diff -Nru filezilla-3.5.3/AUTHORS filezilla-3.7.3~precise/AUTHORS
--- filezilla-3.5.3/AUTHORS	2012-01-08 13:25:39.000000000 +0000
+++ filezilla-3.7.3~precise/AUTHORS	2013-04-29 03:30:06.000000000 +0000
@@ -137,6 +137,8 @@
     Nikola Radovanovic
 - Armenian
     Hrant Ohanyan
+- Aragonese
+    Jorge Pérez
 
 Application icon
   Aleksandar Kovac
@@ -147,7 +149,7 @@
 - LonE set by Ricardo Cabral
 - OpenCrystal set by Σταμάτης Η. Σταματέλλος, Everaldo Coelho
 - Minimal set by Frédéric Duarte
+- Tango set by Christophe Meyer and the Tango Desktop Project
 
 Additional artwork
 - Klement Angelov
-
diff -Nru filezilla-3.5.3/ChangeLog filezilla-3.7.3~precise/ChangeLog
--- filezilla-3.5.3/ChangeLog	2007-11-23 11:34:00.000000000 +0000
+++ filezilla-3.7.3~precise/ChangeLog	2013-06-25 17:11:01.000000000 +0000
@@ -1,2 +1 @@
-For a full list of changes, please visit http://filezilla-project.org/changelog.php
-
+For a full list of changes, please visit https://filezilla-project.org/changelog.php
diff -Nru filezilla-3.5.3/GPL.html filezilla-3.7.3~precise/GPL.html
--- filezilla-3.5.3/GPL.html	2007-11-23 11:34:00.000000000 +0000
+++ filezilla-3.7.3~precise/GPL.html	2013-04-05 03:30:06.000000000 +0000
@@ -11,7 +11,7 @@
 </P>
 
 <PRE>
-Copyright (C) 1989, 1991 Free Software Foundation, Inc.  
+Copyright (C) 1989, 1991 Free Software Foundation, Inc.
 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA
 
 Everyone is permitted to copy and distribute verbatim copies
diff -Nru filezilla-3.5.3/INSTALL filezilla-3.7.3~precise/INSTALL
--- filezilla-3.5.3/INSTALL	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/INSTALL	2012-10-06 03:30:13.000000000 +0000
@@ -40,4 +40,3 @@
 ../configure
 make
 make install
-
diff -Nru filezilla-3.5.3/Makefile.in filezilla-3.7.3~precise/Makefile.in
--- filezilla-3.5.3/Makefile.in	2012-01-08 13:29:14.000000000 +0000
+++ filezilla-3.7.3~precise/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -48,8 +65,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 am__CONFIG_DISTCLEAN_FILES = config.status config.cache config.log \
@@ -68,6 +86,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -89,6 +112,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 man1dir = $(mandir)/man1
 am__installdirs = "$(DESTDIR)$(man1dir)" "$(DESTDIR)$(man5dir)" \
 	"$(DESTDIR)$(docsdir)"
@@ -108,9 +137,11 @@
 distdir = $(PACKAGE)-$(VERSION)
 top_distdir = $(distdir)
 am__remove_distdir = \
-  { test ! -d "$(distdir)" \
-    || { find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
-         && rm -fr "$(distdir)"; }; }
+  if test -d "$(distdir)"; then \
+    find "$(distdir)" -type d ! -perm -200 -exec chmod u+w {} ';' \
+      && rm -rf "$(distdir)" \
+      || { sleep 5 && rm -rf "$(distdir)"; }; \
+  else :; fi
 am__relativize = \
   dir0=`pwd`; \
   sed_first='s,^\([^/]*\)/.*$$,\1,'; \
@@ -139,6 +170,8 @@
 DIST_ARCHIVES = $(distdir).tar.gz $(distdir).tar.bz2
 GZIP_ENV = --best
 distuninstallcheck_listfiles = find . -type f -print
+am__distuninstallcheck_listfiles = $(distuninstallcheck_listfiles) \
+  | sed 's|^\./|$(prefix)/|' | grep -v '$(infodir)/dir$$'
 distcleancheck_listfiles = find . -type f -print
 ACLOCAL = @ACLOCAL@
 AMTAR = @AMTAR@
@@ -162,6 +195,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -199,6 +233,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -244,6 +279,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -277,7 +313,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -316,7 +351,7 @@
 all: all-recursive
 
 .SUFFIXES:
-am--refresh:
+am--refresh: Makefile
 	@:
 $(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
 	@for dep in $?; do \
@@ -361,9 +396,18 @@
 	-rm -f libtool config.lt
 install-man1: $(dist_man1_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man1dir)" || $(MKDIR_P) "$(DESTDIR)$(man1dir)"
-	@list='$(dist_man1_MANS)'; test -n "$(man1dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
+	@list1='$(dist_man1_MANS)'; \
+	list2=''; \
+	test -n "$(man1dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man1dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man1dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.1[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -390,14 +434,21 @@
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^1][0-9a-z]*$$,1,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man1dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man1dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man1dir)'; $(am__uninstall_files_from_dir)
 install-man5: $(dist_man5_MANS)
 	@$(NORMAL_INSTALL)
-	test -z "$(man5dir)" || $(MKDIR_P) "$(DESTDIR)$(man5dir)"
-	@list='$(dist_man5_MANS)'; test -n "$(man5dir)" || exit 0; \
-	{ for i in $$list; do echo "$$i"; done; \
+	@list1='$(dist_man5_MANS)'; \
+	list2=''; \
+	test -n "$(man5dir)" \
+	  && test -n "`echo $$list1$$list2`" \
+	  || exit 0; \
+	echo " $(MKDIR_P) '$(DESTDIR)$(man5dir)'"; \
+	$(MKDIR_P) "$(DESTDIR)$(man5dir)" || exit 1; \
+	{ for i in $$list1; do echo "$$i"; done;  \
+	if test -n "$$list2"; then \
+	  for i in $$list2; do echo "$$i"; done \
+	    | sed -n '/\.5[a-z]*$$/p'; \
+	fi; \
 	} | while read p; do \
 	  if test -f $$p; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; echo "$$p"; \
@@ -424,13 +475,14 @@
 	files=`{ for i in $$list; do echo "$$i"; done; \
 	} | sed -e 's,.*/,,;h;s,.*\.,,;s,^[^5][0-9a-z]*$$,5,;x' \
 	      -e 's,\.[0-9a-z]*$$,,;$(transform);G;s,\n,.,'`; \
-	test -z "$$files" || { \
-	  echo " ( cd '$(DESTDIR)$(man5dir)' && rm -f" $$files ")"; \
-	  cd "$(DESTDIR)$(man5dir)" && rm -f $$files; }
+	dir='$(DESTDIR)$(man5dir)'; $(am__uninstall_files_from_dir)
 install-dist_docsDATA: $(dist_docs_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(docsdir)" || $(MKDIR_P) "$(DESTDIR)$(docsdir)"
 	@list='$(dist_docs_DATA)'; test -n "$(docsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(docsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(docsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -444,9 +496,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_docs_DATA)'; test -n "$(docsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(docsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(docsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(docsdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -630,13 +680,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -667,7 +714,11 @@
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
 	$(am__remove_distdir)
 dist-bzip2: distdir
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
+	$(am__remove_distdir)
+
+dist-lzip: distdir
+	tardir=$(distdir) && $(am__tar) | lzip -c $${LZIP_OPT--9} >$(distdir).tar.lz
 	$(am__remove_distdir)
 
 dist-lzma: distdir
@@ -675,7 +726,7 @@
 	$(am__remove_distdir)
 
 dist-xz: distdir
-	tardir=$(distdir) && $(am__tar) | xz -c >$(distdir).tar.xz
+	tardir=$(distdir) && $(am__tar) | XZ_OPT=$${XZ_OPT--e} xz -c >$(distdir).tar.xz
 	$(am__remove_distdir)
 
 dist-tarZ: distdir
@@ -693,7 +744,7 @@
 
 dist dist-all: distdir
 	tardir=$(distdir) && $(am__tar) | GZIP=$(GZIP_ENV) gzip -c >$(distdir).tar.gz
-	tardir=$(distdir) && $(am__tar) | bzip2 -9 -c >$(distdir).tar.bz2
+	tardir=$(distdir) && $(am__tar) | BZIP2=$${BZIP2--9} bzip2 -c >$(distdir).tar.bz2
 	$(am__remove_distdir)
 
 # This target untars the dist file and tries a VPATH configuration.  Then
@@ -707,6 +758,8 @@
 	  bzip2 -dc $(distdir).tar.bz2 | $(am__untar) ;;\
 	*.tar.lzma*) \
 	  lzma -dc $(distdir).tar.lzma | $(am__untar) ;;\
+	*.tar.lz*) \
+	  lzip -dc $(distdir).tar.lz | $(am__untar) ;;\
 	*.tar.xz*) \
 	  xz -dc $(distdir).tar.xz | $(am__untar) ;;\
 	*.tar.Z*) \
@@ -716,7 +769,7 @@
 	*.zip*) \
 	  unzip $(distdir).zip ;;\
 	esac
-	chmod -R a-w $(distdir); chmod a+w $(distdir)
+	chmod -R a-w $(distdir); chmod u+w $(distdir)
 	mkdir $(distdir)/_build
 	mkdir $(distdir)/_inst
 	chmod a-w $(distdir)
@@ -726,6 +779,7 @@
 	  && am__cwd=`pwd` \
 	  && $(am__cd) $(distdir)/_build \
 	  && ../configure --srcdir=.. --prefix="$$dc_install_base" \
+	    $(AM_DISTCHECK_CONFIGURE_FLAGS) \
 	    $(DISTCHECK_CONFIGURE_FLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) \
 	  && $(MAKE) $(AM_MAKEFLAGS) dvi \
@@ -754,8 +808,16 @@
 	  list='$(DIST_ARCHIVES)'; for i in $$list; do echo $$i; done) | \
 	  sed -e 1h -e 1s/./=/g -e 1p -e 1x -e '$$p' -e '$$x'
 distuninstallcheck:
-	@$(am__cd) '$(distuninstallcheck_dir)' \
-	&& test `$(distuninstallcheck_listfiles) | wc -l` -le 1 \
+	@test -n '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: trying to run $@ with an empty' \
+	       '$$(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	$(am__cd) '$(distuninstallcheck_dir)' || { \
+	  echo 'ERROR: cannot chdir into $(distuninstallcheck_dir)' >&2; \
+	  exit 1; \
+	}; \
+	test `$(am__distuninstallcheck_listfiles) | wc -l` -eq 0 \
 	   || { echo "ERROR: files left after uninstall:" ; \
 	        if test -n "$(DESTDIR)"; then \
 	          echo "  (check DESTDIR support)"; \
@@ -789,10 +851,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -884,8 +951,8 @@
 .PHONY: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) CTAGS GTAGS \
 	all all-am am--refresh check check-am clean clean-generic \
 	clean-libtool clean-local ctags ctags-recursive dist dist-all \
-	dist-bzip2 dist-gzip dist-lzma dist-shar dist-tarZ dist-xz \
-	dist-zip distcheck distclean distclean-generic \
+	dist-bzip2 dist-gzip dist-lzip dist-lzma dist-shar dist-tarZ \
+	dist-xz dist-zip distcheck distclean distclean-generic \
 	distclean-libtool distclean-tags distcleancheck distdir \
 	distuninstallcheck dvi dvi-am html html-am info info-am \
 	install install-am install-data install-data-am \
diff -Nru filezilla-3.5.3/NEWS filezilla-3.7.3~precise/NEWS
--- filezilla-3.5.3/NEWS	2012-01-08 13:25:39.000000000 +0000
+++ filezilla-3.7.3~precise/NEWS	2013-08-07 17:25:48.000000000 +0000
@@ -10,6 +10,107 @@
     *nix: Unix (e.g BSD) and Unix-like systems (e.g. Linux)
     OS X: Apple Mac OS X
 
+3.7.3 (2013-08-07)
+
+! Merge further fixes from PuTTY to address CVE-2013-4206, CVE-2013-4207, CVE-2013-4208
+
+3.7.2 (2013-08-06)
+
+! Apply a fix for a security vulnerability in PuTTY as used in FileZilla to handle SFTP. See CVE-2013-4852 for reference.
+- Provided Linux binaries are now built against Debian Wheezy
+
+3.7.1.1 (2013-06-27)
+
+- Minor bump for installer changes
+
+3.7.1 (2013-06-18)
+
+- Updated translations
+
+3.7.1-rc1 (2013-06-10)
+
++ Add command-line option to specify initial local directory
+- Fix crash on OS X if connecting using FTP over TLS
+- Prevent file lists from jumping when they are not supposed to
+
+3.7.0.2 (2013-05-26)
+
+- Fix freeze if trying to transfer files with multiple servers each with a connection limit of 1
+- Adjust accepted X.509 signature algorithms in TLS 1.2 mode
+
+3.7.0.1 (2013-05-10)
+
+- Fixed a bug in bundled GnuTLS affecting FileZilla 3.7.0
+- Updated translations
+
+3.7.0 (2013-05-09)
+
+- Fix typo
+
+3.7.0-rc1 (2013-04-29)
+
++ Show total transfer speed as tooltip over the transfer indicators
++ List supported protocols in tooltip of host field in quickconnect bar
++ Use TLS instead of the deprecated term SSL
++ Reworded text when saving of passwords is disabled, do not refer to kiosk mode
++ Improved usability of Update page in settings dialog
++ Improve SFTP performance
++ When navigating to the parent directory, highlight the former child
++ When editing files, use high priority for the transfers
++ Add label to size conditions in filter conditions dialog indicating that the unit is bytes
++ Ignore drag&drop operations where source and target are identical and clarify the wording in some drop error cases
++ Trim whitespace from the entered port numbers
++ Slightly darker color of inactive tabs
++ Ignore .. item in the file list context menus if multiple items are selected
++ Display TLS version and key exchange algorithm in certificate and encryption details dialog for FTP over TLS connections.
+- Fix handling of remote paths containing double-quotes
+- Fix crash when opening local directories in Explorer if the name contains characters not representable in the locale's narrow-width character set.
+- Fix a memory leak in the host key verification dialog for SFTP
+- Fix drag-scrolling in file lists with very low height
+- Don't attempt writing XML files upon loading them
+- Improve handling of legacy DDE file associations
+- Fix handling of HTTPS in the auto updater in case a mirror redirects to HTTPS
+
+3.6.0.2 (2012-11-29)
+
+- Fix problems with stalling FTP over TLS uploads
+- MSW: Minor performance increase listing local files
+
+3.6.0.1 (2012-11-18)
+
+- Fix problems with TLS cipher selection, including a bugfix for GnuTLS
+- Fix a crash on shutdown
+- Add log message for servers not using UTF-8
+- Small performance and memory optimizations getting file types
+- Improve formatting of transfer speeds
+
+3.6.0 (2012-11-10)
+
+- Fix a crash introduced since 3.5.3
+- IPv6-only hosts should no longer cause a crash in the network configuration wizard
+
+3.6.0-rc1 (2012-11-02)
+
+- Do not show "Remember passwords?" dialog if connecting anonymously
+- Make wording in "Remember passwords?" dialog consistent.
+- Increase default TLS session lifetime
+- When asking for confirmation to delete files, state whether it's local or on the server
+- Fix right-to-left rendering of progress line in the transfer queue
+
+3.6.0-beta1 (2012-10-21)
+
++ Auto-scroll file lists if dragging an item near the top or bottom
++ Add option to create empty files to the remote file list context menu
++ Support legacy servers sending directory listings in EBCDIC
++ Added Tango icon set
++ First-time users now get prompted whether they want to save passwords when first using the quickconnect bar
++ Greatly improve TLS performance by updating to GnuTLS 3.1.x with Nettle backend
+- FTP proxies now work with IPv6 addresses as proxy address
+- Handle expired TLS sessions when trying to reuse a session
+- TLS session reusing no longer fails with newer GnuTLS versions due to changed semantics of gnutls_session_get_data
+- Directory listings no longer sporadically fail if two connections try to list the same directory in parallel
+- Partially work around a Ubuntu-specific problem with modal dialogs not being modal resulting in crashes
+
 3.5.3 (2012-01-08)
 
 + Ctrl+Shift+O can be used to toggle between modification time and filesize based directory comparison
@@ -31,7 +132,6 @@
 - Queue items with the lowest priority setting are now being restored again
 - Drag & Drop did not work with all saved sites if saving of passwords had been disabled
 
-
 3.5.1 (2011-08-28)
 
 - Add support for another rate variant of MVS style directory listings
@@ -85,7 +185,6 @@
 - Fix Resizing issues with manual transfers dialog
 - MSW: Remote file editing did not correctly handle files that were still open
 
-
 3.4.0-beta1 (2011-01-09)
 
 + Normal FTP connections now always attempt to negotiate secure FTP over TLS
diff -Nru filezilla-3.5.3/README filezilla-3.7.3~precise/README
--- filezilla-3.5.3/README	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/README	2013-06-25 17:11:01.000000000 +0000
@@ -1,8 +1,8 @@
                                FileZilla Client
                                ----------------
 
-                      Copyright (C) 2004-2012  Tim Kosse
-                         http://filezilla-project.org/
+                      Copyright (C) 2004-2013  Tim Kosse
+                        https://filezilla-project.org/
 
 Overview
 --------
@@ -56,9 +56,7 @@
 Contact
 -------
 
-Project website: http://filezilla-project.org
+Project website: https://filezilla-project.org
 IRC:             #filezilla on chat.freenode.net
 Project leader:  mailto:tim.kosse@filezilla-project.org (Support requests per
                  mail will be ignored)
-
-
diff -Nru filezilla-3.5.3/aclocal.m4 filezilla-3.7.3~precise/aclocal.m4
--- filezilla-3.5.3/aclocal.m4	2012-01-08 13:29:08.000000000 +0000
+++ filezilla-3.7.3~precise/aclocal.m4	2013-08-07 19:17:11.000000000 +0000
@@ -1,7 +1,8 @@
-# generated automatically by aclocal 1.11.1 -*- Autoconf -*-
+# generated automatically by aclocal 1.11.6 -*- Autoconf -*-
 
 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2002, 2003, 2004,
-# 2005, 2006, 2007, 2008, 2009  Free Software Foundation, Inc.
+# 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation,
+# Inc.
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -13,8 +14,8 @@
 
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
-m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.67],,
-[m4_warning([this file was generated for autoconf 2.67.
+m4_if(m4_defn([AC_AUTOCONF_VERSION]), [2.69],,
+[m4_warning([this file was generated for autoconf 2.69.
 You have another version of autoconf.  It may work, but is not guaranteed to.
 If you have problems, you may need to regenerate the build system entirely.
 To do so, use the procedure documented by the package, typically `autoreconf'.])])
@@ -22,7 +23,8 @@
 # libtool.m4 - Configure libtool for the host system. -*-Autoconf-*-
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 # This file is free software; the Free Software Foundation gives
@@ -31,7 +33,8 @@
 
 m4_define([_LT_COPYING], [dnl
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -58,7 +61,7 @@
 # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
 ])
 
-# serial 56 LT_INIT
+# serial 57 LT_INIT
 
 
 # LT_PREREQ(VERSION)
@@ -87,6 +90,7 @@
 # ------------------
 AC_DEFUN([LT_INIT],
 [AC_PREREQ([2.58])dnl We use AC_INCLUDES_DEFAULT
+AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT])dnl
 AC_BEFORE([$0], [LT_LANG])dnl
 AC_BEFORE([$0], [LT_OUTPUT])dnl
 AC_BEFORE([$0], [LTDL_INIT])dnl
@@ -103,6 +107,8 @@
 AC_REQUIRE([LTOBSOLETE_VERSION])dnl
 m4_require([_LT_PROG_LTMAIN])dnl
 
+_LT_SHELL_INIT([SHELL=${CONFIG_SHELL-/bin/sh}])
+
 dnl Parse OPTIONS
 _LT_SET_OPTIONS([$0], [$1])
 
@@ -139,7 +145,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 ])
 
 
@@ -159,6 +165,11 @@
 m4_defun([_LT_SETUP],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_REQUIRE([_LT_PREPARE_SED_QUOTE_VARS])dnl
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])dnl
+
+_LT_DECL([], [PATH_SEPARATOR], [1], [The PATH separator for the build system])dnl
+dnl
 _LT_DECL([], [host_alias], [0], [The host system])dnl
 _LT_DECL([], [host], [0])dnl
 _LT_DECL([], [host_os], [0])dnl
@@ -181,10 +192,13 @@
 dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_CHECK_SHELL_FEATURES])dnl
+m4_require([_LT_PATH_CONVERSION_FUNCTIONS])dnl
 m4_require([_LT_CMD_RELOAD])dnl
 m4_require([_LT_CHECK_MAGIC_METHOD])dnl
+m4_require([_LT_CHECK_SHAREDLIB_FROM_LINKLIB])dnl
 m4_require([_LT_CMD_OLD_ARCHIVE])dnl
 m4_require([_LT_CMD_GLOBAL_SYMBOLS])dnl
+m4_require([_LT_WITH_SYSROOT])dnl
 
 _LT_CONFIG_LIBTOOL_INIT([
 # See if we are running on zsh, and set the options which allow our
@@ -200,7 +214,6 @@
 _LT_CHECK_OBJDIR
 
 m4_require([_LT_TAG_COMPILER])dnl
-_LT_PROG_ECHO_BACKSLASH
 
 case $host_os in
 aix3*)
@@ -214,23 +227,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\([["`\\]]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -271,6 +267,28 @@
 ])# _LT_SETUP
 
 
+# _LT_PREPARE_SED_QUOTE_VARS
+# --------------------------
+# Define a few sed substitution that help us do robust quoting.
+m4_defun([_LT_PREPARE_SED_QUOTE_VARS],
+[# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\([["`$\\]]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\([["`\\]]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+])
+
 # _LT_PROG_LTMAIN
 # ---------------
 # Note that this code is called both from `configure', and `config.status'
@@ -423,7 +441,7 @@
 # declaration there will have the same value as in `configure'.  VARNAME
 # must have a single quote delimited value for this to work.
 m4_define([_LT_CONFIG_STATUS_DECLARE],
-[$1='`$ECHO "X$][$1" | $Xsed -e "$delay_single_quote_subst"`'])
+[$1='`$ECHO "$][$1" | $SED "$delay_single_quote_subst"`'])
 
 
 # _LT_CONFIG_STATUS_DECLARATIONS
@@ -433,7 +451,7 @@
 # embedded single quotes properly.  In configure, this macro expands
 # each variable declared with _LT_DECL (and _LT_TAGDECL) into:
 #
-#    <var>='`$ECHO "X$<var>" | $Xsed -e "$delay_single_quote_subst"`'
+#    <var>='`$ECHO "$<var>" | $SED "$delay_single_quote_subst"`'
 m4_defun([_LT_CONFIG_STATUS_DECLARATIONS],
 [m4_foreach([_lt_var], m4_quote(lt_decl_all_varnames),
     [m4_n([_LT_CONFIG_STATUS_DECLARE(_lt_var)])])])
@@ -532,12 +550,20 @@
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$[]1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_quote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -548,9 +574,9 @@
 # Double-quote double-evaled strings.
 for var in lt_decl_all_varnames([[ \
 ]], lt_decl_dquote_varnames); do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[[\\\\\\\`\\"\\\$]]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -558,16 +584,38 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\[$]0 --fallback-echo"')dnl "
-  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\[$]0 --fallback-echo"\[$]/\[$]0 --fallback-echo"/'\`
-  ;;
-esac
-
 _LT_OUTPUT_LIBTOOL_INIT
 ])
 
+# _LT_GENERATED_FILE_INIT(FILE, [COMMENT])
+# ------------------------------------
+# Generate a child script FILE with all initialization necessary to
+# reuse the environment learned by the parent script, and make the
+# file executable.  If COMMENT is supplied, it is inserted after the
+# `#!' sequence but before initialization text begins.  After this
+# macro, additional text can be appended to FILE to form the body of
+# the child script.  The macro ends with non-zero status if the
+# file could not be fully written (such as if the disk is full).
+m4_ifdef([AS_INIT_GENERATED],
+[m4_defun([_LT_GENERATED_FILE_INIT],[AS_INIT_GENERATED($@)])],
+[m4_defun([_LT_GENERATED_FILE_INIT],
+[m4_require([AS_PREPARE])]dnl
+[m4_pushdef([AS_MESSAGE_LOG_FD])]dnl
+[lt_write_fail=0
+cat >$1 <<_ASEOF || lt_write_fail=1
+#! $SHELL
+# Generated by $as_me.
+$2
+SHELL=\${CONFIG_SHELL-$SHELL}
+export SHELL
+_ASEOF
+cat >>$1 <<\_ASEOF || lt_write_fail=1
+AS_SHELL_SANITIZE
+_AS_PREPARE
+exec AS_MESSAGE_FD>&1
+_ASEOF
+test $lt_write_fail = 0 && chmod +x $1[]dnl
+m4_popdef([AS_MESSAGE_LOG_FD])])])# _LT_GENERATED_FILE_INIT
 
 # LT_OUTPUT
 # ---------
@@ -577,20 +625,11 @@
 AC_DEFUN([LT_OUTPUT],
 [: ${CONFIG_LT=./config.lt}
 AC_MSG_NOTICE([creating $CONFIG_LT])
-cat >"$CONFIG_LT" <<_LTEOF
-#! $SHELL
-# Generated by $as_me.
-# Run this file to recreate a libtool stub with the current configuration.
-
-lt_cl_silent=false
-SHELL=\${CONFIG_SHELL-$SHELL}
-_LTEOF
+_LT_GENERATED_FILE_INIT(["$CONFIG_LT"],
+[# Run this file to recreate a libtool stub with the current configuration.])
 
 cat >>"$CONFIG_LT" <<\_LTEOF
-AS_SHELL_SANITIZE
-_AS_PREPARE
-
-exec AS_MESSAGE_FD>&1
+lt_cl_silent=false
 exec AS_MESSAGE_LOG_FD>>config.log
 {
   echo
@@ -616,7 +655,7 @@
 m4_ifset([AC_PACKAGE_VERSION], [ AC_PACKAGE_VERSION])
 configured by $[0], generated by m4_PACKAGE_STRING.
 
-Copyright (C) 2008 Free Software Foundation, Inc.
+Copyright (C) 2011 Free Software Foundation, Inc.
 This config.lt script is free software; the Free Software Foundation
 gives unlimited permision to copy, distribute and modify it."
 
@@ -661,15 +700,13 @@
 # appending to config.log, which fails on DOS, as config.log is still kept
 # open by configure.  Here we exec the FD to /dev/null, effectively closing
 # config.log, so it can be properly (re)opened and appended to by config.lt.
-if test "$no_create" != yes; then
-  lt_cl_success=:
-  test "$silent" = yes &&
-    lt_config_lt_args="$lt_config_lt_args --quiet"
-  exec AS_MESSAGE_LOG_FD>/dev/null
-  $SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
-  exec AS_MESSAGE_LOG_FD>>config.log
-  $lt_cl_success || AS_EXIT(1)
-fi
+lt_cl_success=:
+test "$silent" = yes &&
+  lt_config_lt_args="$lt_config_lt_args --quiet"
+exec AS_MESSAGE_LOG_FD>/dev/null
+$SHELL "$CONFIG_LT" $lt_config_lt_args || lt_cl_success=false
+exec AS_MESSAGE_LOG_FD>>config.log
+$lt_cl_success || AS_EXIT(1)
 ])# LT_OUTPUT
 
 
@@ -732,15 +769,12 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  _LT_PROG_XSI_SHELLFNS
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
+  _LT_PROG_REPLACE_SHELLFNS
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 ],
@@ -785,6 +819,7 @@
 m4_case([$1],
   [C],			[_LT_LANG(C)],
   [C++],		[_LT_LANG(CXX)],
+  [Go],			[_LT_LANG(GO)],
   [Java],		[_LT_LANG(GCJ)],
   [Fortran 77],		[_LT_LANG(F77)],
   [Fortran],		[_LT_LANG(FC)],
@@ -806,6 +841,29 @@
 ])# _LT_LANG
 
 
+m4_ifndef([AC_PROG_GO], [
+# NOTE: This macro has been submitted for inclusion into   #
+#  GNU Autoconf as AC_PROG_GO.  When it is available in    #
+#  a released version of Autoconf we should remove this    #
+#  macro and use it instead.                               #
+m4_defun([AC_PROG_GO],
+[AC_LANG_PUSH(Go)dnl
+AC_ARG_VAR([GOC],     [Go compiler command])dnl
+AC_ARG_VAR([GOFLAGS], [Go compiler flags])dnl
+_AC_ARG_VAR_LDFLAGS()dnl
+AC_CHECK_TOOL(GOC, gccgo)
+if test -z "$GOC"; then
+  if test -n "$ac_tool_prefix"; then
+    AC_CHECK_PROG(GOC, [${ac_tool_prefix}gccgo], [${ac_tool_prefix}gccgo])
+  fi
+fi
+if test -z "$GOC"; then
+  AC_CHECK_PROG(GOC, gccgo, gccgo, false)
+fi
+])#m4_defun
+])#m4_ifndef
+
+
 # _LT_LANG_DEFAULT_CONFIG
 # -----------------------
 m4_defun([_LT_LANG_DEFAULT_CONFIG],
@@ -836,6 +894,10 @@
        m4_ifdef([LT_PROG_GCJ],
 	[m4_define([LT_PROG_GCJ], defn([LT_PROG_GCJ])[LT_LANG(GCJ)])])])])])
 
+AC_PROVIDE_IFELSE([AC_PROG_GO],
+  [LT_LANG(GO)],
+  [m4_define([AC_PROG_GO], defn([AC_PROG_GO])[LT_LANG(GO)])])
+
 AC_PROVIDE_IFELSE([LT_PROG_RC],
   [LT_LANG(RC)],
   [m4_define([LT_PROG_RC], defn([LT_PROG_RC])[LT_LANG(RC)])])
@@ -846,11 +908,13 @@
 AU_DEFUN([AC_LIBTOOL_F77], [LT_LANG(Fortran 77)])
 AU_DEFUN([AC_LIBTOOL_FC], [LT_LANG(Fortran)])
 AU_DEFUN([AC_LIBTOOL_GCJ], [LT_LANG(Java)])
+AU_DEFUN([AC_LIBTOOL_RC], [LT_LANG(Windows Resource)])
 dnl aclocal-1.4 backwards compatibility:
 dnl AC_DEFUN([AC_LIBTOOL_CXX], [])
 dnl AC_DEFUN([AC_LIBTOOL_F77], [])
 dnl AC_DEFUN([AC_LIBTOOL_FC], [])
 dnl AC_DEFUN([AC_LIBTOOL_GCJ], [])
+dnl AC_DEFUN([AC_LIBTOOL_RC], [])
 
 
 # _LT_TAG_COMPILER
@@ -936,7 +1000,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&AS_MESSAGE_LOG_FD
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&AS_MESSAGE_LOG_FD
@@ -944,6 +1014,7 @@
 	rm -rf libconftest.dylib*
 	rm -f conftest.*
       fi])
+
     AC_CACHE_CHECK([for -exported_symbols_list linker flag],
       [lt_cv_ld_exported_symbols_list],
       [lt_cv_ld_exported_symbols_list=no
@@ -955,6 +1026,34 @@
 	[lt_cv_ld_exported_symbols_list=no])
 	LDFLAGS="$save_LDFLAGS"
     ])
+
+    AC_CACHE_CHECK([for -force_load linker flag],[lt_cv_ld_force_load],
+      [lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&AS_MESSAGE_LOG_FD
+      echo "$AR cru libconftest.a conftest.o" >&AS_MESSAGE_LOG_FD
+      $AR cru libconftest.a conftest.o 2>&AS_MESSAGE_LOG_FD
+      echo "$RANLIB libconftest.a" >&AS_MESSAGE_LOG_FD
+      $RANLIB libconftest.a 2>&AS_MESSAGE_LOG_FD
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&AS_MESSAGE_LOG_FD
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&AS_MESSAGE_LOG_FD
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+    ])
     case $host_os in
     rhapsody* | darwin1.[[012]])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
@@ -982,7 +1081,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -992,8 +1091,8 @@
 ])
 
 
-# _LT_DARWIN_LINKER_FEATURES
-# --------------------------
+# _LT_DARWIN_LINKER_FEATURES([TAG])
+# ---------------------------------
 # Checks for linker and compiler features on darwin
 m4_defun([_LT_DARWIN_LINKER_FEATURES],
 [
@@ -1002,7 +1101,13 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_automatic, $1)=yes
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
-  _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    _LT_TAGVAR(whole_archive_flag_spec, $1)='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+    m4_case([$1], [F77], [_LT_TAGVAR(compiler_needs_object, $1)=yes],
+                  [FC],  [_LT_TAGVAR(compiler_needs_object, $1)=yes])
+  else
+    _LT_TAGVAR(whole_archive_flag_spec, $1)=''
+  fi
   _LT_TAGVAR(link_all_deplibs, $1)=yes
   _LT_TAGVAR(allow_undefined_flag, $1)="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -1010,7 +1115,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     _LT_TAGVAR(archive_cmds, $1)="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     _LT_TAGVAR(module_cmds, $1)="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     _LT_TAGVAR(archive_expsym_cmds, $1)="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -1026,203 +1131,142 @@
   fi
 ])
 
-# _LT_SYS_MODULE_PATH_AIX
-# -----------------------
+# _LT_SYS_MODULE_PATH_AIX([TAGNAME])
+# ----------------------------------
 # Links a minimal program and checks the executable
 # for the system default hardcoded library path. In most cases,
 # this is /usr/lib:/lib, but when the MPI compilers are used
 # the location of the communication and MPI libs are included too.
 # If we don't find anything, use the default library path according
 # to the aix ld manual.
+# Store the results from the different compilers for each TAGNAME.
+# Allow to override them for all tags through lt_cv_aix_libpath.
 m4_defun([_LT_SYS_MODULE_PATH_AIX],
 [m4_require([_LT_DECL_SED])dnl
-AC_LINK_IFELSE(AC_LANG_PROGRAM,[
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi],[])
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  AC_CACHE_VAL([_LT_TAGVAR([lt_cv_aix_libpath_], [$1])],
+  [AC_LINK_IFELSE([AC_LANG_PROGRAM],[
+  lt_aix_libpath_sed='[
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }]'
+  _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi],[])
+  if test -z "$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])"; then
+    _LT_TAGVAR([lt_cv_aix_libpath_], [$1])="/usr/lib:/lib"
+  fi
+  ])
+  aix_libpath=$_LT_TAGVAR([lt_cv_aix_libpath_], [$1])
+fi
 ])# _LT_SYS_MODULE_PATH_AIX
 
 
 # _LT_SHELL_INIT(ARG)
 # -------------------
 m4_define([_LT_SHELL_INIT],
-[ifdef([AC_DIVERSION_NOTICE],
-	     [AC_DIVERT_PUSH(AC_DIVERSION_NOTICE)],
-	 [AC_DIVERT_PUSH(NOTICE)])
-$1
-AC_DIVERT_POP
-])# _LT_SHELL_INIT
+[m4_divert_text([M4SH-INIT], [$1
+])])# _LT_SHELL_INIT
+
 
 
 # _LT_PROG_ECHO_BACKSLASH
 # -----------------------
-# Add some code to the start of the generated configure script which
-# will find an echo command which doesn't interpret backslashes.
+# Find how we can fake an echo command that does not interpret backslash.
+# In particular, with Autoconf 2.60 or later we add some code to the start
+# of the generated configure script which will find a shell with a builtin
+# printf (which we can use as an echo command).
 m4_defun([_LT_PROG_ECHO_BACKSLASH],
-[_LT_SHELL_INIT([
-# Check that we are running under the correct shell.
-SHELL=${CONFIG_SHELL-/bin/sh}
-
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\[$]\\[$]0,'[$]0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X[$]1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X[$]1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
+[ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+AC_MSG_CHECKING([how to print strings])
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
 else
-  # Restart under the correct shell.
-  exec $SHELL "[$]0" --no-reexec ${1+"[$]@"}
-fi
-
-if test "X[$]1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-[$]*
-_LT_EOF
-  exit 0
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$[]1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
 fi
 
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "[$]0"' 'sed 20q "[$]0"' 'sed 10q "[$]0"' 'sed 2q "[$]0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "[$]0" --no-reexec ${1+"[$]@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "[$]0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL [$]0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "[$]0"' 'sed 10q "[$]0"' 'sed 20q "[$]0"' 'sed 50q "[$]0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*" 
+}
 
-	  if test "$prev" != 'sed 50q "[$]0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "[$]0" ${1+"[$]@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
+case "$ECHO" in
+  printf*) AC_MSG_RESULT([printf]) ;;
+  print*) AC_MSG_RESULT([print -r]) ;;
+  *) AC_MSG_RESULT([cat]) ;;
+esac
 
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL [$]0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\[$]0 --fallback-echo"
-fi
+m4_ifdef([_AS_DETECT_SUGGESTED],
+[_AS_DETECT_SUGGESTED([
+  test -n "${ZSH_VERSION+set}${BASH_VERSION+set}" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+    ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test "X`printf %s $ECHO`" = "X$ECHO" \
+      || test "X`print -r -- $ECHO`" = "X$ECHO" )])])
 
-AC_SUBST(lt_ECHO)
-])
 _LT_DECL([], [SHELL], [1], [Shell to use when invoking shell scripts])
-_LT_DECL([], [ECHO], [1],
-    [An echo program that does not interpret backslashes])
+_LT_DECL([], [ECHO], [1], [An echo program that protects backslashes])
 ])# _LT_PROG_ECHO_BACKSLASH
 
 
+# _LT_WITH_SYSROOT
+# ----------------
+AC_DEFUN([_LT_WITH_SYSROOT],
+[AC_MSG_CHECKING([for sysroot])
+AC_ARG_WITH([sysroot],
+[  --with-sysroot[=DIR] Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).],
+[], [with_sysroot=no])
+
+dnl lt_sysroot will always be passed unquoted.  We quote it here
+dnl in case the user passed a directory name.
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   AC_MSG_RESULT([${with_sysroot}])
+   AC_MSG_ERROR([The sysroot must be an absolute path.])
+   ;;
+esac
+
+ AC_MSG_RESULT([${lt_sysroot:-no}])
+_LT_DECL([], [lt_sysroot], [0], [The root where to search for ]dnl
+[dependent libraries, and in which our libraries should be installed.])])
+
 # _LT_ENABLE_LOCK
 # ---------------
 m4_defun([_LT_ENABLE_LOCK],
@@ -1251,7 +1295,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '[#]line __oline__ "configure"' > conftest.$ac_ext
+  echo '[#]line '$LINENO' "configure"' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     if test "$lt_cv_prog_gnu_ld" = yes; then
       case `/usr/bin/file conftest.$ac_objext` in
@@ -1344,14 +1388,27 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if AC_TRY_EVAL(ac_compile); then
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -1369,14 +1426,47 @@
 ])# _LT_ENABLE_LOCK
 
 
+# _LT_PROG_AR
+# -----------
+m4_defun([_LT_PROG_AR],
+[AC_CHECK_TOOLS(AR, [ar], false)
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+_LT_DECL([], [AR], [1], [The archiver])
+_LT_DECL([], [AR_FLAGS], [1], [Flags to create an archive])
+
+AC_CACHE_CHECK([for archiver @FILE support], [lt_cv_ar_at_file],
+  [lt_cv_ar_at_file=no
+   AC_COMPILE_IFELSE([AC_LANG_PROGRAM],
+     [echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&AS_MESSAGE_LOG_FD'
+      AC_TRY_EVAL([lt_ar_try])
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	AC_TRY_EVAL([lt_ar_try])
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+     ])
+  ])
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+_LT_DECL([], [archiver_list_spec], [1],
+  [How to feed a file listing to the archiver])
+])# _LT_PROG_AR
+
+
 # _LT_CMD_OLD_ARCHIVE
 # -------------------
 m4_defun([_LT_CMD_OLD_ARCHIVE],
-[AC_CHECK_TOOL(AR, ar, false)
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
-_LT_DECL([], [AR], [1], [The archiver])
-_LT_DECL([], [AR_FLAGS], [1])
+[_LT_PROG_AR
 
 AC_CHECK_TOOL(STRIP, strip, :)
 test -z "$STRIP" && STRIP=:
@@ -1395,18 +1485,27 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
+
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
 _LT_DECL([], [old_postinstall_cmds], [2])
 _LT_DECL([], [old_postuninstall_cmds], [2])
 _LT_TAGDECL([], [old_archive_cmds], [2],
     [Commands used to build an old-style archive])
+_LT_DECL([], [lock_old_archive_extraction], [0],
+    [Whether to use a lock for old archive extraction])
 ])# _LT_CMD_OLD_ARCHIVE
 
 
@@ -1431,15 +1530,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        $2=yes
@@ -1479,7 +1578,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&AS_MESSAGE_LOG_FD
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          $2=yes
@@ -1542,6 +1641,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -1567,6 +1671,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -1606,8 +1715,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL [$]0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -1658,7 +1767,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-[#line __oline__ "configure"
+[#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -1699,7 +1808,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -1708,7 +1823,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -1884,16 +2003,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [[^ ]]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:__oline__: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&AS_MESSAGE_LOG_FD)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&AS_MESSAGE_LOG_FD
-   echo "$as_me:__oline__: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
+   echo "$as_me:$LINENO: \$? = $ac_status" >&AS_MESSAGE_LOG_FD
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        _LT_TAGVAR(lt_cv_prog_compiler_c_o, $1)=yes
@@ -2052,6 +2171,7 @@
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_OBJDUMP])dnl
 m4_require([_LT_DECL_SED])dnl
+m4_require([_LT_CHECK_SHELL_FEATURES])dnl
 AC_MSG_CHECKING([dynamic linker characteristics])
 m4_if([$1],
 	[], [
@@ -2060,16 +2180,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([[A-Za-z]]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -2082,7 +2209,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -2102,7 +2229,13 @@
   if (lt_foo != "") { lt_freq[[lt_foo]]++; }
   if (lt_freq[[lt_foo]] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([[A-Za-z]]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi])
@@ -2128,7 +2261,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -2137,7 +2270,7 @@
   ;;
 
 aix[[4-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -2190,7 +2323,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([[^/]]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -2202,7 +2335,7 @@
   ;;
 
 bsdi[[45]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -2221,8 +2354,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -2243,36 +2377,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+m4_if([$1], [],[
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"])
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([[a-zA-Z]]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | [$GREP ';[c-zC-Z]:/' >/dev/null]; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[[.]]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -2293,7 +2474,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -2301,10 +2482,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -2312,7 +2489,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[[123]]*) objformat=aout ;;
+    freebsd[[23]].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -2330,7 +2507,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[[01]]* | freebsdelf3.[[01]]*)
@@ -2349,13 +2526,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -2401,12 +2581,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[[3-9]]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -2422,7 +2604,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -2459,9 +2641,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2469,16 +2651,21 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
-       LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
-  AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
-    [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
-       [shlibpath_overrides_runpath=yes])])
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+  AC_CACHE_VAL([lt_cv_shlibpath_overrides_runpath],
+    [lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$_LT_TAGVAR(lt_prog_compiler_wl, $1)\"; \
+	 LDFLAGS=\"\$LDFLAGS $_LT_TAGVAR(hardcode_libdir_flag_spec, $1)\""
+    AC_LINK_IFELSE([AC_LANG_PROGRAM([],[])],
+      [AS_IF([ ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null],
+	 [lt_cv_shlibpath_overrides_runpath=yes])])
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+    ])
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -2487,7 +2674,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -2531,7 +2718,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -2600,7 +2787,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2625,7 +2812,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2649,7 +2836,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -2680,7 +2867,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -2690,7 +2877,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -2732,6 +2919,8 @@
     The last name is the one that the linker finds with -lNAME]])
 _LT_DECL([], [soname_spec], [1],
     [[The coded name of the library, if different from the real name]])
+_LT_DECL([], [install_override_mode], [1],
+    [Permission mode override for installation of shared libraries])
 _LT_DECL([], [postinstall_cmds], [2],
     [Command to use after installation of a shared archive])
 _LT_DECL([], [postuninstall_cmds], [2],
@@ -2844,6 +3033,7 @@
 AC_REQUIRE([AC_CANONICAL_BUILD])dnl
 m4_require([_LT_DECL_SED])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PROG_ECHO_BACKSLASH])dnl
 
 AC_ARG_WITH([gnu-ld],
     [AS_HELP_STRING([--with-gnu-ld],
@@ -2965,6 +3155,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -2973,8 +3168,8 @@
     fi
     ;;
 esac
-_LT_DECL([], [reload_flag], [1], [How to create reloadable object files])dnl
-_LT_DECL([], [reload_cmds], [2])dnl
+_LT_TAGDECL([], [reload_flag], [1], [How to create reloadable object files])dnl
+_LT_TAGDECL([], [reload_cmds], [2])dnl
 ])# _LT_CMD_RELOAD
 
 
@@ -3026,16 +3221,18 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -3061,7 +3258,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3073,11 +3270,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]']
+    [lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]']
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]].[[0-9]]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[[0-9]][[0-9]][[0-9]]|PA-RISC[[0-9]]\.[[0-9]]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -3098,8 +3295,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -3177,6 +3374,21 @@
   ;;
 esac
 ])
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[[\1]]\/[[\1]]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -3184,7 +3396,11 @@
 _LT_DECL([], [deplibs_check_method], [1],
     [Method to check whether dependent libraries are shared objects])
 _LT_DECL([], [file_magic_cmd], [1],
-    [Command to use when deplibs_check_method == "file_magic"])
+    [Command to use when deplibs_check_method = "file_magic"])
+_LT_DECL([], [file_magic_glob], [1],
+    [How to find potential files when deplibs_check_method = "file_magic"])
+_LT_DECL([], [want_nocaseglob], [1],
+    [Find potential files using nocaseglob when deplibs_check_method = "file_magic"])
 ])# _LT_CHECK_MAGIC_METHOD
 
 
@@ -3241,7 +3457,19 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  AC_CHECK_TOOLS(DUMPBIN, ["dumpbin -symbols" "link -dump -symbols"], :)
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    AC_CHECK_TOOLS(DUMPBIN, [dumpbin "link -dump"], :)
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
   AC_SUBST([DUMPBIN])
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -3254,13 +3482,13 @@
 AC_CACHE_CHECK([the name lister ($NM) interface], [lt_cv_nm_interface],
   [lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:__oline__: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&AS_MESSAGE_LOG_FD)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&AS_MESSAGE_LOG_FD)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&AS_MESSAGE_LOG_FD
-  (eval echo "\"\$as_me:__oline__: output\"" >&AS_MESSAGE_LOG_FD)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&AS_MESSAGE_LOG_FD)
   cat conftest.out >&AS_MESSAGE_LOG_FD
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -3275,6 +3503,67 @@
 dnl AC_DEFUN([AM_PROG_NM], [])
 dnl AC_DEFUN([AC_PROG_NM], [])
 
+# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+# --------------------------------
+# how to determine the name of the shared library
+# associated with a specific link library.
+#  -- PORTME fill in with the dynamic library characteristics
+m4_defun([_LT_CHECK_SHAREDLIB_FROM_LINKLIB],
+[m4_require([_LT_DECL_EGREP])
+m4_require([_LT_DECL_OBJDUMP])
+m4_require([_LT_DECL_DLLTOOL])
+AC_CACHE_CHECK([how to associate runtime and link libraries],
+lt_cv_sharedlib_from_linklib_cmd,
+[lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+])
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+_LT_DECL([], [sharedlib_from_linklib_cmd], [1],
+    [Command to associate shared and link libraries])
+])# _LT_CHECK_SHAREDLIB_FROM_LINKLIB
+
+
+# _LT_PATH_MANIFEST_TOOL
+# ----------------------
+# locate the manifest tool
+m4_defun([_LT_PATH_MANIFEST_TOOL],
+[AC_CHECK_TOOL(MANIFEST_TOOL, mt, :)
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+AC_CACHE_CHECK([if $MANIFEST_TOOL is a manifest tool], [lt_cv_path_mainfest_tool],
+  [lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&AS_MESSAGE_LOG_FD
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&AS_MESSAGE_LOG_FD
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*])
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+_LT_DECL([], [MANIFEST_TOOL], [1], [Manifest tool])dnl
+])# _LT_PATH_MANIFEST_TOOL
+
 
 # LT_LIB_M
 # --------
@@ -3283,7 +3572,7 @@
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 LIBM=
 case $host in
-*-*-beos* | *-*-cygwin* | *-*-pw32* | *-*-darwin*)
+*-*-beos* | *-*-cegcc* | *-*-cygwin* | *-*-haiku* | *-*-pw32* | *-*-darwin*)
   # These system don't have libm, or don't need it
   ;;
 *-ncr-sysv4.3*)
@@ -3311,7 +3600,12 @@
 _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=
 
 if test "$GCC" = yes; then
-  _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -Xcompiler -fno-builtin' ;;
+  *)
+    _LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)=' -fno-builtin' ;;
+  esac
 
   _LT_COMPILER_OPTION([if $compiler supports -fno-rtti -fno-exceptions],
     lt_cv_prog_compiler_rtti_exceptions,
@@ -3328,6 +3622,7 @@
 m4_defun([_LT_CMD_GLOBAL_SYMBOLS],
 [AC_REQUIRE([AC_CANONICAL_HOST])dnl
 AC_REQUIRE([AC_PROG_CC])dnl
+AC_REQUIRE([AC_PROG_AWK])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
 AC_REQUIRE([LT_PATH_LD])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -3395,8 +3690,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([[^ ]]*\)[[ ]]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([[^ ]]*\) \(lib[[^ ]]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([[^ ]]*\) \([[^ ]]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -3420,6 +3715,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK ['"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -3432,6 +3728,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[[	 ]]\($symcode$symcode*\)[[	 ]][[	 ]]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -3453,7 +3750,7 @@
   if AC_TRY_EVAL(ac_compile); then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if AC_TRY_EVAL(NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) && test -s "$nlist"; then
+    if AC_TRY_EVAL(NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) && test -s "$nlist"; then
       # Try sorting and uniquifying the output.
       if sort "$nlist" | uniq > "$nlist"T; then
 	mv -f "$nlist"T "$nlist"
@@ -3465,6 +3762,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT@&t@_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT@&t@_DLSYM_CONST
+#else
+# define LT@&t@_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -3476,7 +3785,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT@&t@_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -3502,15 +3811,15 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$_LT_TAGVAR(lt_prog_compiler_no_builtin_flag, $1)"
 	  if AC_TRY_EVAL(ac_link) && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&AS_MESSAGE_LOG_FD
 	fi
@@ -3543,6 +3852,13 @@
   AC_MSG_RESULT(ok)
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[[@]]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
 _LT_DECL([global_symbol_pipe], [lt_cv_sys_global_symbol_pipe], [1],
     [Take the output of nm and produce a listing of raw symbols and C names])
 _LT_DECL([global_symbol_to_cdecl], [lt_cv_sys_global_symbol_to_cdecl], [1],
@@ -3553,6 +3869,8 @@
 _LT_DECL([global_symbol_to_c_name_address_lib_prefix],
     [lt_cv_sys_global_symbol_to_c_name_address_lib_prefix], [1],
     [Transform the output of nm in a C name address pair when lib prefix is needed])
+_LT_DECL([], [nm_file_list_spec], [1],
+    [Specify filename containing input files for $NM])
 ]) # _LT_CMD_GLOBAL_SYMBOLS
 
 
@@ -3564,7 +3882,6 @@
 _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 _LT_TAGVAR(lt_prog_compiler_static, $1)=
 
-AC_MSG_CHECKING([for $compiler option to produce PIC])
 m4_if([$1], [CXX], [
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -3615,6 +3932,11 @@
       # DJGPP does not support shared libraries at all
       _LT_TAGVAR(lt_prog_compiler_pic, $1)=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
     interix[[3-9]]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -3664,6 +3986,12 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	m4_if([$1], [GCJ], [],
+	  [_LT_TAGVAR(lt_prog_compiler_pic, $1)='-DDLL_EXPORT'])
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -3720,7 +4048,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -3753,8 +4081,8 @@
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)=
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[[cC]]* | mpixl[[cC]]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
@@ -3816,7 +4144,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	    _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
@@ -3920,6 +4248,12 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      _LT_TAGVAR(lt_prog_compiler_static, $1)=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -3962,6 +4296,15 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Xlinker '
+      if test -n "$_LT_TAGVAR(lt_prog_compiler_pic, $1)"; then
+        _LT_TAGVAR(lt_prog_compiler_pic, $1)="-Xcompiler $_LT_TAGVAR(lt_prog_compiler_pic, $1)"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -4004,7 +4347,7 @@
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -4025,7 +4368,13 @@
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='--shared'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,-Wl,,'
+	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-PIC'
+	_LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
@@ -4037,25 +4386,40 @@
         # All Alpha code is PIC.
         _LT_TAGVAR(lt_prog_compiler_static, $1)='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	_LT_TAGVAR(lt_prog_compiler_pic, $1)='-qpic'
 	_LT_TAGVAR(lt_prog_compiler_static, $1)='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [[1-7]].* | *Sun*Fortran*\ 8.[[0-3]]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
 	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
+        *Intel*\ [[CF]]*Compiler*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fPIC'
+	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-static'
+	  ;;
+	*Portland\ Group*)
+	  _LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,'
+	  _LT_TAGVAR(lt_prog_compiler_pic, $1)='-fpic'
 	  _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
-	  _LT_TAGVAR(lt_prog_compiler_wl, $1)=''
 	  ;;
 	esac
 	;;
@@ -4087,7 +4451,7 @@
       _LT_TAGVAR(lt_prog_compiler_pic, $1)='-KPIC'
       _LT_TAGVAR(lt_prog_compiler_static, $1)='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Qoption ld ';;
       *)
 	_LT_TAGVAR(lt_prog_compiler_wl, $1)='-Wl,';;
@@ -4144,9 +4508,11 @@
     _LT_TAGVAR(lt_prog_compiler_pic, $1)="$_LT_TAGVAR(lt_prog_compiler_pic, $1)@&t@m4_if([$1],[],[ -DPIC],[m4_if([$1],[CXX],[ -DPIC],[])])"
     ;;
 esac
-AC_MSG_RESULT([$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
-_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
-	[How to pass a linker flag through the compiler])
+
+AC_CACHE_CHECK([for $compiler option to produce PIC],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)],
+  [_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_prog_compiler_pic, $1)])
+_LT_TAGVAR(lt_prog_compiler_pic, $1)=$_LT_TAGVAR(lt_cv_prog_compiler_pic, $1)
 
 #
 # Check to make sure the PIC flag actually works.
@@ -4165,6 +4531,8 @@
 _LT_TAGDECL([pic_flag], [lt_prog_compiler_pic], [1],
 	[Additional compiler flags for building library objects])
 
+_LT_TAGDECL([wl], [lt_prog_compiler_wl], [1],
+	[How to pass a linker flag through the compiler])
 #
 # Check to make sure the static flag actually works.
 #
@@ -4185,6 +4553,7 @@
 m4_defun([_LT_LINKER_SHLIBS],
 [AC_REQUIRE([LT_PATH_LD])dnl
 AC_REQUIRE([LT_PATH_NM])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
 m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
 m4_require([_LT_DECL_SED])dnl
@@ -4193,30 +4562,40 @@
 AC_MSG_CHECKING([whether the $compiler linker ($LD) supports shared libraries])
 m4_if([$1], [CXX], [
   _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
   case $host_os in
   aix[[4-9]]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     _LT_TAGVAR(export_symbols_cmds, $1)="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;/^.*[[ ]]__nm__/s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      _LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
-  ;;
+    ;;
   *)
     _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  _LT_TAGVAR(exclude_expsyms, $1)=['_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*']
 ], [
   runpath_var=
   _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -4231,7 +4610,6 @@
   _LT_TAGVAR(hardcode_direct, $1)=no
   _LT_TAGVAR(hardcode_direct_absolute, $1)=no
   _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
   _LT_TAGVAR(hardcode_libdir_separator, $1)=
   _LT_TAGVAR(hardcode_minus_L, $1)=no
   _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -4276,13 +4654,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     _LT_TAGVAR(link_all_deplibs, $1)=no
     ;;
   esac
 
   _LT_TAGVAR(ld_shlibs, $1)=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[[2-9]]*) ;;
+	  *\ \(GNU\ Binutils\)\ [[3-9]]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -4316,11 +4720,12 @@
 	_LT_TAGVAR(ld_shlibs, $1)=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -4356,10 +4761,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
       # as there is no search path for DLLs.
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+      _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
       _LT_TAGVAR(always_export_symbols, $1)=no
       _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1 DATA/;s/^.*[[ ]]__nm__\([[^ ]]*\)[[ ]][[^ ]]*/\1 DATA/;/^I[[ ]]/d;/^[[AITW]][[ ]]/s/.* //'\'' | sort | uniq > $export_symbols'
+      _LT_TAGVAR(exclude_expsyms, $1)=['[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname']
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -4377,6 +4784,11 @@
       fi
       ;;
 
+    haiku*)
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      _LT_TAGVAR(link_all_deplibs, $1)=yes
+      ;;
+
     interix[[3-9]]*)
       _LT_TAGVAR(hardcode_direct, $1)=no
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4402,15 +4814,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -4421,13 +4834,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)=
 	  tmp_sharedflag='--shared' ;;
-	xl[[cC]]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[[cC]]* | bgxl[[cC]]* | mpixl[[cC]]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(compiler_needs_object, $1)=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  _LT_TAGVAR(compiler_needs_object, $1)=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -4443,17 +4860,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  _LT_TAGVAR(whole_archive_flag_spec, $1)='--whole-archive$convenience --no-whole-archive'
-	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-	  _LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='-rpath $libdir'
-	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
+	  _LT_TAGVAR(archive_cmds, $1)='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -4467,8 +4883,8 @@
 	_LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -4486,8 +4902,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4533,8 +4949,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	_LT_TAGVAR(ld_shlibs, $1)=no
       fi
@@ -4574,8 +4990,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  _LT_TAGVAR(export_symbols_cmds, $1)='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && ([substr](\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -4663,9 +5081,9 @@
 	_LT_TAGVAR(allow_undefined_flag, $1)='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        _LT_SYS_MODULE_PATH_AIX
+        _LT_SYS_MODULE_PATH_AIX([$1])
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -4674,14 +5092,19 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 _LT_SYS_MODULE_PATH_AIX
+	 _LT_SYS_MODULE_PATH_AIX([$1])
 	 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	  _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	  fi
 	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  _LT_TAGVAR(archive_expsym_cmds, $1)="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -4713,20 +5136,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
-      _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      _LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
-      # FIXME: Should let the user specify the lib program.
-      _LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      _LT_TAGVAR(fix_srcfile_path, $1)='`cygpath -w "$srcfile"`'
-      _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	_LT_TAGVAR(always_export_symbols, $1)=yes
+	_LT_TAGVAR(file_list_spec, $1)='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	_LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	_LT_TAGVAR(exclude_expsyms, $1)='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	_LT_TAGVAR(export_symbols_cmds, $1)='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[[BCDGRS]][[ ]]/s/.*[[ ]]\([[^ ]]*\)/\1,DATA/'\'' | $SED -e '\''/^[[AITW]][[ ]]/s/.*[[ ]]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	_LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	_LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	_LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	_LT_TAGVAR(archive_cmds, $1)='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	_LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	# FIXME: Should let the user specify the lib program.
+	_LT_TAGVAR(old_archive_cmds, $1)='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	_LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -4739,10 +5206,6 @@
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
       ;;
 
-    freebsd1*)
-      _LT_TAGVAR(ld_shlibs, $1)=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -4755,7 +5218,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       _LT_TAGVAR(archive_cmds, $1)='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
@@ -4764,7 +5227,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      _LT_TAGVAR(archive_cmds, $1)='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
       _LT_TAGVAR(hardcode_direct, $1)=yes
       _LT_TAGVAR(hardcode_shlibpath_var, $1)=no
@@ -4772,7 +5235,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -4787,14 +5250,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}+b ${wl}$libdir'
-	_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)='+b $libdir'
 	_LT_TAGVAR(hardcode_libdir_separator, $1)=:
 	_LT_TAGVAR(hardcode_direct, $1)=yes
 	_LT_TAGVAR(hardcode_direct_absolute, $1)=yes
@@ -4806,16 +5268,16 @@
       ;;
 
     hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
 	case $host_cpu in
 	hppa*64*)
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	ia64*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	esac
       else
@@ -4827,7 +5289,14 @@
 	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
 	  ;;
 	*)
-	  _LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	m4_if($1, [], [
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  _LT_LINKER_OPTION([if $CC understands -b],
+	    _LT_TAGVAR(lt_cv_prog_compiler__b, $1), [-b],
+	    [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'],
+	    [_LT_TAGVAR(archive_cmds, $1)='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'])],
+	  [_LT_TAGVAR(archive_cmds, $1)='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'])
 	  ;;
 	esac
       fi
@@ -4855,19 +5324,34 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        AC_LINK_IFELSE(int foo(void) {},
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-        )
-        LDFLAGS="$save_LDFLAGS"
+	# This should be the same for all languages, so no per-tag cache variable.
+	AC_CACHE_CHECK([whether the $host_os linker accepts -exported_symbol],
+	  [lt_cv_irix_exported_symbol],
+	  [save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   AC_LINK_IFELSE(
+	     [AC_LANG_SOURCE(
+	        [AC_LANG_CASE([C], [[int foo (void) { return 0; }]],
+			      [C++], [[int foo (void) { return 0; }]],
+			      [Fortran 77], [[
+      subroutine foo
+      end]],
+			      [Fortran], [[
+      subroutine foo
+      end]])])],
+	      [lt_cv_irix_exported_symbol=yes],
+	      [lt_cv_irix_exported_symbol=no])
+           LDFLAGS="$save_LDFLAGS"])
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4929,17 +5413,17 @@
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
       _LT_TAGVAR(hardcode_minus_L, $1)=yes
       _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      _LT_TAGVAR(archive_cmds, $1)='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       _LT_TAGVAR(old_archive_from_new_cmds, $1)='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       _LT_TAGVAR(archive_cmds_need_lc, $1)='no'
       _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
@@ -4949,13 +5433,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	_LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
       else
 	_LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	_LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
@@ -4968,9 +5452,9 @@
       _LT_TAGVAR(no_undefined_flag, $1)=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	_LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	_LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	_LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -5146,36 +5630,38 @@
       # Test whether the compiler implicitly links with -lc since on some
       # systems, -lgcc has to come before -lc. If gcc already passes -lc
       # to ld, don't add -lc before -lgcc.
-      AC_MSG_CHECKING([whether -lc should be explicitly linked in])
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
-
-      if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
-	pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
-        _LT_TAGVAR(allow_undefined_flag, $1)=
-        if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
-        then
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=no
-        else
-	  _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
-        fi
-        _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      AC_MSG_RESULT([$_LT_TAGVAR(archive_cmds_need_lc, $1)])
+      AC_CACHE_CHECK([whether -lc should be explicitly linked in],
+	[lt_cv_]_LT_TAGVAR(archive_cmds_need_lc, $1),
+	[$RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+
+	if AC_TRY_EVAL(ac_compile) 2>conftest.err; then
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$_LT_TAGVAR(lt_prog_compiler_wl, $1)
+	  pic_flag=$_LT_TAGVAR(lt_prog_compiler_pic, $1)
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$_LT_TAGVAR(allow_undefined_flag, $1)
+	  _LT_TAGVAR(allow_undefined_flag, $1)=
+	  if AC_TRY_EVAL(_LT_TAGVAR(archive_cmds, $1) 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1)
+	  then
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+	  else
+	    lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)=yes
+	  fi
+	  _LT_TAGVAR(allow_undefined_flag, $1)=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+	])
+      _LT_TAGVAR(archive_cmds_need_lc, $1)=$lt_cv_[]_LT_TAGVAR(archive_cmds_need_lc, $1)
       ;;
     esac
   fi
@@ -5212,9 +5698,6 @@
 _LT_TAGDECL([], [hardcode_libdir_flag_spec], [1],
     [Flag to hardcode $libdir into a binary during linking.
     This must work even if $libdir does not exist])
-_LT_TAGDECL([], [hardcode_libdir_flag_spec_ld], [1],
-    [[If ld is used when linking, flag to hardcode $libdir into a binary
-    during linking.  This must work even if $libdir does not exist]])
 _LT_TAGDECL([], [hardcode_libdir_separator], [1],
     [Whether we need a single "-rpath" flag with a separated argument])
 _LT_TAGDECL([], [hardcode_direct], [0],
@@ -5240,8 +5723,6 @@
     to runtime path list])
 _LT_TAGDECL([], [link_all_deplibs], [0],
     [Whether libtool must link a program against all its dependency libraries])
-_LT_TAGDECL([], [fix_srcfile_path], [1],
-    [Fix the shell variable $srcfile for the compiler])
 _LT_TAGDECL([], [always_export_symbols], [0],
     [Set to "yes" if exported symbols are required])
 _LT_TAGDECL([], [export_symbols_cmds], [2],
@@ -5252,6 +5733,8 @@
     [Symbols that must always be exported])
 _LT_TAGDECL([], [prelink_cmds], [2],
     [Commands necessary for linking programs (against libraries) with templates])
+_LT_TAGDECL([], [postlink_cmds], [2],
+    [Commands necessary for finishing linking programs])
 _LT_TAGDECL([], [file_list_spec], [1],
     [Specify filename containing input files])
 dnl FIXME: Not yet implemented
@@ -5341,37 +5824,22 @@
 ])# _LT_LANG_C_CONFIG
 
 
-# _LT_PROG_CXX
-# ------------
-# Since AC_PROG_CXX is broken, in that it returns g++ if there is no c++
-# compiler, we have our own version here.
-m4_defun([_LT_PROG_CXX],
-[
-pushdef([AC_MSG_ERROR], [_lt_caught_CXX_error=yes])
-AC_PROG_CXX
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  AC_PROG_CXXCPP
-else
-  _lt_caught_CXX_error=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_CXX
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_CXX], [])
-
-
 # _LT_LANG_CXX_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a C++ compiler are suitably
 # defined.  These variables are subsequently used by _LT_CONFIG to write
 # the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_CXX_CONFIG],
-[AC_REQUIRE([_LT_PROG_CXX])dnl
-m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+[m4_require([_LT_FILEUTILS_DEFAULTS])dnl
 m4_require([_LT_DECL_EGREP])dnl
+m4_require([_LT_PATH_MANIFEST_TOOL])dnl
+if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  AC_PROG_CXXCPP
+else
+  _lt_caught_CXX_error=yes
+fi
 
 AC_LANG_PUSH(C++)
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
@@ -5383,7 +5851,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_shlibpath_var, $1)=unsupported
@@ -5393,6 +5860,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -5424,6 +5893,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -5441,6 +5911,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -5462,8 +5933,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        _LT_TAGVAR(archive_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(archive_expsym_cmds, $1)='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
         _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5495,7 +5966,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -5604,10 +6075,10 @@
           _LT_TAGVAR(allow_undefined_flag, $1)='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          _LT_SYS_MODULE_PATH_AIX
+          _LT_SYS_MODULE_PATH_AIX([$1])
           _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $libdir:/usr/lib:/lib'
@@ -5616,14 +6087,19 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    _LT_SYS_MODULE_PATH_AIX
+	    _LT_SYS_MODULE_PATH_AIX([$1])
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-bernotok'
 	    _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='$convenience'
+	    fi
 	    _LT_TAGVAR(archive_cmds_need_lc, $1)=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -5653,28 +6129,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
-        # as there is no search path for DLLs.
-        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
-        _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
-        _LT_TAGVAR(always_export_symbols, $1)=no
-        _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          _LT_TAGVAR(ld_shlibs, $1)=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=' '
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=yes
+	  _LT_TAGVAR(file_list_spec, $1)='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  _LT_TAGVAR(archive_cmds, $1)='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, $1)='true'
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+	  # Don't use ranlib
+	  _LT_TAGVAR(old_postinstall_cmds, $1)='chmod 644 $oldlib'
+	  _LT_TAGVAR(postlink_cmds, $1)='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, $1) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-L$libdir'
+	  _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-all-symbols'
+	  _LT_TAGVAR(allow_undefined_flag, $1)=unsupported
+	  _LT_TAGVAR(always_export_symbols, $1)=no
+	  _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    _LT_TAGVAR(archive_expsym_cmds, $1)='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    _LT_TAGVAR(ld_shlibs, $1)=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
         _LT_DARWIN_LINKER_FEATURES($1)
 	;;
@@ -5697,7 +6220,7 @@
         esac
         ;;
 
-      freebsd[[12]]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5713,7 +6236,9 @@
         _LT_TAGVAR(ld_shlibs, $1)=yes
         ;;
 
-      gnu*)
+      haiku*)
+        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        _LT_TAGVAR(link_all_deplibs, $1)=yes
         ;;
 
       hpux9*)
@@ -5740,11 +6265,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test "$GXX" = yes; then
-              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              _LT_TAGVAR(archive_cmds, $1)='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               _LT_TAGVAR(ld_shlibs, $1)=no
@@ -5805,7 +6330,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -5815,10 +6340,10 @@
 	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -5848,7 +6373,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -5859,9 +6384,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
@@ -5872,7 +6397,7 @@
         _LT_TAGVAR(inherit_rpath, $1)=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -5890,7 +6415,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath,$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5927,26 +6452,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [[1-5]]* | *pgcpp\ [[1-5]]*)
+	    *pgCC\ [[1-5]].* | *pgcpp\ [[1-5]].*)
 	      _LT_TAGVAR(prelink_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      _LT_TAGVAR(old_archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 		$RANLIB $oldlib'
 	      _LT_TAGVAR(archive_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above use weak symbols
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -5954,7 +6479,7 @@
 
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}--rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
-	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -5973,9 +6498,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}--export-dynamic'
@@ -5995,13 +6520,13 @@
 	      _LT_TAGVAR(archive_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-R$libdir'
-	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      _LT_TAGVAR(whole_archive_flag_spec, $1)='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	      _LT_TAGVAR(compiler_needs_object, $1)=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6070,7 +6595,7 @@
 	    _LT_TAGVAR(export_dynamic_flag_spec, $1)='${wl}-E'
 	    _LT_TAGVAR(whole_archive_flag_spec, $1)="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  _LT_TAGVAR(ld_shlibs, $1)=no
 	fi
@@ -6105,15 +6630,15 @@
 	    case $host in
 	      osf3*)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        _LT_TAGVAR(allow_undefined_flag, $1)=' -expect_unresolved \*'
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='-rpath $libdir'
 		;;
@@ -6129,17 +6654,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(allow_undefined_flag, $1)=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -6149,7 +6674,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -6185,7 +6710,7 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             _LT_TAGVAR(archive_cmds_need_lc,$1)=yes
 	    _LT_TAGVAR(no_undefined_flag, $1)=' -zdefs'
@@ -6206,7 +6731,7 @@
 	    esac
 	    _LT_TAGVAR(link_all_deplibs, $1)=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -6226,14 +6751,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      _LT_TAGVAR(no_undefined_flag, $1)=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        _LT_TAGVAR(archive_cmds, $1)='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        _LT_TAGVAR(archive_expsym_cmds, $1)='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -6244,7 +6769,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      _LT_TAGVAR(hardcode_libdir_flag_spec, $1)='${wl}-R $wl$libdir'
@@ -6298,6 +6823,10 @@
           CC*)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    _LT_TAGVAR(archive_expsym_cmds, $1)='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    _LT_TAGVAR(old_archive_cmds, $1)='$CC -Tprelink_objects $oldobjs~
+	      '"$_LT_TAGVAR(old_archive_cmds, $1)"
+	    _LT_TAGVAR(reload_cmds, $1)='$CC -Tprelink_objects $reload_objs~
+	      '"$_LT_TAGVAR(reload_cmds, $1)"
 	    ;;
 	  *)
 	    _LT_TAGVAR(archive_cmds, $1)='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -6353,6 +6882,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -6367,6 +6897,29 @@
 ])# _LT_LANG_CXX_CONFIG
 
 
+# _LT_FUNC_STRIPNAME_CNF
+# ----------------------
+# func_stripname_cnf prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+#
+# This function is identical to the (non-XSI) version of func_stripname,
+# except this one can be used by m4 code that may be executed by configure,
+# rather than the libtool script.
+m4_defun([_LT_FUNC_STRIPNAME_CNF],[dnl
+AC_REQUIRE([_LT_DECL_SED])
+AC_REQUIRE([_LT_PROG_ECHO_BACKSLASH])
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+])# _LT_FUNC_STRIPNAME_CNF
+
 # _LT_SYS_HIDDEN_LIBDEPS([TAGNAME])
 # ---------------------------------
 # Figure out "hidden" library dependencies from verbose
@@ -6375,6 +6928,7 @@
 # objects, libraries and library flags.
 m4_defun([_LT_SYS_HIDDEN_LIBDEPS],
 [m4_require([_LT_FILEUTILS_DEFAULTS])dnl
+AC_REQUIRE([_LT_FUNC_STRIPNAME_CNF])dnl
 # Dependencies to place before and after the object being linked:
 _LT_TAGVAR(predep_objects, $1)=
 _LT_TAGVAR(postdep_objects, $1)=
@@ -6424,7 +6978,20 @@
   }
 };
 _LT_EOF
+], [$1], [GO], [cat > conftest.$ac_ext <<_LT_EOF
+package foo
+func foo() {
+}
+_LT_EOF
 ])
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 dnl Parse the compiler output and extract the necessary
 dnl objects, libraries and library flags.
 if AC_TRY_EVAL(ac_compile); then
@@ -6436,7 +7003,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -6445,13 +7012,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -6471,8 +7047,10 @@
 	   _LT_TAGVAR(postdeps, $1)="${_LT_TAGVAR(postdeps, $1)} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -6508,6 +7086,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 m4_if([$1], [CXX],
@@ -6544,7 +7123,7 @@
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -6588,32 +7167,16 @@
 ])# _LT_SYS_HIDDEN_LIBDEPS
 
 
-# _LT_PROG_F77
-# ------------
-# Since AC_PROG_F77 is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_F77],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_F77=yes])
-AC_PROG_F77
-if test -z "$F77" || test "X$F77" = "Xno"; then
-  _lt_disable_F77=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_F77
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_F77], [])
-
-
 # _LT_LANG_F77_CONFIG([TAG])
 # --------------------------
 # Ensure that the configuration variables for a Fortran 77 compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_F77_CONFIG],
-[AC_REQUIRE([_LT_PROG_F77])dnl
-AC_LANG_PUSH(Fortran 77)
+[AC_LANG_PUSH(Fortran 77)
+if test -z "$F77" || test "X$F77" = "Xno"; then
+  _lt_disable_F77=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6623,7 +7186,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6632,6 +7194,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6671,7 +7235,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${F77-"f77"}
+  CFLAGS=$FFLAGS
   compiler=$CC
   _LT_TAGVAR(compiler, $1)=$CC
   _LT_CC_BASENAME([$compiler])
@@ -6725,38 +7291,24 @@
 
   GCC=$lt_save_GCC
   CC="$lt_save_CC"
+  CFLAGS="$lt_save_CFLAGS"
 fi # test "$_lt_disable_F77" != yes
 
 AC_LANG_POP
 ])# _LT_LANG_F77_CONFIG
 
 
-# _LT_PROG_FC
-# -----------
-# Since AC_PROG_FC is broken, in that it returns the empty string
-# if there is no fortran compiler, we have our own version here.
-m4_defun([_LT_PROG_FC],
-[
-pushdef([AC_MSG_ERROR], [_lt_disable_FC=yes])
-AC_PROG_FC
-if test -z "$FC" || test "X$FC" = "Xno"; then
-  _lt_disable_FC=yes
-fi
-popdef([AC_MSG_ERROR])
-])# _LT_PROG_FC
-
-dnl aclocal-1.4 backwards compatibility:
-dnl AC_DEFUN([_LT_PROG_FC], [])
-
-
 # _LT_LANG_FC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for a Fortran compiler are
 # suitably defined.  These variables are subsequently used by _LT_CONFIG
 # to write the compiler configuration to `libtool'.
 m4_defun([_LT_LANG_FC_CONFIG],
-[AC_REQUIRE([_LT_PROG_FC])dnl
-AC_LANG_PUSH(Fortran)
+[AC_LANG_PUSH(Fortran)
+
+if test -z "$FC" || test "X$FC" = "Xno"; then
+  _lt_disable_FC=yes
+fi
 
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 _LT_TAGVAR(allow_undefined_flag, $1)=
@@ -6766,7 +7318,6 @@
 _LT_TAGVAR(hardcode_direct, $1)=no
 _LT_TAGVAR(hardcode_direct_absolute, $1)=no
 _LT_TAGVAR(hardcode_libdir_flag_spec, $1)=
-_LT_TAGVAR(hardcode_libdir_flag_spec_ld, $1)=
 _LT_TAGVAR(hardcode_libdir_separator, $1)=
 _LT_TAGVAR(hardcode_minus_L, $1)=no
 _LT_TAGVAR(hardcode_automatic, $1)=no
@@ -6775,6 +7326,8 @@
 _LT_TAGVAR(module_expsym_cmds, $1)=
 _LT_TAGVAR(link_all_deplibs, $1)=unknown
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 _LT_TAGVAR(no_undefined_flag, $1)=
 _LT_TAGVAR(whole_archive_flag_spec, $1)=
 _LT_TAGVAR(enable_shared_with_static_runtimes, $1)=no
@@ -6814,7 +7367,9 @@
   # Allow CC to be a program name with arguments.
   lt_save_CC="$CC"
   lt_save_GCC=$GCC
+  lt_save_CFLAGS=$CFLAGS
   CC=${FC-"f95"}
+  CFLAGS=$FCFLAGS
   compiler=$CC
   GCC=$ac_cv_fc_compiler_gnu
 
@@ -6870,7 +7425,8 @@
   fi # test -n "$compiler"
 
   GCC=$lt_save_GCC
-  CC="$lt_save_CC"
+  CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
 fi # test "$_lt_disable_FC" != yes
 
 AC_LANG_POP
@@ -6907,10 +7463,12 @@
 _LT_LINKER_BOILERPLATE
 
 # Allow CC to be a program name with arguments.
-lt_save_CC="$CC"
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=yes
 CC=${GCJ-"gcj"}
+CFLAGS=$GCJFLAGS
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_TAGVAR(LD, $1)="$LD"
@@ -6920,6 +7478,8 @@
 _LT_TAGVAR(archive_cmds_need_lc, $1)=no
 
 _LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
 
 if test -n "$compiler"; then
   _LT_COMPILER_NO_RTTI($1)
@@ -6935,10 +7495,78 @@
 AC_LANG_RESTORE
 
 GCC=$lt_save_GCC
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_GCJ_CONFIG
 
 
+# _LT_LANG_GO_CONFIG([TAG])
+# --------------------------
+# Ensure that the configuration variables for the GNU Go compiler
+# are suitably defined.  These variables are subsequently used by _LT_CONFIG
+# to write the compiler configuration to `libtool'.
+m4_defun([_LT_LANG_GO_CONFIG],
+[AC_REQUIRE([LT_PROG_GO])dnl
+AC_LANG_SAVE
+
+# Source file extension for Go test sources.
+ac_ext=go
+
+# Object file extension for compiled Go test sources.
+objext=o
+_LT_TAGVAR(objext, $1)=$objext
+
+# Code to be used in simple compile tests
+lt_simple_compile_test_code="package main; func main() { }"
+
+# Code to be used in simple link tests
+lt_simple_link_test_code='package main; func main() { }'
+
+# ltmain only uses $CC for tagged configurations so make sure $CC is set.
+_LT_TAG_COMPILER
+
+# save warnings/boilerplate of simple test code
+_LT_COMPILER_BOILERPLATE
+_LT_LINKER_BOILERPLATE
+
+# Allow CC to be a program name with arguments.
+lt_save_CC=$CC
+lt_save_CFLAGS=$CFLAGS
+lt_save_GCC=$GCC
+GCC=yes
+CC=${GOC-"gccgo"}
+CFLAGS=$GOFLAGS
+compiler=$CC
+_LT_TAGVAR(compiler, $1)=$CC
+_LT_TAGVAR(LD, $1)="$LD"
+_LT_CC_BASENAME([$compiler])
+
+# Go did not exist at the time GCC didn't implicitly link libc in.
+_LT_TAGVAR(archive_cmds_need_lc, $1)=no
+
+_LT_TAGVAR(old_archive_cmds, $1)=$old_archive_cmds
+_LT_TAGVAR(reload_flag, $1)=$reload_flag
+_LT_TAGVAR(reload_cmds, $1)=$reload_cmds
+
+if test -n "$compiler"; then
+  _LT_COMPILER_NO_RTTI($1)
+  _LT_COMPILER_PIC($1)
+  _LT_COMPILER_C_O($1)
+  _LT_COMPILER_FILE_LOCKS($1)
+  _LT_LINKER_SHLIBS($1)
+  _LT_LINKER_HARDCODE_LIBPATH($1)
+
+  _LT_CONFIG($1)
+fi
+
+AC_LANG_RESTORE
+
+GCC=$lt_save_GCC
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
+])# _LT_LANG_GO_CONFIG
+
+
 # _LT_LANG_RC_CONFIG([TAG])
 # -------------------------
 # Ensure that the configuration variables for the Windows resource compiler
@@ -6970,9 +7598,11 @@
 
 # Allow CC to be a program name with arguments.
 lt_save_CC="$CC"
+lt_save_CFLAGS=$CFLAGS
 lt_save_GCC=$GCC
 GCC=
 CC=${RC-"windres"}
+CFLAGS=
 compiler=$CC
 _LT_TAGVAR(compiler, $1)=$CC
 _LT_CC_BASENAME([$compiler])
@@ -6985,7 +7615,8 @@
 
 GCC=$lt_save_GCC
 AC_LANG_RESTORE
-CC="$lt_save_CC"
+CC=$lt_save_CC
+CFLAGS=$lt_save_CFLAGS
 ])# _LT_LANG_RC_CONFIG
 
 
@@ -7005,6 +7636,13 @@
 dnl AC_DEFUN([LT_AC_PROG_GCJ], [])
 
 
+# LT_PROG_GO
+# ----------
+AC_DEFUN([LT_PROG_GO],
+[AC_CHECK_TOOL(GOC, gccgo,)
+])
+
+
 # LT_PROG_RC
 # ----------
 AC_DEFUN([LT_PROG_RC],
@@ -7044,6 +7682,15 @@
 AC_SUBST([OBJDUMP])
 ])
 
+# _LT_DECL_DLLTOOL
+# ----------------
+# Ensure DLLTOOL variable is set.
+m4_defun([_LT_DECL_DLLTOOL],
+[AC_CHECK_TOOL(DLLTOOL, dlltool, false)
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])
+AC_SUBST([DLLTOOL])
+])
 
 # _LT_DECL_SED
 # ------------
@@ -7135,8 +7782,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -7175,222 +7822,177 @@
 ])# _LT_CHECK_SHELL_FEATURES
 
 
-# _LT_PROG_XSI_SHELLFNS
-# ---------------------
-# Bourne and XSI compatible variants of some useful shell functions.
-m4_defun([_LT_PROG_XSI_SHELLFNS],
-[case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $[*] ))
-}
+# _LT_PROG_FUNCTION_REPLACE (FUNCNAME, REPLACEMENT-BODY)
+# ------------------------------------------------------
+# In `$cfgfile', look for function FUNCNAME delimited by `^FUNCNAME ()$' and
+# '^} FUNCNAME ', and replace its body with REPLACEMENT-BODY.
+m4_defun([_LT_PROG_FUNCTION_REPLACE],
+[dnl {
+sed -e '/^$1 ()$/,/^} # $1 /c\
+$1 ()\
+{\
+m4_bpatsubsts([$2], [$], [\\], [^\([	 ]\)], [\\\1])
+} # Extended-shell $1 implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
 
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
+# _LT_PROG_REPLACE_SHELLFNS
+# -------------------------
+# Replace existing portable implementations of several shell functions with
+# equivalent extended shell implementations where those features are available..
+m4_defun([_LT_PROG_REPLACE_SHELLFNS],
+[if test x"$xsi_shell" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_dirname], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac])
+
+  _LT_PROG_FUNCTION_REPLACE([func_basename], [dnl
+    func_basename_result="${1##*/}"])
+
+  _LT_PROG_FUNCTION_REPLACE([func_dirname_and_basename], [dnl
+    case ${1} in
+      */*) func_dirname_result="${1%/*}${2}" ;;
+      *  ) func_dirname_result="${3}" ;;
+    esac
+    func_basename_result="${1##*/}"])
 
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
+  _LT_PROG_FUNCTION_REPLACE([func_stripname], [dnl
+    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
+    # positional parameters, so assign one to ordinary parameter first.
+    func_stripname_result=${3}
+    func_stripname_result=${func_stripname_result#"${1}"}
+    func_stripname_result=${func_stripname_result%"${2}"}])
 
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_split_long_opt], [dnl
+    func_split_long_opt_name=${1%%=*}
+    func_split_long_opt_arg=${1#*=}])
 
-dnl func_dirname_and_basename
-dnl A portable version of this function is already defined in general.m4sh
-dnl so there is no need for it here.
+  _LT_PROG_FUNCTION_REPLACE([func_split_short_opt], [dnl
+    func_split_short_opt_arg=${1#??}
+    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}])
 
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
+  _LT_PROG_FUNCTION_REPLACE([func_lo2o], [dnl
+    case ${1} in
+      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
+      *)    func_lo2o_result=${1} ;;
+    esac])
 
-# sed scripts:
-my_sed_long_opt='1s/^\(-[[^=]]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[[^=]]*=//'
+  _LT_PROG_FUNCTION_REPLACE([func_xform], [    func_xform_result=${1%.*}.lo])
 
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_arith], [    func_arith_result=$(( $[*] ))])
 
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_len], [    func_len_result=${#1}])
+fi
 
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[[^.]]*$/.lo/'`
-}
+if test x"$lt_shell_append" = xyes; then
+  _LT_PROG_FUNCTION_REPLACE([func_append], [    eval "${1}+=\\${2}"])
 
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$[@]"`
-}
+  _LT_PROG_FUNCTION_REPLACE([func_append_quoted], [dnl
+    func_quote_for_eval "${2}"
+dnl m4 expansion turns \\\\ into \\, and then the shell eval turns that into \
+    eval "${1}+=\\\\ \\$func_quote_for_eval_result"])
 
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$[1]" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([[a-zA-Z_]]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
 
-_LT_EOF
-esac
+if test x"$_lt_function_replace_fail" = x":"; then
+  AC_MSG_WARN([Unable to substitute extended shell functions in $ofile])
+fi
+])
 
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]+=\$[2]"
-}
-_LT_EOF
+# _LT_PATH_CONVERSION_FUNCTIONS
+# -----------------------------
+# Determine which file name conversion functions should be used by
+# func_to_host_file (and, implicitly, by func_to_host_path).  These are needed
+# for certain cross-compile configurations and native mingw.
+m4_defun([_LT_PATH_CONVERSION_FUNCTIONS],
+[AC_REQUIRE([AC_CANONICAL_HOST])dnl
+AC_REQUIRE([AC_CANONICAL_BUILD])dnl
+AC_MSG_CHECKING([how to convert $build file names to $host format])
+AC_CACHE_VAL(lt_cv_to_host_file_cmd,
+[case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
     ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$[1]=\$$[1]\$[2]"
-}
-
-_LT_EOF
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
     ;;
-  esac
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+])
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+AC_MSG_RESULT([$lt_cv_to_host_file_cmd])
+_LT_DECL([to_host_file_cmd], [lt_cv_to_host_file_cmd],
+         [0], [convert $build file names to $host format])dnl
+
+AC_MSG_CHECKING([how to convert $build file names to toolchain format])
+AC_CACHE_VAL(lt_cv_to_tool_file_cmd,
+[#assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
 ])
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+AC_MSG_RESULT([$lt_cv_to_tool_file_cmd])
+_LT_DECL([to_tool_file_cmd], [lt_cv_to_tool_file_cmd],
+         [0], [convert $build files to toolchain format])dnl
+])# _LT_PATH_CONVERSION_FUNCTIONS
 
 # Helper functions for option handling.                    -*- Autoconf -*-
 #
-#   Copyright (C) 2004, 2005, 2007, 2008 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2008, 2009 Free Software Foundation,
+#   Inc.
 #   Written by Gary V. Vaughan, 2004
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 6 ltoptions.m4
+# serial 7 ltoptions.m4
 
 # This is to help aclocal find these macros, as it can't see m4_define.
 AC_DEFUN([LTOPTIONS_VERSION], [m4_if([1])])
@@ -7505,7 +8107,7 @@
 [enable_win32_dll=yes
 
 case $host in
-*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-cegcc*)
+*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-cegcc*)
   AC_CHECK_TOOL(AS, as, false)
   AC_CHECK_TOOL(DLLTOOL, dlltool, false)
   AC_CHECK_TOOL(OBJDUMP, objdump, false)
@@ -7513,13 +8115,13 @@
 esac
 
 test -z "$AS" && AS=as
-_LT_DECL([], [AS],      [0], [Assembler program])dnl
+_LT_DECL([], [AS],      [1], [Assembler program])dnl
 
 test -z "$DLLTOOL" && DLLTOOL=dlltool
-_LT_DECL([], [DLLTOOL], [0], [DLL creation program])dnl
+_LT_DECL([], [DLLTOOL], [1], [DLL creation program])dnl
 
 test -z "$OBJDUMP" && OBJDUMP=objdump
-_LT_DECL([], [OBJDUMP], [0], [Object dumper program])dnl
+_LT_DECL([], [OBJDUMP], [1], [Object dumper program])dnl
 ])# win32-dll
 
 AU_DEFUN([AC_LIBTOOL_WIN32_DLL],
@@ -7705,9 +8307,24 @@
 # MODE is either `yes' or `no'.  If omitted, it defaults to `both'.
 m4_define([_LT_WITH_PIC],
 [AC_ARG_WITH([pic],
-    [AS_HELP_STRING([--with-pic],
+    [AS_HELP_STRING([--with-pic@<:@=PKGS@:>@],
 	[try to use only PIC/non-PIC objects @<:@default=use both@:>@])],
-    [pic_mode="$withval"],
+    [lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac],
     [pic_mode=default])
 
 test -z "$pic_mode" && pic_mode=m4_default([$1], [default])
@@ -7877,31 +8494,31 @@
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# Generated from ltversion.in.
+# @configure_input@
 
-# serial 3017 ltversion.m4
+# serial 3337 ltversion.m4
 # This file is part of GNU Libtool
 
-m4_define([LT_PACKAGE_VERSION], [2.2.6b])
-m4_define([LT_PACKAGE_REVISION], [1.3017])
+m4_define([LT_PACKAGE_VERSION], [2.4.2])
+m4_define([LT_PACKAGE_REVISION], [1.3337])
 
 AC_DEFUN([LTVERSION_VERSION],
-[macro_version='2.2.6b'
-macro_revision='1.3017'
+[macro_version='2.4.2'
+macro_revision='1.3337'
 _LT_DECL(, macro_version, 0, [Which release of libtool.m4 was used?])
 _LT_DECL(, macro_revision, 0)
 ])
 
 # lt~obsolete.m4 -- aclocal satisfying obsolete definitions.    -*-Autoconf-*-
 #
-#   Copyright (C) 2004, 2005, 2007 Free Software Foundation, Inc.
+#   Copyright (C) 2004, 2005, 2007, 2009 Free Software Foundation, Inc.
 #   Written by Scott James Remnant, 2004.
 #
 # This file is free software; the Free Software Foundation gives
 # unlimited permission to copy and/or distribute it, with or without
 # modifications, as long as this notice is preserved.
 
-# serial 4 lt~obsolete.m4
+# serial 5 lt~obsolete.m4
 
 # These exist entirely to fool aclocal when bootstrapping libtool.
 #
@@ -7971,7 +8588,6 @@
 m4_ifndef([_LT_AC_LANG_CXX],		[AC_DEFUN([_LT_AC_LANG_CXX])])
 m4_ifndef([_LT_AC_LANG_F77],		[AC_DEFUN([_LT_AC_LANG_F77])])
 m4_ifndef([_LT_AC_LANG_GCJ],		[AC_DEFUN([_LT_AC_LANG_GCJ])])
-m4_ifndef([AC_LIBTOOL_RC],		[AC_DEFUN([AC_LIBTOOL_RC])])
 m4_ifndef([AC_LIBTOOL_LANG_C_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_C_CONFIG])])
 m4_ifndef([_LT_AC_LANG_C_CONFIG],	[AC_DEFUN([_LT_AC_LANG_C_CONFIG])])
 m4_ifndef([AC_LIBTOOL_LANG_CXX_CONFIG],	[AC_DEFUN([AC_LIBTOOL_LANG_CXX_CONFIG])])
@@ -7984,13 +8600,23 @@
 m4_ifndef([_LT_AC_LANG_RC_CONFIG],	[AC_DEFUN([_LT_AC_LANG_RC_CONFIG])])
 m4_ifndef([AC_LIBTOOL_CONFIG],		[AC_DEFUN([AC_LIBTOOL_CONFIG])])
 m4_ifndef([_LT_AC_FILE_LTDLL_C],	[AC_DEFUN([_LT_AC_FILE_LTDLL_C])])
+m4_ifndef([_LT_REQUIRED_DARWIN_CHECKS],	[AC_DEFUN([_LT_REQUIRED_DARWIN_CHECKS])])
+m4_ifndef([_LT_AC_PROG_CXXCPP],		[AC_DEFUN([_LT_AC_PROG_CXXCPP])])
+m4_ifndef([_LT_PREPARE_SED_QUOTE_VARS],	[AC_DEFUN([_LT_PREPARE_SED_QUOTE_VARS])])
+m4_ifndef([_LT_PROG_ECHO_BACKSLASH],	[AC_DEFUN([_LT_PROG_ECHO_BACKSLASH])])
+m4_ifndef([_LT_PROG_F77],		[AC_DEFUN([_LT_PROG_F77])])
+m4_ifndef([_LT_PROG_FC],		[AC_DEFUN([_LT_PROG_FC])])
+m4_ifndef([_LT_PROG_CXX],		[AC_DEFUN([_LT_PROG_CXX])])
 
-# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2002, 2003, 2005, 2006, 2007, 2008, 2011 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_AUTOMAKE_VERSION(VERSION)
 # ----------------------------
 # Automake X.Y traces this macro to ensure aclocal.m4 has been
@@ -8000,7 +8626,7 @@
 [am__api_version='1.11'
 dnl Some users find AM_AUTOMAKE_VERSION and mistake it for a way to
 dnl require some minimum version.  Point them to the right macro.
-m4_if([$1], [1.11.1], [],
+m4_if([$1], [1.11.6], [],
       [AC_FATAL([Do not call $0, use AM_INIT_AUTOMAKE([$1]).])])dnl
 ])
 
@@ -8016,19 +8642,21 @@
 # Call AM_AUTOMAKE_VERSION and AM_AUTOMAKE_VERSION so they can be traced.
 # This function is AC_REQUIREd by AM_INIT_AUTOMAKE.
 AC_DEFUN([AM_SET_CURRENT_AUTOMAKE_VERSION],
-[AM_AUTOMAKE_VERSION([1.11.1])dnl
+[AM_AUTOMAKE_VERSION([1.11.6])dnl
 m4_ifndef([AC_AUTOCONF_VERSION],
   [m4_copy([m4_PACKAGE_VERSION], [AC_AUTOCONF_VERSION])])dnl
 _AM_AUTOCONF_VERSION(m4_defn([AC_AUTOCONF_VERSION]))])
 
 # AM_AUX_DIR_EXPAND                                         -*- Autoconf -*-
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # For projects using AC_CONFIG_AUX_DIR([foo]), Autoconf sets
 # $ac_aux_dir to `$srcdir/foo'.  In other projects, it is set to
 # `$srcdir', `$srcdir/..', or `$srcdir/../..'.
@@ -8110,14 +8738,14 @@
 Usually this means the macro was only invoked conditionally.]])
 fi])])
 
-# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009
-# Free Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2009,
+# 2010, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 10
+# serial 12
 
 # There are a few dirty hacks below to avoid letting `AC_PROG_CC' be
 # written in clear, in which case automake, when reading aclocal.m4,
@@ -8157,6 +8785,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -8221,7 +8850,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -8286,10 +8915,13 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
 AM_CONDITIONAL([AMDEP], [test "x$enable_dependency_tracking" != xno])
 AC_SUBST([AMDEPBACKSLASH])dnl
 _AM_SUBST_NOTMAKE([AMDEPBACKSLASH])dnl
+AC_SUBST([am__nodep])dnl
+_AM_SUBST_NOTMAKE([am__nodep])dnl
 ])
 
 # Generate code to set up dependency tracking.              -*- Autoconf -*-
@@ -8511,12 +9143,15 @@
 done
 echo "timestamp for $_am_arg" >`AS_DIRNAME(["$_am_arg"])`/stamp-h[]$_am_stamp_count])
 
-# Copyright (C) 2001, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2008, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_SH
 # ------------------
 # Define $install_sh.
@@ -8683,12 +9318,15 @@
 fi
 ])
 
-# Copyright (C) 2003, 2004, 2005, 2006  Free Software Foundation, Inc.
+# Copyright (C) 2003, 2004, 2005, 2006, 2011 Free Software Foundation,
+# Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_MKDIR_P
 # ---------------
 # Check for `mkdir -p'.
@@ -8711,13 +9349,14 @@
 
 # Helper functions for option handling.                     -*- Autoconf -*-
 
-# Copyright (C) 2001, 2002, 2003, 2005, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2002, 2003, 2005, 2008, 2010 Free Software
+# Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 4
+# serial 5
 
 # _AM_MANGLE_OPTION(NAME)
 # -----------------------
@@ -8725,13 +9364,13 @@
 [[_AM_OPTION_]m4_bpatsubst($1, [[^a-zA-Z0-9_]], [_])])
 
 # _AM_SET_OPTION(NAME)
-# ------------------------------
+# --------------------
 # Set option NAME.  Presently that only means defining a flag for this option.
 AC_DEFUN([_AM_SET_OPTION],
 [m4_define(_AM_MANGLE_OPTION([$1]), 1)])
 
 # _AM_SET_OPTIONS(OPTIONS)
-# ----------------------------------
+# ------------------------
 # OPTIONS is a space-separated list of Automake options.
 AC_DEFUN([_AM_SET_OPTIONS],
 [m4_foreach_w([_AM_Option], [$1], [_AM_SET_OPTION(_AM_Option)])])
@@ -8807,12 +9446,14 @@
 fi
 AC_MSG_RESULT(yes)])
 
-# Copyright (C) 2001, 2003, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2001, 2003, 2005, 2011 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
+# serial 1
+
 # AM_PROG_INSTALL_STRIP
 # ---------------------
 # One issue with vendor `install' (even GNU) is that you can't
@@ -8835,13 +9476,13 @@
 INSTALL_STRIP_PROGRAM="\$(install_sh) -c -s"
 AC_SUBST([INSTALL_STRIP_PROGRAM])])
 
-# Copyright (C) 2006, 2008  Free Software Foundation, Inc.
+# Copyright (C) 2006, 2008, 2010 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
 
-# serial 2
+# serial 3
 
 # _AM_SUBST_NOTMAKE(VARIABLE)
 # ---------------------------
@@ -8850,13 +9491,13 @@
 AC_DEFUN([_AM_SUBST_NOTMAKE])
 
 # AM_SUBST_NOTMAKE(VARIABLE)
-# ---------------------------
+# --------------------------
 # Public sister of _AM_SUBST_NOTMAKE.
 AC_DEFUN([AM_SUBST_NOTMAKE], [_AM_SUBST_NOTMAKE($@)])
 
 # Check how to create a tarball.                            -*- Autoconf -*-
 
-# Copyright (C) 2004, 2005  Free Software Foundation, Inc.
+# Copyright (C) 2004, 2005, 2012 Free Software Foundation, Inc.
 #
 # This file is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
@@ -8878,10 +9519,11 @@
 # a tarball read from stdin.
 #     $(am__untar) < result.tar
 AC_DEFUN([_AM_PROG_TAR],
-[# Always define AMTAR for backward compatibility.
-AM_MISSING_PROG([AMTAR], [tar])
+[# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AC_SUBST([AMTAR], ['$${TAR-tar}'])
 m4_if([$1], [v7],
-     [am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'],
+     [am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'],
      [m4_case([$1], [ustar],, [pax],,
               [m4_fatal([Unknown tar format])])
 AC_MSG_CHECKING([how to create a $1 tar archive])
@@ -8954,6 +9596,7 @@
 m4_include([m4/cppunit.m4])
 m4_include([m4/fz_check_tinyxml.m4])
 m4_include([m4/fz_checkversion.m4])
+m4_include([m4/icopyhookw.m4])
 m4_include([m4/libgnutls.m4])
 m4_include([m4/pkg.m4])
 m4_include([m4/wxwin.m4])
diff -Nru filezilla-3.5.3/autogen.sh filezilla-3.7.3~precise/autogen.sh
--- filezilla-3.5.3/autogen.sh	2011-11-01 16:41:52.000000000 +0000
+++ filezilla-3.7.3~precise/autogen.sh	2013-06-25 17:11:01.000000000 +0000
@@ -21,7 +21,7 @@
 
 echo '--- FileZilla 3 autogen script ---'
 echo ''
-printf '\033[1mHINT:\033[0m If this script fails, please download a recent source tarball from \033[1mhttp://filezilla-project.org/nightly.php\033[0m\n\n'
+printf '\033[1mHINT:\033[0m If this script fails, please download a recent source tarball from \033[1mhttps://filezilla-project.org/nightly.php\033[0m\n\n'
 
 failedAclocal()
 {
@@ -82,7 +82,7 @@
     printf "\033[1;31mfound $WRONGVERSION, not ok!\033[0m\n"
     echo "You must have $PACKAGENAME $VERSION or greater to generate the configure script."
     printf "If \033[1m$PACKAGENAME\033[0m is a symlink, make sure it points to the correct version.\n"
-    printf "Please update your installation or get a recent source tarball from \033[1mhttp://filezilla-project.org/nightly.php\033[0m\n"
+    printf "Please update your installation or get a recent source tarball from \033[1mhttps://filezilla-project.org/nightly.php\033[0m\n"
   fi
 }
 
@@ -235,7 +235,7 @@
   printf "\nError: Unable to generate all required files!\033[0m\n\n"
   echo "Please make sure you have autoconf 2.5, automake 1.7, libtool 1.5,"
   echo "autoheader and aclocal installed."
-  printf "If you don't have access to these tools, please get a recent source tarball from \033[1mhttp://filezilla-project.org/nightly.php\033[0m instead.\n"
+  printf "If you don't have access to these tools, please get a recent source tarball from \033[1mhttps://filezilla-project.org/nightly.php\033[0m instead.\n"
 
   exit 1
 fi
diff -Nru filezilla-3.5.3/config/compile filezilla-3.7.3~precise/config/compile
--- filezilla-3.5.3/config/compile	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/config/compile	2013-08-07 19:17:13.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
+# Wrapper for compilers which do not understand '-c -o'.
 
-scriptversion=2009-10-06.20; # UTC
+scriptversion=2012-03-05.13; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009  Free Software
-# Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2009, 2010, 2012 Free
+# Software Foundation, Inc.
 # Written by Tom Tromey <tromey@cygnus.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -29,21 +29,219 @@
 # bugs to <bug-automake@gnu.org> or send patches to
 # <automake-patches@gnu.org>.
 
+nl='
+'
+
+# We need space, tab and new line, in precisely that order.  Quoting is
+# there to prevent tools from complaining about whitespace usage.
+IFS=" ""	$nl"
+
+file_conv=
+
+# func_file_conv build_file lazy
+# Convert a $build file to $host form and store it in $file
+# Currently only supports Windows hosts. If the determined conversion
+# type is listed in (the comma separated) LAZY, no conversion will
+# take place.
+func_file_conv ()
+{
+  file=$1
+  case $file in
+    / | /[!/]*) # absolute file, and not a UNC file
+      if test -z "$file_conv"; then
+	# lazily determine how to convert abs files
+	case `uname -s` in
+	  MINGW*)
+	    file_conv=mingw
+	    ;;
+	  CYGWIN*)
+	    file_conv=cygwin
+	    ;;
+	  *)
+	    file_conv=wine
+	    ;;
+	esac
+      fi
+      case $file_conv/,$2, in
+	*,$file_conv,*)
+	  ;;
+	mingw/*)
+	  file=`cmd //C echo "$file " | sed -e 's/"\(.*\) " *$/\1/'`
+	  ;;
+	cygwin/*)
+	  file=`cygpath -m "$file" || echo "$file"`
+	  ;;
+	wine/*)
+	  file=`winepath -w "$file" || echo "$file"`
+	  ;;
+      esac
+      ;;
+  esac
+}
+
+# func_cl_dashL linkdir
+# Make cl look for libraries in LINKDIR
+func_cl_dashL ()
+{
+  func_file_conv "$1"
+  if test -z "$lib_path"; then
+    lib_path=$file
+  else
+    lib_path="$lib_path;$file"
+  fi
+  linker_opts="$linker_opts -LIBPATH:$file"
+}
+
+# func_cl_dashl library
+# Do a library search-path lookup for cl
+func_cl_dashl ()
+{
+  lib=$1
+  found=no
+  save_IFS=$IFS
+  IFS=';'
+  for dir in $lib_path $LIB
+  do
+    IFS=$save_IFS
+    if $shared && test -f "$dir/$lib.dll.lib"; then
+      found=yes
+      lib=$dir/$lib.dll.lib
+      break
+    fi
+    if test -f "$dir/$lib.lib"; then
+      found=yes
+      lib=$dir/$lib.lib
+      break
+    fi
+  done
+  IFS=$save_IFS
+
+  if test "$found" != yes; then
+    lib=$lib.lib
+  fi
+}
+
+# func_cl_wrapper cl arg...
+# Adjust compile command to suit cl
+func_cl_wrapper ()
+{
+  # Assume a capable shell
+  lib_path=
+  shared=:
+  linker_opts=
+  for arg
+  do
+    if test -n "$eat"; then
+      eat=
+    else
+      case $1 in
+	-o)
+	  # configure might choose to run compile as 'compile cc -o foo foo.c'.
+	  eat=1
+	  case $2 in
+	    *.o | *.[oO][bB][jJ])
+	      func_file_conv "$2"
+	      set x "$@" -Fo"$file"
+	      shift
+	      ;;
+	    *)
+	      func_file_conv "$2"
+	      set x "$@" -Fe"$file"
+	      shift
+	      ;;
+	  esac
+	  ;;
+	-I)
+	  eat=1
+	  func_file_conv "$2" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-I*)
+	  func_file_conv "${1#-I}" mingw
+	  set x "$@" -I"$file"
+	  shift
+	  ;;
+	-l)
+	  eat=1
+	  func_cl_dashl "$2"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-l*)
+	  func_cl_dashl "${1#-l}"
+	  set x "$@" "$lib"
+	  shift
+	  ;;
+	-L)
+	  eat=1
+	  func_cl_dashL "$2"
+	  ;;
+	-L*)
+	  func_cl_dashL "${1#-L}"
+	  ;;
+	-static)
+	  shared=false
+	  ;;
+	-Wl,*)
+	  arg=${1#-Wl,}
+	  save_ifs="$IFS"; IFS=','
+	  for flag in $arg; do
+	    IFS="$save_ifs"
+	    linker_opts="$linker_opts $flag"
+	  done
+	  IFS="$save_ifs"
+	  ;;
+	-Xlinker)
+	  eat=1
+	  linker_opts="$linker_opts $2"
+	  ;;
+	-*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+	*.cc | *.CC | *.cxx | *.CXX | *.[cC]++)
+	  func_file_conv "$1"
+	  set x "$@" -Tp"$file"
+	  shift
+	  ;;
+	*.c | *.cpp | *.CPP | *.lib | *.LIB | *.Lib | *.OBJ | *.obj | *.[oO])
+	  func_file_conv "$1" mingw
+	  set x "$@" "$file"
+	  shift
+	  ;;
+	*)
+	  set x "$@" "$1"
+	  shift
+	  ;;
+      esac
+    fi
+    shift
+  done
+  if test -n "$linker_opts"; then
+    linker_opts="-link$linker_opts"
+  fi
+  exec "$@" $linker_opts
+  exit 1
+}
+
+eat=
+
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
     cat <<\EOF
 Usage: compile [--help] [--version] PROGRAM [ARGS]
 
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
+Wrapper for compilers which do not understand '-c -o'.
+Remove '-o dest.o' from ARGS, run PROGRAM with the remaining
 arguments, and rename the output as expected.
 
 If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
+right script to run: please start by reading the file 'INSTALL'.
 
 Report bugs to <bug-automake@gnu.org>.
 EOF
@@ -53,11 +251,13 @@
     echo "compile $scriptversion"
     exit $?
     ;;
+  cl | *[/\\]cl | cl.exe | *[/\\]cl.exe )
+    func_cl_wrapper "$@"      # Doesn't return...
+    ;;
 esac
 
 ofile=
 cfile=
-eat=
 
 for arg
 do
@@ -66,8 +266,8 @@
   else
     case $1 in
       -o)
-	# configure might choose to run compile as `compile cc -o foo foo.c'.
-	# So we strip `-o arg' only if arg is an object.
+	# configure might choose to run compile as 'compile cc -o foo foo.c'.
+	# So we strip '-o arg' only if arg is an object.
 	eat=1
 	case $2 in
 	  *.o | *.obj)
@@ -94,10 +294,10 @@
 done
 
 if test -z "$ofile" || test -z "$cfile"; then
-  # If no `-o' option was seen then we might have been invoked from a
+  # If no '-o' option was seen then we might have been invoked from a
   # pattern rule where we don't need one.  That is ok -- this is a
   # normal compilation that the losing compiler can handle.  If no
-  # `.c' file was seen then we are probably linking.  That is also
+  # '.c' file was seen then we are probably linking.  That is also
   # ok.
   exec "$@"
 fi
@@ -106,7 +306,7 @@
 cofile=`echo "$cfile" | sed 's|^.*[\\/]||; s|^[a-zA-Z]:||; s/\.c$/.o/'`
 
 # Create the lock directory.
-# Note: use `[/\\:.-]' here to ensure that we don't use the same name
+# Note: use '[/\\:.-]' here to ensure that we don't use the same name
 # that we are using for the .o file.  Also, base the name on the expected
 # object file name, since that is what matters with a parallel build.
 lockdir=`echo "$cofile" | sed -e 's|[/\\:.-]|_|g'`.d
diff -Nru filezilla-3.5.3/config/config.guess filezilla-3.7.3~precise/config/config.guess
--- filezilla-3.5.3/config/config.guess	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/config/config.guess	2013-08-07 19:17:13.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Attempt to guess a canonical system name.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2009-12-30'
+timestamp='2012-02-10'
 
 # This file is free software; you can redistribute it and/or modify it
 # under the terms of the GNU General Public License as published by
@@ -17,9 +17,7 @@
 # General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -57,8 +55,8 @@
 
 Originally written by Per Bothner.
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -145,7 +143,7 @@
 case "${UNAME_MACHINE}:${UNAME_SYSTEM}:${UNAME_RELEASE}:${UNAME_VERSION}" in
     *:NetBSD:*:*)
 	# NetBSD (nbsd) targets should (where applicable) match one or
-	# more of the tupples: *-*-netbsdelf*, *-*-netbsdaout*,
+	# more of the tuples: *-*-netbsdelf*, *-*-netbsdaout*,
 	# *-*-netbsdecoff* and *-*-netbsd*.  For targets that recently
 	# switched to ELF, *-*-netbsd* would select the old
 	# object file format.  This provides both forward
@@ -181,7 +179,7 @@
 		fi
 		;;
 	    *)
-	        os=netbsd
+		os=netbsd
 		;;
 	esac
 	# The OS release
@@ -224,7 +222,7 @@
 		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $3}'`
 		;;
 	*5.*)
-	        UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
+		UNAME_RELEASE=`/usr/sbin/sizer -v | awk '{print $4}'`
 		;;
 	esac
 	# According to Compaq, /usr/sbin/psrinfo has been available on
@@ -270,7 +268,10 @@
 	# A Xn.n version is an unreleased experimental baselevel.
 	# 1.2 uses "1.2" for uname -r.
 	echo ${UNAME_MACHINE}-dec-osf`echo ${UNAME_RELEASE} | sed -e 's/^[PVTX]//' | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-	exit ;;
+	# Reset EXIT trap before exiting to avoid spurious non-zero exit code.
+	exitcode=$?
+	trap '' 0
+	exit $exitcode ;;
     Alpha\ *:Windows_NT*:*)
 	# How do we know it's Interix rather than the generic POSIX subsystem?
 	# Should we change UNAME_MACHINE based on the output of uname instead
@@ -296,7 +297,7 @@
 	echo s390-ibm-zvmoe
 	exit ;;
     *:OS400:*:*)
-        echo powerpc-ibm-os400
+	echo powerpc-ibm-os400
 	exit ;;
     arm:RISC*:1.[012]*:*|arm:riscix:1.[012]*:*)
 	echo arm-acorn-riscix${UNAME_RELEASE}
@@ -395,23 +396,23 @@
     # MiNT.  But MiNT is downward compatible to TOS, so this should
     # be no problem.
     atarist[e]:*MiNT:*:* | atarist[e]:*mint:*:* | atarist[e]:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     atari*:*MiNT:*:* | atari*:*mint:*:* | atarist[e]:*TOS:*:*)
 	echo m68k-atari-mint${UNAME_RELEASE}
-        exit ;;
+	exit ;;
     *falcon*:*MiNT:*:* | *falcon*:*mint:*:* | *falcon*:*TOS:*:*)
-        echo m68k-atari-mint${UNAME_RELEASE}
+	echo m68k-atari-mint${UNAME_RELEASE}
 	exit ;;
     milan*:*MiNT:*:* | milan*:*mint:*:* | *milan*:*TOS:*:*)
-        echo m68k-milan-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-milan-mint${UNAME_RELEASE}
+	exit ;;
     hades*:*MiNT:*:* | hades*:*mint:*:* | *hades*:*TOS:*:*)
-        echo m68k-hades-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-hades-mint${UNAME_RELEASE}
+	exit ;;
     *:*MiNT:*:* | *:*mint:*:* | *:*TOS:*:*)
-        echo m68k-unknown-mint${UNAME_RELEASE}
-        exit ;;
+	echo m68k-unknown-mint${UNAME_RELEASE}
+	exit ;;
     m68k:machten:*:*)
 	echo m68k-apple-machten${UNAME_RELEASE}
 	exit ;;
@@ -481,8 +482,8 @@
 	echo m88k-motorola-sysv3
 	exit ;;
     AViiON:dgux:*:*)
-        # DG/UX returns AViiON for all architectures
-        UNAME_PROCESSOR=`/usr/bin/uname -p`
+	# DG/UX returns AViiON for all architectures
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
 	if [ $UNAME_PROCESSOR = mc88100 ] || [ $UNAME_PROCESSOR = mc88110 ]
 	then
 	    if [ ${TARGET_BINARY_INTERFACE}x = m88kdguxelfx ] || \
@@ -495,7 +496,7 @@
 	else
 	    echo i586-dg-dgux${UNAME_RELEASE}
 	fi
- 	exit ;;
+	exit ;;
     M88*:DolphinOS:*:*)	# DolphinOS (SVR3)
 	echo m88k-dolphin-sysv3
 	exit ;;
@@ -552,7 +553,7 @@
 		echo rs6000-ibm-aix3.2
 	fi
 	exit ;;
-    *:AIX:*:[456])
+    *:AIX:*:[4567])
 	IBM_CPU_ID=`/usr/sbin/lsdev -C -c processor -S available | sed 1q | awk '{ print $1 }'`
 	if /usr/sbin/lsattr -El ${IBM_CPU_ID} | grep ' POWER' >/dev/null 2>&1; then
 		IBM_ARCH=rs6000
@@ -595,52 +596,52 @@
 	    9000/[678][0-9][0-9])
 		if [ -x /usr/bin/getconf ]; then
 		    sc_cpu_version=`/usr/bin/getconf SC_CPU_VERSION 2>/dev/null`
-                    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
-                    case "${sc_cpu_version}" in
-                      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
-                      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
-                      532)                      # CPU_PA_RISC2_0
-                        case "${sc_kernel_bits}" in
-                          32) HP_ARCH="hppa2.0n" ;;
-                          64) HP_ARCH="hppa2.0w" ;;
+		    sc_kernel_bits=`/usr/bin/getconf SC_KERNEL_BITS 2>/dev/null`
+		    case "${sc_cpu_version}" in
+		      523) HP_ARCH="hppa1.0" ;; # CPU_PA_RISC1_0
+		      528) HP_ARCH="hppa1.1" ;; # CPU_PA_RISC1_1
+		      532)                      # CPU_PA_RISC2_0
+			case "${sc_kernel_bits}" in
+			  32) HP_ARCH="hppa2.0n" ;;
+			  64) HP_ARCH="hppa2.0w" ;;
 			  '') HP_ARCH="hppa2.0" ;;   # HP-UX 10.20
-                        esac ;;
-                    esac
+			esac ;;
+		    esac
 		fi
 		if [ "${HP_ARCH}" = "" ]; then
 		    eval $set_cc_for_build
-		    sed 's/^              //' << EOF >$dummy.c
+		    sed 's/^		//' << EOF >$dummy.c
+
+		#define _HPUX_SOURCE
+		#include <stdlib.h>
+		#include <unistd.h>
 
-              #define _HPUX_SOURCE
-              #include <stdlib.h>
-              #include <unistd.h>
-
-              int main ()
-              {
-              #if defined(_SC_KERNEL_BITS)
-                  long bits = sysconf(_SC_KERNEL_BITS);
-              #endif
-                  long cpu  = sysconf (_SC_CPU_VERSION);
-
-                  switch (cpu)
-              	{
-              	case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
-              	case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
-              	case CPU_PA_RISC2_0:
-              #if defined(_SC_KERNEL_BITS)
-              	    switch (bits)
-              		{
-              		case 64: puts ("hppa2.0w"); break;
-              		case 32: puts ("hppa2.0n"); break;
-              		default: puts ("hppa2.0"); break;
-              		} break;
-              #else  /* !defined(_SC_KERNEL_BITS) */
-              	    puts ("hppa2.0"); break;
-              #endif
-              	default: puts ("hppa1.0"); break;
-              	}
-                  exit (0);
-              }
+		int main ()
+		{
+		#if defined(_SC_KERNEL_BITS)
+		    long bits = sysconf(_SC_KERNEL_BITS);
+		#endif
+		    long cpu  = sysconf (_SC_CPU_VERSION);
+
+		    switch (cpu)
+			{
+			case CPU_PA_RISC1_0: puts ("hppa1.0"); break;
+			case CPU_PA_RISC1_1: puts ("hppa1.1"); break;
+			case CPU_PA_RISC2_0:
+		#if defined(_SC_KERNEL_BITS)
+			    switch (bits)
+				{
+				case 64: puts ("hppa2.0w"); break;
+				case 32: puts ("hppa2.0n"); break;
+				default: puts ("hppa2.0"); break;
+				} break;
+		#else  /* !defined(_SC_KERNEL_BITS) */
+			    puts ("hppa2.0"); break;
+		#endif
+			default: puts ("hppa1.0"); break;
+			}
+		    exit (0);
+		}
 EOF
 		    (CCOPTS= $CC_FOR_BUILD -o $dummy $dummy.c 2>/dev/null) && HP_ARCH=`$dummy`
 		    test -z "$HP_ARCH" && HP_ARCH=hppa
@@ -731,22 +732,22 @@
 	exit ;;
     C1*:ConvexOS:*:* | convex:ConvexOS:C1*:*)
 	echo c1-convex-bsd
-        exit ;;
+	exit ;;
     C2*:ConvexOS:*:* | convex:ConvexOS:C2*:*)
 	if getsysinfo -f scalar_acc
 	then echo c32-convex-bsd
 	else echo c2-convex-bsd
 	fi
-        exit ;;
+	exit ;;
     C34*:ConvexOS:*:* | convex:ConvexOS:C34*:*)
 	echo c34-convex-bsd
-        exit ;;
+	exit ;;
     C38*:ConvexOS:*:* | convex:ConvexOS:C38*:*)
 	echo c38-convex-bsd
-        exit ;;
+	exit ;;
     C4*:ConvexOS:*:* | convex:ConvexOS:C4*:*)
 	echo c4-convex-bsd
-        exit ;;
+	exit ;;
     CRAY*Y-MP:*:*:*)
 	echo ymp-cray-unicos${UNAME_RELEASE} | sed -e 's/\.[^.]*$/.X/'
 	exit ;;
@@ -770,14 +771,14 @@
 	exit ;;
     F30[01]:UNIX_System_V:*:* | F700:UNIX_System_V:*:*)
 	FUJITSU_PROC=`uname -m | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz'`
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
-        echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
-        exit ;;
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | sed -e 's/ /_/'`
+	echo "${FUJITSU_PROC}-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	exit ;;
     5000:UNIX_System_V:4.*:*)
-        FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
-        FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
-        echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
+	FUJITSU_SYS=`uname -p | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/\///'`
+	FUJITSU_REL=`echo ${UNAME_RELEASE} | tr 'ABCDEFGHIJKLMNOPQRSTUVWXYZ' 'abcdefghijklmnopqrstuvwxyz' | sed -e 's/ /_/'`
+	echo "sparc-fujitsu-${FUJITSU_SYS}${FUJITSU_REL}"
 	exit ;;
     i*86:BSD/386:*:* | i*86:BSD/OS:*:* | *:Ascend\ Embedded/OS:*:*)
 	echo ${UNAME_MACHINE}-pc-bsdi${UNAME_RELEASE}
@@ -789,13 +790,12 @@
 	echo ${UNAME_MACHINE}-unknown-bsdi${UNAME_RELEASE}
 	exit ;;
     *:FreeBSD:*:*)
-	case ${UNAME_MACHINE} in
-	    pc98)
-		echo i386-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+	UNAME_PROCESSOR=`/usr/bin/uname -p`
+	case ${UNAME_PROCESSOR} in
 	    amd64)
 		echo x86_64-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	    *)
-		echo ${UNAME_MACHINE}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
+		echo ${UNAME_PROCESSOR}-unknown-freebsd`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'` ;;
 	esac
 	exit ;;
     i*:CYGWIN*:*)
@@ -804,15 +804,18 @@
     *:MINGW*:*)
 	echo ${UNAME_MACHINE}-pc-mingw32
 	exit ;;
+    i*:MSYS*:*)
+	echo ${UNAME_MACHINE}-pc-msys
+	exit ;;
     i*:windows32*:*)
-    	# uname -m includes "-pc" on this system.
-    	echo ${UNAME_MACHINE}-mingw32
+	# uname -m includes "-pc" on this system.
+	echo ${UNAME_MACHINE}-mingw32
 	exit ;;
     i*:PW*:*)
 	echo ${UNAME_MACHINE}-pc-pw32
 	exit ;;
     *:Interix*:*)
-    	case ${UNAME_MACHINE} in
+	case ${UNAME_MACHINE} in
 	    x86)
 		echo i586-pc-interix${UNAME_RELEASE}
 		exit ;;
@@ -858,6 +861,13 @@
     i*86:Minix:*:*)
 	echo ${UNAME_MACHINE}-pc-minix
 	exit ;;
+    aarch64:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    aarch64_be:Linux:*:*)
+	UNAME_MACHINE=aarch64_be
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     alpha:Linux:*:*)
 	case `sed -n '/^cpu model/s/^.*: \(.*\)/\1/p' < /proc/cpuinfo` in
 	  EV5)   UNAME_MACHINE=alphaev5 ;;
@@ -867,7 +877,7 @@
 	  EV6)   UNAME_MACHINE=alphaev6 ;;
 	  EV67)  UNAME_MACHINE=alphaev67 ;;
 	  EV68*) UNAME_MACHINE=alphaev68 ;;
-        esac
+	esac
 	objdump --private-headers /bin/sh | grep -q ld.so.1
 	if test "$?" = 0 ; then LIBC="libc1" ; else LIBC="" ; fi
 	echo ${UNAME_MACHINE}-unknown-linux-gnu${LIBC}
@@ -879,20 +889,29 @@
 	then
 	    echo ${UNAME_MACHINE}-unknown-linux-gnu
 	else
-	    echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    if echo __ARM_PCS_VFP | $CC_FOR_BUILD -E - 2>/dev/null \
+		| grep -q __ARM_PCS_VFP
+	    then
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabi
+	    else
+		echo ${UNAME_MACHINE}-unknown-linux-gnueabihf
+	    fi
 	fi
 	exit ;;
     avr32*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     cris:Linux:*:*)
-	echo cris-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     crisv32:Linux:*:*)
-	echo crisv32-axis-linux-gnu
+	echo ${UNAME_MACHINE}-axis-linux-gnu
 	exit ;;
     frv:Linux:*:*)
-    	echo frv-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
+    hexagon:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:Linux:*:*)
 	LIBC=gnu
@@ -934,7 +953,7 @@
 	test x"${CPU}" != x && { echo "${CPU}-unknown-linux-gnu"; exit; }
 	;;
     or32:Linux:*:*)
-	echo or32-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     padre:Linux:*:*)
 	echo sparc-unknown-linux-gnu
@@ -960,7 +979,7 @@
 	echo ${UNAME_MACHINE}-ibm-linux
 	exit ;;
     sh64*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     sh*:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
@@ -968,14 +987,17 @@
     sparc:Linux:*:* | sparc64:Linux:*:*)
 	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
+    tile*:Linux:*:*)
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	exit ;;
     vax:Linux:*:*)
 	echo ${UNAME_MACHINE}-dec-linux-gnu
 	exit ;;
     x86_64:Linux:*:*)
-	echo x86_64-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     xtensa*:Linux:*:*)
-    	echo ${UNAME_MACHINE}-unknown-linux-gnu
+	echo ${UNAME_MACHINE}-unknown-linux-gnu
 	exit ;;
     i*86:DYNIX/ptx:4*:*)
 	# ptx 4.0 does uname -s correctly, with DYNIX/ptx in there.
@@ -984,11 +1006,11 @@
 	echo i386-sequent-sysv4
 	exit ;;
     i*86:UNIX_SV:4.2MP:2.*)
-        # Unixware is an offshoot of SVR4, but it has its own version
-        # number series starting with 2...
-        # I am not positive that other SVR4 systems won't match this,
+	# Unixware is an offshoot of SVR4, but it has its own version
+	# number series starting with 2...
+	# I am not positive that other SVR4 systems won't match this,
 	# I just have to hope.  -- rms.
-        # Use sysv4.2uw... so that sysv4* matches it.
+	# Use sysv4.2uw... so that sysv4* matches it.
 	echo ${UNAME_MACHINE}-pc-sysv4.2uw${UNAME_VERSION}
 	exit ;;
     i*86:OS/2:*:*)
@@ -1020,7 +1042,7 @@
 	fi
 	exit ;;
     i*86:*:5:[678]*)
-    	# UnixWare 7.x, OpenUNIX and OpenServer 6.
+	# UnixWare 7.x, OpenUNIX and OpenServer 6.
 	case `/bin/uname -X | grep "^Machine"` in
 	    *486*)	     UNAME_MACHINE=i486 ;;
 	    *Pentium)	     UNAME_MACHINE=i586 ;;
@@ -1048,13 +1070,13 @@
 	exit ;;
     pc:*:*:*)
 	# Left here for compatibility:
-        # uname -m prints for DJGPP always 'pc', but it prints nothing about
-        # the processor, so we play safe by assuming i586.
+	# uname -m prints for DJGPP always 'pc', but it prints nothing about
+	# the processor, so we play safe by assuming i586.
 	# Note: whatever this is, it MUST be the same as what config.sub
 	# prints for the "djgpp" host, or else GDB configury will decide that
 	# this is a cross-build.
 	echo i586-pc-msdosdjgpp
-        exit ;;
+	exit ;;
     Intel:Mach:3*:*)
 	echo i386-pc-mach3
 	exit ;;
@@ -1089,8 +1111,8 @@
 	/bin/uname -p 2>/dev/null | /bin/grep entium >/dev/null \
 	  && { echo i586-ncr-sysv4.3${OS_REL}; exit; } ;;
     3[34]??:*:4.0:* | 3[34]??,*:*:4.0:*)
-        /bin/uname -p 2>/dev/null | grep 86 >/dev/null \
-          && { echo i486-ncr-sysv4; exit; } ;;
+	/bin/uname -p 2>/dev/null | grep 86 >/dev/null \
+	  && { echo i486-ncr-sysv4; exit; } ;;
     NCR*:*:4.2:* | MPRAS*:*:4.2:*)
 	OS_REL='.3'
 	test -r /etc/.relid \
@@ -1133,10 +1155,10 @@
 		echo ns32k-sni-sysv
 	fi
 	exit ;;
-    PENTIUM:*:4.0*:*) # Unisys `ClearPath HMP IX 4000' SVR4/MP effort
-                      # says <Richard.M.Bartel@ccMail.Census.GOV>
-        echo i586-unisys-sysv4
-        exit ;;
+    PENTIUM:*:4.0*:*)	# Unisys `ClearPath HMP IX 4000' SVR4/MP effort
+			# says <Richard.M.Bartel@ccMail.Census.GOV>
+	echo i586-unisys-sysv4
+	exit ;;
     *:UNIX_System_V:4*:FTX*)
 	# From Gerald Hewes <hewes@openmarket.com>.
 	# How about differentiating between stratus architectures? -djm
@@ -1162,11 +1184,11 @@
 	exit ;;
     R[34]000:*System_V*:*:* | R4000:UNIX_SYSV:*:* | R*000:UNIX_SV:*:*)
 	if [ -d /usr/nec ]; then
-	        echo mips-nec-sysv${UNAME_RELEASE}
+		echo mips-nec-sysv${UNAME_RELEASE}
 	else
-	        echo mips-unknown-sysv${UNAME_RELEASE}
+		echo mips-unknown-sysv${UNAME_RELEASE}
 	fi
-        exit ;;
+	exit ;;
     BeBox:BeOS:*:*)	# BeOS running on hardware made by Be, PPC only.
 	echo powerpc-be-beos
 	exit ;;
@@ -1231,6 +1253,9 @@
     *:QNX:*:4*)
 	echo i386-pc-qnx
 	exit ;;
+    NEO-?:NONSTOP_KERNEL:*:*)
+	echo neo-tandem-nsk${UNAME_RELEASE}
+	exit ;;
     NSE-?:NONSTOP_KERNEL:*:*)
 	echo nse-tandem-nsk${UNAME_RELEASE}
 	exit ;;
@@ -1276,13 +1301,13 @@
 	echo pdp10-unknown-its
 	exit ;;
     SEI:*:*:SEIUX)
-        echo mips-sei-seiux${UNAME_RELEASE}
+	echo mips-sei-seiux${UNAME_RELEASE}
 	exit ;;
     *:DragonFly:*:*)
 	echo ${UNAME_MACHINE}-unknown-dragonfly`echo ${UNAME_RELEASE}|sed -e 's/[-(].*//'`
 	exit ;;
     *:*VMS:*:*)
-    	UNAME_MACHINE=`(uname -p) 2>/dev/null`
+	UNAME_MACHINE=`(uname -p) 2>/dev/null`
 	case "${UNAME_MACHINE}" in
 	    A*) echo alpha-dec-vms ; exit ;;
 	    I*) echo ia64-dec-vms ; exit ;;
@@ -1300,6 +1325,9 @@
     i*86:AROS:*:*)
 	echo ${UNAME_MACHINE}-pc-aros
 	exit ;;
+    x86_64:VMkernel:*:*)
+	echo ${UNAME_MACHINE}-unknown-esx
+	exit ;;
 esac
 
 #echo '(No uname command or uname output not recognized.)' 1>&2
@@ -1322,11 +1350,11 @@
 #include <sys/param.h>
   printf ("m68k-sony-newsos%s\n",
 #ifdef NEWSOS4
-          "4"
+	"4"
 #else
-	  ""
+	""
 #endif
-         ); exit (0);
+	); exit (0);
 #endif
 #endif
 
diff -Nru filezilla-3.5.3/config/config.sub filezilla-3.7.3~precise/config/config.sub
--- filezilla-3.5.3/config/config.sub	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/config/config.sub	2013-08-07 19:17:13.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Configuration validation subroutine script.
 #   Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999,
-#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010
-#   Free Software Foundation, Inc.
+#   2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010,
+#   2011, 2012 Free Software Foundation, Inc.
 
-timestamp='2010-01-22'
+timestamp='2012-04-18'
 
 # This file is (in principle) common to ALL GNU software.
 # The presence of a machine in this file suggests that SOME GNU software
@@ -21,9 +21,7 @@
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
-# 02110-1301, USA.
+# along with this program; if not, see <http://www.gnu.org/licenses/>.
 #
 # As a special exception to the GNU General Public License, if you
 # distribute this file as part of a program that contains a
@@ -76,8 +74,8 @@
 GNU config.sub ($timestamp)
 
 Copyright (C) 1992, 1993, 1994, 1995, 1996, 1997, 1998, 1999, 2000,
-2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free
-Software Foundation, Inc.
+2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011, 2012
+Free Software Foundation, Inc.
 
 This is free software; see the source for copying conditions.  There is NO
 warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE."
@@ -124,13 +122,18 @@
 # Here we must recognize all the valid KERNEL-OS combinations.
 maybe_os=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\2/'`
 case $maybe_os in
-  nto-qnx* | linux-gnu* | linux-dietlibc | linux-newlib* | linux-uclibc* | \
-  uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | knetbsd*-gnu* | netbsd*-gnu* | \
+  nto-qnx* | linux-gnu* | linux-android* | linux-dietlibc | linux-newlib* | \
+  linux-uclibc* | uclinux-uclibc* | uclinux-gnu* | kfreebsd*-gnu* | \
+  knetbsd*-gnu* | netbsd*-gnu* | \
   kopensolaris*-gnu* | \
   storm-chaos* | os2-emx* | rtmk-nova*)
     os=-$maybe_os
     basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`
     ;;
+  android-linux)
+    os=-linux-android
+    basic_machine=`echo $1 | sed 's/^\(.*\)-\([^-]*-[^-]*\)$/\1/'`-unknown
+    ;;
   *)
     basic_machine=`echo $1 | sed 's/-[^-]*$//'`
     if [ $basic_machine != $1 ]
@@ -157,8 +160,8 @@
 		os=
 		basic_machine=$1
 		;;
-        -bluegene*)
-	        os=-cnk
+	-bluegene*)
+		os=-cnk
 		;;
 	-sim | -cisco | -oki | -wec | -winbond)
 		os=
@@ -174,10 +177,10 @@
 		os=-chorusos
 		basic_machine=$1
 		;;
- 	-chorusrdb)
- 		os=-chorusrdb
+	-chorusrdb)
+		os=-chorusrdb
 		basic_machine=$1
- 		;;
+		;;
 	-hiux*)
 		os=-hiuxwe2
 		;;
@@ -222,6 +225,12 @@
 	-isc*)
 		basic_machine=`echo $1 | sed -e 's/86-.*/86-pc/'`
 		;;
+	-lynx*178)
+		os=-lynxos178
+		;;
+	-lynx*5)
+		os=-lynxos5
+		;;
 	-lynx*)
 		os=-lynxos
 		;;
@@ -246,17 +255,22 @@
 	# Some are omitted here because they have special meanings below.
 	1750a | 580 \
 	| a29k \
+	| aarch64 | aarch64_be \
 	| alpha | alphaev[4-8] | alphaev56 | alphaev6[78] | alphapca5[67] \
 	| alpha64 | alpha64ev[4-8] | alpha64ev56 | alpha64ev6[78] | alpha64pca5[67] \
 	| am33_2.0 \
 	| arc | arm | arm[bl]e | arme[lb] | armv[2345] | armv[345][lb] | avr | avr32 \
+        | be32 | be64 \
 	| bfin \
 	| c4x | clipper \
 	| d10v | d30v | dlx | dsp16xx \
+	| epiphany \
 	| fido | fr30 | frv \
 	| h8300 | h8500 | hppa | hppa1.[01] | hppa2.0 | hppa2.0[nw] | hppa64 \
+	| hexagon \
 	| i370 | i860 | i960 | ia64 \
 	| ip2k | iq2000 \
+	| le32 | le64 \
 	| lm32 \
 	| m32c | m32r | m32rle | m68000 | m68k | m88k \
 	| maxq | mb | microblaze | mcore | mep | metag \
@@ -282,29 +296,39 @@
 	| moxie \
 	| mt \
 	| msp430 \
+	| nds32 | nds32le | nds32be \
 	| nios | nios2 \
 	| ns16k | ns32k \
+	| open8 \
 	| or32 \
 	| pdp10 | pdp11 | pj | pjl \
-	| powerpc | powerpc64 | powerpc64le | powerpcle | ppcbe \
+	| powerpc | powerpc64 | powerpc64le | powerpcle \
 	| pyramid \
-	| rx \
+	| rl78 | rx \
 	| score \
 	| sh | sh[1234] | sh[24]a | sh[24]aeb | sh[23]e | sh[34]eb | sheb | shbe | shle | sh[1234]le | sh3ele \
 	| sh64 | sh64le \
 	| sparc | sparc64 | sparc64b | sparc64v | sparc86x | sparclet | sparclite \
 	| sparcv8 | sparcv9 | sparcv9b | sparcv9v \
-	| spu | strongarm \
-	| tahoe | thumb | tic4x | tic80 | tron \
+	| spu \
+	| tahoe | tic4x | tic54x | tic55x | tic6x | tic80 | tron \
 	| ubicom32 \
-	| v850 | v850e \
+	| v850 | v850e | v850e1 | v850e2 | v850es | v850e2v3 \
 	| we32k \
-	| x86 | xc16x | xscale | xscalee[bl] | xstormy16 | xtensa \
+	| x86 | xc16x | xstormy16 | xtensa \
 	| z8k | z80)
 		basic_machine=$basic_machine-unknown
 		;;
-	m6811 | m68hc11 | m6812 | m68hc12 | picochip)
-		# Motorola 68HC11/12.
+	c54x)
+		basic_machine=tic54x-unknown
+		;;
+	c55x)
+		basic_machine=tic55x-unknown
+		;;
+	c6x)
+		basic_machine=tic6x-unknown
+		;;
+	m6811 | m68hc11 | m6812 | m68hc12 | m68hcs12x | picochip)
 		basic_machine=$basic_machine-unknown
 		os=-none
 		;;
@@ -314,6 +338,21 @@
 		basic_machine=mt-unknown
 		;;
 
+	strongarm | thumb | xscale)
+		basic_machine=arm-unknown
+		;;
+	xgate)
+		basic_machine=$basic_machine-unknown
+		os=-none
+		;;
+	xscaleeb)
+		basic_machine=armeb-unknown
+		;;
+
+	xscaleel)
+		basic_machine=armel-unknown
+		;;
+
 	# We use `pc' rather than `unknown'
 	# because (1) that's what they normally are, and
 	# (2) the word "unknown" tends to confuse beginning users.
@@ -328,21 +367,25 @@
 	# Recognize the basic CPU types with company name.
 	580-* \
 	| a29k-* \
+	| aarch64-* | aarch64_be-* \
 	| alpha-* | alphaev[4-8]-* | alphaev56-* | alphaev6[78]-* \
 	| alpha64-* | alpha64ev[4-8]-* | alpha64ev56-* | alpha64ev6[78]-* \
 	| alphapca5[67]-* | alpha64pca5[67]-* | arc-* \
 	| arm-*  | armbe-* | armle-* | armeb-* | armv*-* \
 	| avr-* | avr32-* \
+	| be32-* | be64-* \
 	| bfin-* | bs2000-* \
-	| c[123]* | c30-* | [cjt]90-* | c4x-* | c54x-* | c55x-* | c6x-* \
+	| c[123]* | c30-* | [cjt]90-* | c4x-* \
 	| clipper-* | craynv-* | cydra-* \
 	| d10v-* | d30v-* | dlx-* \
 	| elxsi-* \
 	| f30[01]-* | f700-* | fido-* | fr30-* | frv-* | fx80-* \
 	| h8300-* | h8500-* \
 	| hppa-* | hppa1.[01]-* | hppa2.0-* | hppa2.0[nw]-* | hppa64-* \
+	| hexagon-* \
 	| i*86-* | i860-* | i960-* | ia64-* \
 	| ip2k-* | iq2000-* \
+	| le32-* | le64-* \
 	| lm32-* \
 	| m32c-* | m32r-* | m32rle-* \
 	| m68000-* | m680[012346]0-* | m68360-* | m683?2-* | m68k-* \
@@ -368,26 +411,29 @@
 	| mmix-* \
 	| mt-* \
 	| msp430-* \
+	| nds32-* | nds32le-* | nds32be-* \
 	| nios-* | nios2-* \
 	| none-* | np1-* | ns16k-* | ns32k-* \
+	| open8-* \
 	| orion-* \
 	| pdp10-* | pdp11-* | pj-* | pjl-* | pn-* | power-* \
-	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* | ppcbe-* \
+	| powerpc-* | powerpc64-* | powerpc64le-* | powerpcle-* \
 	| pyramid-* \
-	| romp-* | rs6000-* | rx-* \
+	| rl78-* | romp-* | rs6000-* | rx-* \
 	| sh-* | sh[1234]-* | sh[24]a-* | sh[24]aeb-* | sh[23]e-* | sh[34]eb-* | sheb-* | shbe-* \
 	| shle-* | sh[1234]le-* | sh3ele-* | sh64-* | sh64le-* \
 	| sparc-* | sparc64-* | sparc64b-* | sparc64v-* | sparc86x-* | sparclet-* \
 	| sparclite-* \
-	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | strongarm-* | sv1-* | sx?-* \
-	| tahoe-* | thumb-* \
+	| sparcv8-* | sparcv9-* | sparcv9b-* | sparcv9v-* | sv1-* | sx?-* \
+	| tahoe-* \
 	| tic30-* | tic4x-* | tic54x-* | tic55x-* | tic6x-* | tic80-* \
-	| tile-* | tilegx-* \
+	| tile*-* \
 	| tron-* \
 	| ubicom32-* \
-	| v850-* | v850e-* | vax-* \
+	| v850-* | v850e-* | v850e1-* | v850es-* | v850e2-* | v850e2v3-* \
+	| vax-* \
 	| we32k-* \
-	| x86-* | x86_64-* | xc16x-* | xps100-* | xscale-* | xscalee[bl]-* \
+	| x86-* | x86_64-* | xc16x-* | xps100-* \
 	| xstormy16-* | xtensa*-* \
 	| ymp-* \
 	| z8k-* | z80-*)
@@ -412,7 +458,7 @@
 		basic_machine=a29k-amd
 		os=-udi
 		;;
-    	abacus)
+	abacus)
 		basic_machine=abacus-unknown
 		;;
 	adobe68k)
@@ -482,11 +528,20 @@
 		basic_machine=powerpc-ibm
 		os=-cnk
 		;;
+	c54x-*)
+		basic_machine=tic54x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c55x-*)
+		basic_machine=tic55x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
+	c6x-*)
+		basic_machine=tic6x-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	c90)
 		basic_machine=c90-cray
 		os=-unicos
 		;;
-        cegcc)
+	cegcc)
 		basic_machine=arm-unknown
 		os=-cegcc
 		;;
@@ -518,7 +573,7 @@
 		basic_machine=craynv-cray
 		os=-unicosmp
 		;;
-	cr16)
+	cr16 | cr16-*)
 		basic_machine=cr16-unknown
 		os=-elf
 		;;
@@ -676,7 +731,6 @@
 	i370-ibm* | ibm*)
 		basic_machine=i370-ibm
 		;;
-# I'm not sure what "Sysv32" means.  Should this be sysv3.2?
 	i*86v32)
 		basic_machine=`echo $1 | sed -e 's/86.*/86-pc/'`
 		os=-sysv32
@@ -734,7 +788,7 @@
 		basic_machine=ns32k-utek
 		os=-sysv
 		;;
-        microblaze)
+	microblaze)
 		basic_machine=microblaze-xilinx
 		;;
 	mingw32)
@@ -773,10 +827,18 @@
 	ms1-*)
 		basic_machine=`echo $basic_machine | sed -e 's/ms1-/mt-/'`
 		;;
+	msys)
+		basic_machine=i386-pc
+		os=-msys
+		;;
 	mvs)
 		basic_machine=i370-ibm
 		os=-mvs
 		;;
+	nacl)
+		basic_machine=le32-unknown
+		os=-nacl
+		;;
 	ncr3000)
 		basic_machine=i486-ncr
 		os=-sysv4
@@ -841,6 +903,12 @@
 	np1)
 		basic_machine=np1-gould
 		;;
+	neo-tandem)
+		basic_machine=neo-tandem
+		;;
+	nse-tandem)
+		basic_machine=nse-tandem
+		;;
 	nsr-tandem)
 		basic_machine=nsr-tandem
 		;;
@@ -923,9 +991,10 @@
 		;;
 	power)	basic_machine=power-ibm
 		;;
-	ppc)	basic_machine=powerpc-unknown
+	ppc | ppcbe)	basic_machine=powerpc-unknown
 		;;
-	ppc-*)	basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
+	ppc-* | ppcbe-*)
+		basic_machine=powerpc-`echo $basic_machine | sed 's/^[^-]*-//'`
 		;;
 	ppcle | powerpclittle | ppc-le | powerpc-little)
 		basic_machine=powerpcle-unknown
@@ -1019,6 +1088,9 @@
 		basic_machine=i860-stratus
 		os=-sysv4
 		;;
+	strongarm-* | thumb-*)
+		basic_machine=arm-`echo $basic_machine | sed 's/^[^-]*-//'`
+		;;
 	sun2)
 		basic_machine=m68000-sun
 		;;
@@ -1075,25 +1147,8 @@
 		basic_machine=t90-cray
 		os=-unicos
 		;;
-	tic54x | c54x*)
-		basic_machine=tic54x-unknown
-		os=-coff
-		;;
-	tic55x | c55x*)
-		basic_machine=tic55x-unknown
-		os=-coff
-		;;
-	tic6x | c6x*)
-		basic_machine=tic6x-unknown
-		os=-coff
-		;;
-        # This must be matched before tile*.
-        tilegx*)
-		basic_machine=tilegx-unknown
-		os=-linux-gnu
-		;;
 	tile*)
-		basic_machine=tile-unknown
+		basic_machine=$basic_machine-unknown
 		os=-linux-gnu
 		;;
 	tx39)
@@ -1163,6 +1218,9 @@
 	xps | xps100)
 		basic_machine=xps100-honeywell
 		;;
+	xscale-* | xscalee[bl]-*)
+		basic_machine=`echo $basic_machine | sed 's/^xscale/arm/'`
+		;;
 	ymp)
 		basic_machine=ymp-cray
 		os=-unicos
@@ -1260,11 +1318,11 @@
 if [ x"$os" != x"" ]
 then
 case $os in
-        # First match some system type aliases
-        # that might get confused with valid system types.
+	# First match some system type aliases
+	# that might get confused with valid system types.
 	# -solaris* is a basic system type, with this one exception.
-        -auroraux)
-	        os=-auroraux
+	-auroraux)
+		os=-auroraux
 		;;
 	-solaris1 | -solaris1.*)
 		os=`echo $os | sed -e 's|solaris1|sunos4|'`
@@ -1300,8 +1358,9 @@
 	      | -ptx* | -coff* | -ecoff* | -winnt* | -domain* | -vsta* \
 	      | -udi* | -eabi* | -lites* | -ieee* | -go32* | -aux* \
 	      | -chorusos* | -chorusrdb* | -cegcc* \
-	      | -cygwin* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
-	      | -mingw32* | -linux-gnu* | -linux-newlib* | -linux-uclibc* \
+	      | -cygwin* | -msys* | -pe* | -psos* | -moss* | -proelf* | -rtems* \
+	      | -mingw32* | -linux-gnu* | -linux-android* \
+	      | -linux-newlib* | -linux-uclibc* \
 	      | -uxpv* | -beos* | -mpeix* | -udk* \
 	      | -interix* | -uwin* | -mks* | -rhapsody* | -darwin* | -opened* \
 	      | -openstep* | -oskit* | -conix* | -pw32* | -nonstopux* \
@@ -1348,7 +1407,7 @@
 	-opened*)
 		os=-openedition
 		;;
-        -os400*)
+	-os400*)
 		os=-os400
 		;;
 	-wince*)
@@ -1397,7 +1456,7 @@
 	-sinix*)
 		os=-sysv4
 		;;
-        -tpf*)
+	-tpf*)
 		os=-tpf
 		;;
 	-triton*)
@@ -1442,8 +1501,8 @@
 	-dicos*)
 		os=-dicos
 		;;
-        -nacl*)
-	        ;;
+	-nacl*)
+		;;
 	-none)
 		;;
 	*)
@@ -1466,10 +1525,10 @@
 # system, and we'll never get to this point.
 
 case $basic_machine in
-        score-*)
+	score-*)
 		os=-elf
 		;;
-        spu-*)
+	spu-*)
 		os=-elf
 		;;
 	*-acorn)
@@ -1481,8 +1540,20 @@
 	arm*-semi)
 		os=-aout
 		;;
-        c4x-* | tic4x-*)
-        	os=-coff
+	c4x-* | tic4x-*)
+		os=-coff
+		;;
+	hexagon-*)
+		os=-elf
+		;;
+	tic54x-*)
+		os=-coff
+		;;
+	tic55x-*)
+		os=-coff
+		;;
+	tic6x-*)
+		os=-coff
 		;;
 	# This must come before the *-dec entry.
 	pdp10-*)
@@ -1502,14 +1573,11 @@
 		;;
 	m68000-sun)
 		os=-sunos3
-		# This also exists in the configure program, but was not the
-		# default.
-		# os=-sunos4
 		;;
 	m68*-cisco)
 		os=-aout
 		;;
-        mep-*)
+	mep-*)
 		os=-elf
 		;;
 	mips*-cisco)
@@ -1536,7 +1604,7 @@
 	*-ibm)
 		os=-aix
 		;;
-    	*-knuth)
+	*-knuth)
 		os=-mmixware
 		;;
 	*-wec)
diff -Nru filezilla-3.5.3/config/depcomp filezilla-3.7.3~precise/config/depcomp
--- filezilla-3.5.3/config/depcomp	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/config/depcomp	2013-08-07 19:17:13.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # depcomp - compile a program generating dependencies as side-effects
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-03-27.16; # UTC
 
-# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009 Free
-# Software Foundation, Inc.
+# Copyright (C) 1999, 2000, 2003, 2004, 2005, 2006, 2007, 2009, 2010,
+# 2011, 2012 Free Software Foundation, Inc.
 
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -28,7 +28,7 @@
 
 case $1 in
   '')
-     echo "$0: No command.  Try \`$0 --help' for more information." 1>&2
+     echo "$0: No command.  Try '$0 --help' for more information." 1>&2
      exit 1;
      ;;
   -h | --h*)
@@ -40,11 +40,11 @@
 
 Environment variables:
   depmode     Dependency tracking mode.
-  source      Source file read by `PROGRAMS ARGS'.
-  object      Object file output by `PROGRAMS ARGS'.
+  source      Source file read by 'PROGRAMS ARGS'.
+  object      Object file output by 'PROGRAMS ARGS'.
   DEPDIR      directory where to store dependencies.
   depfile     Dependency file to output.
-  tmpdepfile  Temporary file to use when outputing dependencies.
+  tmpdepfile  Temporary file to use when outputting dependencies.
   libtool     Whether libtool is used (yes/no).
 
 Report bugs to <bug-automake@gnu.org>.
@@ -57,6 +57,12 @@
     ;;
 esac
 
+# A tabulation character.
+tab='	'
+# A newline character.
+nl='
+'
+
 if test -z "$depmode" || test -z "$source" || test -z "$object"; then
   echo "depcomp: Variables source, object and depmode must be set" 1>&2
   exit 1
@@ -90,10 +96,24 @@
    # This is just like msvisualcpp but w/o cygpath translation.
    # Just convert the backslash-escaped backslashes to single forward
    # slashes to satisfy depend.m4
-   cygpath_u="sed s,\\\\\\\\,/,g"
+   cygpath_u='sed s,\\\\,/,g'
    depmode=msvisualcpp
 fi
 
+if test "$depmode" = msvc7msys; then
+   # This is just like msvc7 but w/o cygpath translation.
+   # Just convert the backslash-escaped backslashes to single forward
+   # slashes to satisfy depend.m4
+   cygpath_u='sed s,\\\\,/,g'
+   depmode=msvc7
+fi
+
+if test "$depmode" = xlc; then
+   # IBM C/C++ Compilers xlc/xlC can output gcc-like dependency informations.
+   gccflag=-qmakedep=gcc,-MF
+   depmode=gcc
+fi
+
 case "$depmode" in
 gcc3)
 ## gcc 3 implements dependency tracking that does exactly what
@@ -148,20 +168,21 @@
 ## The second -e expression handles DOS-style file names with drive letters.
   sed -e 's/^[^:]*: / /' \
       -e 's/^['$alpha']:\/[^:]*: / /' < "$tmpdepfile" >> "$depfile"
-## This next piece of magic avoids the `deleted header file' problem.
+## This next piece of magic avoids the "deleted header file" problem.
 ## The problem is that when a header file which appears in a .P file
 ## is deleted, the dependency causes make to die (because there is
 ## typically no way to rebuild the header).  We avoid this by adding
 ## dummy dependencies for each header file.  Too bad gcc doesn't do
 ## this for us directly.
-  tr ' ' '
-' < "$tmpdepfile" |
-## Some versions of gcc put a space before the `:'.  On the theory
+  tr ' ' "$nl" < "$tmpdepfile" |
+## Some versions of gcc put a space before the ':'.  On the theory
 ## that the space means something, we add a space to the output as
-## well.
+## well.  hp depmode also adds that space, but also prefixes the VPATH
+## to the object.  Take care to not repeat it in the output.
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
-    sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
+    sed -e 's/^\\$//' -e '/^$/d' -e "s|.*$object$||" -e '/:$/d' \
+      | sed -e 's/$/ :/' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -193,18 +214,15 @@
     # clever and replace this with sed code, as IRIX sed won't handle
     # lines with more than a fixed number of characters (4096 in
     # IRIX 6.2 sed, 8192 in IRIX 6.5).  We also remove comment lines;
-    # the IRIX cc adds comments like `#:fec' to the end of the
+    # the IRIX cc adds comments like '#:fec' to the end of the
     # dependency line.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
     | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' | \
-    tr '
-' ' ' >> "$depfile"
+    tr "$nl" ' ' >> "$depfile"
     echo >> "$depfile"
 
     # The second pass generates a dummy entry for each header file.
-    tr ' ' '
-' < "$tmpdepfile" \
+    tr ' ' "$nl" < "$tmpdepfile" \
    | sed -e 's/^.*\.o://' -e 's/#.*$//' -e '/^$/ d' -e 's/$/:/' \
    >> "$depfile"
   else
@@ -216,10 +234,17 @@
   rm -f "$tmpdepfile"
   ;;
 
+xlc)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 aix)
   # The C for AIX Compiler uses -M and outputs the dependencies
   # in a .u file.  In older versions, this file always lives in the
-  # current directory.  Also, the AIX compiler puts `$object:' at the
+  # current directory.  Also, the AIX compiler puts '$object:' at the
   # start of each line; $object doesn't have directory information.
   # Version 6 uses the directory in both cases.
   dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
@@ -249,12 +274,11 @@
     test -f "$tmpdepfile" && break
   done
   if test -f "$tmpdepfile"; then
-    # Each line is of the form `foo.o: dependent.h'.
+    # Each line is of the form 'foo.o: dependent.h'.
     # Do two passes, one to just change these to
-    # `$object: dependent.h' and one to simply `dependent.h:'.
+    # '$object: dependent.h' and one to simply 'dependent.h:'.
     sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-    # That's a tab and a space in the [].
-    sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+    sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
   else
     # The sourcefile does not contain any dependencies, so just
     # store a dummy comment line, to avoid errors with the Makefile
@@ -265,23 +289,26 @@
   ;;
 
 icc)
-  # Intel's C compiler understands `-MD -MF file'.  However on
-  #    icc -MD -MF foo.d -c -o sub/foo.o sub/foo.c
+  # Intel's C compiler anf tcc (Tiny C Compiler) understand '-MD -MF file'.
+  # However on
+  #    $CC -MD -MF foo.d -c -o sub/foo.o sub/foo.c
   # ICC 7.0 will fill foo.d with something like
   #    foo.o: sub/foo.c
   #    foo.o: sub/foo.h
-  # which is wrong.  We want:
+  # which is wrong.  We want
   #    sub/foo.o: sub/foo.c
   #    sub/foo.o: sub/foo.h
   #    sub/foo.c:
   #    sub/foo.h:
   # ICC 7.1 will output
   #    foo.o: sub/foo.c sub/foo.h
-  # and will wrap long lines using \ :
+  # and will wrap long lines using '\':
   #    foo.o: sub/foo.c ... \
   #     sub/foo.h ... \
   #     ...
-
+  # tcc 0.9.26 (FIXME still under development at the moment of writing)
+  # will emit a similar output, but also prepend the continuation lines
+  # with horizontal tabulation characters.
   "$@" -MD -MF "$tmpdepfile"
   stat=$?
   if test $stat -eq 0; then :
@@ -290,15 +317,21 @@
     exit $stat
   fi
   rm -f "$depfile"
-  # Each line is of the form `foo.o: dependent.h',
-  # or `foo.o: dep1.h dep2.h \', or ` dep3.h dep4.h \'.
+  # Each line is of the form 'foo.o: dependent.h',
+  # or 'foo.o: dep1.h dep2.h \', or ' dep3.h dep4.h \'.
   # Do two passes, one to just change these to
-  # `$object: dependent.h' and one to simply `dependent.h:'.
-  sed "s,^[^:]*:,$object :," < "$tmpdepfile" > "$depfile"
-  # Some versions of the HPUX 10.20 sed can't process this invocation
-  # correctly.  Breaking it into two sed invocations is a workaround.
-  sed 's,^[^:]*: \(.*\)$,\1,;s/^\\$//;/^$/d;/:$/d' < "$tmpdepfile" |
-    sed -e 's/$/ :/' >> "$depfile"
+  # '$object: dependent.h' and one to simply 'dependent.h:'.
+  sed -e "s/^[ $tab][ $tab]*/  /" -e "s,^[^:]*:,$object :," \
+    < "$tmpdepfile" > "$depfile"
+  sed '
+    s/[ '"$tab"'][ '"$tab"']*/ /g
+    s/^ *//
+    s/ *\\*$//
+    s/^[^:]*: *//
+    /^$/d
+    /:$/d
+    s/$/ :/
+  ' < "$tmpdepfile" >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
 
@@ -334,7 +367,7 @@
   done
   if test -f "$tmpdepfile"; then
     sed -e "s,^.*\.[a-z]*:,$object:," "$tmpdepfile" > "$depfile"
-    # Add `dependent.h:' lines.
+    # Add 'dependent.h:' lines.
     sed -ne '2,${
 	       s/^ *//
 	       s/ \\*$//
@@ -349,9 +382,9 @@
 
 tru64)
    # The Tru64 compiler uses -MD to generate dependencies as a side
-   # effect.  `cc -MD -o foo.o ...' puts the dependencies into `foo.o.d'.
+   # effect.  'cc -MD -o foo.o ...' puts the dependencies into 'foo.o.d'.
    # At least on Alpha/Redhat 6.1, Compaq CCC V6.2-504 seems to put
-   # dependencies in `foo.d' instead, so we check for that too.
+   # dependencies in 'foo.d' instead, so we check for that too.
    # Subdirectories are respected.
    dir=`echo "$object" | sed -e 's|/[^/]*$|/|'`
    test "x$dir" = "x$object" && dir=
@@ -397,14 +430,59 @@
    done
    if test -f "$tmpdepfile"; then
       sed -e "s,^.*\.[a-z]*:,$object:," < "$tmpdepfile" > "$depfile"
-      # That's a tab and a space in the [].
-      sed -e 's,^.*\.[a-z]*:[	 ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
+      sed -e 's,^.*\.[a-z]*:['"$tab"' ]*,,' -e 's,$,:,' < "$tmpdepfile" >> "$depfile"
    else
       echo "#dummy" > "$depfile"
    fi
    rm -f "$tmpdepfile"
    ;;
 
+msvc7)
+  if test "$libtool" = yes; then
+    showIncludes=-Wc,-showIncludes
+  else
+    showIncludes=-showIncludes
+  fi
+  "$@" $showIncludes > "$tmpdepfile"
+  stat=$?
+  grep -v '^Note: including file: ' "$tmpdepfile"
+  if test "$stat" = 0; then :
+  else
+    rm -f "$tmpdepfile"
+    exit $stat
+  fi
+  rm -f "$depfile"
+  echo "$object : \\" > "$depfile"
+  # The first sed program below extracts the file names and escapes
+  # backslashes for cygpath.  The second sed program outputs the file
+  # name when reading, but also accumulates all include files in the
+  # hold buffer in order to output them again at the end.  This only
+  # works with sed implementations that can handle large buffers.
+  sed < "$tmpdepfile" -n '
+/^Note: including file:  *\(.*\)/ {
+  s//\1/
+  s/\\/\\\\/g
+  p
+}' | $cygpath_u | sort -u | sed -n '
+s/ /\\ /g
+s/\(.*\)/'"$tab"'\1 \\/p
+s/.\(.*\) \\/\1:/
+H
+$ {
+  s/.*/'"$tab"'/
+  G
+  p
+}' >> "$depfile"
+  rm -f "$tmpdepfile"
+  ;;
+
+msvc7msys)
+  # This case exists only to let depend.m4 do its work.  It works by
+  # looking at the text of this script.  This case will never be run,
+  # since it is checked for above.
+  exit 1
+  ;;
+
 #nosideeffect)
   # This comment above is used by automake to tell side-effect
   # dependency tracking mechanisms from slower ones.
@@ -422,7 +500,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -442,15 +520,14 @@
   done
 
   test -z "$dashmflag" && dashmflag=-M
-  # Require at least two characters before searching for `:'
+  # Require at least two characters before searching for ':'
   # in the target name.  This is to cope with DOS-style filenames:
-  # a dependency such as `c:/foo/bar' could be seen as target `c' otherwise.
+  # a dependency such as 'c:/foo/bar' could be seen as target 'c' otherwise.
   "$@" $dashmflag |
-    sed 's:^[  ]*[^: ][^:][^:]*\:[    ]*:'"$object"'\: :' > "$tmpdepfile"
+    sed 's:^['"$tab"' ]*[^:'"$tab"' ][^:][^:]*\:['"$tab"' ]*:'"$object"'\: :' > "$tmpdepfile"
   rm -f "$depfile"
   cat < "$tmpdepfile" > "$depfile"
-  tr ' ' '
-' < "$tmpdepfile" | \
+  tr ' ' "$nl" < "$tmpdepfile" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -503,9 +580,10 @@
   touch "$tmpdepfile"
   ${MAKEDEPEND-makedepend} -o"$obj_suffix" -f"$tmpdepfile" "$@"
   rm -f "$depfile"
-  cat < "$tmpdepfile" > "$depfile"
-  sed '1,2d' "$tmpdepfile" | tr ' ' '
-' | \
+  # makedepend may prepend the VPATH from the source file name to the object.
+  # No need to regex-escape $object, excess matching of '.' is harmless.
+  sed "s|^.*\($object *:\)|\1|" "$tmpdepfile" > "$depfile"
+  sed '1,2d' "$tmpdepfile" | tr ' ' "$nl" | \
 ## Some versions of the HPUX 10.20 sed can't process this invocation
 ## correctly.  Breaking it into two sed invocations is a workaround.
     sed -e 's/^\\$//' -e '/^$/d' -e '/:$/d' | sed -e 's/$/ :/' >> "$depfile"
@@ -525,7 +603,7 @@
     shift
   fi
 
-  # Remove `-o $object'.
+  # Remove '-o $object'.
   IFS=" "
   for arg
   do
@@ -594,8 +672,8 @@
   sed -n '/^#line [0-9][0-9]* "\([^"]*\)"/ s::\1:p' | $cygpath_u | sort -u > "$tmpdepfile"
   rm -f "$depfile"
   echo "$object : \\" > "$depfile"
-  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::	\1 \\:p' >> "$depfile"
-  echo "	" >> "$depfile"
+  sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::'"$tab"'\1 \\:p' >> "$depfile"
+  echo "$tab" >> "$depfile"
   sed < "$tmpdepfile" -n -e 's% %\\ %g' -e '/^\(.*\)$/ s::\1\::p' >> "$depfile"
   rm -f "$tmpdepfile"
   ;;
diff -Nru filezilla-3.5.3/config/install-sh filezilla-3.7.3~precise/config/install-sh
--- filezilla-3.5.3/config/install-sh	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/config/install-sh	2013-08-07 19:17:13.000000000 +0000
@@ -1,7 +1,7 @@
 #!/bin/sh
 # install - install a program, script, or datafile
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2011-01-19.21; # UTC
 
 # This originates from X11R5 (mit/util/scripts/install.sh), which was
 # later released in X11R6 (xc/config/util/install.sh) with the
@@ -156,6 +156,10 @@
     -s) stripcmd=$stripprog;;
 
     -t) dst_arg=$2
+	# Protect names problematic for `test' and other utilities.
+	case $dst_arg in
+	  -* | [=\(\)!]) dst_arg=./$dst_arg;;
+	esac
 	shift;;
 
     -T) no_target_directory=true;;
@@ -186,6 +190,10 @@
     fi
     shift # arg
     dst_arg=$arg
+    # Protect names problematic for `test' and other utilities.
+    case $dst_arg in
+      -* | [=\(\)!]) dst_arg=./$dst_arg;;
+    esac
   done
 fi
 
@@ -200,7 +208,11 @@
 fi
 
 if test -z "$dir_arg"; then
-  trap '(exit $?); exit' 1 2 13 15
+  do_exit='(exit $ret); exit $ret'
+  trap "ret=129; $do_exit" 1
+  trap "ret=130; $do_exit" 2
+  trap "ret=141; $do_exit" 13
+  trap "ret=143; $do_exit" 15
 
   # Set umask so as not to create temps with too-generous modes.
   # However, 'strip' requires both read and write access to temps.
@@ -228,9 +240,9 @@
 
 for src
 do
-  # Protect names starting with `-'.
+  # Protect names problematic for `test' and other utilities.
   case $src in
-    -*) src=./$src;;
+    -* | [=\(\)!]) src=./$src;;
   esac
 
   if test -n "$dir_arg"; then
@@ -252,12 +264,7 @@
       echo "$0: no destination specified." >&2
       exit 1
     fi
-
     dst=$dst_arg
-    # Protect names starting with `-'.
-    case $dst in
-      -*) dst=./$dst;;
-    esac
 
     # If destination is a directory, append the input filename; won't work
     # if double slashes aren't ignored.
@@ -385,7 +392,7 @@
 
       case $dstdir in
 	/*) prefix='/';;
-	-*) prefix='./';;
+	[-=\(\)!]*) prefix='./';;
 	*)  prefix='';;
       esac
 
@@ -403,7 +410,7 @@
 
       for d
       do
-	test -z "$d" && continue
+	test X"$d" = X && continue
 
 	prefix=$prefix$d
 	if test -d "$prefix"; then
diff -Nru filezilla-3.5.3/config/ltmain.sh filezilla-3.7.3~precise/config/ltmain.sh
--- filezilla-3.5.3/config/ltmain.sh	2012-01-08 13:29:09.000000000 +0000
+++ filezilla-3.7.3~precise/config/ltmain.sh	2013-08-07 19:17:12.000000000 +0000
@@ -1,9 +1,9 @@
-# Generated from ltmain.m4sh.
 
-# ltmain.sh (GNU libtool) 2.2.6b
+# libtool (GNU libtool) 2.4.2
 # Written by Gordon Matzigkeit <gord@gnu.ai.mit.edu>, 1996
 
-# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 2008 Free Software Foundation, Inc.
+# Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006,
+# 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
 # This is free software; see the source for copying conditions.  There is NO
 # warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
 
@@ -32,50 +32,57 @@
 #
 # Provide generalized library-building support services.
 #
-#     --config             show all configuration variables
-#     --debug              enable verbose shell tracing
-# -n, --dry-run            display commands without modifying any files
-#     --features           display basic configuration information and exit
-#     --mode=MODE          use operation mode MODE
-#     --preserve-dup-deps  don't remove duplicate dependency libraries
-#     --quiet, --silent    don't print informational messages
-#     --tag=TAG            use configuration variables from tag TAG
-# -v, --verbose            print informational messages (default)
-#     --version            print version information
-# -h, --help               print short or long help message
+#       --config             show all configuration variables
+#       --debug              enable verbose shell tracing
+#   -n, --dry-run            display commands without modifying any files
+#       --features           display basic configuration information and exit
+#       --mode=MODE          use operation mode MODE
+#       --preserve-dup-deps  don't remove duplicate dependency libraries
+#       --quiet, --silent    don't print informational messages
+#       --no-quiet, --no-silent
+#                            print informational messages (default)
+#       --no-warn            don't display warning messages
+#       --tag=TAG            use configuration variables from tag TAG
+#   -v, --verbose            print more informational messages than default
+#       --no-verbose         don't print the extra informational messages
+#       --version            print version information
+#   -h, --help, --help-all   print short, long, or detailed help message
 #
 # MODE must be one of the following:
 #
-#       clean              remove files from the build directory
-#       compile            compile a source file into a libtool object
-#       execute            automatically set library path, then run a program
-#       finish             complete the installation of libtool libraries
-#       install            install libraries or executables
-#       link               create a library or an executable
-#       uninstall          remove libraries from an installed directory
+#         clean              remove files from the build directory
+#         compile            compile a source file into a libtool object
+#         execute            automatically set library path, then run a program
+#         finish             complete the installation of libtool libraries
+#         install            install libraries or executables
+#         link               create a library or an executable
+#         uninstall          remove libraries from an installed directory
 #
-# MODE-ARGS vary depending on the MODE.
+# MODE-ARGS vary depending on the MODE.  When passed as first option,
+# `--mode=MODE' may be abbreviated as `MODE' or a unique abbreviation of that.
 # Try `$progname --help --mode=MODE' for a more detailed description of MODE.
 #
 # When reporting a bug, please describe a test case to reproduce it and
 # include the following information:
 #
-#       host-triplet:	$host
-#       shell:		$SHELL
-#       compiler:		$LTCC
-#       compiler flags:		$LTCFLAGS
-#       linker:		$LD (gnu? $with_gnu_ld)
-#       $progname:		(GNU libtool) 2.2.6b Debian-2.2.6b-2
-#       automake:		$automake_version
-#       autoconf:		$autoconf_version
+#         host-triplet:	$host
+#         shell:		$SHELL
+#         compiler:		$LTCC
+#         compiler flags:		$LTCFLAGS
+#         linker:		$LD (gnu? $with_gnu_ld)
+#         $progname:	(GNU libtool) 2.4.2 Debian-2.4.2-1.1
+#         automake:	$automake_version
+#         autoconf:	$autoconf_version
 #
 # Report bugs to <bug-libtool@gnu.org>.
+# GNU libtool home page: <http://www.gnu.org/software/libtool/>.
+# General help using GNU software: <http://www.gnu.org/gethelp/>.
 
-PROGRAM=ltmain.sh
+PROGRAM=libtool
 PACKAGE=libtool
-VERSION="2.2.6b Debian-2.2.6b-2"
+VERSION="2.4.2 Debian-2.4.2-1.1"
 TIMESTAMP=""
-package_revision=1.3017
+package_revision=1.3337
 
 # Be Bourne compatible
 if test -n "${ZSH_VERSION+set}" && (emulate sh) >/dev/null 2>&1; then
@@ -91,10 +98,15 @@
 BIN_SH=xpg4; export BIN_SH # for Tru64
 DUALCASE=1; export DUALCASE # for MKS sh
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+}
+
 # NLS nuisances: We save the old values to restore during execute mode.
-# Only set LANG and LC_ALL to C if already set.
-# These must not be set unconditionally because not all systems understand
-# e.g. LANG=C (notably SCO).
 lt_user_locale=
 lt_safe_locale=
 for lt_var in LANG LANGUAGE LC_ALL LC_CTYPE LC_COLLATE LC_MESSAGES
@@ -107,24 +119,28 @@
 	  lt_safe_locale=\"$lt_var=C; \$lt_safe_locale\"
 	fi"
 done
+LC_ALL=C
+LANGUAGE=C
+export LANGUAGE LC_ALL
 
 $lt_unset CDPATH
 
 
+# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
+# is ksh but when the shell is invoked as "sh" and the current value of
+# the _XPG environment variable is not equal to 1 (one), the special
+# positional parameter $0, within a function call, is the name of the
+# function.
+progpath="$0"
 
 
 
 : ${CP="cp -f"}
-: ${ECHO="echo"}
-: ${EGREP="/bin/grep -E"}
-: ${FGREP="/bin/grep -F"}
-: ${GREP="/bin/grep"}
-: ${LN_S="ln -s"}
+test "${ECHO+set}" = set || ECHO=${as_echo-'printf %s\n'}
 : ${MAKE="make"}
 : ${MKDIR="mkdir"}
 : ${MV="mv -f"}
 : ${RM="rm -f"}
-: ${SED="/bin/sed"}
 : ${SHELL="${CONFIG_SHELL-/bin/sh}"}
 : ${Xsed="$SED -e 1s/^X//"}
 
@@ -144,6 +160,27 @@
 dirname="s,/[^/]*$,,"
 basename="s,^.*/,,"
 
+# func_dirname file append nondir_replacement
+# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
+# otherwise set result to NONDIR_REPLACEMENT.
+func_dirname ()
+{
+    func_dirname_result=`$ECHO "${1}" | $SED "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+} # func_dirname may be replaced by extended shell implementation
+
+
+# func_basename file
+func_basename ()
+{
+    func_basename_result=`$ECHO "${1}" | $SED "$basename"`
+} # func_basename may be replaced by extended shell implementation
+
+
 # func_dirname_and_basename file append nondir_replacement
 # perform func_basename and func_dirname in a single function
 # call:
@@ -158,33 +195,183 @@
 # those functions but instead duplicate the functionality here.
 func_dirname_and_basename ()
 {
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
+    # Extract subdirectory from the argument.
+    func_dirname_result=`$ECHO "${1}" | $SED -e "$dirname"`
+    if test "X$func_dirname_result" = "X${1}"; then
+      func_dirname_result="${3}"
+    else
+      func_dirname_result="$func_dirname_result${2}"
+    fi
+    func_basename_result=`$ECHO "${1}" | $SED -e "$basename"`
+} # func_dirname_and_basename may be replaced by extended shell implementation
+
+
+# func_stripname prefix suffix name
+# strip PREFIX and SUFFIX off of NAME.
+# PREFIX and SUFFIX must not contain globbing or regex special
+# characters, hashes, percent signs, but SUFFIX may contain a leading
+# dot (in which case that matches only a dot).
+# func_strip_suffix prefix name
+func_stripname ()
+{
+    case ${2} in
+      .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+      *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+    esac
+} # func_stripname may be replaced by extended shell implementation
+
+
+# These SED scripts presuppose an absolute path with a trailing slash.
+pathcar='s,^/\([^/]*\).*$,\1,'
+pathcdr='s,^/[^/]*,,'
+removedotparts=':dotsl
+		s@/\./@/@g
+		t dotsl
+		s,/\.$,/,'
+collapseslashes='s@/\{1,\}@/@g'
+finalslash='s,/*$,/,'
+
+# func_normal_abspath PATH
+# Remove doubled-up and trailing slashes, "." path components,
+# and cancel out any ".." path components in PATH after making
+# it an absolute path.
+#             value returned in "$func_normal_abspath_result"
+func_normal_abspath ()
+{
+  # Start from root dir and reassemble the path.
+  func_normal_abspath_result=
+  func_normal_abspath_tpath=$1
+  func_normal_abspath_altnamespace=
+  case $func_normal_abspath_tpath in
+    "")
+      # Empty path, that just means $cwd.
+      func_stripname '' '/' "`pwd`"
+      func_normal_abspath_result=$func_stripname_result
+      return
+    ;;
+    # The next three entries are used to spot a run of precisely
+    # two leading slashes without using negated character classes;
+    # we take advantage of case's first-match behaviour.
+    ///*)
+      # Unusual form of absolute path, do nothing.
+    ;;
+    //*)
+      # Not necessarily an ordinary path; POSIX reserves leading '//'
+      # and for example Cygwin uses it to access remote file shares
+      # over CIFS/SMB, so we conserve a leading double slash if found.
+      func_normal_abspath_altnamespace=/
+    ;;
+    /*)
+      # Absolute path, do nothing.
+    ;;
+    *)
+      # Relative path, prepend $cwd.
+      func_normal_abspath_tpath=`pwd`/$func_normal_abspath_tpath
+    ;;
+  esac
+  # Cancel out all the simple stuff to save iterations.  We also want
+  # the path to end with a slash for ease of parsing, so make sure
+  # there is one (and only one) here.
+  func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$removedotparts" -e "$collapseslashes" -e "$finalslash"`
+  while :; do
+    # Processed it all yet?
+    if test "$func_normal_abspath_tpath" = / ; then
+      # If we ascended to the root using ".." the result may be empty now.
+      if test -z "$func_normal_abspath_result" ; then
+        func_normal_abspath_result=/
+      fi
+      break
+    fi
+    func_normal_abspath_tcomponent=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcar"`
+    func_normal_abspath_tpath=`$ECHO "$func_normal_abspath_tpath" | $SED \
+        -e "$pathcdr"`
+    # Figure out what to do with it
+    case $func_normal_abspath_tcomponent in
+      "")
+        # Trailing empty path component, ignore it.
+      ;;
+      ..)
+        # Parent dir; strip last assembled component from result.
+        func_dirname "$func_normal_abspath_result"
+        func_normal_abspath_result=$func_dirname_result
+      ;;
+      *)
+        # Actual path component, append it.
+        func_normal_abspath_result=$func_normal_abspath_result/$func_normal_abspath_tcomponent
+      ;;
+    esac
+  done
+  # Restore leading double-slash if one was found on entry.
+  func_normal_abspath_result=$func_normal_abspath_altnamespace$func_normal_abspath_result
 }
 
-# Generated shell functions inserted here.
+# func_relative_path SRCDIR DSTDIR
+# generates a relative path from SRCDIR to DSTDIR, with a trailing
+# slash if non-empty, suitable for immediately appending a filename
+# without needing to append a separator.
+#             value returned in "$func_relative_path_result"
+func_relative_path ()
+{
+  func_relative_path_result=
+  func_normal_abspath "$1"
+  func_relative_path_tlibdir=$func_normal_abspath_result
+  func_normal_abspath "$2"
+  func_relative_path_tbindir=$func_normal_abspath_result
+
+  # Ascend the tree starting from libdir
+  while :; do
+    # check if we have found a prefix of bindir
+    case $func_relative_path_tbindir in
+      $func_relative_path_tlibdir)
+        # found an exact match
+        func_relative_path_tcancelled=
+        break
+        ;;
+      $func_relative_path_tlibdir*)
+        # found a matching prefix
+        func_stripname "$func_relative_path_tlibdir" '' "$func_relative_path_tbindir"
+        func_relative_path_tcancelled=$func_stripname_result
+        if test -z "$func_relative_path_result"; then
+          func_relative_path_result=.
+        fi
+        break
+        ;;
+      *)
+        func_dirname $func_relative_path_tlibdir
+        func_relative_path_tlibdir=${func_dirname_result}
+        if test "x$func_relative_path_tlibdir" = x ; then
+          # Have to descend all the way to the root!
+          func_relative_path_result=../$func_relative_path_result
+          func_relative_path_tcancelled=$func_relative_path_tbindir
+          break
+        fi
+        func_relative_path_result=../$func_relative_path_result
+        ;;
+    esac
+  done
 
-# Work around backward compatibility issue on IRIX 6.5. On IRIX 6.4+, sh
-# is ksh but when the shell is invoked as "sh" and the current value of
-# the _XPG environment variable is not equal to 1 (one), the special
-# positional parameter $0, within a function call, is the name of the
-# function.
-progpath="$0"
+  # Now calculate path; take care to avoid doubling-up slashes.
+  func_stripname '' '/' "$func_relative_path_result"
+  func_relative_path_result=$func_stripname_result
+  func_stripname '/' '/' "$func_relative_path_tcancelled"
+  if test "x$func_stripname_result" != x ; then
+    func_relative_path_result=${func_relative_path_result}/${func_stripname_result}
+  fi
+
+  # Normalisation. If bindir is libdir, return empty string,
+  # else relative path ending with a slash; either way, target
+  # file name can be directly appended.
+  if test ! -z "$func_relative_path_result"; then
+    func_stripname './' '' "$func_relative_path_result/"
+    func_relative_path_result=$func_stripname_result
+  fi
+}
 
 # The name of this program:
-# In the unlikely event $progname began with a '-', it would play havoc with
-# func_echo (imagine progname=-n), so we prepend ./ in that case:
 func_dirname_and_basename "$progpath"
 progname=$func_basename_result
-case $progname in
-  -*) progname=./$progname ;;
-esac
 
 # Make sure we have an absolute path for reexecution:
 case $progpath in
@@ -196,7 +383,7 @@
      ;;
   *)
      save_IFS="$IFS"
-     IFS=:
+     IFS=${PATH_SEPARATOR-:}
      for progdir in $PATH; do
        IFS="$save_IFS"
        test -x "$progdir/$progname" && break
@@ -215,6 +402,15 @@
 # Same as above, but do not quote variable references.
 double_quote_subst='s/\(["`\\]\)/\\\1/g'
 
+# Sed substitution that turns a string into a regex matching for the
+# string literally.
+sed_make_literal_regex='s,[].[^$\\*\/],\\&,g'
+
+# Sed substitution that converts a w32 file name or path
+# which contains forward slashes, into one that contains
+# (escaped) backslashes.  A very naive implementation.
+lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
+
 # Re-`\' parameter expansions in output of double_quote_subst that were
 # `\'-ed in input to the same.  If an odd number of `\' preceded a '$'
 # in input to double_quote_subst, that '$' was protected from expansion.
@@ -243,7 +439,7 @@
 # name if it has been set yet.
 func_echo ()
 {
-    $ECHO "$progname${mode+: }$mode: $*"
+    $ECHO "$progname: ${opt_mode+$opt_mode: }$*"
 }
 
 # func_verbose arg...
@@ -258,18 +454,25 @@
     :
 }
 
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO "$*"
+}
+
 # func_error arg...
 # Echo program name prefixed message to standard error.
 func_error ()
 {
-    $ECHO "$progname${mode+: }$mode: "${1+"$@"} 1>&2
+    $ECHO "$progname: ${opt_mode+$opt_mode: }"${1+"$@"} 1>&2
 }
 
 # func_warning arg...
 # Echo program name prefixed warning message to standard error.
 func_warning ()
 {
-    $opt_warning && $ECHO "$progname${mode+: }$mode: warning: "${1+"$@"} 1>&2
+    $opt_warning && $ECHO "$progname: ${opt_mode+$opt_mode: }warning: "${1+"$@"} 1>&2
 
     # bash bug again:
     :
@@ -326,9 +529,9 @@
         case $my_directory_path in */*) ;; *) break ;; esac
 
         # ...otherwise throw away the child directory and loop
-        my_directory_path=`$ECHO "X$my_directory_path" | $Xsed -e "$dirname"`
+        my_directory_path=`$ECHO "$my_directory_path" | $SED -e "$dirname"`
       done
-      my_dir_list=`$ECHO "X$my_dir_list" | $Xsed -e 's,:*$,,'`
+      my_dir_list=`$ECHO "$my_dir_list" | $SED 's,:*$,,'`
 
       save_mkdir_p_IFS="$IFS"; IFS=':'
       for my_dir in $my_dir_list; do
@@ -378,7 +581,7 @@
         func_fatal_error "cannot create temporary directory \`$my_tmpdir'"
     fi
 
-    $ECHO "X$my_tmpdir" | $Xsed
+    $ECHO "$my_tmpdir"
 }
 
 
@@ -392,7 +595,7 @@
 {
     case $1 in
       *[\\\`\"\$]*)
-	func_quote_for_eval_unquoted_result=`$ECHO "X$1" | $Xsed -e "$sed_quote_subst"` ;;
+	func_quote_for_eval_unquoted_result=`$ECHO "$1" | $SED "$sed_quote_subst"` ;;
       *)
         func_quote_for_eval_unquoted_result="$1" ;;
     esac
@@ -419,7 +622,7 @@
 {
     case $1 in
       *[\\\`\"]*)
-	my_arg=`$ECHO "X$1" | $Xsed \
+	my_arg=`$ECHO "$1" | $SED \
 	    -e "$double_quote_subst" -e "$sed_double_backslash"` ;;
       *)
         my_arg="$1" ;;
@@ -488,15 +691,39 @@
     fi
 }
 
-
-
+# func_tr_sh
+# Turn $1 into a string suitable for a shell variable name.
+# Result is stored in $func_tr_sh_result.  All characters
+# not in the set a-zA-Z0-9_ are replaced with '_'. Further,
+# if $1 begins with a digit, a '_' is prepended as well.
+func_tr_sh ()
+{
+  case $1 in
+  [0-9]* | *[!a-zA-Z0-9_]*)
+    func_tr_sh_result=`$ECHO "$1" | $SED 's/^\([0-9]\)/_\1/; s/[^a-zA-Z0-9_]/_/g'`
+    ;;
+  * )
+    func_tr_sh_result=$1
+    ;;
+  esac
+}
 
 
 # func_version
 # Echo version message to standard output and exit.
 func_version ()
 {
-    $SED -n '/^# '$PROGRAM' (GNU /,/# warranty; / {
+    $opt_debug
+
+    $SED -n '/(C)/!b go
+	:more
+	/\./!{
+	  N
+	  s/\n# / /
+	  b more
+	}
+	:go
+	/^# '$PROGRAM' (GNU /,/# warranty; / {
         s/^# //
 	s/^# *$//
         s/\((C)\)[ 0-9,-]*\( [1-9][0-9]*\)/\1\2/
@@ -509,22 +736,28 @@
 # Echo short help message to standard output and exit.
 func_usage ()
 {
-    $SED -n '/^# Usage:/,/# -h/ {
+    $opt_debug
+
+    $SED -n '/^# Usage:/,/^#  *.*--help/ {
         s/^# //
 	s/^# *$//
 	s/\$progname/'$progname'/
 	p
     }' < "$progpath"
-    $ECHO
+    echo
     $ECHO "run \`$progname --help | more' for full usage"
     exit $?
 }
 
-# func_help
-# Echo long help message to standard output and exit.
+# func_help [NOEXIT]
+# Echo long help message to standard output and exit,
+# unless 'noexit' is passed as argument.
 func_help ()
 {
+    $opt_debug
+
     $SED -n '/^# Usage:/,/# Report bugs to/ {
+	:print
         s/^# //
 	s/^# *$//
 	s*\$progname*'$progname'*
@@ -534,11 +767,18 @@
 	s*\$LTCFLAGS*'"$LTCFLAGS"'*
 	s*\$LD*'"$LD"'*
 	s/\$with_gnu_ld/'"$with_gnu_ld"'/
-	s/\$automake_version/'"`(automake --version) 2>/dev/null |$SED 1q`"'/
-	s/\$autoconf_version/'"`(autoconf --version) 2>/dev/null |$SED 1q`"'/
+	s/\$automake_version/'"`(${AUTOMAKE-automake} --version) 2>/dev/null |$SED 1q`"'/
+	s/\$autoconf_version/'"`(${AUTOCONF-autoconf} --version) 2>/dev/null |$SED 1q`"'/
 	p
-     }' < "$progpath"
-    exit $?
+	d
+     }
+     /^# .* home page:/b print
+     /^# General help using/b print
+     ' < "$progpath"
+    ret=$?
+    if test -z "$1"; then
+      exit $ret
+    fi
 }
 
 # func_missing_arg argname
@@ -546,63 +786,106 @@
 # exit_cmd.
 func_missing_arg ()
 {
-    func_error "missing argument for $1"
+    $opt_debug
+
+    func_error "missing argument for $1."
     exit_cmd=exit
 }
 
-exit_cmd=:
 
+# func_split_short_opt shortopt
+# Set func_split_short_opt_name and func_split_short_opt_arg shell
+# variables after splitting SHORTOPT after the 2nd character.
+func_split_short_opt ()
+{
+    my_sed_short_opt='1s/^\(..\).*$/\1/;q'
+    my_sed_short_rest='1s/^..\(.*\)$/\1/;q'
+
+    func_split_short_opt_name=`$ECHO "$1" | $SED "$my_sed_short_opt"`
+    func_split_short_opt_arg=`$ECHO "$1" | $SED "$my_sed_short_rest"`
+} # func_split_short_opt may be replaced by extended shell implementation
+
+
+# func_split_long_opt longopt
+# Set func_split_long_opt_name and func_split_long_opt_arg shell
+# variables after splitting LONGOPT at the `=' sign.
+func_split_long_opt ()
+{
+    my_sed_long_opt='1s/^\(--[^=]*\)=.*/\1/;q'
+    my_sed_long_arg='1s/^--[^=]*=//'
+
+    func_split_long_opt_name=`$ECHO "$1" | $SED "$my_sed_long_opt"`
+    func_split_long_opt_arg=`$ECHO "$1" | $SED "$my_sed_long_arg"`
+} # func_split_long_opt may be replaced by extended shell implementation
 
+exit_cmd=:
 
 
 
-# Check that we have a working $ECHO.
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t'; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell, and then maybe $ECHO will work.
-  exec $SHELL "$progpath" --no-reexec ${1+"$@"}
-fi
 
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<EOF
-$*
-EOF
-  exit $EXIT_SUCCESS
-fi
 
 magic="%%%MAGIC variable%%%"
 magic_exe="%%%MAGIC EXE variable%%%"
 
 # Global variables.
-# $mode is unset
 nonopt=
-execute_dlfiles=
 preserve_args=
 lo2o="s/\\.lo\$/.${objext}/"
 o2lo="s/\\.${objext}\$/.lo/"
 extracted_archives=
 extracted_serial=0
 
-opt_dry_run=false
-opt_duplicate_deps=false
-opt_silent=false
-opt_debug=:
-
 # If this variable is set in any of the actions, the command in it
 # will be execed at the end.  This prevents here-documents from being
 # left over by shells.
 exec_cmd=
 
+# func_append var value
+# Append VALUE to the end of shell variable VAR.
+func_append ()
+{
+    eval "${1}=\$${1}\${2}"
+} # func_append may be replaced by extended shell implementation
+
+# func_append_quoted var value
+# Quote VALUE and append to the end of shell variable VAR, separated
+# by a space.
+func_append_quoted ()
+{
+    func_quote_for_eval "${2}"
+    eval "${1}=\$${1}\\ \$func_quote_for_eval_result"
+} # func_append_quoted may be replaced by extended shell implementation
+
+
+# func_arith arithmetic-term...
+func_arith ()
+{
+    func_arith_result=`expr "${@}"`
+} # func_arith may be replaced by extended shell implementation
+
+
+# func_len string
+# STRING may not start with a hyphen.
+func_len ()
+{
+    func_len_result=`expr "${1}" : ".*" 2>/dev/null || echo $max_cmd_len`
+} # func_len may be replaced by extended shell implementation
+
+
+# func_lo2o object
+func_lo2o ()
+{
+    func_lo2o_result=`$ECHO "${1}" | $SED "$lo2o"`
+} # func_lo2o may be replaced by extended shell implementation
+
+
+# func_xform libobj-or-source
+func_xform ()
+{
+    func_xform_result=`$ECHO "${1}" | $SED 's/\.[^.]*$/.lo/'`
+} # func_xform may be replaced by extended shell implementation
+
+
 # func_fatal_configuration arg...
 # Echo program name prefixed message to standard error, followed by
 # a configuration failure hint, and exit.
@@ -636,16 +919,16 @@
 # Display the features supported by this script.
 func_features ()
 {
-    $ECHO "host: $host"
+    echo "host: $host"
     if test "$build_libtool_libs" = yes; then
-      $ECHO "enable shared libraries"
+      echo "enable shared libraries"
     else
-      $ECHO "disable shared libraries"
+      echo "disable shared libraries"
     fi
     if test "$build_old_libs" = yes; then
-      $ECHO "enable static libraries"
+      echo "enable static libraries"
     else
-      $ECHO "disable static libraries"
+      echo "disable static libraries"
     fi
 
     exit $?
@@ -692,117 +975,209 @@
   esac
 }
 
-# Parse options once, thoroughly.  This comes as soon as possible in
-# the script to make things like `libtool --version' happen quickly.
+# func_check_version_match
+# Ensure that we are using m4 macros, and libtool script from the same
+# release of libtool.
+func_check_version_match ()
 {
+  if test "$package_revision" != "$macro_revision"; then
+    if test "$VERSION" != "$macro_version"; then
+      if test -z "$macro_version"; then
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from an older release.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      else
+        cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
+$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
+$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
+$progname: and run autoconf again.
+_LT_EOF
+      fi
+    else
+      cat >&2 <<_LT_EOF
+$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
+$progname: but the definition of this LT_INIT comes from revision $macro_revision.
+$progname: You should recreate aclocal.m4 with macros from revision $package_revision
+$progname: of $PACKAGE $VERSION and run autoconf again.
+_LT_EOF
+    fi
 
-  # Shorthand for --mode=foo, only valid as the first argument
-  case $1 in
-  clean|clea|cle|cl)
-    shift; set dummy --mode clean ${1+"$@"}; shift
-    ;;
-  compile|compil|compi|comp|com|co|c)
-    shift; set dummy --mode compile ${1+"$@"}; shift
-    ;;
-  execute|execut|execu|exec|exe|ex|e)
-    shift; set dummy --mode execute ${1+"$@"}; shift
-    ;;
-  finish|finis|fini|fin|fi|f)
-    shift; set dummy --mode finish ${1+"$@"}; shift
-    ;;
-  install|instal|insta|inst|ins|in|i)
-    shift; set dummy --mode install ${1+"$@"}; shift
-    ;;
-  link|lin|li|l)
-    shift; set dummy --mode link ${1+"$@"}; shift
-    ;;
-  uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
-    shift; set dummy --mode uninstall ${1+"$@"}; shift
-    ;;
-  esac
+    exit $EXIT_MISMATCH
+  fi
+}
+
+
+# Shorthand for --mode=foo, only valid as the first argument
+case $1 in
+clean|clea|cle|cl)
+  shift; set dummy --mode clean ${1+"$@"}; shift
+  ;;
+compile|compil|compi|comp|com|co|c)
+  shift; set dummy --mode compile ${1+"$@"}; shift
+  ;;
+execute|execut|execu|exec|exe|ex|e)
+  shift; set dummy --mode execute ${1+"$@"}; shift
+  ;;
+finish|finis|fini|fin|fi|f)
+  shift; set dummy --mode finish ${1+"$@"}; shift
+  ;;
+install|instal|insta|inst|ins|in|i)
+  shift; set dummy --mode install ${1+"$@"}; shift
+  ;;
+link|lin|li|l)
+  shift; set dummy --mode link ${1+"$@"}; shift
+  ;;
+uninstall|uninstal|uninsta|uninst|unins|unin|uni|un|u)
+  shift; set dummy --mode uninstall ${1+"$@"}; shift
+  ;;
+esac
 
-  # Parse non-mode specific arguments:
-  while test "$#" -gt 0; do
+
+
+# Option defaults:
+opt_debug=:
+opt_dry_run=false
+opt_config=false
+opt_preserve_dup_deps=false
+opt_features=false
+opt_finish=false
+opt_help=false
+opt_help_all=false
+opt_silent=:
+opt_warning=:
+opt_verbose=:
+opt_silent=false
+opt_verbose=false
+
+
+# Parse options once, thoroughly.  This comes as soon as possible in the
+# script to make things like `--version' happen as quickly as we can.
+{
+  # this just eases exit handling
+  while test $# -gt 0; do
     opt="$1"
     shift
-
     case $opt in
-      --config)		func_config					;;
-
-      --debug)		preserve_args="$preserve_args $opt"
+      --debug|-x)	opt_debug='set -x'
 			func_echo "enabling shell trace mode"
-			opt_debug='set -x'
 			$opt_debug
 			;;
-
-      -dlopen)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			execute_dlfiles="$execute_dlfiles $1"
-			shift
+      --dry-run|--dryrun|-n)
+			opt_dry_run=:
 			;;
-
-      --dry-run | -n)	opt_dry_run=:					;;
-      --features)       func_features					;;
-      --finish)		mode="finish"					;;
-
-      --mode)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			case $1 in
-			  # Valid mode arguments:
-			  clean)	;;
-			  compile)	;;
-			  execute)	;;
-			  finish)	;;
-			  install)	;;
-			  link)		;;
-			  relink)	;;
-			  uninstall)	;;
-
-			  # Catch anything else as an error
-			  *) func_error "invalid argument for $opt"
-			     exit_cmd=exit
-			     break
-			     ;;
-		        esac
-
-			mode="$1"
+      --config)
+			opt_config=:
+func_config
+			;;
+      --dlopen|-dlopen)
+			optarg="$1"
+			opt_dlopen="${opt_dlopen+$opt_dlopen
+}$optarg"
 			shift
 			;;
-
       --preserve-dup-deps)
-			opt_duplicate_deps=:				;;
-
-      --quiet|--silent)	preserve_args="$preserve_args $opt"
-			opt_silent=:
+			opt_preserve_dup_deps=:
 			;;
-
-      --verbose| -v)	preserve_args="$preserve_args $opt"
+      --features)
+			opt_features=:
+func_features
+			;;
+      --finish)
+			opt_finish=:
+set dummy --mode finish ${1+"$@"}; shift
+			;;
+      --help)
+			opt_help=:
+			;;
+      --help-all)
+			opt_help_all=:
+opt_help=': help-all'
+			;;
+      --mode)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_mode="$optarg"
+case $optarg in
+  # Valid mode arguments:
+  clean|compile|execute|finish|install|link|relink|uninstall) ;;
+
+  # Catch anything else as an error
+  *) func_error "invalid argument for $opt"
+     exit_cmd=exit
+     break
+     ;;
+esac
+			shift
+			;;
+      --no-silent|--no-quiet)
 			opt_silent=false
+func_append preserve_args " $opt"
 			;;
-
-      --tag)		test "$#" -eq 0 && func_missing_arg "$opt" && break
-			preserve_args="$preserve_args $opt $1"
-			func_enable_tag "$1"	# tagname is set here
+      --no-warning|--no-warn)
+			opt_warning=false
+func_append preserve_args " $opt"
+			;;
+      --no-verbose)
+			opt_verbose=false
+func_append preserve_args " $opt"
+			;;
+      --silent|--quiet)
+			opt_silent=:
+func_append preserve_args " $opt"
+        opt_verbose=false
+			;;
+      --verbose|-v)
+			opt_verbose=:
+func_append preserve_args " $opt"
+opt_silent=false
+			;;
+      --tag)
+			test $# = 0 && func_missing_arg $opt && break
+			optarg="$1"
+			opt_tag="$optarg"
+func_append preserve_args " $opt $optarg"
+func_enable_tag "$optarg"
 			shift
 			;;
 
+      -\?|-h)		func_usage				;;
+      --help)		func_help				;;
+      --version)	func_version				;;
+
       # Separate optargs to long options:
-      -dlopen=*|--mode=*|--tag=*)
-			func_opt_split "$opt"
-			set dummy "$func_opt_split_opt" "$func_opt_split_arg" ${1+"$@"}
+      --*=*)
+			func_split_long_opt "$opt"
+			set dummy "$func_split_long_opt_name" "$func_split_long_opt_arg" ${1+"$@"}
 			shift
 			;;
 
-      -\?|-h)		func_usage					;;
-      --help)		opt_help=:					;;
-      --version)	func_version					;;
-
-      -*)		func_fatal_help "unrecognized option \`$opt'"	;;
-
-      *)		nonopt="$opt"
-			break
+      # Separate non-argument short options:
+      -\?*|-h*|-n*|-v*)
+			func_split_short_opt "$opt"
+			set dummy "$func_split_short_opt_name" "-$func_split_short_opt_arg" ${1+"$@"}
+			shift
 			;;
+
+      --)		break					;;
+      -*)		func_fatal_help "unrecognized option \`$opt'" ;;
+      *)		set dummy "$opt" ${1+"$@"};	shift; break  ;;
     esac
   done
 
+  # Validate options:
+
+  # save first non-option argument
+  if test "$#" -gt 0; then
+    nonopt="$opt"
+    shift
+  fi
+
+  # preserve --debug
+  test "$opt_debug" = : || func_append preserve_args " --debug"
 
   case $host in
     *cygwin* | *mingw* | *pw32* | *cegcc*)
@@ -810,82 +1185,44 @@
       opt_duplicate_compiler_generated_deps=:
       ;;
     *)
-      opt_duplicate_compiler_generated_deps=$opt_duplicate_deps
+      opt_duplicate_compiler_generated_deps=$opt_preserve_dup_deps
       ;;
   esac
 
-  # Having warned about all mis-specified options, bail out if
-  # anything was wrong.
-  $exit_cmd $EXIT_FAILURE
-}
+  $opt_help || {
+    # Sanity checks first:
+    func_check_version_match
 
-# func_check_version_match
-# Ensure that we are using m4 macros, and libtool script from the same
-# release of libtool.
-func_check_version_match ()
-{
-  if test "$package_revision" != "$macro_revision"; then
-    if test "$VERSION" != "$macro_version"; then
-      if test -z "$macro_version"; then
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from an older release.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      else
-        cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, but the
-$progname: definition of this LT_INIT comes from $PACKAGE $macro_version.
-$progname: You should recreate aclocal.m4 with macros from $PACKAGE $VERSION
-$progname: and run autoconf again.
-_LT_EOF
-      fi
-    else
-      cat >&2 <<_LT_EOF
-$progname: Version mismatch error.  This is $PACKAGE $VERSION, revision $package_revision,
-$progname: but the definition of this LT_INIT comes from revision $macro_revision.
-$progname: You should recreate aclocal.m4 with macros from revision $package_revision
-$progname: of $PACKAGE $VERSION and run autoconf again.
-_LT_EOF
+    if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
+      func_fatal_configuration "not configured to build any kind of library"
     fi
 
-    exit $EXIT_MISMATCH
-  fi
-}
-
+    # Darwin sucks
+    eval std_shrext=\"$shrext_cmds\"
 
-## ----------- ##
-##    Main.    ##
-## ----------- ##
-
-$opt_help || {
-  # Sanity checks first:
-  func_check_version_match
-
-  if test "$build_libtool_libs" != yes && test "$build_old_libs" != yes; then
-    func_fatal_configuration "not configured to build any kind of library"
-  fi
+    # Only execute mode is allowed to have -dlopen flags.
+    if test -n "$opt_dlopen" && test "$opt_mode" != execute; then
+      func_error "unrecognized option \`-dlopen'"
+      $ECHO "$help" 1>&2
+      exit $EXIT_FAILURE
+    fi
 
-  test -z "$mode" && func_fatal_error "error: you must specify a MODE."
+    # Change the help message to a mode-specific one.
+    generic_help="$help"
+    help="Try \`$progname --help --mode=$opt_mode' for more information."
+  }
 
 
-  # Darwin sucks
-  eval std_shrext=\"$shrext_cmds\"
+  # Bail if the options were screwed
+  $exit_cmd $EXIT_FAILURE
+}
 
 
-  # Only execute mode is allowed to have -dlopen flags.
-  if test -n "$execute_dlfiles" && test "$mode" != execute; then
-    func_error "unrecognized option \`-dlopen'"
-    $ECHO "$help" 1>&2
-    exit $EXIT_FAILURE
-  fi
 
-  # Change the help message to a mode-specific one.
-  generic_help="$help"
-  help="Try \`$progname --help --mode=$mode' for more information."
-}
 
+## ----------- ##
+##    Main.    ##
+## ----------- ##
 
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
@@ -950,12 +1287,9 @@
 # temporary ltwrapper_script.
 func_ltwrapper_scriptname ()
 {
-    func_ltwrapper_scriptname_result=""
-    if func_ltwrapper_executable_p "$1"; then
-	func_dirname_and_basename "$1" "" "."
-	func_stripname '' '.exe' "$func_basename_result"
-	func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
-    fi
+    func_dirname_and_basename "$1" "" "."
+    func_stripname '' '.exe' "$func_basename_result"
+    func_ltwrapper_scriptname_result="$func_dirname_result/$objdir/${func_stripname_result}_ltshwrapper"
 }
 
 # func_ltwrapper_p file
@@ -1001,6 +1335,37 @@
 }
 
 
+# func_resolve_sysroot PATH
+# Replace a leading = in PATH with a sysroot.  Store the result into
+# func_resolve_sysroot_result
+func_resolve_sysroot ()
+{
+  func_resolve_sysroot_result=$1
+  case $func_resolve_sysroot_result in
+  =*)
+    func_stripname '=' '' "$func_resolve_sysroot_result"
+    func_resolve_sysroot_result=$lt_sysroot$func_stripname_result
+    ;;
+  esac
+}
+
+# func_replace_sysroot PATH
+# If PATH begins with the sysroot, replace it with = and
+# store the result into func_replace_sysroot_result.
+func_replace_sysroot ()
+{
+  case "$lt_sysroot:$1" in
+  ?*:"$lt_sysroot"*)
+    func_stripname "$lt_sysroot" '' "$1"
+    func_replace_sysroot_result="=$func_stripname_result"
+    ;;
+  *)
+    # Including no sysroot.
+    func_replace_sysroot_result=$1
+    ;;
+  esac
+}
+
 # func_infer_tag arg
 # Infer tagged configuration to use if any are available and
 # if one wasn't chosen via the "--tag" command line option.
@@ -1013,13 +1378,15 @@
     if test -n "$available_tags" && test -z "$tagname"; then
       CC_quoted=
       for arg in $CC; do
-        func_quote_for_eval "$arg"
-	CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	func_append_quoted CC_quoted "$arg"
       done
+      CC_expanded=`func_echo_all $CC`
+      CC_quoted_expanded=`func_echo_all $CC_quoted`
       case $@ in
       # Blanks in the command may have been stripped by the calling shell,
       # but not from the CC environment variable when configure was run.
-      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*) ;;
+      " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+      " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*) ;;
       # Blanks at the start of $base_compile will cause this to fail
       # if we don't check for them as well.
       *)
@@ -1030,11 +1397,13 @@
 	    CC_quoted=
 	    for arg in $CC; do
 	      # Double-quote args containing other shell metacharacters.
-	      func_quote_for_eval "$arg"
-	      CC_quoted="$CC_quoted $func_quote_for_eval_result"
+	      func_append_quoted CC_quoted "$arg"
 	    done
+	    CC_expanded=`func_echo_all $CC`
+	    CC_quoted_expanded=`func_echo_all $CC_quoted`
 	    case "$@ " in
-	      " $CC "* | "$CC "* | " `$ECHO $CC` "* | "`$ECHO $CC` "* | " $CC_quoted"* | "$CC_quoted "* | " `$ECHO $CC_quoted` "* | "`$ECHO $CC_quoted` "*)
+	    " $CC "* | "$CC "* | " $CC_expanded "* | "$CC_expanded "* | \
+	    " $CC_quoted"* | "$CC_quoted "* | " $CC_quoted_expanded "* | "$CC_quoted_expanded "*)
 	      # The compiler in the base compile command matches
 	      # the one in the tagged configuration.
 	      # Assume this is the tagged configuration we want.
@@ -1097,6 +1466,486 @@
     }
 }
 
+
+##################################################
+# FILE NAME AND PATH CONVERSION HELPER FUNCTIONS #
+##################################################
+
+# func_convert_core_file_wine_to_w32 ARG
+# Helper function used by file name conversion functions when $build is *nix,
+# and $host is mingw, cygwin, or some other w32 environment. Relies on a
+# correctly configured wine environment available, with the winepath program
+# in $build's $PATH.
+#
+# ARG is the $build file name to be converted to w32 format.
+# Result is available in $func_convert_core_file_wine_to_w32_result, and will
+# be empty on error (or when ARG is empty)
+func_convert_core_file_wine_to_w32 ()
+{
+  $opt_debug
+  func_convert_core_file_wine_to_w32_result="$1"
+  if test -n "$1"; then
+    # Unfortunately, winepath does not exit with a non-zero error code, so we
+    # are forced to check the contents of stdout. On the other hand, if the
+    # command is not found, the shell will set an exit code of 127 and print
+    # *an error message* to stdout. So we must check for both error code of
+    # zero AND non-empty stdout, which explains the odd construction:
+    func_convert_core_file_wine_to_w32_tmp=`winepath -w "$1" 2>/dev/null`
+    if test "$?" -eq 0 && test -n "${func_convert_core_file_wine_to_w32_tmp}"; then
+      func_convert_core_file_wine_to_w32_result=`$ECHO "$func_convert_core_file_wine_to_w32_tmp" |
+        $SED -e "$lt_sed_naive_backslashify"`
+    else
+      func_convert_core_file_wine_to_w32_result=
+    fi
+  fi
+}
+# end: func_convert_core_file_wine_to_w32
+
+
+# func_convert_core_path_wine_to_w32 ARG
+# Helper function used by path conversion functions when $build is *nix, and
+# $host is mingw, cygwin, or some other w32 environment. Relies on a correctly
+# configured wine environment available, with the winepath program in $build's
+# $PATH. Assumes ARG has no leading or trailing path separator characters.
+#
+# ARG is path to be converted from $build format to win32.
+# Result is available in $func_convert_core_path_wine_to_w32_result.
+# Unconvertible file (directory) names in ARG are skipped; if no directory names
+# are convertible, then the result may be empty.
+func_convert_core_path_wine_to_w32 ()
+{
+  $opt_debug
+  # unfortunately, winepath doesn't convert paths, only file names
+  func_convert_core_path_wine_to_w32_result=""
+  if test -n "$1"; then
+    oldIFS=$IFS
+    IFS=:
+    for func_convert_core_path_wine_to_w32_f in $1; do
+      IFS=$oldIFS
+      func_convert_core_file_wine_to_w32 "$func_convert_core_path_wine_to_w32_f"
+      if test -n "$func_convert_core_file_wine_to_w32_result" ; then
+        if test -z "$func_convert_core_path_wine_to_w32_result"; then
+          func_convert_core_path_wine_to_w32_result="$func_convert_core_file_wine_to_w32_result"
+        else
+          func_append func_convert_core_path_wine_to_w32_result ";$func_convert_core_file_wine_to_w32_result"
+        fi
+      fi
+    done
+    IFS=$oldIFS
+  fi
+}
+# end: func_convert_core_path_wine_to_w32
+
+
+# func_cygpath ARGS...
+# Wrapper around calling the cygpath program via LT_CYGPATH. This is used when
+# when (1) $build is *nix and Cygwin is hosted via a wine environment; or (2)
+# $build is MSYS and $host is Cygwin, or (3) $build is Cygwin. In case (1) or
+# (2), returns the Cygwin file name or path in func_cygpath_result (input
+# file name or path is assumed to be in w32 format, as previously converted
+# from $build's *nix or MSYS format). In case (3), returns the w32 file name
+# or path in func_cygpath_result (input file name or path is assumed to be in
+# Cygwin format). Returns an empty string on error.
+#
+# ARGS are passed to cygpath, with the last one being the file name or path to
+# be converted.
+#
+# Specify the absolute *nix (or w32) name to cygpath in the LT_CYGPATH
+# environment variable; do not put it in $PATH.
+func_cygpath ()
+{
+  $opt_debug
+  if test -n "$LT_CYGPATH" && test -f "$LT_CYGPATH"; then
+    func_cygpath_result=`$LT_CYGPATH "$@" 2>/dev/null`
+    if test "$?" -ne 0; then
+      # on failure, ensure result is empty
+      func_cygpath_result=
+    fi
+  else
+    func_cygpath_result=
+    func_error "LT_CYGPATH is empty or specifies non-existent file: \`$LT_CYGPATH'"
+  fi
+}
+#end: func_cygpath
+
+
+# func_convert_core_msys_to_w32 ARG
+# Convert file name or path ARG from MSYS format to w32 format.  Return
+# result in func_convert_core_msys_to_w32_result.
+func_convert_core_msys_to_w32 ()
+{
+  $opt_debug
+  # awkward: cmd appends spaces to result
+  func_convert_core_msys_to_w32_result=`( cmd //c echo "$1" ) 2>/dev/null |
+    $SED -e 's/[ ]*$//' -e "$lt_sed_naive_backslashify"`
+}
+#end: func_convert_core_msys_to_w32
+
+
+# func_convert_file_check ARG1 ARG2
+# Verify that ARG1 (a file name in $build format) was converted to $host
+# format in ARG2. Otherwise, emit an error message, but continue (resetting
+# func_to_host_file_result to ARG1).
+func_convert_file_check ()
+{
+  $opt_debug
+  if test -z "$2" && test -n "$1" ; then
+    func_error "Could not determine host file name corresponding to"
+    func_error "  \`$1'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback:
+    func_to_host_file_result="$1"
+  fi
+}
+# end func_convert_file_check
+
+
+# func_convert_path_check FROM_PATHSEP TO_PATHSEP FROM_PATH TO_PATH
+# Verify that FROM_PATH (a path in $build format) was converted to $host
+# format in TO_PATH. Otherwise, emit an error message, but continue, resetting
+# func_to_host_file_result to a simplistic fallback value (see below).
+func_convert_path_check ()
+{
+  $opt_debug
+  if test -z "$4" && test -n "$3"; then
+    func_error "Could not determine the host path corresponding to"
+    func_error "  \`$3'"
+    func_error "Continuing, but uninstalled executables may not work."
+    # Fallback.  This is a deliberately simplistic "conversion" and
+    # should not be "improved".  See libtool.info.
+    if test "x$1" != "x$2"; then
+      lt_replace_pathsep_chars="s|$1|$2|g"
+      func_to_host_path_result=`echo "$3" |
+        $SED -e "$lt_replace_pathsep_chars"`
+    else
+      func_to_host_path_result="$3"
+    fi
+  fi
+}
+# end func_convert_path_check
+
+
+# func_convert_path_front_back_pathsep FRONTPAT BACKPAT REPL ORIG
+# Modifies func_to_host_path_result by prepending REPL if ORIG matches FRONTPAT
+# and appending REPL if ORIG matches BACKPAT.
+func_convert_path_front_back_pathsep ()
+{
+  $opt_debug
+  case $4 in
+  $1 ) func_to_host_path_result="$3$func_to_host_path_result"
+    ;;
+  esac
+  case $4 in
+  $2 ) func_append func_to_host_path_result "$3"
+    ;;
+  esac
+}
+# end func_convert_path_front_back_pathsep
+
+
+##################################################
+# $build to $host FILE NAME CONVERSION FUNCTIONS #
+##################################################
+# invoked via `$to_host_file_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# Result will be available in $func_to_host_file_result.
+
+
+# func_to_host_file ARG
+# Converts the file name ARG from $build format to $host format. Return result
+# in func_to_host_file_result.
+func_to_host_file ()
+{
+  $opt_debug
+  $to_host_file_cmd "$1"
+}
+# end func_to_host_file
+
+
+# func_to_tool_file ARG LAZY
+# converts the file name ARG from $build format to toolchain format. Return
+# result in func_to_tool_file_result.  If the conversion in use is listed
+# in (the comma separated) LAZY, no conversion takes place.
+func_to_tool_file ()
+{
+  $opt_debug
+  case ,$2, in
+    *,"$to_tool_file_cmd",*)
+      func_to_tool_file_result=$1
+      ;;
+    *)
+      $to_tool_file_cmd "$1"
+      func_to_tool_file_result=$func_to_host_file_result
+      ;;
+  esac
+}
+# end func_to_tool_file
+
+
+# func_convert_file_noop ARG
+# Copy ARG to func_to_host_file_result.
+func_convert_file_noop ()
+{
+  func_to_host_file_result="$1"
+}
+# end func_convert_file_noop
+
+
+# func_convert_file_msys_to_w32 ARG
+# Convert file name ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_file_result.
+func_convert_file_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_msys_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_w32
+
+
+# func_convert_file_cygwin_to_w32 ARG
+# Convert file name ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_file_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # because $build is cygwin, we call "the" cygpath in $PATH; no need to use
+    # LT_CYGPATH in this case.
+    func_to_host_file_result=`cygpath -m "$1"`
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_cygwin_to_w32
+
+
+# func_convert_file_nix_to_w32 ARG
+# Convert file name ARG from *nix to w32 format.  Requires a wine environment
+# and a working winepath. Returns result in func_to_host_file_result.
+func_convert_file_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_file_wine_to_w32 "$1"
+    func_to_host_file_result="$func_convert_core_file_wine_to_w32_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_w32
+
+
+# func_convert_file_msys_to_cygwin ARG
+# Convert file name ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_file_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    func_convert_core_msys_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_msys_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_msys_to_cygwin
+
+
+# func_convert_file_nix_to_cygwin ARG
+# Convert file name ARG from *nix to Cygwin format.  Requires Cygwin installed
+# in a wine environment, working winepath, and LT_CYGPATH set.  Returns result
+# in func_to_host_file_result.
+func_convert_file_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_file_result="$1"
+  if test -n "$1"; then
+    # convert from *nix to w32, then use cygpath to convert from w32 to cygwin.
+    func_convert_core_file_wine_to_w32 "$1"
+    func_cygpath -u "$func_convert_core_file_wine_to_w32_result"
+    func_to_host_file_result="$func_cygpath_result"
+  fi
+  func_convert_file_check "$1" "$func_to_host_file_result"
+}
+# end func_convert_file_nix_to_cygwin
+
+
+#############################################
+# $build to $host PATH CONVERSION FUNCTIONS #
+#############################################
+# invoked via `$to_host_path_cmd ARG'
+#
+# In each case, ARG is the path to be converted from $build to $host format.
+# The result will be available in $func_to_host_path_result.
+#
+# Path separators are also converted from $build format to $host format.  If
+# ARG begins or ends with a path separator character, it is preserved (but
+# converted to $host format) on output.
+#
+# All path conversion functions are named using the following convention:
+#   file name conversion function    : func_convert_file_X_to_Y ()
+#   path conversion function         : func_convert_path_X_to_Y ()
+# where, for any given $build/$host combination the 'X_to_Y' value is the
+# same.  If conversion functions are added for new $build/$host combinations,
+# the two new functions must follow this pattern, or func_init_to_host_path_cmd
+# will break.
+
+
+# func_init_to_host_path_cmd
+# Ensures that function "pointer" variable $to_host_path_cmd is set to the
+# appropriate value, based on the value of $to_host_file_cmd.
+to_host_path_cmd=
+func_init_to_host_path_cmd ()
+{
+  $opt_debug
+  if test -z "$to_host_path_cmd"; then
+    func_stripname 'func_convert_file_' '' "$to_host_file_cmd"
+    to_host_path_cmd="func_convert_path_${func_stripname_result}"
+  fi
+}
+
+
+# func_to_host_path ARG
+# Converts the path ARG from $build format to $host format. Return result
+# in func_to_host_path_result.
+func_to_host_path ()
+{
+  $opt_debug
+  func_init_to_host_path_cmd
+  $to_host_path_cmd "$1"
+}
+# end func_to_host_path
+
+
+# func_convert_path_noop ARG
+# Copy ARG to func_to_host_path_result.
+func_convert_path_noop ()
+{
+  func_to_host_path_result="$1"
+}
+# end func_convert_path_noop
+
+
+# func_convert_path_msys_to_w32 ARG
+# Convert path ARG from (mingw) MSYS to (mingw) w32 format; automatic
+# conversion to w32 is not available inside the cwrapper.  Returns result in
+# func_to_host_path_result.
+func_convert_path_msys_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from ARG.  MSYS
+    # behavior is inconsistent here; cygpath turns them into '.;' and ';.';
+    # and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_msys_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_msys_to_w32
+
+
+# func_convert_path_cygwin_to_w32 ARG
+# Convert path ARG from Cygwin to w32 format.  Returns result in
+# func_to_host_file_result.
+func_convert_path_cygwin_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_to_host_path_result=`cygpath -m -p "$func_to_host_path_tmp1"`
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_cygwin_to_w32
+
+
+# func_convert_path_nix_to_w32 ARG
+# Convert path ARG from *nix to w32 format.  Requires a wine environment and
+# a working winepath.  Returns result in func_to_host_file_result.
+func_convert_path_nix_to_w32 ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_to_host_path_result="$func_convert_core_path_wine_to_w32_result"
+    func_convert_path_check : ";" \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" ";" "$1"
+  fi
+}
+# end func_convert_path_nix_to_w32
+
+
+# func_convert_path_msys_to_cygwin ARG
+# Convert path ARG from MSYS to Cygwin format.  Requires LT_CYGPATH set.
+# Returns result in func_to_host_file_result.
+func_convert_path_msys_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # See func_convert_path_msys_to_w32:
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_msys_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_msys_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_msys_to_cygwin
+
+
+# func_convert_path_nix_to_cygwin ARG
+# Convert path ARG from *nix to Cygwin format.  Requires Cygwin installed in a
+# a wine environment, working winepath, and LT_CYGPATH set.  Returns result in
+# func_to_host_file_result.
+func_convert_path_nix_to_cygwin ()
+{
+  $opt_debug
+  func_to_host_path_result="$1"
+  if test -n "$1"; then
+    # Remove leading and trailing path separator characters from
+    # ARG. msys behavior is inconsistent here, cygpath turns them
+    # into '.;' and ';.', and winepath ignores them completely.
+    func_stripname : : "$1"
+    func_to_host_path_tmp1=$func_stripname_result
+    func_convert_core_path_wine_to_w32 "$func_to_host_path_tmp1"
+    func_cygpath -u -p "$func_convert_core_path_wine_to_w32_result"
+    func_to_host_path_result="$func_cygpath_result"
+    func_convert_path_check : : \
+      "$func_to_host_path_tmp1" "$func_to_host_path_result"
+    func_convert_path_front_back_pathsep ":*" "*:" : "$1"
+  fi
+}
+# end func_convert_path_nix_to_cygwin
+
+
 # func_mode_compile arg...
 func_mode_compile ()
 {
@@ -1137,12 +1986,12 @@
 	  ;;
 
 	-pie | -fpie | -fPIE)
-          pie_flag="$pie_flag $arg"
+          func_append pie_flag " $arg"
 	  continue
 	  ;;
 
 	-shared | -static | -prefer-pic | -prefer-non-pic)
-	  later="$later $arg"
+	  func_append later " $arg"
 	  continue
 	  ;;
 
@@ -1163,15 +2012,14 @@
 	  save_ifs="$IFS"; IFS=','
 	  for arg in $args; do
 	    IFS="$save_ifs"
-	    func_quote_for_eval "$arg"
-	    lastarg="$lastarg $func_quote_for_eval_result"
+	    func_append_quoted lastarg "$arg"
 	  done
 	  IFS="$save_ifs"
 	  func_stripname ' ' '' "$lastarg"
 	  lastarg=$func_stripname_result
 
 	  # Add the arguments to base_compile.
-	  base_compile="$base_compile $lastarg"
+	  func_append base_compile " $lastarg"
 	  continue
 	  ;;
 
@@ -1187,8 +2035,7 @@
       esac    #  case $arg_mode
 
       # Aesthetically quote the previous argument.
-      func_quote_for_eval "$lastarg"
-      base_compile="$base_compile $func_quote_for_eval_result"
+      func_append_quoted base_compile "$lastarg"
     done # for arg
 
     case $arg_mode in
@@ -1213,7 +2060,7 @@
     *.[cCFSifmso] | \
     *.ada | *.adb | *.ads | *.asm | \
     *.c++ | *.cc | *.ii | *.class | *.cpp | *.cxx | \
-    *.[fF][09]? | *.for | *.java | *.obj | *.sx)
+    *.[fF][09]? | *.for | *.java | *.go | *.obj | *.sx | *.cu | *.cup)
       func_xform "$libobj"
       libobj=$func_xform_result
       ;;
@@ -1288,7 +2135,7 @@
     # Calculate the filename of the output object if compiler does
     # not support -o with -c
     if test "$compiler_c_o" = no; then
-      output_obj=`$ECHO "X$srcfile" | $Xsed -e 's%^.*/%%' -e 's%\.[^.]*$%%'`.${objext}
+      output_obj=`$ECHO "$srcfile" | $SED 's%^.*/%%; s%\.[^.]*$%%'`.${objext}
       lockfile="$output_obj.lock"
     else
       output_obj=
@@ -1319,17 +2166,16 @@
 	$opt_dry_run || $RM $removelist
 	exit $EXIT_FAILURE
       fi
-      removelist="$removelist $output_obj"
+      func_append removelist " $output_obj"
       $ECHO "$srcfile" > "$lockfile"
     fi
 
     $opt_dry_run || $RM $removelist
-    removelist="$removelist $lockfile"
+    func_append removelist " $lockfile"
     trap '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE' 1 2 15
 
-    if test -n "$fix_srcfile_path"; then
-      eval srcfile=\"$fix_srcfile_path\"
-    fi
+    func_to_tool_file "$srcfile" func_convert_file_msys_to_w32
+    srcfile=$func_to_tool_file_result
     func_quote_for_eval "$srcfile"
     qsrcfile=$func_quote_for_eval_result
 
@@ -1349,7 +2195,7 @@
 
       if test -z "$output_obj"; then
 	# Place PIC objects in $objdir
-	command="$command -o $lobj"
+	func_append command " -o $lobj"
       fi
 
       func_show_eval_locale "$command"	\
@@ -1396,11 +2242,11 @@
 	command="$base_compile $qsrcfile $pic_flag"
       fi
       if test "$compiler_c_o" = yes; then
-	command="$command -o $obj"
+	func_append command " -o $obj"
       fi
 
       # Suppress compiler output if we already did a PIC compilation.
-      command="$command$suppress_output"
+      func_append command "$suppress_output"
       func_show_eval_locale "$command" \
         '$opt_dry_run || $RM $removelist; exit $EXIT_FAILURE'
 
@@ -1445,13 +2291,13 @@
 }
 
 $opt_help || {
-test "$mode" = compile && func_mode_compile ${1+"$@"}
+  test "$opt_mode" = compile && func_mode_compile ${1+"$@"}
 }
 
 func_mode_help ()
 {
     # We need to display help for each of the modes.
-    case $mode in
+    case $opt_mode in
       "")
         # Generic help is extracted from the usage comments
         # at the start of this file.
@@ -1482,10 +2328,11 @@
 
   -o OUTPUT-FILE    set the output file name to OUTPUT-FILE
   -no-suppress      do not suppress compiler output for multiple passes
-  -prefer-pic       try to building PIC objects only
-  -prefer-non-pic   try to building non-PIC objects only
+  -prefer-pic       try to build PIC objects only
+  -prefer-non-pic   try to build non-PIC objects only
   -shared           do not build a \`.o' file suitable for static linking
   -static           only build a \`.o' file suitable for static linking
+  -Wc,FLAG          pass FLAG directly to the compiler
 
 COMPILE-COMMAND is a command to be used in creating a \`standard' object file
 from the given SOURCEFILE.
@@ -1538,7 +2385,7 @@
 
 The following components of INSTALL-COMMAND are treated specially:
 
-  -inst-prefix PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
+  -inst-prefix-dir PREFIX-DIR  Use PREFIX-DIR as a staging area for installation
 
 The rest of the components are interpreted as arguments to that command (only
 BSD-compatible install options are recognized)."
@@ -1558,6 +2405,8 @@
 
   -all-static       do not do any dynamic linking at all
   -avoid-version    do not add a version suffix if possible
+  -bindir BINDIR    specify path to binaries directory (for systems where
+                    libraries must be found in the PATH setting at runtime)
   -dlopen FILE      \`-dlpreopen' FILE if it cannot be dlopened at runtime
   -dlpreopen FILE   link in FILE and add its symbols to lt_preloaded_symbols
   -export-dynamic   allow symbols from OUTPUT-FILE to be resolved with dlsym(3)
@@ -1586,6 +2435,11 @@
   -version-info CURRENT[:REVISION[:AGE]]
                     specify library version info [each variable defaults to 0]
   -weak LIBNAME     declare that the target provides the LIBNAME interface
+  -Wc,FLAG
+  -Xcompiler FLAG   pass linker-specific FLAG directly to the compiler
+  -Wl,FLAG
+  -Xlinker FLAG     pass linker-specific FLAG directly to the linker
+  -XCClinker FLAG   pass link-specific FLAG to the compiler driver (CC)
 
 All other options (arguments beginning with \`-') are ignored.
 
@@ -1619,18 +2473,44 @@
         ;;
 
       *)
-        func_fatal_help "invalid operation mode \`$mode'"
+        func_fatal_help "invalid operation mode \`$opt_mode'"
         ;;
     esac
 
-    $ECHO
+    echo
     $ECHO "Try \`$progname --help' for more information about other modes."
-
-    exit $?
 }
 
-  # Now that we've collected a possible --mode arg, show help if necessary
-  $opt_help && func_mode_help
+# Now that we've collected a possible --mode arg, show help if necessary
+if $opt_help; then
+  if test "$opt_help" = :; then
+    func_mode_help
+  else
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	func_mode_help
+      done
+    } | sed -n '1p; 2,$s/^Usage:/  or: /p'
+    {
+      func_help noexit
+      for opt_mode in compile link execute install finish uninstall clean; do
+	echo
+	func_mode_help
+      done
+    } |
+    sed '1d
+      /^When reporting/,/^Report/{
+	H
+	d
+      }
+      $x
+      /information about other modes/d
+      /more detailed .*MODE/d
+      s/^Usage:.*--mode=\([^ ]*\) .*/Description of \1 mode:/'
+  fi
+  exit $?
+fi
 
 
 # func_mode_execute arg...
@@ -1643,13 +2523,16 @@
       func_fatal_help "you must specify a COMMAND"
 
     # Handle -dlopen flags immediately.
-    for file in $execute_dlfiles; do
+    for file in $opt_dlopen; do
       test -f "$file" \
 	|| func_fatal_help "\`$file' is not a file"
 
       dir=
       case $file in
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$lib' is not a valid libtool archive"
@@ -1671,7 +2554,7 @@
 	dir="$func_dirname_result"
 
 	if test -f "$dir/$objdir/$dlname"; then
-	  dir="$dir/$objdir"
+	  func_append dir "/$objdir"
 	else
 	  if test ! -f "$dir/$dlname"; then
 	    func_fatal_error "cannot find \`$dlname' in \`$dir' or \`$dir/$objdir'"
@@ -1712,7 +2595,7 @@
     for file
     do
       case $file in
-      -*) ;;
+      -* | *.la | *.lo ) ;;
       *)
 	# Do a test to see if this is really a libtool program.
 	if func_ltwrapper_script_p "$file"; then
@@ -1728,8 +2611,7 @@
 	;;
       esac
       # Quote arguments (to preserve shell metacharacters).
-      func_quote_for_eval "$file"
-      args="$args $func_quote_for_eval_result"
+      func_append_quoted args "$file"
     done
 
     if test "X$opt_dry_run" = Xfalse; then
@@ -1754,29 +2636,66 @@
       # Display what would be done.
       if test -n "$shlibpath_var"; then
 	eval "\$ECHO \"\$shlibpath_var=\$$shlibpath_var\""
-	$ECHO "export $shlibpath_var"
+	echo "export $shlibpath_var"
       fi
       $ECHO "$cmd$args"
       exit $EXIT_SUCCESS
     fi
 }
 
-test "$mode" = execute && func_mode_execute ${1+"$@"}
+test "$opt_mode" = execute && func_mode_execute ${1+"$@"}
+
+
+# func_mode_finish arg...
+func_mode_finish ()
+{
+    $opt_debug
+    libs=
+    libdirs=
+    admincmds=
+
+    for opt in "$nonopt" ${1+"$@"}
+    do
+      if test -d "$opt"; then
+	func_append libdirs " $opt"
+
+      elif test -f "$opt"; then
+	if func_lalib_unsafe_p "$opt"; then
+	  func_append libs " $opt"
+	else
+	  func_warning "\`$opt' is not a valid libtool archive"
+	fi
+
+      else
+	func_fatal_error "invalid argument \`$opt'"
+      fi
+    done
 
+    if test -n "$libs"; then
+      if test -n "$lt_sysroot"; then
+        sysroot_regex=`$ECHO "$lt_sysroot" | $SED "$sed_make_literal_regex"`
+        sysroot_cmd="s/\([ ']\)$sysroot_regex/\1/g;"
+      else
+        sysroot_cmd=
+      fi
 
-# func_mode_finish arg...
-func_mode_finish ()
-{
-    $opt_debug
-    libdirs="$nonopt"
-    admincmds=
+      # Remove sysroot references
+      if $opt_dry_run; then
+        for lib in $libs; do
+          echo "removing references to $lt_sysroot and \`=' prefixes from $lib"
+        done
+      else
+        tmpdir=`func_mktempdir`
+        for lib in $libs; do
+	  sed -e "${sysroot_cmd} s/\([ ']-[LR]\)=/\1/g; s/\([ ']\)=/\1/g" $lib \
+	    > $tmpdir/tmp-la
+	  mv -f $tmpdir/tmp-la $lib
+	done
+        ${RM}r "$tmpdir"
+      fi
+    fi
 
     if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
-      for dir
-      do
-	libdirs="$libdirs $dir"
-      done
-
       for libdir in $libdirs; do
 	if test -n "$finish_cmds"; then
 	  # Do each command in the finish commands.
@@ -1786,7 +2705,7 @@
 	if test -n "$finish_eval"; then
 	  # Do the single finish_eval.
 	  eval cmds=\"$finish_eval\"
-	  $opt_dry_run || eval "$cmds" || admincmds="$admincmds
+	  $opt_dry_run || eval "$cmds" || func_append admincmds "
        $cmds"
 	fi
       done
@@ -1795,53 +2714,55 @@
     # Exit here if they wanted silent mode.
     $opt_silent && exit $EXIT_SUCCESS
 
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
-    $ECHO "Libraries have been installed in:"
-    for libdir in $libdirs; do
-      $ECHO "   $libdir"
-    done
-    $ECHO
-    $ECHO "If you ever happen to want to link against installed libraries"
-    $ECHO "in a given directory, LIBDIR, you must either use libtool, and"
-    $ECHO "specify the full pathname of the library, or use the \`-LLIBDIR'"
-    $ECHO "flag during linking and do at least one of the following:"
-    if test -n "$shlibpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$shlibpath_var' environment variable"
-      $ECHO "     during execution"
-    fi
-    if test -n "$runpath_var"; then
-      $ECHO "   - add LIBDIR to the \`$runpath_var' environment variable"
-      $ECHO "     during linking"
-    fi
-    if test -n "$hardcode_libdir_flag_spec"; then
-      libdir=LIBDIR
-      eval flag=\"$hardcode_libdir_flag_spec\"
+    if test -n "$finish_cmds$finish_eval" && test -n "$libdirs"; then
+      echo "----------------------------------------------------------------------"
+      echo "Libraries have been installed in:"
+      for libdir in $libdirs; do
+	$ECHO "   $libdir"
+      done
+      echo
+      echo "If you ever happen to want to link against installed libraries"
+      echo "in a given directory, LIBDIR, you must either use libtool, and"
+      echo "specify the full pathname of the library, or use the \`-LLIBDIR'"
+      echo "flag during linking and do at least one of the following:"
+      if test -n "$shlibpath_var"; then
+	echo "   - add LIBDIR to the \`$shlibpath_var' environment variable"
+	echo "     during execution"
+      fi
+      if test -n "$runpath_var"; then
+	echo "   - add LIBDIR to the \`$runpath_var' environment variable"
+	echo "     during linking"
+      fi
+      if test -n "$hardcode_libdir_flag_spec"; then
+	libdir=LIBDIR
+	eval flag=\"$hardcode_libdir_flag_spec\"
 
-      $ECHO "   - use the \`$flag' linker flag"
-    fi
-    if test -n "$admincmds"; then
-      $ECHO "   - have your system administrator run these commands:$admincmds"
-    fi
-    if test -f /etc/ld.so.conf; then
-      $ECHO "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
-    fi
-    $ECHO
+	$ECHO "   - use the \`$flag' linker flag"
+      fi
+      if test -n "$admincmds"; then
+	$ECHO "   - have your system administrator run these commands:$admincmds"
+      fi
+      if test -f /etc/ld.so.conf; then
+	echo "   - have your system administrator add LIBDIR to \`/etc/ld.so.conf'"
+      fi
+      echo
 
-    $ECHO "See any operating system documentation about shared libraries for"
-    case $host in
-      solaris2.[6789]|solaris2.1[0-9])
-        $ECHO "more information, such as the ld(1), crle(1) and ld.so(8) manual"
-	$ECHO "pages."
-	;;
-      *)
-        $ECHO "more information, such as the ld(1) and ld.so(8) manual pages."
-        ;;
-    esac
-    $ECHO "X----------------------------------------------------------------------" | $Xsed
+      echo "See any operating system documentation about shared libraries for"
+      case $host in
+	solaris2.[6789]|solaris2.1[0-9])
+	  echo "more information, such as the ld(1), crle(1) and ld.so(8) manual"
+	  echo "pages."
+	  ;;
+	*)
+	  echo "more information, such as the ld(1) and ld.so(8) manual pages."
+	  ;;
+      esac
+      echo "----------------------------------------------------------------------"
+    fi
     exit $EXIT_SUCCESS
 }
 
-test "$mode" = finish && func_mode_finish ${1+"$@"}
+test "$opt_mode" = finish && func_mode_finish ${1+"$@"}
 
 
 # func_mode_install arg...
@@ -1852,7 +2773,7 @@
     # install_prog (especially on Windows NT).
     if test "$nonopt" = "$SHELL" || test "$nonopt" = /bin/sh ||
        # Allow the use of GNU shtool's install command.
-       $ECHO "X$nonopt" | $GREP shtool >/dev/null; then
+       case $nonopt in *shtool*) :;; *) false;; esac; then
       # Aesthetically quote it.
       func_quote_for_eval "$nonopt"
       install_prog="$func_quote_for_eval_result "
@@ -1866,7 +2787,12 @@
     # The real first argument should be the name of the installation program.
     # Aesthetically quote it.
     func_quote_for_eval "$arg"
-    install_prog="$install_prog$func_quote_for_eval_result"
+    func_append install_prog "$func_quote_for_eval_result"
+    install_shared_prog=$install_prog
+    case " $install_prog " in
+      *[\\\ /]cp\ *) install_cp=: ;;
+      *) install_cp=false ;;
+    esac
 
     # We need to accept at least all the BSD install flags.
     dest=
@@ -1876,10 +2802,12 @@
     install_type=
     isdir=no
     stripme=
+    no_mode=:
     for arg
     do
+      arg2=
       if test -n "$dest"; then
-	files="$files $dest"
+	func_append files " $dest"
 	dest=$arg
 	continue
       fi
@@ -1887,10 +2815,9 @@
       case $arg in
       -d) isdir=yes ;;
       -f)
-	case " $install_prog " in
-	*[\\\ /]cp\ *) ;;
-	*) prev=$arg ;;
-	esac
+	if $install_cp; then :; else
+	  prev=$arg
+	fi
 	;;
       -g | -m | -o)
 	prev=$arg
@@ -1904,6 +2831,10 @@
       *)
 	# If the previous option needed an argument, then skip it.
 	if test -n "$prev"; then
+	  if test "x$prev" = x-m && test -n "$install_override_mode"; then
+	    arg2=$install_override_mode
+	    no_mode=false
+	  fi
 	  prev=
 	else
 	  dest=$arg
@@ -1914,7 +2845,11 @@
 
       # Aesthetically quote the argument.
       func_quote_for_eval "$arg"
-      install_prog="$install_prog $func_quote_for_eval_result"
+      func_append install_prog " $func_quote_for_eval_result"
+      if test -n "$arg2"; then
+	func_quote_for_eval "$arg2"
+      fi
+      func_append install_shared_prog " $func_quote_for_eval_result"
     done
 
     test -z "$install_prog" && \
@@ -1923,6 +2858,13 @@
     test -n "$prev" && \
       func_fatal_help "the \`$prev' option requires an argument"
 
+    if test -n "$install_override_mode" && $no_mode; then
+      if $install_cp; then :; else
+	func_quote_for_eval "$install_override_mode"
+	func_append install_shared_prog " -m $func_quote_for_eval_result"
+      fi
+    fi
+
     if test -z "$files"; then
       if test -z "$dest"; then
 	func_fatal_help "no file or destination specified"
@@ -1977,10 +2919,13 @@
       case $file in
       *.$libext)
 	# Do the static libraries later.
-	staticlibs="$staticlibs $file"
+	func_append staticlibs " $file"
 	;;
 
       *.la)
+	func_resolve_sysroot "$file"
+	file=$func_resolve_sysroot_result
+
 	# Check to see that this really is a libtool archive.
 	func_lalib_unsafe_p "$file" \
 	  || func_fatal_help "\`$file' is not a valid libtool archive"
@@ -1994,23 +2939,23 @@
 	if test "X$destdir" = "X$libdir"; then
 	  case "$current_libdirs " in
 	  *" $libdir "*) ;;
-	  *) current_libdirs="$current_libdirs $libdir" ;;
+	  *) func_append current_libdirs " $libdir" ;;
 	  esac
 	else
 	  # Note the libdir as a future libdir.
 	  case "$future_libdirs " in
 	  *" $libdir "*) ;;
-	  *) future_libdirs="$future_libdirs $libdir" ;;
+	  *) func_append future_libdirs " $libdir" ;;
 	  esac
 	fi
 
 	func_dirname "$file" "/" ""
 	dir="$func_dirname_result"
-	dir="$dir$objdir"
+	func_append dir "$objdir"
 
 	if test -n "$relink_command"; then
 	  # Determine the prefix the user has applied to our future dir.
-	  inst_prefix_dir=`$ECHO "X$destdir" | $Xsed -e "s%$libdir\$%%"`
+	  inst_prefix_dir=`$ECHO "$destdir" | $SED -e "s%$libdir\$%%"`
 
 	  # Don't allow the user to place us outside of our expected
 	  # location b/c this prevents finding dependent libraries that
@@ -2023,9 +2968,9 @@
 
 	  if test -n "$inst_prefix_dir"; then
 	    # Stick the inst_prefix_dir data into the link command.
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%-inst-prefix-dir $inst_prefix_dir%"`
 	  else
-	    relink_command=`$ECHO "X$relink_command" | $Xsed -e "s%@inst_prefix_dir@%%"`
+	    relink_command=`$ECHO "$relink_command" | $SED "s%@inst_prefix_dir@%%"`
 	  fi
 
 	  func_warning "relinking \`$file'"
@@ -2043,7 +2988,7 @@
 	  test -n "$relink_command" && srcname="$realname"T
 
 	  # Install the shared library and build the symlinks.
-	  func_show_eval "$install_prog $dir/$srcname $destdir/$realname" \
+	  func_show_eval "$install_shared_prog $dir/$srcname $destdir/$realname" \
 	      'exit $?'
 	  tstripme="$stripme"
 	  case $host_os in
@@ -2083,7 +3028,7 @@
 	func_show_eval "$install_prog $instname $destdir/$name" 'exit $?'
 
 	# Maybe install the static library, too.
-	test -n "$old_library" && staticlibs="$staticlibs $dir/$old_library"
+	test -n "$old_library" && func_append staticlibs " $dir/$old_library"
 	;;
 
       *.lo)
@@ -2183,7 +3128,7 @@
 	    if test -f "$lib"; then
 	      func_source "$lib"
 	    fi
-	    libfile="$libdir/"`$ECHO "X$lib" | $Xsed -e 's%^.*/%%g'` ### testsuite: skip nested quoting test
+	    libfile="$libdir/"`$ECHO "$lib" | $SED 's%^.*/%%g'` ### testsuite: skip nested quoting test
 	    if test -n "$libdir" && test ! -f "$libfile"; then
 	      func_warning "\`$lib' has not been installed in \`$libdir'"
 	      finalize=no
@@ -2202,7 +3147,7 @@
 		file="$func_basename_result"
 	        outputname="$tmpdir/$file"
 	        # Replace the output file specification.
-	        relink_command=`$ECHO "X$relink_command" | $Xsed -e 's%@OUTPUT@%'"$outputname"'%g'`
+	        relink_command=`$ECHO "$relink_command" | $SED 's%@OUTPUT@%'"$outputname"'%g'`
 
 	        $opt_silent || {
 	          func_quote_for_expand "$relink_command"
@@ -2221,7 +3166,7 @@
 	    }
 	  else
 	    # Install the binary that we compiled earlier.
-	    file=`$ECHO "X$file$stripped_ext" | $Xsed -e "s%\([^/]*\)$%$objdir/\1%"`
+	    file=`$ECHO "$file$stripped_ext" | $SED "s%\([^/]*\)$%$objdir/\1%"`
 	  fi
 	fi
 
@@ -2257,11 +3202,13 @@
 
       # Set up the ranlib parameters.
       oldlib="$destdir/$name"
+      func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+      tool_oldlib=$func_to_tool_file_result
 
       func_show_eval "$install_prog \$file \$oldlib" 'exit $?'
 
       if test -n "$stripme" && test -n "$old_striplib"; then
-	func_show_eval "$old_striplib $oldlib" 'exit $?'
+	func_show_eval "$old_striplib $tool_oldlib" 'exit $?'
       fi
 
       # Do each command in the postinstall commands.
@@ -2280,7 +3227,7 @@
     fi
 }
 
-test "$mode" = install && func_mode_install ${1+"$@"}
+test "$opt_mode" = install && func_mode_install ${1+"$@"}
 
 
 # func_generate_dlsyms outputname originator pic_p
@@ -2323,6 +3270,22 @@
 extern \"C\" {
 #endif
 
+#if defined(__GNUC__) && (((__GNUC__ == 4) && (__GNUC_MINOR__ >= 4)) || (__GNUC__ > 4))
+#pragma GCC diagnostic ignored \"-Wstrict-prototypes\"
+#endif
+
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 /* External symbol declarations for the compiler. */\
 "
 
@@ -2332,10 +3295,11 @@
 	  $opt_dry_run || echo ': @PROGRAM@ ' > "$nlist"
 
 	  # Add our own program objects to the symbol list.
-	  progfiles=`$ECHO "X$objs$old_deplibs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	  progfiles=`$ECHO "$objs$old_deplibs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	  for progfile in $progfiles; do
-	    func_verbose "extracting global C symbols from \`$progfile'"
-	    $opt_dry_run || eval "$NM $progfile | $global_symbol_pipe >> '$nlist'"
+	    func_to_tool_file "$progfile" func_convert_file_msys_to_w32
+	    func_verbose "extracting global C symbols from \`$func_to_tool_file_result'"
+	    $opt_dry_run || eval "$NM $func_to_tool_file_result | $global_symbol_pipe >> '$nlist'"
 	  done
 
 	  if test -n "$exclude_expsyms"; then
@@ -2371,7 +3335,7 @@
 	      eval '$GREP -f "$output_objdir/$outputname.exp" < "$nlist" > "$nlist"T'
 	      eval '$MV "$nlist"T "$nlist"'
 	      case $host in
-	        *cygwin | *mingw* | *cegcc* )
+	        *cygwin* | *mingw* | *cegcc* )
 	          eval "echo EXPORTS "'> "$output_objdir/$outputname.def"'
 	          eval 'cat "$nlist" >> "$output_objdir/$outputname.def"'
 	          ;;
@@ -2384,10 +3348,52 @@
 	  func_verbose "extracting global C symbols from \`$dlprefile'"
 	  func_basename "$dlprefile"
 	  name="$func_basename_result"
-	  $opt_dry_run || {
-	    eval '$ECHO ": $name " >> "$nlist"'
-	    eval "$NM $dlprefile 2>/dev/null | $global_symbol_pipe >> '$nlist'"
-	  }
+          case $host in
+	    *cygwin* | *mingw* | *cegcc* )
+	      # if an import library, we need to obtain dlname
+	      if func_win32_import_lib_p "$dlprefile"; then
+	        func_tr_sh "$dlprefile"
+	        eval "curr_lafile=\$libfile_$func_tr_sh_result"
+	        dlprefile_dlbasename=""
+	        if test -n "$curr_lafile" && func_lalib_p "$curr_lafile"; then
+	          # Use subshell, to avoid clobbering current variable values
+	          dlprefile_dlname=`source "$curr_lafile" && echo "$dlname"`
+	          if test -n "$dlprefile_dlname" ; then
+	            func_basename "$dlprefile_dlname"
+	            dlprefile_dlbasename="$func_basename_result"
+	          else
+	            # no lafile. user explicitly requested -dlpreopen <import library>.
+	            $sharedlib_from_linklib_cmd "$dlprefile"
+	            dlprefile_dlbasename=$sharedlib_from_linklib_result
+	          fi
+	        fi
+	        $opt_dry_run || {
+	          if test -n "$dlprefile_dlbasename" ; then
+	            eval '$ECHO ": $dlprefile_dlbasename" >> "$nlist"'
+	          else
+	            func_warning "Could not compute DLL name from $name"
+	            eval '$ECHO ": $name " >> "$nlist"'
+	          fi
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe |
+	            $SED -e '/I __imp/d' -e 's/I __nm_/D /;s/_nm__//' >> '$nlist'"
+	        }
+	      else # not an import lib
+	        $opt_dry_run || {
+	          eval '$ECHO ": $name " >> "$nlist"'
+	          func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	          eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	        }
+	      fi
+	    ;;
+	    *)
+	      $opt_dry_run || {
+	        eval '$ECHO ": $name " >> "$nlist"'
+	        func_to_tool_file "$dlprefile" func_convert_file_msys_to_w32
+	        eval "$NM \"$func_to_tool_file_result\" 2>/dev/null | $global_symbol_pipe >> '$nlist'"
+	      }
+	    ;;
+          esac
 	done
 
 	$opt_dry_run || {
@@ -2415,36 +3421,19 @@
 	  if test -f "$nlist"S; then
 	    eval "$global_symbol_to_cdecl"' < "$nlist"S >> "$output_objdir/$my_dlsyms"'
 	  else
-	    $ECHO '/* NONE */' >> "$output_objdir/$my_dlsyms"
+	    echo '/* NONE */' >> "$output_objdir/$my_dlsyms"
 	  fi
 
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
 
 /* The mapping between symbol names and symbols.  */
 typedef struct {
   const char *name;
   void *address;
 } lt_dlsymlist;
-"
-	  case $host in
-	  *cygwin* | *mingw* | *cegcc* )
-	    $ECHO >> "$output_objdir/$my_dlsyms" "\
-/* DATA imports from DLLs on WIN32 con't be const, because
-   runtime relocations are performed -- see ld's documentation
-   on pseudo-relocs.  */"
-	    lt_dlsym_const= ;;
-	  *osf5*)
-	    echo >> "$output_objdir/$my_dlsyms" "\
-/* This system does not cope well with relocations in const data */"
-	    lt_dlsym_const= ;;
-	  *)
-	    lt_dlsym_const=const ;;
-	  esac
-
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
-extern $lt_dlsym_const lt_dlsymlist
+extern LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[];
-$lt_dlsym_const lt_dlsymlist
+LT_DLSYM_CONST lt_dlsymlist
 lt_${my_prefix}_LTX_preloaded_symbols[] =
 {\
   { \"$my_originator\", (void *) 0 },"
@@ -2457,7 +3446,7 @@
 	    eval "$global_symbol_to_c_name_address_lib_prefix" < "$nlist" >> "$output_objdir/$my_dlsyms"
 	    ;;
 	  esac
-	  $ECHO >> "$output_objdir/$my_dlsyms" "\
+	  echo >> "$output_objdir/$my_dlsyms" "\
   {0, (void *) 0}
 };
 
@@ -2484,7 +3473,7 @@
 	  # linked before any other PIC object.  But we must not use
 	  # pic_flag when linking with -static.  The problem exists in
 	  # FreeBSD 2.2.6 and is fixed in FreeBSD 3.1.
-	  *-*-freebsd2*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
+	  *-*-freebsd2.*|*-*-freebsd3.0*|*-*-freebsdelf3.0*)
 	    pic_flag_for_symtable=" $pic_flag -DFREEBSD_WORKAROUND" ;;
 	  *-*-hpux*)
 	    pic_flag_for_symtable=" $pic_flag"  ;;
@@ -2500,7 +3489,7 @@
 	for arg in $LTCFLAGS; do
 	  case $arg in
 	  -pie | -fpie | -fPIE) ;;
-	  *) symtab_cflags="$symtab_cflags $arg" ;;
+	  *) func_append symtab_cflags " $arg" ;;
 	  esac
 	done
 
@@ -2515,16 +3504,16 @@
 	case $host in
 	*cygwin* | *mingw* | *cegcc* )
 	  if test -f "$output_objdir/$my_outputname.def"; then
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$output_objdir/$my_outputname.def $symfileobj%"`
 	  else
-	    compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	    finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	    compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	    finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  fi
 	  ;;
 	*)
-	  compile_command=`$ECHO "X$compile_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
-	  finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s%@SYMFILE@%$symfileobj%"`
+	  compile_command=`$ECHO "$compile_command" | $SED "s%@SYMFILE@%$symfileobj%"`
+	  finalize_command=`$ECHO "$finalize_command" | $SED "s%@SYMFILE@%$symfileobj%"`
 	  ;;
 	esac
 	;;
@@ -2538,8 +3527,8 @@
       # really was required.
 
       # Nullify the symbol file.
-      compile_command=`$ECHO "X$compile_command" | $Xsed -e "s% @SYMFILE@%%"`
-      finalize_command=`$ECHO "X$finalize_command" | $Xsed -e "s% @SYMFILE@%%"`
+      compile_command=`$ECHO "$compile_command" | $SED "s% @SYMFILE@%%"`
+      finalize_command=`$ECHO "$finalize_command" | $SED "s% @SYMFILE@%%"`
     fi
 }
 
@@ -2549,6 +3538,7 @@
 # Need a lot of goo to handle *both* DLLs and import libs
 # Has to be a shell function in order to 'eat' the argument
 # that is supplied when $file_magic_command is called.
+# Despite the name, also deal with 64 bit binaries.
 func_win32_libid ()
 {
   $opt_debug
@@ -2559,9 +3549,11 @@
     win32_libid_type="x86 archive import"
     ;;
   *ar\ archive*) # could be an import, or static
+    # Keep the egrep pattern in sync with the one in _LT_CHECK_MAGIC_METHOD.
     if eval $OBJDUMP -f $1 | $SED -e '10q' 2>/dev/null |
-       $EGREP 'file format pe-i386(.*architecture: i386)?' >/dev/null ; then
-      win32_nmres=`eval $NM -f posix -A $1 |
+       $EGREP 'file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)' >/dev/null; then
+      func_to_tool_file "$1" func_convert_file_msys_to_w32
+      win32_nmres=`eval $NM -f posix -A \"$func_to_tool_file_result\" |
 	$SED -n -e '
 	    1,100{
 		/ I /{
@@ -2590,6 +3582,131 @@
   $ECHO "$win32_libid_type"
 }
 
+# func_cygming_dll_for_implib ARG
+#
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib ()
+{
+  $opt_debug
+  sharedlib_from_linklib_result=`$DLLTOOL --identify-strict --identify "$1"`
+}
+
+# func_cygming_dll_for_implib_fallback_core SECTION_NAME LIBNAMEs
+#
+# The is the core of a fallback implementation of a
+# platform-specific function to extract the name of the
+# DLL associated with the specified import library LIBNAME.
+#
+# SECTION_NAME is either .idata$6 or .idata$7, depending
+# on the platform and compiler that created the implib.
+#
+# Echos the name of the DLL associated with the
+# specified import library.
+func_cygming_dll_for_implib_fallback_core ()
+{
+  $opt_debug
+  match_literal=`$ECHO "$1" | $SED "$sed_make_literal_regex"`
+  $OBJDUMP -s --section "$1" "$2" 2>/dev/null |
+    $SED '/^Contents of section '"$match_literal"':/{
+      # Place marker at beginning of archive member dllname section
+      s/.*/====MARK====/
+      p
+      d
+    }
+    # These lines can sometimes be longer than 43 characters, but
+    # are always uninteresting
+    /:[	 ]*file format pe[i]\{,1\}-/d
+    /^In archive [^:]*:/d
+    # Ensure marker is printed
+    /^====MARK====/p
+    # Remove all lines with less than 43 characters
+    /^.\{43\}/!d
+    # From remaining lines, remove first 43 characters
+    s/^.\{43\}//' |
+    $SED -n '
+      # Join marker and all lines until next marker into a single line
+      /^====MARK====/ b para
+      H
+      $ b para
+      b
+      :para
+      x
+      s/\n//g
+      # Remove the marker
+      s/^====MARK====//
+      # Remove trailing dots and whitespace
+      s/[\. \t]*$//
+      # Print
+      /./p' |
+    # we now have a list, one entry per line, of the stringified
+    # contents of the appropriate section of all members of the
+    # archive which possess that section. Heuristic: eliminate
+    # all those which have a first or second character that is
+    # a '.' (that is, objdump's representation of an unprintable
+    # character.) This should work for all archives with less than
+    # 0x302f exports -- but will fail for DLLs whose name actually
+    # begins with a literal '.' or a single character followed by
+    # a '.'.
+    #
+    # Of those that remain, print the first one.
+    $SED -e '/^\./d;/^.\./d;q'
+}
+
+# func_cygming_gnu_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is a GNU/binutils-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_gnu_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_gnu_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $EGREP ' (_head_[A-Za-z0-9_]+_[ad]l*|[A-Za-z0-9_]+_[ad]l*_iname)$'`
+  test -n "$func_cygming_gnu_implib_tmp"
+}
+
+# func_cygming_ms_implib_p ARG
+# This predicate returns with zero status (TRUE) if
+# ARG is an MS-style import library. Returns
+# with nonzero status (FALSE) otherwise.
+func_cygming_ms_implib_p ()
+{
+  $opt_debug
+  func_to_tool_file "$1" func_convert_file_msys_to_w32
+  func_cygming_ms_implib_tmp=`$NM "$func_to_tool_file_result" | eval "$global_symbol_pipe" | $GREP '_NULL_IMPORT_DESCRIPTOR'`
+  test -n "$func_cygming_ms_implib_tmp"
+}
+
+# func_cygming_dll_for_implib_fallback ARG
+# Platform-specific function to extract the
+# name of the DLL associated with the specified
+# import library ARG.
+#
+# This fallback implementation is for use when $DLLTOOL
+# does not support the --identify-strict option.
+# Invoked by eval'ing the libtool variable
+#    $sharedlib_from_linklib_cmd
+# Result is available in the variable
+#    $sharedlib_from_linklib_result
+func_cygming_dll_for_implib_fallback ()
+{
+  $opt_debug
+  if func_cygming_gnu_implib_p "$1" ; then
+    # binutils import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$7' "$1"`
+  elif func_cygming_ms_implib_p "$1" ; then
+    # ms-generated import library
+    sharedlib_from_linklib_result=`func_cygming_dll_for_implib_fallback_core '.idata$6' "$1"`
+  else
+    # unknown
+    sharedlib_from_linklib_result=""
+  fi
+}
 
 
 # func_extract_an_archive dir oldlib
@@ -2598,7 +3715,18 @@
     $opt_debug
     f_ex_an_ar_dir="$1"; shift
     f_ex_an_ar_oldlib="$1"
-    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" 'exit $?'
+    if test "$lock_old_archive_extraction" = yes; then
+      lockfile=$f_ex_an_ar_oldlib.lock
+      until $opt_dry_run || ln "$progpath" "$lockfile" 2>/dev/null; do
+	func_echo "Waiting for $lockfile to be removed"
+	sleep 2
+      done
+    fi
+    func_show_eval "(cd \$f_ex_an_ar_dir && $AR x \"\$f_ex_an_ar_oldlib\")" \
+		   'stat=$?; rm -f "$lockfile"; exit $stat'
+    if test "$lock_old_archive_extraction" = yes; then
+      $opt_dry_run || rm -f "$lockfile"
+    fi
     if ($AR t "$f_ex_an_ar_oldlib" | sort | sort -uc >/dev/null 2>&1); then
      :
     else
@@ -2669,7 +3797,7 @@
 	    darwin_file=
 	    darwin_files=
 	    for darwin_file in $darwin_filelist; do
-	      darwin_files=`find unfat-$$ -name $darwin_file -print | $NL2SP`
+	      darwin_files=`find unfat-$$ -name $darwin_file -print | sort | $NL2SP`
 	      $LIPO -create -output "$darwin_file" $darwin_files
 	    done # $darwin_filelist
 	    $RM -rf unfat-$$
@@ -2684,25 +3812,30 @@
         func_extract_an_archive "$my_xdir" "$my_xabs"
 	;;
       esac
-      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | $NL2SP`
+      my_oldobjs="$my_oldobjs "`find $my_xdir -name \*.$objext -print -o -name \*.lo -print | sort | $NL2SP`
     done
 
     func_extract_archives_result="$my_oldobjs"
 }
 
 
-
-# func_emit_wrapper_part1 [arg=no]
+# func_emit_wrapper [arg=no]
 #
-# Emit the first part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part1 ()
-{
-	func_emit_wrapper_part1_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part1_arg1=$1
-	fi
+# Emit a libtool wrapper script on stdout.
+# Don't directly open a file because we may want to
+# incorporate the script contents within a cygwin/mingw
+# wrapper executable.  Must ONLY be called from within
+# func_mode_link because it depends on a number of variables
+# set therein.
+#
+# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
+# variable will take.  If 'yes', then the emitted script
+# will assume that the directory in which it is stored is
+# the $objdir directory.  This is a cygwin/mingw-specific
+# behavior.
+func_emit_wrapper ()
+{
+	func_emit_wrapper_arg1=${1-no}
 
 	$ECHO "\
 #! $SHELL
@@ -2718,7 +3851,6 @@
 
 # Sed substitution that helps us do robust quoting.  It backslashifies
 # metacharacters that are still active within double-quoted strings.
-Xsed='${SED} -e 1s/^X//'
 sed_quote_subst='$sed_quote_subst'
 
 # Be Bourne compatible
@@ -2749,31 +3881,135 @@
 else
   # When we are sourced in execute mode, \$file and \$ECHO are already set.
   if test \"\$libtool_execute_magic\" != \"$magic\"; then
-    ECHO=\"$qecho\"
-    file=\"\$0\"
-    # Make sure echo works.
-    if test \"X\$1\" = X--no-reexec; then
-      # Discard the --no-reexec flag, and continue.
-      shift
-    elif test \"X\`{ \$ECHO '\t'; } 2>/dev/null\`\" = 'X\t'; then
-      # Yippee, \$ECHO works!
-      :
-    else
-      # Restart under the correct shell, and then maybe \$ECHO will work.
-      exec $SHELL \"\$0\" --no-reexec \${1+\"\$@\"}
-    fi
-  fi\
+    file=\"\$0\""
+
+    qECHO=`$ECHO "$ECHO" | $SED "$sed_quote_subst"`
+    $ECHO "\
+
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+    ECHO=\"$qECHO\"
+  fi
+
+# Very basic option parsing. These options are (a) specific to
+# the libtool wrapper, (b) are identical between the wrapper
+# /script/ and the wrapper /executable/ which is used only on
+# windows platforms, and (c) all begin with the string "--lt-"
+# (application programs are unlikely to have options which match
+# this pattern).
+#
+# There are only two supported options: --lt-debug and
+# --lt-dump-script. There is, deliberately, no --lt-help.
+#
+# The first argument to this parsing function should be the
+# script's $0 value, followed by "$@".
+lt_option_debug=
+func_parse_lt_options ()
+{
+  lt_script_arg0=\$0
+  shift
+  for lt_opt
+  do
+    case \"\$lt_opt\" in
+    --lt-debug) lt_option_debug=1 ;;
+    --lt-dump-script)
+        lt_dump_D=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%/[^/]*$%%'\`
+        test \"X\$lt_dump_D\" = \"X\$lt_script_arg0\" && lt_dump_D=.
+        lt_dump_F=\`\$ECHO \"X\$lt_script_arg0\" | $SED -e 's/^X//' -e 's%^.*/%%'\`
+        cat \"\$lt_dump_D/\$lt_dump_F\"
+        exit 0
+      ;;
+    --lt-*)
+        \$ECHO \"Unrecognized --lt- option: '\$lt_opt'\" 1>&2
+        exit 1
+      ;;
+    esac
+  done
+
+  # Print the debug banner immediately:
+  if test -n \"\$lt_option_debug\"; then
+    echo \"${outputname}:${output}:\${LINENO}: libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\" 1>&2
+  fi
+}
+
+# Used when --lt-debug. Prints its arguments to stdout
+# (redirection is the responsibility of the caller)
+func_lt_dump_args ()
+{
+  lt_dump_args_N=1;
+  for lt_arg
+  do
+    \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[\$lt_dump_args_N]: \$lt_arg\"
+    lt_dump_args_N=\`expr \$lt_dump_args_N + 1\`
+  done
+}
+
+# Core function for launching the target application
+func_exec_program_core ()
+{
 "
-	$ECHO "\
+  case $host in
+  # Backslashes separate directories on plain windows
+  *-*-mingw | *-*-os2* | *-cegcc*)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir\\\\\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
+"
+    ;;
+
+  *)
+    $ECHO "\
+      if test -n \"\$lt_option_debug\"; then
+        \$ECHO \"${outputname}:${output}:\${LINENO}: newargv[0]: \$progdir/\$program\" 1>&2
+        func_lt_dump_args \${1+\"\$@\"} 1>&2
+      fi
+      exec \"\$progdir/\$program\" \${1+\"\$@\"}
+"
+    ;;
+  esac
+  $ECHO "\
+      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
+      exit 1
+}
+
+# A function to encapsulate launching the target application
+# Strips options in the --lt-* namespace from \$@ and
+# launches target application with the remaining arguments.
+func_exec_program ()
+{
+  case \" \$* \" in
+  *\\ --lt-*)
+    for lt_wr_arg
+    do
+      case \$lt_wr_arg in
+      --lt-*) ;;
+      *) set x \"\$@\" \"\$lt_wr_arg\"; shift;;
+      esac
+      shift
+    done ;;
+  esac
+  func_exec_program_core \${1+\"\$@\"}
+}
+
+  # Parse options
+  func_parse_lt_options \"\$0\" \${1+\"\$@\"}
 
   # Find the directory that this script lives in.
-  thisdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*$%%'\`
+  thisdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*$%%'\`
   test \"x\$thisdir\" = \"x\$file\" && thisdir=.
 
   # Follow symbolic links until we get to the real thisdir.
-  file=\`ls -ld \"\$file\" | ${SED} -n 's/.*-> //p'\`
+  file=\`ls -ld \"\$file\" | $SED -n 's/.*-> //p'\`
   while test -n \"\$file\"; do
-    destdir=\`\$ECHO \"X\$file\" | \$Xsed -e 's%/[^/]*\$%%'\`
+    destdir=\`\$ECHO \"\$file\" | $SED 's%/[^/]*\$%%'\`
 
     # If there was a directory component, then change thisdir.
     if test \"x\$destdir\" != \"x\$file\"; then
@@ -2783,30 +4019,13 @@
       esac
     fi
 
-    file=\`\$ECHO \"X\$file\" | \$Xsed -e 's%^.*/%%'\`
-    file=\`ls -ld \"\$thisdir/\$file\" | ${SED} -n 's/.*-> //p'\`
+    file=\`\$ECHO \"\$file\" | $SED 's%^.*/%%'\`
+    file=\`ls -ld \"\$thisdir/\$file\" | $SED -n 's/.*-> //p'\`
   done
-"
-}
-# end: func_emit_wrapper_part1
-
-# func_emit_wrapper_part2 [arg=no]
-#
-# Emit the second part of a libtool wrapper script on stdout.
-# For more information, see the description associated with
-# func_emit_wrapper(), below.
-func_emit_wrapper_part2 ()
-{
-	func_emit_wrapper_part2_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_part2_arg1=$1
-	fi
-
-	$ECHO "\
 
   # Usually 'no', except on cygwin/mingw when embedded into
   # the cwrapper.
-  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_part2_arg1
+  WRAPPER_SCRIPT_BELONGS_IN_OBJDIR=$func_emit_wrapper_arg1
   if test \"\$WRAPPER_SCRIPT_BELONGS_IN_OBJDIR\" = \"yes\"; then
     # special case for '.'
     if test \"\$thisdir\" = \".\"; then
@@ -2814,7 +4033,7 @@
     fi
     # remove .libs from thisdir
     case \"\$thisdir\" in
-    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"X\$thisdir\" | \$Xsed -e 's%[\\\\/][^\\\\/]*$%%'\` ;;
+    *[\\\\/]$objdir ) thisdir=\`\$ECHO \"\$thisdir\" | $SED 's%[\\\\/][^\\\\/]*$%%'\` ;;
     $objdir )   thisdir=. ;;
     esac
   fi
@@ -2869,6 +4088,18 @@
 
   if test -f \"\$progdir/\$program\"; then"
 
+	# fixup the dll searchpath if we need to.
+	#
+	# Fix the DLL searchpath if we need to.  Do this before prepending
+	# to shlibpath, because on Windows, both are PATH and uninstalled
+	# libraries must come first.
+	if test -n "$dllsearchpath"; then
+	  $ECHO "\
+    # Add the dll search path components to the executable PATH
+    PATH=$dllsearchpath:\$PATH
+"
+	fi
+
 	# Export our shlibpath_var if we have one.
 	if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
 	  $ECHO "\
@@ -2877,253 +4108,28 @@
 
     # Some systems cannot cope with colon-terminated $shlibpath_var
     # The second colon is a workaround for a bug in BeOS R4 sed
-    $shlibpath_var=\`\$ECHO \"X\$$shlibpath_var\" | \$Xsed -e 's/::*\$//'\`
+    $shlibpath_var=\`\$ECHO \"\$$shlibpath_var\" | $SED 's/::*\$//'\`
 
     export $shlibpath_var
 "
 	fi
 
-	# fixup the dll searchpath if we need to.
-	if test -n "$dllsearchpath"; then
-	  $ECHO "\
-    # Add the dll search path components to the executable PATH
-    PATH=$dllsearchpath:\$PATH
-"
-	fi
-
 	$ECHO "\
     if test \"\$libtool_execute_magic\" != \"$magic\"; then
       # Run the actual program with our arguments.
-"
-	case $host in
-	# Backslashes separate directories on plain windows
-	*-*-mingw | *-*-os2* | *-cegcc*)
-	  $ECHO "\
-      exec \"\$progdir\\\\\$program\" \${1+\"\$@\"}
-"
-	  ;;
-
-	*)
-	  $ECHO "\
-      exec \"\$progdir/\$program\" \${1+\"\$@\"}
-"
-	  ;;
-	esac
-	$ECHO "\
-      \$ECHO \"\$0: cannot exec \$program \$*\" 1>&2
-      exit 1
+      func_exec_program \${1+\"\$@\"}
     fi
   else
     # The program doesn't exist.
     \$ECHO \"\$0: error: \\\`\$progdir/\$program' does not exist\" 1>&2
     \$ECHO \"This script is just a wrapper for \$program.\" 1>&2
-    $ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
+    \$ECHO \"See the $PACKAGE documentation for more information.\" 1>&2
     exit 1
   fi
 fi\
 "
 }
-# end: func_emit_wrapper_part2
-
-
-# func_emit_wrapper [arg=no]
-#
-# Emit a libtool wrapper script on stdout.
-# Don't directly open a file because we may want to
-# incorporate the script contents within a cygwin/mingw
-# wrapper executable.  Must ONLY be called from within
-# func_mode_link because it depends on a number of variables
-# set therein.
-#
-# ARG is the value that the WRAPPER_SCRIPT_BELONGS_IN_OBJDIR
-# variable will take.  If 'yes', then the emitted script
-# will assume that the directory in which it is stored is
-# the $objdir directory.  This is a cygwin/mingw-specific
-# behavior.
-func_emit_wrapper ()
-{
-	func_emit_wrapper_arg1=no
-	if test -n "$1" ; then
-	  func_emit_wrapper_arg1=$1
-	fi
-
-	# split this up so that func_emit_cwrapperexe_src
-	# can call each part independently.
-	func_emit_wrapper_part1 "${func_emit_wrapper_arg1}"
-	func_emit_wrapper_part2 "${func_emit_wrapper_arg1}"
-}
-
-
-# func_to_host_path arg
-#
-# Convert paths to host format when used with build tools.
-# Intended for use with "native" mingw (where libtool itself
-# is running under the msys shell), or in the following cross-
-# build environments:
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-# where wine is equipped with the `winepath' executable.
-# In the native mingw case, the (msys) shell automatically
-# converts paths for any non-msys applications it launches,
-# but that facility isn't available from inside the cwrapper.
-# Similar accommodations are necessary for $host mingw and
-# $build cygwin.  Calling this function does no harm for other
-# $host/$build combinations not listed above.
-#
-# ARG is the path (on $build) that should be converted to
-# the proper representation for $host. The result is stored
-# in $func_to_host_path_result.
-func_to_host_path ()
-{
-  func_to_host_path_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        case $build in
-          *mingw* ) # actually, msys
-            # awkward: cmd appends spaces to result
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_path_tmp1=`( cmd //c echo "$1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_path_tmp1=`cygpath -w "$1"`
-            func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # Unfortunately, winepath does not exit with a non-zero
-            # error code, so we are forced to check the contents of
-            # stdout. On the other hand, if the command is not
-            # found, the shell will set an exit code of 127 and print
-            # *an error message* to stdout. So we must check for both
-            # error code of zero AND non-empty stdout, which explains
-            # the odd construction:
-            func_to_host_path_tmp1=`winepath -w "$1" 2>/dev/null`
-            if test "$?" -eq 0 && test -n "${func_to_host_path_tmp1}"; then
-              func_to_host_path_result=`echo "$func_to_host_path_tmp1" |\
-                $SED -e "$lt_sed_naive_backslashify"`
-            else
-              # Allow warning below.
-              func_to_host_path_result=""
-            fi
-            ;;
-        esac
-        if test -z "$func_to_host_path_result" ; then
-          func_error "Could not determine host path corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback:
-          func_to_host_path_result="$1"
-        fi
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_path
-
-# func_to_host_pathlist arg
-#
-# Convert pathlists to host format when used with build tools.
-# See func_to_host_path(), above. This function supports the
-# following $build/$host combinations (but does no harm for
-# combinations not listed here):
-#    $build          $host
-#    mingw (msys)    mingw  [e.g. native]
-#    cygwin          mingw
-#    *nix + wine     mingw
-#
-# Path separators are also converted from $build format to
-# $host format. If ARG begins or ends with a path separator
-# character, it is preserved (but converted to $host format)
-# on output.
-#
-# ARG is a pathlist (on $build) that should be converted to
-# the proper representation on $host. The result is stored
-# in $func_to_host_pathlist_result.
-func_to_host_pathlist ()
-{
-  func_to_host_pathlist_result="$1"
-  if test -n "$1" ; then
-    case $host in
-      *mingw* )
-        lt_sed_naive_backslashify='s|\\\\*|\\|g;s|/|\\|g;s|\\|\\\\|g'
-        # Remove leading and trailing path separator characters from
-        # ARG. msys behavior is inconsistent here, cygpath turns them
-        # into '.;' and ';.', and winepath ignores them completely.
-        func_to_host_pathlist_tmp2="$1"
-        # Once set for this call, this variable should not be
-        # reassigned. It is used in tha fallback case.
-        func_to_host_pathlist_tmp1=`echo "$func_to_host_pathlist_tmp2" |\
-          $SED -e 's|^:*||' -e 's|:*$||'`
-        case $build in
-          *mingw* ) # Actually, msys.
-            # Awkward: cmd appends spaces to result.
-            lt_sed_strip_trailing_spaces="s/[ ]*\$//"
-            func_to_host_pathlist_tmp2=`( cmd //c echo "$func_to_host_pathlist_tmp1" |\
-              $SED -e "$lt_sed_strip_trailing_spaces" ) 2>/dev/null || echo ""`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          *cygwin* )
-            func_to_host_pathlist_tmp2=`cygpath -w -p "$func_to_host_pathlist_tmp1"`
-            func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp2" |\
-              $SED -e "$lt_sed_naive_backslashify"`
-            ;;
-          * )
-            # unfortunately, winepath doesn't convert pathlists
-            func_to_host_pathlist_result=""
-            func_to_host_pathlist_oldIFS=$IFS
-            IFS=:
-            for func_to_host_pathlist_f in $func_to_host_pathlist_tmp1 ; do
-              IFS=$func_to_host_pathlist_oldIFS
-              if test -n "$func_to_host_pathlist_f" ; then
-                func_to_host_path "$func_to_host_pathlist_f"
-                if test -n "$func_to_host_path_result" ; then
-                  if test -z "$func_to_host_pathlist_result" ; then
-                    func_to_host_pathlist_result="$func_to_host_path_result"
-                  else
-                    func_to_host_pathlist_result="$func_to_host_pathlist_result;$func_to_host_path_result"
-                  fi
-                fi
-              fi
-              IFS=:
-            done
-            IFS=$func_to_host_pathlist_oldIFS
-            ;;
-        esac
-        if test -z "$func_to_host_pathlist_result" ; then
-          func_error "Could not determine the host path(s) corresponding to"
-          func_error "  '$1'"
-          func_error "Continuing, but uninstalled executables may not work."
-          # Fallback. This may break if $1 contains DOS-style drive
-          # specifications. The fix is not to complicate the expression
-          # below, but for the user to provide a working wine installation
-          # with winepath so that path translation in the cross-to-mingw
-          # case works properly.
-          lt_replace_pathsep_nix_to_dos="s|:|;|g"
-          func_to_host_pathlist_result=`echo "$func_to_host_pathlist_tmp1" |\
-            $SED -e "$lt_replace_pathsep_nix_to_dos"`
-        fi
-        # Now, add the leading and trailing path separators back
-        case "$1" in
-          :* ) func_to_host_pathlist_result=";$func_to_host_pathlist_result"
-            ;;
-        esac
-        case "$1" in
-          *: ) func_to_host_pathlist_result="$func_to_host_pathlist_result;"
-            ;;
-        esac
-        ;;
-    esac
-  fi
-}
-# end: func_to_host_pathlist
+
 
 # func_emit_cwrapperexe_src
 # emit the source code for a wrapper executable on stdout
@@ -3141,31 +4147,23 @@
 
    This wrapper executable should never be moved out of the build directory.
    If it is, it will not operate correctly.
-
-   Currently, it simply execs the wrapper *script* "$SHELL $output",
-   but could eventually absorb all of the scripts functionality and
-   exec $objdir/$outputname directly.
 */
 EOF
 	    cat <<"EOF"
+#ifdef _MSC_VER
+# define _CRT_SECURE_NO_DEPRECATE 1
+#endif
 #include <stdio.h>
 #include <stdlib.h>
 #ifdef _MSC_VER
 # include <direct.h>
 # include <process.h>
 # include <io.h>
-# define setmode _setmode
 #else
 # include <unistd.h>
 # include <stdint.h>
 # ifdef __CYGWIN__
 #  include <io.h>
-#  define HAVE_SETENV
-#  ifdef __STRICT_ANSI__
-char *realpath (const char *, char *);
-int putenv (char *);
-int setenv (const char *, const char *, int);
-#  endif
 # endif
 #endif
 #include <malloc.h>
@@ -3177,6 +4175,44 @@
 #include <fcntl.h>
 #include <sys/stat.h>
 
+/* declarations of non-ANSI functions */
+#if defined(__MINGW32__)
+# ifdef __STRICT_ANSI__
+int _putenv (const char *);
+# endif
+#elif defined(__CYGWIN__)
+# ifdef __STRICT_ANSI__
+char *realpath (const char *, char *);
+int putenv (char *);
+int setenv (const char *, const char *, int);
+# endif
+/* #elif defined (other platforms) ... */
+#endif
+
+/* portability defines, excluding path handling macros */
+#if defined(_MSC_VER)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+# define S_IXUSR _S_IEXEC
+# ifndef _INTPTR_T_DEFINED
+#  define _INTPTR_T_DEFINED
+#  define intptr_t int
+# endif
+#elif defined(__MINGW32__)
+# define setmode _setmode
+# define stat    _stat
+# define chmod   _chmod
+# define getcwd  _getcwd
+# define putenv  _putenv
+#elif defined(__CYGWIN__)
+# define HAVE_SETENV
+# define FOPEN_WB "wb"
+/* #elif defined (other platforms) ... */
+#endif
+
 #if defined(PATH_MAX)
 # define LT_PATHMAX PATH_MAX
 #elif defined(MAXPATHLEN)
@@ -3192,14 +4228,7 @@
 # define S_IXGRP 0
 #endif
 
-#ifdef _MSC_VER
-# define S_IXUSR _S_IEXEC
-# define stat _stat
-# ifndef _INTPTR_T_DEFINED
-#  define intptr_t int
-# endif
-#endif
-
+/* path handling portability macros */
 #ifndef DIR_SEPARATOR
 # define DIR_SEPARATOR '/'
 # define PATH_SEPARATOR ':'
@@ -3230,10 +4259,6 @@
 # define IS_PATH_SEPARATOR(ch) ((ch) == PATH_SEPARATOR_2)
 #endif /* PATH_SEPARATOR_2 */
 
-#ifdef __CYGWIN__
-# define FOPEN_WB "wb"
-#endif
-
 #ifndef FOPEN_WB
 # define FOPEN_WB "w"
 #endif
@@ -3246,22 +4271,13 @@
   if (stale) { free ((void *) stale); stale = 0; } \
 } while (0)
 
-#undef LTWRAPPER_DEBUGPRINTF
-#if defined DEBUGWRAPPER
-# define LTWRAPPER_DEBUGPRINTF(args) ltwrapper_debugprintf args
-static void
-ltwrapper_debugprintf (const char *fmt, ...)
-{
-    va_list args;
-    va_start (args, fmt);
-    (void) vfprintf (stderr, fmt, args);
-    va_end (args);
-}
+#if defined(LT_DEBUGWRAPPER)
+static int lt_debug = 1;
 #else
-# define LTWRAPPER_DEBUGPRINTF(args)
+static int lt_debug = 0;
 #endif
 
-const char *program_name = NULL;
+const char *program_name = "libtool-wrapper"; /* in case xstrdup fails */
 
 void *xmalloc (size_t num);
 char *xstrdup (const char *string);
@@ -3271,41 +4287,27 @@
 int make_executable (const char *path);
 int check_executable (const char *path);
 char *strendzap (char *str, const char *pat);
-void lt_fatal (const char *message, ...);
+void lt_debugprintf (const char *file, int line, const char *fmt, ...);
+void lt_fatal (const char *file, int line, const char *message, ...);
+static const char *nonnull (const char *s);
+static const char *nonempty (const char *s);
 void lt_setenv (const char *name, const char *value);
 char *lt_extend_str (const char *orig_value, const char *add, int to_end);
-void lt_opt_process_env_set (const char *arg);
-void lt_opt_process_env_prepend (const char *arg);
-void lt_opt_process_env_append (const char *arg);
-int lt_split_name_value (const char *arg, char** name, char** value);
 void lt_update_exe_path (const char *name, const char *value);
 void lt_update_lib_path (const char *name, const char *value);
-
-static const char *script_text_part1 =
-EOF
-
-	    func_emit_wrapper_part1 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
-	    cat <<EOF
-
-static const char *script_text_part2 =
+char **prepare_spawn (char **argv);
+void lt_dump_script (FILE *f);
 EOF
-	    func_emit_wrapper_part2 yes |
-	        $SED -e 's/\([\\"]\)/\\\1/g' \
-	             -e 's/^/  "/' -e 's/$/\\n"/'
-	    echo ";"
 
 	    cat <<EOF
-const char * MAGIC_EXE = "$magic_exe";
+volatile const char * MAGIC_EXE = "$magic_exe";
 const char * LIB_PATH_VARNAME = "$shlibpath_var";
 EOF
 
 	    if test "$shlibpath_overrides_runpath" = yes && test -n "$shlibpath_var" && test -n "$temp_rpath"; then
-              func_to_host_pathlist "$temp_rpath"
+              func_to_host_path "$temp_rpath"
 	      cat <<EOF
-const char * LIB_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * LIB_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3314,10 +4316,10 @@
 	    fi
 
 	    if test -n "$dllsearchpath"; then
-              func_to_host_pathlist "$dllsearchpath:"
+              func_to_host_path "$dllsearchpath:"
 	      cat <<EOF
 const char * EXE_PATH_VARNAME = "PATH";
-const char * EXE_PATH_VALUE   = "$func_to_host_pathlist_result";
+const char * EXE_PATH_VALUE   = "$func_to_host_path_result";
 EOF
 	    else
 	      cat <<"EOF"
@@ -3340,24 +4342,10 @@
 	    cat <<"EOF"
 
 #define LTWRAPPER_OPTION_PREFIX         "--lt-"
-#define LTWRAPPER_OPTION_PREFIX_LENGTH  5
 
-static const size_t opt_prefix_len         = LTWRAPPER_OPTION_PREFIX_LENGTH;
 static const char *ltwrapper_option_prefix = LTWRAPPER_OPTION_PREFIX;
-
 static const char *dumpscript_opt       = LTWRAPPER_OPTION_PREFIX "dump-script";
-
-static const size_t env_set_opt_len     = LTWRAPPER_OPTION_PREFIX_LENGTH + 7;
-static const char *env_set_opt          = LTWRAPPER_OPTION_PREFIX "env-set";
-  /* argument is putenv-style "foo=bar", value of foo is set to bar */
-
-static const size_t env_prepend_opt_len = LTWRAPPER_OPTION_PREFIX_LENGTH + 11;
-static const char *env_prepend_opt      = LTWRAPPER_OPTION_PREFIX "env-prepend";
-  /* argument is putenv-style "foo=bar", new value of foo is bar${foo} */
-
-static const size_t env_append_opt_len  = LTWRAPPER_OPTION_PREFIX_LENGTH + 10;
-static const char *env_append_opt       = LTWRAPPER_OPTION_PREFIX "env-append";
-  /* argument is putenv-style "foo=bar", new value of foo is ${foo}bar */
+static const char *debug_opt            = LTWRAPPER_OPTION_PREFIX "debug";
 
 int
 main (int argc, char *argv[])
@@ -3374,10 +4362,13 @@
   int i;
 
   program_name = (char *) xstrdup (base_name (argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) argv[0]      : %s\n", argv[0]));
-  LTWRAPPER_DEBUGPRINTF (("(main) program_name : %s\n", program_name));
+  newargz = XMALLOC (char *, argc + 1);
 
-  /* very simple arg parsing; don't want to rely on getopt */
+  /* very simple arg parsing; don't want to rely on getopt
+   * also, copy all non cwrapper options to newargz, except
+   * argz[0], which is handled differently
+   */
+  newargc=0;
   for (i = 1; i < argc; i++)
     {
       if (strcmp (argv[i], dumpscript_opt) == 0)
@@ -3391,25 +4382,57 @@
 	      esac
 
 	    cat <<"EOF"
-	  printf ("%s", script_text_part1);
-	  printf ("%s", script_text_part2);
+	  lt_dump_script (stdout);
 	  return 0;
 	}
+      if (strcmp (argv[i], debug_opt) == 0)
+	{
+          lt_debug = 1;
+          continue;
+	}
+      if (strcmp (argv[i], ltwrapper_option_prefix) == 0)
+        {
+          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
+             namespace, but it is not one of the ones we know about and
+             have already dealt with, above (inluding dump-script), then
+             report an error. Otherwise, targets might begin to believe
+             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
+             namespace. The first time any user complains about this, we'll
+             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
+             or a configure.ac-settable value.
+           */
+          lt_fatal (__FILE__, __LINE__,
+		    "unrecognized %s option: '%s'",
+                    ltwrapper_option_prefix, argv[i]);
+        }
+      /* otherwise ... */
+      newargz[++newargc] = xstrdup (argv[i]);
     }
+  newargz[++newargc] = NULL;
+
+EOF
+	    cat <<EOF
+  /* The GNU banner must be the first non-error debug message */
+  lt_debugprintf (__FILE__, __LINE__, "libtool wrapper (GNU $PACKAGE$TIMESTAMP) $VERSION\n");
+EOF
+	    cat <<"EOF"
+  lt_debugprintf (__FILE__, __LINE__, "(main) argv[0]: %s\n", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__, "(main) program_name: %s\n", program_name);
 
-  newargz = XMALLOC (char *, argc + 1);
   tmp_pathspec = find_executable (argv[0]);
   if (tmp_pathspec == NULL)
-    lt_fatal ("Couldn't find %s", argv[0]);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (before symlink chase) at : %s\n",
-			  tmp_pathspec));
+    lt_fatal (__FILE__, __LINE__, "couldn't find %s", argv[0]);
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (before symlink chase) at: %s\n",
+		  tmp_pathspec);
 
   actual_cwrapper_path = chase_symlinks (tmp_pathspec);
-  LTWRAPPER_DEBUGPRINTF (("(main) found exe (after symlink chase) at : %s\n",
-			  actual_cwrapper_path));
+  lt_debugprintf (__FILE__, __LINE__,
+                  "(main) found exe (after symlink chase) at: %s\n",
+		  actual_cwrapper_path);
   XFREE (tmp_pathspec);
 
-  actual_cwrapper_name = xstrdup( base_name (actual_cwrapper_path));
+  actual_cwrapper_name = xstrdup (base_name (actual_cwrapper_path));
   strendzap (actual_cwrapper_path, actual_cwrapper_name);
 
   /* wrapper name transforms */
@@ -3427,8 +4450,9 @@
   target_name = tmp_pathspec;
   tmp_pathspec = 0;
 
-  LTWRAPPER_DEBUGPRINTF (("(main) libtool target name: %s\n",
-			  target_name));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(main) libtool target name: %s\n",
+		  target_name);
 EOF
 
 	    cat <<EOF
@@ -3478,80 +4502,19 @@
 
   lt_setenv ("BIN_SH", "xpg4"); /* for Tru64 */
   lt_setenv ("DUALCASE", "1");  /* for MSK sh */
-  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
+  /* Update the DLL searchpath.  EXE_PATH_VALUE ($dllsearchpath) must
+     be prepended before (that is, appear after) LIB_PATH_VALUE ($temp_rpath)
+     because on Windows, both *_VARNAMEs are PATH but uninstalled
+     libraries must come first. */
   lt_update_exe_path (EXE_PATH_VARNAME, EXE_PATH_VALUE);
+  lt_update_lib_path (LIB_PATH_VARNAME, LIB_PATH_VALUE);
 
-  newargc=0;
-  for (i = 1; i < argc; i++)
-    {
-      if (strncmp (argv[i], env_set_opt, env_set_opt_len) == 0)
-        {
-          if (argv[i][env_set_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_set_opt_len + 1;
-              lt_opt_process_env_set (p);
-            }
-          else if (argv[i][env_set_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_set (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_set_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_prepend_opt, env_prepend_opt_len) == 0)
-        {
-          if (argv[i][env_prepend_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_prepend_opt_len + 1;
-              lt_opt_process_env_prepend (p);
-            }
-          else if (argv[i][env_prepend_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_prepend (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_prepend_opt);
-          continue;
-        }
-      if (strncmp (argv[i], env_append_opt, env_append_opt_len) == 0)
-        {
-          if (argv[i][env_append_opt_len] == '=')
-            {
-              const char *p = argv[i] + env_append_opt_len + 1;
-              lt_opt_process_env_append (p);
-            }
-          else if (argv[i][env_append_opt_len] == '\0' && i + 1 < argc)
-            {
-              lt_opt_process_env_append (argv[++i]); /* don't copy */
-            }
-          else
-            lt_fatal ("%s missing required argument", env_append_opt);
-          continue;
-        }
-      if (strncmp (argv[i], ltwrapper_option_prefix, opt_prefix_len) == 0)
-        {
-          /* however, if there is an option in the LTWRAPPER_OPTION_PREFIX
-             namespace, but it is not one of the ones we know about and
-             have already dealt with, above (inluding dump-script), then
-             report an error. Otherwise, targets might begin to believe
-             they are allowed to use options in the LTWRAPPER_OPTION_PREFIX
-             namespace. The first time any user complains about this, we'll
-             need to make LTWRAPPER_OPTION_PREFIX a configure-time option
-             or a configure.ac-settable value.
-           */
-          lt_fatal ("Unrecognized option in %s namespace: '%s'",
-                    ltwrapper_option_prefix, argv[i]);
-        }
-      /* otherwise ... */
-      newargz[++newargc] = xstrdup (argv[i]);
-    }
-  newargz[++newargc] = NULL;
-
-  LTWRAPPER_DEBUGPRINTF     (("(main) lt_argv_zero : %s\n", (lt_argv_zero ? lt_argv_zero : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__, "(main) lt_argv_zero: %s\n",
+		  nonnull (lt_argv_zero));
   for (i = 0; i < newargc; i++)
     {
-      LTWRAPPER_DEBUGPRINTF (("(main) newargz[%d]   : %s\n", i, (newargz[i] ? newargz[i] : "<NULL>")));
+      lt_debugprintf (__FILE__, __LINE__, "(main) newargz[%d]: %s\n",
+		      i, nonnull (newargz[i]));
     }
 
 EOF
@@ -3560,11 +4523,14 @@
 	      mingw*)
 		cat <<"EOF"
   /* execv doesn't actually work on mingw as expected on unix */
+  newargz = prepare_spawn (newargz);
   rval = _spawnv (_P_WAIT, lt_argv_zero, (const char * const *) newargz);
   if (rval == -1)
     {
       /* failed to start process */
-      LTWRAPPER_DEBUGPRINTF (("(main) failed to launch target \"%s\": errno = %d\n", lt_argv_zero, errno));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "(main) failed to launch target \"%s\": %s\n",
+		      lt_argv_zero, nonnull (strerror (errno)));
       return 127;
     }
   return rval;
@@ -3586,7 +4552,7 @@
 {
   void *p = (void *) malloc (num);
   if (!p)
-    lt_fatal ("Memory exhausted");
+    lt_fatal (__FILE__, __LINE__, "memory exhausted");
 
   return p;
 }
@@ -3620,8 +4586,8 @@
 {
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(check_executable)  : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(check_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3638,8 +4604,8 @@
   int rval = 0;
   struct stat st;
 
-  LTWRAPPER_DEBUGPRINTF (("(make_executable)   : %s\n",
-			  path ? (*path ? path : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(make_executable): %s\n",
+                  nonempty (path));
   if ((!path) || (!*path))
     return 0;
 
@@ -3665,8 +4631,8 @@
   int tmp_len;
   char *concat_name;
 
-  LTWRAPPER_DEBUGPRINTF (("(find_executable)   : %s\n",
-			  wrapper ? (*wrapper ? wrapper : "EMPTY!") : "NULL!"));
+  lt_debugprintf (__FILE__, __LINE__, "(find_executable): %s\n",
+                  nonempty (wrapper));
 
   if ((wrapper == NULL) || (*wrapper == '\0'))
     return NULL;
@@ -3719,7 +4685,8 @@
 		{
 		  /* empty path: current directory */
 		  if (getcwd (tmp, LT_PATHMAX) == NULL)
-		    lt_fatal ("getcwd failed");
+		    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+                              nonnull (strerror (errno)));
 		  tmp_len = strlen (tmp);
 		  concat_name =
 		    XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
@@ -3744,7 +4711,8 @@
     }
   /* Relative path | not found in path: prepend cwd */
   if (getcwd (tmp, LT_PATHMAX) == NULL)
-    lt_fatal ("getcwd failed");
+    lt_fatal (__FILE__, __LINE__, "getcwd failed: %s",
+              nonnull (strerror (errno)));
   tmp_len = strlen (tmp);
   concat_name = XMALLOC (char, tmp_len + 1 + strlen (wrapper) + 1);
   memcpy (concat_name, tmp, tmp_len);
@@ -3770,8 +4738,9 @@
   int has_symlinks = 0;
   while (strlen (tmp_pathspec) && !has_symlinks)
     {
-      LTWRAPPER_DEBUGPRINTF (("checking path component for symlinks: %s\n",
-			      tmp_pathspec));
+      lt_debugprintf (__FILE__, __LINE__,
+		      "checking path component for symlinks: %s\n",
+		      tmp_pathspec);
       if (lstat (tmp_pathspec, &s) == 0)
 	{
 	  if (S_ISLNK (s.st_mode) != 0)
@@ -3793,8 +4762,9 @@
 	}
       else
 	{
-	  char *errstr = strerror (errno);
-	  lt_fatal ("Error accessing file %s (%s)", tmp_pathspec, errstr);
+	  lt_fatal (__FILE__, __LINE__,
+		    "error accessing file \"%s\": %s",
+		    tmp_pathspec, nonnull (strerror (errno)));
 	}
     }
   XFREE (tmp_pathspec);
@@ -3807,7 +4777,8 @@
   tmp_pathspec = realpath (pathspec, buf);
   if (tmp_pathspec == 0)
     {
-      lt_fatal ("Could not follow symlinks for %s", pathspec);
+      lt_fatal (__FILE__, __LINE__,
+		"could not follow symlinks for %s", pathspec);
     }
   return xstrdup (tmp_pathspec);
 #endif
@@ -3833,11 +4804,25 @@
   return str;
 }
 
+void
+lt_debugprintf (const char *file, int line, const char *fmt, ...)
+{
+  va_list args;
+  if (lt_debug)
+    {
+      (void) fprintf (stderr, "%s:%s:%d: ", program_name, file, line);
+      va_start (args, fmt);
+      (void) vfprintf (stderr, fmt, args);
+      va_end (args);
+    }
+}
+
 static void
-lt_error_core (int exit_status, const char *mode,
+lt_error_core (int exit_status, const char *file,
+	       int line, const char *mode,
 	       const char *message, va_list ap)
 {
-  fprintf (stderr, "%s: %s: ", program_name, mode);
+  fprintf (stderr, "%s:%s:%d: %s: ", program_name, file, line, mode);
   vfprintf (stderr, message, ap);
   fprintf (stderr, ".\n");
 
@@ -3846,20 +4831,32 @@
 }
 
 void
-lt_fatal (const char *message, ...)
+lt_fatal (const char *file, int line, const char *message, ...)
 {
   va_list ap;
   va_start (ap, message);
-  lt_error_core (EXIT_FAILURE, "FATAL", message, ap);
+  lt_error_core (EXIT_FAILURE, file, line, "FATAL", message, ap);
   va_end (ap);
 }
 
+static const char *
+nonnull (const char *s)
+{
+  return s ? s : "(null)";
+}
+
+static const char *
+nonempty (const char *s)
+{
+  return (s && !*s) ? "(empty)" : nonnull (s);
+}
+
 void
 lt_setenv (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_setenv) setting '%s' to '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_setenv) setting '%s' to '%s'\n",
+                  nonnull (name), nonnull (value));
   {
 #ifdef HAVE_SETENV
     /* always make a copy, for consistency with !HAVE_SETENV */
@@ -3904,95 +4901,12 @@
   return new_value;
 }
 
-int
-lt_split_name_value (const char *arg, char** name, char** value)
-{
-  const char *p;
-  int len;
-  if (!arg || !*arg)
-    return 1;
-
-  p = strchr (arg, (int)'=');
-
-  if (!p)
-    return 1;
-
-  *value = xstrdup (++p);
-
-  len = strlen (arg) - strlen (*value);
-  *name = XMALLOC (char, len);
-  strncpy (*name, arg, len-1);
-  (*name)[len - 1] = '\0';
-
-  return 0;
-}
-
-void
-lt_opt_process_env_set (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_set_opt, arg);
-    }
-
-  lt_setenv (name, value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_prepend (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_prepend_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 0);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
-void
-lt_opt_process_env_append (const char *arg)
-{
-  char *name = NULL;
-  char *value = NULL;
-  char *new_value = NULL;
-
-  if (lt_split_name_value (arg, &name, &value) != 0)
-    {
-      XFREE (name);
-      XFREE (value);
-      lt_fatal ("bad argument for %s: '%s'", env_append_opt, arg);
-    }
-
-  new_value = lt_extend_str (getenv (name), value, 1);
-  lt_setenv (name, new_value);
-  XFREE (new_value);
-  XFREE (name);
-  XFREE (value);
-}
-
 void
 lt_update_exe_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_exe_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4011,9 +4925,9 @@
 void
 lt_update_lib_path (const char *name, const char *value)
 {
-  LTWRAPPER_DEBUGPRINTF (("(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
-                          (name ? name : "<NULL>"),
-                          (value ? value : "<NULL>")));
+  lt_debugprintf (__FILE__, __LINE__,
+		  "(lt_update_lib_path) modifying '%s' by prepending '%s'\n",
+                  nonnull (name), nonnull (value));
 
   if (name && *name && value && *value)
     {
@@ -4023,11 +4937,158 @@
     }
 }
 
+EOF
+	    case $host_os in
+	      mingw*)
+		cat <<"EOF"
+
+/* Prepares an argument vector before calling spawn().
+   Note that spawn() does not by itself call the command interpreter
+     (getenv ("COMSPEC") != NULL ? getenv ("COMSPEC") :
+      ({ OSVERSIONINFO v; v.dwOSVersionInfoSize = sizeof(OSVERSIONINFO);
+         GetVersionEx(&v);
+         v.dwPlatformId == VER_PLATFORM_WIN32_NT;
+      }) ? "cmd.exe" : "command.com").
+   Instead it simply concatenates the arguments, separated by ' ', and calls
+   CreateProcess().  We must quote the arguments since Win32 CreateProcess()
+   interprets characters like ' ', '\t', '\\', '"' (but not '<' and '>') in a
+   special way:
+   - Space and tab are interpreted as delimiters. They are not treated as
+     delimiters if they are surrounded by double quotes: "...".
+   - Unescaped double quotes are removed from the input. Their only effect is
+     that within double quotes, space and tab are treated like normal
+     characters.
+   - Backslashes not followed by double quotes are not special.
+   - But 2*n+1 backslashes followed by a double quote become
+     n backslashes followed by a double quote (n >= 0):
+       \" -> "
+       \\\" -> \"
+       \\\\\" -> \\"
+ */
+#define SHELL_SPECIAL_CHARS "\"\\ \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+#define SHELL_SPACE_CHARS " \001\002\003\004\005\006\007\010\011\012\013\014\015\016\017\020\021\022\023\024\025\026\027\030\031\032\033\034\035\036\037"
+char **
+prepare_spawn (char **argv)
+{
+  size_t argc;
+  char **new_argv;
+  size_t i;
+
+  /* Count number of arguments.  */
+  for (argc = 0; argv[argc] != NULL; argc++)
+    ;
+
+  /* Allocate new argument vector.  */
+  new_argv = XMALLOC (char *, argc + 1);
+
+  /* Put quoted arguments into the new argument vector.  */
+  for (i = 0; i < argc; i++)
+    {
+      const char *string = argv[i];
+
+      if (string[0] == '\0')
+	new_argv[i] = xstrdup ("\"\"");
+      else if (strpbrk (string, SHELL_SPECIAL_CHARS) != NULL)
+	{
+	  int quote_around = (strpbrk (string, SHELL_SPACE_CHARS) != NULL);
+	  size_t length;
+	  unsigned int backslashes;
+	  const char *s;
+	  char *quoted_string;
+	  char *p;
+
+	  length = 0;
+	  backslashes = 0;
+	  if (quote_around)
+	    length++;
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		length += backslashes + 1;
+	      length++;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    length += backslashes + 1;
+
+	  quoted_string = XMALLOC (char, length + 1);
+
+	  p = quoted_string;
+	  backslashes = 0;
+	  if (quote_around)
+	    *p++ = '"';
+	  for (s = string; *s != '\0'; s++)
+	    {
+	      char c = *s;
+	      if (c == '"')
+		{
+		  unsigned int j;
+		  for (j = backslashes + 1; j > 0; j--)
+		    *p++ = '\\';
+		}
+	      *p++ = c;
+	      if (c == '\\')
+		backslashes++;
+	      else
+		backslashes = 0;
+	    }
+	  if (quote_around)
+	    {
+	      unsigned int j;
+	      for (j = backslashes; j > 0; j--)
+		*p++ = '\\';
+	      *p++ = '"';
+	    }
+	  *p = '\0';
+
+	  new_argv[i] = quoted_string;
+	}
+      else
+	new_argv[i] = (char *) string;
+    }
+  new_argv[argc] = NULL;
+
+  return new_argv;
+}
+EOF
+		;;
+	    esac
 
+            cat <<"EOF"
+void lt_dump_script (FILE* f)
+{
+EOF
+	    func_emit_wrapper yes |
+	      $SED -n -e '
+s/^\(.\{79\}\)\(..*\)/\1\
+\2/
+h
+s/\([\\"]\)/\\\1/g
+s/$/\\n/
+s/\([^\n]*\).*/  fputs ("\1", f);/p
+g
+D'
+            cat <<"EOF"
+}
 EOF
 }
 # end: func_emit_cwrapperexe_src
 
+# func_win32_import_lib_p ARG
+# True if ARG is an import lib, as indicated by $file_magic_cmd
+func_win32_import_lib_p ()
+{
+    $opt_debug
+    case `eval $file_magic_cmd \"\$1\" 2>/dev/null | $SED -e 10q` in
+    *import*) : ;;
+    *) false ;;
+    esac
+}
+
 # func_mode_link arg...
 func_mode_link ()
 {
@@ -4072,6 +5133,7 @@
     new_inherited_linker_flags=
 
     avoid_version=no
+    bindir=
     dlfiles=
     dlprefiles=
     dlself=no
@@ -4164,6 +5226,11 @@
 	esac
 
 	case $prev in
+	bindir)
+	  bindir="$arg"
+	  prev=
+	  continue
+	  ;;
 	dlfiles|dlprefiles)
 	  if test "$preload" = no; then
 	    # Add the symbol object into the linking commands.
@@ -4195,9 +5262,9 @@
 	    ;;
 	  *)
 	    if test "$prev" = dlfiles; then
-	      dlfiles="$dlfiles $arg"
+	      func_append dlfiles " $arg"
 	    else
-	      dlprefiles="$dlprefiles $arg"
+	      func_append dlprefiles " $arg"
 	    fi
 	    prev=
 	    continue
@@ -4221,7 +5288,7 @@
 	    *-*-darwin*)
 	      case "$deplibs " in
 		*" $qarg.ltframework "*) ;;
-		*) deplibs="$deplibs $qarg.ltframework" # this is fixed later
+		*) func_append deplibs " $qarg.ltframework" # this is fixed later
 		   ;;
 	      esac
 	      ;;
@@ -4240,7 +5307,7 @@
 	    moreargs=
 	    for fil in `cat "$save_arg"`
 	    do
-#	      moreargs="$moreargs $fil"
+#	      func_append moreargs " $fil"
 	      arg=$fil
 	      # A libtool-controlled object.
 
@@ -4269,7 +5336,7 @@
 
 		  if test "$prev" = dlfiles; then
 		    if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		      dlfiles="$dlfiles $pic_object"
+		      func_append dlfiles " $pic_object"
 		      prev=
 		      continue
 		    else
@@ -4281,7 +5348,7 @@
 		  # CHECK ME:  I think I busted this.  -Ossama
 		  if test "$prev" = dlprefiles; then
 		    # Preload the old-style object.
-		    dlprefiles="$dlprefiles $pic_object"
+		    func_append dlprefiles " $pic_object"
 		    prev=
 		  fi
 
@@ -4351,12 +5418,12 @@
 	  if test "$prev" = rpath; then
 	    case "$rpath " in
 	    *" $arg "*) ;;
-	    *) rpath="$rpath $arg" ;;
+	    *) func_append rpath " $arg" ;;
 	    esac
 	  else
 	    case "$xrpath " in
 	    *" $arg "*) ;;
-	    *) xrpath="$xrpath $arg" ;;
+	    *) func_append xrpath " $arg" ;;
 	    esac
 	  fi
 	  prev=
@@ -4368,28 +5435,28 @@
 	  continue
 	  ;;
 	weak)
-	  weak_libs="$weak_libs $arg"
+	  func_append weak_libs " $arg"
 	  prev=
 	  continue
 	  ;;
 	xcclinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xcompiler)
-	  compiler_flags="$compiler_flags $qarg"
+	  func_append compiler_flags " $qarg"
 	  prev=
 	  func_append compile_command " $qarg"
 	  func_append finalize_command " $qarg"
 	  continue
 	  ;;
 	xlinker)
-	  linker_flags="$linker_flags $qarg"
-	  compiler_flags="$compiler_flags $wl$qarg"
+	  func_append linker_flags " $qarg"
+	  func_append compiler_flags " $wl$qarg"
 	  prev=
 	  func_append compile_command " $wl$qarg"
 	  func_append finalize_command " $wl$qarg"
@@ -4425,6 +5492,11 @@
 	continue
 	;;
 
+      -bindir)
+	prev=bindir
+	continue
+	;;
+
       -dlopen)
 	prev=dlfiles
 	continue
@@ -4475,15 +5547,16 @@
 	;;
 
       -L*)
-	func_stripname '-L' '' "$arg"
-	dir=$func_stripname_result
-	if test -z "$dir"; then
+	func_stripname "-L" '' "$arg"
+	if test -z "$func_stripname_result"; then
 	  if test "$#" -gt 0; then
 	    func_fatal_error "require no space between \`-L' and \`$1'"
 	  else
 	    func_fatal_error "need path for \`-L' option"
 	  fi
 	fi
+	func_resolve_sysroot "$func_stripname_result"
+	dir=$func_resolve_sysroot_result
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
@@ -4495,24 +5568,30 @@
 	  ;;
 	esac
 	case "$deplibs " in
-	*" -L$dir "*) ;;
+	*" -L$dir "* | *" $arg "*)
+	  # Will only happen for absolute or sysroot arguments
+	  ;;
 	*)
-	  deplibs="$deplibs -L$dir"
-	  lib_search_path="$lib_search_path $dir"
+	  # Preserve sysroot, but never include relative directories
+	  case $dir in
+	    [\\/]* | [A-Za-z]:[\\/]* | =*) func_append deplibs " $arg" ;;
+	    *) func_append deplibs " -L$dir" ;;
+	  esac
+	  func_append lib_search_path " $dir"
 	  ;;
 	esac
 	case $host in
 	*-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-cegcc*)
-	  testbindir=`$ECHO "X$dir" | $Xsed -e 's*/lib$*/bin*'`
+	  testbindir=`$ECHO "$dir" | $SED 's*/lib$*/bin*'`
 	  case :$dllsearchpath: in
 	  *":$dir:"*) ;;
 	  ::) dllsearchpath=$dir;;
-	  *) dllsearchpath="$dllsearchpath:$dir";;
+	  *) func_append dllsearchpath ":$dir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -4522,7 +5601,7 @@
       -l*)
 	if test "X$arg" = "X-lc" || test "X$arg" = "X-lm"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # These systems don't actually have a C or math library (as such)
 	    continue
 	    ;;
@@ -4536,7 +5615,7 @@
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C and math libraries are in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    continue
 	    ;;
 	  *-*-sco3.2v5* | *-*-sco5v6*)
@@ -4556,7 +5635,7 @@
 	   ;;
 	 esac
 	fi
-	deplibs="$deplibs $arg"
+	func_append deplibs " $arg"
 	continue
 	;;
 
@@ -4568,21 +5647,22 @@
       # Tru64 UNIX uses -model [arg] to determine the layout of C++
       # classes, name mangling, and exception handling.
       # Darwin uses the -arch flag to determine output architecture.
-      -model|-arch|-isysroot)
-	compiler_flags="$compiler_flags $arg"
+      -model|-arch|-isysroot|--sysroot)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	prev=xcompiler
 	continue
 	;;
 
-      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
-	compiler_flags="$compiler_flags $arg"
+      -mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+      |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
+	func_append compiler_flags " $arg"
 	func_append compile_command " $arg"
 	func_append finalize_command " $arg"
 	case "$new_inherited_linker_flags " in
 	    *" $arg "*) ;;
-	    * ) new_inherited_linker_flags="$new_inherited_linker_flags $arg" ;;
+	    * ) func_append new_inherited_linker_flags " $arg" ;;
 	esac
 	continue
 	;;
@@ -4649,13 +5729,17 @@
 	# We need an absolute path.
 	case $dir in
 	[\\/]* | [A-Za-z]:[\\/]*) ;;
+	=*)
+	  func_stripname '=' '' "$dir"
+	  dir=$lt_sysroot$func_stripname_result
+	  ;;
 	*)
 	  func_fatal_error "only absolute run-paths are allowed"
 	  ;;
 	esac
 	case "$xrpath " in
 	*" $dir "*) ;;
-	*) xrpath="$xrpath $dir" ;;
+	*) func_append xrpath " $dir" ;;
 	esac
 	continue
 	;;
@@ -4708,8 +5792,8 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $func_quote_for_eval_result"
+	  func_append arg " $func_quote_for_eval_result"
+	  func_append compiler_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4724,9 +5808,9 @@
 	for flag in $args; do
 	  IFS="$save_ifs"
           func_quote_for_eval "$flag"
-	  arg="$arg $wl$func_quote_for_eval_result"
-	  compiler_flags="$compiler_flags $wl$func_quote_for_eval_result"
-	  linker_flags="$linker_flags $func_quote_for_eval_result"
+	  func_append arg " $wl$func_quote_for_eval_result"
+	  func_append compiler_flags " $wl$func_quote_for_eval_result"
+	  func_append linker_flags " $func_quote_for_eval_result"
 	done
 	IFS="$save_ifs"
 	func_stripname ' ' '' "$arg"
@@ -4754,23 +5838,27 @@
 	arg="$func_quote_for_eval_result"
 	;;
 
-      # -64, -mips[0-9] enable 64-bit mode on the SGI compiler
-      # -r[0-9][0-9]* specifies the processor on the SGI compiler
-      # -xarch=*, -xtarget=* enable 64-bit mode on the Sun compiler
-      # +DA*, +DD* enable 64-bit mode on the HP compiler
-      # -q* pass through compiler args for the IBM compiler
-      # -m*, -t[45]*, -txscale* pass through architecture-specific
-      # compiler args for GCC
-      # -F/path gives path to uninstalled frameworks, gcc on darwin
-      # -p, -pg, --coverage, -fprofile-* pass through profiling flag for GCC
-      # @file GCC response files
+      # Flags to be passed through unchanged, with rationale:
+      # -64, -mips[0-9]      enable 64-bit mode for the SGI compiler
+      # -r[0-9][0-9]*        specify processor for the SGI compiler
+      # -xarch=*, -xtarget=* enable 64-bit mode for the Sun compiler
+      # +DA*, +DD*           enable 64-bit mode for the HP compiler
+      # -q*                  compiler args for the IBM compiler
+      # -m*, -t[45]*, -txscale* architecture-specific flags for GCC
+      # -F/path              path to uninstalled frameworks, gcc on darwin
+      # -p, -pg, --coverage, -fprofile-*  profiling flags for GCC
+      # @file                GCC response files
+      # -tp=*                Portland pgcc target processor selection
+      # --sysroot=*          for sysroot support
+      # -O*, -flto*, -fwhopr*, -fuse-linker-plugin GCC link-time optimization
       -64|-mips[0-9]|-r[0-9][0-9]*|-xarch=*|-xtarget=*|+DA*|+DD*|-q*|-m*| \
-      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*)
+      -t[45]*|-txscale*|-p|-pg|--coverage|-fprofile-*|-F*|@*|-tp=*|--sysroot=*| \
+      -O*|-flto*|-fwhopr*|-fuse-linker-plugin)
         func_quote_for_eval "$arg"
 	arg="$func_quote_for_eval_result"
         func_append compile_command " $arg"
         func_append finalize_command " $arg"
-        compiler_flags="$compiler_flags $arg"
+        func_append compiler_flags " $arg"
         continue
         ;;
 
@@ -4782,7 +5870,7 @@
 
       *.$objext)
 	# A standard object.
-	objs="$objs $arg"
+	func_append objs " $arg"
 	;;
 
       *.lo)
@@ -4813,7 +5901,7 @@
 
 	    if test "$prev" = dlfiles; then
 	      if test "$build_libtool_libs" = yes && test "$dlopen_support" = yes; then
-		dlfiles="$dlfiles $pic_object"
+		func_append dlfiles " $pic_object"
 		prev=
 		continue
 	      else
@@ -4825,7 +5913,7 @@
 	    # CHECK ME:  I think I busted this.  -Ossama
 	    if test "$prev" = dlprefiles; then
 	      # Preload the old-style object.
-	      dlprefiles="$dlprefiles $pic_object"
+	      func_append dlprefiles " $pic_object"
 	      prev=
 	    fi
 
@@ -4870,24 +5958,25 @@
 
       *.$libext)
 	# An archive.
-	deplibs="$deplibs $arg"
-	old_deplibs="$old_deplibs $arg"
+	func_append deplibs " $arg"
+	func_append old_deplibs " $arg"
 	continue
 	;;
 
       *.la)
 	# A libtool-controlled library.
 
+	func_resolve_sysroot "$arg"
 	if test "$prev" = dlfiles; then
 	  # This library was specified with -dlopen.
-	  dlfiles="$dlfiles $arg"
+	  func_append dlfiles " $func_resolve_sysroot_result"
 	  prev=
 	elif test "$prev" = dlprefiles; then
 	  # The library was specified with -dlpreopen.
-	  dlprefiles="$dlprefiles $arg"
+	  func_append dlprefiles " $func_resolve_sysroot_result"
 	  prev=
 	else
-	  deplibs="$deplibs $arg"
+	  func_append deplibs " $func_resolve_sysroot_result"
 	fi
 	continue
 	;;
@@ -4925,7 +6014,7 @@
 
     if test -n "$shlibpath_var"; then
       # get the directories listed in $shlibpath_var
-      eval shlib_search_path=\`\$ECHO \"X\${$shlibpath_var}\" \| \$Xsed -e \'s/:/ /g\'\`
+      eval shlib_search_path=\`\$ECHO \"\${$shlibpath_var}\" \| \$SED \'s/:/ /g\'\`
     else
       shlib_search_path=
     fi
@@ -4934,6 +6023,8 @@
 
     func_dirname "$output" "/" ""
     output_objdir="$func_dirname_result$objdir"
+    func_to_tool_file "$output_objdir/"
+    tool_output_objdir=$func_to_tool_file_result
     # Create the object directory.
     func_mkdir_p "$output_objdir"
 
@@ -4954,12 +6045,12 @@
     # Find all interdependent deplibs by searching for libraries
     # that are linked more than once (e.g. -la -lb -la)
     for deplib in $deplibs; do
-      if $opt_duplicate_deps ; then
+      if $opt_preserve_dup_deps ; then
 	case "$libs " in
-	*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	esac
       fi
-      libs="$libs $deplib"
+      func_append libs " $deplib"
     done
 
     if test "$linkmode" = lib; then
@@ -4972,9 +6063,9 @@
       if $opt_duplicate_compiler_generated_deps; then
 	for pre_post_dep in $predeps $postdeps; do
 	  case "$pre_post_deps " in
-	  *" $pre_post_dep "*) specialdeplibs="$specialdeplibs $pre_post_deps" ;;
+	  *" $pre_post_dep "*) func_append specialdeplibs " $pre_post_deps" ;;
 	  esac
-	  pre_post_deps="$pre_post_deps $pre_post_dep"
+	  func_append pre_post_deps " $pre_post_dep"
 	done
       fi
       pre_post_deps=
@@ -5044,17 +6135,19 @@
 	for lib in $dlprefiles; do
 	  # Ignore non-libtool-libs
 	  dependency_libs=
+	  func_resolve_sysroot "$lib"
 	  case $lib in
-	  *.la)	func_source "$lib" ;;
+	  *.la)	func_source "$func_resolve_sysroot_result" ;;
 	  esac
 
 	  # Collect preopened libtool deplibs, except any this library
 	  # has declared as weak libs
 	  for deplib in $dependency_libs; do
-            deplib_base=`$ECHO "X$deplib" | $Xsed -e "$basename"`
+	    func_basename "$deplib"
+            deplib_base=$func_basename_result
 	    case " $weak_libs " in
 	    *" $deplib_base "*) ;;
-	    *) deplibs="$deplibs $deplib" ;;
+	    *) func_append deplibs " $deplib" ;;
 	    esac
 	  done
 	done
@@ -5070,16 +6163,17 @@
 	lib=
 	found=no
 	case $deplib in
-	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe|-threads)
+	-mt|-mthreads|-kthread|-Kthread|-pthread|-pthreads|--thread-safe \
+        |-threads|-fopenmp|-openmp|-mp|-xopenmp|-omp|-qsmp=*)
 	  if test "$linkmode,$pass" = "prog,link"; then
 	    compile_deplibs="$deplib $compile_deplibs"
 	    finalize_deplibs="$deplib $finalize_deplibs"
 	  else
-	    compiler_flags="$compiler_flags $deplib"
+	    func_append compiler_flags " $deplib"
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5164,7 +6258,7 @@
 	    if test "$linkmode" = lib ; then
 		case "$new_inherited_linker_flags " in
 		    *" $deplib "*) ;;
-		    * ) new_inherited_linker_flags="$new_inherited_linker_flags $deplib" ;;
+		    * ) func_append new_inherited_linker_flags " $deplib" ;;
 		esac
 	    fi
 	  fi
@@ -5177,7 +6271,8 @@
 	    test "$pass" = conv && continue
 	    newdependency_libs="$deplib $newdependency_libs"
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  prog)
 	    if test "$pass" = conv; then
@@ -5191,7 +6286,8 @@
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    fi
 	    func_stripname '-L' '' "$deplib"
-	    newlib_search_path="$newlib_search_path $func_stripname_result"
+	    func_resolve_sysroot "$func_stripname_result"
+	    func_append newlib_search_path " $func_resolve_sysroot_result"
 	    ;;
 	  *)
 	    func_warning "\`-L' is ignored for archives/objects"
@@ -5202,17 +6298,21 @@
 	-R*)
 	  if test "$pass" = link; then
 	    func_stripname '-R' '' "$deplib"
-	    dir=$func_stripname_result
+	    func_resolve_sysroot "$func_stripname_result"
+	    dir=$func_resolve_sysroot_result
 	    # Make sure the xrpath contains only unique directories.
 	    case "$xrpath " in
 	    *" $dir "*) ;;
-	    *) xrpath="$xrpath $dir" ;;
+	    *) func_append xrpath " $dir" ;;
 	    esac
 	  fi
 	  deplibs="$deplib $deplibs"
 	  continue
 	  ;;
-	*.la) lib="$deplib" ;;
+	*.la)
+	  func_resolve_sysroot "$deplib"
+	  lib=$func_resolve_sysroot_result
+	  ;;
 	*.$libext)
 	  if test "$pass" = conv; then
 	    deplibs="$deplib $deplibs"
@@ -5230,7 +6330,7 @@
 		match_pattern*)
 		  set dummy $deplibs_check_method; shift
 		  match_pattern_regex=`expr "$deplibs_check_method" : "$1 \(.*\)"`
-		  if eval "\$ECHO \"X$deplib\"" 2>/dev/null | $Xsed -e 10q \
+		  if eval "\$ECHO \"$deplib\"" 2>/dev/null | $SED 10q \
 		    | $EGREP "$match_pattern_regex" > /dev/null; then
 		    valid_a_lib=yes
 		  fi
@@ -5240,15 +6340,15 @@
 		;;
 	      esac
 	      if test "$valid_a_lib" != yes; then
-		$ECHO
+		echo
 		$ECHO "*** Warning: Trying to link with static lib archive $deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because the file extensions .$libext of this argument makes me believe"
-		$ECHO "*** that it is just a static archive that I should not use here."
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because the file extensions .$libext of this argument makes me believe"
+		echo "*** that it is just a static archive that I should not use here."
 	      else
-		$ECHO
+		echo
 		$ECHO "*** Warning: Linking the shared library $output against the"
 		$ECHO "*** static library $deplib is not portable!"
 		deplibs="$deplib $deplibs"
@@ -5275,11 +6375,11 @@
 	    if test "$pass" = dlpreopen || test "$dlopen_support" != yes || test "$build_libtool_libs" = no; then
 	      # If there is no dlopen support or we're linking statically,
 	      # we need to preload.
-	      newdlprefiles="$newdlprefiles $deplib"
+	      func_append newdlprefiles " $deplib"
 	      compile_deplibs="$deplib $compile_deplibs"
 	      finalize_deplibs="$deplib $finalize_deplibs"
 	    else
-	      newdlfiles="$newdlfiles $deplib"
+	      func_append newdlfiles " $deplib"
 	    fi
 	  fi
 	  continue
@@ -5321,20 +6421,20 @@
 
 	# Convert "-framework foo" to "foo.ltframework"
 	if test -n "$inherited_linker_flags"; then
-	  tmp_inherited_linker_flags=`$ECHO "X$inherited_linker_flags" | $Xsed -e 's/-framework \([^ $]*\)/\1.ltframework/g'`
+	  tmp_inherited_linker_flags=`$ECHO "$inherited_linker_flags" | $SED 's/-framework \([^ $]*\)/\1.ltframework/g'`
 	  for tmp_inherited_linker_flag in $tmp_inherited_linker_flags; do
 	    case " $new_inherited_linker_flags " in
 	      *" $tmp_inherited_linker_flag "*) ;;
-	      *) new_inherited_linker_flags="$new_inherited_linker_flags $tmp_inherited_linker_flag";;
+	      *) func_append new_inherited_linker_flags " $tmp_inherited_linker_flag";;
 	    esac
 	  done
 	fi
-	dependency_libs=`$ECHO "X $dependency_libs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	dependency_libs=`$ECHO " $dependency_libs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	if test "$linkmode,$pass" = "lib,link" ||
 	   test "$linkmode,$pass" = "prog,scan" ||
 	   { test "$linkmode" != prog && test "$linkmode" != lib; }; then
-	  test -n "$dlopen" && dlfiles="$dlfiles $dlopen"
-	  test -n "$dlpreopen" && dlprefiles="$dlprefiles $dlpreopen"
+	  test -n "$dlopen" && func_append dlfiles " $dlopen"
+	  test -n "$dlpreopen" && func_append dlprefiles " $dlpreopen"
 	fi
 
 	if test "$pass" = conv; then
@@ -5345,17 +6445,17 @@
 	      func_fatal_error "cannot find name of link library for \`$lib'"
 	    fi
 	    # It is a libtool convenience library, so add in its objects.
-	    convenience="$convenience $ladir/$objdir/$old_library"
-	    old_convenience="$old_convenience $ladir/$objdir/$old_library"
+	    func_append convenience " $ladir/$objdir/$old_library"
+	    func_append old_convenience " $ladir/$objdir/$old_library"
 	    tmp_libs=
 	    for deplib in $dependency_libs; do
 	      deplibs="$deplib $deplibs"
-	      if $opt_duplicate_deps ; then
+	      if $opt_preserve_dup_deps ; then
 		case "$tmp_libs " in
-		*" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+		*" $deplib "*) func_append specialdeplibs " $deplib" ;;
 		esac
 	      fi
-	      tmp_libs="$tmp_libs $deplib"
+	      func_append tmp_libs " $deplib"
 	    done
 	  elif test "$linkmode" != prog && test "$linkmode" != lib; then
 	    func_fatal_error "\`$lib' is not a convenience library"
@@ -5366,9 +6466,15 @@
 
 	# Get the name of the library we link against.
 	linklib=
-	for l in $old_library $library_names; do
-	  linklib="$l"
-	done
+	if test -n "$old_library" &&
+	   { test "$prefer_static_libs" = yes ||
+	     test "$prefer_static_libs,$installed" = "built,no"; }; then
+	  linklib=$old_library
+	else
+	  for l in $old_library $library_names; do
+	    linklib="$l"
+	  done
+	fi
 	if test -z "$linklib"; then
 	  func_fatal_error "cannot find name of link library for \`$lib'"
 	fi
@@ -5385,9 +6491,9 @@
 	    # statically, we need to preload.  We also need to preload any
 	    # dependent libraries so libltdl's deplib preloader doesn't
 	    # bomb out in the load deplibs phase.
-	    dlprefiles="$dlprefiles $lib $dependency_libs"
+	    func_append dlprefiles " $lib $dependency_libs"
 	  else
-	    newdlfiles="$newdlfiles $lib"
+	    func_append newdlfiles " $lib"
 	  fi
 	  continue
 	fi # $pass = dlopen
@@ -5409,14 +6515,14 @@
 
 	# Find the relevant object directory and library name.
 	if test "X$installed" = Xyes; then
-	  if test ! -f "$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
+	  if test ! -f "$lt_sysroot$libdir/$linklib" && test -f "$abs_ladir/$linklib"; then
 	    func_warning "library \`$lib' was moved."
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    libdir="$abs_ladir"
 	  else
-	    dir="$libdir"
-	    absdir="$libdir"
+	    dir="$lt_sysroot$libdir"
+	    absdir="$lt_sysroot$libdir"
 	  fi
 	  test "X$hardcode_automatic" = Xyes && avoidtemprpath=yes
 	else
@@ -5424,12 +6530,12 @@
 	    dir="$ladir"
 	    absdir="$abs_ladir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  else
 	    dir="$ladir/$objdir"
 	    absdir="$abs_ladir/$objdir"
 	    # Remove this search path later
-	    notinst_path="$notinst_path $abs_ladir"
+	    func_append notinst_path " $abs_ladir"
 	  fi
 	fi # $installed = yes
 	func_stripname 'lib' '.la' "$laname"
@@ -5440,20 +6546,46 @@
 	  if test -z "$libdir" && test "$linkmode" = prog; then
 	    func_fatal_error "only libraries may -dlpreopen a convenience library: \`$lib'"
 	  fi
-	  # Prefer using a static library (so that no silly _DYNAMIC symbols
-	  # are required to link).
-	  if test -n "$old_library"; then
-	    newdlprefiles="$newdlprefiles $dir/$old_library"
-	    # Keep a list of preopened convenience libraries to check
-	    # that they are being used correctly in the link pass.
-	    test -z "$libdir" && \
-		dlpreconveniencelibs="$dlpreconveniencelibs $dir/$old_library"
-	  # Otherwise, use the dlname, so that lt_dlopen finds it.
-	  elif test -n "$dlname"; then
-	    newdlprefiles="$newdlprefiles $dir/$dlname"
-	  else
-	    newdlprefiles="$newdlprefiles $dir/$linklib"
-	  fi
+	  case "$host" in
+	    # special handling for platforms with PE-DLLs.
+	    *cygwin* | *mingw* | *cegcc* )
+	      # Linker will automatically link against shared library if both
+	      # static and shared are present.  Therefore, ensure we extract
+	      # symbols from the import library if a shared library is present
+	      # (otherwise, the dlopen module name will be incorrect).  We do
+	      # this by putting the import library name into $newdlprefiles.
+	      # We recover the dlopen module name by 'saving' the la file
+	      # name in a special purpose variable, and (later) extracting the
+	      # dlname from the la file.
+	      if test -n "$dlname"; then
+	        func_tr_sh "$dir/$linklib"
+	        eval "libfile_$func_tr_sh_result=\$abs_ladir/\$laname"
+	        func_append newdlprefiles " $dir/$linklib"
+	      else
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      fi
+	    ;;
+	    * )
+	      # Prefer using a static library (so that no silly _DYNAMIC symbols
+	      # are required to link).
+	      if test -n "$old_library"; then
+	        func_append newdlprefiles " $dir/$old_library"
+	        # Keep a list of preopened convenience libraries to check
+	        # that they are being used correctly in the link pass.
+	        test -z "$libdir" && \
+	          func_append dlpreconveniencelibs " $dir/$old_library"
+	      # Otherwise, use the dlname, so that lt_dlopen finds it.
+	      elif test -n "$dlname"; then
+	        func_append newdlprefiles " $dir/$dlname"
+	      else
+	        func_append newdlprefiles " $dir/$linklib"
+	      fi
+	    ;;
+	  esac
 	fi # $pass = dlpreopen
 
 	if test -z "$libdir"; then
@@ -5471,7 +6603,7 @@
 
 
 	if test "$linkmode" = prog && test "$pass" != link; then
-	  newlib_search_path="$newlib_search_path $ladir"
+	  func_append newlib_search_path " $ladir"
 	  deplibs="$lib $deplibs"
 
 	  linkalldeplibs=no
@@ -5484,7 +6616,8 @@
 	  for deplib in $dependency_libs; do
 	    case $deplib in
 	    -L*) func_stripname '-L' '' "$deplib"
-	         newlib_search_path="$newlib_search_path $func_stripname_result"
+	         func_resolve_sysroot "$func_stripname_result"
+	         func_append newlib_search_path " $func_resolve_sysroot_result"
 		 ;;
 	    esac
 	    # Need to link against all dependency_libs?
@@ -5495,12 +6628,12 @@
 	      # or/and link against static libraries
 	      newdependency_libs="$deplib $newdependency_libs"
 	    fi
-	    if $opt_duplicate_deps ; then
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $deplib "*) func_append specialdeplibs " $deplib" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $deplib"
 	  done # for deplib
 	  continue
 	fi # $linkmode = prog...
@@ -5515,7 +6648,7 @@
 	      # Make sure the rpath contains only unique directories.
 	      case "$temp_rpath:" in
 	      *"$absdir:"*) ;;
-	      *) temp_rpath="$temp_rpath$absdir:" ;;
+	      *) func_append temp_rpath "$absdir:" ;;
 	      esac
 	    fi
 
@@ -5527,7 +6660,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5536,7 +6669,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5561,12 +6694,12 @@
 	  case $host in
 	  *cygwin* | *mingw* | *cegcc*)
 	      # No point in relinking DLLs because paths are not encoded
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=no
 	    ;;
 	  *)
 	    if test "$installed" = no; then
-	      notinst_deplibs="$notinst_deplibs $lib"
+	      func_append notinst_deplibs " $lib"
 	      need_relink=yes
 	    fi
 	    ;;
@@ -5583,7 +6716,7 @@
 	    fi
 	  done
 	  if test -z "$dlopenmodule" && test "$shouldnotlink" = yes && test "$pass" = link; then
-	    $ECHO
+	    echo
 	    if test "$linkmode" = prog; then
 	      $ECHO "*** Warning: Linking the executable $output against the loadable module"
 	    else
@@ -5601,7 +6734,7 @@
 	    *)
 	      case "$compile_rpath " in
 	      *" $absdir "*) ;;
-	      *) compile_rpath="$compile_rpath $absdir"
+	      *) func_append compile_rpath " $absdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5610,7 +6743,7 @@
 	    *)
 	      case "$finalize_rpath " in
 	      *" $libdir "*) ;;
-	      *) finalize_rpath="$finalize_rpath $libdir"
+	      *) func_append finalize_rpath " $libdir" ;;
 	      esac
 	      ;;
 	    esac
@@ -5664,7 +6797,7 @@
 	    linklib=$newlib
 	  fi # test -n "$old_archive_from_expsyms_cmds"
 
-	  if test "$linkmode" = prog || test "$mode" != relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" != relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5686,9 +6819,9 @@
 		      if test "X$dlopenmodule" != "X$lib"; then
 			$ECHO "*** Warning: lib $linklib is a module, not a shared library"
 			if test -z "$old_library" ; then
-			  $ECHO
-			  $ECHO "*** And there doesn't seem to be a static archive available"
-			  $ECHO "*** The link will probably fail, sorry"
+			  echo
+			  echo "*** And there doesn't seem to be a static archive available"
+			  echo "*** The link will probably fail, sorry"
 			else
 			  add="$dir/$old_library"
 			fi
@@ -5715,12 +6848,12 @@
 	         test "$hardcode_direct_absolute" = no; then
 		add="$dir/$linklib"
 	      elif test "$hardcode_minus_L" = yes; then
-		add_dir="-L$dir"
+		add_dir="-L$absdir"
 		# Try looking first in the location we're being installed to.
 		if test -n "$inst_prefix_dir"; then
 		  case $libdir in
 		    [\\/]*)
-		      add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		      func_append add_dir " -L$inst_prefix_dir$libdir"
 		      ;;
 		  esac
 		fi
@@ -5742,7 +6875,7 @@
 	    if test -n "$add_shlibpath"; then
 	      case :$compile_shlibpath: in
 	      *":$add_shlibpath:"*) ;;
-	      *) compile_shlibpath="$compile_shlibpath$add_shlibpath:" ;;
+	      *) func_append compile_shlibpath "$add_shlibpath:" ;;
 	      esac
 	    fi
 	    if test "$linkmode" = prog; then
@@ -5756,13 +6889,13 @@
 		 test "$hardcode_shlibpath_var" = yes; then
 		case :$finalize_shlibpath: in
 		*":$libdir:"*) ;;
-		*) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+		*) func_append finalize_shlibpath "$libdir:" ;;
 		esac
 	      fi
 	    fi
 	  fi
 
-	  if test "$linkmode" = prog || test "$mode" = relink; then
+	  if test "$linkmode" = prog || test "$opt_mode" = relink; then
 	    add_shlibpath=
 	    add_dir=
 	    add=
@@ -5776,7 +6909,7 @@
 	    elif test "$hardcode_shlibpath_var" = yes; then
 	      case :$finalize_shlibpath: in
 	      *":$libdir:"*) ;;
-	      *) finalize_shlibpath="$finalize_shlibpath$libdir:" ;;
+	      *) func_append finalize_shlibpath "$libdir:" ;;
 	      esac
 	      add="-l$name"
 	    elif test "$hardcode_automatic" = yes; then
@@ -5793,7 +6926,7 @@
 	      if test -n "$inst_prefix_dir"; then
 		case $libdir in
 		  [\\/]*)
-		    add_dir="$add_dir -L$inst_prefix_dir$libdir"
+		    func_append add_dir " -L$inst_prefix_dir$libdir"
 		    ;;
 		esac
 	      fi
@@ -5828,21 +6961,21 @@
 
 	    # Just print a warning and add the library to dependency_libs so
 	    # that the program can be linked against the static library.
-	    $ECHO
+	    echo
 	    $ECHO "*** Warning: This system can not link to static lib archive $lib."
-	    $ECHO "*** I have the capability to make that library automatically link in when"
-	    $ECHO "*** you link to this library.  But I can only do this if you have a"
-	    $ECHO "*** shared version of the library, which you do not appear to have."
+	    echo "*** I have the capability to make that library automatically link in when"
+	    echo "*** you link to this library.  But I can only do this if you have a"
+	    echo "*** shared version of the library, which you do not appear to have."
 	    if test "$module" = yes; then
-	      $ECHO "*** But as you try to build a module library, libtool will still create "
-	      $ECHO "*** a static module, that should work as long as the dlopening application"
-	      $ECHO "*** is linked with the -dlopen flag to resolve symbols at runtime."
+	      echo "*** But as you try to build a module library, libtool will still create "
+	      echo "*** a static module, that should work as long as the dlopening application"
+	      echo "*** is linked with the -dlopen flag to resolve symbols at runtime."
 	      if test -z "$global_symbol_pipe"; then
-		$ECHO
-		$ECHO "*** However, this would only work if libtool was able to extract symbol"
-		$ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-		$ECHO "*** not find such a program.  So, this module is probably useless."
-		$ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+		echo
+		echo "*** However, this would only work if libtool was able to extract symbol"
+		echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+		echo "*** not find such a program.  So, this module is probably useless."
+		echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	      fi
 	      if test "$build_old_libs" = no; then
 		build_libtool_libs=module
@@ -5870,27 +7003,33 @@
 	           temp_xrpath=$func_stripname_result
 		   case " $xrpath " in
 		   *" $temp_xrpath "*) ;;
-		   *) xrpath="$xrpath $temp_xrpath";;
+		   *) func_append xrpath " $temp_xrpath";;
 		   esac;;
-	      *) temp_deplibs="$temp_deplibs $libdir";;
+	      *) func_append temp_deplibs " $libdir";;
 	      esac
 	    done
 	    dependency_libs="$temp_deplibs"
 	  fi
 
-	  newlib_search_path="$newlib_search_path $absdir"
+	  func_append newlib_search_path " $absdir"
 	  # Link against this library
 	  test "$link_static" = no && newdependency_libs="$abs_ladir/$laname $newdependency_libs"
 	  # ... and its dependency_libs
 	  tmp_libs=
 	  for deplib in $dependency_libs; do
 	    newdependency_libs="$deplib $newdependency_libs"
-	    if $opt_duplicate_deps ; then
+	    case $deplib in
+              -L*) func_stripname '-L' '' "$deplib"
+                   func_resolve_sysroot "$func_stripname_result";;
+              *) func_resolve_sysroot "$deplib" ;;
+            esac
+	    if $opt_preserve_dup_deps ; then
 	      case "$tmp_libs " in
-	      *" $deplib "*) specialdeplibs="$specialdeplibs $deplib" ;;
+	      *" $func_resolve_sysroot_result "*)
+                func_append specialdeplibs " $func_resolve_sysroot_result" ;;
 	      esac
 	    fi
-	    tmp_libs="$tmp_libs $deplib"
+	    func_append tmp_libs " $func_resolve_sysroot_result"
 	  done
 
 	  if test "$link_all_deplibs" != no; then
@@ -5900,8 +7039,10 @@
 	      case $deplib in
 	      -L*) path="$deplib" ;;
 	      *.la)
+	        func_resolve_sysroot "$deplib"
+	        deplib=$func_resolve_sysroot_result
 	        func_dirname "$deplib" "" "."
-		dir="$func_dirname_result"
+		dir=$func_dirname_result
 		# We need an absolute path.
 		case $dir in
 		[\\/]* | [A-Za-z]:[\\/]*) absdir="$dir" ;;
@@ -5928,8 +7069,8 @@
                       if test -z "$darwin_install_name"; then
                           darwin_install_name=`${OTOOL64} -L $depdepl  | awk '{if (NR == 2) {print $1;exit}}'`
                       fi
-		      compiler_flags="$compiler_flags ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
-		      linker_flags="$linker_flags -dylib_file ${darwin_install_name}:${depdepl}"
+		      func_append compiler_flags " ${wl}-dylib_file ${wl}${darwin_install_name}:${depdepl}"
+		      func_append linker_flags " -dylib_file ${darwin_install_name}:${depdepl}"
 		      path=
 		    fi
 		  fi
@@ -5962,7 +7103,7 @@
 	  compile_deplibs="$new_inherited_linker_flags $compile_deplibs"
 	  finalize_deplibs="$new_inherited_linker_flags $finalize_deplibs"
 	else
-	  compiler_flags="$compiler_flags "`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  compiler_flags="$compiler_flags "`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	fi
       fi
       dependency_libs="$newdependency_libs"
@@ -5979,7 +7120,7 @@
 	  for dir in $newlib_search_path; do
 	    case "$lib_search_path " in
 	    *" $dir "*) ;;
-	    *) lib_search_path="$lib_search_path $dir" ;;
+	    *) func_append lib_search_path " $dir" ;;
 	    esac
 	  done
 	  newlib_search_path=
@@ -6037,10 +7178,10 @@
 	    -L*)
 	      case " $tmp_libs " in
 	      *" $deplib "*) ;;
-	      *) tmp_libs="$tmp_libs $deplib" ;;
+	      *) func_append tmp_libs " $deplib" ;;
 	      esac
 	      ;;
-	    *) tmp_libs="$tmp_libs $deplib" ;;
+	    *) func_append tmp_libs " $deplib" ;;
 	    esac
 	  done
 	  eval $var=\"$tmp_libs\"
@@ -6056,7 +7197,7 @@
 	  ;;
 	esac
 	if test -n "$i" ; then
-	  tmp_libs="$tmp_libs $i"
+	  func_append tmp_libs " $i"
 	fi
       done
       dependency_libs=$tmp_libs
@@ -6097,7 +7238,7 @@
       # Now set the variables for building old libraries.
       build_libtool_libs=no
       oldlibs="$output"
-      objs="$objs$old_deplibs"
+      func_append objs "$old_deplibs"
       ;;
 
     lib)
@@ -6130,10 +7271,10 @@
 	if test "$deplibs_check_method" != pass_all; then
 	  func_fatal_error "cannot build libtool library \`$output' from non-libtool objects on this host:$objs"
 	else
-	  $ECHO
+	  echo
 	  $ECHO "*** Warning: Linking the shared library $output against the non-libtool"
 	  $ECHO "*** objects $objs is not portable!"
-	  libobjs="$libobjs $objs"
+	  func_append libobjs " $objs"
 	fi
       fi
 
@@ -6192,13 +7333,14 @@
 	  # which has an extra 1 added just for fun
 	  #
 	  case $version_type in
+	  # correct linux to gnu/linux during the next big refactor
 	  darwin|linux|osf|windows|none)
 	    func_arith $number_major + $number_minor
 	    current=$func_arith_result
 	    age="$number_minor"
 	    revision="$number_revision"
 	    ;;
-	  freebsd-aout|freebsd-elf|sunos)
+	  freebsd-aout|freebsd-elf|qnx|sunos)
 	    current="$number_major"
 	    revision="$number_minor"
 	    age="0"
@@ -6311,7 +7453,7 @@
 	  versuffix="$major.$revision"
 	  ;;
 
-	linux)
+	linux) # correct to gnu/linux during the next big refactor
 	  func_arith $current - $age
 	  major=.$func_arith_result
 	  versuffix="$major.$age.$revision"
@@ -6334,7 +7476,7 @@
 	  done
 
 	  # Make executables depend on our current version.
-	  verstring="$verstring:${current}.0"
+	  func_append verstring ":${current}.0"
 	  ;;
 
 	qnx)
@@ -6402,10 +7544,10 @@
       fi
 
       func_generate_dlsyms "$libname" "$libname" "yes"
-      libobjs="$libobjs $symfileobj"
+      func_append libobjs " $symfileobj"
       test "X$libobjs" = "X " && libobjs=
 
-      if test "$mode" != relink; then
+      if test "$opt_mode" != relink; then
 	# Remove our outputs, but don't remove object files since they
 	# may have been created when compiling PIC objects.
 	removelist=
@@ -6421,7 +7563,7 @@
 		   continue
 		 fi
 	       fi
-	       removelist="$removelist $p"
+	       func_append removelist " $p"
 	       ;;
 	    *) ;;
 	  esac
@@ -6432,27 +7574,28 @@
 
       # Now set the variables for building old libraries.
       if test "$build_old_libs" = yes && test "$build_libtool_libs" != convenience ; then
-	oldlibs="$oldlibs $output_objdir/$libname.$libext"
+	func_append oldlibs " $output_objdir/$libname.$libext"
 
 	# Transform .lo files to .o files.
-	oldobjs="$objs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}'$/d' -e "$lo2o" | $NL2SP`
+	oldobjs="$objs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; $lo2o" | $NL2SP`
       fi
 
       # Eliminate all temporary directories.
       #for path in $notinst_path; do
-      #	lib_search_path=`$ECHO "X$lib_search_path " | $Xsed -e "s% $path % %g"`
-      #	deplibs=`$ECHO "X$deplibs " | $Xsed -e "s% -L$path % %g"`
-      #	dependency_libs=`$ECHO "X$dependency_libs " | $Xsed -e "s% -L$path % %g"`
+      #	lib_search_path=`$ECHO "$lib_search_path " | $SED "s% $path % %g"`
+      #	deplibs=`$ECHO "$deplibs " | $SED "s% -L$path % %g"`
+      #	dependency_libs=`$ECHO "$dependency_libs " | $SED "s% -L$path % %g"`
       #done
 
       if test -n "$xrpath"; then
 	# If the user specified any rpath flags, then add them.
 	temp_xrpath=
 	for libdir in $xrpath; do
-	  temp_xrpath="$temp_xrpath -R$libdir"
+	  func_replace_sysroot "$libdir"
+	  func_append temp_xrpath " -R$func_replace_sysroot_result"
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
 	if test "$hardcode_into_libs" != yes || test "$build_old_libs" = yes; then
@@ -6466,7 +7609,7 @@
       for lib in $old_dlfiles; do
 	case " $dlprefiles $dlfiles " in
 	*" $lib "*) ;;
-	*) dlfiles="$dlfiles $lib" ;;
+	*) func_append dlfiles " $lib" ;;
 	esac
       done
 
@@ -6476,19 +7619,19 @@
       for lib in $old_dlprefiles; do
 	case "$dlprefiles " in
 	*" $lib "*) ;;
-	*) dlprefiles="$dlprefiles $lib" ;;
+	*) func_append dlprefiles " $lib" ;;
 	esac
       done
 
       if test "$build_libtool_libs" = yes; then
 	if test -n "$rpath"; then
 	  case $host in
-	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc*)
+	  *-*-cygwin* | *-*-mingw* | *-*-pw32* | *-*-os2* | *-*-beos* | *-cegcc* | *-*-haiku*)
 	    # these systems don't actually have a c library (as such)!
 	    ;;
 	  *-*-rhapsody* | *-*-darwin1.[012])
 	    # Rhapsody C library is in the System framework
-	    deplibs="$deplibs System.ltframework"
+	    func_append deplibs " System.ltframework"
 	    ;;
 	  *-*-netbsd*)
 	    # Don't link with libc until the a.out ld.so is fixed.
@@ -6505,7 +7648,7 @@
 	  *)
 	    # Add libc to deplibs on all other systems if necessary.
 	    if test "$build_libtool_need_lc" = "yes"; then
-	      deplibs="$deplibs -lc"
+	      func_append deplibs " -lc"
 	    fi
 	    ;;
 	  esac
@@ -6554,7 +7697,7 @@
 		if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		  case " $predeps $postdeps " in
 		  *" $i "*)
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		    i=""
 		    ;;
 		  esac
@@ -6565,21 +7708,21 @@
 		  set dummy $deplib_matches; shift
 		  deplib_match=$1
 		  if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		    newdeplibs="$newdeplibs $i"
+		    func_append newdeplibs " $i"
 		  else
 		    droppeddeps=yes
-		    $ECHO
+		    echo
 		    $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		    $ECHO "*** I have the capability to make that library automatically link in when"
-		    $ECHO "*** you link to this library.  But I can only do this if you have a"
-		    $ECHO "*** shared version of the library, which I believe you do not have"
-		    $ECHO "*** because a test_compile did reveal that the linker did not use it for"
-		    $ECHO "*** its dynamic dependency list that programs get resolved with at runtime."
+		    echo "*** I have the capability to make that library automatically link in when"
+		    echo "*** you link to this library.  But I can only do this if you have a"
+		    echo "*** shared version of the library, which I believe you do not have"
+		    echo "*** because a test_compile did reveal that the linker did not use it for"
+		    echo "*** its dynamic dependency list that programs get resolved with at runtime."
 		  fi
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6597,7 +7740,7 @@
 		  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		    case " $predeps $postdeps " in
 		    *" $i "*)
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		      i=""
 		      ;;
 		    esac
@@ -6608,29 +7751,29 @@
 		    set dummy $deplib_matches; shift
 		    deplib_match=$1
 		    if test `expr "$ldd_output" : ".*$deplib_match"` -ne 0 ; then
-		      newdeplibs="$newdeplibs $i"
+		      func_append newdeplibs " $i"
 		    else
 		      droppeddeps=yes
-		      $ECHO
+		      echo
 		      $ECHO "*** Warning: dynamic linker does not accept needed library $i."
-		      $ECHO "*** I have the capability to make that library automatically link in when"
-		      $ECHO "*** you link to this library.  But I can only do this if you have a"
-		      $ECHO "*** shared version of the library, which you do not appear to have"
-		      $ECHO "*** because a test_compile did reveal that the linker did not use this one"
-		      $ECHO "*** as a dynamic dependency that programs can get resolved with at runtime."
+		      echo "*** I have the capability to make that library automatically link in when"
+		      echo "*** you link to this library.  But I can only do this if you have a"
+		      echo "*** shared version of the library, which you do not appear to have"
+		      echo "*** because a test_compile did reveal that the linker did not use this one"
+		      echo "*** as a dynamic dependency that programs can get resolved with at runtime."
 		    fi
 		  fi
 		else
 		  droppeddeps=yes
-		  $ECHO
+		  echo
 		  $ECHO "*** Warning!  Library $i is needed by this library but I was not able to"
-		  $ECHO "*** make it link in!  You will probably need to install it or some"
-		  $ECHO "*** library that it depends on before this library will be fully"
-		  $ECHO "*** functional.  Installing it before continuing would be even better."
+		  echo "*** make it link in!  You will probably need to install it or some"
+		  echo "*** library that it depends on before this library will be fully"
+		  echo "*** functional.  Installing it before continuing would be even better."
 		fi
 		;;
 	      *)
-		newdeplibs="$newdeplibs $i"
+		func_append newdeplibs " $i"
 		;;
 	      esac
 	    done
@@ -6647,15 +7790,27 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
 	      fi
 	      if test -n "$a_deplib" ; then
 		libname=`eval "\\$ECHO \"$libname_spec\""`
+		if test -n "$file_magic_glob"; then
+		  libnameglob=`func_echo_all "$libname" | $SED -e $file_magic_glob`
+		else
+		  libnameglob=$libname
+		fi
+		test "$want_nocaseglob" = yes && nocaseglob=`shopt -p nocaseglob`
 		for i in $lib_search_path $sys_lib_search_path $shlib_search_path; do
-		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
+		  if test "$want_nocaseglob" = yes; then
+		    shopt -s nocaseglob
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		    $nocaseglob
+		  else
+		    potential_libs=`ls $i/$libnameglob[.-]* 2>/dev/null`
+		  fi
 		  for potent_lib in $potential_libs; do
 		      # Follow soft links.
 		      if ls -lLd "$potent_lib" 2>/dev/null |
@@ -6672,13 +7827,13 @@
 			potliblink=`ls -ld $potlib | ${SED} 's/.* -> //'`
 			case $potliblink in
 			[\\/]* | [A-Za-z]:[\\/]*) potlib="$potliblink";;
-			*) potlib=`$ECHO "X$potlib" | $Xsed -e 's,[^/]*$,,'`"$potliblink";;
+			*) potlib=`$ECHO "$potlib" | $SED 's,[^/]*$,,'`"$potliblink";;
 			esac
 		      done
 		      if eval $file_magic_cmd \"\$potlib\" 2>/dev/null |
 			 $SED -e 10q |
 			 $EGREP "$file_magic_regex" > /dev/null; then
-			newdeplibs="$newdeplibs $a_deplib"
+			func_append newdeplibs " $a_deplib"
 			a_deplib=""
 			break 2
 		      fi
@@ -6687,12 +7842,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for file magic test)"
 		else
@@ -6703,7 +7858,7 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
@@ -6719,7 +7874,7 @@
 	      if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 		case " $predeps $postdeps " in
 		*" $a_deplib "*)
-		  newdeplibs="$newdeplibs $a_deplib"
+		  func_append newdeplibs " $a_deplib"
 		  a_deplib=""
 		  ;;
 		esac
@@ -6730,9 +7885,9 @@
 		  potential_libs=`ls $i/$libname[.-]* 2>/dev/null`
 		  for potent_lib in $potential_libs; do
 		    potlib="$potent_lib" # see symlink-check above in file_magic test
-		    if eval "\$ECHO \"X$potent_lib\"" 2>/dev/null | $Xsed -e 10q | \
+		    if eval "\$ECHO \"$potent_lib\"" 2>/dev/null | $SED 10q | \
 		       $EGREP "$match_pattern_regex" > /dev/null; then
-		      newdeplibs="$newdeplibs $a_deplib"
+		      func_append newdeplibs " $a_deplib"
 		      a_deplib=""
 		      break 2
 		    fi
@@ -6741,12 +7896,12 @@
 	      fi
 	      if test -n "$a_deplib" ; then
 		droppeddeps=yes
-		$ECHO
+		echo
 		$ECHO "*** Warning: linker path does not have real file for library $a_deplib."
-		$ECHO "*** I have the capability to make that library automatically link in when"
-		$ECHO "*** you link to this library.  But I can only do this if you have a"
-		$ECHO "*** shared version of the library, which you do not appear to have"
-		$ECHO "*** because I did check the linker path looking for a file starting"
+		echo "*** I have the capability to make that library automatically link in when"
+		echo "*** you link to this library.  But I can only do this if you have a"
+		echo "*** shared version of the library, which you do not appear to have"
+		echo "*** because I did check the linker path looking for a file starting"
 		if test -z "$potlib" ; then
 		  $ECHO "*** with $libname but no candidates were found. (...for regex pattern test)"
 		else
@@ -6757,32 +7912,32 @@
 	      ;;
 	    *)
 	      # Add a -L argument.
-	      newdeplibs="$newdeplibs $a_deplib"
+	      func_append newdeplibs " $a_deplib"
 	      ;;
 	    esac
 	  done # Gone through all deplibs.
 	  ;;
 	none | unknown | *)
 	  newdeplibs=""
-	  tmp_deplibs=`$ECHO "X $deplibs" | $Xsed \
-	      -e 's/ -lc$//' -e 's/ -[LR][^ ]*//g'`
+	  tmp_deplibs=`$ECHO " $deplibs" | $SED 's/ -lc$//; s/ -[LR][^ ]*//g'`
 	  if test "X$allow_libtool_libs_with_static_runtimes" = "Xyes" ; then
 	    for i in $predeps $postdeps ; do
 	      # can't use Xsed below, because $i might contain '/'
-	      tmp_deplibs=`$ECHO "X $tmp_deplibs" | $Xsed -e "s,$i,,"`
+	      tmp_deplibs=`$ECHO " $tmp_deplibs" | $SED "s,$i,,"`
 	    done
 	  fi
-	  if $ECHO "X $tmp_deplibs" | $Xsed -e 's/[	 ]//g' |
-	     $GREP . >/dev/null; then
-	    $ECHO
+	  case $tmp_deplibs in
+	  *[!\	\ ]*)
+	    echo
 	    if test "X$deplibs_check_method" = "Xnone"; then
-	      $ECHO "*** Warning: inter-library dependencies are not supported in this platform."
+	      echo "*** Warning: inter-library dependencies are not supported in this platform."
 	    else
-	      $ECHO "*** Warning: inter-library dependencies are not known to be supported."
+	      echo "*** Warning: inter-library dependencies are not known to be supported."
 	    fi
-	    $ECHO "*** All declared inter-library dependencies are being dropped."
+	    echo "*** All declared inter-library dependencies are being dropped."
 	    droppeddeps=yes
-	  fi
+	    ;;
+	  esac
 	  ;;
 	esac
 	versuffix=$versuffix_save
@@ -6794,23 +7949,23 @@
 	case $host in
 	*-*-rhapsody* | *-*-darwin1.[012])
 	  # On Rhapsody replace the C library with the System framework
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's/ -lc / System.ltframework /'`
 	  ;;
 	esac
 
 	if test "$droppeddeps" = yes; then
 	  if test "$module" = yes; then
-	    $ECHO
-	    $ECHO "*** Warning: libtool could not satisfy all declared inter-library"
+	    echo
+	    echo "*** Warning: libtool could not satisfy all declared inter-library"
 	    $ECHO "*** dependencies of module $libname.  Therefore, libtool will create"
-	    $ECHO "*** a static module, that should work as long as the dlopening"
-	    $ECHO "*** application is linked with the -dlopen flag."
+	    echo "*** a static module, that should work as long as the dlopening"
+	    echo "*** application is linked with the -dlopen flag."
 	    if test -z "$global_symbol_pipe"; then
-	      $ECHO
-	      $ECHO "*** However, this would only work if libtool was able to extract symbol"
-	      $ECHO "*** lists from a program, using \`nm' or equivalent, but libtool could"
-	      $ECHO "*** not find such a program.  So, this module is probably useless."
-	      $ECHO "*** \`nm' from GNU binutils and a full rebuild may help."
+	      echo
+	      echo "*** However, this would only work if libtool was able to extract symbol"
+	      echo "*** lists from a program, using \`nm' or equivalent, but libtool could"
+	      echo "*** not find such a program.  So, this module is probably useless."
+	      echo "*** \`nm' from GNU binutils and a full rebuild may help."
 	    fi
 	    if test "$build_old_libs" = no; then
 	      oldlibs="$output_objdir/$libname.$libext"
@@ -6820,16 +7975,16 @@
 	      build_libtool_libs=no
 	    fi
 	  else
-	    $ECHO "*** The inter-library dependencies that have been dropped here will be"
-	    $ECHO "*** automatically added whenever a program is linked with this library"
-	    $ECHO "*** or is declared to -dlopen it."
+	    echo "*** The inter-library dependencies that have been dropped here will be"
+	    echo "*** automatically added whenever a program is linked with this library"
+	    echo "*** or is declared to -dlopen it."
 
 	    if test "$allow_undefined" = no; then
-	      $ECHO
-	      $ECHO "*** Since this library must not contain undefined symbols,"
-	      $ECHO "*** because either the platform does not support them or"
-	      $ECHO "*** it was explicitly requested with -no-undefined,"
-	      $ECHO "*** libtool will only create a static version of it."
+	      echo
+	      echo "*** Since this library must not contain undefined symbols,"
+	      echo "*** because either the platform does not support them or"
+	      echo "*** it was explicitly requested with -no-undefined,"
+	      echo "*** libtool will only create a static version of it."
 	      if test "$build_old_libs" = no; then
 		oldlibs="$output_objdir/$libname.$libext"
 		build_libtool_libs=module
@@ -6846,9 +8001,9 @@
       # Time to change all our "foo.ltframework" stuff back to "-framework foo"
       case $host in
 	*-*-darwin*)
-	  newdeplibs=`$ECHO "X $newdeplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  new_inherited_linker_flags=`$ECHO "X $new_inherited_linker_flags" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	  deplibs=`$ECHO "X $deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  newdeplibs=`$ECHO " $newdeplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  new_inherited_linker_flags=`$ECHO " $new_inherited_linker_flags" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	  deplibs=`$ECHO " $deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	  ;;
       esac
 
@@ -6861,7 +8016,7 @@
 	*)
 	  case " $deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -6871,10 +8026,10 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       deplibs="$new_libs"
@@ -6886,15 +8041,22 @@
 
       # Test again, we may have decided not to build it any more
       if test "$build_libtool_libs" = yes; then
+	# Remove ${wl} instances when linking with ld.
+	# FIXME: should test the right _cmds variable.
+	case $archive_cmds in
+	  *\$LD\ *) wl= ;;
+        esac
 	if test "$hardcode_into_libs" = yes; then
 	  # Hardcode the library paths
 	  hardcode_libdirs=
 	  dep_rpath=
 	  rpath="$finalize_rpath"
-	  test "$mode" != relink && rpath="$compile_rpath$rpath"
+	  test "$opt_mode" != relink && rpath="$compile_rpath$rpath"
 	  for libdir in $rpath; do
 	    if test -n "$hardcode_libdir_flag_spec"; then
 	      if test -n "$hardcode_libdir_separator"; then
+		func_replace_sysroot "$libdir"
+		libdir=$func_replace_sysroot_result
 		if test -z "$hardcode_libdirs"; then
 		  hardcode_libdirs="$libdir"
 		else
@@ -6903,18 +8065,18 @@
 		  *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		    ;;
 		  *)
-		    hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		    func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		    ;;
 		  esac
 		fi
 	      else
 		eval flag=\"$hardcode_libdir_flag_spec\"
-		dep_rpath="$dep_rpath $flag"
+		func_append dep_rpath " $flag"
 	      fi
 	    elif test -n "$runpath_var"; then
 	      case "$perm_rpath " in
 	      *" $libdir "*) ;;
-	      *) perm_rpath="$perm_rpath $libdir" ;;
+	      *) func_append perm_rpath " $libdir" ;;
 	      esac
 	    fi
 	  done
@@ -6922,17 +8084,13 @@
 	  if test -n "$hardcode_libdir_separator" &&
 	     test -n "$hardcode_libdirs"; then
 	    libdir="$hardcode_libdirs"
-	    if test -n "$hardcode_libdir_flag_spec_ld"; then
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec_ld\"
-	    else
-	      eval dep_rpath=\"$hardcode_libdir_flag_spec\"
-	    fi
+	    eval "dep_rpath=\"$hardcode_libdir_flag_spec\""
 	  fi
 	  if test -n "$runpath_var" && test -n "$perm_rpath"; then
 	    # We should set the runpath_var.
 	    rpath=
 	    for dir in $perm_rpath; do
-	      rpath="$rpath$dir:"
+	      func_append rpath "$dir:"
 	    done
 	    eval "$runpath_var='$rpath\$$runpath_var'; export $runpath_var"
 	  fi
@@ -6940,7 +8098,7 @@
 	fi
 
 	shlibpath="$finalize_shlibpath"
-	test "$mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
+	test "$opt_mode" != relink && shlibpath="$compile_shlibpath$shlibpath"
 	if test -n "$shlibpath"; then
 	  eval "$shlibpath_var='$shlibpath\$$shlibpath_var'; export $shlibpath_var"
 	fi
@@ -6966,18 +8124,18 @@
 	linknames=
 	for link
 	do
-	  linknames="$linknames $link"
+	  func_append linknames " $link"
 	done
 
 	# Use standard objects if they are pic
-	test -z "$pic_flag" && libobjs=`$ECHO "X$libobjs" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	test -z "$pic_flag" && libobjs=`$ECHO "$libobjs" | $SP2NL | $SED "$lo2o" | $NL2SP`
 	test "X$libobjs" = "X " && libobjs=
 
 	delfiles=
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  $opt_dry_run || cp "$export_symbols" "$output_objdir/$libname.uexp"
 	  export_symbols="$output_objdir/$libname.uexp"
-	  delfiles="$delfiles $export_symbols"
+	  func_append delfiles " $export_symbols"
 	fi
 
 	orig_export_symbols=
@@ -7008,13 +8166,45 @@
 	    $opt_dry_run || $RM $export_symbols
 	    cmds=$export_symbols_cmds
 	    save_ifs="$IFS"; IFS='~'
-	    for cmd in $cmds; do
+	    for cmd1 in $cmds; do
 	      IFS="$save_ifs"
-	      eval cmd=\"$cmd\"
-	      func_len " $cmd"
-	      len=$func_len_result
-	      if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
+	      # Take the normal branch if the nm_file_list_spec branch
+	      # doesn't work or if tool conversion is not needed.
+	      case $nm_file_list_spec~$to_tool_file_cmd in
+		*~func_convert_file_noop | *~func_convert_file_msys_to_w32 | ~*)
+		  try_normal_branch=yes
+		  eval cmd=\"$cmd1\"
+		  func_len " $cmd"
+		  len=$func_len_result
+		  ;;
+		*)
+		  try_normal_branch=no
+		  ;;
+	      esac
+	      if test "$try_normal_branch" = yes \
+		 && { test "$len" -lt "$max_cmd_len" \
+		      || test "$max_cmd_len" -le -1; }
+	      then
+		func_show_eval "$cmd" 'exit $?'
+		skipped_export=false
+	      elif test -n "$nm_file_list_spec"; then
+		func_basename "$output"
+		output_la=$func_basename_result
+		save_libobjs=$libobjs
+		save_output=$output
+		output=${output_objdir}/${output_la}.nm
+		func_to_tool_file "$output"
+		libobjs=$nm_file_list_spec$func_to_tool_file_result
+		func_append delfiles " $output"
+		func_verbose "creating $NM input file list: $output"
+		for obj in $save_libobjs; do
+		  func_to_tool_file "$obj"
+		  $ECHO "$func_to_tool_file_result"
+		done > "$output"
+		eval cmd=\"$cmd1\"
 		func_show_eval "$cmd" 'exit $?'
+		output=$save_output
+		libobjs=$save_libobjs
 		skipped_export=false
 	      else
 		# The command line is too long to execute in one step.
@@ -7036,7 +8226,7 @@
 	if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	  tmp_export_symbols="$export_symbols"
 	  test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	  $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	  $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	fi
 
 	if test "X$skipped_export" != "X:" && test -n "$orig_export_symbols"; then
@@ -7048,7 +8238,7 @@
 	  # global variables. join(1) would be nice here, but unfortunately
 	  # isn't a blessed tool.
 	  $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	  delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	  func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	  export_symbols=$output_objdir/$libname.def
 	  $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	fi
@@ -7058,7 +8248,7 @@
 	  case " $convenience " in
 	  *" $test_deplib "*) ;;
 	  *)
-	    tmp_deplibs="$tmp_deplibs $test_deplib"
+	    func_append tmp_deplibs " $test_deplib"
 	    ;;
 	  esac
 	done
@@ -7078,21 +8268,21 @@
 	    test "X$libobjs" = "X " && libobjs=
 	  else
 	    gentop="$output_objdir/${outputname}x"
-	    generated="$generated $gentop"
+	    func_append generated " $gentop"
 
 	    func_extract_archives $gentop $convenience
-	    libobjs="$libobjs $func_extract_archives_result"
+	    func_append libobjs " $func_extract_archives_result"
 	    test "X$libobjs" = "X " && libobjs=
 	  fi
 	fi
 
 	if test "$thread_safe" = yes && test -n "$thread_safe_flag_spec"; then
 	  eval flag=\"$thread_safe_flag_spec\"
-	  linker_flags="$linker_flags $flag"
+	  func_append linker_flags " $flag"
 	fi
 
 	# Make a backup of the uninstalled library when relinking
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}U && $MV $realname ${realname}U)' || exit $?
 	fi
 
@@ -7137,7 +8327,8 @@
 	    save_libobjs=$libobjs
 	  fi
 	  save_output=$output
-	  output_la=`$ECHO "X$output" | $Xsed -e "$basename"`
+	  func_basename "$output"
+	  output_la=$func_basename_result
 
 	  # Clear the reloadable object creation command queue and
 	  # initialize k to one.
@@ -7150,13 +8341,16 @@
 	  if test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "$with_gnu_ld" = yes; then
 	    output=${output_objdir}/${output_la}.lnkscript
 	    func_verbose "creating GNU ld script: $output"
-	    $ECHO 'INPUT (' > $output
+	    echo 'INPUT (' > $output
 	    for obj in $save_libobjs
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    $ECHO ')' >> $output
-	    delfiles="$delfiles $output"
+	    echo ')' >> $output
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$func_to_tool_file_result
 	  elif test -n "$save_libobjs" && test "X$skipped_export" != "X:" && test "X$file_list_spec" != X; then
 	    output=${output_objdir}/${output_la}.lnk
 	    func_verbose "creating linker input file list: $output"
@@ -7170,10 +8364,12 @@
 	    fi
 	    for obj
 	    do
-	      $ECHO "$obj" >> $output
+	      func_to_tool_file "$obj"
+	      $ECHO "$func_to_tool_file_result" >> $output
 	    done
-	    delfiles="$delfiles $output"
-	    output=$firstobj\"$file_list_spec$output\"
+	    func_append delfiles " $output"
+	    func_to_tool_file "$output"
+	    output=$firstobj\"$file_list_spec$func_to_tool_file_result\"
 	  else
 	    if test -n "$save_libobjs"; then
 	      func_verbose "creating reloadable object files..."
@@ -7197,17 +8393,19 @@
 		  # command to the queue.
 		  if test "$k" -eq 1 ; then
 		    # The first file doesn't have a previous command to add.
-		    eval concat_cmds=\"$reload_cmds $objlist $last_robj\"
+		    reload_objs=$objlist
+		    eval concat_cmds=\"$reload_cmds\"
 		  else
 		    # All subsequent reloadable object files will link in
 		    # the last one created.
-		    eval concat_cmds=\"\$concat_cmds~$reload_cmds $objlist $last_robj~\$RM $last_robj\"
+		    reload_objs="$objlist $last_robj"
+		    eval concat_cmds=\"\$concat_cmds~$reload_cmds~\$RM $last_robj\"
 		  fi
 		  last_robj=$output_objdir/$output_la-${k}.$objext
 		  func_arith $k + 1
 		  k=$func_arith_result
 		  output=$output_objdir/$output_la-${k}.$objext
-		  objlist=$obj
+		  objlist=" $obj"
 		  func_len " $last_robj"
 		  func_arith $len0 + $func_len_result
 		  len=$func_arith_result
@@ -7217,11 +8415,12 @@
 	      # reloadable object file.  All subsequent reloadable object
 	      # files will link in the last one created.
 	      test -z "$concat_cmds" || concat_cmds=$concat_cmds~
-	      eval concat_cmds=\"\${concat_cmds}$reload_cmds $objlist $last_robj\"
+	      reload_objs="$objlist $last_robj"
+	      eval concat_cmds=\"\${concat_cmds}$reload_cmds\"
 	      if test -n "$last_robj"; then
 	        eval concat_cmds=\"\${concat_cmds}~\$RM $last_robj\"
 	      fi
-	      delfiles="$delfiles $output"
+	      func_append delfiles " $output"
 
 	    else
 	      output=
@@ -7255,7 +8454,7 @@
 		lt_exit=$?
 
 		# Restore the uninstalled library and exit
-		if test "$mode" = relink; then
+		if test "$opt_mode" = relink; then
 		  ( cd "$output_objdir" && \
 		    $RM "${realname}T" && \
 		    $MV "${realname}U" "$realname" )
@@ -7276,7 +8475,7 @@
 	    if test -n "$export_symbols" && test -n "$include_expsyms"; then
 	      tmp_export_symbols="$export_symbols"
 	      test -n "$orig_export_symbols" && tmp_export_symbols="$orig_export_symbols"
-	      $opt_dry_run || eval '$ECHO "X$include_expsyms" | $Xsed | $SP2NL >> "$tmp_export_symbols"'
+	      $opt_dry_run || eval '$ECHO "$include_expsyms" | $SP2NL >> "$tmp_export_symbols"'
 	    fi
 
 	    if test -n "$orig_export_symbols"; then
@@ -7288,7 +8487,7 @@
 	      # global variables. join(1) would be nice here, but unfortunately
 	      # isn't a blessed tool.
 	      $opt_dry_run || $SED -e '/[ ,]DATA/!d;s,\(.*\)\([ \,].*\),s|^\1$|\1\2|,' < $export_symbols > $output_objdir/$libname.filter
-	      delfiles="$delfiles $export_symbols $output_objdir/$libname.filter"
+	      func_append delfiles " $export_symbols $output_objdir/$libname.filter"
 	      export_symbols=$output_objdir/$libname.def
 	      $opt_dry_run || $SED -f $output_objdir/$libname.filter < $orig_export_symbols > $export_symbols
 	    fi
@@ -7329,10 +8528,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  libobjs="$libobjs $func_extract_archives_result"
+	  func_append libobjs " $func_extract_archives_result"
 	  test "X$libobjs" = "X " && libobjs=
 	fi
 
@@ -7348,7 +8547,7 @@
 	    lt_exit=$?
 
 	    # Restore the uninstalled library and exit
-	    if test "$mode" = relink; then
+	    if test "$opt_mode" = relink; then
 	      ( cd "$output_objdir" && \
 	        $RM "${realname}T" && \
 		$MV "${realname}U" "$realname" )
@@ -7360,7 +8559,7 @@
 	IFS="$save_ifs"
 
 	# Restore the uninstalled library and exit
-	if test "$mode" = relink; then
+	if test "$opt_mode" = relink; then
 	  $opt_dry_run || eval '(cd $output_objdir && $RM ${realname}T && $MV $realname ${realname}T && $MV ${realname}U $realname)' || exit $?
 
 	  if test -n "$convenience"; then
@@ -7441,18 +8640,21 @@
       if test -n "$convenience"; then
 	if test -n "$whole_archive_flag_spec"; then
 	  eval tmp_whole_archive_flags=\"$whole_archive_flag_spec\"
-	  reload_conv_objs=$reload_objs\ `$ECHO "X$tmp_whole_archive_flags" | $Xsed -e 's|,| |g'`
+	  reload_conv_objs=$reload_objs\ `$ECHO "$tmp_whole_archive_flags" | $SED 's|,| |g'`
 	else
 	  gentop="$output_objdir/${obj}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $convenience
 	  reload_conv_objs="$reload_objs $func_extract_archives_result"
 	fi
       fi
 
+      # If we're not building shared, we need to use non_pic_objs
+      test "$build_libtool_libs" != yes && libobjs="$non_pic_objects"
+
       # Create the old-style object.
-      reload_objs="$objs$old_deplibs "`$ECHO "X$libobjs" | $SP2NL | $Xsed -e '/\.'${libext}$'/d' -e '/\.lib$/d' -e "$lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
+      reload_objs="$objs$old_deplibs "`$ECHO "$libobjs" | $SP2NL | $SED "/\.${libext}$/d; /\.lib$/d; $lo2o" | $NL2SP`" $reload_conv_objs" ### testsuite: skip nested quoting test
 
       output="$obj"
       func_execute_cmds "$reload_cmds" 'exit $?'
@@ -7512,8 +8714,8 @@
       case $host in
       *-*-rhapsody* | *-*-darwin1.[012])
 	# On Rhapsody replace the C library is the System framework
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's/ -lc / System.ltframework /'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's/ -lc / System.ltframework /'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's/ -lc / System.ltframework /'`
 	;;
       esac
 
@@ -7524,14 +8726,14 @@
 	if test "$tagname" = CXX ; then
 	  case ${MACOSX_DEPLOYMENT_TARGET-10.0} in
 	    10.[0123])
-	      compile_command="$compile_command ${wl}-bind_at_load"
-	      finalize_command="$finalize_command ${wl}-bind_at_load"
+	      func_append compile_command " ${wl}-bind_at_load"
+	      func_append finalize_command " ${wl}-bind_at_load"
 	    ;;
 	  esac
 	fi
 	# Time to change all our "foo.ltframework" stuff back to "-framework foo"
-	compile_deplibs=`$ECHO "X $compile_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
-	finalize_deplibs=`$ECHO "X $finalize_deplibs" | $Xsed -e 's% \([^ $]*\).ltframework% -framework \1%g'`
+	compile_deplibs=`$ECHO " $compile_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
+	finalize_deplibs=`$ECHO " $finalize_deplibs" | $SED 's% \([^ $]*\).ltframework% -framework \1%g'`
 	;;
       esac
 
@@ -7545,7 +8747,7 @@
 	*)
 	  case " $compile_deplibs " in
 	  *" -L$path/$objdir "*)
-	    new_libs="$new_libs -L$path/$objdir" ;;
+	    func_append new_libs " -L$path/$objdir" ;;
 	  esac
 	  ;;
 	esac
@@ -7555,17 +8757,17 @@
 	-L*)
 	  case " $new_libs " in
 	  *" $deplib "*) ;;
-	  *) new_libs="$new_libs $deplib" ;;
+	  *) func_append new_libs " $deplib" ;;
 	  esac
 	  ;;
-	*) new_libs="$new_libs $deplib" ;;
+	*) func_append new_libs " $deplib" ;;
 	esac
       done
       compile_deplibs="$new_libs"
 
 
-      compile_command="$compile_command $compile_deplibs"
-      finalize_command="$finalize_command $finalize_deplibs"
+      func_append compile_command " $compile_deplibs"
+      func_append finalize_command " $finalize_deplibs"
 
       if test -n "$rpath$xrpath"; then
 	# If the user specified any rpath flags, then add them.
@@ -7573,7 +8775,7 @@
 	  # This is the magic to use -rpath.
 	  case "$finalize_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_rpath="$finalize_rpath $libdir" ;;
+	  *) func_append finalize_rpath " $libdir" ;;
 	  esac
 	done
       fi
@@ -7592,18 +8794,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) perm_rpath="$perm_rpath $libdir" ;;
+	  *) func_append perm_rpath " $libdir" ;;
 	  esac
 	fi
 	case $host in
@@ -7612,12 +8814,12 @@
 	  case :$dllsearchpath: in
 	  *":$libdir:"*) ;;
 	  ::) dllsearchpath=$libdir;;
-	  *) dllsearchpath="$dllsearchpath:$libdir";;
+	  *) func_append dllsearchpath ":$libdir";;
 	  esac
 	  case :$dllsearchpath: in
 	  *":$testbindir:"*) ;;
 	  ::) dllsearchpath=$testbindir;;
-	  *) dllsearchpath="$dllsearchpath:$testbindir";;
+	  *) func_append dllsearchpath ":$testbindir";;
 	  esac
 	  ;;
 	esac
@@ -7643,18 +8845,18 @@
 	      *"$hardcode_libdir_separator$libdir$hardcode_libdir_separator"*)
 		;;
 	      *)
-		hardcode_libdirs="$hardcode_libdirs$hardcode_libdir_separator$libdir"
+		func_append hardcode_libdirs "$hardcode_libdir_separator$libdir"
 		;;
 	      esac
 	    fi
 	  else
 	    eval flag=\"$hardcode_libdir_flag_spec\"
-	    rpath="$rpath $flag"
+	    func_append rpath " $flag"
 	  fi
 	elif test -n "$runpath_var"; then
 	  case "$finalize_perm_rpath " in
 	  *" $libdir "*) ;;
-	  *) finalize_perm_rpath="$finalize_perm_rpath $libdir" ;;
+	  *) func_append finalize_perm_rpath " $libdir" ;;
 	  esac
 	fi
       done
@@ -7668,8 +8870,8 @@
 
       if test -n "$libobjs" && test "$build_old_libs" = yes; then
 	# Transform all the library objects into standard objects.
-	compile_command=`$ECHO "X$compile_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
-	finalize_command=`$ECHO "X$finalize_command" | $SP2NL | $Xsed -e "$lo2o" | $NL2SP`
+	compile_command=`$ECHO "$compile_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
+	finalize_command=`$ECHO "$finalize_command" | $SP2NL | $SED "$lo2o" | $NL2SP`
       fi
 
       func_generate_dlsyms "$outputname" "@PROGRAM@" "no"
@@ -7681,15 +8883,15 @@
 
       wrappers_required=yes
       case $host in
+      *cegcc* | *mingw32ce*)
+        # Disable wrappers for cegcc and mingw32ce hosts, we are cross compiling anyway.
+        wrappers_required=no
+        ;;
       *cygwin* | *mingw* )
         if test "$build_libtool_libs" != yes; then
           wrappers_required=no
         fi
         ;;
-      *cegcc)
-        # Disable wrappers for cegcc, we are cross compiling anyway.
-        wrappers_required=no
-        ;;
       *)
         if test "$need_relink" = no || test "$build_libtool_libs" != yes; then
           wrappers_required=no
@@ -7698,13 +8900,19 @@
       esac
       if test "$wrappers_required" = no; then
 	# Replace the output file specification.
-	compile_command=`$ECHO "X$compile_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	compile_command=`$ECHO "$compile_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	link_command="$compile_command$compile_rpath"
 
 	# We have no uninstalled library dependencies, so finalize right now.
 	exit_status=0
 	func_show_eval "$link_command" 'exit_status=$?'
 
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	# Delete the generated files.
 	if test -f "$output_objdir/${outputname}S.${objext}"; then
 	  func_show_eval '$RM "$output_objdir/${outputname}S.${objext}"'
@@ -7727,7 +8935,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  compile_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7735,7 +8943,7 @@
 	  # We should set the runpath_var.
 	  rpath=
 	  for dir in $finalize_perm_rpath; do
-	    rpath="$rpath$dir:"
+	    func_append rpath "$dir:"
 	  done
 	  finalize_var="$runpath_var=\"$rpath\$$runpath_var\" "
 	fi
@@ -7745,11 +8953,18 @@
 	# We don't need to create a wrapper script.
 	link_command="$compile_var$compile_command$compile_rpath"
 	# Replace the output file specification.
-	link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output"'%g'`
+	link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output"'%g'`
 	# Delete the old output file.
 	$opt_dry_run || $RM $output
 	# Link the executable and exit
 	func_show_eval "$link_command" 'exit $?'
+
+	if test -n "$postlink_cmds"; then
+	  func_to_tool_file "$output"
+	  postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	  func_execute_cmds "$postlink_cmds" 'exit $?'
+	fi
+
 	exit $EXIT_SUCCESS
       fi
 
@@ -7764,7 +8979,7 @@
 	if test "$fast_install" != no; then
 	  link_command="$finalize_var$compile_command$finalize_rpath"
 	  if test "$fast_install" = yes; then
-	    relink_command=`$ECHO "X$compile_var$compile_command$compile_rpath" | $Xsed -e 's%@OUTPUT@%\$progdir/\$file%g'`
+	    relink_command=`$ECHO "$compile_var$compile_command$compile_rpath" | $SED 's%@OUTPUT@%\$progdir/\$file%g'`
 	  else
 	    # fast_install is set to needless
 	    relink_command=
@@ -7776,13 +8991,19 @@
       fi
 
       # Replace the output file specification.
-      link_command=`$ECHO "X$link_command" | $Xsed -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
+      link_command=`$ECHO "$link_command" | $SED 's%@OUTPUT@%'"$output_objdir/$outputname"'%g'`
 
       # Delete the old output files.
       $opt_dry_run || $RM $output $output_objdir/$outputname $output_objdir/lt-$outputname
 
       func_show_eval "$link_command" 'exit $?'
 
+      if test -n "$postlink_cmds"; then
+	func_to_tool_file "$output_objdir/$outputname"
+	postlink_cmds=`func_echo_all "$postlink_cmds" | $SED -e 's%@OUTPUT@%'"$output_objdir/$outputname"'%g' -e 's%@TOOL_OUTPUT@%'"$func_to_tool_file_result"'%g'`
+	func_execute_cmds "$postlink_cmds" 'exit $?'
+      fi
+
       # Now create the wrapper script.
       func_verbose "creating $output"
 
@@ -7800,18 +9021,7 @@
 	  fi
 	done
 	relink_command="(cd `pwd`; $relink_command)"
-	relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
-      fi
-
-      # Quote $ECHO for shipping.
-      if test "X$ECHO" = "X$SHELL $progpath --fallback-echo"; then
-	case $progpath in
-	[\\/]* | [A-Za-z]:[\\/]*) qecho="$SHELL $progpath --fallback-echo";;
-	*) qecho="$SHELL `pwd`/$progpath --fallback-echo";;
-	esac
-	qecho=`$ECHO "X$qecho" | $Xsed -e "$sed_quote_subst"`
-      else
-	qecho=`$ECHO "X$ECHO" | $Xsed -e "$sed_quote_subst"`
+	relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       fi
 
       # Only actually do things if not in dry run mode.
@@ -7891,7 +9101,7 @@
 	else
 	  oldobjs="$old_deplibs $non_pic_objects"
 	  if test "$preload" = yes && test -f "$symfileobj"; then
-	    oldobjs="$oldobjs $symfileobj"
+	    func_append oldobjs " $symfileobj"
 	  fi
 	fi
 	addlibs="$old_convenience"
@@ -7899,10 +9109,10 @@
 
       if test -n "$addlibs"; then
 	gentop="$output_objdir/${outputname}x"
-	generated="$generated $gentop"
+	func_append generated " $gentop"
 
 	func_extract_archives $gentop $addlibs
-	oldobjs="$oldobjs $func_extract_archives_result"
+	func_append oldobjs " $func_extract_archives_result"
       fi
 
       # Do each command in the archive commands.
@@ -7913,10 +9123,10 @@
 	# Add any objects from preloaded convenience libraries
 	if test -n "$dlprefiles"; then
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 
 	  func_extract_archives $gentop $dlprefiles
-	  oldobjs="$oldobjs $func_extract_archives_result"
+	  func_append oldobjs " $func_extract_archives_result"
 	fi
 
 	# POSIX demands no paths to be encoded in archives.  We have
@@ -7932,9 +9142,9 @@
 	    done | sort | sort -uc >/dev/null 2>&1); then
 	  :
 	else
-	  $ECHO "copying selected object files to avoid basename conflicts..."
+	  echo "copying selected object files to avoid basename conflicts..."
 	  gentop="$output_objdir/${outputname}x"
-	  generated="$generated $gentop"
+	  func_append generated " $gentop"
 	  func_mkdir_p "$gentop"
 	  save_oldobjs=$oldobjs
 	  oldobjs=
@@ -7958,18 +9168,30 @@
 		esac
 	      done
 	      func_show_eval "ln $obj $gentop/$newobj || cp $obj $gentop/$newobj"
-	      oldobjs="$oldobjs $gentop/$newobj"
+	      func_append oldobjs " $gentop/$newobj"
 	      ;;
-	    *) oldobjs="$oldobjs $obj" ;;
+	    *) func_append oldobjs " $obj" ;;
 	    esac
 	  done
 	fi
+	func_to_tool_file "$oldlib" func_convert_file_msys_to_w32
+	tool_oldlib=$func_to_tool_file_result
 	eval cmds=\"$old_archive_cmds\"
 
 	func_len " $cmds"
 	len=$func_len_result
 	if test "$len" -lt "$max_cmd_len" || test "$max_cmd_len" -le -1; then
 	  cmds=$old_archive_cmds
+	elif test -n "$archiver_list_spec"; then
+	  func_verbose "using command file archive linking..."
+	  for obj in $oldobjs
+	  do
+	    func_to_tool_file "$obj"
+	    $ECHO "$func_to_tool_file_result"
+	  done > $output_objdir/$libname.libcmd
+	  func_to_tool_file "$output_objdir/$libname.libcmd"
+	  oldobjs=" $archiver_list_spec$func_to_tool_file_result"
+	  cmds=$old_archive_cmds
 	else
 	  # the command line is too long to link in one step, link in parts
 	  func_verbose "using piecewise archive linking..."
@@ -8043,7 +9265,7 @@
       done
       # Quote the link command for shipping.
       relink_command="(cd `pwd`; $SHELL $progpath $preserve_args --mode=relink $libtool_args @inst_prefix_dir@)"
-      relink_command=`$ECHO "X$relink_command" | $Xsed -e "$sed_quote_subst"`
+      relink_command=`$ECHO "$relink_command" | $SED "$sed_quote_subst"`
       if test "$hardcode_automatic" = yes ; then
 	relink_command=
       fi
@@ -8063,12 +9285,23 @@
 	      *.la)
 		func_basename "$deplib"
 		name="$func_basename_result"
-		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $deplib`
+		func_resolve_sysroot "$deplib"
+		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $func_resolve_sysroot_result`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$deplib' is not a valid libtool archive"
-		newdependency_libs="$newdependency_libs $libdir/$name"
+		func_append newdependency_libs " ${lt_sysroot:+=}$libdir/$name"
+		;;
+	      -L*)
+		func_stripname -L '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -L$func_replace_sysroot_result"
 		;;
-	      *) newdependency_libs="$newdependency_libs $deplib" ;;
+	      -R*)
+		func_stripname -R '' "$deplib"
+		func_replace_sysroot "$func_stripname_result"
+		func_append newdependency_libs " -R$func_replace_sysroot_result"
+		;;
+	      *) func_append newdependency_libs " $deplib" ;;
 	      esac
 	    done
 	    dependency_libs="$newdependency_libs"
@@ -8082,9 +9315,9 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlfiles="$newdlfiles $libdir/$name"
+		func_append newdlfiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
-	      *) newdlfiles="$newdlfiles $lib" ;;
+	      *) func_append newdlfiles " $lib" ;;
 	      esac
 	    done
 	    dlfiles="$newdlfiles"
@@ -8101,7 +9334,7 @@
 		eval libdir=`${SED} -n -e 's/^libdir=\(.*\)$/\1/p' $lib`
 		test -z "$libdir" && \
 		  func_fatal_error "\`$lib' is not a valid libtool archive"
-		newdlprefiles="$newdlprefiles $libdir/$name"
+		func_append newdlprefiles " ${lt_sysroot:+=}$libdir/$name"
 		;;
 	      esac
 	    done
@@ -8113,7 +9346,7 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlfiles="$newdlfiles $abs"
+	      func_append newdlfiles " $abs"
 	    done
 	    dlfiles="$newdlfiles"
 	    newdlprefiles=
@@ -8122,15 +9355,33 @@
 		[\\/]* | [A-Za-z]:[\\/]*) abs="$lib" ;;
 		*) abs=`pwd`"/$lib" ;;
 	      esac
-	      newdlprefiles="$newdlprefiles $abs"
+	      func_append newdlprefiles " $abs"
 	    done
 	    dlprefiles="$newdlprefiles"
 	  fi
 	  $RM $output
 	  # place dlname in correct position for cygwin
+	  # In fact, it would be nice if we could use this code for all target
+	  # systems that can't hard-code library paths into their executables
+	  # and that have no shared library path variable independent of PATH,
+	  # but it turns out we can't easily determine that from inspecting
+	  # libtool variables, so we have to hard-code the OSs to which it
+	  # applies here; at the moment, that means platforms that use the PE
+	  # object format with DLL files.  See the long comment at the top of
+	  # tests/bindir.at for full details.
 	  tdlname=$dlname
 	  case $host,$output,$installed,$module,$dlname in
-	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll) tdlname=../bin/$dlname ;;
+	    *cygwin*,*lai,yes,no,*.dll | *mingw*,*lai,yes,no,*.dll | *cegcc*,*lai,yes,no,*.dll)
+	      # If a -bindir argument was supplied, place the dll there.
+	      if test "x$bindir" != x ;
+	      then
+		func_relative_path "$install_libdir" "$bindir"
+		tdlname=$func_relative_path_result$dlname
+	      else
+		# Otherwise fall back on heuristic.
+		tdlname=../bin/$dlname
+	      fi
+	      ;;
 	  esac
 	  $ECHO > $output "\
 # $outputname - a libtool library file
@@ -8189,7 +9440,7 @@
     exit $EXIT_SUCCESS
 }
 
-{ test "$mode" = link || test "$mode" = relink; } &&
+{ test "$opt_mode" = link || test "$opt_mode" = relink; } &&
     func_mode_link ${1+"$@"}
 
 
@@ -8209,9 +9460,9 @@
     for arg
     do
       case $arg in
-      -f) RM="$RM $arg"; rmforce=yes ;;
-      -*) RM="$RM $arg" ;;
-      *) files="$files $arg" ;;
+      -f) func_append RM " $arg"; rmforce=yes ;;
+      -*) func_append RM " $arg" ;;
+      *) func_append files " $arg" ;;
       esac
     done
 
@@ -8220,24 +9471,23 @@
 
     rmdirs=
 
-    origobjdir="$objdir"
     for file in $files; do
       func_dirname "$file" "" "."
       dir="$func_dirname_result"
       if test "X$dir" = X.; then
-	objdir="$origobjdir"
+	odir="$objdir"
       else
-	objdir="$dir/$origobjdir"
+	odir="$dir/$objdir"
       fi
       func_basename "$file"
       name="$func_basename_result"
-      test "$mode" = uninstall && objdir="$dir"
+      test "$opt_mode" = uninstall && odir="$dir"
 
-      # Remember objdir for removal later, being careful to avoid duplicates
-      if test "$mode" = clean; then
+      # Remember odir for removal later, being careful to avoid duplicates
+      if test "$opt_mode" = clean; then
 	case " $rmdirs " in
-	  *" $objdir "*) ;;
-	  *) rmdirs="$rmdirs $objdir" ;;
+	  *" $odir "*) ;;
+	  *) func_append rmdirs " $odir" ;;
 	esac
       fi
 
@@ -8263,18 +9513,17 @@
 
 	  # Delete the libtool libraries and symlinks.
 	  for n in $library_names; do
-	    rmfiles="$rmfiles $objdir/$n"
+	    func_append rmfiles " $odir/$n"
 	  done
-	  test -n "$old_library" && rmfiles="$rmfiles $objdir/$old_library"
+	  test -n "$old_library" && func_append rmfiles " $odir/$old_library"
 
-	  case "$mode" in
+	  case "$opt_mode" in
 	  clean)
-	    case "  $library_names " in
-	    # "  " in the beginning catches empty $dlname
+	    case " $library_names " in
 	    *" $dlname "*) ;;
-	    *) rmfiles="$rmfiles $objdir/$dlname" ;;
+	    *) test -n "$dlname" && func_append rmfiles " $odir/$dlname" ;;
 	    esac
-	    test -n "$libdir" && rmfiles="$rmfiles $objdir/$name $objdir/${name}i"
+	    test -n "$libdir" && func_append rmfiles " $odir/$name $odir/${name}i"
 	    ;;
 	  uninstall)
 	    if test -n "$library_names"; then
@@ -8302,19 +9551,19 @@
 	  # Add PIC object to the list of files to remove.
 	  if test -n "$pic_object" &&
 	     test "$pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$pic_object"
+	    func_append rmfiles " $dir/$pic_object"
 	  fi
 
 	  # Add non-PIC object to the list of files to remove.
 	  if test -n "$non_pic_object" &&
 	     test "$non_pic_object" != none; then
-	    rmfiles="$rmfiles $dir/$non_pic_object"
+	    func_append rmfiles " $dir/$non_pic_object"
 	  fi
 	fi
 	;;
 
       *)
-	if test "$mode" = clean ; then
+	if test "$opt_mode" = clean ; then
 	  noexename=$name
 	  case $file in
 	  *.exe)
@@ -8324,7 +9573,7 @@
 	    noexename=$func_stripname_result
 	    # $file with .exe has already been added to rmfiles,
 	    # add $file without .exe
-	    rmfiles="$rmfiles $file"
+	    func_append rmfiles " $file"
 	    ;;
 	  esac
 	  # Do a test to see if this is a libtool program.
@@ -8333,7 +9582,7 @@
 	      func_ltwrapper_scriptname "$file"
 	      relink_command=
 	      func_source $func_ltwrapper_scriptname_result
-	      rmfiles="$rmfiles $func_ltwrapper_scriptname_result"
+	      func_append rmfiles " $func_ltwrapper_scriptname_result"
 	    else
 	      relink_command=
 	      func_source $dir/$noexename
@@ -8341,12 +9590,12 @@
 
 	    # note $name still contains .exe if it was in $file originally
 	    # as does the version of $file that was added into $rmfiles
-	    rmfiles="$rmfiles $objdir/$name $objdir/${name}S.${objext}"
+	    func_append rmfiles " $odir/$name $odir/${name}S.${objext}"
 	    if test "$fast_install" = yes && test -n "$relink_command"; then
-	      rmfiles="$rmfiles $objdir/lt-$name"
+	      func_append rmfiles " $odir/lt-$name"
 	    fi
 	    if test "X$noexename" != "X$name" ; then
-	      rmfiles="$rmfiles $objdir/lt-${noexename}.c"
+	      func_append rmfiles " $odir/lt-${noexename}.c"
 	    fi
 	  fi
 	fi
@@ -8354,7 +9603,6 @@
       esac
       func_show_eval "$RM $rmfiles" 'exit_status=1'
     done
-    objdir="$origobjdir"
 
     # Try to remove the ${objdir}s in the directories where we deleted files
     for dir in $rmdirs; do
@@ -8366,16 +9614,16 @@
     exit $exit_status
 }
 
-{ test "$mode" = uninstall || test "$mode" = clean; } &&
+{ test "$opt_mode" = uninstall || test "$opt_mode" = clean; } &&
     func_mode_uninstall ${1+"$@"}
 
-test -z "$mode" && {
+test -z "$opt_mode" && {
   help="$generic_help"
   func_fatal_help "you must specify a MODE"
 }
 
 test -z "$exec_cmd" && \
-  func_fatal_help "invalid operation mode \`$mode'"
+  func_fatal_help "invalid operation mode \`$opt_mode'"
 
 if test -n "$exec_cmd"; then
   eval exec "$exec_cmd"
diff -Nru filezilla-3.5.3/config/missing filezilla-3.7.3~precise/config/missing
--- filezilla-3.5.3/config/missing	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/config/missing	2013-08-07 19:17:13.000000000 +0000
@@ -1,10 +1,10 @@
 #! /bin/sh
 # Common stub for a few missing GNU programs while installing.
 
-scriptversion=2009-04-28.21; # UTC
+scriptversion=2012-01-06.13; # UTC
 
 # Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006,
-# 2008, 2009 Free Software Foundation, Inc.
+# 2008, 2009, 2010, 2011, 2012 Free Software Foundation, Inc.
 # Originally by Fran,cois Pinard <pinard@iro.umontreal.ca>, 1996.
 
 # This program is free software; you can redistribute it and/or modify
@@ -84,7 +84,6 @@
   help2man     touch the output file
   lex          create \`lex.yy.c', if possible, from existing .c
   makeinfo     touch the output file
-  tar          try tar, gnutar, gtar, then tar without non-portable flags
   yacc         create \`y.tab.[ch]', if possible, from existing .[ch]
 
 Version suffixes to PROGRAM as well as the prefixes \`gnu-', \`gnu', and
@@ -122,15 +121,6 @@
     # Not GNU programs, they don't have --version.
     ;;
 
-  tar*)
-    if test -n "$run"; then
-       echo 1>&2 "ERROR: \`tar' requires --run"
-       exit 1
-    elif test "x$2" = "x--version" || test "x$2" = "x--help"; then
-       exit 1
-    fi
-    ;;
-
   *)
     if test -z "$run" && ($1 --version) > /dev/null 2>&1; then
        # We have it, but it failed.
@@ -226,7 +216,7 @@
          \`Bison' from any GNU archive site."
     rm -f y.tab.c y.tab.h
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.y)
 	    SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
@@ -256,7 +246,7 @@
          \`Flex' from any GNU archive site."
     rm -f lex.yy.c
     if test $# -ne 1; then
-        eval LASTARG="\${$#}"
+        eval LASTARG=\${$#}
 	case $LASTARG in
 	*.l)
 	    SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
@@ -318,41 +308,6 @@
     touch $file
     ;;
 
-  tar*)
-    shift
-
-    # We have already tried tar in the generic part.
-    # Look for gnutar/gtar before invocation to avoid ugly error
-    # messages.
-    if (gnutar --version > /dev/null 2>&1); then
-       gnutar "$@" && exit 0
-    fi
-    if (gtar --version > /dev/null 2>&1); then
-       gtar "$@" && exit 0
-    fi
-    firstarg="$1"
-    if shift; then
-	case $firstarg in
-	*o*)
-	    firstarg=`echo "$firstarg" | sed s/o//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-	case $firstarg in
-	*h*)
-	    firstarg=`echo "$firstarg" | sed s/h//`
-	    tar "$firstarg" "$@" && exit 0
-	    ;;
-	esac
-    fi
-
-    echo 1>&2 "\
-WARNING: I can't seem to be able to run \`tar' with the given arguments.
-         You may want to install GNU tar or Free paxutils, or check the
-         command line arguments."
-    exit 1
-    ;;
-
   *)
     echo 1>&2 "\
 WARNING: \`$1' is needed, and is $msg.
diff -Nru filezilla-3.5.3/configure filezilla-3.7.3~precise/configure
--- filezilla-3.5.3/configure	2012-01-08 13:29:11.000000000 +0000
+++ filezilla-3.7.3~precise/configure	2013-08-07 19:17:12.000000000 +0000
@@ -1,13 +1,11 @@
 #! /bin/sh
 # Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.67 for FileZilla 3.5.3.
+# Generated by GNU Autoconf 2.69 for FileZilla 3.7.3.
 #
 # Report bugs to <tim.kosse@filezilla-project.org>.
 #
 #
-# Copyright (C) 1992, 1993, 1994, 1995, 1996, 1998, 1999, 2000, 2001,
-# 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Free Software
-# Foundation, Inc.
+# Copyright (C) 1992-1996, 1998-2012 Free Software Foundation, Inc.
 #
 #
 # This configure script is free software; the Free Software Foundation
@@ -91,6 +89,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -135,6 +134,31 @@
 # CDPATH.
 (unset CDPATH) >/dev/null 2>&1 && unset CDPATH
 
+# Use a proper internal environment variable to ensure we don't fall
+  # into an infinite loop, continuously re-executing ourselves.
+  if test x"${_as_can_reexec}" != xno && test "x$CONFIG_SHELL" != x; then
+    _as_can_reexec=no; export _as_can_reexec;
+    # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+as_fn_exit 255
+  fi
+  # We don't want this to propagate to other subprocesses.
+          { _as_can_reexec=; unset _as_can_reexec;}
 if test "x$CONFIG_SHELL" = x; then
   as_bourne_compatible="if test -n \"\${ZSH_VERSION+set}\" && (emulate sh) >/dev/null 2>&1; then :
   emulate sh
@@ -168,11 +192,20 @@
 else
   exitcode=1; echo positional parameters were not saved.
 fi
-test x\$exitcode = x0 || exit 1"
+test x\$exitcode = x0 || exit 1
+test -x / || exit 1"
   as_suggested="  as_lineno_1=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_1a=\$LINENO
   as_lineno_2=";as_suggested=$as_suggested$LINENO;as_suggested=$as_suggested" as_lineno_2a=\$LINENO
   eval 'test \"x\$as_lineno_1'\$as_run'\" != \"x\$as_lineno_2'\$as_run'\" &&
   test \"x\`expr \$as_lineno_1'\$as_run' + 1\`\" = \"x\$as_lineno_2'\$as_run'\"' || exit 1
+
+  test -n \"\${ZSH_VERSION+set}\${BASH_VERSION+set}\" || (
+    ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    ECHO=\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO\$ECHO
+    PATH=/empty FPATH=/empty; export PATH FPATH
+    test \"X\`printf %s \$ECHO\`\" = \"X\$ECHO\" \\
+      || test \"X\`print -r -- \$ECHO\`\" = \"X\$ECHO\" ) || exit 1
 test \$(( 1 + 1 )) = 2 || exit 1"
   if (eval "$as_required") 2>/dev/null; then :
   as_have_required=yes
@@ -213,14 +246,25 @@
 
 
       if test "x$CONFIG_SHELL" != x; then :
-  # We cannot yet assume a decent shell, so we have to provide a
-	# neutralization value for shells without unset; and this also
-	# works around shells that cannot unset nonexistent variables.
-	BASH_ENV=/dev/null
-	ENV=/dev/null
-	(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
-	export CONFIG_SHELL
-	exec "$CONFIG_SHELL" "$as_myself" ${1+"$@"}
+  export CONFIG_SHELL
+             # We cannot yet assume a decent shell, so we have to provide a
+# neutralization value for shells without unset; and this also
+# works around shells that cannot unset nonexistent variables.
+# Preserve -v and -x to the replacement shell.
+BASH_ENV=/dev/null
+ENV=/dev/null
+(unset BASH_ENV) >/dev/null 2>&1 && unset BASH_ENV ENV
+case $- in # ((((
+  *v*x* | *x*v* ) as_opts=-vx ;;
+  *v* ) as_opts=-v ;;
+  *x* ) as_opts=-x ;;
+  * ) as_opts= ;;
+esac
+exec $CONFIG_SHELL $as_opts "$as_myself" ${1+"$@"}
+# Admittedly, this is quite paranoid, since all the known shells bail
+# out after a failed `exec'.
+$as_echo "$0: could not re-execute with $CONFIG_SHELL" >&2
+exit 255
 fi
 
     if test x$as_have_required = xno; then :
@@ -323,6 +367,14 @@
 
 
 } # as_fn_mkdir_p
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
 # as_fn_append VAR VALUE
 # ----------------------
 # Append the text in VALUE to the end of the definition contained in VAR. Take
@@ -444,6 +496,10 @@
   chmod +x "$as_me.lineno" ||
     { $as_echo "$as_me: error: cannot create $as_me.lineno; rerun with a POSIX shell" >&2; as_fn_exit 1; }
 
+  # If we had to re-execute with $CONFIG_SHELL, we're ensured to have
+  # already done that, so ensure we don't try to do so again and fall
+  # in an infinite loop.  This has already happened in practice.
+  _as_can_reexec=no; export _as_can_reexec
   # Don't try to exec as it changes $[0], causing all sort of problems
   # (the dirname of $[0] is not the place where we might find the
   # original and so on.  Autoconf is especially sensitive to this).
@@ -478,16 +534,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -499,28 +555,8 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -528,155 +564,8 @@
 # Sed expression to map a string onto a valid variable name.
 as_tr_sh="eval sed 'y%*+%pp%;s%[^_$as_cr_alnum]%_%g'"
 
-
-
-# Check that we are running under the correct shell.
 SHELL=${CONFIG_SHELL-/bin/sh}
 
-case X$lt_ECHO in
-X*--fallback-echo)
-  # Remove one level of quotation (which was required for Make).
-  ECHO=`echo "$lt_ECHO" | sed 's,\\\\\$\\$0,'$0','`
-  ;;
-esac
-
-ECHO=${lt_ECHO-echo}
-if test "X$1" = X--no-reexec; then
-  # Discard the --no-reexec flag, and continue.
-  shift
-elif test "X$1" = X--fallback-echo; then
-  # Avoid inline document here, it may be left over
-  :
-elif test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' ; then
-  # Yippee, $ECHO works!
-  :
-else
-  # Restart under the correct shell.
-  exec $SHELL "$0" --no-reexec ${1+"$@"}
-fi
-
-if test "X$1" = X--fallback-echo; then
-  # used as fallback echo
-  shift
-  cat <<_LT_EOF
-$*
-_LT_EOF
-  exit 0
-fi
-
-# The HP-UX ksh and POSIX shell print the target directory to stdout
-# if CDPATH is set.
-(unset CDPATH) >/dev/null 2>&1 && unset CDPATH
-
-if test -z "$lt_ECHO"; then
-  if test "X${echo_test_string+set}" != Xset; then
-    # find a string as large as possible, as long as the shell can cope with it
-    for cmd in 'sed 50q "$0"' 'sed 20q "$0"' 'sed 10q "$0"' 'sed 2q "$0"' 'echo test'; do
-      # expected sizes: less than 2Kb, 1Kb, 512 bytes, 16 bytes, ...
-      if { echo_test_string=`eval $cmd`; } 2>/dev/null &&
-	 { test "X$echo_test_string" = "X$echo_test_string"; } 2>/dev/null
-      then
-        break
-      fi
-    done
-  fi
-
-  if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-     echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-     test "X$echo_testing_string" = "X$echo_test_string"; then
-    :
-  else
-    # The Solaris, AIX, and Digital Unix default echo programs unquote
-    # backslashes.  This makes it impossible to quote backslashes using
-    #   echo "$something" | sed 's/\\/\\\\/g'
-    #
-    # So, first we look for a working echo in the user's PATH.
-
-    lt_save_ifs="$IFS"; IFS=$PATH_SEPARATOR
-    for dir in $PATH /usr/ucb; do
-      IFS="$lt_save_ifs"
-      if (test -f $dir/echo || test -f $dir/echo$ac_exeext) &&
-         test "X`($dir/echo '\t') 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`($dir/echo "$echo_test_string") 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        ECHO="$dir/echo"
-        break
-      fi
-    done
-    IFS="$lt_save_ifs"
-
-    if test "X$ECHO" = Xecho; then
-      # We didn't find a better echo, so look for alternatives.
-      if test "X`{ print -r '\t'; } 2>/dev/null`" = 'X\t' &&
-         echo_testing_string=`{ print -r "$echo_test_string"; } 2>/dev/null` &&
-         test "X$echo_testing_string" = "X$echo_test_string"; then
-        # This shell has a builtin print -r that does the trick.
-        ECHO='print -r'
-      elif { test -f /bin/ksh || test -f /bin/ksh$ac_exeext; } &&
-	   test "X$CONFIG_SHELL" != X/bin/ksh; then
-        # If we have ksh, try running configure again with it.
-        ORIGINAL_CONFIG_SHELL=${CONFIG_SHELL-/bin/sh}
-        export ORIGINAL_CONFIG_SHELL
-        CONFIG_SHELL=/bin/ksh
-        export CONFIG_SHELL
-        exec $CONFIG_SHELL "$0" --no-reexec ${1+"$@"}
-      else
-        # Try using printf.
-        ECHO='printf %s\n'
-        if test "X`{ $ECHO '\t'; } 2>/dev/null`" = 'X\t' &&
-	   echo_testing_string=`{ $ECHO "$echo_test_string"; } 2>/dev/null` &&
-	   test "X$echo_testing_string" = "X$echo_test_string"; then
-	  # Cool, printf works
-	  :
-        elif echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($ORIGINAL_CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  CONFIG_SHELL=$ORIGINAL_CONFIG_SHELL
-	  export CONFIG_SHELL
-	  SHELL="$CONFIG_SHELL"
-	  export SHELL
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        elif echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo '\t') 2>/dev/null` &&
-	     test "X$echo_testing_string" = 'X\t' &&
-	     echo_testing_string=`($CONFIG_SHELL "$0" --fallback-echo "$echo_test_string") 2>/dev/null` &&
-	     test "X$echo_testing_string" = "X$echo_test_string"; then
-	  ECHO="$CONFIG_SHELL $0 --fallback-echo"
-        else
-	  # maybe with a smaller string...
-	  prev=:
-
-	  for cmd in 'echo test' 'sed 2q "$0"' 'sed 10q "$0"' 'sed 20q "$0"' 'sed 50q "$0"'; do
-	    if { test "X$echo_test_string" = "X`eval $cmd`"; } 2>/dev/null
-	    then
-	      break
-	    fi
-	    prev="$cmd"
-	  done
-
-	  if test "$prev" != 'sed 50q "$0"'; then
-	    echo_test_string=`eval $prev`
-	    export echo_test_string
-	    exec ${ORIGINAL_CONFIG_SHELL-${CONFIG_SHELL-/bin/sh}} "$0" ${1+"$@"}
-	  else
-	    # Oops.  We lost completely, so just stick with echo.
-	    ECHO=echo
-	  fi
-        fi
-      fi
-    fi
-  fi
-fi
-
-# Copy echo and quote the copy suitably for passing to libtool from
-# the Makefile, instead of quoting the original, which is used later.
-lt_ECHO=$ECHO
-if test "X$lt_ECHO" = "X$CONFIG_SHELL $0 --fallback-echo"; then
-   lt_ECHO="$CONFIG_SHELL \\\$\$0 --fallback-echo"
-fi
-
-
-
 
 test -n "$DJDIR" || exec 7<&0 </dev/null
 exec 6>&1
@@ -701,8 +590,8 @@
 # Identity of this package.
 PACKAGE_NAME='FileZilla'
 PACKAGE_TARNAME='filezilla'
-PACKAGE_VERSION='3.5.3'
-PACKAGE_STRING='FileZilla 3.5.3'
+PACKAGE_VERSION='3.7.3'
+PACKAGE_STRING='FileZilla 3.7.3'
 PACKAGE_BUGREPORT='tim.kosse@filezilla-project.org'
 PACKAGE_URL=''
 
@@ -820,9 +709,11 @@
 LIPO
 NMEDIT
 DSYMUTIL
-lt_ECHO
+MANIFEST_TOOL
 RANLIB
+ac_ct_AR
 AR
+DLLTOOL
 OBJDUMP
 LN_S
 NM
@@ -843,6 +734,7 @@
 am__fastdepCXX_FALSE
 am__fastdepCXX_TRUE
 CXXDEPMODE
+am__nodep
 AMDEPBACKSLASH
 AMDEP_FALSE
 AMDEP_TRUE
@@ -934,6 +826,7 @@
 with_pic
 enable_fast_install
 with_gnu_ld
+with_sysroot
 enable_libtool_lock
 enable_locales
 enable_localesonly
@@ -1379,7 +1272,7 @@
     $as_echo "$as_me: WARNING: you should use --build, --host, --target" >&2
     expr "x$ac_option" : ".*[^-._$as_cr_alnum]" >/dev/null &&
       $as_echo "$as_me: WARNING: invalid host type: $ac_option" >&2
-    : ${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}
+    : "${build_alias=$ac_option} ${host_alias=$ac_option} ${target_alias=$ac_option}"
     ;;
 
   esac
@@ -1430,8 +1323,6 @@
 if test "x$host_alias" != x; then
   if test "x$build_alias" = x; then
     cross_compiling=maybe
-    $as_echo "$as_me: WARNING: if you wanted to set the --build type, don't use --host.
-    If a cross compiler is detected then cross compile mode will be used" >&2
   elif test "x$build_alias" != "x$host_alias"; then
     cross_compiling=yes
   fi
@@ -1517,7 +1408,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.5.3 to adapt to many kinds of systems.
+\`configure' configures FileZilla 3.7.3 to adapt to many kinds of systems.
 
 Usage: $0 [OPTION]... [VAR=VALUE]...
 
@@ -1587,7 +1478,7 @@
 
 if test -n "$ac_init_help"; then
   case $ac_init_help in
-     short | recursive ) echo "Configuration of FileZilla 3.5.3:";;
+     short | recursive ) echo "Configuration of FileZilla 3.7.3:";;
    esac
   cat <<\_ACEOF
 
@@ -1619,9 +1510,11 @@
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
   --without-PACKAGE       do not use PACKAGE (same as --with-PACKAGE=no)
-  --with-pic              try to use only PIC/non-PIC objects [default=use
+  --with-pic[=PKGS]       try to use only PIC/non-PIC objects [default=use
                           both]
   --with-gnu-ld           assume the C compiler uses GNU ld [default=no]
+  --with-sysroot=DIR Search for dependent libraries within DIR
+                        (or the compiler's sysroot if not specified).
   --with-wxdir=PATH       Use uninstalled version of wxWidgets in PATH
   --with-wx-config=CONFIG wx-config script to use (optional)
   --with-wx-prefix=PREFIX Prefix where wxWidgets is installed (optional)
@@ -1731,10 +1624,10 @@
 test -n "$ac_init_help" && exit $ac_status
 if $ac_init_version; then
   cat <<\_ACEOF
-FileZilla configure 3.5.3
-generated by GNU Autoconf 2.67
+FileZilla configure 3.7.3
+generated by GNU Autoconf 2.69
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This configure script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it.
 _ACEOF
@@ -1778,7 +1671,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_compile
@@ -1816,7 +1709,7 @@
 
 	ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_compile
@@ -1848,7 +1741,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -1862,7 +1755,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_link
@@ -1876,7 +1769,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -1894,7 +1787,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_compile
 
@@ -1930,7 +1823,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_cpp
@@ -1972,7 +1865,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_c_try_run
@@ -1985,7 +1878,7 @@
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -2040,7 +1933,7 @@
 eval ac_res=\$$3
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_func
 
@@ -2076,7 +1969,7 @@
 
     ac_retval=1
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_cpp
@@ -2108,7 +2001,7 @@
 	 test ! -s conftest.err
        } && test -s conftest$ac_exeext && {
 	 test "$cross_compiling" = yes ||
-	 $as_test_x conftest$ac_exeext
+	 test -x conftest$ac_exeext
        }; then :
   ac_retval=0
 else
@@ -2122,7 +2015,7 @@
   # interfere with the next link command; also delete a directory that is
   # left behind by Apple's compiler.  We do this before executing the actions.
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_link
@@ -2135,10 +2028,10 @@
 ac_fn_c_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2205,7 +2098,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2214,7 +2107,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_c_check_header_mongrel
 
@@ -2226,10 +2119,10 @@
 ac_fn_cxx_check_header_mongrel ()
 {
   as_lineno=${as_lineno-"$1"} as_lineno_stack=as_lineno_stack=$as_lineno_stack
-  if eval "test \"\${$3+set}\"" = set; then :
+  if eval \${$3+:} false; then :
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 fi
 eval ac_res=\$$3
@@ -2296,7 +2189,7 @@
 esac
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $2" >&5
 $as_echo_n "checking for $2... " >&6; }
-if eval "test \"\${$3+set}\"" = set; then :
+if eval \${$3+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   eval "$3=\$ac_header_compiler"
@@ -2305,7 +2198,7 @@
 	       { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_res" >&5
 $as_echo "$ac_res" >&6; }
 fi
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
 
 } # ac_fn_cxx_check_header_mongrel
 
@@ -2346,7 +2239,7 @@
        ac_retval=$ac_status
 fi
   rm -rf conftest.dSYM conftest_ipa8_conftest.oo
-  eval $as_lineno_stack; test "x$as_lineno_stack" = x && { as_lineno=; unset as_lineno;}
+  eval $as_lineno_stack; ${as_lineno_stack:+:} unset as_lineno
   as_fn_set_status $ac_retval
 
 } # ac_fn_cxx_try_run
@@ -2354,8 +2247,8 @@
 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.5.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+It was created by FileZilla $as_me 3.7.3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   $ $0 $@
 
@@ -2613,7 +2506,7 @@
       || { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "failed to load site script $ac_site_file
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
   fi
 done
 
@@ -2753,7 +2646,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a BSD-compatible install" >&5
 $as_echo_n "checking for a BSD-compatible install... " >&6; }
 if test -z "$INSTALL"; then
-if test "${ac_cv_path_install+set}" = set; then :
+if ${ac_cv_path_install+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -2773,7 +2666,7 @@
     # by default.
     for ac_prog in ginstall scoinst install; do
       for ac_exec_ext in '' $ac_executable_extensions; do
-	if { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; }; then
+	if as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext"; then
 	  if test $ac_prog = install &&
 	    grep dspmsg "$as_dir/$ac_prog$ac_exec_ext" >/dev/null 2>&1; then
 	    # AIX install.  It has an incompatible calling convention.
@@ -2840,11 +2733,11 @@
 '
 case `pwd` in
   *[\\\"\#\$\&\'\`$am_lf]*)
-    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe absolute working directory name" "$LINENO" 5;;
 esac
 case $srcdir in
   *[\\\"\#\$\&\'\`$am_lf\ \	]*)
-    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5 ;;
+    as_fn_error $? "unsafe srcdir value: \`$srcdir'" "$LINENO" 5;;
 esac
 
 # Do `set' in a subshell so we don't clobber the current shell's
@@ -2930,7 +2823,7 @@
 set dummy ${ac_tool_prefix}strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$STRIP"; then
@@ -2942,7 +2835,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_STRIP="${ac_tool_prefix}strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -2970,7 +2863,7 @@
 set dummy strip; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_STRIP"; then
@@ -2982,7 +2875,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_STRIP="strip"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3023,7 +2916,7 @@
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a thread-safe mkdir -p" >&5
 $as_echo_n "checking for a thread-safe mkdir -p... " >&6; }
 if test -z "$MKDIR_P"; then
-  if test "${ac_cv_path_mkdir+set}" = set; then :
+  if ${ac_cv_path_mkdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -3033,7 +2926,7 @@
   test -z "$as_dir" && as_dir=.
     for ac_prog in mkdir gmkdir; do
 	 for ac_exec_ext in '' $ac_executable_extensions; do
-	   { test -f "$as_dir/$ac_prog$ac_exec_ext" && $as_test_x "$as_dir/$ac_prog$ac_exec_ext"; } || continue
+	   as_fn_executable_p "$as_dir/$ac_prog$ac_exec_ext" || continue
 	   case `"$as_dir/$ac_prog$ac_exec_ext" --version 2>&1` in #(
 	     'mkdir (GNU coreutils) '* | \
 	     'mkdir (coreutils) '* | \
@@ -3074,7 +2967,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AWK+set}" = set; then :
+if ${ac_cv_prog_AWK+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$AWK"; then
@@ -3086,7 +2979,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_AWK="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3114,7 +3007,7 @@
 $as_echo_n "checking whether ${MAKE-make} sets \$(MAKE)... " >&6; }
 set x ${MAKE-make}
 ac_make=`$as_echo "$2" | sed 's/+/p/g; s/[^a-zA-Z0-9_]/_/g'`
-if eval "test \"\${ac_cv_prog_make_${ac_make}_set+set}\"" = set; then :
+if eval \${ac_cv_prog_make_${ac_make}_set+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat >conftest.make <<\_ACEOF
@@ -3172,7 +3065,7 @@
 
 # Define the identity of the package.
  PACKAGE='filezilla'
- VERSION='3.5.3'
+ VERSION='3.7.3'
 
 
 cat >>confdefs.h <<_ACEOF
@@ -3202,11 +3095,11 @@
 
 # We need awk for the "check" target.  The system "awk" is bad on
 # some platforms.
-# Always define AMTAR for backward compatibility.
-
-AMTAR=${AMTAR-"${am_missing_run}tar"}
+# Always define AMTAR for backward compatibility.  Yes, it's still used
+# in the wild :-(  We should find a proper way to deprecate it ...
+AMTAR='$${TAR-tar}'
 
-am__tar='${AMTAR} chof - "$$tardir"'; am__untar='${AMTAR} xf -'
+am__tar='$${TAR-tar} chof - "$$tardir"' am__untar='$${TAR-tar} xf -'
 
 
 
@@ -3219,7 +3112,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking build system type" >&5
 $as_echo_n "checking build system type... " >&6; }
-if test "${ac_cv_build+set}" = set; then :
+if ${ac_cv_build+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_build_alias=$build_alias
@@ -3235,7 +3128,7 @@
 $as_echo "$ac_cv_build" >&6; }
 case $ac_cv_build in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical build" "$LINENO" 5;;
 esac
 build=$ac_cv_build
 ac_save_IFS=$IFS; IFS='-'
@@ -3253,7 +3146,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking host system type" >&5
 $as_echo_n "checking host system type... " >&6; }
-if test "${ac_cv_host+set}" = set; then :
+if ${ac_cv_host+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test "x$host_alias" = x; then
@@ -3268,7 +3161,7 @@
 $as_echo "$ac_cv_host" >&6; }
 case $ac_cv_host in
 *-*-*) ;;
-*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5 ;;
+*) as_fn_error $? "invalid value of canonical host" "$LINENO" 5;;
 esac
 host=$ac_cv_host
 ac_save_IFS=$IFS; IFS='-'
@@ -3301,7 +3194,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
+if ${ac_cv_prog_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CXX"; then
@@ -3313,7 +3206,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3345,7 +3238,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CXX"; then
@@ -3357,7 +3250,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CXX="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -3509,7 +3402,7 @@
 { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error 77 "C++ compiler cannot create executables
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
@@ -3552,7 +3445,7 @@
   { { $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 compute suffix of executables: cannot compile and link
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest conftest$ac_cv_exeext
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_exeext" >&5
@@ -3611,7 +3504,7 @@
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "cannot run C++ compiled programs.
 If you meant to cross compile, use \`--host'.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
     fi
   fi
 fi
@@ -3622,7 +3515,7 @@
 ac_clean_files=$ac_clean_files_save
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for suffix of object files" >&5
 $as_echo_n "checking for suffix of object files... " >&6; }
-if test "${ac_cv_objext+set}" = set; then :
+if ${ac_cv_objext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3663,7 +3556,7 @@
 { { $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 compute suffix of object files: cannot compile
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 rm -f conftest.$ac_cv_objext conftest.$ac_ext
 fi
@@ -3673,7 +3566,7 @@
 ac_objext=$OBJEXT
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
 $as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
+if ${ac_cv_cxx_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -3710,7 +3603,7 @@
 ac_save_CXXFLAGS=$CXXFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
 $as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
+if ${ac_cv_prog_cxx_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_cxx_werror_flag=$ac_cxx_werror_flag
@@ -3843,6 +3736,7 @@
 if test "x$enable_dependency_tracking" != xno; then
   am_depcomp="$ac_aux_dir/depcomp"
   AMDEPBACKSLASH='\'
+  am__nodep='_no'
 fi
  if test "x$enable_dependency_tracking" != xno; then
   AMDEP_TRUE=
@@ -3858,7 +3752,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CXX_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -3867,6 +3761,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -3926,7 +3821,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -3991,7 +3886,7 @@
 set dummy ${ac_tool_prefix}gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4003,7 +3898,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4031,7 +3926,7 @@
 set dummy gcc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4043,7 +3938,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="gcc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4084,7 +3979,7 @@
 set dummy ${ac_tool_prefix}cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4096,7 +3991,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="${ac_tool_prefix}cc"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4124,7 +4019,7 @@
 set dummy cc; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4137,7 +4032,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     if test "$as_dir/$ac_word$ac_exec_ext" = "/usr/ucb/cc"; then
        ac_prog_rejected=yes
        continue
@@ -4183,7 +4078,7 @@
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CC+set}" = set; then :
+if ${ac_cv_prog_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$CC"; then
@@ -4195,7 +4090,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_CC="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4227,7 +4122,7 @@
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CC+set}" = set; then :
+if ${ac_cv_prog_ac_ct_CC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_CC"; then
@@ -4239,7 +4134,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_CC="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -4282,7 +4177,7 @@
 test -z "$CC" && { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "no acceptable C compiler found in \$PATH
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 # Provide some information about the compiler.
 $as_echo "$as_me:${as_lineno-$LINENO}: checking for C compiler version" >&5
@@ -4311,7 +4206,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C compiler" >&5
 $as_echo_n "checking whether we are using the GNU C compiler... " >&6; }
-if test "${ac_cv_c_compiler_gnu+set}" = set; then :
+if ${ac_cv_c_compiler_gnu+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4348,7 +4243,7 @@
 ac_save_CFLAGS=$CFLAGS
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CC accepts -g" >&5
 $as_echo_n "checking whether $CC accepts -g... " >&6; }
-if test "${ac_cv_prog_cc_g+set}" = set; then :
+if ${ac_cv_prog_cc_g+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_save_c_werror_flag=$ac_c_werror_flag
@@ -4426,7 +4321,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $CC option to accept ISO C89" >&5
 $as_echo_n "checking for $CC option to accept ISO C89... " >&6; }
-if test "${ac_cv_prog_cc_c89+set}" = set; then :
+if ${ac_cv_prog_cc_c89+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_cv_prog_cc_c89=no
@@ -4435,8 +4330,7 @@
 /* end confdefs.h.  */
 #include <stdarg.h>
 #include <stdio.h>
-#include <sys/types.h>
-#include <sys/stat.h>
+struct stat;
 /* Most of the following tests are stolen from RCS 5.7's src/conf.sh.  */
 struct buf { int x; };
 FILE * (*rcsopen) (struct buf *, struct stat *, int);
@@ -4525,7 +4419,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
 $as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CC_dependencies_compiler_type+set}" = set; then :
+if ${am_cv_CC_dependencies_compiler_type+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
@@ -4534,6 +4428,7 @@
   # instance it was reported that on HP-UX the gcc test will end up
   # making a dummy file named `D' -- because `-MD' means `put the output
   # in D'.
+  rm -rf conftest.dir
   mkdir conftest.dir
   # Copy depcomp to subdir because otherwise we won't find it if we're
   # using a relative directory.
@@ -4593,7 +4488,7 @@
 	break
       fi
       ;;
-    msvisualcpp | msvcmsys)
+    msvc7 | msvc7msys | msvisualcpp | msvcmsys)
       # This compiler won't grok `-c -o', but also, the minuso test has
       # not run yet.  These depmodes are late enough in the game, and
       # so weak that their functioning should not be impacted.
@@ -4657,7 +4552,7 @@
 fi
 set dummy $CC; ac_cc=`$as_echo "$2" |
 		      sed 's/[^a-zA-Z0-9_]/_/g;s/^[0-9]/_/'`
-if eval "test \"\${ac_cv_prog_cc_${ac_cc}_c_o+set}\"" = set; then :
+if eval \${ac_cv_prog_cc_${ac_cc}_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -4783,8 +4678,8 @@
 
 
 
-macro_version='2.2.6b'
-macro_revision='1.3017'
+macro_version='2.4.2'
+macro_revision='1.3337'
 
 
 
@@ -4800,9 +4695,78 @@
 
 ltmain="$ac_aux_dir/ltmain.sh"
 
+# Backslashify metacharacters that are still active within
+# double-quoted strings.
+sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
+
+# Same as above, but do not quote variable references.
+double_quote_subst='s/\(["`\\]\)/\\\1/g'
+
+# Sed substitution to delay expansion of an escaped shell variable in a
+# double_quote_subst'ed string.
+delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
+
+# Sed substitution to delay expansion of an escaped single quote.
+delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
+
+# Sed substitution to avoid accidental globbing in evaled expressions
+no_glob_subst='s/\*/\\\*/g'
+
+ECHO='\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\\'
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO
+ECHO=$ECHO$ECHO$ECHO$ECHO$ECHO$ECHO
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to print strings" >&5
+$as_echo_n "checking how to print strings... " >&6; }
+# Test print first, because it will be a builtin if present.
+if test "X`( print -r -- -n ) 2>/dev/null`" = X-n && \
+   test "X`print -r -- $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='print -r --'
+elif test "X`printf %s $ECHO 2>/dev/null`" = "X$ECHO"; then
+  ECHO='printf %s\n'
+else
+  # Use this function as a fallback that always works.
+  func_fallback_echo ()
+  {
+    eval 'cat <<_LTECHO_EOF
+$1
+_LTECHO_EOF'
+  }
+  ECHO='func_fallback_echo'
+fi
+
+# func_echo_all arg...
+# Invoke $ECHO with all args, space-separated.
+func_echo_all ()
+{
+    $ECHO ""
+}
+
+case "$ECHO" in
+  printf*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: printf" >&5
+$as_echo "printf" >&6; } ;;
+  print*) { $as_echo "$as_me:${as_lineno-$LINENO}: result: print -r" >&5
+$as_echo "print -r" >&6; } ;;
+  *) { $as_echo "$as_me:${as_lineno-$LINENO}: result: cat" >&5
+$as_echo "cat" >&6; } ;;
+esac
+
+
+
+
+
+
+
+
+
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for a sed that does not truncate output" >&5
 $as_echo_n "checking for a sed that does not truncate output... " >&6; }
-if test "${ac_cv_path_SED+set}" = set; then :
+if ${ac_cv_path_SED+:} false; then :
   $as_echo_n "(cached) " >&6
 else
             ac_script=s/aaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaaa/bbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbbb/
@@ -4822,7 +4786,7 @@
     for ac_prog in sed gsed; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_SED="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_SED" && $as_test_x "$ac_path_SED"; } || continue
+      as_fn_executable_p "$ac_path_SED" || continue
 # Check for GNU ac_path_SED and select it if it is found.
   # Check for GNU $ac_path_SED
 case `"$ac_path_SED" --version 2>&1` in
@@ -4884,7 +4848,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for grep that handles long lines and -e" >&5
 $as_echo_n "checking for grep that handles long lines and -e... " >&6; }
-if test "${ac_cv_path_GREP+set}" = set; then :
+if ${ac_cv_path_GREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$GREP"; then
@@ -4898,7 +4862,7 @@
     for ac_prog in grep ggrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_GREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_GREP" && $as_test_x "$ac_path_GREP"; } || continue
+      as_fn_executable_p "$ac_path_GREP" || continue
 # Check for GNU ac_path_GREP and select it if it is found.
   # Check for GNU $ac_path_GREP
 case `"$ac_path_GREP" --version 2>&1` in
@@ -4947,7 +4911,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for egrep" >&5
 $as_echo_n "checking for egrep... " >&6; }
-if test "${ac_cv_path_EGREP+set}" = set; then :
+if ${ac_cv_path_EGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo a | $GREP -E '(a|b)' >/dev/null 2>&1
@@ -4964,7 +4928,7 @@
     for ac_prog in egrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_EGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_EGREP" && $as_test_x "$ac_path_EGREP"; } || continue
+      as_fn_executable_p "$ac_path_EGREP" || continue
 # Check for GNU ac_path_EGREP and select it if it is found.
   # Check for GNU $ac_path_EGREP
 case `"$ac_path_EGREP" --version 2>&1` in
@@ -5014,7 +4978,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for fgrep" >&5
 $as_echo_n "checking for fgrep... " >&6; }
-if test "${ac_cv_path_FGREP+set}" = set; then :
+if ${ac_cv_path_FGREP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if echo 'ab*c' | $GREP -F 'ab*c' >/dev/null 2>&1
@@ -5031,7 +4995,7 @@
     for ac_prog in fgrep; do
     for ac_exec_ext in '' $ac_executable_extensions; do
       ac_path_FGREP="$as_dir/$ac_prog$ac_exec_ext"
-      { test -f "$ac_path_FGREP" && $as_test_x "$ac_path_FGREP"; } || continue
+      as_fn_executable_p "$ac_path_FGREP" || continue
 # Check for GNU ac_path_FGREP and select it if it is found.
   # Check for GNU $ac_path_FGREP
 case `"$ac_path_FGREP" --version 2>&1` in
@@ -5145,7 +5109,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -5185,7 +5149,7 @@
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -5212,7 +5176,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for BSD- or MS-compatible name lister (nm)" >&5
 $as_echo_n "checking for BSD- or MS-compatible name lister (nm)... " >&6; }
-if test "${lt_cv_path_NM+set}" = set; then :
+if ${lt_cv_path_NM+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NM"; then
@@ -5265,14 +5229,17 @@
   NM="$lt_cv_path_NM"
 else
   # Didn't find any BSD compatible name lister, look for dumpbin.
-  if test -n "$ac_tool_prefix"; then
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  if test -n "$DUMPBIN"; then :
+    # Let the user override the test.
+  else
+    if test -n "$ac_tool_prefix"; then
+  for ac_prog in dumpbin "link -dump"
   do
     # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
 set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DUMPBIN"; then
@@ -5284,7 +5251,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DUMPBIN="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5310,13 +5277,13 @@
 fi
 if test -z "$DUMPBIN"; then
   ac_ct_DUMPBIN=$DUMPBIN
-  for ac_prog in "dumpbin -symbols" "link -dump -symbols"
+  for ac_prog in dumpbin "link -dump"
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DUMPBIN+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DUMPBIN+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DUMPBIN"; then
@@ -5328,7 +5295,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DUMPBIN="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5365,6 +5332,15 @@
   fi
 fi
 
+    case `$DUMPBIN -symbols /dev/null 2>&1 | sed '1q'` in
+    *COFF*)
+      DUMPBIN="$DUMPBIN -symbols"
+      ;;
+    *)
+      DUMPBIN=:
+      ;;
+    esac
+  fi
 
   if test "$DUMPBIN" != ":"; then
     NM="$DUMPBIN"
@@ -5379,18 +5355,18 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the name lister ($NM) interface" >&5
 $as_echo_n "checking the name lister ($NM) interface... " >&6; }
-if test "${lt_cv_nm_interface+set}" = set; then :
+if ${lt_cv_nm_interface+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_nm_interface="BSD nm"
   echo "int some_variable = 0;" > conftest.$ac_ext
-  (eval echo "\"\$as_me:5387: $ac_compile\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $ac_compile\"" >&5)
   (eval "$ac_compile" 2>conftest.err)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5390: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: $NM \\\"conftest.$ac_objext\\\"\"" >&5)
   (eval "$NM \"conftest.$ac_objext\"" 2>conftest.err > conftest.out)
   cat conftest.err >&5
-  (eval echo "\"\$as_me:5393: output\"" >&5)
+  (eval echo "\"\$as_me:$LINENO: output\"" >&5)
   cat conftest.out >&5
   if $GREP 'External.*some_variable' conftest.out > /dev/null; then
     lt_cv_nm_interface="MS dumpbin"
@@ -5414,7 +5390,7 @@
 # find the maximum length of command line arguments
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking the maximum length of command line arguments" >&5
 $as_echo_n "checking the maximum length of command line arguments... " >&6; }
-if test "${lt_cv_sys_max_cmd_len+set}" = set; then :
+if ${lt_cv_sys_max_cmd_len+:} false; then :
   $as_echo_n "(cached) " >&6
 else
     i=0
@@ -5447,6 +5423,11 @@
     lt_cv_sys_max_cmd_len=8192;
     ;;
 
+  mint*)
+    # On MiNT this can take a long time and run out of memory.
+    lt_cv_sys_max_cmd_len=8192;
+    ;;
+
   amigaos*)
     # On AmigaOS with pdksh, this test takes hours, literally.
     # So we just punt and use a minimum line length of 8192.
@@ -5472,6 +5453,11 @@
     lt_cv_sys_max_cmd_len=196608
     ;;
 
+  os2*)
+    # The test takes a long time on OS/2.
+    lt_cv_sys_max_cmd_len=8192
+    ;;
+
   osf*)
     # Dr. Hans Ekkehard Plesser reports seeing a kernel panic running configure
     # due to this test when exec_disable_arg_limit is 1 on Tru64. It is not
@@ -5511,8 +5497,8 @@
       # If test is not a shell built-in, we'll probably end up computing a
       # maximum length that is only half of the actual maximum length, but
       # we can't tell.
-      while { test "X"`$SHELL $0 --fallback-echo "X$teststring$teststring" 2>/dev/null` \
-	         = "XX$teststring$teststring"; } >/dev/null 2>&1 &&
+      while { test "X"`env echo "$teststring$teststring" 2>/dev/null` \
+	         = "X$teststring$teststring"; } >/dev/null 2>&1 &&
 	      test $i != 17 # 1/2 MB should be enough
       do
         i=`expr $i + 1`
@@ -5554,8 +5540,8 @@
 # Try some XSI features
 xsi_shell=no
 ( _lt_dummy="a/b/c"
-  test "${_lt_dummy##*/},${_lt_dummy%/*},"${_lt_dummy%"$_lt_dummy"}, \
-      = c,a/b,, \
+  test "${_lt_dummy##*/},${_lt_dummy%/*},${_lt_dummy#??}"${_lt_dummy%"$_lt_dummy"}, \
+      = c,a/b,b/c, \
     && eval 'test $(( 1 + 1 )) -eq 2 \
     && test "${#_lt_dummy}" -eq 5' ) >/dev/null 2>&1 \
   && xsi_shell=yes
@@ -5604,9 +5590,83 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to $host format" >&5
+$as_echo_n "checking how to convert $build file names to $host format... " >&6; }
+if ${lt_cv_to_host_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_w32
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_cygwin_to_w32
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_w32
+        ;;
+    esac
+    ;;
+  *-*-cygwin* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_host_file_cmd=func_convert_file_msys_to_cygwin
+        ;;
+      *-*-cygwin* )
+        lt_cv_to_host_file_cmd=func_convert_file_noop
+        ;;
+      * ) # otherwise, assume *nix
+        lt_cv_to_host_file_cmd=func_convert_file_nix_to_cygwin
+        ;;
+    esac
+    ;;
+  * ) # unhandled hosts (and "normal" native builds)
+    lt_cv_to_host_file_cmd=func_convert_file_noop
+    ;;
+esac
+
+fi
+
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_host_file_cmd" >&5
+$as_echo "$lt_cv_to_host_file_cmd" >&6; }
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to convert $build file names to toolchain format" >&5
+$as_echo_n "checking how to convert $build file names to toolchain format... " >&6; }
+if ${lt_cv_to_tool_file_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  #assume ordinary cross tools, or native build.
+lt_cv_to_tool_file_cmd=func_convert_file_noop
+case $host in
+  *-*-mingw* )
+    case $build in
+      *-*-mingw* ) # actually msys
+        lt_cv_to_tool_file_cmd=func_convert_file_msys_to_w32
+        ;;
+    esac
+    ;;
+esac
+
+fi
+
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_to_tool_file_cmd" >&5
+$as_echo "$lt_cv_to_tool_file_cmd" >&6; }
+
+
+
+
+
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $LD option to reload object files" >&5
 $as_echo_n "checking for $LD option to reload object files... " >&6; }
-if test "${lt_cv_ld_reload_flag+set}" = set; then :
+if ${lt_cv_ld_reload_flag+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_reload_flag='-r'
@@ -5620,6 +5680,11 @@
 esac
 reload_cmds='$LD$reload_flag -o $output$reload_objs'
 case $host_os in
+  cygwin* | mingw* | pw32* | cegcc*)
+    if test "$GCC" != yes; then
+      reload_cmds=false
+    fi
+    ;;
   darwin*)
     if test "$GCC" = yes; then
       reload_cmds='$LTCC $LTCFLAGS -nostdlib ${wl}-r -o $output$reload_objs'
@@ -5642,7 +5707,7 @@
 set dummy ${ac_tool_prefix}objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OBJDUMP"; then
@@ -5654,7 +5719,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OBJDUMP="${ac_tool_prefix}objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5682,7 +5747,7 @@
 set dummy objdump; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OBJDUMP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OBJDUMP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OBJDUMP"; then
@@ -5694,7 +5759,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OBJDUMP="objdump"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -5741,7 +5806,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to recognize dependent libraries" >&5
 $as_echo_n "checking how to recognize dependent libraries... " >&6; }
-if test "${lt_cv_deplibs_check_method+set}" = set; then :
+if ${lt_cv_deplibs_check_method+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_file_magic_cmd='$MAGIC_CMD'
@@ -5783,16 +5848,18 @@
   # Base MSYS/MinGW do not provide the 'file' command needed by
   # func_win32_libid shell function, so use a weaker test based on 'objdump',
   # unless we find 'file', for example because we are cross-compiling.
-  if ( file / ) >/dev/null 2>&1; then
+  # func_win32_libid assumes BSD nm, so disallow it if using MS dumpbin.
+  if ( test "$lt_cv_nm_interface" = "BSD nm" && file / ) >/dev/null 2>&1; then
     lt_cv_deplibs_check_method='file_magic ^x86 archive import|^x86 DLL'
     lt_cv_file_magic_cmd='func_win32_libid'
   else
-    lt_cv_deplibs_check_method='file_magic file format pei*-i386(.*architecture: i386)?'
+    # Keep this pattern in sync with the one in func_win32_libid.
+    lt_cv_deplibs_check_method='file_magic file format (pei*-i386(.*architecture: i386)?|pe-arm-wince|pe-x86-64)'
     lt_cv_file_magic_cmd='$OBJDUMP -f'
   fi
   ;;
 
-cegcc)
+cegcc*)
   # use the weaker test based on 'objdump'. See mingw*.
   lt_cv_deplibs_check_method='file_magic file format pe-arm-.*little(.*architecture: arm)?'
   lt_cv_file_magic_cmd='$OBJDUMP -f'
@@ -5818,7 +5885,7 @@
   fi
   ;;
 
-gnu*)
+haiku*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5830,11 +5897,11 @@
     lt_cv_file_magic_test_file=/usr/lib/hpux32/libc.so
     ;;
   hppa*64*)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF-[0-9][0-9]) shared object file - PA-RISC [0-9].[0-9]'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|ELF[ -][0-9][0-9])(-bit)?( [LM]SB)? shared object( file)?[, -]* PA-RISC [0-9]\.[0-9]'
     lt_cv_file_magic_test_file=/usr/lib/pa20_64/libc.sl
     ;;
   *)
-    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9].[0-9]) shared library'
+    lt_cv_deplibs_check_method='file_magic (s[0-9][0-9][0-9]|PA-RISC[0-9]\.[0-9]) shared library'
     lt_cv_file_magic_test_file=/usr/lib/libc.sl
     ;;
   esac
@@ -5855,8 +5922,8 @@
   lt_cv_deplibs_check_method=pass_all
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
   lt_cv_deplibs_check_method=pass_all
   ;;
 
@@ -5937,6 +6004,21 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_deplibs_check_method" >&5
 $as_echo "$lt_cv_deplibs_check_method" >&6; }
+
+file_magic_glob=
+want_nocaseglob=no
+if test "$build" = "$host"; then
+  case $host_os in
+  mingw* | pw32*)
+    if ( shopt | grep nocaseglob ) >/dev/null 2>&1; then
+      want_nocaseglob=yes
+    else
+      file_magic_glob=`echo aAbBcCdDeEfFgGhHiIjJkKlLmMnNoOpPqQrRsStTuUvVwWxXyYzZ | $SED -e "s/\(..\)/s\/[\1]\/[\1]\/g;/g"`
+    fi
+    ;;
+  esac
+fi
+
 file_magic_cmd=$lt_cv_file_magic_cmd
 deplibs_check_method=$lt_cv_deplibs_check_method
 test -z "$deplibs_check_method" && deplibs_check_method=unknown
@@ -5952,16 +6034,26 @@
 
 
 
+
+
+
+
+
+
+
+
+
+
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}ar", so it can be a program name with args.
-set dummy ${ac_tool_prefix}ar; ac_word=$2
+  # Extract the first word of "${ac_tool_prefix}dlltool", so it can be a program name with args.
+set dummy ${ac_tool_prefix}dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_AR+set}" = set; then :
+if ${ac_cv_prog_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$AR"; then
-  ac_cv_prog_AR="$AR" # Let the user override the test.
+  if test -n "$DLLTOOL"; then
+  ac_cv_prog_DLLTOOL="$DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -5969,8 +6061,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_AR="${ac_tool_prefix}ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_DLLTOOL="${ac_tool_prefix}dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -5980,10 +6072,10 @@
 
 fi
 fi
-AR=$ac_cv_prog_AR
-if test -n "$AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
-$as_echo "$AR" >&6; }
+DLLTOOL=$ac_cv_prog_DLLTOOL
+if test -n "$DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DLLTOOL" >&5
+$as_echo "$DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
@@ -5991,17 +6083,17 @@
 
 
 fi
-if test -z "$ac_cv_prog_AR"; then
-  ac_ct_AR=$AR
-  # Extract the first word of "ar", so it can be a program name with args.
-set dummy ar; ac_word=$2
+if test -z "$ac_cv_prog_DLLTOOL"; then
+  ac_ct_DLLTOOL=$DLLTOOL
+  # Extract the first word of "dlltool", so it can be a program name with args.
+set dummy dlltool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_AR+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DLLTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_AR"; then
-  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
+  if test -n "$ac_ct_DLLTOOL"; then
+  ac_cv_prog_ac_ct_DLLTOOL="$ac_ct_DLLTOOL" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6009,8 +6101,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_AR="ar"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_DLLTOOL="dlltool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6020,17 +6112,17 @@
 
 fi
 fi
-ac_ct_AR=$ac_cv_prog_ac_ct_AR
-if test -n "$ac_ct_AR"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
-$as_echo "$ac_ct_AR" >&6; }
+ac_ct_DLLTOOL=$ac_cv_prog_ac_ct_DLLTOOL
+if test -n "$ac_ct_DLLTOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_DLLTOOL" >&5
+$as_echo "$ac_ct_DLLTOOL" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
-  if test "x$ac_ct_AR" = x; then
-    AR="false"
+  if test "x$ac_ct_DLLTOOL" = x; then
+    DLLTOOL="false"
   else
     case $cross_compiling:$ac_tool_warned in
 yes:)
@@ -6038,14 +6130,16 @@
 $as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
 ac_tool_warned=yes ;;
 esac
-    AR=$ac_ct_AR
+    DLLTOOL=$ac_ct_DLLTOOL
   fi
 else
-  AR="$ac_cv_prog_AR"
+  DLLTOOL="$ac_cv_prog_DLLTOOL"
 fi
 
-test -z "$AR" && AR=ar
-test -z "$AR_FLAGS" && AR_FLAGS=cru
+test -z "$DLLTOOL" && DLLTOOL=dlltool
+
+
+
 
 
 
@@ -6053,20 +6147,57 @@
 
 
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to associate runtime and link libraries" >&5
+$as_echo_n "checking how to associate runtime and link libraries... " >&6; }
+if ${lt_cv_sharedlib_from_linklib_cmd+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_sharedlib_from_linklib_cmd='unknown'
+
+case $host_os in
+cygwin* | mingw* | pw32* | cegcc*)
+  # two different shell functions defined in ltmain.sh
+  # decide which to use based on capabilities of $DLLTOOL
+  case `$DLLTOOL --help 2>&1` in
+  *--identify-strict*)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib
+    ;;
+  *)
+    lt_cv_sharedlib_from_linklib_cmd=func_cygming_dll_for_implib_fallback
+    ;;
+  esac
+  ;;
+*)
+  # fallback: assume linklib IS sharedlib
+  lt_cv_sharedlib_from_linklib_cmd="$ECHO"
+  ;;
+esac
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_sharedlib_from_linklib_cmd" >&5
+$as_echo "$lt_cv_sharedlib_from_linklib_cmd" >&6; }
+sharedlib_from_linklib_cmd=$lt_cv_sharedlib_from_linklib_cmd
+test -z "$sharedlib_from_linklib_cmd" && sharedlib_from_linklib_cmd=$ECHO
+
+
+
+
 
 
 
 
 if test -n "$ac_tool_prefix"; then
-  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
-set dummy ${ac_tool_prefix}strip; ac_word=$2
+  for ac_prog in ar
+  do
+    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
+set dummy $ac_tool_prefix$ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_STRIP+set}" = set; then :
+if ${ac_cv_prog_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$STRIP"; then
-  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+  if test -n "$AR"; then
+  ac_cv_prog_AR="$AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6074,8 +6205,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_AR="$ac_tool_prefix$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6085,28 +6216,32 @@
 
 fi
 fi
-STRIP=$ac_cv_prog_STRIP
-if test -n "$STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
-$as_echo "$STRIP" >&6; }
+AR=$ac_cv_prog_AR
+if test -n "$AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $AR" >&5
+$as_echo "$AR" >&6; }
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
 
 
+    test -n "$AR" && break
+  done
 fi
-if test -z "$ac_cv_prog_STRIP"; then
-  ac_ct_STRIP=$STRIP
-  # Extract the first word of "strip", so it can be a program name with args.
-set dummy strip; ac_word=$2
+if test -z "$AR"; then
+  ac_ct_AR=$AR
+  for ac_prog in ar
+do
+  # Extract the first word of "$ac_prog", so it can be a program name with args.
+set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_STRIP+set}" = set; then :
+if ${ac_cv_prog_ac_ct_AR+:} false; then :
   $as_echo_n "(cached) " >&6
 else
-  if test -n "$ac_ct_STRIP"; then
-  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+  if test -n "$ac_ct_AR"; then
+  ac_cv_prog_ac_ct_AR="$ac_ct_AR" # Let the user override the test.
 else
 as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
 for as_dir in $PATH
@@ -6114,8 +6249,8 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_STRIP="strip"
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_AR="$ac_prog"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
   fi
@@ -6125,11 +6260,176 @@
 
 fi
 fi
-ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
-if test -n "$ac_ct_STRIP"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
-$as_echo "$ac_ct_STRIP" >&6; }
-else
+ac_ct_AR=$ac_cv_prog_ac_ct_AR
+if test -n "$ac_ct_AR"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_AR" >&5
+$as_echo "$ac_ct_AR" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+  test -n "$ac_ct_AR" && break
+done
+
+  if test "x$ac_ct_AR" = x; then
+    AR="false"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    AR=$ac_ct_AR
+  fi
+fi
+
+: ${AR=ar}
+: ${AR_FLAGS=cru}
+
+
+
+
+
+
+
+
+
+
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for archiver @FILE support" >&5
+$as_echo_n "checking for archiver @FILE support... " >&6; }
+if ${lt_cv_ar_at_file+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ar_at_file=no
+   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+int
+main ()
+{
+
+  ;
+  return 0;
+}
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+  echo conftest.$ac_objext > conftest.lst
+      lt_ar_try='$AR $AR_FLAGS libconftest.a @conftest.lst >&5'
+      { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+      if test "$ac_status" -eq 0; then
+	# Ensure the archiver fails upon bogus file names.
+	rm -f conftest.$ac_objext libconftest.a
+	{ { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$lt_ar_try\""; } >&5
+  (eval $lt_ar_try) 2>&5
+  ac_status=$?
+  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
+  test $ac_status = 0; }
+	if test "$ac_status" -ne 0; then
+          lt_cv_ar_at_file=@
+        fi
+      fi
+      rm -f conftest.* libconftest.a
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ar_at_file" >&5
+$as_echo "$lt_cv_ar_at_file" >&6; }
+
+if test "x$lt_cv_ar_at_file" = xno; then
+  archiver_list_spec=
+else
+  archiver_list_spec=$lt_cv_ar_at_file
+fi
+
+
+
+
+
+
+
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}strip", so it can be a program name with args.
+set dummy ${ac_tool_prefix}strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$STRIP"; then
+  ac_cv_prog_STRIP="$STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_STRIP="${ac_tool_prefix}strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+STRIP=$ac_cv_prog_STRIP
+if test -n "$STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $STRIP" >&5
+$as_echo "$STRIP" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_STRIP"; then
+  ac_ct_STRIP=$STRIP
+  # Extract the first word of "strip", so it can be a program name with args.
+set dummy strip; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_STRIP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_STRIP"; then
+  ac_cv_prog_ac_ct_STRIP="$ac_ct_STRIP" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_STRIP="strip"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_STRIP=$ac_cv_prog_ac_ct_STRIP
+if test -n "$ac_ct_STRIP"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_STRIP" >&5
+$as_echo "$ac_ct_STRIP" >&6; }
+else
   { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 fi
@@ -6161,7 +6461,7 @@
 set dummy ${ac_tool_prefix}ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_RANLIB+set}" = set; then :
+if ${ac_cv_prog_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$RANLIB"; then
@@ -6173,7 +6473,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6201,7 +6501,7 @@
 set dummy ranlib; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_RANLIB+set}" = set; then :
+if ${ac_cv_prog_ac_ct_RANLIB+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_RANLIB"; then
@@ -6213,7 +6513,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_RANLIB="ranlib"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6263,15 +6563,27 @@
 if test -n "$RANLIB"; then
   case $host_os in
   openbsd*)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB -t \$tool_oldlib"
     ;;
   *)
-    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$oldlib"
+    old_postinstall_cmds="$old_postinstall_cmds~\$RANLIB \$tool_oldlib"
     ;;
   esac
-  old_archive_cmds="$old_archive_cmds~\$RANLIB \$oldlib"
+  old_archive_cmds="$old_archive_cmds~\$RANLIB \$tool_oldlib"
 fi
 
+case $host_os in
+  darwin*)
+    lock_old_archive_extraction=yes ;;
+  *)
+    lock_old_archive_extraction=no ;;
+esac
+
+
+
+
+
+
 
 
 
@@ -6318,7 +6630,7 @@
 # Check for command to grab the raw symbol name followed by C symbol from nm.
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking command to parse $NM output from $compiler object" >&5
 $as_echo_n "checking command to parse $NM output from $compiler object... " >&6; }
-if test "${lt_cv_sys_global_symbol_pipe+set}" = set; then :
+if ${lt_cv_sys_global_symbol_pipe+:} false; then :
   $as_echo_n "(cached) " >&6
 else
 
@@ -6379,8 +6691,8 @@
 lt_cv_sys_global_symbol_to_cdecl="sed -n -e 's/^T .* \(.*\)$/extern int \1();/p' -e 's/^$symcode* .* \(.*\)$/extern char \1;/p'"
 
 # Transform an extracted symbol line into symbol name and symbol address
-lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\) $/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"\2\", (void *) \&\2},/p'"
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix="sed -n -e 's/^: \([^ ]*\)[ ]*$/  {\\\"\1\\\", (void *) 0},/p' -e 's/^$symcode* \([^ ]*\) \(lib[^ ]*\)$/  {\"\2\", (void *) \&\2},/p' -e 's/^$symcode* \([^ ]*\) \([^ ]*\)$/  {\"lib\2\", (void *) \&\2},/p'"
 
 # Handle CRLF in mingw tool chain
 opt_cr=
@@ -6404,6 +6716,7 @@
     # which start with @ or ?.
     lt_cv_sys_global_symbol_pipe="$AWK '"\
 "     {last_section=section; section=\$ 3};"\
+"     /^COFF SYMBOL TABLE/{for(i in hide) delete hide[i]};"\
 "     /Section length .*#relocs.*(pick any)/{hide[last_section]=1};"\
 "     \$ 0!~/External *\|/{next};"\
 "     / 0+ UNDEF /{next}; / UNDEF \([^|]\)*()/{next};"\
@@ -6416,6 +6729,7 @@
   else
     lt_cv_sys_global_symbol_pipe="sed -n -e 's/^.*[	 ]\($symcode$symcode*\)[	 ][	 ]*$ac_symprfx$sympat$opt_cr$/$symxfrm/p'"
   fi
+  lt_cv_sys_global_symbol_pipe="$lt_cv_sys_global_symbol_pipe | sed '/ __gnu_lto/d'"
 
   # Check to see that the pipe works correctly.
   pipe_works=no
@@ -6441,8 +6755,8 @@
   test $ac_status = 0; }; then
     # Now try to grab the symbols.
     nlist=conftest.nm
-    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist\""; } >&5
-  (eval $NM conftest.$ac_objext \| $lt_cv_sys_global_symbol_pipe \> $nlist) 2>&5
+    if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist\""; } >&5
+  (eval $NM conftest.$ac_objext \| "$lt_cv_sys_global_symbol_pipe" \> $nlist) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } && test -s "$nlist"; then
@@ -6457,6 +6771,18 @@
       if $GREP ' nm_test_var$' "$nlist" >/dev/null; then
 	if $GREP ' nm_test_func$' "$nlist" >/dev/null; then
 	  cat <<_LT_EOF > conftest.$ac_ext
+/* Keep this code in sync between libtool.m4, ltmain, lt_system.h, and tests.  */
+#if defined(_WIN32) || defined(__CYGWIN__) || defined(_WIN32_WCE)
+/* DATA imports from DLLs on WIN32 con't be const, because runtime
+   relocations are performed -- see ld's documentation on pseudo-relocs.  */
+# define LT_DLSYM_CONST
+#elif defined(__osf__)
+/* This system does not cope well with relocations in const data.  */
+# define LT_DLSYM_CONST
+#else
+# define LT_DLSYM_CONST const
+#endif
+
 #ifdef __cplusplus
 extern "C" {
 #endif
@@ -6468,7 +6794,7 @@
 	  cat <<_LT_EOF >> conftest.$ac_ext
 
 /* The mapping between symbol names and symbols.  */
-const struct {
+LT_DLSYM_CONST struct {
   const char *name;
   void       *address;
 }
@@ -6494,8 +6820,8 @@
 _LT_EOF
 	  # Now try linking the two files.
 	  mv conftest.$ac_objext conftstm.$ac_objext
-	  lt_save_LIBS="$LIBS"
-	  lt_save_CFLAGS="$CFLAGS"
+	  lt_globsym_save_LIBS=$LIBS
+	  lt_globsym_save_CFLAGS=$CFLAGS
 	  LIBS="conftstm.$ac_objext"
 	  CFLAGS="$CFLAGS$lt_prog_compiler_no_builtin_flag"
 	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_link\""; } >&5
@@ -6505,8 +6831,8 @@
   test $ac_status = 0; } && test -s conftest${ac_exeext}; then
 	    pipe_works=yes
 	  fi
-	  LIBS="$lt_save_LIBS"
-	  CFLAGS="$lt_save_CFLAGS"
+	  LIBS=$lt_globsym_save_LIBS
+	  CFLAGS=$lt_globsym_save_CFLAGS
 	else
 	  echo "cannot find nm_test_func in $nlist" >&5
 	fi
@@ -6543,6 +6869,16 @@
 $as_echo "ok" >&6; }
 fi
 
+# Response file support.
+if test "$lt_cv_nm_interface" = "MS dumpbin"; then
+  nm_file_list_spec='@'
+elif $NM --help 2>/dev/null | grep '[@]FILE' >/dev/null; then
+  nm_file_list_spec='@'
+fi
+
+
+
+
 
 
 
@@ -6565,6 +6901,44 @@
 
 
 
+
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for sysroot" >&5
+$as_echo_n "checking for sysroot... " >&6; }
+
+# Check whether --with-sysroot was given.
+if test "${with_sysroot+set}" = set; then :
+  withval=$with_sysroot;
+else
+  with_sysroot=no
+fi
+
+
+lt_sysroot=
+case ${with_sysroot} in #(
+ yes)
+   if test "$GCC" = yes; then
+     lt_sysroot=`$CC --print-sysroot 2>/dev/null`
+   fi
+   ;; #(
+ /*)
+   lt_sysroot=`echo "$with_sysroot" | sed -e "$sed_quote_subst"`
+   ;; #(
+ no|'')
+   ;; #(
+ *)
+   { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${with_sysroot}" >&5
+$as_echo "${with_sysroot}" >&6; }
+   as_fn_error $? "The sysroot must be an absolute path." "$LINENO" 5
+   ;;
+esac
+
+ { $as_echo "$as_me:${as_lineno-$LINENO}: result: ${lt_sysroot:-no}" >&5
+$as_echo "${lt_sysroot:-no}" >&6; }
+
+
+
+
+
 # Check whether --enable-libtool-lock was given.
 if test "${enable_libtool_lock+set}" = set; then :
   enableval=$enable_libtool_lock;
@@ -6596,7 +6970,7 @@
   ;;
 *-*-irix6*)
   # Find out which ABI we are using.
-  echo '#line 6599 "configure"' > conftest.$ac_ext
+  echo '#line '$LINENO' "configure"' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -6690,7 +7064,7 @@
   CFLAGS="$CFLAGS -belf"
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the C compiler needs -belf" >&5
 $as_echo_n "checking whether the C compiler needs -belf... " >&6; }
-if test "${lt_cv_cc_needs_belf+set}" = set; then :
+if ${lt_cv_cc_needs_belf+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_ext=c
@@ -6731,7 +7105,7 @@
     CFLAGS="$SAVE_CFLAGS"
   fi
   ;;
-sparc*-*solaris*)
+*-*solaris*)
   # Find out which ABI we are using.
   echo 'int i;' > conftest.$ac_ext
   if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
@@ -6742,7 +7116,20 @@
     case `/usr/bin/file conftest.o` in
     *64-bit*)
       case $lt_cv_prog_gnu_ld in
-      yes*) LD="${LD-ld} -m elf64_sparc" ;;
+      yes*)
+        case $host in
+        i?86-*-solaris*)
+          LD="${LD-ld} -m elf_x86_64"
+          ;;
+        sparc*-*-solaris*)
+          LD="${LD-ld} -m elf64_sparc"
+          ;;
+        esac
+        # GNU ld 2.21 introduced _sol2 emulations.  Use them if available.
+        if ${LD-ld} -V | grep _sol2 >/dev/null 2>&1; then
+          LD="${LD-ld}_sol2"
+        fi
+        ;;
       *)
 	if ${LD-ld} -64 -r -o conftest2.o conftest.o >/dev/null 2>&1; then
 	  LD="${LD-ld} -64"
@@ -6758,6 +7145,123 @@
 
 need_locks="$enable_libtool_lock"
 
+if test -n "$ac_tool_prefix"; then
+  # Extract the first word of "${ac_tool_prefix}mt", so it can be a program name with args.
+set dummy ${ac_tool_prefix}mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$MANIFEST_TOOL"; then
+  ac_cv_prog_MANIFEST_TOOL="$MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_MANIFEST_TOOL="${ac_tool_prefix}mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+MANIFEST_TOOL=$ac_cv_prog_MANIFEST_TOOL
+if test -n "$MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MANIFEST_TOOL" >&5
+$as_echo "$MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+
+fi
+if test -z "$ac_cv_prog_MANIFEST_TOOL"; then
+  ac_ct_MANIFEST_TOOL=$MANIFEST_TOOL
+  # Extract the first word of "mt", so it can be a program name with args.
+set dummy mt; ac_word=$2
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+$as_echo_n "checking for $ac_word... " >&6; }
+if ${ac_cv_prog_ac_ct_MANIFEST_TOOL+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  if test -n "$ac_ct_MANIFEST_TOOL"; then
+  ac_cv_prog_ac_ct_MANIFEST_TOOL="$ac_ct_MANIFEST_TOOL" # Let the user override the test.
+else
+as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
+for as_dir in $PATH
+do
+  IFS=$as_save_IFS
+  test -z "$as_dir" && as_dir=.
+    for ac_exec_ext in '' $ac_executable_extensions; do
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
+    ac_cv_prog_ac_ct_MANIFEST_TOOL="mt"
+    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
+    break 2
+  fi
+done
+  done
+IFS=$as_save_IFS
+
+fi
+fi
+ac_ct_MANIFEST_TOOL=$ac_cv_prog_ac_ct_MANIFEST_TOOL
+if test -n "$ac_ct_MANIFEST_TOOL"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_MANIFEST_TOOL" >&5
+$as_echo "$ac_ct_MANIFEST_TOOL" >&6; }
+else
+  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+fi
+
+  if test "x$ac_ct_MANIFEST_TOOL" = x; then
+    MANIFEST_TOOL=":"
+  else
+    case $cross_compiling:$ac_tool_warned in
+yes:)
+{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
+$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
+ac_tool_warned=yes ;;
+esac
+    MANIFEST_TOOL=$ac_ct_MANIFEST_TOOL
+  fi
+else
+  MANIFEST_TOOL="$ac_cv_prog_MANIFEST_TOOL"
+fi
+
+test -z "$MANIFEST_TOOL" && MANIFEST_TOOL=mt
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if $MANIFEST_TOOL is a manifest tool" >&5
+$as_echo_n "checking if $MANIFEST_TOOL is a manifest tool... " >&6; }
+if ${lt_cv_path_mainfest_tool+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_path_mainfest_tool=no
+  echo "$as_me:$LINENO: $MANIFEST_TOOL '-?'" >&5
+  $MANIFEST_TOOL '-?' 2>conftest.err > conftest.out
+  cat conftest.err >&5
+  if $GREP 'Manifest Tool' conftest.out > /dev/null; then
+    lt_cv_path_mainfest_tool=yes
+  fi
+  rm -f conftest*
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_path_mainfest_tool" >&5
+$as_echo "$lt_cv_path_mainfest_tool" >&6; }
+if test "x$lt_cv_path_mainfest_tool" != xyes; then
+  MANIFEST_TOOL=:
+fi
+
+
+
+
+
 
   case $host_os in
     rhapsody* | darwin*)
@@ -6766,7 +7270,7 @@
 set dummy ${ac_tool_prefix}dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$DSYMUTIL"; then
@@ -6778,7 +7282,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_DSYMUTIL="${ac_tool_prefix}dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6806,7 +7310,7 @@
 set dummy dsymutil; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_DSYMUTIL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_DSYMUTIL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_DSYMUTIL"; then
@@ -6818,7 +7322,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_DSYMUTIL="dsymutil"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6858,7 +7362,7 @@
 set dummy ${ac_tool_prefix}nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$NMEDIT"; then
@@ -6870,7 +7374,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_NMEDIT="${ac_tool_prefix}nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6898,7 +7402,7 @@
 set dummy nmedit; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_NMEDIT+set}" = set; then :
+if ${ac_cv_prog_ac_ct_NMEDIT+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_NMEDIT"; then
@@ -6910,7 +7414,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_NMEDIT="nmedit"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6950,7 +7454,7 @@
 set dummy ${ac_tool_prefix}lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_LIPO+set}" = set; then :
+if ${ac_cv_prog_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$LIPO"; then
@@ -6962,7 +7466,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_LIPO="${ac_tool_prefix}lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -6990,7 +7494,7 @@
 set dummy lipo; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_LIPO+set}" = set; then :
+if ${ac_cv_prog_ac_ct_LIPO+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_LIPO"; then
@@ -7002,7 +7506,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_LIPO="lipo"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7042,7 +7546,7 @@
 set dummy ${ac_tool_prefix}otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL+set}" = set; then :
+if ${ac_cv_prog_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL"; then
@@ -7054,7 +7558,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL="${ac_tool_prefix}otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7082,7 +7586,7 @@
 set dummy otool; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL"; then
@@ -7094,7 +7598,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL="otool"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7134,7 +7638,7 @@
 set dummy ${ac_tool_prefix}otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$OTOOL64"; then
@@ -7146,7 +7650,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_OTOOL64="${ac_tool_prefix}otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7174,7 +7678,7 @@
 set dummy otool64; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_OTOOL64+set}" = set; then :
+if ${ac_cv_prog_ac_ct_OTOOL64+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -n "$ac_ct_OTOOL64"; then
@@ -7186,7 +7690,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_prog_ac_ct_OTOOL64="otool64"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -7249,7 +7753,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -single_module linker flag" >&5
 $as_echo_n "checking for -single_module linker flag... " >&6; }
-if test "${lt_cv_apple_cc_single_mod+set}" = set; then :
+if ${lt_cv_apple_cc_single_mod+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_apple_cc_single_mod=no
@@ -7265,7 +7769,13 @@
 	$LTCC $LTCFLAGS $LDFLAGS -o libconftest.dylib \
 	  -dynamiclib -Wl,-single_module conftest.c 2>conftest.err
         _lt_result=$?
-	if test -f libconftest.dylib && test ! -s conftest.err && test $_lt_result = 0; then
+	# If there is a non-empty error log, and "single_module"
+	# appears in it, assume the flag caused a linker warning
+        if test -s conftest.err && $GREP single_module conftest.err; then
+	  cat conftest.err >&5
+	# Otherwise, if the output was created with a 0 exit code from
+	# the compiler, it worked.
+	elif test -f libconftest.dylib && test $_lt_result -eq 0; then
 	  lt_cv_apple_cc_single_mod=yes
 	else
 	  cat conftest.err >&5
@@ -7276,9 +7786,10 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_apple_cc_single_mod" >&5
 $as_echo "$lt_cv_apple_cc_single_mod" >&6; }
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -exported_symbols_list linker flag" >&5
 $as_echo_n "checking for -exported_symbols_list linker flag... " >&6; }
-if test "${lt_cv_ld_exported_symbols_list+set}" = set; then :
+if ${lt_cv_ld_exported_symbols_list+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_ld_exported_symbols_list=no
@@ -7308,7 +7819,42 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_exported_symbols_list" >&5
 $as_echo "$lt_cv_ld_exported_symbols_list" >&6; }
-    case $host_os in
+
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for -force_load linker flag" >&5
+$as_echo_n "checking for -force_load linker flag... " >&6; }
+if ${lt_cv_ld_force_load+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_ld_force_load=no
+      cat > conftest.c << _LT_EOF
+int forced_loaded() { return 2;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS -c -o conftest.o conftest.c" >&5
+      $LTCC $LTCFLAGS -c -o conftest.o conftest.c 2>&5
+      echo "$AR cru libconftest.a conftest.o" >&5
+      $AR cru libconftest.a conftest.o 2>&5
+      echo "$RANLIB libconftest.a" >&5
+      $RANLIB libconftest.a 2>&5
+      cat > conftest.c << _LT_EOF
+int main() { return 0;}
+_LT_EOF
+      echo "$LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a" >&5
+      $LTCC $LTCFLAGS $LDFLAGS -o conftest conftest.c -Wl,-force_load,./libconftest.a 2>conftest.err
+      _lt_result=$?
+      if test -s conftest.err && $GREP force_load conftest.err; then
+	cat conftest.err >&5
+      elif test -f conftest && test $_lt_result -eq 0 && $GREP forced_load conftest >/dev/null 2>&1 ; then
+	lt_cv_ld_force_load=yes
+      else
+	cat conftest.err >&5
+      fi
+        rm -f conftest.err libconftest.a conftest conftest.c
+        rm -rf conftest.dSYM
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_ld_force_load" >&5
+$as_echo "$lt_cv_ld_force_load" >&6; }
+    case $host_os in
     rhapsody* | darwin1.[012])
       _lt_dar_allow_undefined='${wl}-undefined ${wl}suppress' ;;
     darwin1.*)
@@ -7335,7 +7881,7 @@
     else
       _lt_dar_export_syms='~$NMEDIT -s $output_objdir/${libname}-symbols.expsym ${lib}'
     fi
-    if test "$DSYMUTIL" != ":"; then
+    if test "$DSYMUTIL" != ":" && test "$lt_cv_ld_force_load" = "no"; then
       _lt_dsymutil='~$DSYMUTIL $lib || :'
     else
       _lt_dsymutil=
@@ -7355,7 +7901,7 @@
   CPP=
 fi
 if test -z "$CPP"; then
-  if test "${ac_cv_prog_CPP+set}" = set; then :
+  if ${ac_cv_prog_CPP+:} false; then :
   $as_echo_n "(cached) " >&6
 else
       # Double quotes because CPP needs to be expanded
@@ -7471,7 +8017,7 @@
   { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "C preprocessor \"$CPP\" fails sanity check
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 fi
 
 ac_ext=c
@@ -7483,7 +8029,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ANSI C header files" >&5
 $as_echo_n "checking for ANSI C header files... " >&6; }
-if test "${ac_cv_header_stdc+set}" = set; then :
+if ${ac_cv_header_stdc+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
@@ -7585,569 +8131,55 @@
 
 fi
 fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
-$as_echo "$ac_cv_header_stdc" >&6; }
-if test $ac_cv_header_stdc = yes; then
-
-$as_echo "#define STDC_HEADERS 1" >>confdefs.h
-
-fi
-
-# On IRIX 5.3, sys/types and inttypes.h are conflicting.
-for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
-		  inttypes.h stdint.h unistd.h
-do :
-  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
-ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
-"
-if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
-  cat >>confdefs.h <<_ACEOF
-#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
-_ACEOF
-
-fi
-
-done
-
-
-for ac_header in dlfcn.h
-do :
-  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
-"
-if test "x$ac_cv_header_dlfcn_h" = x""yes; then :
-  cat >>confdefs.h <<_ACEOF
-#define HAVE_DLFCN_H 1
-_ACEOF
-
-fi
-
-done
-
-
-
-ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-if test -z "$CXX"; then
-  if test -n "$CCC"; then
-    CXX=$CCC
-  else
-    if test -n "$ac_tool_prefix"; then
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-  do
-    # Extract the first word of "$ac_tool_prefix$ac_prog", so it can be a program name with args.
-set dummy $ac_tool_prefix$ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$CXX"; then
-  ac_cv_prog_CXX="$CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_CXX="$ac_tool_prefix$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-CXX=$ac_cv_prog_CXX
-if test -n "$CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXX" >&5
-$as_echo "$CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-    test -n "$CXX" && break
-  done
-fi
-if test -z "$CXX"; then
-  ac_ct_CXX=$CXX
-  for ac_prog in g++ c++ gpp aCC CC cxx cc++ cl.exe FCC KCC RCC xlC_r xlC
-do
-  # Extract the first word of "$ac_prog", so it can be a program name with args.
-set dummy $ac_prog; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_prog_ac_ct_CXX+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -n "$ac_ct_CXX"; then
-  ac_cv_prog_ac_ct_CXX="$ac_ct_CXX" # Let the user override the test.
-else
-as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
-  IFS=$as_save_IFS
-  test -z "$as_dir" && as_dir=.
-    for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
-    ac_cv_prog_ac_ct_CXX="$ac_prog"
-    $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
-    break 2
-  fi
-done
-  done
-IFS=$as_save_IFS
-
-fi
-fi
-ac_ct_CXX=$ac_cv_prog_ac_ct_CXX
-if test -n "$ac_ct_CXX"; then
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_CXX" >&5
-$as_echo "$ac_ct_CXX" >&6; }
-else
-  { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
-  test -n "$ac_ct_CXX" && break
-done
-
-  if test "x$ac_ct_CXX" = x; then
-    CXX="g++"
-  else
-    case $cross_compiling:$ac_tool_warned in
-yes:)
-{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5
-$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;}
-ac_tool_warned=yes ;;
-esac
-    CXX=$ac_ct_CXX
-  fi
-fi
-
-  fi
-fi
-# Provide some information about the compiler.
-$as_echo "$as_me:${as_lineno-$LINENO}: checking for C++ compiler version" >&5
-set X $ac_compile
-ac_compiler=$2
-for ac_option in --version -v -V -qversion; do
-  { { ac_try="$ac_compiler $ac_option >&5"
-case "(($ac_try" in
-  *\"* | *\`* | *\\*) ac_try_echo=\$ac_try;;
-  *) ac_try_echo=$ac_try;;
-esac
-eval ac_try_echo="\"\$as_me:${as_lineno-$LINENO}: $ac_try_echo\""
-$as_echo "$ac_try_echo"; } >&5
-  (eval "$ac_compiler $ac_option >&5") 2>conftest.err
-  ac_status=$?
-  if test -s conftest.err; then
-    sed '10a\
-... rest of stderr output deleted ...
-         10q' conftest.err >conftest.er1
-    cat conftest.er1 >&5
-  fi
-  rm -f conftest.er1 conftest.err
-  $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
-  test $ac_status = 0; }
-done
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether we are using the GNU C++ compiler" >&5
-$as_echo_n "checking whether we are using the GNU C++ compiler... " >&6; }
-if test "${ac_cv_cxx_compiler_gnu+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-#ifndef __GNUC__
-       choke me
-#endif
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_compiler_gnu=yes
-else
-  ac_compiler_gnu=no
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-ac_cv_cxx_compiler_gnu=$ac_compiler_gnu
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_cxx_compiler_gnu" >&5
-$as_echo "$ac_cv_cxx_compiler_gnu" >&6; }
-if test $ac_compiler_gnu = yes; then
-  GXX=yes
-else
-  GXX=
-fi
-ac_test_CXXFLAGS=${CXXFLAGS+set}
-ac_save_CXXFLAGS=$CXXFLAGS
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether $CXX accepts -g" >&5
-$as_echo_n "checking whether $CXX accepts -g... " >&6; }
-if test "${ac_cv_prog_cxx_g+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  ac_save_cxx_werror_flag=$ac_cxx_werror_flag
-   ac_cxx_werror_flag=yes
-   ac_cv_prog_cxx_g=no
-   CXXFLAGS="-g"
-   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-else
-  CXXFLAGS=""
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-
-else
-  ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-	 CXXFLAGS="-g"
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-
-int
-main ()
-{
-
-  ;
-  return 0;
-}
-_ACEOF
-if ac_fn_cxx_try_compile "$LINENO"; then :
-  ac_cv_prog_cxx_g=yes
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-   ac_cxx_werror_flag=$ac_save_cxx_werror_flag
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_prog_cxx_g" >&5
-$as_echo "$ac_cv_prog_cxx_g" >&6; }
-if test "$ac_test_CXXFLAGS" = set; then
-  CXXFLAGS=$ac_save_CXXFLAGS
-elif test $ac_cv_prog_cxx_g = yes; then
-  if test "$GXX" = yes; then
-    CXXFLAGS="-g -O2"
-  else
-    CXXFLAGS="-g"
-  fi
-else
-  if test "$GXX" = yes; then
-    CXXFLAGS="-O2"
-  else
-    CXXFLAGS=
-  fi
-fi
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
-
-depcc="$CXX"  am_compiler_list=
-
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking dependency style of $depcc" >&5
-$as_echo_n "checking dependency style of $depcc... " >&6; }
-if test "${am_cv_CXX_dependencies_compiler_type+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-  if test -z "$AMDEP_TRUE" && test -f "$am_depcomp"; then
-  # We make a subdir and do the tests there.  Otherwise we can end up
-  # making bogus files that we don't know about and never remove.  For
-  # instance it was reported that on HP-UX the gcc test will end up
-  # making a dummy file named `D' -- because `-MD' means `put the output
-  # in D'.
-  mkdir conftest.dir
-  # Copy depcomp to subdir because otherwise we won't find it if we're
-  # using a relative directory.
-  cp "$am_depcomp" conftest.dir
-  cd conftest.dir
-  # We will build objects and dependencies in a subdirectory because
-  # it helps to detect inapplicable dependency modes.  For instance
-  # both Tru64's cc and ICC support -MD to output dependencies as a
-  # side effect of compilation, but ICC will put the dependencies in
-  # the current directory while Tru64 will put them in the object
-  # directory.
-  mkdir sub
-
-  am_cv_CXX_dependencies_compiler_type=none
-  if test "$am_compiler_list" = ""; then
-     am_compiler_list=`sed -n 's/^#*\([a-zA-Z0-9]*\))$/\1/p' < ./depcomp`
-  fi
-  am__universal=false
-  case " $depcc " in #(
-     *\ -arch\ *\ -arch\ *) am__universal=true ;;
-     esac
-
-  for depmode in $am_compiler_list; do
-    # Setup a source with many dependencies, because some compilers
-    # like to wrap large dependency lists on column 80 (with \), and
-    # we should not choose a depcomp mode which is confused by this.
-    #
-    # We need to recreate these files for each test, as the compiler may
-    # overwrite some of them when testing with obscure command lines.
-    # This happens at least with the AIX C compiler.
-    : > sub/conftest.c
-    for i in 1 2 3 4 5 6; do
-      echo '#include "conftst'$i'.h"' >> sub/conftest.c
-      # Using `: > sub/conftst$i.h' creates only sub/conftst1.h with
-      # Solaris 8's {/usr,}/bin/sh.
-      touch sub/conftst$i.h
-    done
-    echo "${am__include} ${am__quote}sub/conftest.Po${am__quote}" > confmf
-
-    # We check with `-c' and `-o' for the sake of the "dashmstdout"
-    # mode.  It turns out that the SunPro C++ compiler does not properly
-    # handle `-M -o', and we need to detect this.  Also, some Intel
-    # versions had trouble with output in subdirs
-    am__obj=sub/conftest.${OBJEXT-o}
-    am__minus_obj="-o $am__obj"
-    case $depmode in
-    gcc)
-      # This depmode causes a compiler race in universal mode.
-      test "$am__universal" = false || continue
-      ;;
-    nosideeffect)
-      # after this tag, mechanisms are not by side-effect, so they'll
-      # only be used when explicitly requested
-      if test "x$enable_dependency_tracking" = xyes; then
-	continue
-      else
-	break
-      fi
-      ;;
-    msvisualcpp | msvcmsys)
-      # This compiler won't grok `-c -o', but also, the minuso test has
-      # not run yet.  These depmodes are late enough in the game, and
-      # so weak that their functioning should not be impacted.
-      am__obj=conftest.${OBJEXT-o}
-      am__minus_obj=
-      ;;
-    none) break ;;
-    esac
-    if depmode=$depmode \
-       source=sub/conftest.c object=$am__obj \
-       depfile=sub/conftest.Po tmpdepfile=sub/conftest.TPo \
-       $SHELL ./depcomp $depcc -c $am__minus_obj sub/conftest.c \
-         >/dev/null 2>conftest.err &&
-       grep sub/conftst1.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep sub/conftst6.h sub/conftest.Po > /dev/null 2>&1 &&
-       grep $am__obj sub/conftest.Po > /dev/null 2>&1 &&
-       ${MAKE-make} -s -f confmf > /dev/null 2>&1; then
-      # icc doesn't choke on unknown options, it will just issue warnings
-      # or remarks (even with -Werror).  So we grep stderr for any message
-      # that says an option was ignored or not supported.
-      # When given -MP, icc 7.0 and 7.1 complain thusly:
-      #   icc: Command line warning: ignoring option '-M'; no argument required
-      # The diagnosis changed in icc 8.0:
-      #   icc: Command line remark: option '-MP' not supported
-      if (grep 'ignoring option' conftest.err ||
-          grep 'not supported' conftest.err) >/dev/null 2>&1; then :; else
-        am_cv_CXX_dependencies_compiler_type=$depmode
-        break
-      fi
-    fi
-  done
-
-  cd ..
-  rm -rf conftest.dir
-else
-  am_cv_CXX_dependencies_compiler_type=none
-fi
-
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $am_cv_CXX_dependencies_compiler_type" >&5
-$as_echo "$am_cv_CXX_dependencies_compiler_type" >&6; }
-CXXDEPMODE=depmode=$am_cv_CXX_dependencies_compiler_type
-
- if
-  test "x$enable_dependency_tracking" != xno \
-  && test "$am_cv_CXX_dependencies_compiler_type" = gcc3; then
-  am__fastdepCXX_TRUE=
-  am__fastdepCXX_FALSE='#'
-else
-  am__fastdepCXX_TRUE='#'
-  am__fastdepCXX_FALSE=
-fi
-
-
-if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
-    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
-    (test "X$CXX" != "Xg++"))) ; then
-  ac_ext=cpp
-ac_cpp='$CXXCPP $CPPFLAGS'
-ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
-$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
-if test -z "$CXXCPP"; then
-  if test "${ac_cv_prog_CXXCPP+set}" = set; then :
-  $as_echo_n "(cached) " >&6
-else
-      # Double quotes because CXXCPP needs to be expanded
-    for CXXCPP in "$CXX -E" "/lib/cpp"
-    do
-      ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-
-else
-  # Broken: fails on valid input.
-continue
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
-fi
-rm -f conftest.err conftest.i conftest.$ac_ext
-
-done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
-  break
-fi
-
-    done
-    ac_cv_prog_CXXCPP=$CXXCPP
-
-fi
-  CXXCPP=$ac_cv_prog_CXXCPP
-else
-  ac_cv_prog_CXXCPP=$CXXCPP
-fi
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
-$as_echo "$CXXCPP" >&6; }
-ac_preproc_ok=false
-for ac_cxx_preproc_warn_flag in '' yes
-do
-  # Use a header file that comes with gcc, so configuring glibc
-  # with a fresh cross-compiler works.
-  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
-  # <limits.h> exists even on freestanding compilers.
-  # On the NeXT, cc -E runs the code through the compiler's parser,
-  # not just through cpp. "Syntax error" is here to catch this case.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#ifdef __STDC__
-# include <limits.h>
-#else
-# include <assert.h>
-#endif
-		     Syntax error
-_ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_header_stdc" >&5
+$as_echo "$ac_cv_header_stdc" >&6; }
+if test $ac_cv_header_stdc = yes; then
+
+$as_echo "#define STDC_HEADERS 1" >>confdefs.h
 
-else
-  # Broken: fails on valid input.
-continue
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
-  # OK, works on sane cases.  Now check whether nonexistent headers
-  # can be detected and how.
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
-/* end confdefs.h.  */
-#include <ac_nonexistent.h>
+# On IRIX 5.3, sys/types and inttypes.h are conflicting.
+for ac_header in sys/types.h sys/stat.h stdlib.h string.h memory.h strings.h \
+		  inttypes.h stdint.h unistd.h
+do :
+  as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh`
+ac_fn_c_check_header_compile "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default
+"
+if eval test \"x\$"$as_ac_Header"\" = x"yes"; then :
+  cat >>confdefs.h <<_ACEOF
+#define `$as_echo "HAVE_$ac_header" | $as_tr_cpp` 1
 _ACEOF
-if ac_fn_cxx_try_cpp "$LINENO"; then :
-  # Broken: success on invalid input.
-continue
-else
-  # Passes both tests.
-ac_preproc_ok=:
-break
+
 fi
-rm -f conftest.err conftest.i conftest.$ac_ext
 
 done
-# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
-rm -f conftest.i conftest.err conftest.$ac_ext
-if $ac_preproc_ok; then :
 
-else
-  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
-$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
-_lt_caught_CXX_error=yes; }
-fi
 
-ac_ext=c
-ac_cpp='$CPP $CPPFLAGS'
-ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
-ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
-ac_compiler_gnu=$ac_cv_c_compiler_gnu
+for ac_header in dlfcn.h
+do :
+  ac_fn_c_check_header_compile "$LINENO" "dlfcn.h" "ac_cv_header_dlfcn_h" "$ac_includes_default
+"
+if test "x$ac_cv_header_dlfcn_h" = xyes; then :
+  cat >>confdefs.h <<_ACEOF
+#define HAVE_DLFCN_H 1
+_ACEOF
 
-else
-  _lt_caught_CXX_error=yes
 fi
 
+done
+
+
+
+
+func_stripname_cnf ()
+{
+  case ${2} in
+  .*) func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%\\\\${2}\$%%"`;;
+  *)  func_stripname_result=`$ECHO "${3}" | $SED "s%^${1}%%; s%${2}\$%%"`;;
+  esac
+} # func_stripname_cnf
+
 
 
 
@@ -8227,7 +8259,22 @@
 
 # Check whether --with-pic was given.
 if test "${with_pic+set}" = set; then :
-  withval=$with_pic; pic_mode="$withval"
+  withval=$with_pic; lt_p=${PACKAGE-default}
+    case $withval in
+    yes|no) pic_mode=$withval ;;
+    *)
+      pic_mode=default
+      # Look at the argument we got.  We use all the common list separators.
+      lt_save_ifs="$IFS"; IFS="${IFS}$PATH_SEPARATOR,"
+      for lt_pkg in $withval; do
+	IFS="$lt_save_ifs"
+	if test "X$lt_pkg" = "X$lt_p"; then
+	  pic_mode=yes
+	fi
+      done
+      IFS="$lt_save_ifs"
+      ;;
+    esac
 else
   pic_mode=default
 fi
@@ -8304,6 +8351,11 @@
 
 
 
+
+
+
+
+
 test -z "$LN_S" && LN_S="ln -s"
 
 
@@ -8325,7 +8377,7 @@
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for objdir" >&5
 $as_echo_n "checking for objdir... " >&6; }
-if test "${lt_cv_objdir+set}" = set; then :
+if ${lt_cv_objdir+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   rm -f .libs 2>/dev/null
@@ -8353,19 +8405,6 @@
 
 
 
-
-
-
-
-
-
-
-
-
-
-
-
-
 case $host_os in
 aix3*)
   # AIX sometimes has problems with the GCC collect2 program.  For some
@@ -8378,23 +8417,6 @@
   ;;
 esac
 
-# Sed substitution that helps us do robust quoting.  It backslashifies
-# metacharacters that are still active within double-quoted strings.
-sed_quote_subst='s/\(["`$\\]\)/\\\1/g'
-
-# Same as above, but do not quote variable references.
-double_quote_subst='s/\(["`\\]\)/\\\1/g'
-
-# Sed substitution to delay expansion of an escaped shell variable in a
-# double_quote_subst'ed string.
-delay_variable_subst='s/\\\\\\\\\\\$/\\\\\\$/g'
-
-# Sed substitution to delay expansion of an escaped single quote.
-delay_single_quote_subst='s/'\''/'\'\\\\\\\'\''/g'
-
-# Sed substitution to avoid accidental globbing in evaled expressions
-no_glob_subst='s/\*/\\\*/g'
-
 # Global variables:
 ofile=libtool
 can_build_shared=yes
@@ -8423,7 +8445,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
 # Only perform the check for file, if the check method requires it
@@ -8433,7 +8455,7 @@
   if test "$file_magic_cmd" = '$MAGIC_CMD'; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for ${ac_tool_prefix}file" >&5
 $as_echo_n "checking for ${ac_tool_prefix}file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8499,7 +8521,7 @@
   if test -n "$ac_tool_prefix"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for file" >&5
 $as_echo_n "checking for file... " >&6; }
-if test "${lt_cv_path_MAGIC_CMD+set}" = set; then :
+if ${lt_cv_path_MAGIC_CMD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $MAGIC_CMD in
@@ -8628,11 +8650,16 @@
 lt_prog_compiler_no_builtin_flag=
 
 if test "$GCC" = yes; then
-  lt_prog_compiler_no_builtin_flag=' -fno-builtin'
+  case $cc_basename in
+  nvcc*)
+    lt_prog_compiler_no_builtin_flag=' -Xcompiler -fno-builtin' ;;
+  *)
+    lt_prog_compiler_no_builtin_flag=' -fno-builtin' ;;
+  esac
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -fno-rtti -fno-exceptions" >&5
 $as_echo_n "checking if $compiler supports -fno-rtti -fno-exceptions... " >&6; }
-if test "${lt_cv_prog_compiler_rtti_exceptions+set}" = set; then :
+if ${lt_cv_prog_compiler_rtti_exceptions+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_rtti_exceptions=no
@@ -8648,15 +8675,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8651: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8655: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_rtti_exceptions=yes
@@ -8685,8 +8712,6 @@
 lt_prog_compiler_pic=
 lt_prog_compiler_static=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   if test "$GCC" = yes; then
     lt_prog_compiler_wl='-Wl,'
@@ -8734,6 +8759,12 @@
       lt_prog_compiler_pic='-fno-common'
       ;;
 
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static=
+      ;;
+
     hpux*)
       # PIC is the default for 64-bit PA HP-UX, but not for 32-bit
       # PA HP-UX.  On IA64 HP-UX, PIC is the default but the pic flag
@@ -8776,6 +8807,15 @@
       lt_prog_compiler_pic='-fPIC'
       ;;
     esac
+
+    case $cc_basename in
+    nvcc*) # Cuda Compiler Driver 2.2
+      lt_prog_compiler_wl='-Xlinker '
+      if test -n "$lt_prog_compiler_pic"; then
+        lt_prog_compiler_pic="-Xcompiler $lt_prog_compiler_pic"
+      fi
+      ;;
+    esac
   else
     # PORTME Check for flag to pass linker flags through the system compiler.
     case $host_os in
@@ -8817,7 +8857,7 @@
       lt_prog_compiler_static='-non_shared'
       ;;
 
-    linux* | k*bsd*-gnu | kopensolaris*-gnu)
+    linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
       case $cc_basename in
       # old Intel for x86_64 which still supported -KPIC.
       ecc*)
@@ -8838,7 +8878,13 @@
 	lt_prog_compiler_pic='--shared'
 	lt_prog_compiler_static='--static'
 	;;
-      pgcc* | pgf77* | pgf90* | pgf95*)
+      nagfor*)
+	# NAG Fortran compiler
+	lt_prog_compiler_wl='-Wl,-Wl,,'
+	lt_prog_compiler_pic='-PIC'
+	lt_prog_compiler_static='-Bstatic'
+	;;
+      pgcc* | pgf77* | pgf90* | pgf95* | pgfortran*)
         # Portland Group compilers (*not* the Pentium gcc compiler,
 	# which looks to be a dead project)
 	lt_prog_compiler_wl='-Wl,'
@@ -8850,25 +8896,40 @@
         # All Alpha code is PIC.
         lt_prog_compiler_static='-non_shared'
         ;;
-      xl*)
-	# IBM XL C 8.0/Fortran 10.1 on PPC
+      xl* | bgxl* | bgf* | mpixl*)
+	# IBM XL C 8.0/Fortran 10.1, 11.1 on PPC and BlueGene
 	lt_prog_compiler_wl='-Wl,'
 	lt_prog_compiler_pic='-qpic'
 	lt_prog_compiler_static='-qstaticlink'
 	;;
       *)
 	case `$CC -V 2>&1 | sed 5q` in
+	*Sun\ Ceres\ Fortran* | *Sun*Fortran*\ [1-7].* | *Sun*Fortran*\ 8.[0-3]*)
+	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl=''
+	  ;;
+	*Sun\ F* | *Sun*Fortran*)
+	  lt_prog_compiler_pic='-KPIC'
+	  lt_prog_compiler_static='-Bstatic'
+	  lt_prog_compiler_wl='-Qoption ld '
+	  ;;
 	*Sun\ C*)
 	  # Sun C 5.9
 	  lt_prog_compiler_pic='-KPIC'
 	  lt_prog_compiler_static='-Bstatic'
 	  lt_prog_compiler_wl='-Wl,'
 	  ;;
-	*Sun\ F*)
-	  # Sun Fortran 8.3 passes all unrecognized flags to the linker
-	  lt_prog_compiler_pic='-KPIC'
+        *Intel*\ [CF]*Compiler*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fPIC'
+	  lt_prog_compiler_static='-static'
+	  ;;
+	*Portland\ Group*)
+	  lt_prog_compiler_wl='-Wl,'
+	  lt_prog_compiler_pic='-fpic'
 	  lt_prog_compiler_static='-Bstatic'
-	  lt_prog_compiler_wl=''
 	  ;;
 	esac
 	;;
@@ -8900,7 +8961,7 @@
       lt_prog_compiler_pic='-KPIC'
       lt_prog_compiler_static='-Bstatic'
       case $cc_basename in
-      f77* | f90* | f95*)
+      f77* | f90* | f95* | sunf77* | sunf90* | sunf95*)
 	lt_prog_compiler_wl='-Qoption ld ';;
       *)
 	lt_prog_compiler_wl='-Wl,';;
@@ -8957,13 +9018,17 @@
     lt_prog_compiler_pic="$lt_prog_compiler_pic -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic" >&5
-$as_echo "$lt_prog_compiler_pic" >&6; }
-
-
-
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic=$lt_prog_compiler_pic
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic" >&5
+$as_echo "$lt_cv_prog_compiler_pic" >&6; }
+lt_prog_compiler_pic=$lt_cv_prog_compiler_pic
 
 #
 # Check to make sure the PIC flag actually works.
@@ -8971,7 +9036,7 @@
 if test -n "$lt_prog_compiler_pic"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works=no
@@ -8987,15 +9052,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:8990: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:8994: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works=yes
@@ -9024,13 +9089,18 @@
 
 
 
+
+
+
+
+
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl eval lt_tmp_static_flag=\"$lt_prog_compiler_static\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works=no
@@ -9043,7 +9113,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works=yes
@@ -9073,7 +9143,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9092,16 +9162,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9095: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9099: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9128,7 +9198,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o=no
@@ -9147,16 +9217,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:9150: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:9154: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o=yes
@@ -9222,7 +9292,6 @@
   hardcode_direct=no
   hardcode_direct_absolute=no
   hardcode_libdir_flag_spec=
-  hardcode_libdir_flag_spec_ld=
   hardcode_libdir_separator=
   hardcode_minus_L=no
   hardcode_shlibpath_var=unsupported
@@ -9266,13 +9335,39 @@
   openbsd*)
     with_gnu_ld=no
     ;;
-  linux* | k*bsd*-gnu)
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs=no
     ;;
   esac
 
   ld_shlibs=yes
+
+  # On some targets, GNU ld is compatible enough with the native linker
+  # that we're better off using the native interface for both.
+  lt_use_gnu_ld_interface=no
   if test "$with_gnu_ld" = yes; then
+    case $host_os in
+      aix*)
+	# The AIX port of GNU ld has always aspired to compatibility
+	# with the native linker.  However, as the warning in the GNU ld
+	# block says, versions before 2.19.5* couldn't really create working
+	# shared libraries, regardless of the interface used.
+	case `$LD -v 2>&1` in
+	  *\ \(GNU\ Binutils\)\ 2.19.5*) ;;
+	  *\ \(GNU\ Binutils\)\ 2.[2-9]*) ;;
+	  *\ \(GNU\ Binutils\)\ [3-9]*) ;;
+	  *)
+	    lt_use_gnu_ld_interface=yes
+	    ;;
+	esac
+	;;
+      *)
+	lt_use_gnu_ld_interface=yes
+	;;
+    esac
+  fi
+
+  if test "$lt_use_gnu_ld_interface" = yes; then
     # If archive_cmds runs LD, not CC, wlarc should be empty
     wlarc='${wl}'
 
@@ -9306,11 +9401,12 @@
 	ld_shlibs=no
 	cat <<_LT_EOF 1>&2
 
-*** Warning: the GNU linker, at least up to release 2.9.1, is reported
+*** Warning: the GNU linker, at least up to release 2.19, is reported
 *** to be unable to reliably create shared libraries on AIX.
 *** Therefore, libtool is disabling shared libraries support.  If you
-*** really care for shared libraries, you may want to modify your PATH
-*** so that a non-GNU linker is found, and then restart.
+*** really care for shared libraries, you may want to install binutils
+*** 2.20 or above, or modify your PATH so that a non-GNU linker is found.
+*** You will then need to restart the configuration process.
 
 _LT_EOF
       fi
@@ -9346,10 +9442,12 @@
       # _LT_TAGVAR(hardcode_libdir_flag_spec, ) is actually meaningless,
       # as there is no search path for DLLs.
       hardcode_libdir_flag_spec='-L$libdir'
+      export_dynamic_flag_spec='${wl}--export-all-symbols'
       allow_undefined_flag=unsupported
       always_export_symbols=no
       enable_shared_with_static_runtimes=yes
-      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+      export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
 
       if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
         archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
@@ -9367,6 +9465,11 @@
       fi
       ;;
 
+    haiku*)
+      archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+      link_all_deplibs=yes
+      ;;
+
     interix[3-9]*)
       hardcode_direct=no
       hardcode_shlibpath_var=no
@@ -9392,15 +9495,16 @@
       if $LD --help 2>&1 | $EGREP ': supported targets:.* elf' > /dev/null \
 	 && test "$tmp_diet" = no
       then
-	tmp_addflag=
+	tmp_addflag=' $pic_flag'
 	tmp_sharedflag='-shared'
 	case $cc_basename,$host_cpu in
         pgcc*)				# Portland Group C compiler
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag'
 	  ;;
-	pgf77* | pgf90* | pgf95*)	# Portland Group f77 and f90 compilers
-	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	pgf77* | pgf90* | pgf95* | pgfortran*)
+					# Portland Group f77 and f90 compilers
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  tmp_addflag=' $pic_flag -Mnomain' ;;
 	ecc*,ia64* | icc*,ia64*)	# Intel C compiler on ia64
 	  tmp_addflag=' -i_dynamic' ;;
@@ -9411,13 +9515,17 @@
 	lf95*)				# Lahey Fortran 8.1
 	  whole_archive_flag_spec=
 	  tmp_sharedflag='--shared' ;;
-	xl[cC]*)			# IBM XL C 8.0 on PPC (deal with xlf below)
+	xl[cC]* | bgxl[cC]* | mpixl[cC]*) # IBM XL C 8.0 on PPC (deal with xlf below)
 	  tmp_sharedflag='-qmkshrobj'
 	  tmp_addflag= ;;
+	nvcc*)	# Cuda Compiler Driver 2.2
+	  whole_archive_flag_spec='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
+	  compiler_needs_object=yes
+	  ;;
 	esac
 	case `$CC -V 2>&1 | sed 5q` in
 	*Sun\ C*)			# Sun C 5.9
-	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	  whole_archive_flag_spec='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	  compiler_needs_object=yes
 	  tmp_sharedflag='-G' ;;
 	*Sun\ F*)			# Sun Fortran 8.3
@@ -9433,17 +9541,16 @@
         fi
 
 	case $cc_basename in
-	xlf*)
+	xlf* | bgf* | bgxlf* | mpixlf*)
 	  # IBM XL Fortran 10.1 on PPC cannot create shared libs itself
 	  whole_archive_flag_spec='--whole-archive$convenience --no-whole-archive'
-	  hardcode_libdir_flag_spec=
-	  hardcode_libdir_flag_spec_ld='-rpath $libdir'
-	  archive_cmds='$LD -shared $libobjs $deplibs $compiler_flags -soname $soname -o $lib'
+	  hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
+	  archive_cmds='$LD -shared $libobjs $deplibs $linker_flags -soname $soname -o $lib'
 	  if test "x$supports_anon_versioning" = xyes; then
 	    archive_expsym_cmds='echo "{ global:" > $output_objdir/$libname.ver~
 	      cat $export_symbols | sed -e "s/\(.*\)/\1;/" >> $output_objdir/$libname.ver~
 	      echo "local: *; };" >> $output_objdir/$libname.ver~
-	      $LD -shared $libobjs $deplibs $compiler_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
+	      $LD -shared $libobjs $deplibs $linker_flags -soname $soname -version-script $output_objdir/$libname.ver -o $lib'
 	  fi
 	  ;;
 	esac
@@ -9457,8 +9564,8 @@
 	archive_cmds='$LD -Bshareable $libobjs $deplibs $linker_flags -o $lib'
 	wlarc=
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       fi
       ;;
 
@@ -9476,8 +9583,8 @@
 
 _LT_EOF
       elif $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9523,8 +9630,8 @@
 
     *)
       if $LD --help 2>&1 | $GREP ': supported targets:.* elf' > /dev/null; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+	archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
       else
 	ld_shlibs=no
       fi
@@ -9564,8 +9671,10 @@
       else
 	# If we're using GNU nm, then we don't want the "-C" option.
 	# -C means demangle to AIX nm, but means don't demangle with GNU nm
+	# Also, AIX nm treats weak defined symbols like other global
+	# defined symbols, whereas GNU nm marks them as "W".
 	if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+	  export_symbols_cmds='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	else
 	  export_symbols_cmds='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
 	fi
@@ -9653,7 +9762,13 @@
 	allow_undefined_flag='-berok'
         # Determine the default libpath from the value encoded in an
         # empty executable.
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+        if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9666,25 +9781,32 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
         hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
-        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+        archive_expsym_cmds='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
       else
 	if test "$host_cpu" = ia64; then
 	  hardcode_libdir_flag_spec='${wl}-R $libdir:/usr/lib:/lib'
@@ -9693,7 +9815,13 @@
 	else
 	 # Determine the default libpath from the value encoded in an
 	 # empty executable.
-	 cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	 if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath_+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -9706,30 +9834,42 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath_=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath_"; then
+    lt_cv_aix_libpath_="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath_
+fi
 
 	 hardcode_libdir_flag_spec='${wl}-blibpath:$libdir:'"$aix_libpath"
 	  # Warning - without using the other run time loading flags,
 	  # -berok will link without error, but may produce a broken library.
 	  no_undefined_flag=' ${wl}-bernotok'
 	  allow_undefined_flag=' ${wl}-berok'
-	  # Exported symbols can be pulled into shared objects from archives
-	  whole_archive_flag_spec='$convenience'
+	  if test "$with_gnu_ld" = yes; then
+	    # We only use this code for GNU lds that support --whole-archive.
+	    whole_archive_flag_spec='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	  else
+	    # Exported symbols can be pulled into shared objects from archives
+	    whole_archive_flag_spec='$convenience'
+	  fi
 	  archive_cmds_need_lc=yes
 	  # This is similar to how AIX traditionally builds its shared libraries.
 	  archive_expsym_cmds="\$CC $shared_flag"' -o $output_objdir/$soname $libobjs $deplibs ${wl}-bnoentry $compiler_flags ${wl}-bE:$export_symbols${allow_undefined_flag}~$AR $AR_FLAGS $output_objdir/$libname$release.a $output_objdir/$soname'
@@ -9761,20 +9901,64 @@
       # Microsoft Visual C++.
       # hardcode_libdir_flag_spec is actually meaningless, as there is
       # no search path for DLLs.
-      hardcode_libdir_flag_spec=' '
-      allow_undefined_flag=unsupported
-      # Tell ltmain to make .lib files, not .a files.
-      libext=lib
-      # Tell ltmain to make .dll files, not .so files.
-      shrext_cmds=".dll"
-      # FIXME: Setting linknames here is a bad hack.
-      archive_cmds='$CC -o $lib $libobjs $compiler_flags `$ECHO "X$deplibs" | $Xsed -e '\''s/ -lc$//'\''` -link -dll~linknames='
-      # The linker will automatically build a .lib file if we build a DLL.
-      old_archive_from_new_cmds='true'
-      # FIXME: Should let the user specify the lib program.
-      old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
-      fix_srcfile_path='`cygpath -w "$srcfile"`'
-      enable_shared_with_static_runtimes=yes
+      case $cc_basename in
+      cl*)
+	# Native MSVC
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	always_export_symbols=yes
+	file_list_spec='@'
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	archive_expsym_cmds='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	    sed -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	  else
+	    sed -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	  fi~
+	  $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	  linknames='
+	# The linker will not automatically build a static lib if we build a DLL.
+	# _LT_TAGVAR(old_archive_from_new_cmds, )='true'
+	enable_shared_with_static_runtimes=yes
+	exclude_expsyms='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+	export_symbols_cmds='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1,DATA/'\'' | $SED -e '\''/^[AITW][ ]/s/.*[ ]//'\'' | sort | uniq > $export_symbols'
+	# Don't use ranlib
+	old_postinstall_cmds='chmod 644 $oldlib'
+	postlink_cmds='lt_outputfile="@OUTPUT@"~
+	  lt_tool_outputfile="@TOOL_OUTPUT@"~
+	  case $lt_outputfile in
+	    *.exe|*.EXE) ;;
+	    *)
+	      lt_outputfile="$lt_outputfile.exe"
+	      lt_tool_outputfile="$lt_tool_outputfile.exe"
+	      ;;
+	  esac~
+	  if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	    $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	    $RM "$lt_outputfile.manifest";
+	  fi'
+	;;
+      *)
+	# Assume MSVC wrapper
+	hardcode_libdir_flag_spec=' '
+	allow_undefined_flag=unsupported
+	# Tell ltmain to make .lib files, not .a files.
+	libext=lib
+	# Tell ltmain to make .dll files, not .so files.
+	shrext_cmds=".dll"
+	# FIXME: Setting linknames here is a bad hack.
+	archive_cmds='$CC -o $lib $libobjs $compiler_flags `func_echo_all "$deplibs" | $SED '\''s/ -lc$//'\''` -link -dll~linknames='
+	# The linker will automatically build a .lib file if we build a DLL.
+	old_archive_from_new_cmds='true'
+	# FIXME: Should let the user specify the lib program.
+	old_archive_cmds='lib -OUT:$oldlib$oldobjs$old_deplibs'
+	enable_shared_with_static_runtimes=yes
+	;;
+      esac
       ;;
 
     darwin* | rhapsody*)
@@ -9784,7 +9968,12 @@
   hardcode_direct=no
   hardcode_automatic=yes
   hardcode_shlibpath_var=unsupported
-  whole_archive_flag_spec=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec=''
+  fi
   link_all_deplibs=yes
   allow_undefined_flag="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -9792,7 +9981,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     archive_cmds="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -9810,10 +9999,6 @@
       hardcode_shlibpath_var=no
       ;;
 
-    freebsd1*)
-      ld_shlibs=no
-      ;;
-
     # FreeBSD 2.2.[012] allows us to include c++rt0.o to get C++ constructor
     # support.  Future versions do this automatically, but an explicit c++rt0.o
     # does not break anything, and helps significantly (at the cost of a little
@@ -9826,7 +10011,7 @@
       ;;
 
     # Unfortunately, older versions of FreeBSD 2 do not have this feature.
-    freebsd2*)
+    freebsd2.*)
       archive_cmds='$LD -Bshareable -o $lib $libobjs $deplibs $linker_flags'
       hardcode_direct=yes
       hardcode_minus_L=yes
@@ -9835,7 +10020,7 @@
 
     # FreeBSD 3 and greater uses gcc -shared to do shared libraries.
     freebsd* | dragonfly*)
-      archive_cmds='$CC -shared -o $lib $libobjs $deplibs $compiler_flags'
+      archive_cmds='$CC -shared $pic_flag -o $lib $libobjs $deplibs $compiler_flags'
       hardcode_libdir_flag_spec='-R$libdir'
       hardcode_direct=yes
       hardcode_shlibpath_var=no
@@ -9843,7 +10028,7 @@
 
     hpux9*)
       if test "$GCC" = yes; then
-	archive_cmds='$RM $output_objdir/$soname~$CC -shared -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+	archive_cmds='$RM $output_objdir/$soname~$CC -shared $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $libobjs $deplibs $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       else
 	archive_cmds='$RM $output_objdir/$soname~$LD -b +b $install_libdir -o $output_objdir/$soname $libobjs $deplibs $linker_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
       fi
@@ -9858,14 +10043,13 @@
       ;;
 
     hpux10*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
       else
 	archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
       fi
       if test "$with_gnu_ld" = no; then
 	hardcode_libdir_flag_spec='${wl}+b ${wl}$libdir'
-	hardcode_libdir_flag_spec_ld='+b $libdir'
 	hardcode_libdir_separator=:
 	hardcode_direct=yes
 	hardcode_direct_absolute=yes
@@ -9876,29 +10060,68 @@
       fi
       ;;
 
-    hpux11*)
-      if test "$GCC" = yes -a "$with_gnu_ld" = no; then
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -shared -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	esac
-      else
-	case $host_cpu in
-	hppa*64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	ia64*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
-	  ;;
-	*)
-	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+    hpux11*)
+      if test "$GCC" = yes && test "$with_gnu_ld" = no; then
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -shared ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+	  archive_cmds='$CC -shared $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	esac
+      else
+	case $host_cpu in
+	hppa*64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	ia64*)
+	  archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $libobjs $deplibs $compiler_flags'
+	  ;;
+	*)
+
+	  # Older versions of the 11.00 compiler do not understand -b yet
+	  # (HP92453-01 A.11.01.20 doesn't, HP92453-01 B.11.X.35175-35176.GP does)
+	  { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $CC understands -b" >&5
+$as_echo_n "checking if $CC understands -b... " >&6; }
+if ${lt_cv_prog_compiler__b+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler__b=no
+   save_LDFLAGS="$LDFLAGS"
+   LDFLAGS="$LDFLAGS -b"
+   echo "$lt_simple_link_test_code" > conftest.$ac_ext
+   if (eval $ac_link 2>conftest.err) && test -s conftest$ac_exeext; then
+     # The linker can only warn and ignore the option if not recognized
+     # So say no if there are warnings
+     if test -s conftest.err; then
+       # Append any errors to the config.log.
+       cat conftest.err 1>&5
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
+       $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
+       if diff conftest.exp conftest.er2 >/dev/null; then
+         lt_cv_prog_compiler__b=yes
+       fi
+     else
+       lt_cv_prog_compiler__b=yes
+     fi
+   fi
+   $RM -r conftest*
+   LDFLAGS="$save_LDFLAGS"
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler__b" >&5
+$as_echo "$lt_cv_prog_compiler__b" >&6; }
+
+if test x"$lt_cv_prog_compiler__b" = xyes; then
+    archive_cmds='$CC -b ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $libobjs $deplibs $compiler_flags'
+else
+    archive_cmds='$LD -b +h $soname +b $install_libdir -o $lib $libobjs $deplibs $linker_flags'
+fi
+
 	  ;;
 	esac
       fi
@@ -9926,26 +10149,39 @@
 
     irix5* | irix6* | nonstopux*)
       if test "$GCC" = yes; then
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	# Try to use the -exported_symbol ld option, if it does not
 	# work, assume that -exports_file does not work either and
 	# implicitly export all symbols.
-        save_LDFLAGS="$LDFLAGS"
-        LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
-        cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	# This should be the same for all languages, so no per-tag cache variable.
+	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking whether the $host_os linker accepts -exported_symbol" >&5
+$as_echo_n "checking whether the $host_os linker accepts -exported_symbol... " >&6; }
+if ${lt_cv_irix_exported_symbol+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  save_LDFLAGS="$LDFLAGS"
+	   LDFLAGS="$LDFLAGS -shared ${wl}-exported_symbol ${wl}foo ${wl}-update_registry ${wl}/dev/null"
+	   cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
-int foo(void) {}
+int foo (void) { return 0; }
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
-  archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
-
+  lt_cv_irix_exported_symbol=yes
+else
+  lt_cv_irix_exported_symbol=no
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-        LDFLAGS="$save_LDFLAGS"
+           LDFLAGS="$save_LDFLAGS"
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_irix_exported_symbol" >&5
+$as_echo "$lt_cv_irix_exported_symbol" >&6; }
+	if test "$lt_cv_irix_exported_symbol" = yes; then
+          archive_expsym_cmds='$CC -shared $pic_flag $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations ${wl}-exports_file ${wl}$export_symbols -o $lib'
+	fi
       else
-	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
-	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
+	archive_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_expsym_cmds='$CC -shared $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -exports_file $export_symbols -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10007,17 +10243,17 @@
       hardcode_libdir_flag_spec='-L$libdir'
       hardcode_minus_L=yes
       allow_undefined_flag=unsupported
-      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~$ECHO DATA >> $output_objdir/$libname.def~$ECHO " SINGLE NONSHARED" >> $output_objdir/$libname.def~$ECHO EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
+      archive_cmds='$ECHO "LIBRARY $libname INITINSTANCE" > $output_objdir/$libname.def~$ECHO "DESCRIPTION \"$libname\"" >> $output_objdir/$libname.def~echo DATA >> $output_objdir/$libname.def~echo " SINGLE NONSHARED" >> $output_objdir/$libname.def~echo EXPORTS >> $output_objdir/$libname.def~emxexp $libobjs >> $output_objdir/$libname.def~$CC -Zdll -Zcrtdll -o $lib $libobjs $deplibs $compiler_flags $output_objdir/$libname.def'
       old_archive_from_new_cmds='emximp -o $output_objdir/$libname.a $output_objdir/$libname.def'
       ;;
 
     osf3*)
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
       fi
       archive_cmds_need_lc='no'
       hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
@@ -10027,13 +10263,13 @@
     osf4* | osf5*)	# as osf3* with the addition of -msym flag
       if test "$GCC" = yes; then
 	allow_undefined_flag=' ${wl}-expect_unresolved ${wl}\*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $pic_flag $libobjs $deplibs $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	hardcode_libdir_flag_spec='${wl}-rpath ${wl}$libdir'
       else
 	allow_undefined_flag=' -expect_unresolved \*'
-	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	archive_cmds='$CC -shared${allow_undefined_flag} $libobjs $deplibs $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	archive_expsym_cmds='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done; printf "%s\\n" "-hidden">> $lib.exp~
-	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
+	$CC -shared${allow_undefined_flag} ${wl}-input ${wl}$lib.exp $compiler_flags $libobjs $deplibs -soname $soname `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~$RM $lib.exp'
 
 	# Both c and cxx compiler support -rpath directly
 	hardcode_libdir_flag_spec='-rpath $libdir'
@@ -10046,9 +10282,9 @@
       no_undefined_flag=' -z defs'
       if test "$GCC" = yes; then
 	wlarc='${wl}'
-	archive_cmds='$CC -shared ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
+	archive_cmds='$CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags'
 	archive_expsym_cmds='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-	  $CC -shared ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
+	  $CC -shared $pic_flag ${wl}-z ${wl}text ${wl}-M ${wl}$lib.exp ${wl}-h ${wl}$soname -o $lib $libobjs $deplibs $compiler_flags~$RM $lib.exp'
       else
 	case `$CC -V 2>&1` in
 	*"Compilers 5.0"*)
@@ -10236,44 +10472,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl
-	pic_flag=$lt_prog_compiler_pic
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag
-        allow_undefined_flag=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl
+	  pic_flag=$lt_prog_compiler_pic
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag
+	  allow_undefined_flag=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc=no
-        else
-	  archive_cmds_need_lc=yes
-        fi
-        allow_undefined_flag=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc" >&5
-$as_echo "$archive_cmds_need_lc" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc=no
+	  else
+	    lt_cv_archive_cmds_need_lc=yes
+	  fi
+	  allow_undefined_flag=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc" >&6; }
+      archive_cmds_need_lc=$lt_cv_archive_cmds_need_lc
       ;;
     esac
   fi
@@ -10431,11 +10673,6 @@
 
 
 
-
-
-
-
-
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -10444,16 +10681,23 @@
     darwin*) lt_awk_arg="/^libraries:/,/LR/" ;;
     *) lt_awk_arg="/^libraries:/" ;;
   esac
-  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-  if $ECHO "$lt_search_path_spec" | $GREP ';' >/dev/null ; then
+  case $host_os in
+    mingw* | cegcc*) lt_sed_strip_eq="s,=\([A-Za-z]:\),\1,g" ;;
+    *) lt_sed_strip_eq="s,=/,/,g" ;;
+  esac
+  lt_search_path_spec=`$CC -print-search-dirs | awk $lt_awk_arg | $SED -e "s/^libraries://" -e $lt_sed_strip_eq`
+  case $lt_search_path_spec in
+  *\;*)
     # if the path contains ";" then we assume it to be the separator
     # otherwise default to the standard path separator (i.e. ":") - it is
     # assumed that no part of a normal pathname contains ";" but that should
     # okay in the real world where ";" in dirpaths is itself problematic.
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED -e 's/;/ /g'`
-  else
-    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-  fi
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED 's/;/ /g'`
+    ;;
+  *)
+    lt_search_path_spec=`$ECHO "$lt_search_path_spec" | $SED "s/$PATH_SEPARATOR/ /g"`
+    ;;
+  esac
   # Ok, now we have the path, separated by spaces, we can step through it
   # and add multilib dir if necessary.
   lt_tmp_lt_search_path_spec=
@@ -10466,7 +10710,7 @@
 	lt_tmp_lt_search_path_spec="$lt_tmp_lt_search_path_spec $lt_sys_path"
     fi
   done
-  lt_search_path_spec=`$ECHO $lt_tmp_lt_search_path_spec | awk '
+  lt_search_path_spec=`$ECHO "$lt_tmp_lt_search_path_spec" | awk '
 BEGIN {RS=" "; FS="/|\n";} {
   lt_foo="";
   lt_count=0;
@@ -10486,7 +10730,13 @@
   if (lt_foo != "") { lt_freq[lt_foo]++; }
   if (lt_freq[lt_foo] == 1) { print lt_foo; }
 }'`
-  sys_lib_search_path_spec=`$ECHO $lt_search_path_spec`
+  # AWK program above erroneously prepends '/' to C:/dos/paths
+  # for these hosts.
+  case $host_os in
+    mingw* | cegcc*) lt_search_path_spec=`$ECHO "$lt_search_path_spec" |\
+      $SED 's,/\([A-Za-z]:\),\1,g'` ;;
+  esac
+  sys_lib_search_path_spec=`$ECHO "$lt_search_path_spec" | $lt_NL2SP`
 else
   sys_lib_search_path_spec="/lib /usr/lib /usr/local/lib"
 fi
@@ -10512,7 +10762,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -10521,7 +10771,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -10574,7 +10824,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -10586,7 +10836,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -10605,8 +10855,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -10627,36 +10878,83 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
+      sys_lib_search_path_spec="$sys_lib_search_path_spec /usr/lib/w32api"
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -10677,7 +10975,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -10685,10 +10983,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -10696,7 +10990,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -10714,7 +11008,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -10733,13 +11027,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -10785,12 +11082,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -10806,7 +11105,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -10843,9 +11142,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -10853,12 +11152,17 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -10871,13 +11175,17 @@
 _ACEOF
 if ac_fn_c_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -10886,7 +11194,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -10930,7 +11238,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -10999,7 +11307,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11024,7 +11332,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11048,7 +11356,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -11079,7 +11387,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -11089,7 +11397,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -11201,6 +11509,11 @@
 
 
 
+
+
+
+
+
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action=
@@ -11273,7 +11586,7 @@
   # if libdl is installed we need to link against it
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11307,7 +11620,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
 
@@ -11321,12 +11634,12 @@
 
   *)
     ac_fn_c_check_func "$LINENO" "shl_load" "ac_cv_func_shl_load"
-if test "x$ac_cv_func_shl_load" = x""yes; then :
+if test "x$ac_cv_func_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for shl_load in -ldld" >&5
 $as_echo_n "checking for shl_load in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_shl_load+set}" = set; then :
+if ${ac_cv_lib_dld_shl_load+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11360,16 +11673,16 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_shl_load" >&5
 $as_echo "$ac_cv_lib_dld_shl_load" >&6; }
-if test "x$ac_cv_lib_dld_shl_load" = x""yes; then :
+if test "x$ac_cv_lib_dld_shl_load" = xyes; then :
   lt_cv_dlopen="shl_load" lt_cv_dlopen_libs="-ldld"
 else
   ac_fn_c_check_func "$LINENO" "dlopen" "ac_cv_func_dlopen"
-if test "x$ac_cv_func_dlopen" = x""yes; then :
+if test "x$ac_cv_func_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -ldl" >&5
 $as_echo_n "checking for dlopen in -ldl... " >&6; }
-if test "${ac_cv_lib_dl_dlopen+set}" = set; then :
+if ${ac_cv_lib_dl_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11403,12 +11716,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dl_dlopen" >&5
 $as_echo "$ac_cv_lib_dl_dlopen" >&6; }
-if test "x$ac_cv_lib_dl_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_dl_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-ldl"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dlopen in -lsvld" >&5
 $as_echo_n "checking for dlopen in -lsvld... " >&6; }
-if test "${ac_cv_lib_svld_dlopen+set}" = set; then :
+if ${ac_cv_lib_svld_dlopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11442,12 +11755,12 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_svld_dlopen" >&5
 $as_echo "$ac_cv_lib_svld_dlopen" >&6; }
-if test "x$ac_cv_lib_svld_dlopen" = x""yes; then :
+if test "x$ac_cv_lib_svld_dlopen" = xyes; then :
   lt_cv_dlopen="dlopen" lt_cv_dlopen_libs="-lsvld"
 else
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for dld_link in -ldld" >&5
 $as_echo_n "checking for dld_link in -ldld... " >&6; }
-if test "${ac_cv_lib_dld_dld_link+set}" = set; then :
+if ${ac_cv_lib_dld_dld_link+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -11481,7 +11794,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_dld_dld_link" >&5
 $as_echo "$ac_cv_lib_dld_dld_link" >&6; }
-if test "x$ac_cv_lib_dld_dld_link" = x""yes; then :
+if test "x$ac_cv_lib_dld_dld_link" = xyes; then :
   lt_cv_dlopen="dld_link" lt_cv_dlopen_libs="-ldld"
 fi
 
@@ -11522,7 +11835,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a program can dlopen itself" >&5
 $as_echo_n "checking whether a program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self+set}" = set; then :
+if ${lt_cv_dlopen_self+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11531,7 +11844,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11534 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11572,7 +11885,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11581,7 +11900,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11618,7 +11941,7 @@
       wl=$lt_prog_compiler_wl eval LDFLAGS=\"\$LDFLAGS $lt_prog_compiler_static\"
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether a statically linked program can dlopen itself" >&5
 $as_echo_n "checking whether a statically linked program can dlopen itself... " >&6; }
-if test "${lt_cv_dlopen_self_static+set}" = set; then :
+if ${lt_cv_dlopen_self_static+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   	  if test "$cross_compiling" = yes; then :
@@ -11627,7 +11950,7 @@
   lt_dlunknown=0; lt_dlno_uscore=1; lt_dlneed_uscore=2
   lt_status=$lt_dlunknown
   cat > conftest.$ac_ext <<_LT_EOF
-#line 11630 "configure"
+#line $LINENO "configure"
 #include "confdefs.h"
 
 #if HAVE_DLFCN_H
@@ -11668,7 +11991,13 @@
 #  endif
 #endif
 
-void fnord() { int i=42;}
+/* When -fvisbility=hidden is used, assume the code has been annotated
+   correspondingly for the symbols needed.  */
+#if defined(__GNUC__) && (((__GNUC__ == 3) && (__GNUC_MINOR__ >= 3)) || (__GNUC__ > 3))
+int fnord () __attribute__((visibility("default")));
+#endif
+
+int fnord () { return 42; }
 int main ()
 {
   void *self = dlopen (0, LT_DLGLOBAL|LT_DLLAZY_OR_NOW);
@@ -11677,7 +12006,11 @@
   if (self)
     {
       if (dlsym (self,"fnord"))       status = $lt_dlno_uscore;
-      else if (dlsym( self,"_fnord")) status = $lt_dlneed_uscore;
+      else
+        {
+	  if (dlsym( self,"_fnord"))  status = $lt_dlneed_uscore;
+          else puts (dlerror ());
+	}
       /* dlclose (self); */
     }
   else
@@ -11834,6 +12167,145 @@
 
 CC="$lt_save_CC"
 
+      if test -n "$CXX" && ( test "X$CXX" != "Xno" &&
+    ( (test "X$CXX" = "Xg++" && `g++ -v >/dev/null 2>&1` ) ||
+    (test "X$CXX" != "Xg++"))) ; then
+  ac_ext=cpp
+ac_cpp='$CXXCPP $CPPFLAGS'
+ac_compile='$CXX -c $CXXFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CXX -o conftest$ac_exeext $CXXFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking how to run the C++ preprocessor" >&5
+$as_echo_n "checking how to run the C++ preprocessor... " >&6; }
+if test -z "$CXXCPP"; then
+  if ${ac_cv_prog_CXXCPP+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+      # Double quotes because CXXCPP needs to be expanded
+    for CXXCPP in "$CXX -E" "/lib/cpp"
+    do
+      ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+  break
+fi
+
+    done
+    ac_cv_prog_CXXCPP=$CXXCPP
+
+fi
+  CXXCPP=$ac_cv_prog_CXXCPP
+else
+  ac_cv_prog_CXXCPP=$CXXCPP
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $CXXCPP" >&5
+$as_echo "$CXXCPP" >&6; }
+ac_preproc_ok=false
+for ac_cxx_preproc_warn_flag in '' yes
+do
+  # Use a header file that comes with gcc, so configuring glibc
+  # with a fresh cross-compiler works.
+  # Prefer <limits.h> to <assert.h> if __STDC__ is defined, since
+  # <limits.h> exists even on freestanding compilers.
+  # On the NeXT, cc -E runs the code through the compiler's parser,
+  # not just through cpp. "Syntax error" is here to catch this case.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#ifdef __STDC__
+# include <limits.h>
+#else
+# include <assert.h>
+#endif
+		     Syntax error
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+
+else
+  # Broken: fails on valid input.
+continue
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+  # OK, works on sane cases.  Now check whether nonexistent headers
+  # can be detected and how.
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+#include <ac_nonexistent.h>
+_ACEOF
+if ac_fn_cxx_try_cpp "$LINENO"; then :
+  # Broken: success on invalid input.
+continue
+else
+  # Passes both tests.
+ac_preproc_ok=:
+break
+fi
+rm -f conftest.err conftest.i conftest.$ac_ext
+
+done
+# Because of `break', _AC_PREPROC_IFELSE's cleaning code was skipped.
+rm -f conftest.i conftest.err conftest.$ac_ext
+if $ac_preproc_ok; then :
+
+else
+  { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
+$as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
+as_fn_error $? "C++ preprocessor \"$CXXCPP\" fails sanity check
+See \`config.log' for more details" "$LINENO" 5; }
+fi
+
+ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+else
+  _lt_caught_CXX_error=yes
+fi
 
 ac_ext=cpp
 ac_cpp='$CXXCPP $CPPFLAGS'
@@ -11850,7 +12322,6 @@
 hardcode_direct_CXX=no
 hardcode_direct_absolute_CXX=no
 hardcode_libdir_flag_spec_CXX=
-hardcode_libdir_flag_spec_ld_CXX=
 hardcode_libdir_separator_CXX=
 hardcode_minus_L_CXX=no
 hardcode_shlibpath_var_CXX=unsupported
@@ -11860,6 +12331,8 @@
 module_expsym_cmds_CXX=
 link_all_deplibs_CXX=unknown
 old_archive_cmds_CXX=$old_archive_cmds
+reload_flag_CXX=$reload_flag
+reload_cmds_CXX=$reload_cmds
 no_undefined_flag_CXX=
 whole_archive_flag_spec_CXX=
 enable_shared_with_static_runtimes_CXX=no
@@ -11915,6 +12388,7 @@
 
   # Allow CC to be a program name with arguments.
   lt_save_CC=$CC
+  lt_save_CFLAGS=$CFLAGS
   lt_save_LD=$LD
   lt_save_GCC=$GCC
   GCC=$GXX
@@ -11932,6 +12406,7 @@
   fi
   test -z "${LDCXX+set}" || LD=$LDCXX
   CC=${CXX-"c++"}
+  CFLAGS=$CXXFLAGS
   compiler=$CC
   compiler_CXX=$CC
   for cc_temp in $compiler""; do
@@ -11942,7 +12417,7 @@
     *) break;;
   esac
 done
-cc_basename=`$ECHO "X$cc_temp" | $Xsed -e 's%.*/%%' -e "s%^$host_alias-%%"`
+cc_basename=`$ECHO "$cc_temp" | $SED "s%.*/%%; s%^$host_alias-%%"`
 
 
   if test -n "$compiler"; then
@@ -12005,7 +12480,7 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for non-GNU ld" >&5
 $as_echo_n "checking for non-GNU ld... " >&6; }
 fi
-if test "${lt_cv_path_LD+set}" = set; then :
+if ${lt_cv_path_LD+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   if test -z "$LD"; then
@@ -12045,7 +12520,7 @@
 test -z "$LD" && as_fn_error $? "no acceptable ld found in \$PATH" "$LINENO" 5
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if the linker ($LD) is GNU ld" >&5
 $as_echo_n "checking if the linker ($LD) is GNU ld... " >&6; }
-if test "${lt_cv_prog_gnu_ld+set}" = set; then :
+if ${lt_cv_prog_gnu_ld+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   # I'd rather use --version here, but apparently some GNU lds only accept -v.
@@ -12071,8 +12546,8 @@
       # Check if GNU C++ uses GNU ld as the underlying linker, since the
       # archiving commands below assume that GNU ld is being used.
       if test "$with_gnu_ld" = yes; then
-        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
-        archive_expsym_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
+        archive_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        archive_expsym_cmds_CXX='$CC $pic_flag -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $wl$soname ${wl}-retain-symbols-file $wl$export_symbols -o $lib'
 
         hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
         export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12104,7 +12579,7 @@
       # Commands to make compiler produce verbose output that lists
       # what "hidden" libraries, object files and flags are used when
       # linking a shared library.
-      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
     else
       GXX=no
@@ -12214,7 +12689,13 @@
           allow_undefined_flag_CXX='-berok'
           # Determine the default libpath from the value encoded in an empty
           # executable.
-          cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+          if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12227,26 +12708,33 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
           hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 
-          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then $ECHO "X${wl}${allow_undefined_flag}" | $Xsed; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
+          archive_expsym_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $deplibs '"\${wl}$no_entry_flag"' $compiler_flags `if test "x${allow_undefined_flag}" != "x"; then func_echo_all "${wl}${allow_undefined_flag}"; else :; fi` '"\${wl}$exp_sym_flag:\$export_symbols $shared_flag"
         else
           if test "$host_cpu" = ia64; then
 	    hardcode_libdir_flag_spec_CXX='${wl}-R $libdir:/usr/lib:/lib'
@@ -12255,7 +12743,13 @@
           else
 	    # Determine the default libpath from the value encoded in an
 	    # empty executable.
-	    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+	    if test "${lt_cv_aix_libpath+set}" = set; then
+  aix_libpath=$lt_cv_aix_libpath
+else
+  if ${lt_cv_aix_libpath__CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -12268,30 +12762,42 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
 
-lt_aix_libpath_sed='
-    /Import File Strings/,/^$/ {
-	/^0/ {
-	    s/^0  *\(.*\)$/\1/
-	    p
-	}
-    }'
-aix_libpath=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-# Check for a 64-bit object if we didn't find anything.
-if test -z "$aix_libpath"; then
-  aix_libpath=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
-fi
+  lt_aix_libpath_sed='
+      /Import File Strings/,/^$/ {
+	  /^0/ {
+	      s/^0  *\([^ ]*\) *$/\1/
+	      p
+	  }
+      }'
+  lt_cv_aix_libpath__CXX=`dump -H conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  # Check for a 64-bit object if we didn't find anything.
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX=`dump -HX64 conftest$ac_exeext 2>/dev/null | $SED -n -e "$lt_aix_libpath_sed"`
+  fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-if test -z "$aix_libpath"; then aix_libpath="/usr/lib:/lib"; fi
+  if test -z "$lt_cv_aix_libpath__CXX"; then
+    lt_cv_aix_libpath__CXX="/usr/lib:/lib"
+  fi
+
+fi
+
+  aix_libpath=$lt_cv_aix_libpath__CXX
+fi
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-blibpath:$libdir:'"$aix_libpath"
 	    # Warning - without using the other run time loading flags,
 	    # -berok will link without error, but may produce a broken library.
 	    no_undefined_flag_CXX=' ${wl}-bernotok'
 	    allow_undefined_flag_CXX=' ${wl}-berok'
-	    # Exported symbols can be pulled into shared objects from archives
-	    whole_archive_flag_spec_CXX='$convenience'
+	    if test "$with_gnu_ld" = yes; then
+	      # We only use this code for GNU lds that support --whole-archive.
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive$convenience ${wl}--no-whole-archive'
+	    else
+	      # Exported symbols can be pulled into shared objects from archives
+	      whole_archive_flag_spec_CXX='$convenience'
+	    fi
 	    archive_cmds_need_lc_CXX=yes
 	    # This is similar to how AIX traditionally builds its shared
 	    # libraries.
@@ -12321,28 +12827,75 @@
         ;;
 
       cygwin* | mingw* | pw32* | cegcc*)
-        # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
-        # as there is no search path for DLLs.
-        hardcode_libdir_flag_spec_CXX='-L$libdir'
-        allow_undefined_flag_CXX=unsupported
-        always_export_symbols_CXX=no
-        enable_shared_with_static_runtimes_CXX=yes
-
-        if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
-          archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-          # If the export-symbols file already is a .def file (1st line
-          # is EXPORTS), use it as is; otherwise, prepend...
-          archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
-	    cp $export_symbols $output_objdir/$soname.def;
-          else
-	    echo EXPORTS > $output_objdir/$soname.def;
-	    cat $export_symbols >> $output_objdir/$soname.def;
-          fi~
-          $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
-        else
-          ld_shlibs_CXX=no
-        fi
-        ;;
+	case $GXX,$cc_basename in
+	,cl* | no,cl*)
+	  # Native MSVC
+	  # hardcode_libdir_flag_spec is actually meaningless, as there is
+	  # no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX=' '
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=yes
+	  file_list_spec_CXX='@'
+	  # Tell ltmain to make .lib files, not .a files.
+	  libext=lib
+	  # Tell ltmain to make .dll files, not .so files.
+	  shrext_cmds=".dll"
+	  # FIXME: Setting linknames here is a bad hack.
+	  archive_cmds_CXX='$CC -o $output_objdir/$soname $libobjs $compiler_flags $deplibs -Wl,-dll~linknames='
+	  archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      $SED -n -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' -e '1\\\!p' < $export_symbols > $output_objdir/$soname.exp;
+	    else
+	      $SED -e 's/\\\\\\\(.*\\\\\\\)/-link\\\ -EXPORT:\\\\\\\1/' < $export_symbols > $output_objdir/$soname.exp;
+	    fi~
+	    $CC -o $tool_output_objdir$soname $libobjs $compiler_flags $deplibs "@$tool_output_objdir$soname.exp" -Wl,-DLL,-IMPLIB:"$tool_output_objdir$libname.dll.lib"~
+	    linknames='
+	  # The linker will not automatically build a static lib if we build a DLL.
+	  # _LT_TAGVAR(old_archive_from_new_cmds, CXX)='true'
+	  enable_shared_with_static_runtimes_CXX=yes
+	  # Don't use ranlib
+	  old_postinstall_cmds_CXX='chmod 644 $oldlib'
+	  postlink_cmds_CXX='lt_outputfile="@OUTPUT@"~
+	    lt_tool_outputfile="@TOOL_OUTPUT@"~
+	    case $lt_outputfile in
+	      *.exe|*.EXE) ;;
+	      *)
+		lt_outputfile="$lt_outputfile.exe"
+		lt_tool_outputfile="$lt_tool_outputfile.exe"
+		;;
+	    esac~
+	    func_to_tool_file "$lt_outputfile"~
+	    if test "$MANIFEST_TOOL" != ":" && test -f "$lt_outputfile.manifest"; then
+	      $MANIFEST_TOOL -manifest "$lt_tool_outputfile.manifest" -outputresource:"$lt_tool_outputfile" || exit 1;
+	      $RM "$lt_outputfile.manifest";
+	    fi'
+	  ;;
+	*)
+	  # g++
+	  # _LT_TAGVAR(hardcode_libdir_flag_spec, CXX) is actually meaningless,
+	  # as there is no search path for DLLs.
+	  hardcode_libdir_flag_spec_CXX='-L$libdir'
+	  export_dynamic_flag_spec_CXX='${wl}--export-all-symbols'
+	  allow_undefined_flag_CXX=unsupported
+	  always_export_symbols_CXX=no
+	  enable_shared_with_static_runtimes_CXX=yes
+
+	  if $LD --help 2>&1 | $GREP 'auto-import' > /dev/null; then
+	    archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	    # If the export-symbols file already is a .def file (1st line
+	    # is EXPORTS), use it as is; otherwise, prepend...
+	    archive_expsym_cmds_CXX='if test "x`$SED 1q $export_symbols`" = xEXPORTS; then
+	      cp $export_symbols $output_objdir/$soname.def;
+	    else
+	      echo EXPORTS > $output_objdir/$soname.def;
+	      cat $export_symbols >> $output_objdir/$soname.def;
+	    fi~
+	    $CC -shared -nostdlib $output_objdir/$soname.def $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -o $output_objdir/$soname ${wl}--enable-auto-image-base -Xlinker --out-implib -Xlinker $lib'
+	  else
+	    ld_shlibs_CXX=no
+	  fi
+	  ;;
+	esac
+	;;
       darwin* | rhapsody*)
 
 
@@ -12350,7 +12903,12 @@
   hardcode_direct_CXX=no
   hardcode_automatic_CXX=yes
   hardcode_shlibpath_var_CXX=unsupported
-  whole_archive_flag_spec_CXX=''
+  if test "$lt_cv_ld_force_load" = "yes"; then
+    whole_archive_flag_spec_CXX='`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience ${wl}-force_load,$conv\"; done; func_echo_all \"$new_convenience\"`'
+
+  else
+    whole_archive_flag_spec_CXX=''
+  fi
   link_all_deplibs_CXX=yes
   allow_undefined_flag_CXX="$_lt_dar_allow_undefined"
   case $cc_basename in
@@ -12358,7 +12916,7 @@
      *) _lt_dar_can_shared=$GCC ;;
   esac
   if test "$_lt_dar_can_shared" = "yes"; then
-    output_verbose_link_cmd=echo
+    output_verbose_link_cmd=func_echo_all
     archive_cmds_CXX="\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring $_lt_dar_single_mod${_lt_dsymutil}"
     module_cmds_CXX="\$CC \$allow_undefined_flag -o \$lib -bundle \$libobjs \$deplibs \$compiler_flags${_lt_dsymutil}"
     archive_expsym_cmds_CXX="sed 's,^,_,' < \$export_symbols > \$output_objdir/\${libname}-symbols.expsym~\$CC -dynamiclib \$allow_undefined_flag -o \$lib \$libobjs \$deplibs \$compiler_flags -install_name \$rpath/\$soname \$verstring ${_lt_dar_single_mod}${_lt_dar_export_syms}${_lt_dsymutil}"
@@ -12392,7 +12950,7 @@
         esac
         ;;
 
-      freebsd[12]*)
+      freebsd2.*)
         # C++ shared libraries reported to be fairly broken before
 	# switch to ELF
         ld_shlibs_CXX=no
@@ -12408,7 +12966,9 @@
         ld_shlibs_CXX=yes
         ;;
 
-      gnu*)
+      haiku*)
+        archive_cmds_CXX='$CC -shared $libobjs $deplibs $compiler_flags ${wl}-soname $wl$soname -o $lib'
+        link_all_deplibs_CXX=yes
         ;;
 
       hpux9*)
@@ -12435,11 +12995,11 @@
             # explicitly linking system object files so we need to strip them
             # from the output so that they don't get included in the library
             # dependencies.
-            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+            output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $EGREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
             ;;
           *)
             if test "$GXX" = yes; then
-              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib -fPIC ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
+              archive_cmds_CXX='$RM $output_objdir/$soname~$CC -shared -nostdlib $pic_flag ${wl}+b ${wl}$install_libdir -o $output_objdir/$soname $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~test $output_objdir/$soname = $lib || mv $output_objdir/$soname $lib'
             else
               # FIXME: insert proper C++ library support
               ld_shlibs_CXX=no
@@ -12500,7 +13060,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`($CC -b $CFLAGS -v conftest.$objext 2>&1) | $GREP "\-L"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
           *)
 	    if test "$GXX" = yes; then
@@ -12510,10 +13070,10 @@
 	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          ia64*)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+nodefaultrpath -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	          *)
-	            archive_cmds_CXX='$CC -shared -nostdlib -fPIC ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
+	            archive_cmds_CXX='$CC -shared -nostdlib $pic_flag ${wl}+h ${wl}$soname ${wl}+b ${wl}$install_libdir -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	            ;;
 	        esac
 	      fi
@@ -12543,7 +13103,7 @@
         case $cc_basename in
           CC*)
 	    # SGI C++
-	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	    archive_cmds_CXX='$CC -shared -all -multigot $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -ar", where "CC" is the IRIX C++ compiler.  This is
@@ -12554,9 +13114,9 @@
           *)
 	    if test "$GXX" = yes; then
 	      if test "$with_gnu_ld" = no; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 	      else
-	        archive_cmds_CXX='$CC -shared -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` -o $lib'
 	      fi
 	    fi
 	    link_all_deplibs_CXX=yes
@@ -12567,7 +13127,7 @@
         inherit_rpath_CXX=yes
         ;;
 
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
         case $cc_basename in
           KCC*)
 	    # Kuck and Associates, Inc. (KAI) C++ Compiler
@@ -12585,7 +13145,7 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1 | $GREP "ld"`; rm -f libconftest$shared_ext; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath,$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12622,26 +13182,26 @@
           pgCC* | pgcpp*)
             # Portland Group C++ compiler
 	    case `$CC -V` in
-	    *pgCC\ [1-5]* | *pgcpp\ [1-5]*)
+	    *pgCC\ [1-5].* | *pgcpp\ [1-5].*)
 	      prelink_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $objs $libobjs $compile_deplibs~
-		compile_command="$compile_command `find $tpldir -name \*.o | $NL2SP`"'
+		compile_command="$compile_command `find $tpldir -name \*.o | sort | $NL2SP`"'
 	      old_archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $oldobjs$old_deplibs~
-		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | $NL2SP`~
+		$AR $AR_FLAGS $oldlib$oldobjs$old_deplibs `find $tpldir -name \*.o | sort | $NL2SP`~
 		$RANLIB $oldlib'
 	      archive_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='tpldir=Template.dir~
 		rm -rf $tpldir~
 		$CC --prelink_objects --instantiation_dir $tpldir $predep_objects $libobjs $deplibs $convenience $postdep_objects~
-		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
+		$CC -shared $pic_flag $predep_objects $libobjs $deplibs `find $tpldir -name \*.o | sort | $NL2SP` $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
-	    *) # Version 6 will use weak symbols
+	    *) # Version 6 and above use weak symbols
 	      archive_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname -o $lib'
 	      archive_expsym_cmds_CXX='$CC -shared $pic_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname ${wl}-retain-symbols-file ${wl}$export_symbols -o $lib'
 	      ;;
@@ -12649,7 +13209,7 @@
 
 	    hardcode_libdir_flag_spec_CXX='${wl}--rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
-	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	    whole_archive_flag_spec_CXX='${wl}--whole-archive`for conv in $convenience\"\"; do test  -n \"$conv\" && new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
             ;;
 	  cxx*)
 	    # Compaq C++
@@ -12668,9 +13228,9 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld .*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "X$list" | $Xsed'
 	    ;;
-	  xl*)
+	  xl* | mpixl* | bgxl*)
 	    # IBM XL 8.0 on PPC, with GNU ld
 	    hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 	    export_dynamic_flag_spec_CXX='${wl}--export-dynamic'
@@ -12690,13 +13250,13 @@
 	      archive_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags'
 	      archive_expsym_cmds_CXX='$CC -G${allow_undefined_flag} -h$soname -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-retain-symbols-file ${wl}$export_symbols'
 	      hardcode_libdir_flag_spec_CXX='-R$libdir'
-	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; $ECHO \"$new_convenience\"` ${wl}--no-whole-archive'
+	      whole_archive_flag_spec_CXX='${wl}--whole-archive`new_convenience=; for conv in $convenience\"\"; do test -z \"$conv\" || new_convenience=\"$new_convenience,$conv\"; done; func_echo_all \"$new_convenience\"` ${wl}--no-whole-archive'
 	      compiler_needs_object_CXX=yes
 
 	      # Not sure whether something based on
 	      # $CC $CFLAGS -v conftest.$objext -o libconftest$shared_ext 2>&1
 	      # would be better.
-	      output_verbose_link_cmd='echo'
+	      output_verbose_link_cmd='func_echo_all'
 
 	      # Archives containing C++ object files must be created using
 	      # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -12765,7 +13325,7 @@
 	    export_dynamic_flag_spec_CXX='${wl}-E'
 	    whole_archive_flag_spec_CXX="$wlarc"'--whole-archive$convenience '"$wlarc"'--no-whole-archive'
 	  fi
-	  output_verbose_link_cmd=echo
+	  output_verbose_link_cmd=func_echo_all
 	else
 	  ld_shlibs_CXX=no
 	fi
@@ -12800,15 +13360,15 @@
 	    case $host in
 	      osf3*)
 	        allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && $ECHO "X${wl}-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname $soname `test -n "$verstring" && func_echo_all "${wl}-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        hardcode_libdir_flag_spec_CXX='${wl}-rpath ${wl}$libdir'
 		;;
 	      *)
 	        allow_undefined_flag_CXX=' -expect_unresolved \*'
-	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib'
+	        archive_cmds_CXX='$CC -shared${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname `test -n "$verstring" && func_echo_all "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib'
 	        archive_expsym_cmds_CXX='for i in `cat $export_symbols`; do printf "%s %s\\n" -exported_symbol "\$i" >> $lib.exp; done~
 	          echo "-hidden">> $lib.exp~
-	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "X-set_version $verstring" | $Xsed` -update_registry ${output_objdir}/so_locations -o $lib~
+	          $CC -shared$allow_undefined_flag $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags -msym -soname $soname ${wl}-input ${wl}$lib.exp  `test -n "$verstring" && $ECHO "-set_version $verstring"` -update_registry ${output_objdir}/so_locations -o $lib~
 	          $RM $lib.exp'
 	        hardcode_libdir_flag_spec_CXX='-rpath $libdir'
 		;;
@@ -12824,17 +13384,17 @@
 	    # explicitly linking system object files so we need to strip them
 	    # from the output so that they don't get included in the library
 	    # dependencies.
-	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`$ECHO "X$templist" | $Xsed -e "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; $ECHO "X$list" | $Xsed'
+	    output_verbose_link_cmd='templist=`$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "ld" | $GREP -v "ld:"`; templist=`func_echo_all "$templist" | $SED "s/\(^.*ld.*\)\( .*ld.*$\)/\1/"`; list=""; for z in $templist; do case $z in conftest.$objext) list="$list $z";; *.$objext);; *) list="$list $z";;esac; done; func_echo_all "$list"'
 	    ;;
 	  *)
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      allow_undefined_flag_CXX=' ${wl}-expect_unresolved ${wl}\*'
 	      case $host in
 	        osf3*)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "X${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	        *)
-	          archive_cmds_CXX='$CC -shared -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && $ECHO "${wl}-set_version ${wl}$verstring" | $Xsed` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
+	          archive_cmds_CXX='$CC -shared $pic_flag -nostdlib ${allow_undefined_flag} $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-msym ${wl}-soname ${wl}$soname `test -n "$verstring" && func_echo_all "${wl}-set_version ${wl}$verstring"` ${wl}-update_registry ${wl}${output_objdir}/so_locations -o $lib'
 		  ;;
 	      esac
 
@@ -12844,7 +13404,7 @@
 	      # Commands to make compiler produce verbose output that lists
 	      # what "hidden" libraries, object files and flags are used when
 	      # linking a shared library.
-	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	      output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 
 	    else
 	      # FIXME: insert proper C++ library support
@@ -12880,7 +13440,7 @@
 
       solaris*)
         case $cc_basename in
-          CC*)
+          CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
             archive_cmds_need_lc_CXX=yes
 	    no_undefined_flag_CXX=' -zdefs'
@@ -12901,7 +13461,7 @@
 	    esac
 	    link_all_deplibs_CXX=yes
 
-	    output_verbose_link_cmd='echo'
+	    output_verbose_link_cmd='func_echo_all'
 
 	    # Archives containing C++ object files must be created using
 	    # "CC -xar", where "CC" is the Sun C++ compiler.  This is
@@ -12921,14 +13481,14 @@
 	    if test "$GXX" = yes && test "$with_gnu_ld" = no; then
 	      no_undefined_flag_CXX=' ${wl}-z ${wl}defs'
 	      if $CC --version | $GREP -v '^2\.7' > /dev/null; then
-	        archive_cmds_CXX='$CC -shared -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
+	        archive_cmds_CXX='$CC -shared $pic_flag -nostdlib $LDFLAGS $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags ${wl}-h $wl$soname -o $lib'
 	        archive_expsym_cmds_CXX='echo "{ global:" > $lib.exp~cat $export_symbols | $SED -e "s/\(.*\)/\1;/" >> $lib.exp~echo "local: *; };" >> $lib.exp~
-		  $CC -shared -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
+		  $CC -shared $pic_flag -nostdlib ${wl}-M $wl$lib.exp -o $lib $predep_objects $libobjs $deplibs $postdep_objects $compiler_flags~$RM $lib.exp'
 
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -shared $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      else
 	        # g++ 2.7 appears to require `-G' NOT `-shared' on this
 	        # platform.
@@ -12939,7 +13499,7 @@
 	        # Commands to make compiler produce verbose output that lists
 	        # what "hidden" libraries, object files and flags are used when
 	        # linking a shared library.
-	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP "\-L"'
+	        output_verbose_link_cmd='$CC -G $CFLAGS -v conftest.$objext 2>&1 | $GREP -v "^Configured with:" | $GREP "\-L"'
 	      fi
 
 	      hardcode_libdir_flag_spec_CXX='${wl}-R $wl$libdir'
@@ -12993,6 +13553,10 @@
           CC*)
 	    archive_cmds_CXX='$CC -G ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
 	    archive_expsym_cmds_CXX='$CC -G ${wl}-Bexport:$export_symbols ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
+	    old_archive_cmds_CXX='$CC -Tprelink_objects $oldobjs~
+	      '"$old_archive_cmds_CXX"
+	    reload_cmds_CXX='$CC -Tprelink_objects $reload_objs~
+	      '"$reload_cmds_CXX"
 	    ;;
 	  *)
 	    archive_cmds_CXX='$CC -shared ${wl}-h,$soname -o $lib $libobjs $deplibs $compiler_flags'
@@ -13054,6 +13618,14 @@
 };
 _LT_EOF
 
+
+_lt_libdeps_save_CFLAGS=$CFLAGS
+case "$CC $CFLAGS " in #(
+*\ -flto*\ *) CFLAGS="$CFLAGS -fno-lto" ;;
+*\ -fwhopr*\ *) CFLAGS="$CFLAGS -fno-whopr" ;;
+*\ -fuse-linker-plugin*\ *) CFLAGS="$CFLAGS -fno-use-linker-plugin" ;;
+esac
+
 if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
@@ -13067,7 +13639,7 @@
   pre_test_object_deps_done=no
 
   for p in `eval "$output_verbose_link_cmd"`; do
-    case $p in
+    case ${prev}${p} in
 
     -L* | -R* | -l*)
        # Some compilers place space between "-{L,R}" and the path.
@@ -13076,13 +13648,22 @@
           test $p = "-R"; then
 	 prev=$p
 	 continue
-       else
-	 prev=
        fi
 
+       # Expand the sysroot to ease extracting the directories later.
+       if test -z "$prev"; then
+         case $p in
+         -L*) func_stripname_cnf '-L' '' "$p"; prev=-L; p=$func_stripname_result ;;
+         -R*) func_stripname_cnf '-R' '' "$p"; prev=-R; p=$func_stripname_result ;;
+         -l*) func_stripname_cnf '-l' '' "$p"; prev=-l; p=$func_stripname_result ;;
+         esac
+       fi
+       case $p in
+       =*) func_stripname_cnf '=' '' "$p"; p=$lt_sysroot$func_stripname_result ;;
+       esac
        if test "$pre_test_object_deps_done" = no; then
-	 case $p in
-	 -L* | -R*)
+	 case ${prev} in
+	 -L | -R)
 	   # Internal compiler library paths should come after those
 	   # provided the user.  The postdeps already come after the
 	   # user supplied libs so there is no need to process them.
@@ -13102,8 +13683,10 @@
 	   postdeps_CXX="${postdeps_CXX} ${prev}${p}"
 	 fi
        fi
+       prev=
        ;;
 
+    *.lto.$objext) ;; # Ignore GCC LTO objects
     *.$objext)
        # This assumes that the test object file only shows up
        # once in the compiler output.
@@ -13139,6 +13722,7 @@
 fi
 
 $RM -f confest.$objext
+CFLAGS=$_lt_libdeps_save_CFLAGS
 
 # PORTME: override above test on systems where it is broken
 case $host_os in
@@ -13174,7 +13758,7 @@
 
 solaris*)
   case $cc_basename in
-  CC*)
+  CC* | sunCC*)
     # The more standards-conforming stlport4 library is
     # incompatible with the Cstd library. Avoid specifying
     # it if it's in CXXFLAGS. Ignore libCrun as
@@ -13239,8 +13823,6 @@
 lt_prog_compiler_pic_CXX=
 lt_prog_compiler_static_CXX=
 
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
-$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
 
   # C++ specific cases for pic, static, wl, etc.
   if test "$GXX" = yes; then
@@ -13290,6 +13872,11 @@
       # DJGPP does not support shared libraries at all
       lt_prog_compiler_pic_CXX=
       ;;
+    haiku*)
+      # PIC is the default for Haiku.
+      # The "-static" flag exists, but is broken.
+      lt_prog_compiler_static_CXX=
+      ;;
     interix[3-9]*)
       # Interix 3.x gcc -fpic/-fPIC options generate broken code.
       # Instead, we relocate shared libraries at runtime.
@@ -13339,6 +13926,11 @@
 	  ;;
 	esac
 	;;
+      mingw* | cygwin* | os2* | pw32* | cegcc*)
+	# This hack is so that the source file can tell whether it is being
+	# built for inclusion in a dll (and should export symbols for example).
+	lt_prog_compiler_pic_CXX='-DDLL_EXPORT'
+	;;
       dgux*)
 	case $cc_basename in
 	  ec++*)
@@ -13395,7 +13987,7 @@
 	    ;;
 	esac
 	;;
-      linux* | k*bsd*-gnu | kopensolaris*-gnu)
+      linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
 	case $cc_basename in
 	  KCC*)
 	    # KAI C++ Compiler
@@ -13428,8 +14020,8 @@
 	    lt_prog_compiler_pic_CXX=
 	    lt_prog_compiler_static_CXX='-non_shared'
 	    ;;
-	  xlc* | xlC*)
-	    # IBM XL 8.0 on PPC
+	  xlc* | xlC* | bgxl[cC]* | mpixl[cC]*)
+	    # IBM XL 8.0, 9.0 on PPC and BlueGene
 	    lt_prog_compiler_wl_CXX='-Wl,'
 	    lt_prog_compiler_pic_CXX='-qpic'
 	    lt_prog_compiler_static_CXX='-qstaticlink'
@@ -13491,7 +14083,7 @@
 	;;
       solaris*)
 	case $cc_basename in
-	  CC*)
+	  CC* | sunCC*)
 	    # Sun C++ 4.2, 5.x and Centerline C++
 	    lt_prog_compiler_pic_CXX='-KPIC'
 	    lt_prog_compiler_static_CXX='-Bstatic'
@@ -13556,10 +14148,17 @@
     lt_prog_compiler_pic_CXX="$lt_prog_compiler_pic_CXX -DPIC"
     ;;
 esac
-{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_prog_compiler_pic_CXX" >&5
-$as_echo "$lt_prog_compiler_pic_CXX" >&6; }
-
 
+{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $compiler option to produce PIC" >&5
+$as_echo_n "checking for $compiler option to produce PIC... " >&6; }
+if ${lt_cv_prog_compiler_pic_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_prog_compiler_pic_CXX=$lt_prog_compiler_pic_CXX
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_prog_compiler_pic_CXX" >&5
+$as_echo "$lt_cv_prog_compiler_pic_CXX" >&6; }
+lt_prog_compiler_pic_CXX=$lt_cv_prog_compiler_pic_CXX
 
 #
 # Check to make sure the PIC flag actually works.
@@ -13567,7 +14166,7 @@
 if test -n "$lt_prog_compiler_pic_CXX"; then
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works" >&5
 $as_echo_n "checking if $compiler PIC flag $lt_prog_compiler_pic_CXX works... " >&6; }
-if test "${lt_cv_prog_compiler_pic_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_pic_works_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_pic_works_CXX=no
@@ -13583,15 +14182,15 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13586: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>conftest.err)
    ac_status=$?
    cat conftest.err >&5
-   echo "$as_me:13590: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s "$ac_outfile"; then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings other than the usual output.
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' >conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' >conftest.exp
      $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
      if test ! -s conftest.er2 || diff conftest.exp conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_pic_works_CXX=yes
@@ -13617,13 +14216,15 @@
 
 
 
+
+
 #
 # Check to make sure the static flag actually works.
 #
 wl=$lt_prog_compiler_wl_CXX eval lt_tmp_static_flag=\"$lt_prog_compiler_static_CXX\"
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler static flag $lt_tmp_static_flag works" >&5
 $as_echo_n "checking if $compiler static flag $lt_tmp_static_flag works... " >&6; }
-if test "${lt_cv_prog_compiler_static_works_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_static_works_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_static_works_CXX=no
@@ -13636,7 +14237,7 @@
      if test -s conftest.err; then
        # Append any errors to the config.log.
        cat conftest.err 1>&5
-       $ECHO "X$_lt_linker_boilerplate" | $Xsed -e '/^$/d' > conftest.exp
+       $ECHO "$_lt_linker_boilerplate" | $SED '/^$/d' > conftest.exp
        $SED '/^$/d; /^ *+/d' conftest.err >conftest.er2
        if diff conftest.exp conftest.er2 >/dev/null; then
          lt_cv_prog_compiler_static_works_CXX=yes
@@ -13663,7 +14264,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -13682,16 +14283,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13685: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13689: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -13715,7 +14316,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking if $compiler supports -c -o file.$ac_objext" >&5
 $as_echo_n "checking if $compiler supports -c -o file.$ac_objext... " >&6; }
-if test "${lt_cv_prog_compiler_c_o_CXX+set}" = set; then :
+if ${lt_cv_prog_compiler_c_o_CXX+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   lt_cv_prog_compiler_c_o_CXX=no
@@ -13734,16 +14335,16 @@
    -e 's:.*FLAGS}\{0,1\} :&$lt_compiler_flag :; t' \
    -e 's: [^ ]*conftest\.: $lt_compiler_flag&:; t' \
    -e 's:$: $lt_compiler_flag:'`
-   (eval echo "\"\$as_me:13737: $lt_compile\"" >&5)
+   (eval echo "\"\$as_me:$LINENO: $lt_compile\"" >&5)
    (eval "$lt_compile" 2>out/conftest.err)
    ac_status=$?
    cat out/conftest.err >&5
-   echo "$as_me:13741: \$? = $ac_status" >&5
+   echo "$as_me:$LINENO: \$? = $ac_status" >&5
    if (exit $ac_status) && test -s out/conftest2.$ac_objext
    then
      # The compiler can only warn and ignore the option if not recognized
      # So say no if there are warnings
-     $ECHO "X$_lt_compiler_boilerplate" | $Xsed -e '/^$/d' > out/conftest.exp
+     $ECHO "$_lt_compiler_boilerplate" | $SED '/^$/d' > out/conftest.exp
      $SED '/^$/d; /^ *+/d' out/conftest.err >out/conftest.er2
      if test ! -s out/conftest.er2 || diff out/conftest.exp out/conftest.er2 >/dev/null; then
        lt_cv_prog_compiler_c_o_CXX=yes
@@ -13794,30 +14395,40 @@
 $as_echo_n "checking whether the $compiler linker ($LD) supports shared libraries... " >&6; }
 
   export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
+  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
   case $host_os in
   aix[4-9]*)
     # If we're using GNU nm, then we don't want the "-C" option.
     # -C means demangle to AIX nm, but means don't demangle with GNU nm
+    # Also, AIX nm treats weak defined symbols like other global defined
+    # symbols, whereas GNU nm marks them as "W".
     if $NM -V 2>&1 | $GREP 'GNU' > /dev/null; then
-      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
+      export_symbols_cmds_CXX='$NM -Bpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B") || (\$ 2 == "W")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     else
       export_symbols_cmds_CXX='$NM -BCpg $libobjs $convenience | awk '\''{ if (((\$ 2 == "T") || (\$ 2 == "D") || (\$ 2 == "B")) && (substr(\$ 3,1,1) != ".")) { print \$ 3 } }'\'' | sort -u > $export_symbols'
     fi
     ;;
   pw32*)
     export_symbols_cmds_CXX="$ltdll_cmds"
-  ;;
+    ;;
   cygwin* | mingw* | cegcc*)
-    export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;/^.*[ ]__nm__/s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
-  linux* | k*bsd*-gnu)
+    case $cc_basename in
+    cl*)
+      exclude_expsyms_CXX='_NULL_IMPORT_DESCRIPTOR|_IMPORT_DESCRIPTOR_.*'
+      ;;
+    *)
+      export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED -e '\''/^[BCDGRS][ ]/s/.*[ ]\([^ ]*\)/\1 DATA/;s/^.*[ ]__nm__\([^ ]*\)[ ][^ ]*/\1 DATA/;/^I[ ]/d;/^[AITW][ ]/s/.* //'\'' | sort | uniq > $export_symbols'
+      exclude_expsyms_CXX='[_]+GLOBAL_OFFSET_TABLE_|[_]+GLOBAL__[FID]_.*|[_]+head_[A-Za-z0-9_]+_dll|[A-Za-z0-9_]+_dll_iname'
+      ;;
+    esac
+    ;;
+  linux* | k*bsd*-gnu | gnu*)
     link_all_deplibs_CXX=no
-  ;;
+    ;;
   *)
     export_symbols_cmds_CXX='$NM $libobjs $convenience | $global_symbol_pipe | $SED '\''s/.* //'\'' | sort | uniq > $export_symbols'
-  ;;
+    ;;
   esac
-  exclude_expsyms_CXX='_GLOBAL_OFFSET_TABLE_|_GLOBAL__F[ID]_.*'
 
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ld_shlibs_CXX" >&5
 $as_echo "$ld_shlibs_CXX" >&6; }
@@ -13849,44 +14460,50 @@
       # to ld, don't add -lc before -lgcc.
       { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether -lc should be explicitly linked in" >&5
 $as_echo_n "checking whether -lc should be explicitly linked in... " >&6; }
-      $RM conftest*
-      echo "$lt_simple_compile_test_code" > conftest.$ac_ext
+if ${lt_cv_archive_cmds_need_lc_CXX+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  $RM conftest*
+	echo "$lt_simple_compile_test_code" > conftest.$ac_ext
 
-      if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
+	if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$ac_compile\""; } >&5
   (eval $ac_compile) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; } 2>conftest.err; then
-        soname=conftest
-        lib=conftest
-        libobjs=conftest.$ac_objext
-        deplibs=
-        wl=$lt_prog_compiler_wl_CXX
-	pic_flag=$lt_prog_compiler_pic_CXX
-        compiler_flags=-v
-        linker_flags=-v
-        verstring=
-        output_objdir=.
-        libname=conftest
-        lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
-        allow_undefined_flag_CXX=
-        if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
+	  soname=conftest
+	  lib=conftest
+	  libobjs=conftest.$ac_objext
+	  deplibs=
+	  wl=$lt_prog_compiler_wl_CXX
+	  pic_flag=$lt_prog_compiler_pic_CXX
+	  compiler_flags=-v
+	  linker_flags=-v
+	  verstring=
+	  output_objdir=.
+	  libname=conftest
+	  lt_save_allow_undefined_flag=$allow_undefined_flag_CXX
+	  allow_undefined_flag_CXX=
+	  if { { eval echo "\"\$as_me\":${as_lineno-$LINENO}: \"$archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1\""; } >&5
   (eval $archive_cmds_CXX 2\>\&1 \| $GREP \" -lc \" \>/dev/null 2\>\&1) 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }
-        then
-	  archive_cmds_need_lc_CXX=no
-        else
-	  archive_cmds_need_lc_CXX=yes
-        fi
-        allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
-      else
-        cat conftest.err 1>&5
-      fi
-      $RM conftest*
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: $archive_cmds_need_lc_CXX" >&5
-$as_echo "$archive_cmds_need_lc_CXX" >&6; }
+	  then
+	    lt_cv_archive_cmds_need_lc_CXX=no
+	  else
+	    lt_cv_archive_cmds_need_lc_CXX=yes
+	  fi
+	  allow_undefined_flag_CXX=$lt_save_allow_undefined_flag
+	else
+	  cat conftest.err 1>&5
+	fi
+	$RM conftest*
+
+fi
+{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $lt_cv_archive_cmds_need_lc_CXX" >&5
+$as_echo "$lt_cv_archive_cmds_need_lc_CXX" >&6; }
+      archive_cmds_need_lc_CXX=$lt_cv_archive_cmds_need_lc_CXX
       ;;
     esac
   fi
@@ -13954,8 +14571,6 @@
 
 
 
-
-
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking dynamic linker characteristics" >&5
 $as_echo_n "checking dynamic linker characteristics... " >&6; }
 
@@ -13981,7 +14596,7 @@
 
 case $host_os in
 aix3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix $libname.a'
   shlibpath_var=LIBPATH
 
@@ -13990,7 +14605,7 @@
   ;;
 
 aix[4-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   hardcode_into_libs=yes
@@ -14043,7 +14658,7 @@
   m68k)
     library_names_spec='$libname.ixlibrary $libname.a'
     # Create ${libname}_ixlibrary.a entries in /sys/libs.
-    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`$ECHO "X$lib" | $Xsed -e '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
+    finish_eval='for lib in `ls $libdir/*.ixlibrary 2>/dev/null`; do libname=`func_echo_all "$lib" | $SED '\''s%^.*/\([^/]*\)\.ixlibrary$%\1%'\''`; test $RM /sys/libs/${libname}_ixlibrary.a; $show "cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a"; cd /sys/libs && $LN_S $lib ${libname}_ixlibrary.a || exit 1; done'
     ;;
   esac
   ;;
@@ -14055,7 +14670,7 @@
   ;;
 
 bsdi[45]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
@@ -14074,8 +14689,9 @@
   need_version=no
   need_lib_prefix=no
 
-  case $GCC,$host_os in
-  yes,cygwin* | yes,mingw* | yes,pw32* | yes,cegcc*)
+  case $GCC,$cc_basename in
+  yes,*)
+    # gcc
     library_names_spec='$libname.dll.a'
     # DLL is installed to $(libdir)/../bin by postinstall_cmds
     postinstall_cmds='base_file=`basename \${file}`~
@@ -14096,36 +14712,82 @@
     cygwin*)
       # Cygwin DLLs use 'cyg' prefix rather than 'lib'
       soname_spec='`echo ${libname} | sed -e 's/^lib/cyg/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec="/usr/lib /lib/w32api /lib /usr/local/lib"
+
       ;;
     mingw* | cegcc*)
       # MinGW DLLs use traditional 'lib' prefix
       soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
-      sys_lib_search_path_spec=`$CC -print-search-dirs | $GREP "^libraries:" | $SED -e "s/^libraries://" -e "s,=/,/,g"`
-      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
-        # It is most probably a Windows format PATH printed by
-        # mingw gcc, but we are running on Cygwin. Gcc prints its search
-        # path with ; separators, and with drive letters. We can handle the
-        # drive letters (cygwin fileutils understands them), so leave them,
-        # especially as we might pass files found there to a mingw objdump,
-        # which wouldn't understand a cygwinified path. Ahh.
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
-      else
-        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED  -e "s/$PATH_SEPARATOR/ /g"`
-      fi
       ;;
     pw32*)
       # pw32 DLLs use 'pw' prefix rather than 'lib'
       library_names_spec='`echo ${libname} | sed -e 's/^lib/pw/'``echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
       ;;
     esac
+    dynamic_linker='Win32 ld.exe'
+    ;;
+
+  *,cl*)
+    # Native MSVC
+    libname_spec='$name'
+    soname_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext}'
+    library_names_spec='${libname}.dll.lib'
+
+    case $build_os in
+    mingw*)
+      sys_lib_search_path_spec=
+      lt_save_ifs=$IFS
+      IFS=';'
+      for lt_path in $LIB
+      do
+        IFS=$lt_save_ifs
+        # Let DOS variable expansion print the short 8.3 style file name.
+        lt_path=`cd "$lt_path" 2>/dev/null && cmd //C "for %i in (".") do @echo %~si"`
+        sys_lib_search_path_spec="$sys_lib_search_path_spec $lt_path"
+      done
+      IFS=$lt_save_ifs
+      # Convert to MSYS style.
+      sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | sed -e 's|\\\\|/|g' -e 's| \\([a-zA-Z]\\):| /\\1|g' -e 's|^ ||'`
+      ;;
+    cygwin*)
+      # Convert to unix form, then to dos form, then back to unix form
+      # but this time dos style (no spaces!) so that the unix form looks
+      # like /cygdrive/c/PROGRA~1:/cygdr...
+      sys_lib_search_path_spec=`cygpath --path --unix "$LIB"`
+      sys_lib_search_path_spec=`cygpath --path --dos "$sys_lib_search_path_spec" 2>/dev/null`
+      sys_lib_search_path_spec=`cygpath --path --unix "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      ;;
+    *)
+      sys_lib_search_path_spec="$LIB"
+      if $ECHO "$sys_lib_search_path_spec" | $GREP ';[c-zC-Z]:/' >/dev/null; then
+        # It is most probably a Windows format PATH.
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e 's/;/ /g'`
+      else
+        sys_lib_search_path_spec=`$ECHO "$sys_lib_search_path_spec" | $SED -e "s/$PATH_SEPARATOR/ /g"`
+      fi
+      # FIXME: find the short name or the path components, as spaces are
+      # common. (e.g. "Program Files" -> "PROGRA~1")
+      ;;
+    esac
+
+    # DLL is installed to $(libdir)/../bin by postinstall_cmds
+    postinstall_cmds='base_file=`basename \${file}`~
+      dlpath=`$SHELL 2>&1 -c '\''. $dir/'\''\${base_file}'\''i; echo \$dlname'\''`~
+      dldir=$destdir/`dirname \$dlpath`~
+      test -d \$dldir || mkdir -p \$dldir~
+      $install_prog $dir/$dlname \$dldir/$dlname'
+    postuninstall_cmds='dldll=`$SHELL 2>&1 -c '\''. $file; echo \$dlname'\''`~
+      dlpath=$dir/\$dldll~
+       $RM \$dlpath'
+    shlibpath_overrides_runpath=yes
+    dynamic_linker='Win32 link.exe'
     ;;
 
   *)
+    # Assume MSVC wrapper
     library_names_spec='${libname}`echo ${release} | $SED -e 's/[.]/-/g'`${versuffix}${shared_ext} $libname.lib'
+    dynamic_linker='Win32 ld.exe'
     ;;
   esac
-  dynamic_linker='Win32 ld.exe'
   # FIXME: first we should search . and the directory the executable is in
   shlibpath_var=PATH
   ;;
@@ -14145,7 +14807,7 @@
   ;;
 
 dgux*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname$shared_ext'
@@ -14153,10 +14815,6 @@
   shlibpath_var=LD_LIBRARY_PATH
   ;;
 
-freebsd1*)
-  dynamic_linker=no
-  ;;
-
 freebsd* | dragonfly*)
   # DragonFly does not have aout.  When/if they implement a new
   # versioning mechanism, adjust this.
@@ -14164,7 +14822,7 @@
     objformat=`/usr/bin/objformat`
   else
     case $host_os in
-    freebsd[123]*) objformat=aout ;;
+    freebsd[23].*) objformat=aout ;;
     *) objformat=elf ;;
     esac
   fi
@@ -14182,7 +14840,7 @@
   esac
   shlibpath_var=LD_LIBRARY_PATH
   case $host_os in
-  freebsd2*)
+  freebsd2.*)
     shlibpath_overrides_runpath=yes
     ;;
   freebsd3.[01]* | freebsdelf3.[01]*)
@@ -14201,13 +14859,16 @@
   esac
   ;;
 
-gnu*)
-  version_type=linux
+haiku*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
+  dynamic_linker="$host_os runtime_loader"
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}${major} ${libname}${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
-  shlibpath_var=LD_LIBRARY_PATH
+  shlibpath_var=LIBRARY_PATH
+  shlibpath_overrides_runpath=yes
+  sys_lib_dlsearch_path_spec='/boot/home/config/lib /boot/common/lib /boot/system/lib'
   hardcode_into_libs=yes
   ;;
 
@@ -14253,12 +14914,14 @@
     soname_spec='${libname}${release}${shared_ext}$major'
     ;;
   esac
-  # HP-UX runs *really* slowly unless shared libraries are mode 555.
+  # HP-UX runs *really* slowly unless shared libraries are mode 555, ...
   postinstall_cmds='chmod 555 $lib'
+  # or fails outright, so override atomically:
+  install_override_mode=555
   ;;
 
 interix[3-9]*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major ${libname}${shared_ext}'
@@ -14274,7 +14937,7 @@
     nonstopux*) version_type=nonstopux ;;
     *)
 	if test "$lt_cv_prog_gnu_ld" = yes; then
-		version_type=linux
+		version_type=linux # correct to gnu/linux during the next big refactor
 	else
 		version_type=irix
 	fi ;;
@@ -14311,9 +14974,9 @@
   dynamic_linker=no
   ;;
 
-# This must be Linux ELF.
-linux* | k*bsd*-gnu | kopensolaris*-gnu)
-  version_type=linux
+# This must be glibc/ELF.
+linux* | k*bsd*-gnu | kopensolaris*-gnu | gnu*)
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14321,12 +14984,17 @@
   finish_cmds='PATH="\$PATH:/sbin" ldconfig -n $libdir'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=no
+
   # Some binutils ld are patched to set DT_RUNPATH
-  save_LDFLAGS=$LDFLAGS
-  save_libdir=$libdir
-  eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
-       LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
-  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+  if ${lt_cv_shlibpath_overrides_runpath+:} false; then :
+  $as_echo_n "(cached) " >&6
+else
+  lt_cv_shlibpath_overrides_runpath=no
+    save_LDFLAGS=$LDFLAGS
+    save_libdir=$libdir
+    eval "libdir=/foo; wl=\"$lt_prog_compiler_wl_CXX\"; \
+	 LDFLAGS=\"\$LDFLAGS $hardcode_libdir_flag_spec_CXX\""
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 int
@@ -14339,13 +15007,17 @@
 _ACEOF
 if ac_fn_cxx_try_link "$LINENO"; then :
   if  ($OBJDUMP -p conftest$ac_exeext) 2>/dev/null | grep "RUNPATH.*$libdir" >/dev/null; then :
-  shlibpath_overrides_runpath=yes
+  lt_cv_shlibpath_overrides_runpath=yes
 fi
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext conftest.$ac_ext
-  LDFLAGS=$save_LDFLAGS
-  libdir=$save_libdir
+    LDFLAGS=$save_LDFLAGS
+    libdir=$save_libdir
+
+fi
+
+  shlibpath_overrides_runpath=$lt_cv_shlibpath_overrides_runpath
 
   # This implies no fast_install, which is unacceptable.
   # Some rework will be needed to allow for fast_install
@@ -14354,7 +15026,7 @@
 
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
-    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
+    lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \$2)); skip = 1; } { if (!skip) print \$0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[	 ]*hwcap[	 ]/d;s/[:,	]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;s/"//g;/^$/d' | tr '\n' ' '`
     sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
   fi
 
@@ -14398,7 +15070,7 @@
   ;;
 
 newsos6)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   shlibpath_var=LD_LIBRARY_PATH
   shlibpath_overrides_runpath=yes
@@ -14467,7 +15139,7 @@
   ;;
 
 solaris*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14492,7 +15164,7 @@
   ;;
 
 sysv4 | sysv4.3*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14516,7 +15188,7 @@
 
 sysv4*MP*)
   if test -d /usr/nec ;then
-    version_type=linux
+    version_type=linux # correct to gnu/linux during the next big refactor
     library_names_spec='$libname${shared_ext}.$versuffix $libname${shared_ext}.$major $libname${shared_ext}'
     soname_spec='$libname${shared_ext}.$major'
     shlibpath_var=LD_LIBRARY_PATH
@@ -14547,7 +15219,7 @@
 
 tpf*)
   # TPF is a cross-target only.  Preferred cross-host = GNU/Linux.
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   need_lib_prefix=no
   need_version=no
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
@@ -14557,7 +15229,7 @@
   ;;
 
 uts4*)
-  version_type=linux
+  version_type=linux # correct to gnu/linux during the next big refactor
   library_names_spec='${libname}${release}${shared_ext}$versuffix ${libname}${release}${shared_ext}$major $libname${shared_ext}'
   soname_spec='${libname}${release}${shared_ext}$major'
   shlibpath_var=LD_LIBRARY_PATH
@@ -14618,6 +15290,8 @@
 
 
 
+
+
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking how to hardcode library paths into programs" >&5
 $as_echo_n "checking how to hardcode library paths into programs... " >&6; }
 hardcode_action_CXX=
@@ -14665,6 +15339,7 @@
   fi # test -n "$compiler"
 
   CC=$lt_save_CC
+  CFLAGS=$lt_save_CFLAGS
   LDCXX=$LD
   LD=$lt_save_LD
   GCC=$lt_save_GCC
@@ -14693,6 +15368,8 @@
 
 
 
+
+
         ac_config_commands="$ac_config_commands libtool"
 
 
@@ -14766,10 +15443,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -14843,8 +15531,99 @@
   cxx_has_cxx0x=""
   if test "X$GCC" = "Xyes"; then
 
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=gnu++0x" >&5
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=gnu++11" >&5
+$as_echo_n "checking whether compiler supports -std=gnu++11... " >&6; }
+  if test "X${cxx_has_cxx0x}" = "X"; then
+
+    old_cxxflags="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -std=gnu++11"
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+
+int
+main ()
+{
+
+        return 0;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      cxx_has_cxx0x="-std=gnu++11"
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      CXXFLAGS="$old_cxxflags"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=c++11" >&5
+$as_echo_n "checking whether compiler supports -std=c++11... " >&6; }
+  if test "X${cxx_has_cxx0x}" = "X"; then
+
+    old_cxxflags="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -std=c++11"
+
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+
+int
+main ()
+{
+
+        return 0;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_cxx_try_compile "$LINENO"; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+      cxx_has_cxx0x="-std=c++11"
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      CXXFLAGS="$old_cxxflags"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+  fi
+
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=gnu++0x" >&5
 $as_echo_n "checking whether compiler supports -std=gnu++0x... " >&6; }
+  if test "X${cxx_has_cxx0x}" = "X"; then
 
     old_cxxflags="$CXXFLAGS"
     CXXFLAGS="$CXXFLAGS -std=gnu++0x"
@@ -14873,17 +15652,27 @@
 
 else
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-      CXXFLAGS="$old_cxxflags"
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+      CXXFLAGS="$old_cxxflags"
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+  fi
+
+
 
-      { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=C++0x" >&5
-$as_echo_n "checking whether compiler supports -std=C++0x... " >&6; }
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether compiler supports -std=c++11" >&5
+$as_echo_n "checking whether compiler supports -std=c++11... " >&6; }
+  if test "X${cxx_has_cxx0x}" = "X"; then
 
-      old_cxxflags="$CXXFLAGS"
-      CXXFLAGS="$CXXFLAGS -std=c++0x"
+    old_cxxflags="$CXXFLAGS"
+    CXXFLAGS="$CXXFLAGS -std=c++11"
 
-      cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+    cat confdefs.h - <<_ACEOF >conftest.$ac_ext
 /* end confdefs.h.  */
 
 
@@ -14892,7 +15681,7 @@
 main ()
 {
 
-          return 0;
+        return 0;
 
   ;
   return 0;
@@ -14901,22 +15690,22 @@
 _ACEOF
 if ac_fn_cxx_try_compile "$LINENO"; then :
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        cxx_has_cxx0x="-std=c++0x"
+      cxx_has_cxx0x="-std=c++11"
 
 else
 
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-        CXXFLAGS="$old_cxxflags"
-
-fi
-rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
-
+      CXXFLAGS="$old_cxxflags"
 
 fi
 rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+  else
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: skipped" >&5
+$as_echo "skipped" >&6; }
+  fi
 
   fi
 
@@ -14990,7 +15779,7 @@
         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "No unordered_map implementation found.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 fi
 rm -f conftest.err conftest.i conftest.$ac_ext
@@ -15146,7 +15935,7 @@
 set dummy $WX_CONFIG_NAME; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_WX_CONFIG_PATH+set}" = set; then :
+if ${ac_cv_path_WX_CONFIG_PATH+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $WX_CONFIG_PATH in
@@ -15161,7 +15950,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_WX_CONFIG_PATH="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15350,7 +16139,7 @@
     as_fn_error $? "
         wxWidgets must be installed on your system
         but either the wx-config script couldn't be found or
-        no compatible wxWidgets configuration has been insalled.
+        no compatible wxWidgets configuration has been installed.
 
         Compatible wxWidgets configurations are the unicode builds
         of wxGTK, wxMac and wxMSW.
@@ -15406,7 +16195,7 @@
         { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5
 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;}
 as_fn_error $? "Positional printf argument support in wxWidgets is required by FileZilla. Please rebuild wxWidgets and pass --enable-printfposparam to its configure script.
-See \`config.log' for more details" "$LINENO" 5 ; }
+See \`config.log' for more details" "$LINENO" 5; }
 
 
 fi
@@ -15485,10 +16274,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -15528,7 +16328,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing socket" >&5
 $as_echo_n "checking for library containing socket... " >&6; }
-if test "${ac_cv_search_socket+set}" = set; then :
+if ${ac_cv_search_socket+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -15562,11 +16362,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_socket+set}" = set; then :
+  if ${ac_cv_search_socket+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_socket+set}" = set; then :
+if ${ac_cv_search_socket+:} false; then :
 
 else
   ac_cv_search_socket=no
@@ -15584,7 +16384,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing getaddrinfo" >&5
 $as_echo_n "checking for library containing getaddrinfo... " >&6; }
-if test "${ac_cv_search_getaddrinfo+set}" = set; then :
+if ${ac_cv_search_getaddrinfo+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -15618,11 +16418,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_getaddrinfo+set}" = set; then :
+  if ${ac_cv_search_getaddrinfo+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_getaddrinfo+set}" = set; then :
+if ${ac_cv_search_getaddrinfo+:} false; then :
 
 else
   ac_cv_search_getaddrinfo=no
@@ -15640,7 +16440,7 @@
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking for library containing in6addr_loopback" >&5
 $as_echo_n "checking for library containing in6addr_loopback... " >&6; }
-if test "${ac_cv_search_in6addr_loopback+set}" = set; then :
+if ${ac_cv_search_in6addr_loopback+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_func_search_save_LIBS=$LIBS
@@ -15674,11 +16474,11 @@
 fi
 rm -f core conftest.err conftest.$ac_objext \
     conftest$ac_exeext
-  if test "${ac_cv_search_in6addr_loopback+set}" = set; then :
+  if ${ac_cv_search_in6addr_loopback+:} false; then :
   break
 fi
 done
-if test "${ac_cv_search_in6addr_loopback+set}" = set; then :
+if ${ac_cv_search_in6addr_loopback+:} false; then :
 
 else
   ac_cv_search_in6addr_loopback=no
@@ -15760,21 +16560,21 @@
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether to use windres" >&5
 $as_echo_n "checking whether to use windres... " >&6; }
   if echo $host_os | grep "cygwin\|mingw" > /dev/null 2>&1; then
-        if echo $WX_CPPFLAGS | grep __WXMSW__ > /dev/null 2>&1; then
-        if test -z "$host_alias"; then
-            hostaliaswindres=
-        else
-            hostaliaswindres="$host_alias-windres"
-        fi
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    if echo $WX_CPPFLAGS | grep __WXMSW__ > /dev/null 2>&1; then
+      if test -z "$host_alias"; then
+        hostaliaswindres=
+      else
+        hostaliaswindres="$host_alias-windres"
+      fi
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-        for ac_prog in windres $hostaliaswindres $host_os-windres
+      for ac_prog in windres $hostaliaswindres $host_os-windres
 do
   # Extract the first word of "$ac_prog", so it can be a program name with args.
 set dummy $ac_prog; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_WINDRES+set}" = set; then :
+if ${ac_cv_path_WINDRES+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $WINDRES in
@@ -15788,7 +16588,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_WINDRES="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -15813,13 +16613,68 @@
   test -n "$WINDRES" && break
 done
 
-        if test "x$WINDRES" = "x"; then
-            as_fn_error $? "windres could not be found, please make sure this program is within your path." "$LINENO" 5
-        fi
-                use_resourcefile=true
-                parseflags $WX_CPPFLAGS
+      if test "x$WINDRES" = "x"; then
+        as_fn_error $? "windres could not be found, please make sure this program is within your path." "$LINENO" 5
+      fi
+      use_resourcefile=true
+      parseflags $WX_CPPFLAGS
+
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
+  { $as_echo "$as_me:${as_lineno-$LINENO}: checking whether MinGW headers declare ICopyHookW" >&5
+$as_echo_n "checking whether MinGW headers declare ICopyHookW... " >&6; }
+  cat confdefs.h - <<_ACEOF >conftest.$ac_ext
+/* end confdefs.h.  */
+
+
+        #include <objbase.h>
+        #include <shlobj.h>
+
+int
+main ()
+{
+
+    ICopyHookW* foo;
+        return 0;
+
+  ;
+  return 0;
+}
+
+_ACEOF
+if ac_fn_c_try_compile "$LINENO"; then :
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+$as_echo "yes" >&6; }
+
+$as_echo "#define HAVE_ICOPYHOOKW 1" >>confdefs.h
+
+
+else
+
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+$as_echo "no" >&6; }
+
+fi
+rm -f core conftest.err conftest.$ac_objext conftest.$ac_ext
+
+
+  ac_ext=c
+ac_cpp='$CPP $CPPFLAGS'
+ac_compile='$CC -c $CFLAGS $CPPFLAGS conftest.$ac_ext >&5'
+ac_link='$CC -o conftest$ac_exeext $CFLAGS $CPPFLAGS $LDFLAGS conftest.$ac_ext $LIBS >&5'
+ac_compiler_gnu=$ac_cv_c_compiler_gnu
+
+
     else
-        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+      { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
     fi
   else
@@ -15895,7 +16750,7 @@
   # -------------
 
   ac_fn_c_check_header_mongrel "$LINENO" "idna.h" "ac_cv_header_idna_h" "$ac_includes_default"
-if test "x$ac_cv_header_idna_h" = x""yes; then :
+if test "x$ac_cv_header_idna_h" = xyes; then :
 
 else
 
@@ -15919,7 +16774,7 @@
   if test "x$IDN_LIB" = "x"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for stringprep_check_version in -lidn" >&5
 $as_echo_n "checking for stringprep_check_version in -lidn... " >&6; }
-if test "${ac_cv_lib_idn_stringprep_check_version+set}" = set; then :
+if ${ac_cv_lib_idn_stringprep_check_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -15953,7 +16808,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_idn_stringprep_check_version" >&5
 $as_echo "$ac_cv_lib_idn_stringprep_check_version" >&6; }
-if test "x$ac_cv_lib_idn_stringprep_check_version" = x""yes; then :
+if test "x$ac_cv_lib_idn_stringprep_check_version" = xyes; then :
   IDN_LIB="-lidn"
 else
   as_fn_error $? "GNU libidn not found. Try using --with-idn-lib=FILE to specify the library path." "$LINENO" 5
@@ -16064,7 +16919,7 @@
 set dummy cppunit-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_CPPUNIT_CONFIG+set}" = set; then :
+if ${ac_cv_path_CPPUNIT_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $CPPUNIT_CONFIG in
@@ -16078,7 +16933,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_CPPUNIT_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16217,12 +17072,12 @@
 
 
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	if test -n "$ac_tool_prefix"; then
+    if test -n "$ac_tool_prefix"; then
   # Extract the first word of "${ac_tool_prefix}pkg-config", so it can be a program name with args.
 set dummy ${ac_tool_prefix}pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $PKG_CONFIG in
@@ -16236,7 +17091,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16265,7 +17120,7 @@
 set dummy pkg-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_ac_pt_PKG_CONFIG+set}" = set; then :
+if ${ac_cv_path_ac_pt_PKG_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $ac_pt_PKG_CONFIG in
@@ -16279,7 +17134,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_ac_pt_PKG_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16317,17 +17172,17 @@
 
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=0.9.0
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
+    _pkg_min_version=0.9.0
+    { $as_echo "$as_me:${as_lineno-$LINENO}: checking pkg-config is at least version $_pkg_min_version" >&5
 $as_echo_n "checking pkg-config is at least version $_pkg_min_version... " >&6; }
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
+    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	else
-		{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    else
+        { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
-		PKG_CONFIG=""
-	fi
+        PKG_CONFIG=""
+    fi
 
 fi
 
@@ -16378,14 +17233,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.8.3" 2>&1`
+            LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gnutls >= 2.8.3" 2>&1`
         else
-	        LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.8.3" 2>&1`
+            LIBGNUTLS_PKG_ERRORS=`$PKG_CONFIG --print-errors "gnutls >= 2.8.3" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBGNUTLS_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBGNUTLS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 
@@ -16408,7 +17263,7 @@
 set dummy libgnutls-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then :
+if ${ac_cv_path_LIBGNUTLS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LIBGNUTLS_CONFIG in
@@ -16422,7 +17277,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16632,7 +17487,7 @@
 set dummy libgnutls-config; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_LIBGNUTLS_CONFIG+set}" = set; then :
+if ${ac_cv_path_LIBGNUTLS_CONFIG+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $LIBGNUTLS_CONFIG in
@@ -16646,7 +17501,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_LIBGNUTLS_CONFIG="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -16835,11 +17690,11 @@
 
 
 else
-	LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS
-	LIBGNUTLS_LIBS=$pkg_cv_LIBGNUTLS_LIBS
+    LIBGNUTLS_CFLAGS=$pkg_cv_LIBGNUTLS_CFLAGS
+    LIBGNUTLS_LIBS=$pkg_cv_LIBGNUTLS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+    :
 fi
 
 
@@ -16881,7 +17736,7 @@
 
     if test "x$with_tinyxml" != "xbuiltin"; then
     ac_fn_cxx_check_header_mongrel "$LINENO" "tinyxml.h" "ac_cv_header_tinyxml_h" "$ac_includes_default"
-if test "x$ac_cv_header_tinyxml_h" = x""yes; then :
+if test "x$ac_cv_header_tinyxml_h" = xyes; then :
 
 else
 
@@ -16900,7 +17755,7 @@
   if test "x$with_tinyxml" != "xbuiltin"; then
         { $as_echo "$as_me:${as_lineno-$LINENO}: checking for main in -ltinyxml" >&5
 $as_echo_n "checking for main in -ltinyxml... " >&6; }
-if test "${ac_cv_lib_tinyxml_main+set}" = set; then :
+if ${ac_cv_lib_tinyxml_main+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -16928,7 +17783,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_tinyxml_main" >&5
 $as_echo "$ac_cv_lib_tinyxml_main" >&6; }
-if test "x$ac_cv_lib_tinyxml_main" = x""yes; then :
+if test "x$ac_cv_lib_tinyxml_main" = xyes; then :
   true
 else
 
@@ -17100,14 +17955,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.2" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1 >= 1.2" 2>&1`
         else
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.2" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1 >= 1.2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBDBUS_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBDBUS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 
@@ -17158,14 +18013,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
         else
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBDBUS_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBDBUS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
             as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5
@@ -17175,11 +18030,11 @@
             as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5
 
 else
-	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
-	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
+    LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
+    LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	with_dbus_v="1"
+    with_dbus_v="1"
 fi
 
 elif test $pkg_failed = untried; then
@@ -17232,14 +18087,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "dbus-1" 2>&1`
         else
-	        LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
+            LIBDBUS_PKG_ERRORS=`$PKG_CONFIG --print-errors "dbus-1" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBDBUS_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBDBUS_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
             as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5
@@ -17249,19 +18104,19 @@
             as_fn_error $? "libdbus not found. Install libdbus or configure with --without-dbus" "$LINENO" 5
 
 else
-	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
-	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
+    LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
+    LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	with_dbus_v="1"
+    with_dbus_v="1"
 fi
 
 else
-	LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
-	LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
+    LIBDBUS_CFLAGS=$pkg_cv_LIBDBUS_CFLAGS
+    LIBDBUS_LIBS=$pkg_cv_LIBDBUS_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	with_dbus_v="2"
+    with_dbus_v="2"
 fi
 
 cat >>confdefs.h <<_ACEOF
@@ -17282,7 +18137,7 @@
 set dummy xdg-open; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_xdgopen+set}" = set; then :
+if ${ac_cv_path_xdgopen+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $xdgopen in
@@ -17296,7 +18151,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_xdgopen="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17370,14 +18225,14 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1`
+            LIBGTK_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "gtk+-2.0" 2>&1`
         else
-	        LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`
+            LIBGTK_PKG_ERRORS=`$PKG_CONFIG --print-errors "gtk+-2.0" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBGTK_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBGTK_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
       as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
@@ -17387,11 +18242,11 @@
       as_fn_error $? "gtk+-2.0 was not found, even though the used version of wxWidgets depends on it. Are you missing the gtk+2.0 development files?" "$LINENO" 5
 
 else
-	LIBGTK_CFLAGS=$pkg_cv_LIBGTK_CFLAGS
-	LIBGTK_LIBS=$pkg_cv_LIBGTK_LIBS
+    LIBGTK_CFLAGS=$pkg_cv_LIBGTK_CFLAGS
+    LIBGTK_LIBS=$pkg_cv_LIBGTK_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+    :
 fi
 
 
@@ -17400,14 +18255,14 @@
 
   # Some more obscure platforms (e.g. HP-UX) don't have setenv which is required by POSIX
   ac_fn_c_check_func "$LINENO" "setenv" "ac_cv_func_setenv"
-if test "x$ac_cv_func_setenv" = x""yes; then :
+if test "x$ac_cv_func_setenv" = xyes; then :
 
 $as_echo "#define HAVE_SETENV 1" >>confdefs.h
 
 fi
 
   ac_fn_c_check_func "$LINENO" "putenv" "ac_cv_func_putenv"
-if test "x$ac_cv_func_putenv" = x""yes; then :
+if test "x$ac_cv_func_putenv" = xyes; then :
 
 $as_echo "#define HAVE_PUTENV 1" >>confdefs.h
 
@@ -17465,19 +18320,19 @@
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-	        LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= 3.7" 2>&1`
+            LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "sqlite3 >= 3.7" 2>&1`
         else
-	        LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= 3.7" 2>&1`
+            LIBSQLITE3_PKG_ERRORS=`$PKG_CONFIG --print-errors "sqlite3 >= 3.7" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$LIBSQLITE3_PKG_ERRORS" >&5
+    # Put the nasty error message in config.log where it belongs
+    echo "$LIBSQLITE3_PKG_ERRORS" >&5
 
-	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
+    { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
 $as_echo "no" >&6; }
 
 
     ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
 
 else
 
@@ -17489,7 +18344,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_version in -lsqlite3" >&5
 $as_echo_n "checking for sqlite3_version in -lsqlite3... " >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_version+set}" = set; then :
+if ${ac_cv_lib_sqlite3_sqlite3_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17523,7 +18378,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_version" >&5
 $as_echo "$ac_cv_lib_sqlite3_sqlite3_version" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_version" = x""yes; then :
+if test "x$ac_cv_lib_sqlite3_sqlite3_version" = xyes; then :
   LIBSQLITE3_LIBS="-lsqlite3"
 else
 
@@ -17536,7 +18391,7 @@
 
 
     ac_fn_c_check_header_mongrel "$LINENO" "sqlite3.h" "ac_cv_header_sqlite3_h" "$ac_includes_default"
-if test "x$ac_cv_header_sqlite3_h" = x""yes; then :
+if test "x$ac_cv_header_sqlite3_h" = xyes; then :
 
 else
 
@@ -17548,7 +18403,7 @@
 
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for sqlite3_version in -lsqlite3" >&5
 $as_echo_n "checking for sqlite3_version in -lsqlite3... " >&6; }
-if test "${ac_cv_lib_sqlite3_sqlite3_version+set}" = set; then :
+if ${ac_cv_lib_sqlite3_sqlite3_version+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   ac_check_lib_save_LIBS=$LIBS
@@ -17582,7 +18437,7 @@
 fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_sqlite3_sqlite3_version" >&5
 $as_echo "$ac_cv_lib_sqlite3_sqlite3_version" >&6; }
-if test "x$ac_cv_lib_sqlite3_sqlite3_version" = x""yes; then :
+if test "x$ac_cv_lib_sqlite3_sqlite3_version" = xyes; then :
   LIBSQLITE3_LIBS="-lsqlite3"
 else
 
@@ -17592,11 +18447,11 @@
 
 
 else
-	LIBSQLITE3_CFLAGS=$pkg_cv_LIBSQLITE3_CFLAGS
-	LIBSQLITE3_LIBS=$pkg_cv_LIBSQLITE3_LIBS
+    LIBSQLITE3_CFLAGS=$pkg_cv_LIBSQLITE3_CFLAGS
+    LIBSQLITE3_LIBS=$pkg_cv_LIBSQLITE3_LIBS
         { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	:
+    :
 fi
 
 
@@ -17617,7 +18472,7 @@
 set dummy xgettext; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_xgettext+set}" = set; then :
+if ${ac_cv_path_xgettext+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $xgettext in
@@ -17631,7 +18486,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_xgettext="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17661,7 +18516,7 @@
 set dummy msgfmt; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_msgfmt+set}" = set; then :
+if ${ac_cv_path_msgfmt+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $msgfmt in
@@ -17675,7 +18530,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_msgfmt="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17706,7 +18561,7 @@
 set dummy msgmerge; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_msgmerge+set}" = set; then :
+if ${ac_cv_path_msgmerge+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $msgmerge in
@@ -17720,7 +18575,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_msgmerge="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17820,7 +18675,7 @@
 set dummy wxrc --version; ac_word=$2
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
 $as_echo_n "checking for $ac_word... " >&6; }
-if test "${ac_cv_path_WXRC+set}" = set; then :
+if ${ac_cv_path_WXRC+:} false; then :
   $as_echo_n "(cached) " >&6
 else
   case $WXRC in
@@ -17834,7 +18689,7 @@
   IFS=$as_save_IFS
   test -z "$as_dir" && as_dir=.
     for ac_exec_ext in '' $ac_executable_extensions; do
-  if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then
+  if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
     ac_cv_path_WXRC="$as_dir/$ac_word$ac_exec_ext"
     $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
     break 2
@@ -17978,7 +18833,7 @@
 fi
 
 
-ac_config_files="$ac_config_files Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile src/dbus/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile locales/Makefile src/interface/resources/16x16/Makefile src/interface/resources/32x32/Makefile data/Makefile src/interface/resources/cyril/Makefile src/interface/resources/cyril/16x16/Makefile src/interface/resources/blukis/Makefile src/interface/resources/lone/Makefile src/interface/resources/minimal/Makefile src/interface/resources/opencrystal/Makefile src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile tests/Makefile src/interface/resources/version.rc src/interface/resources/MacInfo.plist src/fzshellext/Makefile src/fzshellext/version.rc"
+ac_config_files="$ac_config_files Makefile src/Makefile src/engine/Makefile src/tinyxml/Makefile src/dbus/Makefile src/interface/Makefile src/interface/resources/Makefile src/include/Makefile locales/Makefile src/interface/resources/16x16/Makefile src/interface/resources/32x32/Makefile data/Makefile src/interface/resources/cyril/Makefile src/interface/resources/cyril/16x16/Makefile src/interface/resources/blukis/Makefile src/interface/resources/lone/Makefile src/interface/resources/minimal/Makefile src/interface/resources/opencrystal/Makefile src/interface/resources/tango/Makefile src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile tests/Makefile src/interface/resources/version.rc src/interface/resources/MacInfo.plist src/fzshellext/Makefile src/fzshellext/version.rc"
 
 cat >confcache <<\_ACEOF
 # This file is a shell script that caches the results of configure
@@ -18044,10 +18899,21 @@
      :end' >>confcache
 if diff "$cache_file" confcache >/dev/null 2>&1; then :; else
   if test -w "$cache_file"; then
-    test "x$cache_file" != "x/dev/null" &&
+    if test "x$cache_file" != "x/dev/null"; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: updating cache $cache_file" >&5
 $as_echo "$as_me: updating cache $cache_file" >&6;}
-    cat confcache >$cache_file
+      if test ! -f "$cache_file" || test -h "$cache_file"; then
+	cat confcache >"$cache_file"
+      else
+        case $cache_file in #(
+        */* | ?:*)
+	  mv -f confcache "$cache_file"$$ &&
+	  mv -f "$cache_file"$$ "$cache_file" ;; #(
+        *)
+	  mv -f confcache "$cache_file" ;;
+	esac
+      fi
+    fi
   else
     { $as_echo "$as_me:${as_lineno-$LINENO}: not updating unwritable cache $cache_file" >&5
 $as_echo "$as_me: not updating unwritable cache $cache_file" >&6;}
@@ -18098,10 +18964,6 @@
   as_fn_error $? "conditional \"am__fastdepCC\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
-if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then
-  as_fn_error $? "conditional \"am__fastdepCXX\" was never defined.
-Usually this means the macro was only invoked conditionally." "$LINENO" 5
-fi
 if test -z "${MINGW_TRUE}" && test -z "${MINGW_FALSE}"; then
   as_fn_error $? "conditional \"MINGW\" was never defined.
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
@@ -18155,7 +19017,7 @@
 Usually this means the macro was only invoked conditionally." "$LINENO" 5
 fi
 
-: ${CONFIG_STATUS=./config.status}
+: "${CONFIG_STATUS=./config.status}"
 ac_write_fail=0
 ac_clean_files_save=$ac_clean_files
 ac_clean_files="$ac_clean_files $CONFIG_STATUS"
@@ -18256,6 +19118,7 @@
 IFS=" ""	$as_nl"
 
 # Find who we are.  Look in the path if we contain no directory separator.
+as_myself=
 case $0 in #((
   *[\\/]* ) as_myself=$0 ;;
   *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
@@ -18451,16 +19314,16 @@
     # ... but there are two gotchas:
     # 1) On MSYS, both `ln -s file dir' and `ln file dir' fail.
     # 2) DJGPP < 2.04 has no symlinks; `ln -s' creates a wrapper executable.
-    # In both cases, we have to default to `cp -p'.
+    # In both cases, we have to default to `cp -pR'.
     ln -s conf$$.file conf$$.dir 2>/dev/null && test ! -f conf$$.exe ||
-      as_ln_s='cp -p'
+      as_ln_s='cp -pR'
   elif ln conf$$.file conf$$ 2>/dev/null; then
     as_ln_s=ln
   else
-    as_ln_s='cp -p'
+    as_ln_s='cp -pR'
   fi
 else
-  as_ln_s='cp -p'
+  as_ln_s='cp -pR'
 fi
 rm -f conf$$ conf$$.exe conf$$.dir/conf$$.file conf$$.file
 rmdir conf$$.dir 2>/dev/null
@@ -18520,28 +19383,16 @@
   as_mkdir_p=false
 fi
 
-if test -x / >/dev/null 2>&1; then
-  as_test_x='test -x'
-else
-  if ls -dL / >/dev/null 2>&1; then
-    as_ls_L_option=L
-  else
-    as_ls_L_option=
-  fi
-  as_test_x='
-    eval sh -c '\''
-      if test -d "$1"; then
-	test -d "$1/.";
-      else
-	case $1 in #(
-	-*)set "./$1";;
-	esac;
-	case `ls -ld'$as_ls_L_option' "$1" 2>/dev/null` in #((
-	???[sx]*):;;*)false;;esac;fi
-    '\'' sh
-  '
-fi
-as_executable_p=$as_test_x
+
+# as_fn_executable_p FILE
+# -----------------------
+# Test if FILE is an executable regular file.
+as_fn_executable_p ()
+{
+  test -f "$1" && test -x "$1"
+} # as_fn_executable_p
+as_test_x='test -x'
+as_executable_p=as_fn_executable_p
 
 # Sed expression to map a string onto a valid CPP name.
 as_tr_cpp="eval sed 'y%*$as_cr_letters%P$as_cr_LETTERS%;s%[^_$as_cr_alnum]%_%g'"
@@ -18562,8 +19413,8 @@
 # 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.5.3, which was
-generated by GNU Autoconf 2.67.  Invocation command line was
+This file was extended by FileZilla $as_me 3.7.3, which was
+generated by GNU Autoconf 2.69.  Invocation command line was
 
   CONFIG_FILES    = $CONFIG_FILES
   CONFIG_HEADERS  = $CONFIG_HEADERS
@@ -18628,11 +19479,11 @@
 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.5.3
-configured by $0, generated by GNU Autoconf 2.67,
+FileZilla config.status 3.7.3
+configured by $0, generated by GNU Autoconf 2.69,
   with options \\"\$ac_cs_config\\"
 
-Copyright (C) 2010 Free Software Foundation, Inc.
+Copyright (C) 2012 Free Software Foundation, Inc.
 This config.status script is free software; the Free Software Foundation
 gives unlimited permission to copy, distribute and modify it."
 
@@ -18723,7 +19574,7 @@
 _ACEOF
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 if \$ac_cs_recheck; then
-  set X '$SHELL' '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
+  set X $SHELL '$0' $ac_configure_args \$ac_configure_extra_args --no-create --no-recursion
   shift
   \$as_echo "running CONFIG_SHELL=$SHELL \$*" >&6
   CONFIG_SHELL='$SHELL'
@@ -18757,184 +19608,208 @@
 sed_quote_subst='$sed_quote_subst'
 double_quote_subst='$double_quote_subst'
 delay_variable_subst='$delay_variable_subst'
-macro_version='`$ECHO "X$macro_version" | $Xsed -e "$delay_single_quote_subst"`'
-macro_revision='`$ECHO "X$macro_revision" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared='`$ECHO "X$enable_shared" | $Xsed -e "$delay_single_quote_subst"`'
-enable_static='`$ECHO "X$enable_static" | $Xsed -e "$delay_single_quote_subst"`'
-pic_mode='`$ECHO "X$pic_mode" | $Xsed -e "$delay_single_quote_subst"`'
-enable_fast_install='`$ECHO "X$enable_fast_install" | $Xsed -e "$delay_single_quote_subst"`'
-host_alias='`$ECHO "X$host_alias" | $Xsed -e "$delay_single_quote_subst"`'
-host='`$ECHO "X$host" | $Xsed -e "$delay_single_quote_subst"`'
-host_os='`$ECHO "X$host_os" | $Xsed -e "$delay_single_quote_subst"`'
-build_alias='`$ECHO "X$build_alias" | $Xsed -e "$delay_single_quote_subst"`'
-build='`$ECHO "X$build" | $Xsed -e "$delay_single_quote_subst"`'
-build_os='`$ECHO "X$build_os" | $Xsed -e "$delay_single_quote_subst"`'
-SED='`$ECHO "X$SED" | $Xsed -e "$delay_single_quote_subst"`'
-Xsed='`$ECHO "X$Xsed" | $Xsed -e "$delay_single_quote_subst"`'
-GREP='`$ECHO "X$GREP" | $Xsed -e "$delay_single_quote_subst"`'
-EGREP='`$ECHO "X$EGREP" | $Xsed -e "$delay_single_quote_subst"`'
-FGREP='`$ECHO "X$FGREP" | $Xsed -e "$delay_single_quote_subst"`'
-LD='`$ECHO "X$LD" | $Xsed -e "$delay_single_quote_subst"`'
-NM='`$ECHO "X$NM" | $Xsed -e "$delay_single_quote_subst"`'
-LN_S='`$ECHO "X$LN_S" | $Xsed -e "$delay_single_quote_subst"`'
-max_cmd_len='`$ECHO "X$max_cmd_len" | $Xsed -e "$delay_single_quote_subst"`'
-ac_objext='`$ECHO "X$ac_objext" | $Xsed -e "$delay_single_quote_subst"`'
-exeext='`$ECHO "X$exeext" | $Xsed -e "$delay_single_quote_subst"`'
-lt_unset='`$ECHO "X$lt_unset" | $Xsed -e "$delay_single_quote_subst"`'
-lt_SP2NL='`$ECHO "X$lt_SP2NL" | $Xsed -e "$delay_single_quote_subst"`'
-lt_NL2SP='`$ECHO "X$lt_NL2SP" | $Xsed -e "$delay_single_quote_subst"`'
-reload_flag='`$ECHO "X$reload_flag" | $Xsed -e "$delay_single_quote_subst"`'
-reload_cmds='`$ECHO "X$reload_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-OBJDUMP='`$ECHO "X$OBJDUMP" | $Xsed -e "$delay_single_quote_subst"`'
-deplibs_check_method='`$ECHO "X$deplibs_check_method" | $Xsed -e "$delay_single_quote_subst"`'
-file_magic_cmd='`$ECHO "X$file_magic_cmd" | $Xsed -e "$delay_single_quote_subst"`'
-AR='`$ECHO "X$AR" | $Xsed -e "$delay_single_quote_subst"`'
-AR_FLAGS='`$ECHO "X$AR_FLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-STRIP='`$ECHO "X$STRIP" | $Xsed -e "$delay_single_quote_subst"`'
-RANLIB='`$ECHO "X$RANLIB" | $Xsed -e "$delay_single_quote_subst"`'
-old_postinstall_cmds='`$ECHO "X$old_postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_postuninstall_cmds='`$ECHO "X$old_postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds='`$ECHO "X$old_archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-CC='`$ECHO "X$CC" | $Xsed -e "$delay_single_quote_subst"`'
-CFLAGS='`$ECHO "X$CFLAGS" | $Xsed -e "$delay_single_quote_subst"`'
-compiler='`$ECHO "X$compiler" | $Xsed -e "$delay_single_quote_subst"`'
-GCC='`$ECHO "X$GCC" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_pipe='`$ECHO "X$lt_cv_sys_global_symbol_pipe" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_cdecl='`$ECHO "X$lt_cv_sys_global_symbol_to_cdecl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "X$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-objdir='`$ECHO "X$objdir" | $Xsed -e "$delay_single_quote_subst"`'
-SHELL='`$ECHO "X$SHELL" | $Xsed -e "$delay_single_quote_subst"`'
-ECHO='`$ECHO "X$ECHO" | $Xsed -e "$delay_single_quote_subst"`'
-MAGIC_CMD='`$ECHO "X$MAGIC_CMD" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag='`$ECHO "X$lt_prog_compiler_no_builtin_flag" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl='`$ECHO "X$lt_prog_compiler_wl" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic='`$ECHO "X$lt_prog_compiler_pic" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static='`$ECHO "X$lt_prog_compiler_static" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o='`$ECHO "X$lt_cv_prog_compiler_c_o" | $Xsed -e "$delay_single_quote_subst"`'
-need_locks='`$ECHO "X$need_locks" | $Xsed -e "$delay_single_quote_subst"`'
-DSYMUTIL='`$ECHO "X$DSYMUTIL" | $Xsed -e "$delay_single_quote_subst"`'
-NMEDIT='`$ECHO "X$NMEDIT" | $Xsed -e "$delay_single_quote_subst"`'
-LIPO='`$ECHO "X$LIPO" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL='`$ECHO "X$OTOOL" | $Xsed -e "$delay_single_quote_subst"`'
-OTOOL64='`$ECHO "X$OTOOL64" | $Xsed -e "$delay_single_quote_subst"`'
-libext='`$ECHO "X$libext" | $Xsed -e "$delay_single_quote_subst"`'
-shrext_cmds='`$ECHO "X$shrext_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-extract_expsyms_cmds='`$ECHO "X$extract_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc='`$ECHO "X$archive_cmds_need_lc" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes='`$ECHO "X$enable_shared_with_static_runtimes" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec='`$ECHO "X$export_dynamic_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec='`$ECHO "X$whole_archive_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object='`$ECHO "X$compiler_needs_object" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds='`$ECHO "X$old_archive_from_new_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds='`$ECHO "X$old_archive_from_expsyms_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds='`$ECHO "X$archive_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds='`$ECHO "X$archive_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds='`$ECHO "X$module_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds='`$ECHO "X$module_expsym_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld='`$ECHO "X$with_gnu_ld" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag='`$ECHO "X$allow_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag='`$ECHO "X$no_undefined_flag" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec='`$ECHO "X$hardcode_libdir_flag_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld='`$ECHO "X$hardcode_libdir_flag_spec_ld" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator='`$ECHO "X$hardcode_libdir_separator" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct='`$ECHO "X$hardcode_direct" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute='`$ECHO "X$hardcode_direct_absolute" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L='`$ECHO "X$hardcode_minus_L" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var='`$ECHO "X$hardcode_shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic='`$ECHO "X$hardcode_automatic" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath='`$ECHO "X$inherit_rpath" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs='`$ECHO "X$link_all_deplibs" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path='`$ECHO "X$fix_srcfile_path" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols='`$ECHO "X$always_export_symbols" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds='`$ECHO "X$export_symbols_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms='`$ECHO "X$exclude_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms='`$ECHO "X$include_expsyms" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds='`$ECHO "X$prelink_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec='`$ECHO "X$file_list_spec" | $Xsed -e "$delay_single_quote_subst"`'
-variables_saved_for_relink='`$ECHO "X$variables_saved_for_relink" | $Xsed -e "$delay_single_quote_subst"`'
-need_lib_prefix='`$ECHO "X$need_lib_prefix" | $Xsed -e "$delay_single_quote_subst"`'
-need_version='`$ECHO "X$need_version" | $Xsed -e "$delay_single_quote_subst"`'
-version_type='`$ECHO "X$version_type" | $Xsed -e "$delay_single_quote_subst"`'
-runpath_var='`$ECHO "X$runpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_var='`$ECHO "X$shlibpath_var" | $Xsed -e "$delay_single_quote_subst"`'
-shlibpath_overrides_runpath='`$ECHO "X$shlibpath_overrides_runpath" | $Xsed -e "$delay_single_quote_subst"`'
-libname_spec='`$ECHO "X$libname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-library_names_spec='`$ECHO "X$library_names_spec" | $Xsed -e "$delay_single_quote_subst"`'
-soname_spec='`$ECHO "X$soname_spec" | $Xsed -e "$delay_single_quote_subst"`'
-postinstall_cmds='`$ECHO "X$postinstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-postuninstall_cmds='`$ECHO "X$postuninstall_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_cmds='`$ECHO "X$finish_cmds" | $Xsed -e "$delay_single_quote_subst"`'
-finish_eval='`$ECHO "X$finish_eval" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_into_libs='`$ECHO "X$hardcode_into_libs" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_search_path_spec='`$ECHO "X$sys_lib_search_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-sys_lib_dlsearch_path_spec='`$ECHO "X$sys_lib_dlsearch_path_spec" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action='`$ECHO "X$hardcode_action" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen='`$ECHO "X$enable_dlopen" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self='`$ECHO "X$enable_dlopen_self" | $Xsed -e "$delay_single_quote_subst"`'
-enable_dlopen_self_static='`$ECHO "X$enable_dlopen_self_static" | $Xsed -e "$delay_single_quote_subst"`'
-old_striplib='`$ECHO "X$old_striplib" | $Xsed -e "$delay_single_quote_subst"`'
-striplib='`$ECHO "X$striplib" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs='`$ECHO "X$compiler_lib_search_dirs" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects='`$ECHO "X$predep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects='`$ECHO "X$postdep_objects" | $Xsed -e "$delay_single_quote_subst"`'
-predeps='`$ECHO "X$predeps" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps='`$ECHO "X$postdeps" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path='`$ECHO "X$compiler_lib_search_path" | $Xsed -e "$delay_single_quote_subst"`'
-LD_CXX='`$ECHO "X$LD_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_cmds_CXX='`$ECHO "X$old_archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_CXX='`$ECHO "X$compiler_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-GCC_CXX='`$ECHO "X$GCC_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "X$lt_prog_compiler_no_builtin_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_wl_CXX='`$ECHO "X$lt_prog_compiler_wl_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_pic_CXX='`$ECHO "X$lt_prog_compiler_pic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_prog_compiler_static_CXX='`$ECHO "X$lt_prog_compiler_static_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-lt_cv_prog_compiler_c_o_CXX='`$ECHO "X$lt_cv_prog_compiler_c_o_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_need_lc_CXX='`$ECHO "X$archive_cmds_need_lc_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-enable_shared_with_static_runtimes_CXX='`$ECHO "X$enable_shared_with_static_runtimes_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_dynamic_flag_spec_CXX='`$ECHO "X$export_dynamic_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-whole_archive_flag_spec_CXX='`$ECHO "X$whole_archive_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_needs_object_CXX='`$ECHO "X$compiler_needs_object_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_new_cmds_CXX='`$ECHO "X$old_archive_from_new_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-old_archive_from_expsyms_cmds_CXX='`$ECHO "X$old_archive_from_expsyms_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_cmds_CXX='`$ECHO "X$archive_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-archive_expsym_cmds_CXX='`$ECHO "X$archive_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_cmds_CXX='`$ECHO "X$module_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-module_expsym_cmds_CXX='`$ECHO "X$module_expsym_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-with_gnu_ld_CXX='`$ECHO "X$with_gnu_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-allow_undefined_flag_CXX='`$ECHO "X$allow_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-no_undefined_flag_CXX='`$ECHO "X$no_undefined_flag_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_CXX='`$ECHO "X$hardcode_libdir_flag_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_flag_spec_ld_CXX='`$ECHO "X$hardcode_libdir_flag_spec_ld_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_libdir_separator_CXX='`$ECHO "X$hardcode_libdir_separator_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_CXX='`$ECHO "X$hardcode_direct_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_direct_absolute_CXX='`$ECHO "X$hardcode_direct_absolute_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_minus_L_CXX='`$ECHO "X$hardcode_minus_L_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_shlibpath_var_CXX='`$ECHO "X$hardcode_shlibpath_var_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_automatic_CXX='`$ECHO "X$hardcode_automatic_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-inherit_rpath_CXX='`$ECHO "X$inherit_rpath_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-link_all_deplibs_CXX='`$ECHO "X$link_all_deplibs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-fix_srcfile_path_CXX='`$ECHO "X$fix_srcfile_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-always_export_symbols_CXX='`$ECHO "X$always_export_symbols_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-export_symbols_cmds_CXX='`$ECHO "X$export_symbols_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-exclude_expsyms_CXX='`$ECHO "X$exclude_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-include_expsyms_CXX='`$ECHO "X$include_expsyms_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-prelink_cmds_CXX='`$ECHO "X$prelink_cmds_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-file_list_spec_CXX='`$ECHO "X$file_list_spec_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-hardcode_action_CXX='`$ECHO "X$hardcode_action_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_dirs_CXX='`$ECHO "X$compiler_lib_search_dirs_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predep_objects_CXX='`$ECHO "X$predep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdep_objects_CXX='`$ECHO "X$postdep_objects_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-predeps_CXX='`$ECHO "X$predeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-postdeps_CXX='`$ECHO "X$postdeps_CXX" | $Xsed -e "$delay_single_quote_subst"`'
-compiler_lib_search_path_CXX='`$ECHO "X$compiler_lib_search_path_CXX" | $Xsed -e "$delay_single_quote_subst"`'
+macro_version='`$ECHO "$macro_version" | $SED "$delay_single_quote_subst"`'
+macro_revision='`$ECHO "$macro_revision" | $SED "$delay_single_quote_subst"`'
+enable_shared='`$ECHO "$enable_shared" | $SED "$delay_single_quote_subst"`'
+enable_static='`$ECHO "$enable_static" | $SED "$delay_single_quote_subst"`'
+pic_mode='`$ECHO "$pic_mode" | $SED "$delay_single_quote_subst"`'
+enable_fast_install='`$ECHO "$enable_fast_install" | $SED "$delay_single_quote_subst"`'
+SHELL='`$ECHO "$SHELL" | $SED "$delay_single_quote_subst"`'
+ECHO='`$ECHO "$ECHO" | $SED "$delay_single_quote_subst"`'
+PATH_SEPARATOR='`$ECHO "$PATH_SEPARATOR" | $SED "$delay_single_quote_subst"`'
+host_alias='`$ECHO "$host_alias" | $SED "$delay_single_quote_subst"`'
+host='`$ECHO "$host" | $SED "$delay_single_quote_subst"`'
+host_os='`$ECHO "$host_os" | $SED "$delay_single_quote_subst"`'
+build_alias='`$ECHO "$build_alias" | $SED "$delay_single_quote_subst"`'
+build='`$ECHO "$build" | $SED "$delay_single_quote_subst"`'
+build_os='`$ECHO "$build_os" | $SED "$delay_single_quote_subst"`'
+SED='`$ECHO "$SED" | $SED "$delay_single_quote_subst"`'
+Xsed='`$ECHO "$Xsed" | $SED "$delay_single_quote_subst"`'
+GREP='`$ECHO "$GREP" | $SED "$delay_single_quote_subst"`'
+EGREP='`$ECHO "$EGREP" | $SED "$delay_single_quote_subst"`'
+FGREP='`$ECHO "$FGREP" | $SED "$delay_single_quote_subst"`'
+LD='`$ECHO "$LD" | $SED "$delay_single_quote_subst"`'
+NM='`$ECHO "$NM" | $SED "$delay_single_quote_subst"`'
+LN_S='`$ECHO "$LN_S" | $SED "$delay_single_quote_subst"`'
+max_cmd_len='`$ECHO "$max_cmd_len" | $SED "$delay_single_quote_subst"`'
+ac_objext='`$ECHO "$ac_objext" | $SED "$delay_single_quote_subst"`'
+exeext='`$ECHO "$exeext" | $SED "$delay_single_quote_subst"`'
+lt_unset='`$ECHO "$lt_unset" | $SED "$delay_single_quote_subst"`'
+lt_SP2NL='`$ECHO "$lt_SP2NL" | $SED "$delay_single_quote_subst"`'
+lt_NL2SP='`$ECHO "$lt_NL2SP" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_host_file_cmd='`$ECHO "$lt_cv_to_host_file_cmd" | $SED "$delay_single_quote_subst"`'
+lt_cv_to_tool_file_cmd='`$ECHO "$lt_cv_to_tool_file_cmd" | $SED "$delay_single_quote_subst"`'
+reload_flag='`$ECHO "$reload_flag" | $SED "$delay_single_quote_subst"`'
+reload_cmds='`$ECHO "$reload_cmds" | $SED "$delay_single_quote_subst"`'
+OBJDUMP='`$ECHO "$OBJDUMP" | $SED "$delay_single_quote_subst"`'
+deplibs_check_method='`$ECHO "$deplibs_check_method" | $SED "$delay_single_quote_subst"`'
+file_magic_cmd='`$ECHO "$file_magic_cmd" | $SED "$delay_single_quote_subst"`'
+file_magic_glob='`$ECHO "$file_magic_glob" | $SED "$delay_single_quote_subst"`'
+want_nocaseglob='`$ECHO "$want_nocaseglob" | $SED "$delay_single_quote_subst"`'
+DLLTOOL='`$ECHO "$DLLTOOL" | $SED "$delay_single_quote_subst"`'
+sharedlib_from_linklib_cmd='`$ECHO "$sharedlib_from_linklib_cmd" | $SED "$delay_single_quote_subst"`'
+AR='`$ECHO "$AR" | $SED "$delay_single_quote_subst"`'
+AR_FLAGS='`$ECHO "$AR_FLAGS" | $SED "$delay_single_quote_subst"`'
+archiver_list_spec='`$ECHO "$archiver_list_spec" | $SED "$delay_single_quote_subst"`'
+STRIP='`$ECHO "$STRIP" | $SED "$delay_single_quote_subst"`'
+RANLIB='`$ECHO "$RANLIB" | $SED "$delay_single_quote_subst"`'
+old_postinstall_cmds='`$ECHO "$old_postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_postuninstall_cmds='`$ECHO "$old_postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds='`$ECHO "$old_archive_cmds" | $SED "$delay_single_quote_subst"`'
+lock_old_archive_extraction='`$ECHO "$lock_old_archive_extraction" | $SED "$delay_single_quote_subst"`'
+CC='`$ECHO "$CC" | $SED "$delay_single_quote_subst"`'
+CFLAGS='`$ECHO "$CFLAGS" | $SED "$delay_single_quote_subst"`'
+compiler='`$ECHO "$compiler" | $SED "$delay_single_quote_subst"`'
+GCC='`$ECHO "$GCC" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_pipe='`$ECHO "$lt_cv_sys_global_symbol_pipe" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_cdecl='`$ECHO "$lt_cv_sys_global_symbol_to_cdecl" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address" | $SED "$delay_single_quote_subst"`'
+lt_cv_sys_global_symbol_to_c_name_address_lib_prefix='`$ECHO "$lt_cv_sys_global_symbol_to_c_name_address_lib_prefix" | $SED "$delay_single_quote_subst"`'
+nm_file_list_spec='`$ECHO "$nm_file_list_spec" | $SED "$delay_single_quote_subst"`'
+lt_sysroot='`$ECHO "$lt_sysroot" | $SED "$delay_single_quote_subst"`'
+objdir='`$ECHO "$objdir" | $SED "$delay_single_quote_subst"`'
+MAGIC_CMD='`$ECHO "$MAGIC_CMD" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag='`$ECHO "$lt_prog_compiler_no_builtin_flag" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic='`$ECHO "$lt_prog_compiler_pic" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl='`$ECHO "$lt_prog_compiler_wl" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static='`$ECHO "$lt_prog_compiler_static" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o='`$ECHO "$lt_cv_prog_compiler_c_o" | $SED "$delay_single_quote_subst"`'
+need_locks='`$ECHO "$need_locks" | $SED "$delay_single_quote_subst"`'
+MANIFEST_TOOL='`$ECHO "$MANIFEST_TOOL" | $SED "$delay_single_quote_subst"`'
+DSYMUTIL='`$ECHO "$DSYMUTIL" | $SED "$delay_single_quote_subst"`'
+NMEDIT='`$ECHO "$NMEDIT" | $SED "$delay_single_quote_subst"`'
+LIPO='`$ECHO "$LIPO" | $SED "$delay_single_quote_subst"`'
+OTOOL='`$ECHO "$OTOOL" | $SED "$delay_single_quote_subst"`'
+OTOOL64='`$ECHO "$OTOOL64" | $SED "$delay_single_quote_subst"`'
+libext='`$ECHO "$libext" | $SED "$delay_single_quote_subst"`'
+shrext_cmds='`$ECHO "$shrext_cmds" | $SED "$delay_single_quote_subst"`'
+extract_expsyms_cmds='`$ECHO "$extract_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc='`$ECHO "$archive_cmds_need_lc" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes='`$ECHO "$enable_shared_with_static_runtimes" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec='`$ECHO "$export_dynamic_flag_spec" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec='`$ECHO "$whole_archive_flag_spec" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object='`$ECHO "$compiler_needs_object" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds='`$ECHO "$old_archive_from_new_cmds" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds='`$ECHO "$old_archive_from_expsyms_cmds" | $SED "$delay_single_quote_subst"`'
+archive_cmds='`$ECHO "$archive_cmds" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds='`$ECHO "$archive_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+module_cmds='`$ECHO "$module_cmds" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds='`$ECHO "$module_expsym_cmds" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld='`$ECHO "$with_gnu_ld" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag='`$ECHO "$allow_undefined_flag" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag='`$ECHO "$no_undefined_flag" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec='`$ECHO "$hardcode_libdir_flag_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator='`$ECHO "$hardcode_libdir_separator" | $SED "$delay_single_quote_subst"`'
+hardcode_direct='`$ECHO "$hardcode_direct" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute='`$ECHO "$hardcode_direct_absolute" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L='`$ECHO "$hardcode_minus_L" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var='`$ECHO "$hardcode_shlibpath_var" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic='`$ECHO "$hardcode_automatic" | $SED "$delay_single_quote_subst"`'
+inherit_rpath='`$ECHO "$inherit_rpath" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs='`$ECHO "$link_all_deplibs" | $SED "$delay_single_quote_subst"`'
+always_export_symbols='`$ECHO "$always_export_symbols" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds='`$ECHO "$export_symbols_cmds" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms='`$ECHO "$exclude_expsyms" | $SED "$delay_single_quote_subst"`'
+include_expsyms='`$ECHO "$include_expsyms" | $SED "$delay_single_quote_subst"`'
+prelink_cmds='`$ECHO "$prelink_cmds" | $SED "$delay_single_quote_subst"`'
+postlink_cmds='`$ECHO "$postlink_cmds" | $SED "$delay_single_quote_subst"`'
+file_list_spec='`$ECHO "$file_list_spec" | $SED "$delay_single_quote_subst"`'
+variables_saved_for_relink='`$ECHO "$variables_saved_for_relink" | $SED "$delay_single_quote_subst"`'
+need_lib_prefix='`$ECHO "$need_lib_prefix" | $SED "$delay_single_quote_subst"`'
+need_version='`$ECHO "$need_version" | $SED "$delay_single_quote_subst"`'
+version_type='`$ECHO "$version_type" | $SED "$delay_single_quote_subst"`'
+runpath_var='`$ECHO "$runpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_var='`$ECHO "$shlibpath_var" | $SED "$delay_single_quote_subst"`'
+shlibpath_overrides_runpath='`$ECHO "$shlibpath_overrides_runpath" | $SED "$delay_single_quote_subst"`'
+libname_spec='`$ECHO "$libname_spec" | $SED "$delay_single_quote_subst"`'
+library_names_spec='`$ECHO "$library_names_spec" | $SED "$delay_single_quote_subst"`'
+soname_spec='`$ECHO "$soname_spec" | $SED "$delay_single_quote_subst"`'
+install_override_mode='`$ECHO "$install_override_mode" | $SED "$delay_single_quote_subst"`'
+postinstall_cmds='`$ECHO "$postinstall_cmds" | $SED "$delay_single_quote_subst"`'
+postuninstall_cmds='`$ECHO "$postuninstall_cmds" | $SED "$delay_single_quote_subst"`'
+finish_cmds='`$ECHO "$finish_cmds" | $SED "$delay_single_quote_subst"`'
+finish_eval='`$ECHO "$finish_eval" | $SED "$delay_single_quote_subst"`'
+hardcode_into_libs='`$ECHO "$hardcode_into_libs" | $SED "$delay_single_quote_subst"`'
+sys_lib_search_path_spec='`$ECHO "$sys_lib_search_path_spec" | $SED "$delay_single_quote_subst"`'
+sys_lib_dlsearch_path_spec='`$ECHO "$sys_lib_dlsearch_path_spec" | $SED "$delay_single_quote_subst"`'
+hardcode_action='`$ECHO "$hardcode_action" | $SED "$delay_single_quote_subst"`'
+enable_dlopen='`$ECHO "$enable_dlopen" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self='`$ECHO "$enable_dlopen_self" | $SED "$delay_single_quote_subst"`'
+enable_dlopen_self_static='`$ECHO "$enable_dlopen_self_static" | $SED "$delay_single_quote_subst"`'
+old_striplib='`$ECHO "$old_striplib" | $SED "$delay_single_quote_subst"`'
+striplib='`$ECHO "$striplib" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs='`$ECHO "$compiler_lib_search_dirs" | $SED "$delay_single_quote_subst"`'
+predep_objects='`$ECHO "$predep_objects" | $SED "$delay_single_quote_subst"`'
+postdep_objects='`$ECHO "$postdep_objects" | $SED "$delay_single_quote_subst"`'
+predeps='`$ECHO "$predeps" | $SED "$delay_single_quote_subst"`'
+postdeps='`$ECHO "$postdeps" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path='`$ECHO "$compiler_lib_search_path" | $SED "$delay_single_quote_subst"`'
+LD_CXX='`$ECHO "$LD_CXX" | $SED "$delay_single_quote_subst"`'
+reload_flag_CXX='`$ECHO "$reload_flag_CXX" | $SED "$delay_single_quote_subst"`'
+reload_cmds_CXX='`$ECHO "$reload_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_cmds_CXX='`$ECHO "$old_archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_CXX='`$ECHO "$compiler_CXX" | $SED "$delay_single_quote_subst"`'
+GCC_CXX='`$ECHO "$GCC_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_no_builtin_flag_CXX='`$ECHO "$lt_prog_compiler_no_builtin_flag_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_pic_CXX='`$ECHO "$lt_prog_compiler_pic_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_wl_CXX='`$ECHO "$lt_prog_compiler_wl_CXX" | $SED "$delay_single_quote_subst"`'
+lt_prog_compiler_static_CXX='`$ECHO "$lt_prog_compiler_static_CXX" | $SED "$delay_single_quote_subst"`'
+lt_cv_prog_compiler_c_o_CXX='`$ECHO "$lt_cv_prog_compiler_c_o_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_need_lc_CXX='`$ECHO "$archive_cmds_need_lc_CXX" | $SED "$delay_single_quote_subst"`'
+enable_shared_with_static_runtimes_CXX='`$ECHO "$enable_shared_with_static_runtimes_CXX" | $SED "$delay_single_quote_subst"`'
+export_dynamic_flag_spec_CXX='`$ECHO "$export_dynamic_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+whole_archive_flag_spec_CXX='`$ECHO "$whole_archive_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_needs_object_CXX='`$ECHO "$compiler_needs_object_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_new_cmds_CXX='`$ECHO "$old_archive_from_new_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+old_archive_from_expsyms_cmds_CXX='`$ECHO "$old_archive_from_expsyms_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_cmds_CXX='`$ECHO "$archive_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+archive_expsym_cmds_CXX='`$ECHO "$archive_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_cmds_CXX='`$ECHO "$module_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+module_expsym_cmds_CXX='`$ECHO "$module_expsym_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+with_gnu_ld_CXX='`$ECHO "$with_gnu_ld_CXX" | $SED "$delay_single_quote_subst"`'
+allow_undefined_flag_CXX='`$ECHO "$allow_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+no_undefined_flag_CXX='`$ECHO "$no_undefined_flag_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_flag_spec_CXX='`$ECHO "$hardcode_libdir_flag_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_libdir_separator_CXX='`$ECHO "$hardcode_libdir_separator_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_CXX='`$ECHO "$hardcode_direct_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_direct_absolute_CXX='`$ECHO "$hardcode_direct_absolute_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_minus_L_CXX='`$ECHO "$hardcode_minus_L_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_shlibpath_var_CXX='`$ECHO "$hardcode_shlibpath_var_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_automatic_CXX='`$ECHO "$hardcode_automatic_CXX" | $SED "$delay_single_quote_subst"`'
+inherit_rpath_CXX='`$ECHO "$inherit_rpath_CXX" | $SED "$delay_single_quote_subst"`'
+link_all_deplibs_CXX='`$ECHO "$link_all_deplibs_CXX" | $SED "$delay_single_quote_subst"`'
+always_export_symbols_CXX='`$ECHO "$always_export_symbols_CXX" | $SED "$delay_single_quote_subst"`'
+export_symbols_cmds_CXX='`$ECHO "$export_symbols_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+exclude_expsyms_CXX='`$ECHO "$exclude_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+include_expsyms_CXX='`$ECHO "$include_expsyms_CXX" | $SED "$delay_single_quote_subst"`'
+prelink_cmds_CXX='`$ECHO "$prelink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+postlink_cmds_CXX='`$ECHO "$postlink_cmds_CXX" | $SED "$delay_single_quote_subst"`'
+file_list_spec_CXX='`$ECHO "$file_list_spec_CXX" | $SED "$delay_single_quote_subst"`'
+hardcode_action_CXX='`$ECHO "$hardcode_action_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_dirs_CXX='`$ECHO "$compiler_lib_search_dirs_CXX" | $SED "$delay_single_quote_subst"`'
+predep_objects_CXX='`$ECHO "$predep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+postdep_objects_CXX='`$ECHO "$postdep_objects_CXX" | $SED "$delay_single_quote_subst"`'
+predeps_CXX='`$ECHO "$predeps_CXX" | $SED "$delay_single_quote_subst"`'
+postdeps_CXX='`$ECHO "$postdeps_CXX" | $SED "$delay_single_quote_subst"`'
+compiler_lib_search_path_CXX='`$ECHO "$compiler_lib_search_path_CXX" | $SED "$delay_single_quote_subst"`'
 
 LTCC='$LTCC'
 LTCFLAGS='$LTCFLAGS'
 compiler='$compiler_DEFAULT'
 
+# A function that is used when there is no print builtin or printf.
+func_fallback_echo ()
+{
+  eval 'cat <<_LTECHO_EOF
+\$1
+_LTECHO_EOF'
+}
+
 # Quote evaled strings.
-for var in SED \
+for var in SHELL \
+ECHO \
+PATH_SEPARATOR \
+SED \
 GREP \
 EGREP \
 FGREP \
@@ -18947,8 +19822,13 @@
 OBJDUMP \
 deplibs_check_method \
 file_magic_cmd \
+file_magic_glob \
+want_nocaseglob \
+DLLTOOL \
+sharedlib_from_linklib_cmd \
 AR \
 AR_FLAGS \
+archiver_list_spec \
 STRIP \
 RANLIB \
 CC \
@@ -18958,14 +19838,14 @@
 lt_cv_sys_global_symbol_to_cdecl \
 lt_cv_sys_global_symbol_to_c_name_address \
 lt_cv_sys_global_symbol_to_c_name_address_lib_prefix \
-SHELL \
-ECHO \
+nm_file_list_spec \
 lt_prog_compiler_no_builtin_flag \
-lt_prog_compiler_wl \
 lt_prog_compiler_pic \
+lt_prog_compiler_wl \
 lt_prog_compiler_static \
 lt_cv_prog_compiler_c_o \
 need_locks \
+MANIFEST_TOOL \
 DSYMUTIL \
 NMEDIT \
 LIPO \
@@ -18979,9 +19859,7 @@
 allow_undefined_flag \
 no_undefined_flag \
 hardcode_libdir_flag_spec \
-hardcode_libdir_flag_spec_ld \
 hardcode_libdir_separator \
-fix_srcfile_path \
 exclude_expsyms \
 include_expsyms \
 file_list_spec \
@@ -18989,6 +19867,7 @@
 libname_spec \
 library_names_spec \
 soname_spec \
+install_override_mode \
 finish_eval \
 old_striplib \
 striplib \
@@ -18999,10 +19878,11 @@
 postdeps \
 compiler_lib_search_path \
 LD_CXX \
+reload_flag_CXX \
 compiler_CXX \
 lt_prog_compiler_no_builtin_flag_CXX \
-lt_prog_compiler_wl_CXX \
 lt_prog_compiler_pic_CXX \
+lt_prog_compiler_wl_CXX \
 lt_prog_compiler_static_CXX \
 lt_cv_prog_compiler_c_o_CXX \
 export_dynamic_flag_spec_CXX \
@@ -19012,9 +19892,7 @@
 allow_undefined_flag_CXX \
 no_undefined_flag_CXX \
 hardcode_libdir_flag_spec_CXX \
-hardcode_libdir_flag_spec_ld_CXX \
 hardcode_libdir_separator_CXX \
-fix_srcfile_path_CXX \
 exclude_expsyms_CXX \
 include_expsyms_CXX \
 file_list_spec_CXX \
@@ -19024,9 +19902,9 @@
 predeps_CXX \
 postdeps_CXX \
 compiler_lib_search_path_CXX; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED \\"\\\$sed_quote_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19048,11 +19926,13 @@
 module_expsym_cmds \
 export_symbols_cmds \
 prelink_cmds \
+postlink_cmds \
 postinstall_cmds \
 postuninstall_cmds \
 finish_cmds \
 sys_lib_search_path_spec \
 sys_lib_dlsearch_path_spec \
+reload_cmds_CXX \
 old_archive_cmds_CXX \
 old_archive_from_new_cmds_CXX \
 old_archive_from_expsyms_cmds_CXX \
@@ -19061,10 +19941,11 @@
 module_cmds_CXX \
 module_expsym_cmds_CXX \
 export_symbols_cmds_CXX \
-prelink_cmds_CXX; do
-    case \`eval \\\\\$ECHO "X\\\\\$\$var"\` in
+prelink_cmds_CXX \
+postlink_cmds_CXX; do
+    case \`eval \\\\\$ECHO \\\\""\\\\\$\$var"\\\\"\` in
     *[\\\\\\\`\\"\\\$]*)
-      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"X\\\$\$var\\" | \\\$Xsed -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
+      eval "lt_\$var=\\\\\\"\\\`\\\$ECHO \\"\\\$\$var\\" | \\\$SED -e \\"\\\$double_quote_subst\\" -e \\"\\\$sed_quote_subst\\" -e \\"\\\$delay_variable_subst\\"\\\`\\\\\\""
       ;;
     *)
       eval "lt_\$var=\\\\\\"\\\$\$var\\\\\\""
@@ -19072,12 +19953,6 @@
     esac
 done
 
-# Fix-up fallback echo if it was mangled by the above quoting rules.
-case \$lt_ECHO in
-*'\\\$0 --fallback-echo"')  lt_ECHO=\`\$ECHO "X\$lt_ECHO" | \$Xsed -e 's/\\\\\\\\\\\\\\\$0 --fallback-echo"\$/\$0 --fallback-echo"/'\`
-  ;;
-esac
-
 ac_aux_dir='$ac_aux_dir'
 xsi_shell='$xsi_shell'
 lt_shell_append='$lt_shell_append'
@@ -19131,6 +20006,7 @@
     "src/interface/resources/lone/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/lone/Makefile" ;;
     "src/interface/resources/minimal/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/minimal/Makefile" ;;
     "src/interface/resources/opencrystal/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/opencrystal/Makefile" ;;
+    "src/interface/resources/tango/Makefile") CONFIG_FILES="$CONFIG_FILES src/interface/resources/tango/Makefile" ;;
     "src/putty/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/Makefile" ;;
     "src/putty/unix/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/unix/Makefile" ;;
     "src/putty/windows/Makefile") CONFIG_FILES="$CONFIG_FILES src/putty/windows/Makefile" ;;
@@ -19140,7 +20016,7 @@
     "src/fzshellext/Makefile") CONFIG_FILES="$CONFIG_FILES src/fzshellext/Makefile" ;;
     "src/fzshellext/version.rc") CONFIG_FILES="$CONFIG_FILES src/fzshellext/version.rc" ;;
 
-  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5 ;;
+  *) as_fn_error $? "invalid argument: \`$ac_config_target'" "$LINENO" 5;;
   esac
 done
 
@@ -19163,9 +20039,10 @@
 # after its creation but before its name has been assigned to `$tmp'.
 $debug ||
 {
-  tmp=
+  tmp= ac_tmp=
   trap 'exit_status=$?
-  { test -z "$tmp" || test ! -d "$tmp" || rm -fr "$tmp"; } && exit $exit_status
+  : "${ac_tmp:=$tmp}"
+  { test ! -d "$ac_tmp" || rm -fr "$ac_tmp"; } && exit $exit_status
 ' 0
   trap 'as_fn_exit 1' 1 2 13 15
 }
@@ -19173,12 +20050,13 @@
 
 {
   tmp=`(umask 077 && mktemp -d "./confXXXXXX") 2>/dev/null` &&
-  test -n "$tmp" && test -d "$tmp"
+  test -d "$tmp"
 }  ||
 {
   tmp=./conf$$-$RANDOM
   (umask 077 && mkdir "$tmp")
 } || as_fn_error $? "cannot create a temporary directory in ." "$LINENO" 5
+ac_tmp=$tmp
 
 # Set up the scripts for CONFIG_FILES section.
 # No need to generate them if there are no CONFIG_FILES.
@@ -19200,7 +20078,7 @@
   ac_cs_awk_cr=$ac_cr
 fi
 
-echo 'BEGIN {' >"$tmp/subs1.awk" &&
+echo 'BEGIN {' >"$ac_tmp/subs1.awk" &&
 _ACEOF
 
 
@@ -19228,7 +20106,7 @@
 rm -f conf$$subs.sh
 
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
-cat >>"\$tmp/subs1.awk" <<\\_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<\\_ACAWK &&
 _ACEOF
 sed -n '
 h
@@ -19276,7 +20154,7 @@
 rm -f conf$$subs.awk
 cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
 _ACAWK
-cat >>"\$tmp/subs1.awk" <<_ACAWK &&
+cat >>"\$ac_tmp/subs1.awk" <<_ACAWK &&
   for (key in S) S_is_set[key] = 1
   FS = ""
 
@@ -19308,7 +20186,7 @@
   sed "s/$ac_cr\$//; s/$ac_cr/$ac_cs_awk_cr/g"
 else
   cat
-fi < "$tmp/subs1.awk" > "$tmp/subs.awk" \
+fi < "$ac_tmp/subs1.awk" > "$ac_tmp/subs.awk" \
   || as_fn_error $? "could not setup config files machinery" "$LINENO" 5
 _ACEOF
 
@@ -19342,7 +20220,7 @@
 # No need to generate them if there are no CONFIG_HEADERS.
 # This happens for instance with `./config.status Makefile'.
 if test -n "$CONFIG_HEADERS"; then
-cat >"$tmp/defines.awk" <<\_ACAWK ||
+cat >"$ac_tmp/defines.awk" <<\_ACAWK ||
 BEGIN {
 _ACEOF
 
@@ -19354,8 +20232,8 @@
 # handling of long lines.
 ac_delim='%!_!# '
 for ac_last_try in false false :; do
-  ac_t=`sed -n "/$ac_delim/p" confdefs.h`
-  if test -z "$ac_t"; then
+  ac_tt=`sed -n "/$ac_delim/p" confdefs.h`
+  if test -z "$ac_tt"; then
     break
   elif $ac_last_try; then
     as_fn_error $? "could not make $CONFIG_HEADERS" "$LINENO" 5
@@ -19456,7 +20334,7 @@
   esac
   case $ac_mode$ac_tag in
   :[FHL]*:*);;
-  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5 ;;
+  :L* | :C*:*) as_fn_error $? "invalid tag \`$ac_tag'" "$LINENO" 5;;
   :[FH]-) ac_tag=-:-;;
   :[FH]*) ac_tag=$ac_tag:$ac_tag.in;;
   esac
@@ -19475,7 +20353,7 @@
     for ac_f
     do
       case $ac_f in
-      -) ac_f="$tmp/stdin";;
+      -) ac_f="$ac_tmp/stdin";;
       *) # Look for the file first in the build tree, then in the source tree
 	 # (if the path is not absolute).  The absolute path cannot be DOS-style,
 	 # because $ac_f cannot contain `:'.
@@ -19484,7 +20362,7 @@
 	   [\\/$]*) false;;
 	   *) test -f "$srcdir/$ac_f" && ac_f="$srcdir/$ac_f";;
 	   esac ||
-	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5 ;;
+	   as_fn_error 1 "cannot find input file: \`$ac_f'" "$LINENO" 5;;
       esac
       case $ac_f in *\'*) ac_f=`$as_echo "$ac_f" | sed "s/'/'\\\\\\\\''/g"`;; esac
       as_fn_append ac_file_inputs " '$ac_f'"
@@ -19510,8 +20388,8 @@
     esac
 
     case $ac_tag in
-    *:-:* | *:-) cat >"$tmp/stdin" \
-      || as_fn_error $? "could not create $ac_file" "$LINENO" 5  ;;
+    *:-:* | *:-) cat >"$ac_tmp/stdin" \
+      || as_fn_error $? "could not create $ac_file" "$LINENO" 5 ;;
     esac
     ;;
   esac
@@ -19647,21 +20525,22 @@
 s&@MKDIR_P@&$ac_MKDIR_P&;t t
 $ac_datarootdir_hack
 "
-eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$tmp/subs.awk" >$tmp/out \
-  || as_fn_error $? "could not create $ac_file" "$LINENO" 5
+eval sed \"\$ac_sed_extra\" "$ac_file_inputs" | $AWK -f "$ac_tmp/subs.awk" \
+  >$ac_tmp/out || as_fn_error $? "could not create $ac_file" "$LINENO" 5
 
 test -z "$ac_datarootdir_hack$ac_datarootdir_seen" &&
-  { ac_out=`sed -n '/\${datarootdir}/p' "$tmp/out"`; test -n "$ac_out"; } &&
-  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' "$tmp/out"`; test -z "$ac_out"; } &&
+  { ac_out=`sed -n '/\${datarootdir}/p' "$ac_tmp/out"`; test -n "$ac_out"; } &&
+  { ac_out=`sed -n '/^[	 ]*datarootdir[	 ]*:*=/p' \
+      "$ac_tmp/out"`; test -z "$ac_out"; } &&
   { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&5
 $as_echo "$as_me: WARNING: $ac_file contains a reference to the variable \`datarootdir'
 which seems to be undefined.  Please make sure it is defined" >&2;}
 
-  rm -f "$tmp/stdin"
+  rm -f "$ac_tmp/stdin"
   case $ac_file in
-  -) cat "$tmp/out" && rm -f "$tmp/out";;
-  *) rm -f "$ac_file" && mv "$tmp/out" "$ac_file";;
+  -) cat "$ac_tmp/out" && rm -f "$ac_tmp/out";;
+  *) rm -f "$ac_file" && mv "$ac_tmp/out" "$ac_file";;
   esac \
   || as_fn_error $? "could not create $ac_file" "$LINENO" 5
  ;;
@@ -19672,20 +20551,20 @@
   if test x"$ac_file" != x-; then
     {
       $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs"
-    } >"$tmp/config.h" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs"
+    } >"$ac_tmp/config.h" \
       || as_fn_error $? "could not create $ac_file" "$LINENO" 5
-    if diff "$ac_file" "$tmp/config.h" >/dev/null 2>&1; then
+    if diff "$ac_file" "$ac_tmp/config.h" >/dev/null 2>&1; then
       { $as_echo "$as_me:${as_lineno-$LINENO}: $ac_file is unchanged" >&5
 $as_echo "$as_me: $ac_file is unchanged" >&6;}
     else
       rm -f "$ac_file"
-      mv "$tmp/config.h" "$ac_file" \
+      mv "$ac_tmp/config.h" "$ac_file" \
 	|| as_fn_error $? "could not create $ac_file" "$LINENO" 5
     fi
   else
     $as_echo "/* $configure_input  */" \
-      && eval '$AWK -f "$tmp/defines.awk"' "$ac_file_inputs" \
+      && eval '$AWK -f "$ac_tmp/defines.awk"' "$ac_file_inputs" \
       || as_fn_error $? "could not create -" "$LINENO" 5
   fi
 # Compute "$ac_file"'s index in $config_headers.
@@ -19847,7 +20726,8 @@
 # NOTE: Changes made to this file will be lost: look at ltmain.sh.
 #
 #   Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005,
-#                 2006, 2007, 2008 Free Software Foundation, Inc.
+#                 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+#                 Foundation, Inc.
 #   Written by Gordon Matzigkeit, 1996
 #
 #   This file is part of GNU Libtool.
@@ -19895,6 +20775,15 @@
 # Whether or not to optimize for fast installation.
 fast_install=$enable_fast_install
 
+# Shell to use when invoking shell scripts.
+SHELL=$lt_SHELL
+
+# An echo program that protects backslashes.
+ECHO=$lt_ECHO
+
+# The PATH separator for the build system.
+PATH_SEPARATOR=$lt_PATH_SEPARATOR
+
 # The host system.
 host_alias=$host_alias
 host=$host
@@ -19944,9 +20833,11 @@
 # turn newlines into spaces.
 NL2SP=$lt_lt_NL2SP
 
-# How to create reloadable object files.
-reload_flag=$lt_reload_flag
-reload_cmds=$lt_reload_cmds
+# convert \$build file names to \$host format.
+to_host_file_cmd=$lt_cv_to_host_file_cmd
+
+# convert \$build files to toolchain format.
+to_tool_file_cmd=$lt_cv_to_tool_file_cmd
 
 # An object symbol dumper.
 OBJDUMP=$lt_OBJDUMP
@@ -19954,13 +20845,30 @@
 # Method to check whether dependent libraries are shared objects.
 deplibs_check_method=$lt_deplibs_check_method
 
-# Command to use when deplibs_check_method == "file_magic".
+# Command to use when deplibs_check_method = "file_magic".
 file_magic_cmd=$lt_file_magic_cmd
 
+# How to find potential files when deplibs_check_method = "file_magic".
+file_magic_glob=$lt_file_magic_glob
+
+# Find potential files using nocaseglob when deplibs_check_method = "file_magic".
+want_nocaseglob=$lt_want_nocaseglob
+
+# DLL creation program.
+DLLTOOL=$lt_DLLTOOL
+
+# Command to associate shared and link libraries.
+sharedlib_from_linklib_cmd=$lt_sharedlib_from_linklib_cmd
+
 # The archiver.
 AR=$lt_AR
+
+# Flags to create an archive.
 AR_FLAGS=$lt_AR_FLAGS
 
+# How to feed a file listing to the archiver.
+archiver_list_spec=$lt_archiver_list_spec
+
 # A symbol stripping program.
 STRIP=$lt_STRIP
 
@@ -19969,6 +20877,9 @@
 old_postinstall_cmds=$lt_old_postinstall_cmds
 old_postuninstall_cmds=$lt_old_postuninstall_cmds
 
+# Whether to use a lock for old archive extraction.
+lock_old_archive_extraction=$lock_old_archive_extraction
+
 # A C compiler.
 LTCC=$lt_CC
 
@@ -19987,14 +20898,14 @@
 # Transform the output of nm in a C name address pair when lib prefix is needed.
 global_symbol_to_c_name_address_lib_prefix=$lt_lt_cv_sys_global_symbol_to_c_name_address_lib_prefix
 
-# The name of the directory that contains temporary libtool files.
-objdir=$objdir
+# Specify filename containing input files for \$NM.
+nm_file_list_spec=$lt_nm_file_list_spec
 
-# Shell to use when invoking shell scripts.
-SHELL=$lt_SHELL
+# The root where to search for dependent libraries,and in which our libraries should be installed.
+lt_sysroot=$lt_sysroot
 
-# An echo program that does not interpret backslashes.
-ECHO=$lt_ECHO
+# The name of the directory that contains temporary libtool files.
+objdir=$objdir
 
 # Used to examine libraries when file_magic_cmd begins with "file".
 MAGIC_CMD=$MAGIC_CMD
@@ -20002,6 +20913,9 @@
 # Must we lock files when doing compilation?
 need_locks=$lt_need_locks
 
+# Manifest tool.
+MANIFEST_TOOL=$lt_MANIFEST_TOOL
+
 # Tool to manipulate archived DWARF debug symbol files on Mac OS X.
 DSYMUTIL=$lt_DSYMUTIL
 
@@ -20058,6 +20972,9 @@
 # The coded name of the library, if different from the real name.
 soname_spec=$lt_soname_spec
 
+# Permission mode override for installation of shared libraries.
+install_override_mode=$lt_install_override_mode
+
 # Command to use after installation of a shared archive.
 postinstall_cmds=$lt_postinstall_cmds
 
@@ -20097,6 +21014,10 @@
 # The linker used to build libraries.
 LD=$lt_LD
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag
+reload_cmds=$lt_reload_cmds
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds
 
@@ -20109,12 +21030,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static
 
@@ -20164,10 +21085,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator
 
@@ -20201,9 +21118,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols
 
@@ -20219,6 +21133,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec
 
@@ -20265,212 +21182,169 @@
   # if finds mixed CR/LF and LF-only lines.  Since sed operates in
   # text mode, it properly converts lines to CR/LF.  This bash problem
   # is reportedly fixed, but why not run on old versions too?
-  sed '/^# Generated shell functions inserted here/q' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
-
-  case $xsi_shell in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result="${1##*/}"
-}
-
-# func_dirname_and_basename file append nondir_replacement
-# perform func_basename and func_dirname in a single function
-# call:
-#   dirname:  Compute the dirname of FILE.  If nonempty,
-#             add APPEND to the result, otherwise set result
-#             to NONDIR_REPLACEMENT.
-#             value returned in "$func_dirname_result"
-#   basename: Compute filename of FILE.
-#             value retuned in "$func_basename_result"
-# Implementation must be kept synchronized with func_dirname
-# and func_basename. For efficiency, we do not delegate to
-# those functions but instead duplicate the functionality here.
-func_dirname_and_basename ()
-{
-  case ${1} in
-    */*) func_dirname_result="${1%/*}${2}" ;;
-    *  ) func_dirname_result="${3}" ;;
-  esac
-  func_basename_result="${1##*/}"
-}
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-func_stripname ()
-{
-  # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are
-  # positional parameters, so assign one to ordinary parameter first.
-  func_stripname_result=${3}
-  func_stripname_result=${func_stripname_result#"${1}"}
-  func_stripname_result=${func_stripname_result%"${2}"}
-}
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=${1%%=*}
-  func_opt_split_arg=${1#*=}
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  case ${1} in
-    *.lo) func_lo2o_result=${1%.lo}.${objext} ;;
-    *)    func_lo2o_result=${1} ;;
-  esac
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=${1%.*}.lo
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=$(( $* ))
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=${#1}
-}
-
-_LT_EOF
-    ;;
-  *) # Bourne compatible functions.
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_dirname file append nondir_replacement
-# Compute the dirname of FILE.  If nonempty, add APPEND to the result,
-# otherwise set result to NONDIR_REPLACEMENT.
-func_dirname ()
-{
-  # Extract subdirectory from the argument.
-  func_dirname_result=`$ECHO "X${1}" | $Xsed -e "$dirname"`
-  if test "X$func_dirname_result" = "X${1}"; then
-    func_dirname_result="${3}"
-  else
-    func_dirname_result="$func_dirname_result${2}"
-  fi
-}
-
-# func_basename file
-func_basename ()
-{
-  func_basename_result=`$ECHO "X${1}" | $Xsed -e "$basename"`
-}
-
-
-# func_stripname prefix suffix name
-# strip PREFIX and SUFFIX off of NAME.
-# PREFIX and SUFFIX must not contain globbing or regex special
-# characters, hashes, percent signs, but SUFFIX may contain a leading
-# dot (in which case that matches only a dot).
-# func_strip_suffix prefix name
-func_stripname ()
-{
-  case ${2} in
-    .*) func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%\\\\${2}\$%%"`;;
-    *)  func_stripname_result=`$ECHO "X${3}" \
-           | $Xsed -e "s%^${1}%%" -e "s%${2}\$%%"`;;
-  esac
-}
-
-# sed scripts:
-my_sed_long_opt='1s/^\(-[^=]*\)=.*/\1/;q'
-my_sed_long_arg='1s/^-[^=]*=//'
-
-# func_opt_split
-func_opt_split ()
-{
-  func_opt_split_opt=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_opt"`
-  func_opt_split_arg=`$ECHO "X${1}" | $Xsed -e "$my_sed_long_arg"`
-}
-
-# func_lo2o object
-func_lo2o ()
-{
-  func_lo2o_result=`$ECHO "X${1}" | $Xsed -e "$lo2o"`
-}
-
-# func_xform libobj-or-source
-func_xform ()
-{
-  func_xform_result=`$ECHO "X${1}" | $Xsed -e 's/\.[^.]*$/.lo/'`
-}
-
-# func_arith arithmetic-term...
-func_arith ()
-{
-  func_arith_result=`expr "$@"`
-}
-
-# func_len string
-# STRING may not start with a hyphen.
-func_len ()
-{
-  func_len_result=`expr "$1" : ".*" 2>/dev/null || echo $max_cmd_len`
-}
-
-_LT_EOF
-esac
-
-case $lt_shell_append in
-  yes)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1+=\$2"
-}
-_LT_EOF
-    ;;
-  *)
-    cat << \_LT_EOF >> "$cfgfile"
-
-# func_append var value
-# Append VALUE to the end of shell variable VAR.
-func_append ()
-{
-  eval "$1=\$$1\$2"
-}
-
-_LT_EOF
-    ;;
-  esac
+  sed '$q' "$ltmain" >> "$cfgfile" \
+     || (rm -f "$cfgfile"; exit 1)
 
+  if test x"$xsi_shell" = xyes; then
+  sed -e '/^func_dirname ()$/,/^} # func_dirname /c\
+func_dirname ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+} # Extended-shell func_dirname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_basename ()$/,/^} # func_basename /c\
+func_basename ()\
+{\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_dirname_and_basename ()$/,/^} # func_dirname_and_basename /c\
+func_dirname_and_basename ()\
+{\
+\    case ${1} in\
+\      */*) func_dirname_result="${1%/*}${2}" ;;\
+\      *  ) func_dirname_result="${3}" ;;\
+\    esac\
+\    func_basename_result="${1##*/}"\
+} # Extended-shell func_dirname_and_basename implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_stripname ()$/,/^} # func_stripname /c\
+func_stripname ()\
+{\
+\    # pdksh 5.2.14 does not do ${X%$Y} correctly if both X and Y are\
+\    # positional parameters, so assign one to ordinary parameter first.\
+\    func_stripname_result=${3}\
+\    func_stripname_result=${func_stripname_result#"${1}"}\
+\    func_stripname_result=${func_stripname_result%"${2}"}\
+} # Extended-shell func_stripname implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_long_opt ()$/,/^} # func_split_long_opt /c\
+func_split_long_opt ()\
+{\
+\    func_split_long_opt_name=${1%%=*}\
+\    func_split_long_opt_arg=${1#*=}\
+} # Extended-shell func_split_long_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_split_short_opt ()$/,/^} # func_split_short_opt /c\
+func_split_short_opt ()\
+{\
+\    func_split_short_opt_arg=${1#??}\
+\    func_split_short_opt_name=${1%"$func_split_short_opt_arg"}\
+} # Extended-shell func_split_short_opt implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_lo2o ()$/,/^} # func_lo2o /c\
+func_lo2o ()\
+{\
+\    case ${1} in\
+\      *.lo) func_lo2o_result=${1%.lo}.${objext} ;;\
+\      *)    func_lo2o_result=${1} ;;\
+\    esac\
+} # Extended-shell func_lo2o implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_xform ()$/,/^} # func_xform /c\
+func_xform ()\
+{\
+    func_xform_result=${1%.*}.lo\
+} # Extended-shell func_xform implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_arith ()$/,/^} # func_arith /c\
+func_arith ()\
+{\
+    func_arith_result=$(( $* ))\
+} # Extended-shell func_arith implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_len ()$/,/^} # func_len /c\
+func_len ()\
+{\
+    func_len_result=${#1}\
+} # Extended-shell func_len implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+fi
+
+if test x"$lt_shell_append" = xyes; then
+  sed -e '/^func_append ()$/,/^} # func_append /c\
+func_append ()\
+{\
+    eval "${1}+=\\${2}"\
+} # Extended-shell func_append implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  sed -e '/^func_append_quoted ()$/,/^} # func_append_quoted /c\
+func_append_quoted ()\
+{\
+\    func_quote_for_eval "${2}"\
+\    eval "${1}+=\\\\ \\$func_quote_for_eval_result"\
+} # Extended-shell func_append_quoted implementation' "$cfgfile" > $cfgfile.tmp \
+  && mv -f "$cfgfile.tmp" "$cfgfile" \
+    || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+test 0 -eq $? || _lt_function_replace_fail=:
+
+
+  # Save a `func_append' function call where possible by direct use of '+='
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1+="%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+else
+  # Save a `func_append' function call even when '+=' is not available
+  sed -e 's%func_append \([a-zA-Z_]\{1,\}\) "%\1="$\1%g' $cfgfile > $cfgfile.tmp \
+    && mv -f "$cfgfile.tmp" "$cfgfile" \
+      || (rm -f "$cfgfile" && cp "$cfgfile.tmp" "$cfgfile" && rm -f "$cfgfile.tmp")
+  test 0 -eq $? || _lt_function_replace_fail=:
+fi
+
+if test x"$_lt_function_replace_fail" = x":"; then
+  { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Unable to substitute extended shell functions in $ofile" >&5
+$as_echo "$as_me: WARNING: Unable to substitute extended shell functions in $ofile" >&2;}
+fi
 
-  sed -n '/^# Generated shell functions inserted here/,$p' "$ltmain" >> "$cfgfile" \
-    || (rm -f "$cfgfile"; exit 1)
 
-  mv -f "$cfgfile" "$ofile" ||
+   mv -f "$cfgfile" "$ofile" ||
     (rm -f "$ofile" && cp "$cfgfile" "$ofile" && rm -f "$cfgfile")
   chmod +x "$ofile"
 
@@ -20482,6 +21356,10 @@
 # The linker used to build libraries.
 LD=$lt_LD_CXX
 
+# How to create reloadable object files.
+reload_flag=$lt_reload_flag_CXX
+reload_cmds=$lt_reload_cmds_CXX
+
 # Commands used to build an old-style archive.
 old_archive_cmds=$lt_old_archive_cmds_CXX
 
@@ -20494,12 +21372,12 @@
 # Compiler flag to turn off builtin functions.
 no_builtin_flag=$lt_lt_prog_compiler_no_builtin_flag_CXX
 
-# How to pass a linker flag through the compiler.
-wl=$lt_lt_prog_compiler_wl_CXX
-
 # Additional compiler flags for building library objects.
 pic_flag=$lt_lt_prog_compiler_pic_CXX
 
+# How to pass a linker flag through the compiler.
+wl=$lt_lt_prog_compiler_wl_CXX
+
 # Compiler flag to prevent dynamic linking.
 link_static_flag=$lt_lt_prog_compiler_static_CXX
 
@@ -20549,10 +21427,6 @@
 # This must work even if \$libdir does not exist
 hardcode_libdir_flag_spec=$lt_hardcode_libdir_flag_spec_CXX
 
-# If ld is used when linking, flag to hardcode \$libdir into a binary
-# during linking.  This must work even if \$libdir does not exist.
-hardcode_libdir_flag_spec_ld=$lt_hardcode_libdir_flag_spec_ld_CXX
-
 # Whether we need a single "-rpath" flag with a separated argument.
 hardcode_libdir_separator=$lt_hardcode_libdir_separator_CXX
 
@@ -20586,9 +21460,6 @@
 # Whether libtool must link a program against all its dependency libraries.
 link_all_deplibs=$link_all_deplibs_CXX
 
-# Fix the shell variable \$srcfile for the compiler.
-fix_srcfile_path=$lt_fix_srcfile_path_CXX
-
 # Set to "yes" if exported symbols are required.
 always_export_symbols=$always_export_symbols_CXX
 
@@ -20604,6 +21475,9 @@
 # Commands necessary for linking programs (against libraries) with templates.
 prelink_cmds=$lt_prelink_cmds_CXX
 
+# Commands necessary for finishing linking programs.
+postlink_cmds=$lt_postlink_cmds_CXX
+
 # Specify filename containing input files.
 file_list_spec=$lt_file_list_spec_CXX
 
diff -Nru filezilla-3.5.3/configure.in filezilla-3.7.3~precise/configure.in
--- filezilla-3.5.3/configure.in	2012-01-08 13:25:39.000000000 +0000
+++ filezilla-3.7.3~precise/configure.in	2013-08-07 17:25:47.000000000 +0000
@@ -1,4 +1,4 @@
-AC_INIT(FileZilla, 3.5.3, tim.kosse@filezilla-project.org)
+AC_INIT(FileZilla, 3.7.3, tim.kosse@filezilla-project.org)
 AC_CONFIG_HEADERS([src/include/config.h])
 AC_CONFIG_MACRO_DIR([m4])
 AC_CONFIG_AUX_DIR(config)
@@ -100,7 +100,7 @@
     AC_MSG_ERROR([
         wxWidgets must be installed on your system
         but either the wx-config script couldn't be found or
-        no compatible wxWidgets configuration has been insalled.
+        no compatible wxWidgets configuration has been installed.
 
         Compatible wxWidgets configurations are the unicode builds
         of wxGTK, wxMac and wxMSW.
@@ -194,21 +194,23 @@
   use_resourcefile=
   AC_MSG_CHECKING([whether to use windres])
   if echo $host_os | grep "cygwin\|mingw" > /dev/null 2>&1; then
-        if echo $WX_CPPFLAGS | grep __WXMSW__ > /dev/null 2>&1; then
-        if test -z "$host_alias"; then
-            hostaliaswindres=
-        else
-            hostaliaswindres="$host_alias-windres"
-        fi
-        AC_MSG_RESULT([yes])
-        AC_PATH_PROGS([WINDRES], [windres $hostaliaswindres $host_os-windres])
-        if test "x$WINDRES" = "x"; then
-            AC_MSG_ERROR([windres could not be found, please make sure this program is within your path.])
-        fi
-                use_resourcefile=true
-                parseflags $WX_CPPFLAGS
+    if echo $WX_CPPFLAGS | grep __WXMSW__ > /dev/null 2>&1; then
+      if test -z "$host_alias"; then
+        hostaliaswindres=
+      else
+        hostaliaswindres="$host_alias-windres"
+      fi
+      AC_MSG_RESULT([yes])
+      AC_PATH_PROGS([WINDRES], [windres $hostaliaswindres $host_os-windres])
+      if test "x$WINDRES" = "x"; then
+        AC_MSG_ERROR([windres could not be found, please make sure this program is within your path.])
+      fi
+      use_resourcefile=true
+      parseflags $WX_CPPFLAGS
+
+      FZ_CHECK_ICOPYHOOKW
     else
-        AC_MSG_RESULT([no])
+      AC_MSG_RESULT([no])
     fi
   else
     AC_MSG_RESULT([no])
@@ -576,6 +578,7 @@
 src/interface/resources/lone/Makefile
 src/interface/resources/minimal/Makefile
 src/interface/resources/opencrystal/Makefile
+src/interface/resources/tango/Makefile
 src/putty/Makefile src/putty/unix/Makefile src/putty/windows/Makefile
 tests/Makefile src/interface/resources/version.rc
 src/interface/resources/MacInfo.plist
diff -Nru filezilla-3.5.3/data/Makefile.in filezilla-3.7.3~precise/data/Makefile.in
--- filezilla-3.5.3/data/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/data/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +60,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -53,6 +71,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,6 +97,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(desktopentrydir)"
 DATA = $(dist_desktopentry_DATA) $(dist_noinst_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -99,6 +128,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -136,6 +166,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -181,6 +212,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -214,7 +246,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -294,8 +325,11 @@
 	-rm -rf .libs _libs
 install-dist_desktopentryDATA: $(dist_desktopentry_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(desktopentrydir)" || $(MKDIR_P) "$(DESTDIR)$(desktopentrydir)"
 	@list='$(dist_desktopentry_DATA)'; test -n "$(desktopentrydir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(desktopentrydir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(desktopentrydir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -309,9 +343,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_desktopentry_DATA)'; test -n "$(desktopentrydir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(desktopentrydir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(desktopentrydir)" && rm -f $$files
+	dir='$(DESTDIR)$(desktopentrydir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -366,10 +398,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/data/install.nsi.in filezilla-3.7.3~precise/data/install.nsi.in
--- filezilla-3.5.3/data/install.nsi.in	2011-05-24 03:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/data/install.nsi.in	2013-06-25 17:11:01.000000000 +0000
@@ -12,8 +12,8 @@
   !define VERSION_MAJOR @PACKAGE_VERSION_MAJOR@
   !define VERSION_MINOR @PACKAGE_VERSION_MINOR@
   !define VERSION_FULL  @PACKAGE_VERSION_MAJOR@.@PACKAGE_VERSION_MINOR@.@PACKAGE_VERSION_MICRO@.@PACKAGE_VERSION_NANO@
-  !define PUBLISHER    "FileZilla Project"
-  !define WEBSITE_URL  "http://filezilla-project.org/"
+  !define PUBLISHER    "Tim Kosse"
+  !define WEBSITE_URL  "https://filezilla-project.org/"
   !addplugindir @srcdir@
 
 ;--------------------------------
@@ -27,7 +27,7 @@
 
   ;Default installation folder
   InstallDir "$PROGRAMFILES\FileZilla FTP Client"
-  
+
   ;Get installation folder from registry if available
   InstallDirRegKey HKLM "Software\FileZilla Client" ""
 
@@ -57,7 +57,7 @@
 
   VIProductVersion                   "${VERSION_FULL}"
   VIAddVersionKey "CompanyName"      "${PUBLISHER}"
-  VIAddVersionKey "ProductName"      "FileZilla" 
+  VIAddVersionKey "ProductName"      "FileZilla"
   VIAddVersionKey "ProductVersion"   "${VERSION}"
   VIAddVersionKey "FileDescription"  "FileZilla FTP Client"
   VIAddVersionKey "FileVersion"      "${VERSION}"
@@ -89,6 +89,7 @@
   Var IS_ADMIN
   Var USERNAME
   Var PERFORM_UPDATE
+  Var SKIPLICENSE
   Var GetInstalledSize.total
 
 ;--------------------------------
@@ -125,7 +126,7 @@
   !define MUI_STARTMENUPAGE_REGISTRY_KEY "Software\FileZilla Client"
   !define MUI_STARTMENUPAGE_REGISTRY_VALUENAME "Startmenu"
   !define MUI_STARTMENUPAGE_DEFAULTFOLDER "FileZilla FTP Client"
-  
+
   !define MUI_PAGE_CUSTOMFUNCTION_PRE PageStartmenuPre
   !insertmacro MUI_PAGE_STARTMENU Application $STARTMENU_FOLDER
 
@@ -137,7 +138,7 @@
   !define MUI_FINISHPAGE_RUN_FUNCTION CustomFinishRun
   !define MUI_FINISHPAGE_RUN_TEXT "&Start FileZilla now"
   !insertmacro MUI_PAGE_FINISH
-  
+
   !define MUI_PAGE_CUSTOMFUNCTION_PRE un.ConfirmPagePre
   !insertmacro MUI_UNPAGE_CONFIRM
   !insertmacro MUI_UNPAGE_INSTFILES
@@ -238,7 +239,7 @@
       return
     ${EndIf}
   ${EndIf}
-  
+
   ReadRegStr $PREVIOUS_INSTALLDIR HKCU "Software\FileZilla Client" ""
 
   Call CheckPrevInstallDirExists
@@ -252,7 +253,7 @@
       return
     ${EndIf}
   ${EndIf}
- 
+
 FunctionEnd
 
 Function LoadPreviousSettings
@@ -297,6 +298,20 @@
 
 FunctionEnd
 
+Function ReadSkipLicense
+
+  ${GetParameters} $R0
+
+  ${GetOptions} $R0 "/skiplicense" $R1
+
+  ${If} ${Errors}
+    StrCpy $SKIPLICENSE 0
+  ${Else}
+    StrCpy $SKIPLICENSE 1
+  ${EndIf}
+
+FunctionEnd
+
 Function .onInit
 
   ${Unless} ${AtLeastWin2000}
@@ -304,7 +319,7 @@
     Abort
 installonoldwindows:
   ${EndUnless}
-  
+
   UAC_unicode::RunElevated
   StrCmp 1223 $0 UAC_ElevationAborted ; UAC dialog aborted by user?
   StrCmp 0 $0 0 UAC_Err ; Error?
@@ -318,6 +333,8 @@
   ; /update argument
   Call ReadUpdateCommandline
 
+  Call ReadSkipLicense
+
   Call GetUserInfo
 
   ; Initialize $ALL_USERS with default value
@@ -352,7 +369,7 @@
       ${EndIf}
     ${EndIf}
   ${EndIf}
-        
+
   ${If} $PREVIOUS_VERSION == ""
 
     StrCpy $PERFORM_UPDATE 0
@@ -465,8 +482,9 @@
 
   ${If} $PERFORM_UPDATE == 1
     Abort
+  ${Elseif} $SKIPLICENSE == 1
+    Abort
   ${EndIf}
-
 FunctionEnd
 
 Function PageReinstall
@@ -538,6 +556,12 @@
     SendMessage $R0 ${BM_SETCHECK} 1 0
   ${EndIf}
 
+  ${If} $SKIPLICENSE == 1
+    EnableWindow $mui.Button.Back 0
+  ${Else}
+    EnableWindow $mui.Button.Back 1
+  ${Endif}
+
   nsDialogs::Show
 
 FunctionEnd
@@ -624,7 +648,7 @@
 
   nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 0 100% 30 "Please select whether you wish to make this software available to all users or just yourself."
   Pop $R0
-  
+
   ${If} $IS_ADMIN == 1
     StrCpy $R2 ${BS_AUTORADIOBUTTON}|${BS_VCENTER}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}|${WS_GROUP}|${WS_TABSTOP}
   ${Else}
@@ -632,16 +656,16 @@
   ${EndIf}
   nsDialogs::CreateItem /NOUNLOAD BUTTON $R2 0 10 55 100% 30 "&Anyone who uses this computer (all users)"
   Pop $ALL_USERS_BUTTON
-  
+
   StrCpy $R2 ${BS_AUTORADIOBUTTON}|${BS_TOP}|${BS_MULTILINE}|${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS}
-  
+
   ${If} $USERNAME != ""
     nsDialogs::CreateItem /NOUNLOAD BUTTON $R2 0 10 85 100% 50 "&Only for me ($USERNAME)"
   ${Else}
     nsDialogs::CreateItem /NOUNLOAD BUTTON $R2 0 10 85 100% 50 "&Only for me"
   ${EndIf}
   Pop $R0
-  
+
   ${If} $PREVIOUS_VERSION != ""
     ${If} $ALL_USERS_DEFAULT == 1
       nsDialogs::CreateItem /NOUNLOAD STATIC ${WS_VISIBLE}|${WS_CHILD}|${WS_CLIPSIBLINGS} 0 0 -30 100% 30 "FileZilla has been previously installed for all users."
@@ -658,7 +682,20 @@
   ${Else}
     SendMessage $R0 ${BM_SETCHECK} 1 0
   ${EndIf}
-  
+
+  ${If} $PREVIOUS_VERSION == ""
+  ${OrIf} $PERFORM_UPDATE == 1}
+    ${IF} $SKIPLICENSE == 1
+      EnableWindow $mui.Button.Back 0
+    ${ENDIF}
+  ${EndIf}
+
+  ${If} $PERFORM_UPDATE == 1
+    StrCpy $REINSTALL_UNINSTALL 1
+    Abort
+  ${EndIf}
+
+
   nsDialogs::Show
 
 FunctionEnd
@@ -724,7 +761,7 @@
   ${EndIf}
 
   ${While} $R1 == 1
- 
+
     ${If} $R0 == 0
 
       ${ExitWhile}
@@ -752,7 +789,7 @@
     Push "filezilla.exe"
     Call IsProcessRunning
     Pop $R1
-    
+
   ${EndWhile}
 
  CheckFileZillaRunning_ignore:
@@ -792,7 +829,7 @@
 
 ;--------------------------------
 ;Languages
- 
+
   !insertmacro MUI_LANGUAGE "English"
 
 ;--------------------------------
@@ -803,7 +840,7 @@
   SectionIn 1 RO
 
   SetOutPath "$INSTDIR"
-  
+
   File "..\src\interface\${LT_EXEDIR}FileZilla.exe"
   File "..\src\putty\${LT_EXEDIR}fzsftp.exe"
   File "..\src\putty\${LT_EXEDIR}fzputtygen.exe"
@@ -824,7 +861,7 @@
 
   SetOutPath "$INSTDIR\resources\32x32"
   File "${top_srcdir}/src\interface\resources\32x32\*.png"
-  
+
   SetOutPath "$INSTDIR\resources\48x48"
   File "${top_srcdir}/src\interface\resources\48x48\*.png"
 
@@ -855,13 +892,13 @@
   File "${top_srcdir}\docs\fzdefaults.xml.example"
 
   !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-    
+
   ;Create shortcuts
   SetOutPath "$INSTDIR"
   CreateDirectory "$SMPROGRAMS\$STARTMENU_FOLDER"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\Uninstall.lnk" "$INSTDIR\Uninstall.exe"
   CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\FileZilla.lnk" "$INSTDIR\filezilla.exe"
-  
+
   ${If} ${AtLeastWin7}
     ; Setting AppID
     push "FileZilla.Client.AppID"
@@ -894,6 +931,7 @@
   !insertmacro INSTALLICONSET lone
   !insertmacro INSTALLICONSET minimal
   !insertmacro INSTALLICONSET opencrystal
+  !insertmacro INSTALLICONSET tango
 
 ${MementoSectionEnd}
 
@@ -1048,7 +1086,7 @@
   ${EndIf}
 
   ReadRegStr $R1 HKCU "Software\FileZilla Client" ""
-  
+
   ${If} $R1 != ""
     ;Detect version
     ReadRegStr $R2 HKCU "Software\FileZilla Client" "Version"
@@ -1087,30 +1125,30 @@
     MessageBox MB_ICONSTOP "FileZilla has been installed for all users.$\nPlease restart the uninstaller with Administrator privileges to remove it." /SD IDOK
     Abort
   ${EndIf}
-  
+
 FunctionEnd
 
 Function un.RemoveStartmenu
 
   !insertmacro MUI_STARTMENU_GETFOLDER Application $MUI_TEMP
-  
+
   Delete "$SMPROGRAMS\$MUI_TEMP\Uninstall.lnk"
   Delete "$SMPROGRAMS\$MUI_TEMP\FileZilla.lnk"
-  
+
   ${un.GetParameters} $R0
 
   ${un.GetOptions} $R0 "/keepstartmenudir" $R1
   ${If} ${Errors}
- 
+
     ;Delete empty start menu parent diretories
     StrCpy $MUI_TEMP "$SMPROGRAMS\$MUI_TEMP"
- 
+
     startMenuDeleteLoop:
       RMDir $MUI_TEMP
       GetFullPathName $MUI_TEMP "$MUI_TEMP\.."
-    
+
       IfErrors startMenuDeleteLoopDone
-  
+
       StrCmp $MUI_TEMP $SMPROGRAMS startMenuDeleteLoopDone startMenuDeleteLoop
     startMenuDeleteLoopDone:
 
@@ -1119,7 +1157,7 @@
 FunctionEnd
 
 Function un.ConfirmPagePre
-  
+
   ${un.GetParameters} $R0
 
   ${un.GetOptions} $R0 "/frominstall" $R1
@@ -1130,7 +1168,7 @@
 FunctionEnd
 
 Function un.FinishPagePre
-  
+
   ${un.GetParameters} $R0
 
   ${un.GetOptions} $R0 "/frominstall" $R1
@@ -1156,7 +1194,7 @@
 !endif
 
 !macro UNINSTALLICONSET SET
-  
+
   Delete "$INSTDIR\resources\${SET}\theme.xml"
   Delete "$INSTDIR\resources\${SET}\16x16\*.png"
   Delete "$INSTDIR\resources\${SET}\20x20\*.png"
@@ -1188,7 +1226,6 @@
   Delete "$INSTDIR\fzsftp.exe"
   Delete "$INSTDIR\fzputtygen.exe"
   Delete "$INSTDIR\mingwm10.dll"
-  Delete "mingwm10.dll"
   Delete "$INSTDIR\GPL.html"
   Delete "$INSTDIR\NEWS"
   Delete "$INSTDIR\AUTHORS"
@@ -1206,6 +1243,7 @@
   !insertmacro UNINSTALLICONSET lone
   !insertmacro UNINSTALLICONSET minimal
   !insertmacro UNINSTALLICONSET opencrystal
+  !insertmacro UNINSTALLICONSET tango
 
 !if "@FILEZILLA_LINGUAS@" != ""
   ; uninstalllangfiles.nsh is generated by configure and just contains a series of
diff -Nru filezilla-3.5.3/data/process_running.nsh filezilla-3.7.3~precise/data/process_running.nsh
--- filezilla-3.5.3/data/process_running.nsh	2010-09-20 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/data/process_running.nsh	2012-10-06 03:30:13.000000000 +0000
@@ -99,7 +99,7 @@
     Push ''
 
     return
-    
+
   ${EndIf}
 
   System::Call "kernel32::CloseHandle(i R0)"
@@ -130,7 +130,7 @@
   IntOp $R4 0 - $R4
 
   Call EnumProcesses
-  
+
   Pop $R1
   Pop $R2
 
@@ -179,4 +179,3 @@
 FunctionEnd
 
 !endif ;EXECUTABLE_RUNNING_INCLUDED
-
diff -Nru filezilla-3.5.3/debian/changelog filezilla-3.7.3~precise/debian/changelog
--- filezilla-3.5.3/debian/changelog	2012-03-28 08:28:35.000000000 +0000
+++ filezilla-3.7.3~precise/debian/changelog	2013-08-19 21:43:14.000000000 +0000
@@ -1,3 +1,9 @@
+filezilla (3.7.3~precise) precise; urgency=low
+
+  * New upstream release
+
+ -- Stephane ROBERT <ns.robert@gmail.com>  Mon, 19 Aug 2013 23:20:55 +0200
+
 filezilla (3.5.3-1ubuntu2) precise; urgency=low
 
   * Added debian/filezilla.svg and install it as application icon
diff -Nru filezilla-3.5.3/docs/filezilla.man filezilla-3.7.3~precise/docs/filezilla.man
--- filezilla-3.5.3/docs/filezilla.man	2010-04-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/docs/filezilla.man	2013-06-25 17:11:01.000000000 +0000
@@ -1,4 +1,4 @@
-.TH filezilla 1 "April 2008" "" "FileZilla Manual"
+.TH filezilla 1 "May 2013" "" "FileZilla Manual"
 .SH NAME
 FileZilla \- FTP client
 .SH SYNOPSIS
@@ -9,6 +9,8 @@
 .B filezilla \-h|\-s|\-v
 .br
 .B filezilla \-c <site>
+.br
+.B filezilla \-a <path>
 .SH DESCRIPTION
 FileZilla is a powerful client for plain FTP, FTP over SSL/TLS (FTPS) and the SSH File Transfer Protocol (SFTP).
 .SH OPTIONS
@@ -25,6 +27,12 @@
 nor with URL parameter.
 
 .TP
+.B \-a <path>, \-\-local <path>
+Sets the local site to the given path.
+.IP
+Example: filezilla \-a "/foo bar/"
+
+.TP
 .B \-h, \-\-help
 Displays a help dialog listing these commandline options.
 
@@ -54,9 +62,9 @@
 .B FZ_DATADIR
 environment variable can be used to specify the directory containing FileZilla's data files.
 .SH SUPPORT
-Please visit http://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website.
+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\-2010  Tim Kosse
+Copyright (C) 2004\-2013  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.5.3/docs/fzdefaults.xml.man filezilla-3.7.3~precise/docs/fzdefaults.xml.man
--- filezilla-3.5.3/docs/fzdefaults.xml.man	2010-04-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/docs/fzdefaults.xml.man	2013-06-25 17:11:01.000000000 +0000
@@ -1,4 +1,4 @@
-.TH fzdefaults.xml 5 "December 2008" "" "FileZilla Manual"
+.TH fzdefaults.xml 5 "May 2013" "" "FileZilla Manual"
 .SH NAME
 fzdefaults.xml \- Default options for FileZilla
 .SH SYNOPSIS
@@ -20,9 +20,9 @@
 .B fzdefaults.xml.example
 for further information. It is often found in the /usr/share/filezilla/docs directory.
 .SH SUPPORT
-Please visit http://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website.
+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\-2010  Tim Kosse
+Copyright (C) 2004\-2013  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.5.3/docs/fzputtygen.man filezilla-3.7.3~precise/docs/fzputtygen.man
--- filezilla-3.5.3/docs/fzputtygen.man	2010-04-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/docs/fzputtygen.man	2013-06-25 17:11:01.000000000 +0000
@@ -1,4 +1,4 @@
-.TH fzputtygen 1 "August 2008" "" "FileZilla Manual"
+.TH fzputtygen 1 "May 2013" "" "FileZilla Manual"
 .SH NAME
 fzputtygen \- SFTP private key converter of FileZilla
 .SH DESCRIPTION
@@ -8,11 +8,11 @@
 .B fzputtygen
 is based on the puttygen component of PuTTY.
 .SH SUPPORT
-Please visit http://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website.
+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\-2010  Tim Kosse
+Copyright (C) 2004\-2013  Tim Kosse
 .br
-Copyright (C) 1997\-2010  Simon Tatham and the PuTTY team
+Copyright (C) 1997\-2013  Simon Tatham and the PuTTY team
 .P
 FileZilla is distributed under the terms of the GNU General Public License version 2 or later.
 .SH "SEE ALSO"
diff -Nru filezilla-3.5.3/docs/fzsftp.man filezilla-3.7.3~precise/docs/fzsftp.man
--- filezilla-3.5.3/docs/fzsftp.man	2010-04-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/docs/fzsftp.man	2013-06-25 17:11:01.000000000 +0000
@@ -1,4 +1,4 @@
-.TH fzsftp 1 "January 2008" "" "FileZilla Manual"
+.TH fzsftp 1 "May 2013" "" "FileZilla Manual"
 .SH NAME
 fzsftp \- SFTP connection handler of FileZilla
 .SH DESCRIPTION
@@ -8,11 +8,11 @@
 .B fzsftp
 is based on the psftp component of PuTTY.
 .SH SUPPORT
-Please visit http://filezilla\-project.org/ for further information. Report bugs only if you are using the latest version available from the FileZilla website.
+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\-2010  Tim Kosse
+Copyright (C) 2004\-2013  Tim Kosse
 .br
-Copyright (C) 1997\-2010  Simon Tatham and the PuTTY team
+Copyright (C) 1997\-2013  Simon Tatham and the PuTTY team
 .P
 FileZilla is distributed under the terms of the GNU General Public License version 2 or later.
 .SH "SEE ALSO"
diff -Nru filezilla-3.5.3/docs/iconspecs.htm filezilla-3.7.3~precise/docs/iconspecs.htm
--- filezilla-3.5.3/docs/iconspecs.htm	2012-01-08 13:25:38.000000000 +0000
+++ filezilla-3.7.3~precise/docs/iconspecs.htm	2012-10-08 03:30:21.000000000 +0000
@@ -155,7 +155,7 @@
     ascii.png, auto.png, binary.png - Transfermode icons for Ascii, binary
     and Auto mode.
   </li>
-  <li>bookmarks.png - Bookmarks/Favourites</li>
+  <li>bookmark.png - Bookmarks/Favourites</li>
   <li>bookmark.png - Individual Bookmark/Favourite</li>
   <li>folderup.png - "Go up one folder"</li>
   <li>folderback.png - "Go back to previous folder"</li>
diff -Nru filezilla-3.5.3/locales/Makefile.in filezilla-3.7.3~precise/locales/Makefile.in
--- filezilla-3.5.3/locales/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/locales/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -52,6 +70,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA) $(noinst_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
 ACLOCAL = @ACLOCAL@
@@ -76,6 +99,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -113,6 +137,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -158,6 +183,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -191,7 +217,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -330,10 +355,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/locales/an.po filezilla-3.7.3~precise/locales/an.po
--- filezilla-3.5.3/locales/an.po	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/locales/an.po	2013-06-10 18:45:03.000000000 +0000
@@ -0,0 +1,8225 @@
+# Traducción de FileZilla ta l'aragonés.
+# Copyright (C) 2012 FileZilla'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the FileZilla package.
+# Jorge Perez Perez <jorgtum@gmail.com>, 2012.
+# juanpabl <jpmart@unizar.es>, 2013.
+msgid ""
+msgstr ""
+"Project-Id-Version: FileZilla 3.6.0.2\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-05-27 12:31+0100\n"
+"Last-Translator: Jorge Pérez Pérez <jorgtum@gmail.com>\n"
+"Language-Team: softaragonés\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: an\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+# Traduciu y correchiu por Jorge Pérez Pérez <jorgtum@gmail.com>, 2013
+# Softaragonés
+#: ../../locales/../src/interface/statuslinectrl.cpp:65
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
+msgid "%H:%M:%S elapsed"
+msgstr "Ha transcorriu %H:%M:%S"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:69
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
+msgid "%H:%M:%S left"
+msgstr "En queda %H:%M:%S"
+
+#: resources.h:799
+#, no-c-format
+msgid ""
+"%a - Account (Lines containing this will be omitted if not using Account "
+"logontype)"
+msgstr ""
+"%a - Cuenta (As linias que contiengan isto serán omitidas si no se ye usando "
+"o tipo d'inicio de Cuenta)"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:63
+#: ../../locales/../src/interface/filelist_statusbar.cpp:74
+#: ../../locales/../src/interface/filelist_statusbar.cpp:86
+#, c-format
+msgid "%d directory"
+msgid_plural "%d directories"
+msgstr[0] "%d directorio"
+msgstr[1] "%d directorios"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
+#, c-format
+msgid "%d directory with its contents"
+msgid_plural "%d directories with their contents"
+msgstr[0] "%d directorio con os suyos contenius"
+msgstr[1] "%d directorios con os suyos contenius"
+
+#: ../../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
+#, c-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d fichero"
+msgstr[1] "%d fichers"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:81
+#, c-format
+msgid "%d file. Total size: %s"
+msgid_plural "%d files. Total size: %s"
+msgstr[0] "%d fichero. Grandaria total: %s"
+msgstr[1] "%d fichers. Grandaria total: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:79
+#, c-format
+msgid "%d file. Total size: At least %s"
+msgid_plural "%d files. Total size: At least %s"
+msgstr[0] "%d fichero. Grandaria total: A lo menos %s"
+msgstr[1] "%d fichers. Grandaria total: A lo menos %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:2934
+#, c-format
+msgid "%d files added to queue"
+msgstr "S'ha adhibiu %d fichers a la ringlera"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:104
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
+
+#: resources.h:796
+msgid "%h - Host"
+msgstr "%h - Servidor"
+
+#: resources.h:798
+#, no-c-format
+msgid "%p - Password"
+msgstr "%p - Clau"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, c-format
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
+#, c-format
+msgid "%s (? B/s)"
+msgstr "%s (? B/s)"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
+#, c-format
+msgid "%s - Certificate expired!"
+msgstr "%s - O certificau ha venciu!"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
+#, c-format
+msgid "%s - Not yet valid!"
+msgstr "%s - Encara no ye valido!"
+
+#: resources.h:800
+#, no-c-format
+msgid "%s - Proxy user"
+msgstr "%s - Usuario d'o proxy"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:91
+#, c-format
+msgid "%s and %s. Total size: %s"
+msgstr "%s y %s. Grandaria total: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:89
+#, c-format
+msgid "%s and %s. Total size: At least %s"
+msgstr "%s y %s. Grandaria total: A lo menos %s"
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:31
+#, c-format
+msgid "%s byte"
+msgid_plural "%s bytes"
+msgstr[0] "%s byte"
+msgstr[1] "%s bytes"
+
+#: ../../locales/../src/interface/updatewizard.cpp:918
+#, c-format
+msgid "%s bytes"
+msgstr "%s bytes"
+
+#: ../../locales/../src/interface/updatewizard.cpp:902
+#, c-format
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
+
+#: ../../locales/../src/interface/FileZilla.cpp:711
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Please download FileZilla again. If this problem persists, please submit a "
+"bug report."
+msgstr ""
+"%s no s'ha puesto trobar. Sin iste component de FileZilla, SFTP no "
+"funcionará.\n"
+"\n"
+"Por favor descargue FileZilla de nuevas. Si iste problema persiste, por "
+"favor ninvie un informe d'a error."
+
+#: ../../locales/../src/interface/FileZilla.cpp:805
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Possible solutions:\n"
+"- Make sure %s is in a directory listed in your PATH environment variable.\n"
+"- Set the full path to %s in the FZ_FZSFTP environment variable."
+msgstr ""
+"%s no s'ha puesto trobar. Sin ixe component de FileZilla, SFTP no "
+"funcionará.\n"
+"\n"
+"Posibles solucions:\n"
+"- Asegure-se que %s siga en un directorio incluiu en a suya variable de "
+"entorno PATH.\n"
+"- Defina a rota completa a %s en a variable d'entorno FZ_FZSFTP."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
+#, c-format
+msgid "%s with %d bits"
+msgstr "%s con %d bits"
+
+#: resources.h:797
+#, no-c-format
+msgid "%u - Username"
+msgstr "%u - Nombre d'usuario"
+
+#: resources.h:801
+#, no-c-format
+msgid "%w - Proxy password"
+msgstr "%w - Clau d'o proxy"
+
+#: resources.h:572
+msgid "&About..."
+msgstr "&Arredol de..."
+
+#: resources.h:95 resources.h:394
+msgid "&Account:"
+msgstr "&Cuenta:"
+
+#: resources.h:110 resources.h:701 resources.h:765
+msgid "&Active"
+msgstr "&Activo"
+
+#: resources.h:563
+msgid "&Add bookmark..."
+msgstr "&Adhibir marcapachinas..."
+
+#: resources.h:576 resources.h:593
+msgid "&Add files to queue"
+msgstr "&Adhibir fichero a la coda"
+
+#: resources.h:809
+msgid "&Add keyfile..."
+msgstr "&Adhibir fichero de clau..."
+
+#: resources.h:651 resources.h:670
+msgid "&Add to queue"
+msgstr "&Adhibir a la coda"
+
+#: resources.h:104
+msgid "&Adjust server timezone offset:"
+msgstr "Achustar zona horaria d'o servidor:"
+
+#: resources.h:28
+msgid "&Always trust certificate in future sessions."
+msgstr "Confiar &siempre en o certificau en sesions venideras."
+
+#: resources.h:192
+msgid "&Always trust this host, add this key to the cache"
+msgstr "&Confiar siempre en iste puesto, adhibir a suya clau a la caché"
+
+#: resources.h:961
+msgid "&Always use default editor"
+msgstr "Us&ar siempre l'editor predeterminau"
+
+#: resources.h:437
+msgid "&Always use selection for unassociated files"
+msgstr "Us&ar siempre selección ta fichers no asociaus"
+
+#: resources.h:74
+msgid "&Always use this action"
+msgstr "Usar &siempre ista acción"
+
+#: resources.h:777
+msgid "&Ask your operating system for the external IP address"
+msgstr "&Preguntar a suya adreza IP externa a lo sistema operativo"
+
+#: resources.h:545 resources.h:681 resources.h:846
+msgid "&Auto"
+msgstr "&Automatico"
+
+#: resources.h:116
+msgid "&Autodetect"
+msgstr "Detectar &automaticament"
+
+#: resources.h:547 resources.h:683 resources.h:848
+msgid "&Binary"
+msgstr "&Binario"
+
+#: resources.h:921
+msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
+msgstr "Prefixos &binarios usando símbolos SI (p. eix. 1 KB = 1024 bytes)"
+
+#: resources.h:562
+msgid "&Bookmarks"
+msgstr "&Marcapachinas"
+
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
+msgid "&Browse..."
+msgstr "&Examinar..."
+
+#: resources.h:836
+#, no-c-format
+msgid "&Burst tolerance:"
+msgstr "Tolerancia a rafa&gas:"
+
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
+msgid "&Cancel"
+msgstr "&Cancelar"
+
+#: resources.h:245
+msgid "&Check for beta versions of FileZilla"
+msgstr "&Comprebar si bi ha versions beta de FileZilla"
+
+#: resources.h:522
+msgid "&Clear private data..."
+msgstr "&Limpiar información privada..."
+
+#: resources.h:622
+msgid "&Close FileZilla"
+msgstr "&Zarrar FileZilla"
+
+#: resources.h:691
+msgid "&Configure speed limits..."
+msgstr "&Configurar os limites de velocidat..."
+
+#: resources.h:550
+msgid "&Configure..."
+msgstr "&Configurar..."
+
+#: resources.h:122
+msgid "&Connect"
+msgstr "&Connectar"
+
+#: resources.h:510
+msgid "&Copy current connection to Site Manager..."
+msgstr "&Copiar connexión actual ta lo chestor de puestos..."
+
+#: resources.h:182 resources.h:631
+msgid "&Copy to clipboard"
+msgstr "&Copiar en o portafuellas"
+
+#: resources.h:636
+msgid "&Crash"
+msgstr "&Crebadura"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
+msgid "&Create directory"
+msgstr "&Creyar directorio"
+
+#: resources.h:686
+msgid "&Create new tab"
+msgstr "&Ubrir una nueva pestanya"
+
+#: ../../locales/../src/interface/menu_bar.cpp:72
+msgid "&Debug"
+msgstr "&Depuración"
+
+#: resources.h:992
+msgid "&Debug information in message log:"
+msgstr "&Información de depuración en o log de mensaches:"
+
+#: resources.h:954
+msgid "&Default editor:"
+msgstr "E&ditor predeterminau:"
+
+#: resources.h:543 resources.h:614
+msgid "&Default file exists action..."
+msgstr "&Acción predeterminada si lo fichero ya bi existe..."
+
+#: resources.h:759
+msgid "&Delay between failed login attempts:"
+msgstr "&Intervalo entre intentos de connexión fallius:"
+
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
+msgid "&Delete"
+msgstr "&Borrar"
+
+#: resources.h:467
+msgid "&Delete symlink"
+msgstr "&Borrar vinclo simbolico"
+
+#: resources.h:528
+msgid "&Directory comparison"
+msgstr "Comparanza de &directorios"
+
+#: resources.h:335
+msgid "&Discard local file then download and edit file anew"
+msgstr "&Descartar fichero local y alavez descargar y editar fichero nuevo"
+
+#: resources.h:556
+msgid "&Disconnect"
+msgstr "&Desconnectar"
+
+#: resources.h:623
+msgid "&Disconnect from server"
+msgstr "&Desconnectar d'o servidor"
+
+#: resources.h:897
+msgid "&Display momentary transfer speed instead of average speed"
+msgstr ""
+"&Amostrar velocidat de transferencia momentania en cuenta d'a velocidat meya"
+
+#: resources.h:919
+msgid "&Display size in bytes"
+msgstr "&Amostrar grandaria en bytes"
+
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "N&o remerar claus"
+
+#: ../../locales/../src/interface/conditionaldialog.cpp:25
+msgid "&Don't show this dialog again."
+msgstr "&No tornar a amostrar iste dialogo"
+
+#: resources.h:782
+msgid "&Don't use external IP address on local connections."
+msgstr "&No usar adreza IP externa en connexions locals."
+
+#: resources.h:941
+msgid "&Double-click action on files:"
+msgstr "Accions de &dople clic sobre fichero:"
+
+#: resources.h:591 resources.h:649
+msgid "&Download"
+msgstr "&Descargar"
+
+#: resources.h:453
+msgid "&Download to:"
+msgstr "&Descargar ta:"
+
+#: resources.h:684
+msgid "&Download..."
+msgstr "&Descargar..."
+
+#: resources.h:267 resources.h:858
+msgid "&Downloads:"
+msgstr "&Descargas:"
+
+#: resources.h:520 resources.h:582
+msgid "&Edit"
+msgstr "&Edición"
+
+#: resources.h:220
+msgid "&Edit filter rules..."
+msgstr "&Editar regles de filtro..."
+
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
+msgid "&Enable"
+msgstr "&Activar"
+
+#: resources.h:491 resources.h:831
+msgid "&Enable speed limits"
+msgstr "Activar limites de velocidat"
+
+#: resources.h:120
+msgid "&Encoding:"
+msgstr "&Codificación:"
+
+#: resources.h:91
+msgid "&Encryption:"
+msgstr "Zi&frau"
+
+#: resources.h:630
+msgid "&Enter custom command..."
+msgstr "M&eter comando personalizau..."
+
+#: resources.h:146
+msgid "&Execute"
+msgstr "&Executar"
+
+#: resources.h:302
+msgid "&Export Site Manager entries"
+msgstr "&Exportar dentradas d'o chestor de puestos"
+
+#: resources.h:515 resources.h:680
+msgid "&Export..."
+msgstr "&Exportar..."
+
+#: resources.h:787
+msgid "&Fall back to active mode"
+msgstr "&Revertir a modo activo"
+
+#: resources.h:507
+msgid "&File"
+msgstr "&Fichero"
+
+#: resources.h:661
+msgid "&File Attributes..."
+msgstr "&Atributos de fichero..."
+
+#: resources.h:609
+msgid "&File permissions..."
+msgstr "Premisos de &fichero..."
+
+#: resources.h:375
+msgid "&File:"
+msgstr "&Fichero:"
+
+#: resources.h:230
+msgid "&Filter conditions:"
+msgstr "Condicions de Filtros:"
+
+#: resources.h:209
+msgid "&Filter sets:"
+msgstr "Conchuntos de Filtros:"
+
+#: resources.h:224
+msgid "&Filters:"
+msgstr "&Filtros:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:30
+msgid "&Finish"
+msgstr "&Rematar"
+
+#: resources.h:327
+msgid "&Finish editing and delete local file"
+msgstr "&Rematar a edición y borrar o fichero local"
+
+#: resources.h:457
+msgid ""
+"&Flatten remote paths, download all contained files directly into target "
+"directory"
+msgstr ""
+"Simplificar as rotas remotas, descargar totz os fichers que contiengan "
+"dreitament a lo directorio destín"
+
+#: resources.h:468
+msgid "&Follow symlink, delete target directory contents"
+msgstr ""
+"&Siguir o vinclo simbolico y Borrar o conteniu d'o directorio de destín"
+
+#: resources.h:780
+msgid "&Get external IP address from the following URL:"
+msgstr "O&btener a IP externa a partir d'a siguient URL:"
+
+#: resources.h:570
+msgid "&Getting help..."
+msgstr "&Obtener aduya..."
+
+#: resources.h:407
+msgid "&Global bookmark"
+msgstr "Marcapachinas &global"
+
+#: resources.h:816
+msgid "&HTTP/1.1 using CONNECT method"
+msgstr "&HTTP/1.1 usando o metodo CONNECT"
+
+#: resources.h:566
+msgid "&Help"
+msgstr "Adu&ya"
+
+#: resources.h:532 resources.h:667
+msgid "&Hide identical files"
+msgstr "&Ocultar fichers identicos"
+
+#: resources.h:616
+msgid "&Highest"
+msgstr "A mas &alta"
+
+#: resources.h:775
+msgid "&Highest available port:"
+msgstr "Puerto mas &alto disponible:"
+
+#: resources.h:88 resources.h:388 resources.h:739
+msgid "&Host:"
+msgstr "&Servidor:"
+
+#: resources.h:920
+msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
+msgstr "Prefixos binarios &IEC (p. eix. 1 KiB = 1024 bytes)"
+
+#: resources.h:908
+msgid "&ISO 8601 (example: 2007-09-15)"
+msgstr "&ISO 8601 (eixemplo: 2007-09-15)"
+
+#: resources.h:516
+msgid "&Import..."
+msgstr "&Importar..."
+
+#: resources.h:963
+msgid "&Inherit system's filetype associations"
+msgstr "Usar asociacions de t&ipos de fichero d'o sistema"
+
+#: resources.h:456
+msgid "&Keep remote path structure relative to search root"
+msgstr "&Mantener estructura d'a rota remota relativa a radiz d'a busca"
+
+#: resources.h:881
+msgid "&Layout of file and directory panes:"
+msgstr "Distribución d'os pane&ls de fichers y directorios:"
+
+#: resources.h:772
+msgid "&Limit local ports used by FileZilla"
+msgstr "&Limitar puertos locals usaus por FileZilla"
+
+#: resources.h:112
+msgid "&Limit number of simultaneous connections"
+msgstr "&Limitar o numero de connexions simultanias"
+
+#: resources.h:538
+msgid "&Local directory tree"
+msgstr "Arbol de directorio &local"
+
+#: resources.h:412 resources.h:418
+msgid "&Local directory:"
+msgstr "Directorio &local:"
+
+#: resources.h:982
+msgid "&Log to file"
+msgstr "Alzar rechistro en &fichero"
+
+#: resources.h:92
+msgid "&Logon Type:"
+msgstr "&Modo d'acceso:"
+
+#: resources.h:391
+msgid "&Logontype:"
+msgstr "&Modo d'acceso:"
+
+#: resources.h:619
+msgid "&Low"
+msgstr "&Baixa"
+
+#: resources.h:564
+msgid "&Manage bookmarks..."
+msgstr "&Chestionar marcapachinas..."
+
+#: resources.h:552
+msgid "&Manual transfer..."
+msgstr "Transferencia &manual..."
+
+#: resources.h:113
+msgid "&Maximum number of connections:"
+msgstr "Numero &maximo de connexions"
+
+#: resources.h:757
+msgid "&Maximum number of retries:"
+msgstr "Numero &maximo de reintentos:"
+
+#: resources.h:537
+msgid "&Message log"
+msgstr "&Rechistro de mensaches"
+
+#: resources.h:894
+msgid "&Minimize to tray"
+msgstr "&Minimizar ta la barra de quefers"
+
+#: resources.h:410
+msgid "&Name:"
+msgstr "&Nombre:"
+
+#: resources.h:521
+msgid "&Network configuration wizard..."
+msgstr "&Asistent de configuración de ret..."
+
+#: resources.h:225
+msgid "&New"
+msgstr "&Nuevo"
+
+#: resources.h:81
+msgid "&New Site"
+msgstr "&Nuevo puesto"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1058
+msgid "&New version available!"
+msgstr "Bi ha una nueva versión disponible!"
+
+#: ../../locales/../src/interface/updatewizard.cpp:28
+msgid "&Next >"
+msgstr "&Siguient >"
+
+#: resources.h:329
+msgid "&No"
+msgstr "&No"
+
+#: resources.h:790 resources.h:815
+msgid "&None"
+msgstr "&Dengún"
+
+#: resources.h:618
+msgid "&Normal"
+msgstr "&Normal"
+
+#: resources.h:155
+msgid "&Numeric value:"
+msgstr "Valura &numerica:"
+
+#: resources.h:123 resources.h:136 resources.h:428
+msgid "&OK"
+msgstr "&Acceptar"
+
+#: resources.h:793
+msgid "&OPEN"
+msgstr "&Ubrir"
+
+#: resources.h:580 resources.h:672
+msgid "&Open"
+msgstr "&Ubrir"
+
+#: resources.h:67
+msgid "&Overwrite"
+msgstr "S&obreescribir"
+
+#: resources.h:111
+msgid "&Passive"
+msgstr "&Pasivo"
+
+#: resources.h:134
+msgid "&Password:"
+msgstr "&Clau"
+
+#: resources.h:626
+msgid "&Play sound"
+msgstr "Re&producir son"
+
+#: resources.h:89 resources.h:389 resources.h:743
+msgid "&Port:"
+msgstr "&Puerto"
+
+#: resources.h:887
+msgid "&Position of the message log:"
+msgstr "&Posición d'o rechistro de mensaches:"
+
+#: resources.h:548
+msgid "&Preserve timestamps of transferred files"
+msgstr "&Preservar información horaria d'os fichers transferius"
+
+#: resources.h:311
+msgid "&Queue"
+msgstr "&Coda"
+
+#: resources.h:745
+msgid "&Quickconnect"
+msgstr "&Connexión rapida"
+
+#: resources.h:536
+msgid "&Quickconnect bar"
+msgstr "Barra de &connexión rapida"
+
+#: resources.h:144
+msgid "&Read"
+msgstr "&Leyer"
+
+#: resources.h:555
+msgid "&Reconnect"
+msgstr "&Reconnectar"
+
+#: resources.h:526 resources.h:689
+msgid "&Refresh"
+msgstr "&Refrescar"
+
+#: resources.h:135
+msgid "&Remember password for this session"
+msgstr "&Remerar a clau ta ista sesión"
+
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Remerar as claus"
+
+#: resources.h:414 resources.h:420
+msgid "&Remote directory:"
+msgstr "Di&rectorio remoto"
+
+#: resources.h:378
+msgid "&Remote path:"
+msgstr "&Rota remota:"
+
+#: resources.h:852
+msgid "&Remove"
+msgstr "&Borrar"
+
+#: resources.h:810
+msgid "&Remove key"
+msgstr "Bo&rrar clau"
+
+#: resources.h:613
+msgid "&Remove selected"
+msgstr "Bo&rrar o seleccionau"
+
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
+msgid "&Rename"
+msgstr "&Renombrar"
+
+#: resources.h:211
+msgid "&Rename..."
+msgstr "&Renombrar..."
+
+#: resources.h:334
+msgid "&Reopen local file"
+msgstr "&Tornar a ubrir fichero local"
+
+#: resources.h:843
+msgid "&Replace invalid characters with:"
+msgstr "&Substituir os caracters no validos por:"
+
+#: resources.h:571
+msgid "&Report a bug..."
+msgstr "Info&rmar d'una error..."
+
+#: resources.h:641
+msgid "&Reset and requeue all"
+msgstr "&Reiniciar y tornar a meter tot en a coda"
+
+#: resources.h:738
+msgid "&Restart Wizard"
+msgstr "&Reenchegar l'Asistent"
+
+#: resources.h:71
+msgid "&Resume"
+msgstr "&Reprener"
+
+#: resources.h:624
+msgid "&Run command..."
+msgstr "Executa&r comando..."
+
+#: resources.h:752
+msgid "&Run configuration wizard now..."
+msgstr "&Executar agora l'asistent de configuración..."
+
+#: resources.h:977
+msgid "&Run update check now..."
+msgstr "&Executar agora a comprebación d'actualizacions..."
+
+#: resources.h:792
+msgid "&SITE"
+msgstr "&Puesto"
+
+#: resources.h:817
+msgid "&SOCKS 5"
+msgstr "&SOCKS 5"
+
+#: resources.h:210
+msgid "&Save as..."
+msgstr "Alzar como..."
+
+#: resources.h:442
+msgid "&Search"
+msgstr "&Mirar"
+
+#: resources.h:557
+msgid "&Search remote files..."
+msgstr "&Mirar fichers remotos..."
+
+#: resources.h:80
+msgid "&Select Entry:"
+msgstr "&Seleccionar dentrada"
+
+#: resources.h:952
+msgid "&Select language:"
+msgstr "&Seleccione l'idioma"
+
+#: resources.h:366
+msgid "&Select the columns that should be displayed:"
+msgstr "&Seleccione as columnas que s'habrían d'amostrar:"
+
+#: resources.h:380 resources.h:553
+msgid "&Server"
+msgstr "&Servidor"
+
+#: resources.h:310
+msgid "&Settings"
+msgstr "&Opcions"
+
+#: resources.h:523
+msgid "&Settings..."
+msgstr "&Opcions..."
+
+#: resources.h:991
+msgid "&Show debug menu"
+msgstr "&Amostrar menú de depuración"
+
+#: resources.h:625
+msgid "&Show message"
+msgstr "Amo&strar mensache"
+
+#: resources.h:981
+msgid "&Show timestamps in message log"
+msgstr "Amo&strar calendata y hora en o rechistro de mensaches"
+
+#: resources.h:508
+msgid "&Site Manager..."
+msgstr "&Chestor de puestos..."
+
+#: resources.h:408
+msgid "&Site-specific bookmark"
+msgstr "Marcapachinas especifico de &puesto"
+
+#: resources.h:73
+msgid "&Skip"
+msgstr "&Blincar"
+
+#: resources.h:551
+msgid "&Speed limits"
+msgstr "Limites de &velocidat"
+
+#: resources.h:459
+msgid "&Start transfer immediately"
+msgstr "Prencipiar tran&sferencia immediatament"
+
+#: resources.h:886
+msgid "&Swap local and remote panes"
+msgstr "&Intercambiar panels local y remoto"
+
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Zifraus TLS"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:228
+msgid "&Test"
+msgstr "&Prebar"
+
+#: resources.h:900
+msgid "&Theme:"
+msgstr "&Tema:"
+
+#: resources.h:541
+msgid "&Transfer"
+msgstr "&Transferencia"
+
+#: resources.h:108
+msgid "&Transfer mode:"
+msgstr "Modo de &transferencia:"
+
+#: resources.h:540
+msgid "&Transfer queue"
+msgstr "Coda de &transferencia"
+
+#: resources.h:855
+msgid "&Treat dotfiles as ASCII files"
+msgstr "&Tractar os fichers punto como ASCII"
+
+#: resources.h:340
+msgid "&Unedit"
+msgstr "&Desfer edición"
+
+#: resources.h:205
+msgid "&Update cached key for this host"
+msgstr "&Esviellar en caché la clau d'iste servidor"
+
+#: resources.h:574 resources.h:668
+msgid "&Upload"
+msgstr "P&uyar"
+
+#: resources.h:277 resources.h:867
+msgid "&Uploads:"
+msgstr "P&uyadas:"
+
+#: resources.h:435
+msgid "&Use custom program"
+msgstr "&Usar programa personalizau"
+
+#: resources.h:103
+msgid "&Use synchronized browsing"
+msgstr "&Usar navegación sincronizada"
+
+#: resources.h:956
+msgid "&Use system's default editor for text files"
+msgstr "&Usar editor predeterminau d'o sistema ta fichers de texto"
+
+#: resources.h:778
+msgid "&Use the following IP address:"
+msgstr "&Usar a siguient adreza IP:"
+
+#: resources.h:786
+msgid "&Use the server's external IP address instead"
+msgstr "Emplegar l'adreza IP externa d'o servidor en c&uenta"
+
+#: resources.h:923
+msgid "&Use thousands separator"
+msgstr "&Usar separador de milars"
+
+#: resources.h:93 resources.h:133 resources.h:392
+msgid "&User:"
+msgstr "&Usuario:"
+
+#: resources.h:741
+msgid "&Username:"
+msgstr "Nombre d'&usuario:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1054
+#, c-format
+msgid "&Version %s"
+msgstr "&Versión %s"
+
+#: resources.h:525
+msgid "&View"
+msgstr "&Veyer"
+
+#: resources.h:597
+msgid "&View/Edit"
+msgstr "&Veyer/Editar"
+
+#: resources.h:962
+msgid "&Watch locally edited files and prompt to upload modifications"
+msgstr ""
+"&Monitorizar os fichers editaus localment y preguntar si se puyan as "
+"modificacions"
+
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Quan se miren actualizacions, mirar:"
+
+#: resources.h:145
+msgid "&Write"
+msgstr "&Escribir"
+
+#: resources.h:328
+msgid "&Yes"
+msgstr "&Sí"
+
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
+#, c-format
+msgid "'%s' does not exist or cannot be accessed."
+msgstr "'%s' no existe u no ye accesible."
+
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
+msgid "'%s' is not a directory."
+msgstr "'%s' no ye un directorio."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+msgid "'Account' logontype not supported by selected protocol"
+msgstr "L'acceso con cuenta no ye suportau por o protocolo seleccionau"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Os inicios de sesión 'Normal' y 'Cuenta' no son disponibles, emplega en "
+"cuenta 'preguntar por a clau'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Os inicios de sesión 'Normal' y 'Cuenta' no son disponibles, Tu dentrada ha "
+"estau cambiada ta 'preguntar por a clau'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
+msgid ""
+"'quote' is usually a local command used by commandline clients to send the "
+"arguments following 'quote' to the server. You might want to enter the raw "
+"command without the leading 'quote'."
+msgstr ""
+"'quote' ye normalment un comando local usau por clients de linia de comando "
+"ta ninviar arguments seguius de 'quote' a lo servidor. Por un regular "
+"preferirá escribir o comando dreitament sin 'quote'."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:96
+#: ../../locales/../src/interface/filelist_statusbar.cpp:105
+#, c-format
+msgid "(%d object filtered)"
+msgid_plural "(%d objects filtered)"
+msgstr[0] "(%d obchecto filtrau)"
+msgstr[1] "(%d obchectos filtraus)"
+
+#: resources.h:827 resources.h:829
+msgid "(0 for no limit)"
+msgstr "(0 ta no limitar)"
+
+#: resources.h:758
+msgid "(0-99)"
+msgstr "(0-99)"
+
+#: resources.h:760
+msgid "(0-999 seconds)"
+msgstr "(0-999 segundos)"
+
+#: resources.h:825
+msgid "(1-10)"
+msgstr "(1-10)"
+
+#: resources.h:754
+msgid "(5-9999, 0 to disable)"
+msgstr "(5-9999, 0 ta desactivar)"
+
+#: resources.h:916
+msgid "(example: %H:%M)"
+msgstr "(eixemplo: %H:%M)"
+
+#: resources.h:910
+msgid "(example: %Y-%m-%d)"
+msgstr "(eixemplo: %Y-%m-%d)"
+
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
+#, c-format
+msgid "(in %s/s)"
+msgstr "(en %s/s)"
+
+#: ../../locales/../src/interface/updatewizard.cpp:910
+msgid ", %H:%M:%S left"
+msgstr ", en queda %H:%M:%S"
+
+#: ../../locales/../src/interface/updatewizard.cpp:914
+msgid ", --:--:-- left"
+msgstr ", en queda --:--:--"
+
+#: resources.h:726
+msgid "-"
+msgstr "-"
+
+#: resources.h:258
+msgid "- Broken router and/or firewall"
+msgstr "- L'enrotador y/u tallafuegos no funciona"
+
+#: resources.h:259
+msgid "- File corrupted on mirror"
+msgstr "- O fichero ye corrupto en o servidor espiello"
+
+#: resources.h:257
+msgid "- Malware on your system"
+msgstr "- Bi ha software malicioso en o tuyo sistema"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
+msgid "--:--:-- left"
+msgstr "En queda --:--:--"
+
+#: ../../locales/../src/interface/cmdline.cpp:88
+msgid "-c cannot be used together with an FTP URL."
+msgstr "-c no puet estar usau de conchunta con una URL de FTP."
+
+#: ../../locales/../src/interface/cmdline.cpp:97
+msgid "-l can only be used together with an FTP URL."
+msgstr "-l Solament se puet usar con una URL de FTP."
+
+#: ../../locales/../src/interface/cmdline.cpp:76
+msgid "-s and -c cannot be present at the same time."
+msgstr "-s y -c no pueden estar presents a lo mesmo tiempo."
+
+#: ../../locales/../src/interface/cmdline.cpp:82
+msgid "-s cannot be used together with an FTP URL."
+msgstr "-s no puet estar usau de conchunta con una URL de FTP."
+
+#: resources.h:993
+msgid "0 - None"
+msgstr "0 - Denguna"
+
+#: resources.h:994
+msgid "1 - Warning"
+msgstr "1 - Alvertencia"
+
+#: resources.h:995
+msgid "2 - Info"
+msgstr "2 - Informativa"
+
+#: resources.h:996
+msgid "3 - Verbose"
+msgstr "3 - Detallada"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:152
+msgid "32 bit system"
+msgstr "Sistema de 32 bits"
+
+#: resources.h:997
+msgid "4 - Debug"
+msgstr "4 - Depuración"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:150
+msgid "64 bit system"
+msgstr "Sistema de 64 bits"
+
+#: ../../locales/../src/interface/updatewizard.cpp:29
+msgid "< &Back"
+msgstr "< Enta &zaga"
+
+#: resources.h:565
+msgid "?"
+msgstr "?"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+msgid ""
+"A bookmark with the entered name already exists. Please enter an unused name."
+msgstr ""
+"Ya existe un marcapachinas con o nombre metiu. Por favor mete un nombre que "
+"no siga usau."
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
+msgid "A default editor needs to be set."
+msgstr "Cal fixar un editor predeterminau."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
+msgid "A directory cannot be dragged into one of its subdirectories."
+msgstr ""
+"No se puet arrocegar un directorio dentro d'un d'os suyos subdirectorios."
+
+#: resources.h:698
+msgid ""
+"A few servers don't allow passive mode or are misconfigured. In such cases "
+"you would have to use active mode. In active mode, FileZilla opens a port "
+"and asks the server to connect to it."
+msgstr ""
+"Qualques servidors no permiten o modo pasivo u son mal configuraus. En tals "
+"casos, s'habría d'usar o modo activo. En modo activo, FileZilla ubre un "
+"puerto y pide a lo servidor que se connecte por iste."
+
+#: resources.h:316
+msgid "A file previously opened has been changed."
+msgstr "Ha estau cambiau un fichero ubierto previament."
+
+#: ../../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 ""
+"Un fichero con ixe nombre ya ye estando editau. Deseya tornar a ubrir '%s'?"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
+msgid "A file with that name is already being transferred."
+msgstr "Ya se ye transferindo un fichero con ixe nombre."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
+msgid ""
+"A file with that name is still being edited. Please close it and try again."
+msgstr ""
+"Un fichero con ixe nombre ya ye estando editau. Por favor zarra-lo y intenta-"
+"lo de nuevas."
+
+#: ../../locales/../src/interface/FileZilla.cpp:690
+msgid ""
+"A local filename could not be decoded.\n"
+"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
+"correctly.\n"
+"Unless you fix this problem, files might be missing in the file listings.\n"
+"No further warning will be displayed this session."
+msgstr ""
+"No s'ha puesto descodificar un fichero local.\n"
+"Comprebe que la variable d'entorno LC_TYPE (u LC_ALL) tien a valor "
+"correcta.\n"
+"Si no corriche iste problema, podrían faltar fichers en os listaus.\n"
+"No s'amostrarán mas avisos entre ista sesión."
+
+#: resources.h:247
+msgid "A newer version of FileZilla is available:"
+msgstr "Bi ha disponible una versión nueva de FileZilla:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:679
+msgid ""
+"A proper server always shows all files, but some broken servers hide files "
+"from the user. Use this option to force the server to show all files."
+msgstr ""
+"Un servidor adequau siempre amuestra totz os fichers, pero qualques "
+"servidors con problemas ocultan fichers a l'usuario. Use ista opción ta "
+"forzar a lo servidor ta amostrar totz os fichers."
+
+#: resources.h:770
+msgid ""
+"A proper server does not require this. Contact the server administrator if "
+"you need this."
+msgstr ""
+"Un servidor adequau no ameneste isto. Contacte con l'administrador d'o "
+"servidor si vusté l'ameneste."
+
+#: ../../locales/../src/interface/state.cpp:284
+msgid ""
+"A remote operation is in progress and synchronized browsing is enabled.\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+"Una operación remota ye en curso y a navegación sincronizada ye activada.\n"
+"Quiers desactivar a navegación sincronizada y continar cambiando lo "
+"directorio local?"
+
+#: resources.h:546 resources.h:682 resources.h:847
+msgid "A&SCII"
+msgstr "A&SCII"
+
+#: resources.h:851
+msgid "A&dd"
+msgstr "A&dhibir"
+
+#: resources.h:878
+msgid "A&llow resume of ASCII files"
+msgstr "Premitir &o reprener fichers ASCII"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
+msgid "A&pply only to downloads"
+msgstr "A&plicar nomás a las descargas"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
+msgid "A&pply only to uploads"
+msgstr "A&plicar nomás que a las puyadas"
+
+#: resources.h:158
+msgid "A&pply to all files and directories"
+msgstr "A&plicar a totz os fichers y directorios"
+
+#: resources.h:648
+msgid "A&utomatically remove successful transfers"
+msgstr "Borrar a&utomaticament transferencias satisfactorias"
+
+#: resources.h:399
+msgid "ASCII"
+msgstr "ASCII"
+
+#: resources.h:489
+msgid "Abort previous connection and connect in current tab"
+msgstr "Abortar a connexión anterior y connectar en a pestanya actual"
+
+#: resources.h:163
+msgid "About FileZilla"
+msgstr "Arredol de FileZilla"
+
+#: resources.h:888
+msgid "Above the file lists"
+msgstr "Dencima d'a lista de fichers"
+
+#: ../../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:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
+msgid "Account"
+msgstr "Cuenta"
+
+#: resources.h:621
+msgid "Action after queue &completion"
+msgstr "Acción dimpués de &completar a coda de fichers"
+
+#: resources.h:339
+msgid "Action on selected file:"
+msgstr "Acción sobre fichero seleccionau:"
+
+#: resources.h:333
+msgid "Action to perform:"
+msgstr "Acción a realizar:"
+
+#: resources.h:66
+msgid "Action:"
+msgstr "Acción:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:118
+msgid "Active mode"
+msgstr "Modo activo"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:605
+msgid ""
+"Active mode FTP test failed. FileZilla does not know the correct external IP "
+"address."
+msgstr ""
+"A comprebación d'o modo activo ha fallau. FileZilla no puet determinar a "
+"adreza IP externa correcta."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:592
+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 ""
+"A comprebación d'o modo activo ha fallau. FileZilla no puet determinar a "
+"adreza IP externa correcta. Amás, l'enrotador ha modificau la adreza IP "
+"ninviada."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:580
+msgid ""
+"Active mode FTP test failed. FileZilla knows the correct external IP "
+"address, but your router or firewall has misleadingly modified the sent "
+"address."
+msgstr ""
+"A comprebación d'o modo FTP activo ha fallau. FileZilla conoixe la adreza IP "
+"externa correcta, pero lo suyo enrotador u o tallafuegos ha modificau "
+"erroniament l'adreza IP ninviada."
+
+#: resources.h:783
+msgid "Active mode IP"
+msgstr "IP ta modo activo"
+
+#: resources.h:460
+msgid "Add files to &queue only"
+msgstr "&Adhibir fichero nomás que ta la coda"
+
+#: resources.h:652 resources.h:671
+msgid "Add selected directory to the transfer queue"
+msgstr "Adhibir carpeta seleccionada ta la coda de transferencia"
+
+#: resources.h:577 resources.h:594
+msgid "Add selected files and folders to the transfer queue"
+msgstr "Adhibir fichers y directorios seleccionaus ta la coda de transferencia"
+
+#: resources.h:943 resources.h:949
+msgid "Add to queue"
+msgstr "Adhibir ta la coda"
+
+#: ../../locales/../src/engine/proxy.cpp:451
+msgid "Address type not supported"
+msgstr "O tipo d'adreza no ye suportau"
+
+#: resources.h:97
+msgid "Advanced"
+msgstr "Abanzau"
+
+#: resources.h:244
+msgid "Advanced options:"
+msgstr "Opcions abanzadas:"
+
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Alvertencia: De no estar que quieras prebar nuevas caracteristicas, por "
+"favor, contina emplegando nomás a versión estable. As versions Beta y as "
+"versions compiladas son versions de desembolique ta fins de preba. As "
+"versions compiladas de FileZilla pueden no funcionar como s'aspera y mesmo "
+"podrían danyar o tuyo sistema. Emplegar as versions beta y compiladas ye "
+"baixo lo tuyo risgo."
+
+#: resources.h:348
+msgid "Algorithm:"
+msgstr "Algorismo:"
+
+#: ../../locales/../src/interface/QueueView.cpp:3123
+msgid "All files have been successfully transferred"
+msgstr "Totz os fichers s'han transferiu con exito"
+
+#: resources.h:727
+msgid "All ports in the given range have to be between 1024 and 65535."
+msgstr "Totz os puertos de l'intervalo dau han d'estar entre o 1024 y o 65535."
+
+#: ../../locales/../src/interface/QueueView.cpp:3119
+#, c-format
+msgid "All transfers have finished. %d file could not be transferred."
+msgid_plural "All transfers have finished. %d files could not be transferred."
+msgstr[0] ""
+"Totz os fichers s'han transferiu con exito, fueras de %d fichero que no ha "
+"puesto transferir-se."
+msgstr[1] ""
+"Totz os fichers s'han transferiu con exito, fueras de %d fichers que no han "
+"puesto transferir-se."
+
+#: resources.h:766
+msgid "Allow &fall back to other transfer mode on failure"
+msgstr "Premitir tornar ta unatro modo de trans&ferencia si falla"
+
+#: resources.h:702
+msgid "Allow fallback to other transfer mode on failure"
+msgstr "Premitir tornar ta unatro modo de transferencia si falla"
+
+#: resources.h:486
+msgid "Already connected"
+msgstr "Ya ye connectau"
+
+#: resources.h:811
+msgid ""
+"Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
+"FileZilla does recognize Pageant."
+msgstr ""
+"Alternativament puet usar a ferramienta Pageant de PuTTy ta chestionar as "
+"suyas claus, FileZilla reconoixe Pageant."
+
+#: resources.h:812
+msgid ""
+"Alternatively you can use your system's SSH agent. To do so, make sure the "
+"SSH_AUTH_SOCK environment variable is set."
+msgstr ""
+"Alternativament puede usar o suyo client de SSH d'o sistema. Ta fer-lo, "
+"asegurar que a variable d'entorno SSH_AUTH_SOCK ye definida."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1118
+msgid ""
+"Alternatively, visit http://filezilla-project.org to download the most "
+"recent version."
+msgstr ""
+"Alternativament, visite http://filezilla-project.org ta descargar a versión "
+"mas recient."
+
+#: ../../locales/../src/interface/QueueView.cpp:2042
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+"S'ha produciu una error en cargar a coda de transferencia dende \"%s\".\n"
+"Qualques obchectos d'a coda podrían no haber-se restaurau."
+
+#: ../../locales/../src/interface/QueueView.cpp:1941
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"S'ha produciu una error en alzar a coda de transferencia en \"%s\".\n"
+"Qualques obchectos d'a coda podrían no haber-se alzau."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
+msgid ""
+"An item with the same name as the dragged item already exists at the target "
+"location."
+msgstr ""
+"Ya existe un elemento con o mesmo nombre que o que s'ha arrocegau en a "
+"localización indicada."
+
+#: ../../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:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
+msgid "Anonymous"
+msgstr "Anonimo"
+
+#: ../../locales/../src/interface/state.cpp:1095
+msgid ""
+"Another remote operation is already in progress, cannot change directory now."
+msgstr ""
+"Unatra operación remota ye ya en execución, agora no se puet cambiar o "
+"directorio."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
+msgid "Any changes made in the Site Manager could not be saved."
+msgstr "No s'ha puesto alzar dengún cambeo realizau en o chestor de puestos."
+
+#: ../../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 ""
+"No s'alzará dengún cambeo realizau en o chestor de puestos de no estar que "
+"repare o fichero."
+
+#: ../../locales/../src/interface/filter.cpp:209
+msgid "Any changes made to the filters could not be saved."
+msgstr "No s'ha puesto alzar dengún cambeo realizau en os filtros."
+
+#: ../../locales/../src/interface/filter.cpp:1033
+msgid "Any changes made to the filters will not be saved."
+msgstr "No s'alzará dengún cambeo realizau en os filtros."
+
+#: resources.h:160
+msgid "App&ly to directories only"
+msgstr "Ap&licar nomás que a directorios"
+
+#: resources.h:223
+msgid "Apply"
+msgstr "Aplicar"
+
+#: resources.h:75
+msgid "Apply to &current queue only"
+msgstr "Aplicar nomás que a la &coda actual"
+
+#: resources.h:159
+msgid "Apply to &files only"
+msgstr "Aplicar nomás que a &fichers"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
+msgid "Archive"
+msgstr "Fichero"
+
+#: resources.h:890
+msgid "As tab in the transfer queue pane"
+msgstr "Como pestanya en o panel de coda de transferencia"
+
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
+msgid "Ask for action"
+msgstr "Preguntar acción"
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:188
+msgid "Ask for password"
+msgstr "Preguntar clau"
+
+#: resources.h:723
+msgid "Ask operating system for a port."
+msgstr "Pedir un puerto a lo sistema operativo."
+
+#: resources.h:713
+msgid "Ask your operating system for the external IP address"
+msgstr "Pregunta l'adreza IP externa a o sistema operativo."
+
+#: resources.h:481
+msgid "Asking questions in the FileZilla forums"
+msgstr "Fer preguntas en o foro de FileZilla"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
+msgid "Associated program not found:"
+msgstr "No s'ha trobau o programa asociau:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
+msgid "At least one filter condition is incomplete"
+msgstr "A lo menos una condición de filtro ye incompleta"
+
+#: resources.h:732
+msgid "At this point, all required information has been gathered."
+msgstr ""
+"Plegaus a iste punto, toda la información obligatoria ha estau replegada."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
+msgid "Attribute"
+msgstr "Atributo"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
+msgid "Authentication failed."
+msgstr "L'autenticación ha fallau."
+
+#: resources.h:901
+msgid "Author:"
+msgstr "Autor:"
+
+#: resources.h:396
+msgid "Auto"
+msgstr "Automatico"
+
+#: resources.h:849
+msgid "Automatic file type classification"
+msgstr "Clasificación automatica de tipos de fichero"
+
+#: resources.h:905
+msgid "Available sizes"
+msgstr "Midas disponibles"
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
+msgid "B <Unit symbol for bytes. Only translate first letter>"
+msgstr "B"
+
+#: resources.h:99
+msgid "B&ypass proxy"
+msgstr "Privar prox&y"
+
+#: resources.h:477
+msgid "Basic usage instructions"
+msgstr "Instruccions basicas d'emplego"
+
+#: resources.h:892
+msgid "Behaviour"
+msgstr "Comportamiento"
+
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
+msgid "Being edited"
+msgstr "Estando editau"
+
+#: resources.h:635
+msgid "Benchmark string coalescer"
+msgstr "Marcar unión de cadenas"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1094
+msgid "Beware! Certificate has been revoked"
+msgstr "Para cuenta! O certificau ha estau refusau"
+
+#: resources.h:400
+msgid "Binary"
+msgstr "Binario"
+
+#: resources.h:885
+msgid "Blackboard"
+msgstr "Pizarra"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
+msgid "Bookmark"
+msgstr "Marcapachinas"
+
+#: resources.h:423
+msgid "Bookmark:"
+msgstr "Marcapachinas:"
+
+#: resources.h:422
+msgid "Bookmarks"
+msgstr "Marcapachinas"
+
+#: resources.h:171
+msgid "Build date:"
+msgstr "Calendata de creyación:"
+
+#: resources.h:168
+msgid "Build information"
+msgstr "Información de creyación"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
+msgid "Business category:"
+msgstr "Categoría de negocio:"
+
+#: resources.h:773
+msgid ""
+"By default uses any available local port to establish transfers in active "
+"mode. If you want to limit FileZilla to use only a small range of ports, "
+"please enter the port range below."
+msgstr ""
+"Por defecto s'usa qualsiquier puerto local disponible ta establir "
+"transferencias en modo activo. Si quiere limitar a FileZilla ta que use "
+"solament un chicot intervalo de puertos, por favor introduzca l'intervalo a "
+"continación."
+
+#: resources.h:554
+msgid "C&ancel current operation"
+msgstr "C&ancelar a operación actual"
+
+#: resources.h:246
+msgid "C&heck for nightly builds of FileZilla"
+msgstr "Comprebar zagueras versions de desembolique de FileZilla"
+
+#: resources.h:632
+msgid "C&lear all"
+msgstr "&Limpiar-lo tot"
+
+#: resources.h:607 resources.h:659
+msgid "C&opy URL(s) to clipboard"
+msgstr "C&opiar URL(s) en o portafuellas"
+
+#: resources.h:909
+msgid "C&ustom"
+msgstr "Personali&zau"
+
+#: resources.h:964
+msgid "C&ustom filetype associations:"
+msgstr "Aso&ciacions de tipo de fichero personalizadas:"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
+msgid "Calculating timezone offset of server..."
+msgstr "Calculando compensación d'a zona horaria d'o servidor..."
+
+#: ../../locales/../src/engine/transfersocket.cpp:743
+msgid "Can't read from file"
+msgstr "No s'ha puesto leyer dende o fichero"
+
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
+msgid "Can't write data to file."
+msgstr "No s'ha puesto escribir os datos en o fichero."
+
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
+#, c-format
+msgid "Can't write data to file: %s"
+msgstr "No s'han puesto escribir datos en o fichero: %s"
+
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
+msgid "Cancel"
+msgstr "Cancelar"
+
+#: resources.h:1016
+msgid "Cancel current operation"
+msgstr "Cancelar a operación en curso"
+
+#: resources.h:1017
+msgid "Cancels the current operation"
+msgstr "Cancela a operación en curso"
+
+#: ../../locales/../src/engine/local_path.cpp:471
+#, c-format
+msgid "Cannot access '%s', no media inserted or drive not ready."
+msgstr ""
+"No se puet acceder ta '%s', no bi ha disco ficau u lo dispositivo no ye "
+"listo."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:566
+msgid "Cannot add server to Site Manager"
+msgstr "No se puet adhibir o servidor a lo chestor de puestos"
+
+#: ../../locales/../src/interface/context_control.cpp:348
+msgid ""
+"Cannot close tab while busy.\n"
+"Cancel current operation and close tab?"
+msgstr ""
+"No se puet zarrar a pestanya mientras tienga actividat.\n"
+"Cancelar a operación actual y zarrar a pestanya?"
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+msgid ""
+"Cannot compare directories, different filters for local and remote "
+"directories are enabled"
+msgstr ""
+"No se puet comparar directorios, bi ha distintos filtros activos t'os "
+"directorios locals y remotos."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
+msgid "Cannot compare directories, not connected to a server."
+msgstr "No se puet comparar directorios, no yes connectau a un servidor."
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "Cannot create new filter"
+msgstr "No s'ha puesto creyar un filtro nuevo"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
+msgid "Cannot edit file"
+msgstr "No se puet editar o fichero"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+msgid "Cannot edit file, not connected to any server."
+msgstr "No se puet editar o fichero, no yes connectau a dengún servidor."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1971
+msgid "Cannot edit file, remote path unknown."
+msgstr "No se puet editar o fichero, rota remota desconoixida."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
+msgid ""
+"Cannot establish FTP connection to an SFTP server. Please select proper "
+"protocol."
+msgstr ""
+"No se puet establir una connexión FTP a un servidor SFTP. Por favor "
+"seleccione o protocolo apropiau."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
+msgid "Cannot load Quickconnect bar from resource file"
+msgstr ""
+"No s'ha puesto cargar a barra de connexión rapida dende o fichero de recursos"
+
+#: ../../locales/../src/interface/import.cpp:38
+msgid "Cannot load file, not a valid XML file."
+msgstr "No se puet cargar o fichero, no ye un fichero XML valido."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Cannot load keyfile"
+msgstr "No se puet cargar o fichero clau"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
+msgid "Cannot load toolbar from resource file"
+msgstr ""
+"No s'ha puesto cargar a barra de ferramientas dende o fichero de recursos"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "No se pueden remerar claus"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
+msgid "Cannot rename entry"
+msgstr "No se puet renombrar a dentrada"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
+msgid "Cannot rename file"
+msgstr "No s'ha puesto renombrar o fichero"
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "Cannot save filterset"
+msgstr "No s'ha puesto alzar o conchunto de filtros"
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Cannot select filter"
+msgstr "No s'ha puesto seleccionar filtro"
+
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
+msgid "Cannot set file association"
+msgstr "No se puet establir l'asociación de fichero"
+
+#: ../../locales/../src/interface/edithandler.cpp:1227
+msgid "Cannot show dialog"
+msgstr "No se puet amostrar o dialogo"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
+msgid "Cannot view/edit selected file"
+msgstr "No se puet veyer/editar o fichero seleccionau"
+
+#: resources.h:293
+msgid "Categories"
+msgstr "Categorías"
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Certificate and session data are not available yet."
+msgstr "Os datos de sesión y o certificau no son disponibles encara."
+
+#: resources.h:31
+msgid "Certificate details"
+msgstr "Detalles d'o certificau"
+
+#: resources.h:3 resources.h:32
+msgid "Certificate in chain:"
+msgstr "Certificar en cadena:"
+
+#: resources.h:14 resources.h:42
+msgid "Certificate issuer"
+msgstr "Achent de certificau"
+
+#: resources.h:132
+msgid "Challenge:"
+msgstr "Desafío:"
+
+#: resources.h:141
+msgid "Change file attributes"
+msgstr "Cambiar os atributos d'o fichero"
+
+#: resources.h:610 resources.h:662
+msgid "Change the file permissions."
+msgstr "Cambiar os premisos d'o fichero."
+
+#: resources.h:989
+msgid "Changing logfile settings requires restart of FileZilla."
+msgstr ""
+"Cambiar os achustes d'o fichero de rechistro amenesta reenchegar FileZilla."
+
+#: ../../locales/../src/interface/FileZilla.cpp:690
+msgid "Character encoding issue"
+msgstr "Problema de codificación de caracters"
+
+#: resources.h:114
+msgid "Charset"
+msgstr "Chuego de caracters"
+
+#: resources.h:567
+msgid "Check for &updates..."
+msgstr "Comprebar si bi ha act&ualizacions..."
+
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Mirar act&ualizacions de FileZilla automaticament:"
+
+#: resources.h:568
+msgid "Check for newer versions of FileZilla"
+msgstr "Compreba si bi ha nuevas versions de FileZilla"
+
+#: ../../locales/../src/interface/updatewizard.cpp:171
+msgid "Check for updates"
+msgstr "Compreba si bi ha actualizacions"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
+msgid "Check for updates failed"
+msgstr "A comprebación d'actualizacions ha fallau"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:765
+msgid "Checking for correct external IP address"
+msgstr "Comprebando si la IP externa ye correcta"
+
+#: resources.h:242
+msgid "Checking for updates"
+msgstr "Comprebando actualizacions"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1261
+msgid "Checksum mismatch of downloaded file."
+msgstr "A suma de bits no concuerda con o fichero descargau"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
+msgid "Choose the default local directory"
+msgstr "Seleccione o directorio local predeterminau"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
+msgid "Choose the local directory"
+msgstr "Seleccione lo directorio local"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+msgid "Chunk data improperly terminated"
+msgstr "Trozo de datos rematau incorrectament"
+
+#: resources.h:23 resources.h:51
+msgid "Cipher:"
+msgstr "Zifrau:"
+
+#: resources.h:513 resources.h:687
+msgid "Cl&ose tab"
+msgstr "&Zarrar a pestanya"
+
+#: resources.h:882
+msgid "Classic"
+msgstr "Clasico"
+
+#: resources.h:296
+msgid "Clear &Site Manager entries"
+msgstr "Limpiar dentradas d'o chestor de &puestos"
+
+#: resources.h:633
+msgid "Clear &layout cache"
+msgstr "Borrar caché"
+
+#: resources.h:294
+msgid "Clear &quickconnect history"
+msgstr "Limpiar historial de connexión ra&pida"
+
+#: resources.h:295
+msgid "Clear &reconnect information"
+msgstr "Limpiar información de &reconnexión"
+
+#: resources.h:297
+msgid "Clear &transfer queue"
+msgstr "Limpiar coda de &transferencia"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
+msgid "Clear history"
+msgstr "Borrar historial"
+
+#: resources.h:291 ../../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 "Limpiar información privada"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
+msgid "Clear quickconnect bar"
+msgstr "Borrar barra de connexión rapida"
+
+#: resources.h:634
+msgid "Clear string coalescer"
+msgstr "Borrar unión de cadenas"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:571
+msgid "Click on Finish to save your configuration."
+msgstr "Faiga clic en rematar ta alzar a configuración."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1117
+msgid "Click on next to download the new version."
+msgstr "Faiga clic en siguient ta descargar a nueva versión."
+
+#: resources.h:357
+msgid "Client to server MAC:"
+msgstr "MAC de client ta servidor:"
+
+#: resources.h:355
+msgid "Client to server cipher:"
+msgstr "Zifrau de client ta servidor:"
+
+#: resources.h:688
+msgid "Close &all other tabs"
+msgstr "Zarrar todas as pestanyas"
+
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
+msgid "Close FileZilla"
+msgstr "Zarrar FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:15
+msgid "Close all running instances of FileZilla"
+msgstr "Zarrar todas as copias de FileZilla en execución."
+
+#: resources.h:514
+msgid "Closes current tab"
+msgstr "Zarra la pestanya actual"
+
+#: resources.h:96
+msgid "Co&mments:"
+msgstr "Co&mentarios:"
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "Column properties"
+msgstr "Propiedatz de columna"
+
+#: resources.h:364
+msgid "Column setup"
+msgstr "Configuración de columna"
+
+#: resources.h:959
+msgid "Command and its arguments should be properly quoted."
+msgstr ""
+"O comando y os suyos argumentos han d'estar correctament entre cometas."
+
+#: ../../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
+msgid "Command failed"
+msgstr "O comando ha fallau"
+
+#: ../../locales/../src/engine/proxy.cpp:448
+msgid "Command not supported"
+msgstr "Comando no suportau"
+
+#: ../../locales/../src/engine/engineprivate.cpp:183
+msgid "Command not supported by this protocol"
+msgstr "Comando no suportau por o protocolo"
+
+#: ../../locales/../src/engine/logging.cpp:214
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
+msgid "Command:"
+msgstr "Comando:"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
+msgid "Comment"
+msgstr "Comentario"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
+msgid "Common name:"
+msgstr "Nombre común:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:426
+#: ../../locales/../src/interface/netconfwizard.cpp:441
+msgid "Communication tainted by router or firewall"
+msgstr "Comunicación contaminada por l'enrotador u lo tallafuegos"
+
+#: resources.h:531 resources.h:666
+msgid "Compare &modification time"
+msgstr "Comparar tiempo de &modificación"
+
+#: resources.h:530 resources.h:665
+msgid "Compare file&size"
+msgstr "Comparar &grandaria de fichero"
+
+#: resources.h:939
+msgid "Comparison &threshold (in minutes):"
+msgstr "&Branquil de comparanza (en minutos):"
+
+#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
+msgid "Comparison threshold needs to be between 0 and 1440 minutes."
+msgstr "L'umbral de comparanza ameneste estar entre 0 y 1440 minutos."
+
+#: resources.h:169
+msgid "Compiled for:"
+msgstr "Compilau pa:"
+
+#: resources.h:170
+msgid "Compiled on:"
+msgstr "Compilau en:"
+
+#: resources.h:172
+msgid "Compiled with:"
+msgstr "Compilau con:"
+
+#: resources.h:173
+msgid "Compiler flags:"
+msgstr "Parametros de compilación:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+msgid "Compressed"
+msgstr "Comprimiu"
+
+#: resources.h:823
+msgid "Concurrent transfers"
+msgstr "Transferencias simultanias"
+
+#: resources.h:234 resources.h:448
+msgid "Conditions are c&ase sensitive"
+msgstr "As condicions son sensibles a mayusclas y minusclas"
+
+#: resources.h:731
+msgid "Configuration test"
+msgstr "Preba de configuración"
+
+#: resources.h:705
+msgid "Configure passive mode"
+msgstr "Configurar o modo pasivo"
+
+#: resources.h:721
+msgid "Configure port range"
+msgstr "Configurar intervalo de puertos"
+
+#: resources.h:478
+msgid "Configuring FileZilla and your network"
+msgstr "Configurar FileZilla y o tuyo ret"
+
+#: ../../locales/../src/interface/search.cpp:1034
+msgid "Confirm deletion"
+msgstr "Confirmar borrau"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+#: ../../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
+msgid "Confirmation needed"
+msgstr "S'ameneste confirmación"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:567
+msgid "Congratulations, your configuration seems to be working."
+msgstr "Enhorabuena, a suya configuración pareixe que funciona."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
+msgid "Connect bypassing proxy settings"
+msgstr "Connectar sin pasar por as opcions d'o servidor"
+
+#: ../../locales/../src/interface/cmdline.cpp:8
+msgid "Connect to specified Site Manager site"
+msgstr "Connectar a un puesto especifico d'o gestor de puestos"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
+msgid "Connected"
+msgstr "Connectau"
+
+#: ../../locales/../src/interface/QueueView.cpp:1437
+msgid "Connecting"
+msgstr "Connectando"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:207
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
+#, c-format
+msgid "Connecting to %s"
+msgstr "Se ye connectando a %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
+#, c-format
+msgid "Connecting to %s through proxy"
+msgstr "Se ye connectando a %s a traviés de proxy"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
+#: ../../locales/../src/engine/proxy.cpp:172
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
+#, c-format
+msgid "Connecting to %s..."
+msgstr "Se ye connectando a %s..."
+
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
+msgid "Connecting to server"
+msgstr "Connectando a lo servidor"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:116
+msgid "Connection"
+msgstr "Connexión"
+
+#: ../../locales/../src/interface/QueueView.cpp:1053
+msgid "Connection attempt failed"
+msgstr "L'intento de connexión ha fallau"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
+#: ../../locales/../src/engine/proxy.cpp:176
+#, c-format
+msgid "Connection attempt failed with \"%s\", trying next address."
+msgstr ""
+"L'intento de connexión con \"%s\" ha fallau, intentando a siguient adreza."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
+#, c-format
+msgid "Connection attempt failed with \"%s\"."
+msgstr "L'intento de connexión con \"%s\" ha fallau."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:186
+#: ../../locales/../src/engine/engineprivate.cpp:320
+msgid "Connection attempt interrupted by user"
+msgstr "L'intento de connexión ha estau aturau por l'usuario"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:543
+msgid "Connection closed"
+msgstr "A connexión ha estau zarrada"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
+msgid "Connection closed by server"
+msgstr "A connexión ha estau zarrada por o servidor"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:305
+msgid "Connection established, initializing TLS..."
+msgstr "Connexión establida, Se ye inicializando TLS..."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:340
+msgid "Connection established, sending HTTP request"
+msgstr "Connexión establida, Se ye ninviando petición HTTP"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
+msgid "Connection established, waiting for welcome message..."
+msgstr "Connexión establida, Se ye asperando o mensache de bienvenida..."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:338
+msgid "Connection lost"
+msgstr "A connexión s'ha perdiu"
+
+#: ../../locales/../src/engine/proxy.cpp:433
+msgid "Connection not allowed by ruleset"
+msgstr "A connexión no ye premitida por o conchunto de regles"
+
+#: ../../locales/../src/engine/proxy.cpp:442
+msgid "Connection refused"
+msgstr "A connexión ha estau refusada"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:684
+msgid "Connection timed out"
+msgstr "A connexión superó lo tiempo d'aspera"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
+msgid "Connection timed out."
+msgstr "A connexión superó o tiempo d'aspera."
+
+#: ../../locales/../src/interface/search.cpp:677
+msgid "Connection to server lost."
+msgstr "A connexión a lo servidor s'ha perdiu."
+
+#: ../../locales/../src/engine/proxy.cpp:188
+msgid "Connection with proxy established, performing handshake..."
+msgstr ""
+"A connexión con o proxy s'ha establiu, se ye realizando a negociación..."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:561
+msgid "Connection with server got closed prematurely."
+msgstr "A connexión con o servidor se ye zarrada prematurament."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:552
+msgid "Connection with the test server failed."
+msgstr "Ha fallau la connexión con o servidor de comprebación."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
+msgid "Convert keyfile"
+msgstr "Convertir fichero de clau"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
+#, c-format
+msgid "Copy (%d) of %s"
+msgstr "Copiau (%d) de %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
+#, c-format
+msgid "Copy of %s"
+msgstr "Copia de %s"
+
+#: resources.h:608 resources.h:660
+msgid "Copy the URLs of the selected items to clipboard."
+msgstr "Copiar en o portafuellas as URL d'os elementos seleccionaus."
+
+#: ../../locales/../src/engine/transfersocket.cpp:215
+#, c-format
+msgid "Could not accept connection: %s"
+msgstr "No s'ha puesto acceptara connexión: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+msgid "Could not add connection to Site Manager"
+msgstr "No s'ha puesto adhibir a connexión a lo chestor de puestos"
+
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "No s'ha puesto completar a operación"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:188
+msgid "Could not connect to server"
+msgstr "No s'ha puesto connectar a lo servidor"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "No s'ha puesto connectar a lo servidor: %s"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
+msgid "Could not convert command to server encoding"
+msgstr "No s'ha puesto convertir o comando ta la codificación d'o servidor"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+msgid "Could not convert private key"
+msgstr "No s'ha puesto convertir a clau privada"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+msgid "Could not copy URLs"
+msgstr "No s'han puesto copiar as URL"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+msgid "Could not copy data"
+msgstr "No s'han puesto copiar os datos"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
+msgid ""
+"Could not determine the target of the Drag&Drop operation.\n"
+"Either the shell extension is not installed properly or you didn't drop the "
+"files into an Explorer window."
+msgstr ""
+"No s'ha puesto determinar o destín d'a operación d'arrocegar y soltar.\n"
+"U bien a extensión de consola no ye instalada adequadament u no soltó os "
+"fichers en una finestra de l'Explorador."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
+msgid "Could not establish connection to server"
+msgstr "No s'ha puesto establir connexión con o servidor"
+
+#: ../../locales/../src/interface/FileZilla.cpp:493
+msgid ""
+"Could not find the resource files for FileZilla, closing FileZilla.\n"
+"You can set the data directory of FileZilla using the '--datadir "
+"<custompath>' commandline option or by setting the FZ_DATADIR environment "
+"variable."
+msgstr ""
+"No s'han puesto trobar os fichers de recursos ta FileZilla, se ye zarrando "
+"FileZilla.\n"
+"No se puet establir o directorio de datos de FileZilla usando la opción '- "
+"datadir <rotapersonalizada>' en a linia de comandos u por meyo d'a creyación "
+"d'a variable d'entorno FZ_DATADIR."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
+msgid "Could not generate custom login sequence."
+msgstr "No s'ha puesto chenerar a seqüencia d'inicio personalizau de sesión."
+
+#: ../../locales/../src/engine/tlssocket.cpp:1029
+msgid ""
+"Could not get distinguished name of certificate issuer, "
+"gnutls_x509_get_issuer_dn failed"
+msgstr ""
+"No s'ha puesto obtener o nombre completo de l'emisor d'o certificau, error "
+"en gnutls_x509_get_issuer_dn"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1005
+msgid ""
+"Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
+"failed"
+msgstr ""
+"No s'ha puesto obtener o nombre completo de l'afer d'o certificau, error en "
+"gnutls_x509_get_dn"
+
+#: ../../locales/../src/interface/state.cpp:1079
+msgid "Could not get full remote path."
+msgstr "No s'ha puesto obtener a rota remota completa."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
+msgid "Could not get reply from fzputtygen."
+msgstr "No s'obtenió respuesta de fzputtygen."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+msgid "Could not get temporary directory to download file into."
+msgstr ""
+"No s'ha puesto obtener un directorio temporal ta descargar o fichero dentro."
+
+#: ../../locales/../src/engine/tlssocket.cpp:947
+msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
+msgstr "No s'ha puesto importar o certificau, error en gnutls_x509_crt_import"
+
+#: ../../locales/../src/engine/tlssocket.cpp:941
+msgid ""
+"Could not initialize structure for peer certificates, gnutls_x509_crt_init "
+"failed"
+msgstr ""
+"No s'ha puesto inicializar a estructura de certificaus, error en "
+"gnutls_x509_crt_init"
+
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
+#, c-format
+msgid ""
+"Could not load \"%s\", please make sure the file is valid and can be "
+"accessed.\n"
+"Any changes made in the Site Manager will not be saved."
+msgstr ""
+"No s'ha puesto ubrir \"%s\", verifique que lo fichero siga valido y que siga "
+"accesible.\n"
+"Qualsiquier cambeo realizau en o chestor de Puestos no s'alzará."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
+msgid "Could not load keyfile"
+msgstr "No s'ha puesto cargar o fichero de clau"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
+msgid "Could not load private key"
+msgstr "No s'ha puesto cargar a clau privada"
+
+#: ../../locales/../src/interface/state.cpp:1105
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+"No s'ha puesto obtener o directorio local correspondient t'o directorio "
+"remoto '%s'.\n"
+"Quiers desactivar a navegación sincronizada y continar cambiando o "
+"directorio remoto?"
+
+#: ../../locales/../src/interface/state.cpp:404
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"No s'ha puesto obtener o directorio local correspondient t'o directorio "
+"remoto '%s'.\n"
+"a navegación sincronizada ha estau desactivada."
+
+#: ../../locales/../src/interface/state.cpp:295
+#, c-format
+msgid ""
+"Could not obtain corresponding remote directory for the local directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"No s'ha puesto obtener o directorio remoto correspondient t'o directorio "
+"local '%s'.\n"
+"a navegación sincronizada ha estau desactivada."
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+msgid "Could not open clipboard"
+msgstr "No s'ha puesto ubrir o portafuellas"
+
+#: ../../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 "No s'ha puesto ubrir o fichero de rechistro: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+msgid "Could not parse remote path."
+msgstr "No s'ha puesto analisar a rota remota."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
+msgid "Could not parse server address:"
+msgstr "No s'ha puesto analisar l'adreza d'o servidor:"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#, c-format
+msgid "Could not read from socket: %s"
+msgstr "No s'ha puesto leyer dende lo socket: %s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:487
+msgid "Could not read server item."
+msgstr "No s'ha puesto leyer o elemento d'o servidor."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#, c-format
+msgid "Could not seek to offset %s within file"
+msgstr "No s'ha puesto buscar a posición %s dentro d'o fichero"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
+msgid "Could not seek to the end of the file"
+msgstr "No s'ha puesto buscar dica a fin d'o fichero"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
+msgid "Could not send command to fzputtygen."
+msgstr "No s'ha puesto ninviar o comando a fzputtygen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
+msgid "Could not spawn IO thread"
+msgstr "No s'ha puesto creyar un filo de dentrada/salida"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
+#, c-format
+msgid "Could not start proxy handshake: %s"
+msgstr "No s'ha puesto prencipiar o saludo con o servidor: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
+msgid "Could not start transfer"
+msgstr "No s'ha puesto prencipiar a transferencia"
+
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
+#, c-format
+msgid ""
+"Could not write \"%s\", any changes to the Site Manager could not be saved: %"
+"s"
+msgstr ""
+"No s'ha puesto escribir \"%s\", os cambeos realizaus en o chestor de puestos "
+"no s'han puesto alzar: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
+#, c-format
+msgid "Could not write \"%s\", the bookmark could not be added: %s"
+msgstr ""
+"No s'ha puesto escribir \"%s\", o marcapachinas no s'ha puesto adhibir: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
+msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
+msgstr ""
+"No s'ha puesto escribir \"%s\", os marcapachinas globals no s'han puesto "
+"alzar: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1976
+#, c-format
+msgid ""
+"Could not write \"%s\", the queue could not be saved.\n"
+"%s"
+msgstr ""
+"No s'ha puesto escribir \"%s\", a coda no ha puesto alzar.\n"
+"%s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
+#, c-format
+msgid "Could not write \"%s\", the selected sites could not be exported: %s"
+msgstr ""
+"No s'ha puesto escribir \"%s\", os puestos seleccionaus no han puesto "
+"exportar: %s"
+
+#: ../../locales/../src/interface/wrapengine.cpp:1151
+#, c-format
+msgid "Could not write \"%s\": %s"
+msgstr "No s'ha puesto escribir \"%s\": %s"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+#, c-format
+msgid "Could not write keyfile: %s"
+msgstr "No s'ha puesto escribir o fichero de clau: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1098
+msgid "Could not write to local file"
+msgstr "No s'ha puesto escribir en o fichero local"
+
+#: ../../locales/../src/engine/logging.cpp:315
+#: ../../locales/../src/engine/logging.cpp:386
+#, c-format
+msgid "Could not write to log file: %s"
+msgstr "No s'ha puesto escribir en o fichero de rechistro: %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
+#, c-format
+msgid "Could not write to socket: %s"
+msgstr "No s'ha puesto escribir en o socket: %s"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+msgid "Country:"
+msgstr "País:"
+
+#: resources.h:637
+msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
+msgstr ""
+"As crebaduras de FileZilla instantaniament. Solament s'utiliza ta depurar o "
+"controlador d'excepcions"
+
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Cre&yar nuevo fichero"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
+msgid "Create a new subdirectory in the current directory"
+msgstr "Creyar un nuevo subdirectorio en o directorio actual"
+
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Creyar un nuevo, fichero vuedo en o directorio actual"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+msgid "Create directory"
+msgstr "Creyar directorio"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Creyar fichero vuedo"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
+msgid "Creating directory"
+msgstr "Se ye creyando un directorio"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
+#, c-format
+msgid "Creating directory '%s'..."
+msgstr "Se ye creyando o directorio '%s'..."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:174
+msgid "Critical error"
+msgstr "Error critica"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:137
+msgid "Critical file transfer error"
+msgstr "Error critica de transferencia de fichero"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:120
+#, c-format
+msgid "Critical file transfer error after transferring %s in %s"
+msgstr ""
+"Error critica de transferencia de fichero dimpués de transferir %s en %s"
+
+#: ../../locales/../src/interface/state.cpp:393
+#, c-format
+msgid ""
+"Current remote directory (%s) is not below the synchronization root (%s).\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"O directorio remoto actual (%s) no ye baixo a radiz de sincronización (%s).\n"
+"a navegación sincronizada ha estau desactivada."
+
+#: ../../locales/../src/interface/statusbar.cpp:423
+msgid "Current transfer type is set to ASCII."
+msgstr "O tipo de transferencia actual ye fixau en ASCII."
+
+#: ../../locales/../src/interface/statusbar.cpp:433
+msgid "Current transfer type is set to automatic detection."
+msgstr "O tipo de transferencia actual ye fixau en detección automatica."
+
+#: ../../locales/../src/interface/statusbar.cpp:428
+msgid "Current transfer type is set to binary."
+msgstr "O Tipo de transferencia actual ye fixau en binario."
+
+#: resources.h:794 resources.h:915
+msgid "Cus&tom"
+msgstr "Pesonali&zau"
+
+#: ../../locales/../src/interface/filter.cpp:98
+msgid "Custom filter set"
+msgstr "Conchunto de filtros personalizau"
+
+#: resources.h:386 resources.h:387
+msgid "Custom server"
+msgstr "Servidor personalizau"
+
+#: resources.h:395
+msgid "D&ata type"
+msgstr "Tipo de d&atos"
+
+#: resources.h:922
+msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
+msgstr "Prefixos d&ecimals usando simbolos SI (p. eix. 1 KB = 1000 bytes)"
+
+#: resources.h:109
+msgid "D&efault"
+msgstr "Por d&efecto"
+
+#: resources.h:603 resources.h:655 resources.h:685
+msgid "D&elete"
+msgstr "&Borrar"
+
+#: resources.h:215
+msgid "D&isable all"
+msgstr "Desactivar-lo tot"
+
+#: resources.h:893
+msgid "D&o not save passwords"
+msgstr "N&o alzar claus"
+
+#: resources.h:946
+msgid "D&ouble-click action on directories:"
+msgstr "Acci&ons de dople clic sobre directorios:"
+
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplicau"
+
+#: ../../locales/../src/engine/server.cpp:34
+msgid "DOS-like with virtual paths"
+msgstr "Con rotas virtuals a lo estilo DOS"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
+msgid "Dangerous filetype"
+msgstr "Tipo de fichero perigloso"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
+msgid "Data"
+msgstr "Datos"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
+msgid "Data socket closed too early."
+msgstr "O socket de datos s'ha zarrau masiau pronto."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
+msgid "Date"
+msgstr "Calendata"
+
+#: resources.h:906
+msgid "Date formatting"
+msgstr "Formato de calendata"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:128
+msgid "Date/time format"
+msgstr "Formato de calendata/hora"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
+msgid "Date/time unknown"
+msgstr "Calendata/hora desconoixida"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:141
+msgid "Debug"
+msgstr "Depuración"
+
+#: resources.h:990
+msgid "Debugging settings"
+msgstr "Opcions de depuración"
+
+#: resources.h:100
+msgid "Default &local directory:"
+msgstr "Directorio &local predeterminau:"
+
+#: ../../locales/../src/engine/server.cpp:26
+msgid "Default (Autodetect)"
+msgstr "Predeterminau (Detectar automaticament)"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+msgid "Default editor not properly quoted."
+msgstr "O editor predeterminau no ye correctament entre cometas."
+
+#: resources.h:265 resources.h:287 resources.h:876
+msgid "Default file exists action"
+msgstr "Acción predeterminada si lo fichero existe"
+
+#: resources.h:102
+msgid "Default r&emote directory:"
+msgstr "Directorio r&emoto predeterminau:"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
+msgid ""
+"Default remote path cannot be parsed. Make sure it is a valid absolute path "
+"for the selected server type."
+msgstr ""
+"No se puet analisar a rota remota predeterminada. Mira que siga valida t'o "
+"tipo de servidor seleccionau."
+
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:78
+msgid "Default system language"
+msgstr "Idioma predeterminau d'o sistema"
+
+#: resources.h:699
+msgid "Default transfer mode:"
+msgstr "Modo de transferencia predeterminada:"
+
+#: resources.h:845
+msgid "Default transfer type:"
+msgstr "Tipo de transferencia predeterminada:"
+
+#: resources.h:718 resources.h:781
+msgid "Default: http://ip.filezilla-project.org/ip.php"
+msgstr "Predeterminada: http://ip.filezilla-project.org/ip.php"
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
+msgid ""
+"Delay between failed connection attempts has to be between 1 and 999 seconds."
+msgstr ""
+"L'intervalo entre intentos de connexions fallidas debe estar entre 1 y 999 "
+"segundos."
+
+#: ../../locales/../src/engine/engineprivate.cpp:630
+#, c-format
+msgid ""
+"Delaying connection for %d second due to previously failed connection "
+"attempt..."
+msgid_plural ""
+"Delaying connection for %d seconds due to previously failed connection "
+"attempt..."
+msgstr[0] ""
+"Se ye retardando la connexión por %d segundo a causa d'un intento previo de "
+"connexión falliu..."
+msgstr[1] ""
+"Se ye retardando la connexión por %d segundos a causa d'un intento previo de "
+"connexión falliu..."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
+msgid "Delete Site Manager entry"
+msgstr "Borrar dentrada d'o chestor de puestos"
+
+#: resources.h:656 resources.h:677
+msgid "Delete selected directory"
+msgstr "Borrar o directorio seleccionau"
+
+#: resources.h:588 resources.h:604
+msgid "Delete selected files and directories"
+msgstr "Borrar os fichers y carpetas seleccionadas"
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting directories"
+msgstr "Se son borrando directorios"
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting multiple unrelated directories is not yet supported"
+msgstr "Ya no s'admite borrar multiples directorios sin relación"
+
+#: resources.h:463
+msgid "Deleting symbolic link"
+msgstr "Se ye borrando un vinclo simbolico"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
+msgid "Desktop"
+msgstr "Escritorio"
+
+#: resources.h:4 resources.h:33 resources.h:186
+msgid "Details"
+msgstr "Detalles"
+
+#: resources.h:199
+msgid "Details for new key:"
+msgstr "Detalles ta la nueva clau"
+
+#: resources.h:237
+msgid "Dire&ctories"
+msgstr "Dire&ctorios"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Direction"
+msgstr "Adreza"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:283
+msgid "Directory"
+msgstr "Directorio"
+
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
+msgid "Directory comparison"
+msgstr "Comparanza de directorios"
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+#: ../../locales/../src/interface/listingcomparison.cpp:82
+#: ../../locales/../src/interface/listingcomparison.cpp:88
+msgid "Directory comparison failed"
+msgstr "A comparanza de directorios ha fallau"
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
+msgid "Directory containing the logfile does not exist or filename is invalid."
+msgstr ""
+"O directorio que contién o fichero de rechistro no existe u lo nombre d'o "
+"fichero no ye valido."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:192
+msgid "Directory listing aborted by user"
+msgstr "O listau de directorio ha estau cancelau por l'usuario"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
+msgid "Directory listing failed"
+msgstr "O listau de directorios ha fallau"
+
+#: resources.h:208
+msgid "Directory listing filters"
+msgstr "Filtros de listau de directorio"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:196
+msgid "Directory listing successful"
+msgstr "O listau de directorio ha estau correcto"
+
+#: resources.h:218
+msgid "Disa&ble all"
+msgstr "Desactivar-lo tot"
+
+#: ../../locales/../src/interface/state.cpp:1113
+msgid ""
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+"Desactivar a navegación sincronizada y continar cambiando o directorio "
+"remoto?"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:681
+msgid ""
+"Disable this option again if you will not be able to see the correct "
+"directory contents anymore."
+msgstr ""
+"Desactiva ista opción de nuevo si ya no puetz tornar a veyer correctament os "
+"contenius d'o directorio."
+
+#: resources.h:1018
+msgid "Disconnect from server"
+msgstr "Desconnectar d'o servidor"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:82
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../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
+msgid "Disconnected from server"
+msgstr "Desconnectau d'o servidor"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:953
+#, c-format
+msgid "Disconnected from server: %s"
+msgstr "Desconnectau d'o servidor: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
+msgid "Disconnecting from previous server"
+msgstr "Se ye desconnectando d'o servidor anterior"
+
+#: resources.h:1019
+msgid "Disconnects from the currently visible server"
+msgstr "Desconnectar d'o servidor actualment visible"
+
+#: resources.h:573
+msgid "Display about dialog"
+msgstr "Amostrar o dialogo arredol de"
+
+#: resources.h:955
+msgid "Do &not use default editor"
+msgstr "No emplegar l'editor predeterminau"
+
+#: resources.h:629
+msgid "Do &nothing"
+msgstr "&No fer cosa"
+
+#: ../../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 ""
+"Yes seguro que quiers comprebar si bi ha versions beta?\n"
+"De no estar que quieras prebar nuevas funcionalidatz, ye millor que sigas "
+"emplegando versions estables."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
+msgid "Do you really want to close FileZilla?"
+msgstr "Yes seguro que quiers zarrar FileZilla?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
+msgid ""
+"Do you really want to delete all Site Manager entries and the transfer queue?"
+msgstr ""
+"Yes seguro que quiers borrar todas as dentradas d'o chestor de puestos y a "
+"coda de transferencia?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+msgid "Do you really want to delete all Site Manager entries?"
+msgstr ""
+"Yes seguro que quiers borrar todas as dentradas d'o chestor de puestos?"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
+msgid "Do you really want to delete selected entry?"
+msgstr "Yes seguro que quiers borrar a dentrada seleccionada?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+msgid "Do you really want to delete the transfer queue?"
+msgstr "Yes seguro que quiers borrar a coda de transferencia?"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:597
+#, c-format
+msgid "Do you really want to send '%s' to the server?"
+msgstr "Yes seguro que quiers ninviar '%s' ta lo servidor?"
+
+#: resources.h:476
+msgid "Documentation"
+msgstr "Documentación"
+
+#: resources.h:720
+msgid "Don't use external IP address on &local connections."
+msgstr "No emplegar una adreza IP externa en as connexions locals."
+
+#: resources.h:856
+msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
+msgstr ""
+"Os fichers punto son nombres de fichers que prencipian con un punto, p. "
+"eix. .htaccess"
+
+#: resources.h:940
+msgid "Double-click action"
+msgstr "Acción de dople clic"
+
+#: resources.h:372
+msgid "Download"
+msgstr "Descargar"
+
+#: resources.h:492 resources.h:832
+msgid "Download &limit:"
+msgstr "&Limite de descarga:"
+
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
+msgid "Download limit: %s/s"
+msgstr "Limite de descarga: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:606
+msgid "Download limit: none"
+msgstr "Limite de descarga: garra"
+
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
+msgid "Download search results"
+msgstr "Descargar resultaus de busca"
+
+#: resources.h:650
+msgid "Download selected directory"
+msgstr "Descargar directorio seleccionau"
+
+#: resources.h:592
+msgid "Download selected files and directories"
+msgstr "Descargar fichers y carpetas seleccionadas"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Velocidat de baixada: %s/s\n"
+"Velocidat de puyada: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
+msgid "Downloading"
+msgstr "Descargando"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:358
+#: ../../locales/../src/interface/updatewizard.cpp:423
+#, c-format
+msgid "Downloading %s"
+msgstr "Se ye descargando %s"
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading multiple unrelated directories is not yet supported"
+msgstr "Ya no s'admite descargar multiples directorios sin relación"
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading search results"
+msgstr "Se son descargando os resultaus de busca"
+
+#: ../../locales/../src/interface/LocalListView.cpp:104
+#: ../../locales/../src/interface/LocalTreeView.cpp:104
+#: ../../locales/../src/interface/QueueView.cpp:83
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
+msgid ""
+"Drag&drop between different instances of FileZilla has not been implemented "
+"yet."
+msgstr ""
+"Encara no ha estau implementada a función d'arrocegar y soltar entre "
+"esferents instancias de FileZilla."
+
+#: ../../locales/../src/interface/LocalListView.cpp:110
+#: ../../locales/../src/interface/LocalTreeView.cpp:110
+#: ../../locales/../src/interface/QueueView.cpp:96
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
+msgid "Drag&drop between different servers has not been implemented yet."
+msgstr ""
+"Arrocegar y soltar entre esferents servidors no ha estau implementado encara."
+
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&icau"
+
+#: resources.h:214
+msgid "E&nable all"
+msgstr "A&ctivar-lo tot"
+
+#: resources.h:578 resources.h:595
+msgid "E&nter directory"
+msgstr "E&ntrar en directorio"
+
+#: resources.h:150
+msgid "E&xecute"
+msgstr "E&xecutar"
+
+#: resources.h:518
+msgid "E&xit"
+msgstr "Sali&r"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
+msgid "E-Mail:"
+msgstr "Correu electronico:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
+msgid "Each filter needs at least one condition."
+msgstr "Cada filtro ameneste a lo menos una condición."
+
+#: resources.h:240
+msgid "Edit filters"
+msgstr "Editar filtros"
+
+#: resources.h:583
+msgid ""
+"Edit the file with the configured editor and upload changes to the server."
+msgstr ""
+"Editar o fichero con l'editor configurau y puyar os cambeos ta lo servidor."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
+msgid "Editing failed"
+msgstr "Edición fallida"
+
+#: resources.h:903
+msgid "Email:"
+msgstr "Correu electronico:"
+
+#: ../../locales/../src/interface/QueueView.cpp:2286
+msgid "Empty command"
+msgstr "Comando vuedo"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
+msgid "Empty command."
+msgstr "Comando vuedo."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
+msgid "Empty directory listing"
+msgstr "Listau d'o directorio vuedo"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:26
+msgid "Empty directory."
+msgstr "Directorio vuedo."
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
+msgid "Empty file extension."
+msgstr "Extensión de fichero vueda."
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty filter names are not allowed."
+msgstr "No se permite nombre de filtro en blanco."
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty name"
+msgstr "Nombre vuedo"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
+msgid "Empty quoted string."
+msgstr "Cadena vueda entre cometas."
+
+#: resources.h:217
+msgid "En&able all"
+msgstr "&Activar-lo tot"
+
+#: resources.h:841
+msgid "Enable invalid character &filtering"
+msgstr "Activar &filtrau de caracters no validos"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+msgid "Encrypted"
+msgstr "Zifrau"
+
+#: resources.h:354
+msgid "Encryption"
+msgstr "Zifrau"
+
+#: resources.h:346
+msgid "Encryption details"
+msgstr "Detalles de zifrau"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:451
+msgid "End comparison and change sorting order?"
+msgstr "Rematar comparanza y cambiar l'orden de clasificación?"
+
+#: resources.h:559
+msgid "Enter &custom command..."
+msgstr "Escribir &comando personalizau..."
+
+#: resources.h:496
+#, no-c-format
+msgid "Enter 0 for unlimited speed."
+msgstr "Mete 0 ta velocidat ilimitada."
+
+#: ../../locales/../src/interface/QueueView.cpp:2275
+msgid "Enter command"
+msgstr "Mete lo comando"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:578
+msgid "Enter custom command"
+msgstr "Mete lo comando personalizau"
+
+#: resources.h:947
+msgid "Enter directory"
+msgstr "Mete lo directorio"
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Enter filter name"
+msgstr "Mete lo nombre de filtro"
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Enter name for filterset"
+msgstr "Mete lo nombre d'o conchunto de filtros"
+
+#: ../../locales/../src/interface/filter.cpp:405
+msgid "Enter new name for filterset"
+msgstr "Mete lo nuevo nombre ta o conchunto de filtros"
+
+#: resources.h:125
+msgid "Enter password"
+msgstr "Mete la clau"
+
+#: resources.h:579 resources.h:596
+msgid "Enter selected directory"
+msgstr "Mete lo directorio seleccionau"
+
+#: resources.h:740
+msgid ""
+"Enter the address of the server.\n"
+"To specify the server protocol, prepend the host with the protocol "
+"identifier. If no protocol is specified, the default protocol (ftp://) will "
+"be used.\n"
+"You can also enter complete URLs in the form protocol://user:pass@host:port "
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
+msgstr ""
+"Mete l'adreza d'o servidor.\n"
+"Ta especificar o protocolo de servidor, mete debant de l'host o protocolo "
+"identificador. Si no s'especifica lo protocolo, s'emplegará lo protocolo "
+"predeterminau (ftp://).\n"
+"Puetz tamién meter a URL completa en o formulario protocolo://usuario:"
+"clau@servidor:puerto aquí, en ixe caso as valors d'os atros campos serán "
+"sobrescritas.\n"
+"\n"
+"Os protocolos permitius son:\n"
+"- ftp:// ta FTP normal\n"
+"- sftp:// ta lo protocolo de transferencia SSH\n"
+"- ftps:// ta FTP sobre TLS (implicito)\n"
+"- ftpes:// ta FTP sobre TLS (explicito)"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
+#, c-format
+msgid ""
+"Enter the password for the file '%s'.\n"
+"Please note that the converted file will not be password protected."
+msgstr ""
+"Mete la clau t'o fichero '%s'.\n"
+"Por favor tienga en cuenta que o fichero convertiu no será protechiu por "
+"clau."
+
+#: resources.h:744
+msgid ""
+"Enter the port on which the server listens.\n"
+"The default for FTP is 21, the default for SFTP is 22."
+msgstr ""
+"Mete lo puerto en o qual escuita o servidor.\n"
+"O puerto predeterminau ta FTP ye o 21, ta SFTP ye o 22."
+
+#: ../../locales/../src/interface/loginmanager.cpp:63
+msgid "Enter username and password"
+msgstr "Mete nombre d'usuario y clau"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "Error exporting settings"
+msgstr "S'ha produciu una error en exportar as opcions"
+
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
+msgid "Error importing"
+msgstr "S'ha produciu una error en importar"
+
+#: ../../locales/../src/interface/QueueView.cpp:2043
+msgid "Error loading queue"
+msgstr "S'ha produciu una error en cargar a coda"
+
+#: ../../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:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
+msgid "Error loading xml file"
+msgstr "S'ha produciu una error en cargar o fichero xml"
+
+#: ../../locales/../src/interface/QueueView.cpp:1942
+msgid "Error saving queue"
+msgstr "S'ha produciu una error en alzar a coda"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid "Error starting program"
+msgstr "S'ha produciu una error en encetar o programa"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
+msgid "Error writing xml file"
+msgstr "S'ha produciu una error en escribir o fichero xml"
+
+#: ../../locales/../src/interface/updatewizard.cpp:343
+msgid "Error, file name cannot be parsed."
+msgstr "Error, no se puet procesar o fichero."
+
+#: ../../locales/../src/interface/updatewizard.cpp:359
+msgid "Error, local file exists but cannot be removed"
+msgstr "Error: o fichero local existe pero no se puet borrar"
+
+#: ../../locales/../src/engine/logging.cpp:213
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
+msgid "Error:"
+msgstr "Error:"
+
+#: resources.h:488
+msgid "Establish connection in a new tab"
+msgstr "Establir connexión en una nueva pestanya"
+
+#: resources.h:972
+msgid "Every month"
+msgstr "Cada mes"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Cada dos semanas"
+
+#: resources.h:966
+msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
+msgstr "Eixemplo: png \"c:\\fichero de programa\\visor\\visor.exe\" -open"
+
+#: resources.h:925
+msgid "Examples"
+msgstr "Eixemplos"
+
+#: resources.h:154
+msgid "Exe&cute"
+msgstr "Exe&cutar"
+
+#: ../../locales/../src/interface/updatewizard.cpp:328
+msgid "Executable"
+msgstr "Executable"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
+msgid "Executable contains no version info, cannot check for updates."
+msgstr ""
+"L'executable no contién información de versión, no se puet comprebar si bi "
+"ha actualizacions."
+
+#: resources.h:883
+msgid "Explorer"
+msgstr "Explorador"
+
+#: resources.h:304
+msgid "Export &Queue"
+msgstr "Exportar &coda"
+
+#: resources.h:303
+msgid "Export &Settings"
+msgstr "Exportar &opcions"
+
+#: resources.h:300
+msgid "Export settings"
+msgstr "Exportar opcions"
+
+#: resources.h:229
+msgid "F&ilter name:"
+msgstr "&Nombre d'o filtro:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:117
+msgid "FTP"
+msgstr "FTP"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Protocolo de tranferencia de fichers"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Protocolo de Transferencia de Fichers con zifrau opcional"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Protocolo de Transferencia de Fichers no seguro"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FTP Engine not initialized, can't connect"
+msgstr "O motor de FTP no ye inicializau, no se puet connectar"
+
+#: resources.h:768
+msgid "FTP Keep-alive"
+msgstr "FTP Keep-alive"
+
+#: resources.h:788
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:120
+msgid "FTP Proxy"
+msgstr "Proxy FTP"
+
+#: ../../locales/../src/interface/cmdline.cpp:21
+msgid "FTP URL"
+msgstr "URL d'o FTP"
+
+#: resources.h:696
+msgid ""
+"FTP uses secondary connections for data transfers. These additional "
+"connections can be established in two ways."
+msgstr ""
+"O FTP emplega connexions secundarias t'a transferencia de datos. Istas "
+"connexions adicionals se pueden establir de dos trazas."
+
+#: ../../locales/../src/engine/server.cpp:20
+msgid "FTPES - FTP over explicit TLS/SSL"
+msgstr "FTPES - FTP sobre TLS/SSL explicito"
+
+#: ../../locales/../src/engine/server.cpp:19
+msgid "FTPS - FTP over implicit TLS/SSL"
+msgstr "FTPS - FTP sobre TLS/SSL implicito"
+
+#: ../../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
+msgid "Failed to change directory"
+msgstr "S'ha produciu una error en cambiar de directorio"
+
+#: ../../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
+msgid "Failed to change language"
+msgstr "S'ha produciu una error en cambiar d'idioma"
+
+#: ../../locales/../src/interface/updatewizard.cpp:464
+msgid "Failed to check for newer version of FileZilla."
+msgstr ""
+"S'ha produciu una error en comprebar si existen nuevas versions de FileZilla."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
+msgid "Failed to copy or move sites"
+msgstr "S'ha produciu una error en copiar u mover puestos"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
+msgid "Failed to create backup copy of xml file"
+msgstr ""
+"S'ha produciu una error en creyar una copia de seguranza d'o fichero xml"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:797
+msgid "Failed to create listen socket, aborting"
+msgstr "S'ha produciu una error en creyar socket d'escuita, se ye cancelando"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
+msgid "Failed to create listening socket for active mode transfer"
+msgstr ""
+"S'ha produciu una error en creyar socket ta transferencia en modo activo"
+
+#: ../../locales/../src/interface/updatewizard.cpp:466
+msgid "Failed to download the latest version of FileZilla."
+msgstr "S'ha produciu una error en descargar a zaguera versión de FileZilla."
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
+msgid "Failed to get 'My Documents' path"
+msgstr "S'ha produciu una error en obtener a rota de 'Os míos Documentos'"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
+msgid "Failed to get desktop path"
+msgstr "S'ha produciu una error en obtener a rota d'o escritorio"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:956
+msgid "Failed to get peer address of control connection, connection closed."
+msgstr ""
+"S'ha produciu una error en obtener l'adreza homonima d'a connexión de "
+"control, a connexión ha estau zarrada."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:964
+msgid "Failed to get peer address of data connection, connection closed."
+msgstr ""
+"S'ha produciu una error en obtener l'adreza homonima d'a connexión de datos, "
+"a connexión ha estau zarrada."
+
+#: ../../locales/../src/interface/context_control.cpp:79
+msgid "Failed to initialize FTP engine"
+msgstr "S'ha produciu una error en inicializar o motor de FTP"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:313
+msgid "Failed to initialize TLS."
+msgstr "S'ha produciu una error en inicializar TLS."
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:173
+msgid "Failed to load panels, invalid resource files?"
+msgstr ""
+"S'ha produciu una error en cargar os panels, os fichers de recursos no son "
+"validos?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
+#, c-format
+msgid "Failed to load private key: %s"
+msgstr "S'ha produciu una error en cargar a clau privada: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
+#, c-format
+msgid "Failed to open \"%s\" for appending/writing"
+msgstr "S'ha produciu una error en ubrir \"%s\" ta adhibir u escribir"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
+#, c-format
+msgid "Failed to open \"%s\" for reading"
+msgstr "S'ha produciu una error en ubrir \"%s\" ta leyer"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:391
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:448
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "S'ha produciu una error en ubrir \"%s\" ta escribir"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:418
+msgid "Failed to parse returned path."
+msgstr "S'ha produciu una error en analisar a rota devuelta."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:321
+msgid "Failed to parse trusted root cert."
+msgstr "S'ha produciu una error en procesar o certificau radiz de confianza."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
+msgid "Failed to receive data"
+msgstr "S'ha produciu una error en recibir datos"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:194
+msgid "Failed to retrieve directory listing"
+msgstr "S'ha produciu una error en recuperar o listau d'o directorio"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:719
+msgid "Failed to retrieve external ip address, aborting"
+msgstr ""
+"S'ha produciu una error en recuperar l'adreza ip externa, se ye cancelando"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
+msgid "Failed to retrieve external ip address, using local address"
+msgstr ""
+"S'ha produciu una error en recuperar l'adreza ip externa, se ye emplegando "
+"l'adreza local"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
+msgid "Failed to retrieve local ip address."
+msgstr "S'ha produciu una error en recuperar l'adreza ip local."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:688
+msgid "Failed to retrieve local ip address. Aborting"
+msgstr ""
+"S'ha produciu una error en recuperar l'adreza ip local. Se ye abortando"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:616
+msgid "Failed to retrieve the external IP address."
+msgstr "S'ha produciu una error en recuperar l'adreza IP externa."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:307
+msgid "Failed to send command."
+msgstr "S'ha produciu una error en ninviar o comando."
+
+#: ../../locales/../src/interface/FileZilla.cpp:271
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language"
+msgstr ""
+"S'ha produciu una error en cambiar a l'idioma %s (%s), se ye emplegando "
+"l'idioma predeterminau de l'equipo"
+
+#: ../../locales/../src/interface/FileZilla.cpp:256
+#, c-format
+msgid ""
+"Failed to set language to %s (%s), using default system language (%s, %s)."
+msgstr ""
+"S'ha produciu una error en cambiar a l'idioma %s (%s), se ye emplegando "
+"l'idioma predeterminau de l'equipo (%s, %s)."
+
+#: ../../locales/../src/interface/FileZilla.cpp:244
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language."
+msgstr ""
+"S'ha produciu una error en cambiar a l'idioma %s (%s), se ye emplegando "
+"l'idioma predeterminau de l'equipo."
+
+#: ../../locales/../src/interface/FileZilla.cpp:273
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:53
+#, c-format
+msgid "Failed to set language to %s, using default system language"
+msgstr ""
+"S'ha produciu una error en establir l'idioma %s, se ye emplegando l'idioma "
+"predeterminau d'o sistema"
+
+#: ../../locales/../src/interface/FileZilla.cpp:252
+#, c-format
+msgid "Failed to set language to %s, using default system language (%s, %s)."
+msgstr ""
+"S'ha produciu una error en cambiar a l'idioma %s, se ye emplegando l'idioma "
+"predeterminau de l'equipo (%s, %s)."
+
+#: ../../locales/../src/interface/FileZilla.cpp:241
+#, c-format
+msgid "Failed to set language to %s, using default system language."
+msgstr ""
+"S'ha produciu una error en cambiar a l'idioma %s, se ye emplegando l'idioma "
+"predeterminau de l'equipo."
+
+#: ../../locales/../src/interface/settings/optionspage.cpp:215
+msgid "Failed to validate settings"
+msgstr "S'ha produciu una error en validar as configuracions"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1087
+msgid "Failed to verify peer certificate"
+msgstr "S'ha produciu una error en verificar o certificau d'o destín"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:566
+#, c-format
+msgid "Failed to write to file %s"
+msgstr "S'ha produciu una error en escribir o fichero %s"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
+msgid "Failed to write xml file"
+msgstr "S'ha produciu una error en escribir o fichero xml"
+
+#: ../../locales/../src/interface/queueview_failed.cpp:16
+msgid "Failed transfers"
+msgstr "Transferencias fallidas"
+
+#: resources.h:711
+msgid "Fall back to active mode"
+msgstr "Revertir ta lo modo activo"
+
+#: resources.h:379
+msgid "Fil&e:"
+msgstr "Fich&ero:"
+
+#: resources.h:236
+msgid "Fil&es"
+msgstr "Fich&ers"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:282
+msgid "File"
+msgstr "Fichero"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:124
+msgid "File Types"
+msgstr "Menas de fichero"
+
+#: ../../locales/../src/interface/import.cpp:108
+msgid "File does not contain any importable data."
+msgstr "O fichero no contién garra dato que se pueda importar."
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:132
+msgid "File editing"
+msgstr "Edición de fichero"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
+msgid "File exists"
+msgstr "O fichero existe"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:125
+msgid "File exists action"
+msgstr "Acción si lo fichero existe"
+
+#: resources.h:315
+msgid "File has changed"
+msgstr "O fichero ha cambiau"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:130
+msgid "File lists"
+msgstr "Listaus de fichers"
+
+#: ../../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
+msgid "File not found"
+msgstr "No s'ha trobau o fichero"
+
+#: resources.h:1029
+msgid "File search"
+msgstr "Busca de fichers"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:128
+msgid "File transfer aborted by user"
+msgstr "A transferencia ha estau interrumpida por l'usuario"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:118
+#, c-format
+msgid "File transfer aborted by user after transferring %s in %s"
+msgstr ""
+"A transferencia ha estau interrumpida por l'usuario dimpués de transferir %s "
+"en %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:139
+msgid "File transfer failed"
+msgstr "Ha fallau a transferencia de fichero"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:122
+#, c-format
+msgid "File transfer failed after transferring %s in %s"
+msgstr "Transferencia fallida dimpués de transferir %s en %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:134
+msgid "File transfer skipped"
+msgstr "Transferencia de fichero omitida"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:132
+msgid "File transfer successful"
+msgstr "Transferencia de fichero correcta"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:115
+#, c-format
+msgid "File transfer successful, transferred %s in %s"
+msgstr "Transferencia de fichero correcta, transferidos %s en %s"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
+msgid "File transfers still in progress."
+msgstr "Encara bi ha transferencias en progreso."
+
+#: resources.h:397
+msgid "File would transfer with ASCII data type."
+msgstr "O fichero se transferiría como tipo de datos ASCII."
+
+#: resources.h:398
+msgid "File would transfer with binary data type."
+msgstr "O fichero se transferiría como tipo de datos binario."
+
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FileZilla Error"
+msgstr "Error de FileZilla"
+
+#: resources.h:733
+msgid ""
+"FileZilla can now test your configuration to ensure everything is configured "
+"properly."
+msgstr ""
+"FileZilla puet comprebar agora a suya configuración ta asegurar que tot ye "
+"configurau adequadament."
+
+#: resources.h:487
+msgid "FileZilla is already connected to a server."
+msgstr "FileZilla ya ye connectau a un servidor."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
+msgid "FileZilla needs to be restarted for the language change to take effect."
+msgstr "Cal reenchegar FileZilla ta que o cambeo d'idioma faiga efecto."
+
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Actualizacions de FileZilla"
+
+#: resources.h:534
+msgid "Filelist status &bars"
+msgstr "&Barras d'estau de lista de fichers"
+
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
+msgid "Filename"
+msgstr "Nombre de fichero"
+
+#: resources.h:527
+msgid "Filename &filters..."
+msgstr "&Filtros de nombre de fichero..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
+#, c-format
+msgid "Filename cannot be constructed for directory %s and filename %s"
+msgstr ""
+"No se puet construir o nombre de fichero t'o directorio %s y nombre de "
+"fichero %s"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
+msgid "Filename invalid"
+msgstr "O nombre de fichero no ye valido"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"O nombre de fichero no puet contener dengún d'os siguients caracters: / \\ : "
+"* ? \" < > |"
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "Filename unchanged"
+msgstr "O nombre de fichero no ha cambiau"
+
+#: resources.h:317 resources.h:983
+msgid "Filename:"
+msgstr "Nombre de fichero:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+msgid "Filenames may not contain any of the following characters: / * ? < > |"
+msgstr ""
+"Os nombre de fichero no puet contener dengún d'os siguients caracters: / * ? "
+"< > |"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+msgid ""
+"Filenames may not contain any of the following characters: / \\ : * ? \" < > "
+"|"
+msgstr ""
+"O nombre de fichero no puet contener dengún d'os siguients caracters: / \\ : "
+"* ? \" < > |"
+
+#: resources.h:345
+msgid "Files currently being edited"
+msgstr "Fichers que son estando editaus actualment"
+
+#: ../../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
+msgid "Filesize"
+msgstr "Grandaria d'o fichero"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:129
+msgid "Filesize format"
+msgstr "Formato de grandaria de fichero"
+
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:382
+msgid "Filetype"
+msgstr "Mena de fichero"
+
+#: resources.h:967
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:133
+msgid "Filetype associations"
+msgstr "Asociacions de mena de fichero"
+
+#: resources.h:235
+msgid "Filter applies to:"
+msgstr "Filtros aplicaus a:"
+
+#: resources.h:840
+msgid "Filter invalid characters in filenames"
+msgstr "Filtrar caracters invalidos en os nombres de fichero"
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter name already exists"
+msgstr "O nombre d'o filtro ya existe"
+
+#: resources.h:231
+msgid "Filter out items matching all of the following"
+msgstr "Filtrar os elementos que quadren con totz os siguients"
+
+#: resources.h:232
+msgid "Filter out items matching any of the following"
+msgstr "Filtrar os elementos que quadren con belún d'os siguients"
+
+#: resources.h:233
+msgid "Filter out items matching none of the following"
+msgstr "Filtrar os elementos que no quadren con dengún d'os siguients"
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Filter set already exists"
+msgstr "O conchunto de filtros ya existe"
+
+#: resources.h:1022
+msgid "Filter the directory listings"
+msgstr "Filtrar o listau d'o directorio"
+
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter validation failed"
+msgstr "S'ha produciu una error en a validación d'o filtro"
+
+#: resources.h:10 resources.h:38
+msgid "Fingerprint (MD5):"
+msgstr "Ditalada (MD5):"
+
+#: resources.h:11 resources.h:39
+msgid "Fingerprint (SHA-1):"
+msgstr "Ditalada (SHA-1):"
+
+#: resources.h:189 resources.h:202
+msgid "Fingerprint:"
+msgstr "Ditalada:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:42
+msgid "Firewall and router configuration wizard"
+msgstr "Asistent de configuración de tallafuegos y enrotador"
+
+#: resources.h:751
+msgid ""
+"For more detailed information about what these options do, please run the "
+"network configuration wizard."
+msgstr ""
+"Ta información mas detallada sobre qué fa cada opción, executa l'asistent de "
+"configuración de ret."
+
+#: resources.h:728
+msgid "For reliability you should specify a range of at least 10 ports."
+msgstr ""
+"Ta mas fiabilidat, habría d'especificar un intervalo d'a lo menos 10 puertos."
+
+#: ../../locales/../src/interface/Options.cpp:215
+msgid ""
+"For this session the default settings will be used. Any changes to the "
+"settings will not be saved."
+msgstr ""
+"Ta ista sesión s'emplegarán os achustes predeterminaus. No s'alzará dengún "
+"cambeo d'os achustes."
+
+#: resources.h:118
+msgid "Force &UTF-8"
+msgstr "Forzar &UTF-8"
+
+#: resources.h:561
+msgid "Force showing &hidden files"
+msgstr "Forzar l'amostrar os f&ichers amagaus"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:676
+msgid "Force showing hidden files"
+msgstr "Forzar l'amostrar os fichers amagaus"
+
+#: resources.h:795
+msgid "Format specifications:"
+msgstr "Especificacions d'o formato:"
+
+#: resources.h:965
+msgid "Format: Extension followed by properly quoted command and arguments."
+msgstr ""
+"Formato: Extensión siguida por o comando correctament citau y argumentos."
+
+#: resources.h:479
+msgid "Further documentation"
+msgstr "Documentación adicional"
+
+#: resources.h:87
+msgid "General"
+msgstr "Cheneral"
+
+#: ../../locales/../src/engine/proxy.cpp:430
+msgid "General SOCKS server failure"
+msgstr "Fallo cheneral de servidor SOCKS"
+
+#: resources.h:813
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:122
+msgid "Generic proxy"
+msgstr "Servidor chenerico"
+
+#: resources.h:717
+msgid "Get external IP address from the following URL:"
+msgstr "Obtener l'adreza IP externa dende la siguient URL:"
+
+#: resources.h:480
+msgid "Getting help"
+msgstr "Obtener aduya"
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Given filterset name already exists, overwrite filter set?"
+msgstr ""
+"Ya existe un conchunto de filtros con ixe nombre, deseya sobrescribir-lo?"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
+msgid "Global bookmarks"
+msgstr "Marcapachinas globals"
+
+#: resources.h:175
+msgid "GnuTLS:"
+msgstr "GnuTLS:"
+
+#: resources.h:147
+msgid "Group permissions"
+msgstr "Premisos de colla"
+
+#: resources.h:617
+msgid "H&igh"
+msgstr "A&lta"
+
+#: ../../locales/../src/engine/server.cpp:18
+msgid "HTTPS - HTTP over TLS"
+msgstr "HTTPS - HTTP sobre TLS/SSL"
+
+#: resources.h:350
+msgid "Hash:"
+msgstr "Hash:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+msgid "Hidden"
+msgstr "Amagau"
+
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
+msgid "High"
+msgstr "Alto"
+
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
+msgid "Highest"
+msgstr "O mas alto"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
+msgid "Highest available port has to be a number between 1024 and 65535."
+msgstr "O puerto mas alto disponible debe estar un numero entre 1024 y 65535."
+
+#: resources.h:219
+msgid ""
+"Hold the shift key to toggle the filter state on both sides simultaneously."
+msgstr ""
+"Mantener preta a tecla mayusclas ta cambiar o estau d'o filtro en totz dos "
+"costaus simultaneament."
+
+#: resources.h:166
+msgid "Homepage:"
+msgstr "Pachina prencipal:"
+
+#: resources.h:352
+msgid "Host key fingerprint:"
+msgstr "Ditalada d'a clau d'o servidor:"
+
+#: resources.h:195
+msgid "Host key mismatch"
+msgstr "A clau de puesto no coincide"
+
+#: ../../locales/../src/engine/server.cpp:168
+msgid "Host starts with '[' but no closing bracket found."
+msgstr "O servidor prencipia con '[' pero no s'ha trobau a zarrada de gafet."
+
+#: ../../locales/../src/engine/proxy.cpp:439
+msgid "Host unreachable"
+msgstr "No se puet alcanzar o servidor"
+
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
+msgid "Host:"
+msgstr "Puesto:"
+
+#: resources.h:105
+msgid "Hours,"
+msgstr "Horas,"
+
+#: resources.h:914
+msgid "I&SO 8601 (example: 15:47)"
+msgstr "I&SO 8601 (por eixemplo: 15:47)"
+
+#: resources.h:755
+msgid ""
+"If no data is sent or received during an operation for longer than the "
+"specified time, the connection will be closed and FileZilla will try to "
+"reconnect."
+msgstr ""
+"Si no se ninvian u reciben datos en una operación entre un tiempo superior a "
+"lo especificau, a connexión se zarrará y FileZilla intentará reconnectar-se."
+
+#: resources.h:999
+msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
+msgstr ""
+"Si quiers informar d'errors, ninvia rechistros con un libel de depuración "
+"\"Verboso\"."
+
+#: resources.h:708
+msgid ""
+"If the automatic test at the end of this wizard succeeds, but you cannot "
+"transfer files to a particular server, the server might be misconfigured and "
+"you should try active mode. You can set the transfer mode on a per-server "
+"basis in the Site Manager."
+msgstr ""
+"Si la comprebación automatica a la fin de l'asistent tien exito, pero no se "
+"pueden transferir fichers ta un servidor en concreto, ye posible que o "
+"servidor siga mal configurau y habrías de prebar con o modo activo. Puet "
+"configurar o modo de transferencia individualment por servidor en o chestor "
+"de Puestos."
+
+#: resources.h:703
+msgid ""
+"If the fallback option is enabled, you will be able to connect to "
+"misconfigured servers which reject the selected transfer mode."
+msgstr ""
+"Si lo modo alternativo ye activau, te será posible connectar a servidors mal "
+"configuraus que refusen o modo de transferencia seleccionau."
+
+#: resources.h:198
+msgid ""
+"If the host key change was not expected, please contact the server "
+"administrator."
+msgstr ""
+"Si no asperabas o cambeo de clau d'o servidor, por favor, contacta con o "
+"suyo administrador."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:554
+msgid ""
+"If the problem persists, some router and/or firewall keeps blocking "
+"FileZilla."
+msgstr ""
+"Si o problema persiste, bell enrotador y/u tallafuegos contina bloqueyando "
+"lo FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:563
+msgid ""
+"If the problem persists, some router and/or firewall keeps interrupting the "
+"connection."
+msgstr ""
+"Si o problema persiste, bell enrotador y/u tallafuegos contina interrumpindo "
+"a connexión."
+
+#: resources.h:988
+msgid ""
+"If the size of the logfile reaches the limit, it gets renamed by adding \".1"
+"\" to the end of the filename (possibly overwriting older logfiles) and a "
+"new file gets created."
+msgstr ""
+"Si a grandaria d'o fichero de rechistro aconsigue o limite, se renombra "
+"adhibindo \".1\" a la fin d'o nombre de fichero (posiblement sobreescribindo "
+"antigos fichers de rechistro) y se creya un nuevo fichero."
+
+#: resources.h:465
+msgid ""
+"If the symlink points to a directory, FileZilla can either delete the "
+"symbolic link or remove the contents of the linked directory."
+msgstr ""
+"Si o vinclo simbolico referencia a un directorio, FileZilla puet bien borrar "
+"o vinclo simbolico u borrar o conteniu d'o directorio referenciau."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:624
+msgid ""
+"If this problem persists, please contact your router or firewall "
+"manufacturer for a solution."
+msgstr ""
+"Si o problema persiste, contacta por favor con o fabricant d'o tuyo "
+"enrotador u tallafuegos ta demandar-le una solución."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:582
+msgid "If this problem stays, please contact your router manufacturer."
+msgstr ""
+"Si o problema persiste, contacta por favor con o fabricante d'o tuyo "
+"enrotador."
+
+#: resources.h:288 resources.h:877
+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 ""
+"Si yes emplegando 'sobreescribir si ye mas recient', o reloch d'o tuyo "
+"sistema ha d'estar sincronizau con o d'o servidor. Si as horas son diferents "
+"(por eixemplo por diferencia de fusos horarios), especifica a esferencia "
+"d'horas en o chestor de puestos."
+
+#: resources.h:938
+msgid ""
+"If using timestamp based comparison, consider two files equal if their "
+"timestamp difference does not exceed this threshold."
+msgstr ""
+"Si se ye emplegando comparanza basada en a calendata d'edición, considerar "
+"dos fichers iguals si a diferencia entre calendatas no excedeixe iste umbral."
+
+#: resources.h:953
+msgid "If you change the language, you should restart FileZilla."
+msgstr "Si cambeas l'idioma, te cal reenchegar o FileZilla."
+
+#: resources.h:734
+msgid ""
+"If you click on test, FileZilla will connect to probe.filezilla-project.org "
+"and will perform some simple tests."
+msgstr ""
+"Si pretas Prebar, FileZilla se connectará a probe.filezilla-project.org y "
+"levará a cabo unas quantas comprebacions simplas."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
+msgid "If you close FileZilla, your changes will be lost."
+msgstr "Si zarras FileZilla, os tuyos cambeos se perderán."
+
+#: resources.h:853
+msgid ""
+"If you enter the wrong filetypes, those files may get corrupted when "
+"transferred."
+msgstr ""
+"Si escribes menas de fichers incorrectos, ye posible que se corrompan en "
+"estar transferius."
+
+#: resources.h:735
+msgid "If you get any errors, your configuration is not correct."
+msgstr "Si obtienes bella error, a tuya configuración no ye correcta."
+
+#: resources.h:767
+msgid ""
+"If you have problems to retrieve directory listings or to transfer files, "
+"try to change the default transfer mode."
+msgstr ""
+"Si tiens problemas ta recuperar os directorios u transferir fichers, prueba "
+"a cambiar ta lo modo de transferencia predeterminau."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:569
+msgid ""
+"If you keep having problems with a specific server, the server itself or a "
+"remote router or firewall might be misconfigured. In this case try to toggle "
+"passive mode and contact the server administrator for help."
+msgstr ""
+"Si continas tenendo problemas con un servidor en concreto, o servidor u "
+"belún enrotador remoto podrían estar malament configuraus. En iste caso, "
+"intenta alternar o modo pasivo y pide aduya a l'administrador d'o servidor."
+
+#: resources.h:694
+msgid ""
+"If you successfully complete the wizard and the final test succeeds, any "
+"firewalls and routers you have should be configured properly."
+msgstr ""
+"Si s'acaba l'asistent satisfactoriament y a comprebación final tien exito, "
+"qualsiquier tallafuegos y enrotadors que tiengas habrían d'estar configuraus "
+"apropiadament."
+
+#: resources.h:730
+msgid ""
+"If you use a firewall, make sure FileZilla is allowed to accept connection "
+"on all given ports."
+msgstr ""
+"Si emplegas un tallafuegos, asegura-te que a FileZilla le se permiten as "
+"connexions dentrants en totz os puertos trigaus."
+
+#: resources.h:729
+msgid ""
+"If you use a router, make sure all these ports are forwarded to the machine "
+"you're running FileZilla on."
+msgstr ""
+"Si emplegas un enrotador, asegura-te que totz istos puertos sigan "
+"reendrezaus ent'a maquina an se ye executando FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:595
+msgid ""
+"If your router keeps changing the IP address, please contact your router "
+"manufacturer."
+msgstr ""
+"Si l'enrotador contina modificando l'adreza IP, contacta con o fabricant."
+
+#: ../../locales/../src/interface/import.cpp:96
+msgid "Import data from older version"
+msgstr "Importar datos dende una versión más viella"
+
+#: resources.h:307
+msgid "Import settings"
+msgstr "Importar opcions"
+
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
+msgid "Import successful"
+msgstr "Importación satisfactoria"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
+msgid "Improperly quoted association."
+msgstr "L'asociación ye no metida correctament entre cometas."
+
+#: resources.h:722
+msgid ""
+"In active mode, FileZilla has to listen on a port for data transfers. You "
+"have to specify which ports FileZilla will use."
+msgstr ""
+"En o modo activo, FileZilla ha d'escuitar en un puerto ta transferir datos. "
+"Has d'especificar qué puertos emplegará FileZilla."
+
+#: resources.h:724
+msgid ""
+"In case you have a router, you will have to forward all available ports, as "
+"FileZilla has no influence on the ports your system chooses."
+msgstr ""
+"En o caso que tiengas un enrotador, habrá de reendrezar totz os puertos "
+"disponibles, ya que en dito caso FileZilla no puet trigar os puertos que "
+"s'emplegarán."
+
+#: resources.h:264
+msgid ""
+"In case you prefer automatic updates, you can enable automatic update checks "
+"in the settings dialog."
+msgstr ""
+"Si prefieres actualizacions automaticas, puetz activar a comprebación "
+"automatica en o dialogo de configuración."
+
+#: resources.h:712 resources.h:776
+msgid ""
+"In order to use active mode, FileZilla needs to know your external IP "
+"address."
+msgstr ""
+"Ta emplegar o modo activo, FileZilla ameneste conoixer a suya adreza IP "
+"externa."
+
+#: resources.h:697
+msgid ""
+"In passive mode, which is recommended for most users, FileZilla asks the "
+"server for a port and connects to the given port. Not much configuration has "
+"to be done for this."
+msgstr ""
+"En o modo pasivo, que ye o recomendau t'a mayoría d'os usuarios, FileZilla "
+"le pide un puerto a o servidor y se connecta ta ixe puerto. Ta ixo no cal "
+"configurar cosa."
+
+#: ../../locales/../src/engine/tlssocket.cpp:1101
+msgid ""
+"Incomplete chain, top certificate is not self-signed certificate authority "
+"certificate"
+msgstr ""
+"Cadena incompleta, o certificau radiz no ye auto-sinyau por una autoridat "
+"certificadera"
+
+#: ../../locales/../src/interface/QueueView.cpp:1047
+msgid "Incorrect password"
+msgstr "Clau incorrecta"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
+msgid "Initializing TLS..."
+msgstr "Se ye inicializando TLS..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "O servidor no ye seguro, no suporta FTP sobre TLS."
+
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:191
+msgid "Interactive"
+msgstr "Interactivo"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:126
+msgid "Interface"
+msgstr "Interfaz"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:219
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
+msgid "Interrupted by user"
+msgstr "Interrumpiu por l'usuario"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+msgid "Invalid Content-Length"
+msgstr "A capitera Content-Length no ye valida"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:623
+msgid "Invalid HTTP Response"
+msgstr "A respuesta HTTP no ye valida"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
+msgid ""
+"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
+"site manager to force UTF-8."
+msgstr ""
+"S'ha recibiu una seqüencia no valida de caracters, se desactiva UTF-8. "
+"Selecciona la opción UTF-8 en o chestor de puestos ta forzar UTF-8."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+msgid "Invalid chunk size"
+msgstr "A grandaria de trozo no ye valida"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:353
+#: ../../locales/../src/interface/netconfwizard.cpp:363
+#: ../../locales/../src/interface/netconfwizard.cpp:372
+msgid "Invalid data received"
+msgstr "Os datos recibius no son validos"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
+msgid "Invalid date"
+msgstr "A calendata no ye valida"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid "Invalid filename"
+msgstr "O nombre de fichero no ye valido"
+
+#: ../../locales/../src/engine/server.cpp:175
+msgid "Invalid host, after closing bracket only colon and port may follow."
+msgstr ""
+"O servidor no ye valido, dimpués d'o zarre de gafet nomás pueden siguir-le "
+"dos puntos y o puerto."
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "Invalid input"
+msgstr "A dentrada no ye valida"
+
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
+msgid "Invalid port given. The port has to be a value from 1 to 65535."
+msgstr ""
+"O puerto introduciu no ye valido. O puerto debe estar una valor entre 1 y "
+"65535."
+
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+msgid ""
+"Invalid protocol specified. Valid protocols are:\n"
+"ftp:// for normal FTP,\n"
+"sftp:// for SSH file transfer protocol,\n"
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
+msgstr ""
+"O protocolo especificau no ye valido. Os protocolos validos son:\n"
+"ftp:// ta un FTP normal,\n"
+"sftp:// ta o protocolo de transferencia de fichers SSH,\n"
+"ftps:// ta FTP sobre TLS (implicito) y\n"
+"ftpes:// ta FTP sobre TLS (explicito)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"O servidor no ye valido, dimpués d'o zarre de gafet nomás pueden siguir-le "
+"dos puntos y o puerto."
+
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Invalid regular expression in search conditions."
+msgstr "A expresión regular no ye valida en as condicions de busca."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:633
+msgid "Invalid response code"
+msgstr "O codigo de respuesta no ye valido"
+
+#: ../../locales/../src/interface/search.cpp:693
+#, c-format
+msgid "Invalid search conditions: %s"
+msgstr "As condicions de busca no son validas: %s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Invalid site path"
+msgstr "A rota d'o puesto no ye valida"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
+msgid "Invalid size in condition"
+msgstr "A grandaria no ye valida en a condición"
+
+#: ../../locales/../src/engine/server.cpp:138
+msgid "Invalid username given."
+msgstr "O nombre d'usuario introduciu no ye valido."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
+msgid "Jurisdiction country:"
+msgstr "País de churisdicción:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
+msgid "Jurisdiction locality:"
+msgstr "Localidat de churisdicción:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
+msgid "Jurisdiction state or province:"
+msgstr "Provincia de churisdicción:"
+
+#: resources.h:935
+msgid "Keep directories on top"
+msgstr "Meter os directorios alto"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:680
+msgid ""
+"Keep in mind that not all servers support this feature and may return "
+"incorrect listings if this option is enabled. Although FileZilla performs "
+"some tests to check if the server supports this feature, the test may fail."
+msgstr ""
+"Para cuenta que no totz os servidors permiten ista función y pueden retornar "
+"listaus incorrectos si ista opción ye activada. Encara que FileZilla realiza "
+"qualques prebas ta comprebar si o servidor permite ista función, a "
+"comprebación podría fallar."
+
+#: resources.h:347
+msgid "Key exchange"
+msgstr "Intercambeo de clau"
+
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Intercambeo de clau:"
+
+#: resources.h:620
+msgid "L&owest"
+msgstr "A mas bai&xa"
+
+#: resources.h:951
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:131
+msgid "Language"
+msgstr "Idioma"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
+msgid "Language changed"
+msgstr "Sh'ha cambiau l'idioma"
+
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:383
+msgid "Last modified"
+msgstr "Zaguera modificación"
+
+#: resources.h:880
+msgid "Layout"
+msgstr "Distribución"
+
+#: resources.h:826
+msgid "Limit for concurrent &downloads:"
+msgstr "Limite ta descargas simultanias:"
+
+#: resources.h:828
+msgid "Limit for concurrent &uploads:"
+msgstr "Limite ta puyadas simultanias:"
+
+#: resources.h:771
+msgid "Limit local ports"
+msgstr "&Limitar os puertos locals"
+
+#: resources.h:985
+msgid "Limit size of logfile"
+msgstr "Limite de grandaria t'o fichero de rechistro"
+
+#: resources.h:986
+msgid "Limit:"
+msgstr "Limite:"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+msgid "Line length exceeded"
+msgstr "S'ha excediu a longaria de linia"
+
+#: resources.h:177
+msgid "Linked against"
+msgstr "Vinclau contra"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:267
+msgid "Listen socket closed"
+msgstr "Socket d'escuita zarrau"
+
+#: ../../locales/../src/engine/logging.cpp:220
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
+msgid "Listing:"
+msgstr "Listau:"
+
+#: resources.h:774
+msgid "Lo&west available port:"
+msgstr "O p&uerto más baixo disponible"
+
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
+msgid "Local"
+msgstr "Local"
+
+#: resources.h:374
+msgid "Local file"
+msgstr "Fichero local"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:328
+msgid "Local file does not exist."
+msgstr "O fichero local no existe."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:323
+msgid "Local file is a directory instead of a regular file."
+msgstr "O fichero local ye un directorio en cuenta d'un fichero normal."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr "O fichero local no tien un nombre de fichero valido."
+
+#: resources.h:213
+msgid "Local filters:"
+msgstr "Filtros locals:"
+
+#: ../../locales/../src/interface/viewheader.cpp:360
+msgid "Local site:"
+msgstr "Puesto local:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+msgid "Locality:"
+msgstr "Localidat:"
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
+msgid "Log file"
+msgstr "Fichero de rechistro"
+
+#: resources.h:261
+msgid "Log of update check:"
+msgstr "Rechistrar comprebacions d'actualizacions"
+
+#: resources.h:980
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:140
+msgid "Logging"
+msgstr "Rechistro"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+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 ""
+"Os datos d'inicio de sesión contienen caracters que no son ASCII y lo "
+"servidor podría no estar compatible con UTF-8. No se puet tornar a lo chuego "
+"de caracters local ya que se ye emplegando un proxy."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
+msgid ""
+"Login data contains non-ASCII characters and server might not be UTF-8 "
+"aware. Trying local charset."
+msgstr ""
+"Os datos d'inicio de sesión contienen caracters que no son ASCII y lo "
+"servidor podría no estar compatible con UTF-8. se ye Prebando o chuego de "
+"caracters local."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
+msgid "Login sequence fully executed yet not logged in. Aborting."
+msgstr ""
+"A seqüencia d'inicio de sesión se ye executada completament pero no s'ha "
+"encetau sesión. Abortando."
+
+#: ../../locales/../src/interface/cmdline.cpp:103
+msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
+msgstr ""
+"O tipo de rechistro debe estar 'preguntar' u 'interactivo' (sin cometas)."
+
+#: ../../locales/../src/interface/cmdline.cpp:11
+#, c-format
+msgid ""
+"Logontype, can only be used together with FTP URL. Argument has to be either "
+"'%s' or '%s'"
+msgstr ""
+"O rechistro puet emplegar-se nomás que con una URL FTP. L'argumento ha "
+"d'estar bien '%s' u '%s'"
+
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
+msgid "Low"
+msgstr "Baixo"
+
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
+msgid "Lowest"
+msgstr "O mas baixo"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
+msgid "Lowest available port has to be a number between 1024 and 65535."
+msgstr "O puerto mas baixo disponible ha d'estar un numero entre 1024 y 65535."
+
+#: resources.h:25 resources.h:53
+msgid "MAC:"
+msgstr "MAC:"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
+msgid "Make sure the file can be accessed and is a well-formed XML document."
+msgstr ""
+"Asegura-te que se puet acceder a lo fichero y ye un documento XML bien "
+"formau."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+#, c-format
+msgid "Malformed chunk data: %s"
+msgstr "O trozo de datos ye mal formau: %s"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+#, c-format
+msgid "Malformed header: %s"
+msgstr "A capitera ye mal formada: %s"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:593
+msgid "Malformed reply, server not sending proper line endings"
+msgstr ""
+"A respuesta ye mal formada, o servidor no ye ninviando finals de linia "
+"adequaus"
+
+#: resources.h:404 ../../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
+msgid "Manual transfer"
+msgstr "Transferencia manual"
+
+#: resources.h:444
+msgid "Match all of the following"
+msgstr "Coincidir con todas as siguients"
+
+#: resources.h:445
+msgid "Match any of the following"
+msgstr "Coincidir con bella d'as siguients"
+
+#: resources.h:446
+msgid "Match none of the following"
+msgstr "No coincidir con denguna d'as siguients"
+
+#: resources.h:824
+msgid "Maximum simultaneous &transfers:"
+msgstr "Maximo de transferencias simultanias:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
+msgid "Message log"
+msgstr "Rechistro de mensaches"
+
+#: resources.h:891
+msgid "Message log position"
+msgstr "Posición d'o rechistro de mensaches"
+
+#: resources.h:987
+msgid "MiB"
+msgstr "MiB"
+
+#: resources.h:106
+msgid "Minutes"
+msgstr "Minutos"
+
+#: resources.h:368
+msgid "Move &down"
+msgstr "Bai&xar"
+
+#: resources.h:367
+msgid "Move &up"
+msgstr "P&uyar"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+msgid "My Computer"
+msgstr "O mío equipo"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
+msgid "My Documents"
+msgstr "Os míos documentos"
+
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
+msgid "My Sites"
+msgstr "Os míos puestos"
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
+msgid "N/a"
+msgstr "N/a"
+
+#: resources.h:409
+msgid "Name"
+msgstr "Nombre"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
+msgid "Name already exists"
+msgstr "O nombre ya existe"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+msgid "Name of bookmark already exists."
+msgstr "O nombre d'o marcapachinas ya existe."
+
+#: resources.h:129 resources.h:178
+msgid "Name:"
+msgstr "Nombre:"
+
+#: ../../locales/../src/interface/filteredit.cpp:349
+msgid "Need to enter filter name"
+msgstr "Cal escribir o nombre d'o filtro"
+
+#: ../../locales/../src/interface/search.cpp:683
+msgid "Need to enter valid remote path"
+msgstr "Cal escribir una rota remota valida"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
+msgid "Need to specify a character encoding"
+msgstr "Cal especificar una codificación de caracters"
+
+#: ../../locales/../src/engine/proxy.cpp:436
+msgid "Network unreachable"
+msgstr "No se puet alcanzar o ret"
+
+#: resources.h:969
+msgid "Never"
+msgstr "Nunca"
+
+#: resources.h:82
+msgid "New &Folder"
+msgstr "Nueva &carpeta"
+
+#: resources.h:511
+msgid "New &tab"
+msgstr "Nueva &pestanya"
+
+#: resources.h:83 resources.h:424
+msgid "New Book&mark"
+msgstr "Nuevo &marcapachinas"
+
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
+msgid "New bookmark"
+msgstr "Nuevo marcapachinas"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
+msgid "New directory"
+msgstr "Nueva carpeta"
+
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
+#, c-format
+msgid "New features and improvements in %s"
+msgstr "Nuevas caracteristicas y milloras en %s"
+
+#: ../../locales/../src/interface/filteredit.cpp:131
+msgid "New filter"
+msgstr "Nuevo filtro"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
+msgid "New folder"
+msgstr "Nueva carpeta"
+
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
+msgid "New site"
+msgstr "Nuevo puesto"
+
+#: resources.h:889
+msgid "Next to the transfer queue"
+msgstr "Amán d'a coda de transferencia"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+msgid "No"
+msgstr "No"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "No category to export selected"
+msgstr "No bi ha categoría d'exportación seleccionada"
+
+#: ../../locales/../src/interface/QueueView.cpp:2286
+msgid "No command given, aborting."
+msgstr "No s'ha dau garra comando, se ye abortando."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
+msgid "No external IP address set, trying default."
+msgstr ""
+"No s'ha configurau l'adreza IP externa, se ye intentando con a valura "
+"predeterminada."
+
+#: ../../locales/../src/interface/edithandler.cpp:1227
+msgid "No files are currently being edited."
+msgstr "Actualment no se son editando fichers."
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "No filter name given"
+msgstr "No s'ha dau garra nombre a lo filtro"
+
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
+msgid "No host given, please enter a host."
+msgstr "No has especificau un puesto, por favor mete un."
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
+msgid "No images available"
+msgstr "No bi ha imachens disponibles"
+
+#: ../../locales/../src/interface/QueueView.cpp:3152
+msgid "No more files in the queue!"
+msgstr "No bi ha mas fichers en a coda"
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "No name for the filterset given."
+msgstr "No s'ha dau un nombre a lo conchunto de filtros."
+
+#: resources.h:440
+msgid "No program associated with filetype"
+msgstr "No bi ha programa asociau con a mena de fichero"
+
+#: resources.h:430
+#, c-format
+msgid "No program has been associated to edit files with the extension '%s'."
+msgstr "No s'ha asociau garra programa ta editar fichers con a extensión '%s'"
+
+#: ../../locales/../src/interface/search.cpp:541
+msgid "No search results"
+msgstr "No bi ha resultaus de busca"
+
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
+msgid "No sites available"
+msgstr "No bi ha puestos disponibles"
+
+#: ../../locales/../src/engine/proxy.cpp:404
+msgid "No supported SOCKS5 auth method"
+msgstr "Metodo d'autenticación SOCKS5 no admitiu"
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "No username given."
+msgstr "No s'ha dau garra nombre"
+
+#: resources.h:945 resources.h:950
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
+msgid "None"
+msgstr "Dengún"
+
+#: resources.h:384
+msgid "None selected yet"
+msgstr "Garra seleccionau encara"
+
+#: resources.h:837 ../../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:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+msgid "Normal"
+msgstr "Normal"
+
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
+msgid "Not all items could be requeued for viewing/editing."
+msgstr "No totz os elementos podrán tornar a la coda ta veyer-se u editar-se."
+
+#: ../../locales/../src/interface/state.cpp:199
+#: ../../locales/../src/interface/state.cpp:527
+msgid "Not connected"
+msgstr "No yes connectau"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
+msgid "Not connected to any server"
+msgstr "No yes connectau a garra servidor"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:566
+msgid "Not connected to any server."
+msgstr "No yes connectau a garra servidor."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:27
+msgid "Not connected."
+msgstr "No yes connectau."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:678
+msgid "Note that this feature is only supported using the FTP protocol."
+msgstr ""
+"Tien en cuenta que ista función solament ye disponible emplegando lo "
+"protocolo FTP."
+
+#: resources.h:805
+msgid "Note: This only works with plain, unencrypted FTP connections."
+msgstr "Nota: Isto solament funciona con connexions FTP simplas, sin zifrar."
+
+#: resources.h:822
+msgid "Note: Using a generic proxy forces passive mode on FTP connections."
+msgstr ""
+"Nota: Emplegar un proxy chenerico obliga a lo modo pasivo en as connexions "
+"FTP."
+
+#: resources.h:924
+msgid "Number of decimal places:"
+msgstr "Numero de posicions decimals:"
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
+msgid "Number of retries has to be between 0 and 99."
+msgstr "O numero de reintentos ha d'estar entre 0 y 99."
+
+#: resources.h:343
+msgid "O&pen file"
+msgstr "U&brir o fichero."
+
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
+msgid "OK"
+msgstr "Acceptar"
+
+#: resources.h:704
+msgid ""
+"On the following pages, the selected transfer mode will be configured, as "
+"well as the fallback mode if enabled."
+msgstr ""
+"En as pachinas siguients, se configurará o modo de transferencia "
+"seleccionau, asinas como lo modo alternativo, si se ye activau."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+msgid "Once"
+msgstr "Una vez"
+
+#: resources.h:970
+msgid "Once a week"
+msgstr "Una vez a la semana"
+
+#: resources.h:673
+msgid "Open directory in system's file manager"
+msgstr "Ubrir directorio en o chestor d'o sistema de fichers"
+
+#: resources.h:1001
+msgid "Open the Site Manager"
+msgstr "Ubrir o chestor de puestos"
+
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Ubrir o chestor de puestos."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Ubrir o chestor de puestos. Fe clic dreito ta veyer un listau de puestos."
+
+#: resources.h:581
+msgid "Open the file."
+msgstr "Ubrir o fichero."
+
+#: resources.h:524
+msgid "Open the settings dialog of FileZilla"
+msgstr "Ubrir o dialogo de opcions de FileZilla"
+
+#: resources.h:319
+msgid "Opened as:"
+msgstr "Ubierto como:"
+
+#: ../../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
+msgid "Opening failed"
+msgstr "S'ha produciu una error en ubrir"
+
+#: resources.h:512
+msgid "Opens a new tab"
+msgstr "Ubre una nueva pestanya"
+
+#: resources.h:509
+msgid "Opens the Site Manager"
+msgstr "Ubre o chestor de Puestos"
+
+#: resources.h:1023
+msgid ""
+"Opens the directory listing filter dialog. Right-click to toggle filters."
+msgstr ""
+"Ubrir a finestra de filtro de listau de directorios. Fe clic dreito ta "
+"alternar filtros."
+
+#: resources.h:181
+msgid "Operating system"
+msgstr "Sistema operativo"
+
+#: ../../locales/../src/interface/FileZilla.cpp:310
+msgid "Operating system problem detected"
+msgstr "S'ha detectau un problema d'o sistema operativo"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
+msgid "Organization:"
+msgstr "Organización:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
+msgid "Other:"
+msgstr "Atro:"
+
+#: resources.h:750
+msgid "Overview"
+msgstr "Anvista previa"
+
+#: resources.h:68
+msgid "Overwrite &if source newer"
+msgstr "Sobrescribir s&i l'orichen ye más recient"
+
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
+msgid "Overwrite file"
+msgstr "Sobrescribir fichero"
+
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
+msgid "Overwrite file if size differs"
+msgstr "Sobrescribir si tienen distinta grandaria"
+
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
+msgid "Overwrite file if size differs or source file is newer"
+msgstr ""
+"Sobrescribir o fichero si tienen distinta grandaria u lo fichero orichen ye "
+"más recient"
+
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
+msgid "Overwrite file if source file newer"
+msgstr "Sobrescribir o fichero si lo fichero orichen ye mas recient"
+
+#: resources.h:69
+msgid "Overwrite if &different size"
+msgstr "Sobrescribir si tienen &distinta grandaria"
+
+#: resources.h:70
+msgid "Overwrite if different si&ze or source newer"
+msgstr "Sobrescribir si tienen distinta &grandaria u l'orichen ye más recient"
+
+#: resources.h:143
+msgid "Owner permissions"
+msgstr "Premisos de propietario"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:377
+#: ../../locales/../src/interface/search.cpp:385
+msgid "Owner/Group"
+msgstr "Propietario/grupo"
+
+#: resources.h:895
+msgid ""
+"P&revent system from entering idle sleep during transfers and other "
+"operations"
+msgstr ""
+"E&vitar que o sistema dentre en aspera (stand-by) entre a transferencia y "
+"atras operacions"
+
+#: resources.h:802 resources.h:818
+#, no-c-format
+msgid "P&roxy host:"
+msgstr "Servidor p&roxy:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:488
+msgid "PORT command tainted by router or firewall."
+msgstr "Comando PORT contaminau por l'enrotador u lo tallafuegos"
+
+#: resources.h:764
+msgid "Pa&ssive (recommended)"
+msgstr "Pa&sivo (recomendau)"
+
+#: ../../locales/../src/interface/updatewizard.cpp:332
+msgid "Package"
+msgstr "Paquet"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
+msgid "Parameter not a valid URL"
+msgstr "O parametro no ye una URL valida"
+
+#: resources.h:94 resources.h:393 resources.h:742
+msgid "Pass&word:"
+msgstr "Contra&senya:"
+
+#: resources.h:700
+msgid "Passive (recommended)"
+msgstr "Pasivo (recomendau)"
+
+#: resources.h:784
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:119
+msgid "Passive mode"
+msgstr "Modo pasivo"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:588
+#: ../../locales/../src/interface/netconfwizard.cpp:601
+#: ../../locales/../src/interface/netconfwizard.cpp:612
+msgid "Passive mode has been set as default transfer mode."
+msgstr ""
+"O modo pasivo ha estau establiu como modo de transferencia predeterminau."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
+msgid "Password required"
+msgstr "Clau requerida"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
+#: ../../locales/../src/interface/search.cpp:380
+msgid "Path"
+msgstr "Rota"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
+#, c-format
+msgid "Path cannot be constructed for directory %s and subdir %s"
+msgstr "No se puet construir a rota t'o directorio %s y lo subdirectorio %s"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+#, fuzzy
+msgid "Path not found:"
+msgstr "No s'ha trobau o fichero"
+
+#: resources.h:411
+msgid "Paths"
+msgstr "Rotas"
+
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
+msgid "Pending removal"
+msgstr "En aspera ta borrar"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
+msgid "Permission"
+msgstr "Premiso"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:376
+#: ../../locales/../src/interface/search.cpp:384
+msgid "Permissions"
+msgstr "Premisos"
+
+#: resources.h:180
+msgid "Platform:"
+msgstr "Plataforma:"
+
+#: resources.h:260
+msgid ""
+"Please check http://filezilla-project.org for the most recent version of "
+"FileZilla."
+msgstr ""
+"Por favor ve ta http://filezilla-project.org ta obtener a versión mas "
+"recient de FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:553
+msgid ""
+"Please check on http://filezilla-project.org/probe.php that the server is "
+"running and carefully check your settings again."
+msgstr ""
+"Por favor compreba en http://filezilla-project.org/probe.php que o servidor "
+"ye activo y torna a comprebar cudiadosament a configuración."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1091
+msgid ""
+"Please check the package manager of your system for an updated package or "
+"visit http://filezilla-project.org to download the source code of FileZilla."
+msgstr ""
+"Por favor compreba con o chestor de paquetz d'o suyo sistema si bi ha un "
+"paquet más recient u visita http://filezilla-project.org ta descargar o "
+"codigo fuent de FileZilla."
+
+#: resources.h:706
+msgid ""
+"Please configure any firewalls and routers so that FileZilla can establish "
+"outgoing connection to arbitrary ports."
+msgstr ""
+"Por favor configura os enrotadors y tallafuegos de traza que FileZilla pueda "
+"establir connexions salients enta puertos arbitrarios."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:623
+msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
+msgstr ""
+"Por favor desactiva en o suyo enrotador configuracions tals como 'Modo DMZ' "
+"u 'Modo de chuegos'."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:562
+msgid ""
+"Please ensure you have a stable internet connection and carefully check your "
+"settings again."
+msgstr ""
+"Por favor asegura-te que tiens una connexión a internet estable y compreba "
+"de nuevo os tuyos achustes cudiadosament."
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
+msgid "Please enter a custom date format."
+msgstr "Por favor, mete un formato de calendata personalizau."
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
+msgid "Please enter a custom time format."
+msgstr "Por favor, mete un formato d'hora personalizau."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr ""
+"Por favor, mete una calendata en formato AAAA-MM-DD como por eixemplo 2012-"
+"12-21."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#, c-format
+msgid "Please enter a download speed limit greater or equal to 0 %s/s."
+msgstr ""
+"Por favor, mete un limite de velocidat de descarga igual u superior a 0 %s/s."
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+msgid "Please enter a name for the new filter."
+msgstr "Por favor, mete un nuevo nombre t'o nuevo filtro."
+
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Please enter a new name for the copied filter."
+msgstr "Por favor, mete un nuevo nombre t'o filtro copiau."
+
+#: ../../locales/../src/interface/filter.cpp:403
+#, c-format
+msgid "Please enter a new name for the filter set \"%s\""
+msgstr "Por favor, mete un nuevo nombre t'o conchunto de filtros \"%s\""
+
+#: ../../locales/../src/interface/filteredit.cpp:196
+msgid "Please enter a new name for the filter."
+msgstr "Por favor, mete un nuevo nombre t'o filtro ."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent "
+"downloads."
+msgstr ""
+"Por favor mete un numero entre 0 y 10 t'o numero de descargas simultanias."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent uploads."
+msgstr ""
+"Por favor, mete un numero entre 0 y 10 t'o numero de puyadas simultanias."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
+msgid ""
+"Please enter a number between 1 and 10 for the number of concurrent "
+"transfers."
+msgstr ""
+"Por favor, mete un numero entre 1 y 10 t'o numero de transferencias "
+"simultanias."
+
+#: resources.h:126
+msgid "Please enter a password for this server:"
+msgstr "Por favor, mete una clau ta iste servidor:"
+
+#: ../../locales/../src/interface/QueueView.cpp:2275
+msgid ""
+"Please enter a path and executable to run.\n"
+"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
+"You can also optionally specify program arguments."
+msgstr ""
+"Por favor, mete a rota y o comando que executar.\n"
+"P. eix. c:\\una_rota\\fichero.exe baixo MS Windows u /unaruta/fichero baixo "
+"Unix.\n"
+"Opcionalment tamién puetz especificar argumentos."
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
+msgid ""
+"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
+msgstr ""
+"Por favor, mete un tiempo d'aspera entre 5 y 9999 segundos, u 0 ta "
+"desactivar o tiempo d'aspera."
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Please enter a unique name for this filter set"
+msgstr "Por favor, mete un nombre unico ta iste conchunto de filtros"
+
+#: resources.h:127
+msgid "Please enter a username for this server:"
+msgstr "Por favor, mete un nombre d'usuario ta iste servidor:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:182
+msgid "Please enter a valid portrange."
+msgstr "Por favor, mete un intervalo de puertos valido."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:161
+msgid "Please enter an URL where to get your external address from"
+msgstr "Por favor, mete una URL d'án se pueda obtener a tuya adreza externa"
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+#, c-format
+msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
+msgstr ""
+"Por favor, mete un limite de velocidat de puyada igual u superior a 0 %s/s."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:578
+msgid ""
+"Please enter raw FTP command.\n"
+"Using raw ftp commands will clear the directory cache."
+msgstr ""
+"Por favor, mete o comando FTP.\n"
+"En emplegar comandos FTP se vuedará la cache de directorios."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+msgid "Please enter the name of the directory which should be created:"
+msgstr "Por favor, mete o nombre d'o directorio que cal creyar:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Por favor, mete o nombre d'o fichero que cal creyar:"
+
+#: resources.h:128
+msgid "Please enter username and password for this server:"
+msgstr "Por favor, mete un nombre d'usuario y una clau ta iste servidor:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:142
+msgid "Please enter your external IP address"
+msgstr "Por favor, mete a tuya adreza IP externa"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:593
+#: ../../locales/../src/interface/netconfwizard.cpp:606
+msgid ""
+"Please enter your external IP address on the active mode page of this "
+"wizard. In case you have a dynamic address or don't know your external "
+"address, use the external resolver option."
+msgstr ""
+"Por favor, mete a tuya adreza IP externa en a pachina de modo activo d'o "
+"asistent. En caso que tiengas una adreza dinamica u que no la conoixcas, "
+"emplega la opción de resolución externa."
+
+#: resources.h:693
+msgid ""
+"Please follow the instructions carefully, as wrong configuration will "
+"prevent successful FTP connections."
+msgstr ""
+"Por favor, sigue as instruccions cudiadosament, pus una configuración "
+"erronia te impedirá fer connexions FTP exitosas."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:617
+msgid ""
+"Please make sure FileZilla is allowed to establish outgoing connections and "
+"make sure you typed the address of the address resolver correctly."
+msgstr ""
+"Por favor, asegura-te que a FileZilla le se permite establir connexions "
+"salients y asegura-te que has escrito correctament l'adreza d'o servidor de "
+"resolución d'adrezas."
+
+#: ../../locales/../src/interface/FileZilla.cpp:262
+msgid "Please make sure the requested locale is installed on your system."
+msgstr ""
+"Por favor asegura-te que l'idioma solicitau ye instalau en o tuyo equipo."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:594
+msgid ""
+"Please make sure your router is using the latest available firmware. "
+"Furthermore, your router has to be configured properly. You will have to use "
+"manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
+"'game mode'."
+msgstr ""
+"Por favor asegura-te que o tuyo enrotador ye emplegando o firmware "
+"disponible mas recient. Amás, o tuyo enrotador tien que estar correctament "
+"configurau. Habrá de fer redirección manual de puertos. No configures o tuyo "
+"enrotador en o modo denominau 'DMZ' u 'de chuegos'."
+
+#: resources.h:707
+msgid ""
+"Please note that FileZilla has no influence on the port the server chooses. "
+"So the server might choose a port which your firewall thinks is only used by "
+"trojans or other malware. This might raise a false alarm you can safely "
+"discard."
+msgstr ""
+"Por favor, para cuenta que FileZilla no puet influir en o puerto que o "
+"servidor triga. Asinas pues o servidor podría trigar un puerto que o tuyo "
+"enrotador estima que solament s'emplega ta troyanos u código malicioso. Ixo "
+"podría ocasionar una falsa alarma que puetz inorar tranquilament."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:728
+msgid ""
+"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
+"servers only works if they support the MFMT command."
+msgstr ""
+"Por favor, tien en cuenta que preservar a calendata y a hora en as puyadas a "
+"servidors FTP, FTPS y FTPES solament funcionará si admiten o comando MFMT."
+
+#: resources.h:761
+msgid ""
+"Please note that some servers might ban you if you try to reconnect too "
+"often or in too short intervals."
+msgstr ""
+"Por favor, considera que qualques servidors podrían denegar-te l'acceso si "
+"intentas reconnectar masiau a ormino u a intervalos masiau curtos."
+
+#: resources.h:911 resources.h:917
+#, no-c-format
+msgid ""
+"Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
+"details"
+msgstr ""
+"Por favor, leye http://wiki.filezilla-project.org/Date_and_Time_formatting "
+"ta saber-ne mas"
+
+#: resources.h:256
+msgid ""
+"Please retry downloading the update. Possible reasons if the problem "
+"persists (listed in order of decreasing probability):"
+msgstr ""
+"Por favor, reintenta descargar l'actualización. As razons, si o problema "
+"persiste, posiblement se deben a (orden de probabilidat decreixient):"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:570
+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 ""
+"Por favor, torna a executar iste asistent en caso que o tuyo ret cambee, u "
+"si de rapiconté trobas problemas con servidors que funcionaban antis."
+
+#: resources.h:466
+msgid "Please select an action:"
+msgstr "Por favor, selecciona una acción:"
+
+#: resources.h:312
+msgid "Please select the categories you would like to import."
+msgstr "Por favor, selecciona as categorías que te fería goyo importar."
+
+#: resources.h:695
+msgid "Please select the default transfer mode you would like to use."
+msgstr ""
+"Por favor, selecciona lo modo de transferencia predeterminau que te fería "
+"goyo emplegar."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:51
+#, c-format
+msgid "Please select the new attributes for the directory \"%s\"."
+msgstr "Por favor, selecciona os nuevos atributos t'o directorio \"%s\"."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:40
+#, c-format
+msgid "Please select the new attributes for the file \"%s\"."
+msgstr "Por favor, selecciona os nuevos atributos t'o fichero \"%s\"."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:54
+msgid "Please select the new attributes for the selected directories."
+msgstr ""
+"Por favor, selecciona os nuevos atributos t'os directorios seleccionaus."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:57
+msgid ""
+"Please select the new attributes for the selected files and directories."
+msgstr ""
+"Por favor, selecciona os nuevos atributos t'os fichers y directorios "
+"seleccionaus."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:43
+msgid "Please select the new attributes for the selected files."
+msgstr "Por favor, selecciona os nuevos atributos t'os fichers seleccionaus."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:581
+msgid ""
+"Please update your firewall and make sure your router is using the latest "
+"available firmware. Furthermore, your router has to be configured properly. "
+"You will have to use manual port forwarding. Don't run your router in the so "
+"called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
+"protocol specific 'fixups' have to be disabled"
+msgstr ""
+"Por favor, esviella o tuyo tallafuegos y asegura-te que o tuyo enrotador "
+"emplega o firmware mas recient. Amás, o tuyo enrotador debe estar "
+"correctament configurau. Tendrás que emplegar a redirección manual de "
+"puertos. No emplegues o tuyo enrotador en o modo denominau 'DMZ' u 'de "
+"chuegos'. Cosetas como a inspección de protocolo u parches especificos de "
+"protocolo tienen que estar desactivaus."
+
+#: resources.h:263
+msgid ""
+"Please visit http://filezilla-project.org for more information about "
+"FileZilla."
+msgstr ""
+"Por favor, visita http://filezilla-project.org ta mas información sobre "
+"FileZilla."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
+msgid ""
+"Please visit http://filezilla-project.org to download the most recent "
+"version."
+msgstr ""
+"Por favor, visita http://filezilla-project.org ta descargar a versión mas "
+"recient."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
+msgid "Postal code:"
+msgstr "Codigo postal:"
+
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
+msgid "Predefined Sites"
+msgstr "Puestos predefinidos"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:727
+msgid "Preserving file timestamps"
+msgstr "Preservar calendatas de creyación d'os fichers"
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
+msgid "Preview:"
+msgstr "Previo:"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1127
+msgid "Primary connection and data connection certificates don't match."
+msgstr ""
+"A connexión primaria y os certificaus de connexión de datos no coinciden."
+
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Imprentar información de diagnostico sobre l'inicio de FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print version information to stdout and exit"
+msgstr "Imprentar información d'a versión por a salida estandar y salir"
+
+#: resources.h:934
+msgid "Prioritize directories (default)"
+msgstr "Priorizar directorios (predeterminau)"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Priority"
+msgstr "Prioridat"
+
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Politica de privacidat: Nomás se ninviarán ta lo servidor a versión de "
+"FileZilla, o sistema operativo emplegau y l'arquitectura d'a CPU."
+
+#: resources.h:808
+msgid "Private &keys:"
+msgstr "Claus pri&vadas:"
+
+#: resources.h:90
+msgid "Pro&tocol:"
+msgstr "Pro&tocolo:"
+
+#: resources.h:804 resources.h:821
+msgid "Pro&xy password:"
+msgstr "Clau d'o pro&xy:"
+
+#: resources.h:542 resources.h:611
+msgid "Process &Queue"
+msgstr "Procesar &Coda"
+
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: resources.h:819
+msgid "Proxy &port:"
+msgstr "&Puerto d'o proxy:"
+
+#: resources.h:803 resources.h:820
+msgid "Proxy &user:"
+msgstr "&Usuario d'o proxy:"
+
+#: ../../locales/../src/engine/proxy.cpp:415
+msgid "Proxy authentication failed"
+msgstr "L'autenticación d'o proxy ha fallau"
+
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
+#, c-format
+msgid "Proxy handshake failed: %s"
+msgstr "Ha fallau a negociación con o proxy: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "O servidor prencipia con '[' pero no s'ha trobau o zarre de gafet."
+
+#: ../../locales/../src/engine/proxy.cpp:309
+#, c-format
+msgid "Proxy reply: %s"
+msgstr "Respuesta d'o proxy: %s"
+
+#: ../../locales/../src/engine/proxy.cpp:458
+#, c-format
+msgid "Proxy request failed: %s"
+msgstr "Ha fallau a petición d'o proxy: %s"
+
+#: ../../locales/../src/engine/proxy.cpp:480
+msgid "Proxy request failed: Unknown address type in CONNECT reply"
+msgstr ""
+"Ha fallau a petición d'o proxy: Mena d'adreza desconoixida en a respuesta a "
+"CONNECT"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
+msgid "Proxy set but proxy host or port invalid"
+msgstr "S'ha fixau o proxy pero o servidor proxy u lo puerto no son validos"
+
+#: resources.h:806
+msgid "Public Key Authentication"
+msgstr "Autenticación con clau publica"
+
+#: resources.h:8 resources.h:37
+msgid "Public key algorithm:"
+msgstr "Algorismo de clau publica:"
+
+#: resources.h:151
+msgid "Public permissions"
+msgstr "Premisos publicos"
+
+#: ../../locales/../src/interface/QueueView.cpp:3208
+msgid "Queue has been fully processed"
+msgstr "A coda s'ha procesau de tot."
+
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
+msgid "Queue: %s MiB"
+msgstr "Coda: %s MiB"
+
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
+msgid "Queue: %s%s"
+msgstr "En coda: %s%s"
+
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
+msgid "Queue: empty"
+msgstr "Coda: vueda"
+
+#: ../../locales/../src/interface/QueueView.cpp:455
+msgid "Queued files"
+msgstr "Fichers en coda"
+
+#: resources.h:458
+msgid "Queueing:"
+msgstr "Se ye metiendo en coda:"
+
+#: resources.h:627
+msgid "R&eboot system"
+msgstr "R&eenchegar o sistema"
+
+#: resources.h:539
+msgid "R&emote directory tree"
+msgstr "Arbol de directorio r&emoto"
+
+#: resources.h:643 resources.h:647
+msgid "R&eset and requeue selected files"
+msgstr "R&einiciar y meter de nuevas en coda os fichers seleccionaus"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:594
+msgid "Raw FTP command"
+msgstr "Comando FTP puro"
+
+#: resources.h:148
+msgid "Re&ad"
+msgstr "Le&yer"
+
+#: resources.h:586 resources.h:602
+msgid "Re&fresh"
+msgstr "&Refrescar"
+
+#: resources.h:72
+msgid "Re&name"
+msgstr "Re&nombrar"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:576
+msgid ""
+"Re-run the wizard and carefully check your settings and configure all "
+"routers and firewalls accordingly."
+msgstr ""
+"Torna a executar l'asistent y compreba cudiadosament os achustes y configura "
+"totz os enrotadors y tallafuegos adequadament."
+
+#: resources.h:152
+msgid "Rea&d"
+msgstr "Le&yer"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+msgid "Read-only"
+msgstr "Nomás lectura"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
+msgid "Really cancel current operation?"
+msgstr "Yes seguro de querer cancelar a operación actual?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] "Yes seguro de querer borrar %d directorio y os suyos contenius?"
+msgstr[1] "Yes seguro de querer borrar %d directorios y os suyos contenius?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Yes seguro de querer borrar %d fichero?"
+msgstr[1] "Yes seguro de querer borrar %d fichers?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Yes seguro de querer borrar %s y %s?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Yes seguro de querer borrar totz os fichers y directorios seleccionaus?"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Yes seguro de querer borrar totz os fichers y directorios seleccionaus?"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Reason"
+msgstr "Razón"
+
+#: ../../locales/../src/interface/QueueView.cpp:3215
+msgid "Reboot now"
+msgstr "Reenchegar agora"
+
+#: resources.h:157
+msgid "Rec&urse into subdirectories"
+msgstr "Incl&uir totz os subdirectorios"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"S'ha recibiu un listau de directorios que pareix estar codificau en EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "S'ha recibiu una linea que supera os 10000 caracters, se ye abortando."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
+msgid "Received data tainted"
+msgstr "Os datos recibius s'han modificau."
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+msgid ""
+"Reconnect information cannot be cleared while connected to a server.\n"
+"If you continue, your connection will be disconnected."
+msgstr ""
+"A información de reconnexión no s'ha puesto limpiar entre a connexión a un "
+"servidor.\n"
+"Si continas, a connexión se perderá."
+
+#: resources.h:762
+msgid "Reconnection settings"
+msgstr "Opcions de reconnexión"
+
+#: resources.h:1020 resources.h:1021
+msgid "Reconnects to the last used server"
+msgstr "Reconnecta con o zaguer servidor emplegau"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:715
+msgid "Redirection to invalid address"
+msgstr "Redirección enta una adreza invalida"
+
+#: resources.h:1012 resources.h:1013
+msgid "Refresh the file and folder lists"
+msgstr "Refrescar as listas de fichers y carpetas"
+
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Remerar as claus?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
+msgid "Remote"
+msgstr "Remoto"
+
+#: ../../locales/../src/engine/tlssocket.cpp:916
+msgid "Remote certificate not trusted."
+msgstr "O certificau remoto no ye de confianza"
+
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
+msgid "Remote file"
+msgstr "Fichero remoto"
+
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Remote file search"
+msgstr "Busca de fichers remotos"
+
+#: resources.h:216
+msgid "Remote filters:"
+msgstr "Filtros remotos:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1240
+msgid "Remote path"
+msgstr "Rota remota"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
+#, 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 ""
+"No se puet analisar a rota remota. Asegura-te que ye una rota absoluta "
+"valida y premitida por a mena de servidor actual (%s)."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
+#, 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 ""
+"No se puet analisar a rota remota. Asegura-te que ye una rota absoluta "
+"valida y premitida por a mena de servidor (%s) seleccionau en o puesto radiz."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
+msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
+msgstr ""
+"No se puet analisar a rota remota. Asegura-te que ye una rota absoluta "
+"valida."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:350
+msgid "Remote path could not be parsed."
+msgstr "No s'ha puesto analisar a rota remota."
+
+#: resources.h:455
+msgid "Remote path handling:"
+msgstr "Chestión de rota remota:"
+
+#: resources.h:323
+msgid "Remote path:"
+msgstr "Rota remota:"
+
+#: ../../locales/../src/interface/viewheader.cpp:560
+msgid "Remote site:"
+msgstr "Puesto remoto:"
+
+#: resources.h:640 resources.h:644
+msgid "Remove &all"
+msgstr "Borr&ar tot"
+
+#: resources.h:642 resources.h:646
+msgid "Remove &selected"
+msgstr "Borrar as &seleccionadas"
+
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:256
+msgid "Rename file"
+msgstr "Renombrar fichero"
+
+#: resources.h:658 resources.h:679
+msgid "Rename selected directory"
+msgstr "Renombrar o directorio seleccionau"
+
+#: resources.h:590 resources.h:606
+msgid "Rename selected files and directories"
+msgstr "Renombrar os fichers y carpetas seleccionadas"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
+#, c-format
+msgid "Renaming '%s' to '%s'"
+msgstr "Se ye renombrando '%s' ta '%s'"
+
+#: resources.h:482
+msgid "Reporting bugs and feature requests"
+msgstr "Informar d'errors y solicitutz de caracteristicas"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "Requier FTP explicito sobre TLS"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "Requier FTP implicito sobre TLS"
+
+#: resources.h:645
+msgid "Reset and requeue &all"
+msgstr "Reiniciar y meter &tot de nuevas en a coda"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:497
+#, c-format
+msgid "Resolving address of %s"
+msgstr "Se ye resolvendo l'adreza de %s"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1179
+msgid "Resolving hostname"
+msgstr "Se ye resolvendo o nombre d'a maquina"
+
+#: ../../locales/../src/engine/logging.cpp:215
+#: ../../locales/../src/interface/netconfwizard.cpp:395
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
+msgid "Response:"
+msgstr "Respuesta:"
+
+#: resources.h:449
+msgid "Results:"
+msgstr "Resultaus:"
+
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
+msgid "Resume file transfer"
+msgstr "Continar a transferencia de fichers"
+
+#: resources.h:879
+msgid ""
+"Resuming ASCII files can cause problems if server uses a different line "
+"ending format than the client."
+msgstr ""
+"Reprener fichers ASCII puet causar problemas si o servidor emplega un "
+"formato de fin de linia diferent a lo d'o client."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
+msgid "Retrieving directory listing..."
+msgstr "Se ye recuperando o listau d'o directorio..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
+#: ../../locales/../src/interface/netconfwizard.cpp:707
+#, c-format
+msgid "Retrieving external IP address from %s"
+msgstr "Se ye obtenendo l'adreza IP externa de %s"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1108
+msgid "Root certificate is not trusted"
+msgstr "O certificau radiz no ye de confianza"
+
+#: resources.h:517
+msgid "S&how files currently being edited..."
+msgstr "Amostrar fic&hers que son estando editaus..."
+
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "Amostrar o c&hestor de puestos a l'enciet"
+
+#: resources.h:628
+msgid "S&hutdown system"
+msgstr "Amo&rtar sistema"
+
+#: resources.h:447
+msgid "S&top"
+msgstr "A&turar"
+
+#: resources.h:533
+msgid "S&ynchronized browsing"
+msgstr "Navegación s&incronizada"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:121
+msgid "SFTP"
+msgstr "SFTP"
+
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "Save settings?"
+msgstr "Alzar opcions?"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+"L'alzamiento de claus ye estau desactivau por o tuyo administrador de "
+"sistemas."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "L'alzamiento d'as claus ha estau desactivau por tú."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
+msgid "Scanning for files to add to queue"
+msgstr "Se son mirando fichers ta adhibir a la coda"
+
+#: ../../locales/../src/interface/QueueView.cpp:1824
+msgid "Scanning for files to upload"
+msgstr "Se son mirando fichers ta puyar"
+
+#: resources.h:443
+msgid "Search &conditions:"
+msgstr "&Condicions de busca:"
+
+#: resources.h:441
+msgid "Search &directory:"
+msgstr "&Directorio de busca:"
+
+#: resources.h:1028
+msgid "Search for files recursively."
+msgstr "Mirar fichers recursivament."
+
+#: resources.h:558
+msgid "Search server for files"
+msgstr "Servidor de busca ta fichers"
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Security information"
+msgstr "Información de seguranza"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:564
+#: ../../locales/../src/interface/netconfwizard.cpp:577
+msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
+msgstr "Visita tamién http://wiki.filezilla-project.org/Network_Configuration"
+
+#: resources.h:385
+msgid "Sele&ct server"
+msgstr "Selecciona un servidor"
+
+#: resources.h:747
+msgid "Select &page:"
+msgstr "Selecciona una pachina:"
+
+#: resources.h:899
+msgid "Select Theme"
+msgstr "Selecciona un tema"
+
+#: resources.h:857
+msgid ""
+"Select default action to perform if target file of a transfer already exists."
+msgstr ""
+"Selecciona l'acción predeterminada ta realizar si o fichero de destín ya "
+"existe."
+
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
+msgid "Select default editor"
+msgstr "Selecciona l'editor predeterminau"
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
+msgid ""
+"Select default file exists action if the target file already exists. This "
+"selection is valid only for the current session."
+msgstr ""
+"Selecciona l'acción predeterminada a realizar si lo fichero de destín ya "
+"existe. Ista selección ye valida solament t'a sesión actual."
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
+msgid ""
+"Select default file exists action only for the currently selected files in "
+"the queue."
+msgstr ""
+"Seleccione a opción predeterminada a realizar si o fichero existe, solament "
+"t'os fichers actualment seleccionaus en a coda."
+
+#: ../../locales/../src/interface/updatewizard.cpp:336
+msgid "Select download location for package"
+msgstr "Selecciona la ubicación de descarga t'o paquet"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
+msgid "Select file containing private key"
+msgstr "Selecciona o fichero que contién a clau privada"
+
+#: ../../locales/../src/interface/export.cpp:38
+msgid "Select file for exported data"
+msgstr "Selecciona un fichero t'os datos exportaus"
+
+#: ../../locales/../src/interface/export.cpp:34
+msgid "Select file for exported queue"
+msgstr "Selecciona un fichero t'a coda exportada"
+
+#: ../../locales/../src/interface/export.cpp:36
+msgid "Select file for exported settings"
+msgstr "Selecciona un fichero t'as opcions exportadas"
+
+#: ../../locales/../src/interface/export.cpp:32
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
+msgid "Select file for exported sites"
+msgstr "Selecciona un fichero t'os puestos exportaus"
+
+#: ../../locales/../src/interface/import.cpp:15
+msgid "Select file to import settings from"
+msgstr "Selecciona un fichero dende an importar opcions"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:250
+msgid "Select file to upload"
+msgstr "Selecciona un fichero ta puyar"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
+msgid "Select filename for converted keyfile"
+msgstr "Selecciona un nombre t'o fichero clau convertiu"
+
+#: resources.h:431
+#, no-c-format
+msgid "Select how these files should be opened."
+msgstr "Selecciona como cal ubrir istos fichers."
+
+#: ../../locales/../src/interface/search.cpp:806
+msgid "Select target download directory"
+msgstr "Selecciona o directorio destín de descarga"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:245
+msgid "Select target filename"
+msgstr "Selecciona o nombre de fichero destín"
+
+#: resources.h:301
+msgid "Select the categories to export:"
+msgstr "Selecciona as categorías ta exportar:"
+
+#: resources.h:292
+msgid "Select the private data you would like to delete."
+msgstr "Selecciona os datos privaus que quiers borrar."
+
+#: ../../locales/../src/interface/search.cpp:773
+#, c-format
+msgid "Selected %d directory with its contents for transfer."
+msgid_plural "Selected %d directories with their contents for transfer."
+msgstr[0] "S'ha seleccionau %d directorio y os suyos contenius ta transferir"
+msgstr[1] "S'han seleccionau %d directorios y os suyos contenius ta transferir"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:51
+#, c-format
+msgid "Selected %d directory."
+msgid_plural "Selected %d directories."
+msgstr[0] "%d directorio seleccionau."
+msgstr[1] "%d directorios seleccionaus."
+
+#: ../../locales/../src/interface/search.cpp:771
+#, c-format
+msgid "Selected %d file for transfer."
+msgid_plural "Selected %d files for transfer."
+msgstr[0] "S'ha seleccionau %d fichero ta transferir."
+msgstr[1] "S'han seleccionau %d fichers ta transferir."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:58
+#, c-format
+msgid "Selected %d file. Total size: %s"
+msgid_plural "Selected %d files. Total size: %s"
+msgstr[0] "%d fichero seleccionau. Grandaria total: %s"
+msgstr[1] "%d fichers seleccionaus. Grandaria total: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:56
+#, c-format
+msgid "Selected %d file. Total size: At least %s"
+msgid_plural "Selected %d files. Total size: At least %s"
+msgstr[0] "%d fichero seleccionau. Grandaria total: A lo menos %s"
+msgstr[1] "%d fichers seleccionaus. Grandaria total: A lo menos %s"
+
+#: ../../locales/../src/interface/search.cpp:778
+#, c-format
+msgid "Selected %s and %s for transfer."
+msgstr "Seleccionau %s y %s ta transferir."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:68
+#, c-format
+msgid "Selected %s and %s. Total size: %s"
+msgstr "Seleccionau %s y %s. Grandaria total: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:66
+#, c-format
+msgid "Selected %s and %s. Total size: At least %s"
+msgstr "Seleccionau %s y %s. Grandaria total: A lo menos %s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
+msgid "Selected editor does not exist."
+msgstr "L'editor seleccionau no existe."
+
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
+msgid "Selected file already being edited"
+msgstr "O fichero seleccionau ya ye estando editau"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Selected file is already loaded"
+msgstr "O fichero seleccionau ya ye cargau."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
+msgid "Selected file is already opened"
+msgstr "O fichero seleccionau ya ye ubierto"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
+msgid "Selected file is still being edited"
+msgstr "O fichero seleccionau sigue estando editau"
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Selected filter only works for local files."
+msgstr "O filtro seleccionau nomás funciona con fichers locals."
+
+#: ../../locales/../src/interface/menu_bar.cpp:313
+msgid ""
+"Selected global bookmark and current server use a different server type.\n"
+"Use site-specific bookmarks for this server."
+msgstr ""
+"O marcapachinas global seleccionau y lo servidor actual emplegan distintas "
+"menas de servidor.\n"
+"Emplega marcapachinas especificos d'o puesto ta iste servidor."
+
+#: ../../locales/../src/engine/engineprivate.cpp:281
+msgid "Selected port usually in use by a different protocol."
+msgstr "O puerto seleccionau normalment ye emplegau por un protocolo diferent."
+
+#: resources.h:769
+msgid "Send FTP &keep-alive commands"
+msgstr "Ninviar comandos FTP ta mantener viva la connexión"
+
+#: resources.h:560
+msgid "Send custom command to the server otherwise not available"
+msgstr ""
+"Ninviar comando personalizau ta lo servidor no ye disponible d'unatra traza"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
+msgid "Sending keep-alive command"
+msgstr "Se ye ninviando o comando ta mantener viva la connexión"
+
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
+msgid "Serial number:"
+msgstr "Numero de serie:"
+
+#: resources.h:98
+msgid "Server &Type:"
+msgstr "&Mena de servidor:"
+
+#: ../../locales/../src/engine/tlssocket.cpp:794
+msgid "Server did not properly shut down TLS connection"
+msgstr "O servidor no respondió adequadament, zarre de connexión TLS"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "O servidor no premite reprener fichers mayors de 2 GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
+#, c-format
+msgid "Server does not support resume of files > %d GB."
+msgstr "O servidor no permite reprener fichers mayors de %d GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
+#, c-format
+msgid ""
+"Server does not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"O servidor no premite reprener fichers mayors de %d GB. Remata la "
+"transferencia ya que as grandarias coinciden."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
+msgid "Server does not support resume of files > 2GB."
+msgstr "O servidor no premite reprener fichers mayors de 2 GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
+msgid "Server does not support resume of files > 4GB."
+msgstr "O servidor no premite reprener fichers mayors de 4 GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
+#, c-format
+msgid ""
+"Server may not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"O servidor podría no premitir reprener fichers mayors de %d GB. Remata la "
+"transferencia ya que as grandarias coinciden."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
+msgid ""
+"Server might require an account. Try specifying an account using the Site "
+"Manager"
+msgstr ""
+"O servidor puet requerir una cuenta. Preba especificando una cuenta "
+"emplegando o chestor de puestos."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:420
+msgid "Server returned empty path."
+msgstr "O servidor ha retornau una rota vueda."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
+msgid ""
+"Server sent an additional login prompt. You need to use the interactive "
+"login type."
+msgstr ""
+"O servidor ninvió una petición adicional d'inicio de sesión. Amenestes "
+"emplegar l'inicio de sesión interactivo."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
+msgid "Server sent passive reply with unroutable address. Passive mode failed."
+msgstr ""
+"O servidor ninvió una respuesta pasiva con una adreza no enrotable. O modo "
+"pasivo ha fallau."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
+msgid ""
+"Server sent passive reply with unroutable address. Using server address "
+"instead."
+msgstr ""
+"O servidor ninvió una respuesta pasiva con una adreza no enrotable. Se ye "
+"emplegando en cuenta l'adreza d'o servidor."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:403
+#: ../../locales/../src/interface/netconfwizard.cpp:410
+#: ../../locales/../src/interface/netconfwizard.cpp:449
+#: ../../locales/../src/interface/netconfwizard.cpp:458
+#: ../../locales/../src/interface/netconfwizard.cpp:470
+#: ../../locales/../src/interface/netconfwizard.cpp:494
+#: ../../locales/../src/interface/netconfwizard.cpp:501
+#: ../../locales/../src/interface/netconfwizard.cpp:510
+#: ../../locales/../src/interface/netconfwizard.cpp:521
+msgid "Server sent unexpected reply."
+msgstr "O servidor ninvió una respuesta inasperada."
+
+#: resources.h:361
+msgid "Server to client MAC:"
+msgstr "MAC servidor ta client:"
+
+#: resources.h:359
+msgid "Server to client cipher:"
+msgstr "Zifrau servidor ta client:"
+
+#: resources.h:390
+msgid "Server&type:"
+msgstr "&Mena de servidor:"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Server/Local file"
+msgstr "Servidor/Fichero local"
+
+#: resources.h:321 resources.h:383
+msgid "Server:"
+msgstr "Servidor:"
+
+#: resources.h:16 resources.h:44
+msgid "Session details"
+msgstr "Detalles d'a sesión"
+
+#: resources.h:615
+msgid "Set &Priority"
+msgstr "Establir &prioridat"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
+#, c-format
+msgid "Set permissions of '%s' to '%s'"
+msgstr "Establir premisos de '%s' ta '%s'"
+
+#: ../../locales/../src/engine/transfersocket.cpp:870
+msgid "SetSocketBufferSize called without socket"
+msgstr "SetSocketBufferSize invocau sin socket"
+
+#: resources.h:746
+msgid "Settings"
+msgstr "Opcions"
+
+#: resources.h:1000
+msgid "Show &raw directory listing"
+msgstr "Amostra&r tal como lo listau d'o directorio"
+
+#: resources.h:569
+msgid "Show &welcome dialog..."
+msgstr "Amostrar o mensache de &bienvenida..."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
+msgid "Show both directory trees and continue comparing?"
+msgstr "Amostrar totz dos arbols de directorios y continar comparando?"
+
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Amuestra as menas disponibles de zifrau TLS"
+
+#: ../../locales/../src/interface/cmdline.cpp:6
+msgid "Shows this help dialog"
+msgstr "Amostrar ista finestra d'aduya"
+
+#: ../../locales/../src/interface/QueueView.cpp:3217
+msgid "Shutdown now"
+msgstr "Amortar agora"
+
+#: resources.h:9
+#, fuzzy
+msgid "Signature algorithm:"
+msgstr "Algorismo de clau publica:"
+
+#: resources.h:309
+msgid "Site &Manager entries"
+msgstr "Dentradas d'o chestor de &puestos"
+
+#: resources.h:79
+msgid "Site Manager"
+msgstr "Chestor de puestos"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Chestor de puestos - No puet remerar a clau"
+
+#: ../../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
+msgid "Site Manager - Invalid data"
+msgstr "Chestor de puestos - Datos no validos"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
+msgid "Site Manager already open"
+msgstr "O chestor de puestos ya ye ubierto"
+
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Site does not exist."
+msgstr "O puesto no existe."
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+msgid "Site path has to begin with 0 or 1."
+msgstr "A rota d'o puesto ha de prencipiar con 0 u 1."
+
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
+msgid "Site path is malformed."
+msgstr "A rota d'o puesto ye mal formada."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
+msgid "Site-specific bookmarks"
+msgstr "Marcapachinas especificos d'o puesto"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+msgid ""
+"Site-specific bookmarks require the server to be stored in the Site "
+"Manager.\n"
+"Add current connection to the site manager?"
+msgstr ""
+"Os marcapachinas especificos d'o puesto requieren que o servidor s'almacene "
+"en o chestor de puestos.\n"
+"Quiers adhibir a connexión actual a lo chestor de puestos?"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Size"
+msgstr "Grandaria"
+
+#: resources.h:918
+msgid "Size formatting"
+msgstr "Formato de grandaria"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
+msgid "Size unknown"
+msgstr "Grandaria desconoixida"
+
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
+msgid "Skip file"
+msgstr "Blincar fichero"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
+#, c-format
+msgid "Skipping download of %s"
+msgstr "Se ye blincando a descarga de %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
+#, c-format
+msgid "Skipping upload of %s"
+msgstr "Se ye blincando a puyada de %s"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
+msgid "Some files are still being edited or need to be uploaded."
+msgstr "Qualques fichers se son editando encara u amenesten estar puyaus."
+
+#: resources.h:709 resources.h:785
+msgid ""
+"Some misconfigured remote servers which are behind a router, may reply with "
+"their local IP address."
+msgstr ""
+"Qualques servidores remotos mal configuraus que se troben dimpués d'un "
+"enrotador, podrían responder con l'adreza IP local d'ells."
+
+#: resources.h:936
+msgid "Sort directories inline"
+msgstr "Ordinar directorios mezclaus"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:450
+msgid "Sort order cannot be changed if comparing directories."
+msgstr ""
+"L'orden de clasificación no puet cambiar si se son comparando directorios."
+
+#: resources.h:932
+msgid "Sorting"
+msgstr "Clasificación"
+
+#: resources.h:933
+msgid "Sorting &mode:"
+msgstr "&Modo de clasificación:"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
+msgid "Source and path of the drop operation are identical"
+msgstr "Orichen y rota d'a operación de soltar son identicos"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+msgid "Source and target file may not be the same"
+msgstr "O fichero d'orichen y destín no puet estar o mesmo"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:141
+msgid "Source and target of the drop operation are identical"
+msgstr "L'orichen y destín d'a operación de soltar son identicos"
+
+#: resources.h:58
+msgid "Source file:"
+msgstr "Fichero d'orichen:"
+
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+msgid "Speed Limits"
+msgstr "Limites de Velocidat"
+
+#: resources.h:830
+msgid "Speed limits"
+msgstr "Limites de velocidat"
+
+#: ../../locales/../src/interface/statusbar.cpp:597
+msgid "Speed limits are disabled, click to change."
+msgstr "Os limites de velocidat son desactivaus, fe clic ta cambiar-ne."
+
+#: ../../locales/../src/interface/statusbar.cpp:601
+msgid "Speed limits are enabled, click to change."
+msgstr "Os limites de velocidat son activaus, fe clic ta cambiar-ne."
+
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versions estables y beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Nomás que versions estables"
+
+#: resources.h:401
+msgid "Start transfer &immediately"
+msgstr "Prencipiar transferencia &immediatament"
+
+#: ../../locales/../src/interface/cmdline.cpp:7
+msgid "Start with opened Site Manager"
+msgstr "Prencipiar con o chestor de puestos ubierto"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
+#, c-format
+msgid "Starting download of %s"
+msgstr "Se ye prencipiando a descarga de %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
+#, c-format
+msgid "Starting upload of %s"
+msgstr "Se ye prencipiando a puyada de %s"
+
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
+msgid "State or province:"
+msgstr "Estau u provincia:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Status"
+msgstr "Estau"
+
+#: ../../locales/../src/engine/logging.cpp:212
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
+msgid "Status:"
+msgstr "Estau:"
+
+#: resources.h:612
+msgid "Stop and remove &all"
+msgstr "&Aturar y borrar-lo tot"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
+msgid "Street:"
+msgstr "Carrera:"
+
+#: resources.h:12 resources.h:40
+msgid "Subject of certificate"
+msgstr "Afer d'o certificau"
+
+#: ../../locales/../src/interface/queueview_successful.cpp:12
+msgid "Successful transfers"
+msgstr "Transferencias exitosas"
+
+#: resources.h:737
+msgid "Summary of test results:"
+msgstr "Resumen d'os resultaus d'a comprebación:"
+
+#: resources.h:469
+msgid ""
+"Symlinks to files are not affected by this choice, such symlinks are always "
+"deleted."
+msgstr ""
+"Os vinclos simbolicos no están afectaus por ista opción, istos cutio se "
+"borran."
+
+#: resources.h:1027 ../../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
+msgid "Synchronized browsing"
+msgstr "Navegación sincronizada"
+
+#: ../../locales/../src/interface/state.cpp:414
+msgid "Synchronized browsing has been disabled."
+msgstr "A navegación sincronizada ha estau desactivada."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
+msgid "Syntax error"
+msgstr "S'ha produciu una error de sintaxi"
+
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
+msgid "Syntax error in command line"
+msgstr "S'ha produciu una error de sintaxi en a linia de comandos"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+msgid "System"
+msgstr "Sistema"
+
+#: resources.h:535
+msgid "T&oolbar"
+msgstr "Barra de ferramien&tas"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:332
+msgid "TLS/SSL connection established, sending HTTP request"
+msgstr ""
+"A connexión TLS/SSL ha estau establida, se ye ninviando a petición HTTP"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
+msgid "TLS/SSL connection established, waiting for welcome message..."
+msgstr ""
+"A connexión TLS/SSL ha estau establida, se ye asperando o mensache de "
+"bienvenida..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
+msgid "TLS/SSL connection established."
+msgstr "A connexión TLS/SSL ha estau establida."
+
+#: ../../locales/../src/engine/proxy.cpp:445
+msgid "TTL expired"
+msgstr "O tiempo de vida ha venciu"
+
+#: resources.h:56
+msgid "Target file already exists"
+msgstr "O fichero de destín ya existe"
+
+#: resources.h:62
+msgid "Target file:"
+msgstr "Fichero de destín:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Ya existe ixe nombre d'o fichero de destín!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
+msgid "Target filename already exists, really continue?"
+msgstr "O fichero de destín ya existe, quiers continar?"
+
+#: resources.h:736
+msgid "Test results"
+msgstr "Resultaus d'a comprebación"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
+msgid "Testing resume capabilities of server"
+msgstr "Se ye comprebando si o servidol ye capable de continar"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Do you want to continue? Any changes made in the Site Manager won't be saved "
+"then."
+msgstr ""
+"O Chestor de Puestos se troba ubierto en unatra instancia de FileZilla 3.\n"
+"Quiers continar? D'estar asinas cualsiquier cambeo feito en o chestor de "
+"puestos se perderá."
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Please close it or the data cannot be deleted."
+msgstr ""
+"O chestor de puestos ye ubierto en unatra instancia de FileZilla 3.\n"
+"Por favor zarra-lo u os datos no podrán estar borraus."
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
+#, c-format
+msgid "The XML document is not well-formed: %s"
+msgstr "O documento XML no ye bien formau: %s"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:618
+#, c-format
+msgid "The address you entered was: %s"
+msgstr "L'adreza que metiés yera: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
+msgid "The bookmark could not be added."
+msgstr "No s'ha puesto adhibir o marcapachinas."
+
+#: ../../locales/../src/interface/sitemanager.cpp:805
+msgid "The bookmarks could not be cleared."
+msgstr "No s'han puesto limpiar os marcapachinas."
+
+#: ../../locales/../src/interface/statusbar.cpp:490
+msgid "The connection is encrypted. Click icon for details."
+msgstr "Ista connexión ye zifrada. Fe clic en l'icono ta mas detalles."
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
+msgid "The custom login sequence cannot be empty."
+msgstr "A seqüencia d'inicio de sesión personalizau no puet estar vueda."
+
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, fuzzy, c-format
+msgid "The data connection could not be established: %s"
+msgstr "A connexión TLS/SSL ha estau establida."
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
+#, no-c-format
+msgid "The default editor for text files could not be found."
+msgstr "No s'ha puesto trobar l'editor predeterminau ta fichers de texto."
+
+#: resources.h:433
+#, c-format
+msgid "The default editor for text files is '%s'."
+msgstr "L'editor predeterminau ta fichers de texto ye '%s'."
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr ""
+"O nombre de filtro que has metiu ya existe, por favor esliche un diferent."
+
+#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
+#, c-format
+msgid "The extension '%s' does already exist in the list"
+msgstr "A extensión '%s' ya existe en a lista"
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:246
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:253
+#, c-format
+msgid ""
+"The file %s already exists.\n"
+"Please enter a new name:"
+msgstr ""
+"O fichero %s ya existe.\n"
+"Por favor, escribe un nuevo nombre:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
+#, c-format
+msgid ""
+"The file '%s' cannot be opened:\n"
+"The associated program (%s) could not be found.\n"
+"Please check your filetype associations."
+msgstr ""
+"O fichero '%s' no s'ha puesto ubrir:\n"
+"O programa asociau (%s) no s'ha puesto trobar.\n"
+"Por favor compreba las tuyas asociacions de menas de fichers."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
+#, c-format
+msgid "The file '%s' could not be loaded or does not contain a private key."
+msgstr "O fichero '%s' no s'ha puesto cargar u no contién una clau privada."
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#, c-format
+msgid "The file '%s' could not be loaded."
+msgstr "No s'ha puesto cargar o fichero '%s'"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"No program has been associated on your system with this file type."
+msgstr ""
+"O fichero '%s' no s'ha puesto ubrir:\n"
+"Garra programa en o tuyo equipo ha estau asociau con ista mena de fichero."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"The associated command failed"
+msgstr ""
+"O fichero '%s' no s'ha puesto ubrir:\n"
+"O comando asociau ha fallau"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
+#, c-format
+msgid ""
+"The file '%s' is not in a format supported by FileZilla.\n"
+"The file is also password protected. Password protected keyfiles are not "
+"supported by FileZilla yet.\n"
+"Would you like to convert it into a supported, unprotected format?"
+msgstr ""
+"O fichero '%s' no ye en un formato admitiu por FileZilla.\n"
+"Amás ye protechiu por clau. FileZilla no admite encara os fichers de clau "
+"protechius por clau.\n"
+"Te fería goyo convertir-lo ta un formato admitiu y desprotechiu?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
+#, c-format
+msgid ""
+"The file '%s' is not in a format supported by FileZilla.\n"
+"Would you like to convert it into a supported format?"
+msgstr ""
+"O fichero '%s' no ye en un formato admitiu por FileZilla.\n"
+"Te fería goyo convertir-lo en un formato admitiu?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
+#, c-format
+msgid ""
+"The file '%s' is password protected. Password protected keyfiles are not "
+"supported by FileZilla yet.\n"
+"Would you like to convert it into an unprotected file?"
+msgstr ""
+"O fichero '%s' ye protechiu por clau. FileZilla no admite encara os fichers "
+"de clau protechius por clau.\n"
+"Te fería goyo convertir-lo en un fichero desprotechiu?"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
+msgid "The file selected as default editor does not exist."
+msgstr "O fichero seleccionau como editor predeterminau no existe."
+
+#: ../../locales/../src/interface/import.cpp:95
+msgid ""
+"The file you have selected contains site manager data from a previous "
+"version of FileZilla.\n"
+"Due to differences in the storage format, only host, port, username and "
+"password will be imported.\n"
+"Continue with the import?"
+msgstr ""
+"O fichero que has seleccionau contién datos d'o chestor de puestos d'una "
+"versión anterior de FileZilla.\n"
+"A causa de diferencias en o formato d'almacenamiento, solament s'importarán "
+"servidor, puerto, usuario y clau.\n"
+"Quiers continar con a importación?"
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "The filename column can neither be hidden nor moved."
+msgstr "A columna de nombre de fichero no se puet amagar ni mover."
+
+#: ../../locales/../src/interface/listctrlex.cpp:811
+msgid "The filename column cannot be hidden."
+msgstr "A columna de nombre de fichero no se puet amagar."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
+#, c-format
+msgid "The following character will be replaced: %s"
+msgstr "O siguient caracter será reemplazau: %s"
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
+#, c-format
+msgid "The following characters will be replaced: %s"
+msgstr "Os siguients caracters serán reemplazaus: %s"
+
+#: resources.h:338
+msgid "The following files are currently being edited:"
+msgstr "Os siguients fichers son estando editaus actualment:"
+
+#: resources.h:473
+msgid "The free open source FTP solution"
+msgstr "A solución FTP de código ubierto"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
+msgid "The global bookmarks could not be saved."
+msgstr "No s'han puesto alzar os marcapachinas globals."
+
+#: resources.h:998
+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 ""
+"Quanto mayor siga o libel de depuración, mas información se veyerá en o "
+"rechistro de mensaches. a visualización d'a información de depuración tien "
+"un impacto negativo en o rendimiento."
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
+msgid "The limit needs to be between 1 and 2000 MiB"
+msgstr "O limite ameneste estar entre 1 y 2000 MiB."
+
+#: ../../locales/../src/interface/state.cpp:275
+#, c-format
+msgid ""
+"The local directory '%s' is not below the synchronization root (%s).\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+"O directorio local '%s' no ye baixo o radiz de sincronización (%s).\n"
+"Quiers desactivar a navegación sincronizada y continar cambiando o "
+"directorio local?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
+msgid ""
+"The lowest available port has to be less or equal than the highest available "
+"port."
+msgstr ""
+"O puerto mas baixo disponible debe estar menor u igual a lo puerto mas alto "
+"disponible."
+
+#: ../../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 ""
+"A versión mas recient ha estau descargada. Fe clic en rematar ta zarrar y "
+"prencipiar a instalación."
+
+#: ../../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 ""
+"S'ha descargau a versión mas recient. Por favor, instala-la d'a mesma traza "
+"que ista versión."
+
+#: ../../locales/../src/interface/QueueView.cpp:1955
+msgid "The queue will not be saved."
+msgstr "No s'alzará la coda."
+
+#: ../../locales/../src/interface/state.cpp:1086
+#, 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 ""
+"O directorio remoto '%s' no ye baixo o radiz de sincronización (%s).\n"
+"Quiers desactivar a navegación sincronizada y continar cambiando o "
+"directorio remoto?"
+
+#: ../../locales/../src/interface/import.cpp:84
+msgid "The selected categories have been imported."
+msgstr "As categorías seleccionadas han estau importadas."
+
+#: resources.h:308
+msgid ""
+"The selected file contains importable data for the following categories:"
+msgstr ""
+"O fichero seleccionau contién datos importables t'as siguients categorías:"
+
+#: resources.h:331
+msgid "The selected file is already being edited:"
+msgstr "O fichero seleccionau ya ye estando editau:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
+msgid ""
+"The selected file is still opened in some other program, please close it."
+msgstr ""
+"O fichero seleccionau contina ubierto en belatro programa, por favor zarra-"
+"lo."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
+msgid ""
+"The selected file would be executed directly.\n"
+"This can be dangerous and damage your system.\n"
+"Do you really want to continue?"
+msgstr ""
+"O fichero seleccionau sería executau dreitament.\n"
+"Isto puede estar perigloso y dañar o tuyo sistema.\n"
+"Realment quiers continar?"
+
+#: ../../locales/../src/interface/sitemanager.cpp:602
+msgid "The server could not be added."
+msgstr "No s'ha puesto adhibir o servidor"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:574
+msgid "The server sent an unexpected or unrecognized reply."
+msgstr "O servidor ninvió una respuesta inasperada u irreconoixible."
+
+#: resources.h:115
+msgid "The server uses following charset encoding for filenames:"
+msgstr ""
+"O servidor emplega lo siguient chuego de caracters ta los nombres de fichero:"
+
+#: resources.h:2
+msgid ""
+"The server's certificate is unknown. Please carefully examine the "
+"certificate to make sure the server can be trusted."
+msgstr ""
+"O certificau d'o servidor ye desconoixiu. Por favor, examina cudiadosament o "
+"certificau ta asegurar-te que o servidor ye de confianza."
+
+#: resources.h:197
+msgid ""
+"The server's host key does not match the key that has been cached. This "
+"means that either the administrator has changed the host key, or you are "
+"actually trying to connect to another computer pretending to be the server."
+msgstr ""
+"La clau d'o servidor no corresponde con a clau que bi ha alzada en a caché. "
+"Isto sinnifica que u bien l'administrador ha cambiau a tuya clau de maquina, "
+"u estás intentando connectar-te ta atro ordinador que finche estar o "
+"servidor."
+
+#: resources.h:185
+msgid ""
+"The server's host key is unknown. You have no guarantee that the server is "
+"the computer you think it is."
+msgstr ""
+"La clau d'o puesto d'o servidor ye desconoixida. No tiens denguna guarencia "
+"que o servidor siga o equipo que tú piensas que ye."
+
+#: ../../locales/../src/interface/import.cpp:81
+msgid ""
+"The settings have been imported. You have to restart FileZilla for all "
+"settings to have effect."
+msgstr ""
+"As opcions han estau importadas. Habrás que desactivar FileZilla ta que "
+"todas as opcions faigan efecto."
+
+#: ../../locales/../src/interface/QueueView.cpp:3206
+msgid "The system will soon reboot unless you click Cancel."
+msgstr "L'equipo se reenchegará en breus si no fas clic en Cancelar."
+
+#: ../../locales/../src/interface/QueueView.cpp:3204
+msgid "The system will soon shut down unless you click Cancel."
+msgstr "L'equipo s'amortará en breus intes si no pretas Cancelar."
+
+#: resources.h:57
+msgid ""
+"The target file already exists.\n"
+"Please choose an action."
+msgstr ""
+"O fichero de destín ya existe.\n"
+"Por favor triga una acción."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "The test did not succeed. Do you really want to save the settings?"
+msgstr "A comprebación ha fallau. De verdat quiers alzar a configuración?"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:127
+msgid "Themes"
+msgstr "Temas"
+
+#: ../../locales/../src/interface/filter.cpp:462
+msgid "This filter set cannot be removed."
+msgstr "Iste conchunto de filtros no puet estar borrau."
+
+#: ../../locales/../src/interface/filter.cpp:397
+msgid "This filter set cannot be renamed."
+msgstr "Iste conchunto de filtros no puet estar renombrau."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:575
+msgid ""
+"This means that some router and/or firewall is still interfering with "
+"FileZilla."
+msgstr ""
+"Isto sinnifica que bell enrotador y/u tallafuegos encara ye interferindo con "
+"FileZilla."
+
+#: resources.h:714
+msgid ""
+"This only works if you are not behind a router, else your system would just "
+"return your internal address."
+msgstr ""
+"Isto solament funciona si no se troba dimpués d'un enrotador, d'unatro modo "
+"o sistema nomás retornaría l'adreza interna."
+
+#: resources.h:692
+msgid ""
+"This wizard will help you to properly configure any routers and firewalls "
+"you have and tests your configuration."
+msgstr ""
+"Iste asistent le aduyará a configurar correctament os tuyos enrotadors y "
+"tallafuegos, y comprebará a tuya configuración."
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Hora"
+
+#: resources.h:912
+msgid "Time formatting"
+msgstr "Formato d'hora"
+
+#: resources.h:753
+msgid "Time&out in seconds:"
+msgstr "Tiempo d'aspera en segundos:"
+
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
+msgid "Timeout"
+msgstr "Tiempo d'aspera"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
+#, c-format
+msgid ""
+"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
+"seconds."
+msgstr ""
+"Compensacions de zona horaria: Servidor: %d segundos. Local: %d segundos. "
+"Diferencia: %d segundos."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
+msgid "Title:"
+msgstr "Titol:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
+msgid "To compare directories, both file lists have to be aligned."
+msgstr ""
+"Ta comparar directorios, todas dos listas de fichero han d'estar aliniadas."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
+msgid "To do this, the directory trees need to be both shown or both hidden."
+msgstr ""
+"Ta fer isto, ye necesario que totz dos arbols de directorio se sigan "
+"amostrando u sigan amagaus."
+
+#: resources.h:807
+msgid ""
+"To support public key authentication, FileZilla needs to know the private "
+"keys to use."
+msgstr ""
+"Ta premitir l'autenticación con clau publica, FileZilla ameneste saber las "
+"claus privadas que cal emplegar."
+
+#: resources.h:1024
+msgid ""
+"Toggle directory comparison. Right-click to change comparison mode.\n"
+"\n"
+"Colors:\n"
+"Yellow: File only exists on one side\n"
+"Green: File is newer than the unmarked file on other side\n"
+"Red: File sizes different"
+msgstr ""
+"Alternar comparanza de directorios. Fe clic con o botón dreito ta cambiar o "
+"modo de comparanza.\n"
+"\n"
+"Colors:\n"
+"Amariello: O fichero nomás existe en un costau\n"
+"Verde: O fichero ye mas nuevo que o fichero sin marcar en l'atro costau\n"
+"Royo: As grandarias d'os fichers son diferents"
+
+#: resources.h:1026
+msgid ""
+"Toggle synchronized browsing.\n"
+"If enabled, navigating the local directory hierarchy will also change the "
+"directory on the server accordingly and vice versa."
+msgstr ""
+"Alternar navegación sincronizada.\n"
+"Si ye activada, navegar por a estructura local de directorios tamién "
+"cambiará o directorio correspondient en o servidor y viceversa."
+
+#: resources.h:1014 resources.h:1015
+msgid "Toggles processing of the transfer queue"
+msgstr "Encetar u aturar o proceso d'a coda de transferencias"
+
+#: resources.h:1006 resources.h:1007
+msgid "Toggles the display of the local directory tree"
+msgstr "Amaga u amuestra l'arbol de directorios local"
+
+#: resources.h:1004 resources.h:1005
+msgid "Toggles the display of the message log"
+msgstr "Amaga u amuestra o rechistro de mensaches"
+
+#: resources.h:1008 resources.h:1009
+msgid "Toggles the display of the remote directory tree"
+msgstr "Amaga u amuestra l'arbol de directorios remoto"
+
+#: resources.h:1010 resources.h:1011
+msgid "Toggles the display of the transfer queue"
+msgstr "Amaga u amostra a coda de transferencia"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:605
+msgid "Too long header line"
+msgstr "Linia de capitera masiau larga"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:666
+msgid "Too many redirects"
+msgstr "Masiadas redireccions"
+
+#: ../../locales/../src/engine/logging.cpp:216
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
+msgid "Trace:"
+msgstr "Traza:"
+
+#: resources.h:942 resources.h:948
+msgid "Transfer"
+msgstr "Transferencia"
+
+#: resources.h:371
+msgid "Transfer &direction"
+msgstr "&Adreza d'a transferencia"
+
+#: resources.h:544
+msgid "Transfer &type"
+msgstr "&Mena de transferencia"
+
+#: resources.h:763
+msgid "Transfer Mode"
+msgstr "Modo de transferencia"
+
+#: resources.h:898
+msgid "Transfer Queue"
+msgstr "Coda de transferencia"
+
+#: resources.h:107
+msgid "Transfer Settings"
+msgstr "Opcions de Transferencia"
+
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
+#, c-format
+msgid "Transfer connection interrupted: %s"
+msgstr "Connexión de transferencia interrumpida: %s"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:621
+msgid "Transferred data got tainted."
+msgstr "Os datos transferidos s'han corrompiu."
+
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
+msgid "Transferring"
+msgstr "Se ye transferindo"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:123
+msgid "Transfers"
+msgstr "Transferencias"
+
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
+msgid "Transfers finished"
+msgstr "Transferencias rematadas"
+
+#: resources.h:854
+msgid "Treat files &without extension as ASCII file"
+msgstr "Tractar fichers sin e&xtensión como fichers ASCII"
+
+#: resources.h:850
+msgid "Treat the &following filetypes as ASCII files:"
+msgstr "Tractar as &siguients menas de fichers como ASCII:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
+msgid "Trust changed Hostkey:"
+msgstr "Confiar en a clau de maquina cambiada:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
+msgid "Trust new Hostkey:"
+msgstr "Confiar en a nueva clau de maquina:"
+
+#: resources.h:204
+msgid "Trust the new key and carry on connecting?"
+msgstr "Quiers confiar en a nueva clau y continar con a connexión?"
+
+#: resources.h:27
+msgid "Trust this certificate and carry on connecting?"
+msgstr "Quiers confiar en iste certificau y continar connectando-te?"
+
+#: resources.h:191
+msgid "Trust this host and carry on connecting?"
+msgstr "Quiers confiar en iste puesto y continar con a connexión?"
+
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
+msgid "Type"
+msgstr "Mena"
+
+#: resources.h:789
+msgid "Type of FTP Proxy:"
+msgstr "Mena de Proxy FTP:"
+
+#: resources.h:814
+msgid "Type of generic proxy:"
+msgstr "Mena de proxy chenerico:"
+
+#: resources.h:341
+msgid "U&pload"
+msgstr "&Puyar"
+
+#: resources.h:494 resources.h:834
+#, no-c-format
+msgid "U&pload limit:"
+msgstr "Limite de &puyada:"
+
+#: resources.h:960
+msgid "U&se filetype associations if available"
+msgstr "Emplegar a&sociacions de mena de fichers si son disponibles"
+
+#: resources.h:913
+msgid "U&se system defaults"
+msgstr "Emplegar valors predeterminadas d'o &sistema"
+
+#: resources.h:791
+msgid "USER@&HOST"
+msgstr "usuario@&puesto"
+
+#: ../../locales/../src/engine/proxy.cpp:454
+#, c-format
+msgid "Unassigned error code %d"
+msgstr "Codigo d'error no asignau %d"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
+msgid "Unit:"
+msgstr "Unidat:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
+msgid "Unknown"
+msgstr "Desconoixiu"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
+msgid "Unknown FTP proxy type, cannot generate login sequence."
+msgstr ""
+"Mena de proxy FTP desconoixida, no se puet chenerar a seqüencia d'inicio de "
+"sesión personalizau."
+
+#: ../../locales/../src/engine/proxy.cpp:368
+#, c-format
+msgid "Unknown SOCKS protocol version: %d"
+msgstr "Versión de protocolo SOCKS desconoixida: %d"
+
+#: resources.h:1
+msgid "Unknown certificate"
+msgstr "Certificau desconoixiu"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
+msgid ""
+"Unknown error opening the file. Make sure the file can be accessed and is a "
+"well-formed XML document."
+msgstr ""
+"S'ha produciu una error desconoixida en ubrir o fichero. Asegura-te que se "
+"puet acceder a lo fichero y que ye un documento XML bien formau."
+
+#: resources.h:184
+msgid "Unknown host key"
+msgstr "Clau de puesto desconoixida"
+
+#: ../../locales/../src/engine/proxy.cpp:378
+#, c-format
+msgid ""
+"Unknown protocol version of SOCKS Username/Password Authentication "
+"subnegotiation: %d"
+msgstr ""
+"Versión desconoixida de protocolo SOCKS de subnegociación d'autenticación "
+"usuario/clau: %d"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
+msgid ""
+"Unknown root element, the file does not appear to be generated by FileZilla."
+msgstr ""
+"L'elemento radiz ye desconoixiu, o fichero no pareix haber estau chenerau "
+"por FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:596
+#: ../../locales/../src/interface/netconfwizard.cpp:607
+msgid ""
+"Unless these problems get fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"De no estar que istos problemas se solucionen, o FTP en modo activo no "
+"funcionará y habrás d'emplegar o modo pasivo."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:583
+msgid ""
+"Unless this problem gets fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"De no estar que iste problema se solucione, FTP no funcionará en modo activo "
+"y habrás d'emplegar o modo pasivo."
+
+#: ../../locales/../src/engine/tlssocket.cpp:1079
+msgid "Unsupported certificate type"
+msgstr "Ixa mena de certificau no ye suportada."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:650
+msgid "Unsupported redirect"
+msgstr "A redirección no ye premitida."
+
+#: resources.h:342
+msgid "Up&load and unedit"
+msgstr "Puyar y des&fer edición"
+
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
+msgid "Update wizard"
+msgstr "Asistent d'actualización"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Actualizacions"
+
+#: resources.h:373
+msgid "Upload"
+msgstr "Puyar"
+
+#: ../../locales/../src/interface/edithandler.cpp:1262
+msgid "Upload failed"
+msgstr "A puyada ha fallau"
+
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
+msgid "Upload limit: %s/s"
+msgstr "Limite de puyada: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:611
+msgid "Upload limit: none"
+msgstr "Limite de descarga: dengún"
+
+#: resources.h:669
+msgid "Upload selected directory"
+msgstr "Puyar directorio seleccionau"
+
+#: resources.h:575
+msgid "Upload selected files and directories"
+msgstr "Puyar os fichers y carpetas seleccionadas"
+
+#: resources.h:326
+msgid "Upload this file back to the server?"
+msgstr "Quiers tornar a puyar iste fichero ta lo servidor?"
+
+#: resources.h:325
+msgid "Upload this file to the server?"
+msgstr "Quiers puyar iste fichero ta lo servidor?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
+msgid "Uploading"
+msgstr "Se ye puyando"
+
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
+msgid "Uploading and pending removal"
+msgstr "Se ye puyando y ye pendient de borrar-se"
+
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
+msgid "Uploading and unediting"
+msgstr "Se ye puyando y desfendo"
+
+#: resources.h:119
+msgid "Use &custom charset"
+msgstr "Emplegar un &conchunto de caracters personalizau:"
+
+#: resources.h:957
+msgid "Use &custom editor:"
+msgstr "Emplegar l'editor &personalizau:"
+
+#: resources.h:432
+msgid "Use &default editor for text files"
+msgstr "Emplegar l'editor pre&determinau ta fichers de texto"
+
+#: resources.h:415 resources.h:421
+msgid "Use &synchronized browsing"
+msgstr "Emplegar a navegación s&incronizada"
+
+#: resources.h:117
+msgid "Use UTF-8 if the server supports it, else use local charset."
+msgstr ""
+"Emplegar UTF-8 si o servidor l'admite. Si no, emplegar o chuego de caracters "
+"local."
+
+#: resources.h:268 resources.h:278
+msgid "Use default action"
+msgstr "Emplegar acción predeterminada"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Emplegar FTP simple"
+
+#: resources.h:381
+msgid "Use server currently connected to"
+msgstr "Emplegar o servidor actualment connectau"
+
+#: resources.h:382
+msgid "Use server from site manager"
+msgstr "Emplegar o servidor dende o chestor de puestos"
+
+#: resources.h:907
+msgid "Use system &defaults"
+msgstr "Emplegar valors pre&determinaus d'o sistema"
+
+#: resources.h:715
+msgid "Use the following IP address:"
+msgstr "Emplegar a siguient adreza IP:"
+
+#: resources.h:725
+msgid "Use the following port range:"
+msgstr "Emplegar o siguient intervalo de puertos:"
+
+#: resources.h:710
+msgid "Use the server's external IP address instead"
+msgstr "Emplegar 'adreza IP externa d'o servidor en cuenta"
+
+#: resources.h:716 resources.h:779
+msgid ""
+"Use this if you're behind a router and have a static external IP address."
+msgstr ""
+"Emplega isto si te trobas dimpués d'un enrotador y tiens una adreza IP "
+"externa estatica."
+
+#: resources.h:719
+msgid ""
+"Use this option if you have a dynamic IP address. FileZilla will contact the "
+"above server once each session as soon as you use active mode for the first "
+"time. Only the version of FileZilla you're using is submitted to the server."
+msgstr ""
+"Emplega ista opción si tiens una adreza IP dinamica. FileZilla contactará "
+"con o servidor alto mencionau una vez por sesión quan tú emplegues o modo "
+"activo por primera vez. Solament se ninvia ta lo servidor a versión de "
+"FileZilla que yes emplegando."
+
+#: resources.h:131
+msgid "User:"
+msgstr "Usuario:"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+msgid "Username cannot be a series of spaces"
+msgstr "O nombre d'usuario no puet estar una serie d'espacios"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
+#, c-format
+msgid "Using proxy %s"
+msgstr "Emplegar proxy %s"
+
+#: resources.h:121
+msgid ""
+"Using the wrong charset can result in filenames not displaying properly."
+msgstr ""
+"Si no s'emplega o chuego de caracters adequau, os nombres de fichero pueden "
+"no amostrar-se correctament."
+
+#: resources.h:241
+msgid "Using this wizard you can check for available updates to FileZilla."
+msgstr ""
+"Emplegando iste asistent puetz comprebar si bi ha disponibles actualizacions "
+"de FileZilla."
+
+#: resources.h:5 resources.h:34
+msgid "Valid from:"
+msgstr "Valido dende:"
+
+#: resources.h:6 resources.h:35
+msgid "Valid to:"
+msgstr "Valido dica:"
+
+#: ../../locales/../src/interface/cmdline.cpp:17
+msgid "Verbose log messages from wxWidgets"
+msgstr "Rechistro de mensaches detallau de wxWidgets"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1165
+msgid "Verifying certificate..."
+msgstr "Se ye verificando o certificau..."
+
+#: resources.h:179
+msgid "Version:"
+msgstr "Versión:"
+
+#: resources.h:839
+msgid "Very high"
+msgstr "Muit alta"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
+msgid "View hidden option set, but unsupported by server"
+msgstr "Opción 'veyer amagaus' fixada, pero no premitida por o servidor"
+
+#: resources.h:944
+msgid "View/Edit"
+msgstr "Veyer/Editar"
+
+#: resources.h:365
+msgid "Visible columns"
+msgstr "Columnas visibles"
+
+#: resources.h:149
+msgid "W&rite"
+msgstr "Esc&ribir"
+
+#: ../../locales/../src/interface/QueueView.cpp:1781
+msgid "Waiting"
+msgstr "Se ye asperando"
+
+#: ../../locales/../src/interface/QueueView.cpp:1381
+msgid "Waiting for browsing connection"
+msgstr "Se ye asperando a connexión d'o navegador"
+
+#: ../../locales/../src/interface/QueueView.cpp:1424
+msgid "Waiting for password"
+msgstr "Se ye asperando a clau"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
+msgid "Waiting for transfer to be cancelled"
+msgstr "Se ye asperando a que a transferencia siga cancelada"
+
+#: ../../locales/../src/engine/engineprivate.cpp:203
+msgid "Waiting to retry..."
+msgstr "Se ye asperando ta reintentar..."
+
+#: ../../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 ""
+"Alvertencia!\n"
+"\n"
+"Una error de Windows causa problemas con FileZilla.\n"
+"\n"
+"A error ocurre si tiens\n"
+"- Windows Server 2003 u XP 64\n"
+"- Firewall de Windows activau\n"
+"- Servicio de puerta d'enlaz de capa d'aplicación activau\n"
+"Veyer http://support.microsoft.com/kb/931130 ta mas información.\n"
+"\n"
+"De no estar que desenchegues o Firewall de Windows u o servicio de puerta "
+"d'enlaz de capa d'aplicación,\n"
+"FileZilla fallará en as trasnferencias grans."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:972
+msgid "Warning, ignoring data connection from wrong IP."
+msgstr ""
+"Para cuenta! Se son inorando os datos de connexión dende una IP incorrecta"
+
+#: ../../locales/../src/interface/updatewizard.cpp:272
+msgid ""
+"Warning, use nightly builds at your own risk.\n"
+"No support is given for nightly builds.\n"
+"Nightly builds may not work as expected and might even damage your system.\n"
+"\n"
+"Do you really want to check for nightly builds?"
+msgstr ""
+"Para cuenta!, Fe servir as versions de desembolique por a tuya cuenta y "
+"risgo.\n"
+"No se da suporte ta ixas versions.\n"
+"As versions de desembolique pueden no funcionar d'o modo asperau y mesmo "
+"podrían danyar o tuyo sistema.\n"
+"\n"
+"Seguro que quiers comprebar si bi ha versions de desembolique?"
+
+#: resources.h:196
+msgid "Warning: Potential security breach!"
+msgstr "Alvertencia: Forau potencial de seguranza!"
+
+#: resources.h:485
+msgid "Welcome to FileZilla"
+msgstr "Bienveniu en FileZilla"
+
+#: resources.h:474
+msgid "What's new"
+msgstr "Qué bi ha de nuevo"
+
+#: resources.h:251
+msgid "What's new:"
+msgstr "Qué bi ha de nuevo:"
+
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Quan permites que FileZilla remere claus, puetz reconnectar-te sin tener que "
+"tornar a meter una clau dimpués de reenchegar FileZilla."
+
+#: resources.h:842
+msgid ""
+"When enabled, characters that are not supported by the local operating "
+"system in filenames are replaced if downloading such a file."
+msgstr ""
+"Quan ye activau, os caracters no suportaus por o sistema operativo en os "
+"nombres de fichers, se substituyen mientras a descarga."
+
+#: resources.h:884
+msgid "Widescreen"
+msgstr "Pantalla panoramica"
+
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Quiers que FileZilla remere as claus?"
+
+#: resources.h:153
+msgid "Wr&ite"
+msgstr "Escr&ibir"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:433
+#: ../../locales/../src/interface/netconfwizard.cpp:440
+msgid "Wrong external IP address"
+msgstr "L'adreza IP externa ye incorrecta"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+msgid "Wrong line endings"
+msgstr "Os finals de linia son incorrectos"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+msgid "Yes"
+msgstr "Sí"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Pareix que yes emplegando un puesto de IPv6 nomás. Iste asistent no suporta "
+"isto."
+
+#: resources.h:262
+msgid ""
+"You are already using the most recent version of FileZilla. Please check "
+"again in future."
+msgstr ""
+"Ya yes emplegando a zaguera versión de FileZilla. Por favor torna a "
+"comprebar-lo en o esbenidero."
+
+#: resources.h:483
+msgid "You can always open this dialog again through the help menu."
+msgstr "Perén podrás veyer iste mensache a traviés d'o menú d'aduya."
+
+#: ../../locales/../src/engine/server.cpp:65
+msgid "You can leave the port field empty to use the default port."
+msgstr ""
+"Puetz deixar o campo d'o puerto en blanco ta emplegar o puerto por defecto."
+
+#: resources.h:156
+msgid ""
+"You can use an x at any position to keep the permission the original files "
+"have."
+msgstr ""
+"Puetz emplegar una x en qualsiquier posición ta mantener os premisos "
+"orichinals."
+
+#: ../../locales/../src/interface/import.cpp:28
+msgid "You cannot import settings from FileZilla's own settings directory."
+msgstr ""
+"No puetz importar opcions dende o mesmo directorio de opcions de FileZilla."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
+msgid ""
+"You cannot replace an invalid character with another invalid character. "
+"Please enter a character that is allowed in filenames."
+msgstr ""
+"No puetz substituir un caracter invalido con unatro caracter invalido. Por "
+"favor, mete un caracter premitiu ta nombres de fichers."
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "You did not enter a new name for the file. Overwrite the file instead?"
+msgstr "No has escrito un nuevo nombre t'o fichero. Quiers sobreescribir-lo?"
+
+#: resources.h:464
+msgid "You have selected at least one symbolic link."
+msgstr "Has de seleccionar a lo menos un vinclo simbolico."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
+msgid ""
+"You have selected more than 10 files for editing, do you really want to "
+"continue?"
+msgstr ""
+"Has seleccionau mas de 10 fichers ta editar, seguro que quiers continar?"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2136
+msgid ""
+"You have selected more than 10 files or directories to open, do you really "
+"want to continue?"
+msgstr ""
+"Has seleccionau mas de 10 fichers u directorios ta ubrir, seguro que quiers "
+"continar?"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+msgid "You have to enter a hostname."
+msgstr "Has d'escribir un nombre de puesto."
+
+#: ../../locales/../src/interface/search.cpp:818
+msgid "You have to enter a local directory."
+msgstr "Has d'escribir un directorio local."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:149
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
+msgid "You have to enter a valid IP address."
+msgstr "Has d'escribir una adreza IP valida."
+
+#: ../../locales/../src/interface/search.cpp:824
+msgid "You have to enter a writable local directory."
+msgstr "Has d'escribir un directorio local con premisos d'escritura."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
+msgid "You have to enter an account name"
+msgstr "Has d'escribir un nombre de cuenta"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
+msgid "You have to specify a user name"
+msgstr "Has d'escribir un nombre d'usuario"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:622
+msgid ""
+"You likely have a router or firewall which erroneously modified the "
+"transferred data."
+msgstr ""
+"Probablement tiens un enrotador u tallafuegos que modifica erroniament os "
+"datos transferius."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
+msgid "You need to enter a name for the bookmark."
+msgstr "Te cal meter un nombre t'o marcapachinas."
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
+msgid "You need to enter a name for the log file."
+msgstr "Te cal meter un nombre t'o fichero de rechistro."
+
+#: ../../locales/../src/interface/edithandler.cpp:1646
+msgid "You need to enter a properly quoted command."
+msgstr "Te cal meter un comando adequadament entre cometas."
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
+msgid "You need to enter a proxy host."
+msgstr "Te cal meter un servidor proxy."
+
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
+msgid "You need to enter a proxy port in the range from 1 to 65535"
+msgstr "Te cal meter un puerto de proxy entre l'1 y lo 65535."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+msgid "You need to enter at least one path, empty bookmarks are not supported."
+msgstr "Te cal meter a lo menos una rota, no s'admiten marcapachinas vuedos."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this bookmark."
+msgstr ""
+"Te cal meter tanto a rota remota como a local ta activar a navegación "
+"sincronizada en iste marcapachinas."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this site."
+msgstr ""
+"Te cal meter tanto a rota remota como a local ta activar a navegación "
+"sincronizada en iste puesto."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:316
+msgid "You need to specify a local file."
+msgstr "Has d'especificar un fichero local."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:336
+msgid "You need to specify a remote file."
+msgstr "Has d'especificar un fichero remoto."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:343
+msgid "You need to specify a remote path."
+msgstr "Has d'especificar una rota remota."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:309
+msgid "You need to specify a server."
+msgstr "Has d'especificar un servidor."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:568
+msgid ""
+"You should have no problems connecting to other servers, file transfers "
+"should work properly."
+msgstr ""
+"No habrías de tener problemas en connectar con atros servidors, as "
+"transferencias de fichers habrían de funcionar correctament."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
+msgid "after"
+msgstr "dimpués"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "before"
+msgstr "antis"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+msgid "begins with"
+msgstr "empecipia con"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+msgid "contains"
+msgstr "contién"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+msgid "does not contain"
+msgstr "no contién"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
+msgid "does not equal"
+msgstr "no ye igual"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+msgid "ends with"
+msgstr "remata con"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
+msgid "equals"
+msgstr "ye igual"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
+msgid "file"
+msgstr "fichero"
+
+#: ../../locales/../src/interface/edithandler.cpp:88
+msgid "fz3temp-lockfile"
+msgstr "fichero de rechistro fz3temp"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid ""
+"fzputtygen could not be started.\n"
+"Please make sure this executable exists in the same directory as the main "
+"FileZilla executable."
+msgstr ""
+"fzputtygen no ha puesto encetar-se.\n"
+"Por favor asegura-te que iste executable existe en o mesmo directorio que o "
+"fichero executable de FileZilla."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
+msgid "fzsftp could not be started"
+msgstr "fzsftp no ha puesto estar encetau"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1117
+msgid "gnutls_certificate_get_peers returned no certificates"
+msgstr "gnutls_certificate_get_peers no retornó certificaus"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+msgid "greater than"
+msgstr "mayor que"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+msgid "group executable"
+msgstr "a colla leye"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+msgid "group readable"
+msgstr "a colla leye"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+msgid "group writeable"
+msgstr "a colla escribe"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+msgid "is equal to"
+msgstr "ye igual a"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+msgid "is set"
+msgstr "ye definiu"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+msgid "is unset"
+msgstr "no ye definiu"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+msgid "less than"
+msgstr "menor que"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+msgid "matches regex"
+msgstr "concuerda con expresión regular"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+msgid "owner executable"
+msgstr "o propietario executa"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+msgid "owner readable"
+msgstr "o propietario leye"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+msgid "owner writeable"
+msgstr "o propietario escribe"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
+#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
+msgid "unknown"
+msgstr "desconoixiu"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+msgid "world executable"
+msgstr "a resta executan"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+msgid "world readable"
+msgstr "a resta leyen"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "world writeable"
+msgstr "a resta escriben"
+
+#: resources.h:174
+msgid "wxWidgets:"
+msgstr "wxWidgets:"
+
+#~ msgid "&Copy"
+#~ msgstr "&Copiar"
+
+#~ msgid "Cop&y"
+#~ msgstr "Cop&iar"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Enchegar comprebación automatica d'actualizacions"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Numero de diyas entre comprebacions d'actualización:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(A lo menos 7 diyas)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Comprebación automatica d'actualizacions"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Comprebar si bi ha versions &beta y candidatas a lo lanzamiento"
diff -Nru filezilla-3.5.3/locales/ar.po filezilla-3.7.3~precise/locales/ar.po
--- filezilla-3.5.3/locales/ar.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ar.po	2013-06-27 20:03:26.000000000 +0000
@@ -6,31 +6,30 @@
 msgstr ""
 "Project-Id-Version: FileZilla3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-02 10:49+0300\n"
-"Last-Translator: awadh alghaamdi _ منتديات عميد التعريب "
-"<awadh_al_ghaamdi@hotmail.com>\n"
+"POT-Creation-Date: 2013-06-24 19:29+0200\n"
+"PO-Revision-Date: 2013-06-24 07:06+0300\n"
+"Last-Translator: awadh alghaamdi <awadh_al_ghaamdi@hotmail.com>\n"
 "Language-Team: Awadh Al-Ghaamdi <awadh_al_ghaamdi@hotmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Country: SAUDI ARABIA\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: ar\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-Poedit-Language: Arabic\n"
+"X-Generator: Poedit 1.5.5\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
-msgstr "المنقضي %H:%M:%S"
+msgstr "%H:%M:%S المنقضي"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "المتبقي %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -50,9 +49,9 @@
 msgstr[4] "%d مجلد"
 msgstr[5] "%d مجلد"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -65,9 +64,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -100,7 +99,7 @@
 msgstr[4] "%d ملف . الحجم الكلي : على الأقل %s"
 msgstr[5] "%d ملف . الحجم الكلي : على الأقل %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "تمت إضافة %d ملف إلى قائمة الإنتظار"
@@ -116,31 +115,21 @@
 msgstr[4] "%d ثواني"
 msgstr[5] "%d ثانية"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - المضيف"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - كلمة المرور"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "(%s ـ (%d ب/ث"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "(%s ـ (%d.%d كب/ث"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "(%s ـ (%d.%d مب/ث"
+msgid "%s (%s/s)"
+msgstr "%s (%s/ث)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "(%s (؟ ب/ث"
@@ -155,7 +144,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - ليست صالحة بعد"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - مستخدم الملقم"
@@ -181,27 +170,17 @@
 msgstr[4] "%s بايت"
 msgstr[5] "%s بايت"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s بايت"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s بايت (%d ب/ث)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s بايت (%d.%d كب/ث)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s بايت (%d.%d مب/ث)"
+msgid "%s bytes (%s/s)"
+msgstr "%s بايت (%s/ث)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -215,7 +194,7 @@
 "الرجاء تحميل FileZilla مرة ثانية . إذا أستمرت هذه المشكلة أرسل لنا تقرير عن "
 "الخطأ"
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -236,152 +215,148 @@
 msgid "%s with %d bits"
 msgstr "%s مع %d بت"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - المستخدم"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - كلمة مرور الملقم الوكيل"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&حول..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
-msgstr "&حساب:"
+msgstr "&الحساب:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&نشط"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "إ&ضافة عنوان مفضل..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "إ&ضافة ملفات إلى قائمة الإنتظار"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "إ&ضافة ملف مفتاح..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "إ&ضافة إلى قائمة الإنتظار"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "ضبط &فارق التوقيت للخادم:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "الوثوق &دائما بالشهادة في الجلسات المستقبلية"
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "دائما الوثوق بهذا ال&مضيف , إضافة هذا المفتاح إلى المخزون المؤقت"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&دائما إستخدام المحرر الإفتراضي"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "دائما أ&ستخدم التحديد للملفات الغير مشروكة"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "دائما إستخدام هذا الإ&جراء"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "ال&طلب من نظام التشغيل العنوان الخارجي لـ IP"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&آلي"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&كشف آلي"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&ثنائى"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&بادئات ثنائية تستخدم رموز SI (مثال : 1 كب = 1024 بايت)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "ال&عناوين المفضلة"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "ت&صفح..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "إ&قحام التجاوب :"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "إ&لغاء الأمر"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "التدقيق &بحثا عن نسخ beta من FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&مسح بيانات الخصوصية..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "إغلاق FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "ت&كوين حدود السرعة..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "ت&كوين..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "إ&تصال"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&نسخ"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&نسخ الإتصال الحالي إلى مدير الموقع..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "نسخ &إلى الحافظة"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "الأ&عطال"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "إنشاء دليل"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "إ&نشاء تبويب جديد"
 
@@ -389,645 +364,653 @@
 msgid "&Debug"
 msgstr "ت&صحيح"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&معلومات التصحيح في سجل الرسالة"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "ال&محرر الإفتراضي:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "ال&إجراء الإفتراضي للملف الموجود..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "ال&تأخير بين المحاولات الفاشلة لتسجيل الدخول :"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&حذف"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&حذف الرابط الترميزي"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "مقارنة الأ&دلة"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "الت&خلي عن الملف المحلي ثم التحميل و تحرير الملف بشكل جديد"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&قطع الإتصال"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "قطع الإ&تصال من الخادم"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "عرض &سرعة النقل فورا بدلا من معدل السرعة"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "عرض ال&حجم بالبايت"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&عدم تذكر كلمات المرور"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&عدم إظهار هذه اللائحة مرة ثانية"
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "عدم إ&ستخدام عنوان IP خارجى مع الإتصالات المحلية"
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "إجراء ال&نقرة المزدوجة على الملفات:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "ت&حميل"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "التحميل &إلى:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "ت&حميل..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&عمليات التحميل:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "ت&حرير"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "تحرير &قواعد المرشح..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "ت&مكين"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "ت&مكين التدقيق التلقائي للبحث عن تحديث"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "ت&مكين حدود السرعة"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "ال&ترميز:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "ال&تشفير :"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "إدخال &أمر مخصص..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "ت&نفيذ"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "ت&صدير مدخلات مدير الموقع"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "ت&صدير..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&رجوع كامل إلى النمط النشط"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&ملف"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&خصائص الملف..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&أذونات الملف..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "ال&ملف:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&شروط المرشح:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&مجموعات المرشح:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "ال&مرشحات:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "إ&نتهاء"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "إ&نتهاء تحرير و حذف الملف المحلي"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "ت&سطيح المسارات البعيدة ، تحميل كافة الملفات المحتوية مباشرة إلى الدليل الهدف"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "تتبع &الرابط الترميزي ، حذف محتويات الدليل الهدف"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "الحصول على عنوان IP الخارجى من الرابط التالي :"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "ال&حصول على تعليمات..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "العنوان المفضل ال&شامل"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 باستخدام طريقة CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "تعل&يمات"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "إ&خفاء الملفات المتطابقة"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "ال&أعلى"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "أ&على منفذ متوفر:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "ال&مضيف:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "البادئات الثنائية &IEC (مثال : 1 كي.ب = 1024 بايت)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (مثال: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "إ&ستيراد..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "إ&شراكات متوارثة لأنواع ملفات النظام"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "إ&بقاء تركيبة المسار البعيد مقارب إلى جذر البحث"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "تخطيط &لوائح الملفات و الأدلة:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&حدود المنافذ المحلية المستخدمة من قبل FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "حدود &عدد الإتصالات المتزامنة"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "ت&فرع المجلد المحلى"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "ال&دليل المحلى:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&سجل إلى ملف"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&نوع الدخول:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&نوع الدخول:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&منخفض"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "إ&دارة العناوين المفضلة..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&إرسال يدوي..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "أ&قصى عدد للإتصالات:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&أقصى عدد للمحاولات:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "سجل ال&رسائل"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "ت&صغير إلى جوار الساعة"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "الأ&سم:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "معالج ت&كوين الشبكة..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&جديد"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&موقع جديد"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "يتوفر &نسخة جديدة"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "ال&تالي >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&لا"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&بدون"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&عادى"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&عدد الأيام بين فترات البحث عن تحديثات:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "ال&قيمة العددية:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&حسنا"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&فتح"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&فتح"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&كتابة على الملف"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&سلبي"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&كلمة المرور:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "تشغيل &صوت"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "ال&منفذ:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&مكان سجل الرسائل :"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "الإ&حتفاظ بطوابع وقت الملفات المنقولة"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&قائمة الإنتظار"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "إ&تصال سريع"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&شريط الإتصال السريع"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&قراءة"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "إ&عادة الإتصال"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "ت&حديث"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&تذكر كلمة المرور لهذه الجلسة"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "تذكر &كلمات المرور"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "ال&دليل البعيد:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "ال&مسار البعيد:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "إ&زالة"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "إ&زالة المفتاح"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "إزالة المحددة"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&تسمية"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&تسمية..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "إ&عادة فتح الملف المحلي"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "إ&ستبدال الرموز الغير صالحة مع :"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "التبليغ عن &خطأ..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "إ&ستعادة و إعادة وضع الكل في قائمة الإنتظار"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "إ&عادة تشغيل المعالج"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "إ&ستئناف"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "ت&شغيل أمر..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "ت&شغيل معالج التكوين الآن..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "تشغيل &وحدة التحديث الآن..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "حفظ &باسم..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&بحث"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&بحث عن ملفات بعيدة..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "ت&حديد مدخلة:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "تحديد ال&لغة:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "تحديد الأ&عمدة المراد عرضها :"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&خادم"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "إ&عدادات"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "إ&عدادات..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "إ&ظهار قائمة التصحيح"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "إظهار ال&رسالة"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "إ&ظهار طوابع الوقت في سجل الرسائل"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&مدير المواقع..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "عنوان مفضل لموقع-&معين"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "ت&جاوز"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&حدود السرعة"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&بدء الإرسال فورا"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "الت&بديل بين اللوائح المحلية و البعيدة"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&تشفير TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&فحص"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "ال&سمة :"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "إ&رسال"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&نمط الإرسال"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&قائمة إنتظار الإرسال"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&معاملة الملفات ذات النقط بهيئة ملفات ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "ال&وحدة:"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "ت&حديث المفتاح المخزن مؤقتا لهذا المضيف"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&رفع"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "عمليات ال&رفع:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "إ&ستخدام برنامج مخصص"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "إستخدام &تصفح متزامن"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "إ&ستخدم محرر النظام الإفتراضي للملفات النصية"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "إ&ستخدام عنوان IP التالي :"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "إ&ستخدام عنوان IP الخارجي للخادم بدلا من ذلك"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "إ&ستخدام ألوف الفواصل"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&المستخدم:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&المستخدم:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "ال&نسخة %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&عرض"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&عرض/تحرير"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&مراقبة الملفات المعدلة محليا و المطالبة برفع التعديلات"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&عند التحقق من التحديثات, التحقق أيضا من:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&كتابة"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&نعم"
 
@@ -1045,11 +1028,27 @@
 msgstr "'%s' ليس دليلا"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "نوع الدخول 'الحساب' ليس مدعوما من قبل البروتوكول المحدد"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"أنواع تسجيل الدخول العادية للحساب ليست متوفرة،, يمكنك استخدام 'Ask for "
+"password' بدلا من ذلك"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"أنواع تسجيل الدخول العادية للحساب ليست متوفرة،, تم تغيير الإدخال الخاص بك "
+"إلى 'Ask for password' ـ"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1071,120 +1070,116 @@
 msgstr[4] "(تم فرز %d كائن)"
 msgstr[5] "(تم فرز %d كائن)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 غير محدود)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 ثانية)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999 , 0 للتعطيل)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(على الأقل 7 أيام)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(مثال: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(مثال: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(في %s/ث)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S المتبقى"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- المتبقي"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- جهاز توجيه معطل و/أو جدار حماية"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- الملف تالف على المرآة"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- برنامج ضار على نظامك"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:--المتبقي"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "لا يمكن إستخدام -c مع رابط FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "يمكن فقط أن يستخدم -l مع رابط FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "لا يمكن أن يتواجد -c و -s في نفس الوقت"
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "لا يمكن إستخدام -s مع رابط FTP"
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - بدون"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - تحذير"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - معلومات"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - مسهب"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "نظام 32 بت"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - تصحيح"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "نظام 64 بت"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< ال&خلف"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "؟"
 
@@ -1193,16 +1188,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "يوجد عنوان مفضل بالإسم المدخل مسبقا . الرجاء إدخال إسم غير مستعمل"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "يجب وضع المحرر إفتراضي"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "لا يمكن سحب المجلد إلى أحد مجلداته الفرعية"
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1212,27 +1208,27 @@
 "مثل هذه الحالات قد تستخدم النمط النشط . حيث أنه في النمط النشط يقوم "
 "FileZilla بفتح منفذ و من ثم يطلب من الخادم الإتصال به"
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "تم تغيير ملف مفتوح مسبقا"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "تم تعديل ملف بهذا الإسم مسبقا . هل تريد إعادة فتح '%s' ؟"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "تم إرسال ملف بهذا الإسم مسبقا"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "يتم الآن تعديل ملف بهذا الإسم . الرجاء إغلاقه ثم حاول مرة ثانية"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1245,11 +1241,11 @@
 "مالم تصلح هذه المشكلة ، فقد تفقد الملفات في نتائج الملفات\n"
 "لن يتم عرض تحذير في هذه الجلسة"
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "يتوفر نسخة جديدة من FileZilla :"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1257,7 +1253,7 @@
 "الخادم الصحيح يعرض دائما كافة الملفات ، لكن بعض الخادمات المتعطلة تخفي "
 "الملفات عن المستخدمين . أستخدم هذا الخيار لإجبار الخادم على عرض كافة الملفات"
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1271,15 +1267,15 @@
 "عملية بعيدة مستمرة و التصفح المتزامن في وضع التمكين\n"
 "عطل التصفح المتزامن و تابع تغيير الدليل المحلي ؟"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "إض&افة"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "ال&سماح باستئناف ملفات ASCII"
 
@@ -1291,55 +1287,55 @@
 msgid "A&pply only to uploads"
 msgstr "ت&طبيق فقط على عمليات الرفع"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "ت&طبيق على كافة الملفات و الأدلة"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "إ&زالة عمليات الإرسال الناجحة تلقائيا"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "قطع الإتصال السابق و الإتصال في تبويب جديد"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "حول FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "فوق قوائم الملفات"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "الحساب"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "الإجراء بعد إ&كتمال قائمة الإنتظار"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "الإجراء مع الملف المحدد :"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "الإجراء للتنفيذ :"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "الإجراء:"
 
@@ -1371,23 +1367,23 @@
 "التوجيه الخاص بك أو برنامج الجدار الناري قام بتعديل عنوان الإرسال إلى جهة "
 "غير صحيحة"
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP النمط النشط"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "إ&ضافة الملفات فقط إلى قائمة الإنتظار"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "إ&ضافة الدليل المحدد إلى قائمة إنتظار الإرسال"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "إضافة الملفات المحددة و المجلدات الى قائمة إنتظار الإرسال"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "إ&ضافة إلى قائمة الإنتظار"
 
@@ -1395,27 +1391,41 @@
 msgid "Address type not supported"
 msgstr "نوع العنوان غير معتمد"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "متقدم"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "خيارات متقدمة:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"نصيحة: إذا كنت لا ترغب في اختبار ميزات جديدة، فالرجاء الاستمرار في استخدام "
+"الإصدارات المستقرة فقط. إن إصدارات بيتا و الإصدارات الليلية تعتبر مخصصة فقط "
+"لأغراض الاختبار. إن إن الإصدارات الليلية من FileZilla قد لا تعمل كما هو "
+"متوقع، وقد تؤدي حتى إلى تلف النظام الخاص بك. وبالتالي فإن استخدام هذه "
+"الإصدارات يكون على مسؤوليتك الخاصة"
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "الخوارزمية:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "تم إرسال كافة الملفات بنجاح"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "كل المنافذ في المجال الذى تم إدخاله يجب ان تكون بين 1024 و 65535"
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1426,19 +1436,19 @@
 msgstr[4] "كافة عمليات الإرسال أنتهت . تعذر إرسال %d ملفات"
 msgstr[5] "كافة عمليات الإرسال أنتهت . تعذر إرسال %d ملف"
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "السماح بالتراجع الكامل إلى نمط إرسال آخر &عند الفشل"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "السماح بالتراجع الكامل إلى نمط آخر عند الفشل"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "متصل مسبقا"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1446,7 +1456,7 @@
 "بدلا من ذلك يمكنك أن تستخدم أداة Pageant من PuTTY لإدارة مفاتيحك ، FileZilla "
 "لا يتعرف على Pageant"
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1454,13 +1464,13 @@
 "ممكن تستخدم بدلا عن ذلك وكيل SSH في نظامك . و لعمل ذلك ، تأكد من أن متغير "
 "بيئة SSH_AUTH_SOCK موضوع"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr "بدلا من ذلك ، قم بزيارة http://filezilla-project.org لتحميل آخر نسخة"
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1469,7 +1479,7 @@
 "حدث خطأ أثناء تحميل قائمة إنتظار النقل من \"%s\"\n"
 "بعض العناصر الموجودة في قائمة الانتظار ربما لم يتم استعادتها"
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1478,91 +1488,91 @@
 "حدث خطأ أثناء حفظ قائمة إنتظار النقل إلى \"%s\"\n"
 "بعض العناصر الموجودة في قائمة الانتظار ربما لم يتم حفظها"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 "يوجد مادة بنفس الإسم مسبقا موجودة عن طريق السحب و الإفلات في المكان المستهدف"
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "مجهول"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "عملية أخرى مستمرة عن بعد ، لا يمكن تغيير الدليل الآن"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "أي تغييرات تتم مع مدير الموقع قد لا يمكن حفظها"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 ""
 "سوف لن يتم حفظ أي تغييرات تقوم بها في مدير الموقع مالم تقوم بإصلاح الملف"
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "أي تغييرات تتم مع المرشحات قد لا يمكن حفظها"
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "سوف لن يتم حفظ أي تغييرات تمت على المرشحات"
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "ت&طبيق فقط على الأدلة"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "تطبيق"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "تطبيق فقط على &قائمة الانتظار الحالية"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "تطبيق فقط على ال&ملفات"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "إ&رشيف"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "كعلامة في لائحة قائمة الإنتظار للإرسال"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "المطالبة بالإجراء"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "طلب كلمة المرور"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "سؤال نظام التشغيل من اجل منفذ"
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "سؤال نظام التشغيل الخاص بك عن عنوان IP خارجي"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "طرح أسئلة في منتديات FileZilla"
 
@@ -1570,39 +1580,35 @@
 msgid "Associated program not found:"
 msgstr "البرنامج المشروك غير موجود :"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "هناك على الاقل شرط واحد للمرشح غير مكتمل"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "عند هذه النقطة ، تم تجميع كافة المعلومات المطلوبة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "الخاصية"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "فشلت المصادقة"
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "المؤلف:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "آلي"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "تصنيف آلي لنوع الملف"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "التدقيق آليا بحثا من تحديثات"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "الأحجام المتوفرة"
 
@@ -1611,66 +1617,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "ب <رمز وحدة البايت . تترجم الحرف الأول فقط>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "ت&جاوز الملقم الوكيل"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "تعليمات الإستخدام الأساسية"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "السلوك"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "يتم التحرير"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "وضع علامة على زوائد العبارة"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "أنتبه! تم إبطال الشهادة"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "ثنائى"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "لوحة سوداء"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "عنوان مفضل"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "العنوان المفضل:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "عناوين مفضلة"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "تاريخ الإصدار"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "معلومات الإصدار"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "فئة العمل :"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1680,63 +1686,63 @@
 "كنت تريد أن تفرض على FileZilla أن يستخدم مجال صغير من المنافذ , فالرجاء "
 "إدخال مجال المنفذ أسفل"
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "إ&لغاء العملية الحالية"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "ال&تدقيق بحثا عن الإصدارات المحايدة من FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&مسح الكل"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "&نسخ الرابط إلى الحافظة"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&مخصص"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "إ&شراكات مخصصة لأنواع الملفات :"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "تعداد فارق التوقيت للخادم..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "تعذرت القراءة من الملف"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "تعذرت كتابة البيانات إلى الملف"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "تعذرت كتابة البيانات إلى الملف : %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "إلغاء الأمر"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "الغاء العملية الحالية"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "لإلغاء العملية الحالية"
 
@@ -1745,11 +1751,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "لا يمكن دخول '%s' ، لا يوجد وسيطة مدخلة أو محرك الأقراص غير جاهز"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "تعذرت إضافة الخادم إلى مدير الموقع"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1765,37 +1771,37 @@
 "لا يمكن مقارنة المجلدات ، مرشحات مختلفة للأدلة المحلية و البعيدة في وضع "
 "التمكين"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "لا يمكن مقارنة الأدلة ، غير متصل بأي خادم"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "تعذر إنشاء مرشح جديد"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "تعذر تحرير الملف"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "تعذر تحرير الملف , غير متصل بأي خادم"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "لا يمكن تحرير الملف ، المسار البعيد غير معروف"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "تعذر تأسيس إتصال FTP إلى خادم SFTP . الرجاء تحديد البروتوكول الصحيح"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "تعذر تحميل شريط الإتصال السريع من ملف الموارد"
 
@@ -1807,44 +1813,48 @@
 msgid "Cannot load keyfile"
 msgstr "تعذر تحميل ملف المفتاح"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "تعذر تحميل شريط الأدوات من ملف الموارد"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "لا يمكن تذكر كلمة المرور"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "تعذرت تسمية المدخلة"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "تعذرت تسمية الملف"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "تعذر حفظ مجموعة المرشح"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "تعذر تحديد المرشح"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "تعذر وضع إشراك الملف"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "تعذر إظهار اللائحة"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "تعذر عرض/تحرير الملف المحدد"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "الفئات"
 
@@ -1852,59 +1862,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "تاريخ الشهادة و بيانات الجلسة غير متوفرة بعد"
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "تفاصيل الشهادة"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "الشهادة في السلسة:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "ناشر الشهادة"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "الإعتراض :"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "تغيير خواص الملف"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "تغيير أذونات الملف"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "التغيير لإعدادات ملف السجل يتطلب إعادة تشغيل FileZilla"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "حالة ترميز الرمز"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "مجموعة الرموز"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "التدقيق بحثا عن نسخ &beta و الإصدارات المرتقبة"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "التدقيق &بحثا عن تحديثات..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "البحث من &تحديثات FileZilla تلقائيا:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "التدقيق بحثا عن نسخ جديدة من FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "التدقيق بحثا عن تحديثات"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "فشل البحث عن تحديثات"
 
@@ -1912,21 +1922,21 @@
 msgid "Checking for correct external IP address"
 msgstr "جارى التحقق من عنوان رقم الانترنت الخارجى الصحيح"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "التدقيق بحثا عن تحديثات"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "عدم مطابقة رقم التدقيق النهائي للملف المحمل"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "قم باختيار الفولدر المحلى الافتراضى"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "تحديد الدليل المحلي"
 
@@ -1934,43 +1944,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "تم إنهاء قطعة البيانات بشكل غير صحيح"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "الشفرة :"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "إ&غلاق التبويب"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "كلاسيكي"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "&مسح مدخلات مدير المواقع"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "مسح المخزون المؤقت &للمخطط"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "مسح محفوظات الإ&تصال السريع"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "مسح معلومات &إعادة الإتصال"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "مسح &قائمة إنتظار الإرسال"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "مسح المحفوظات"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1978,11 +1988,11 @@
 msgid "Clear private data"
 msgstr "مسح البيانات الخصوصية"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "مسح شريط الاتصال السريع"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "مسح زوائد العبارة"
 
@@ -1990,36 +2000,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "أنقر على إنهاء لحفظ تكوينك"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "أنقر على التالي لتحميل النسخة الجديدة"
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "العميل إلى خادم MAC :"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "التابع إلى شفرة الخادم :"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "إ&غلاق كافة التبويبات الأخرى"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "إغلاق FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "إغلاق أي وجود لـ FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "لإغلاق التبويب الحالي"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "تع&ليقات"
 
@@ -2027,11 +2037,11 @@
 msgid "Column properties"
 msgstr "خصائص العامود"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "إعداد العامود"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "يجب أن يتم إقتباس الأمر و عبارات التعامل الخاصة به بشكل صحيح"
 
@@ -2050,9 +2060,9 @@
 msgstr "الأمر غير مدعوم من قبل هذا البروتوكول"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "الأمر:"
 
@@ -2060,7 +2070,7 @@
 msgid "Comment"
 msgstr "تعليق"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "الإسم المشترك:"
 
@@ -2069,15 +2079,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "تم تلويث الإتصال بواسطة جهاز التوجيه أو جدار الحماية"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "مقارنة &وقت التعديل"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "مقارنة &حجم الملف"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "&عتبة المقارنة (بالدقائق) :"
 
@@ -2085,60 +2095,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "عتبة المقارنة يجب أن تكون بين 0 و 1440 دقيقة"
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "مجمع من أجل:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "مجمع في :"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "مجمع بواسطة"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "علامات المجمع:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "مضغوط"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "عمليات الإرسال المتزامنة"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "حالة الشروط &حساسة"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "فحص التكوين"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "تكوين النمط السلبي"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "تكوين نطاق المنفذ"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "تكوين FileZilla و شبكتك"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "تأكيد الحذف"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "التأكيد مطلوب"
 
@@ -2146,7 +2156,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "مبروك , يبدو أن إعداداتك تعمل"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "إعدادات تجاوز إتصال ملقم الوكيل"
 
@@ -2154,34 +2164,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "إتصال بموقع مدير موقع معين"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "متصل"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "اتصال"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "إتصال إلى %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "الإتصال إلى %s خلال ملقم الوكيل"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "جاري الإتصال إلى %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "إتصال بالخادم"
 
@@ -2189,17 +2199,17 @@
 msgid "Connection"
 msgstr "الإتصال"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "محاولة الاتصال فشلت"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "محاولة الإتصال فشلت مع \"%s\" ، محاولة العنوان التالي"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "محاولة الإتصال فشلت مع \"%s\" ."
@@ -2213,12 +2223,12 @@
 msgid "Connection closed"
 msgstr "تم إغلاق الإتصال"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "تم إغلاق الإتصال من قبل الخادم"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "تم تأسيس الإتصال ، جاري تهيئة TLS..."
@@ -2227,7 +2237,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "تم تأسيس الإتصال ، جاري إرسال طلب HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "تم تأسيس الإتصال ، في انتظار رسالة الترحيب..."
 
@@ -2243,15 +2253,15 @@
 msgid "Connection refused"
 msgstr "تم رفض الإتصال"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "إنقضاء مهملة الإتصال"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "إنقضاء مهملة الإتصال"
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "فقد الإتصال بالخادم"
 
@@ -2271,27 +2281,23 @@
 msgid "Convert keyfile"
 msgstr "تحويل ملف المفتاح"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "نس&خ"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "نسخ (%d) من %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "نسخة من %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "نسخ الرابط للمواد المحددة إلى الحافظة"
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "تعذر قبول الإتصال : %s"
@@ -2301,16 +2307,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "تعذر إضافة الإتصال إلى مدير الموقع"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "تعذّر إكمال العملية"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "تعذر الإتصال بالخادم"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "تعذر الإتصال بالخادم : %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "تعذر تحويل الأمر إلى ترميز الخادم"
 
@@ -2319,17 +2329,17 @@
 msgid "Could not convert private key"
 msgstr "تعذر تحويل المفتاح الخاص"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "تعذر نسخ الروابط"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "تعذر نسخ البيانات"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2338,11 +2348,11 @@
 "تعذر تعيين الهدف من عملية السحب و الإفلات\n"
 "ربما لم تثبت إمتداد القشرة بطريقة صحيحة أو لم تفلت الملفات في نافذة المستكشف"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "تعذر تأسيس الإتصال مع الخادم"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2353,11 +2363,11 @@
 "يمكنك وضع دليل البيانات لـ FileZilla باستعمال خيار سطر الأمر '--datadir "
 "<custompath>' أو بوضع متغير بيئة FZ_DATADIR"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "تعذر توليد سلسلة تسجيل الدخول المخصصة"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2365,14 +2375,14 @@
 "لا يمكن الحصول على الإسم الفارق من ناشر الشهادة , فشل "
 "gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 "لا يمكن الحصول على الإسم الفارق لموضوع الشهادة , فشل gnutls_x509_get_dn"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "تعذر الحصول على كامل المسار البعيد"
 
@@ -2381,15 +2391,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "تعذر الحصول على الرد من fzputtygen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "تعذر الحصول على الدليل المؤقت لتحميل معلومات الملف"
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "لا يمكن إستيراد شهادات النظير , فشل gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2414,7 +2424,7 @@
 msgid "Could not load private key"
 msgstr "تعذر تحميل ملف الخصوصي"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2424,7 +2434,7 @@
 "لا يمكن الحصول على الدليل المحلي المتعلق بالدليل البعيد '%s'\n"
 "تعطيل التصفح المتزامن و الإستمرار في تغيير الدليل البعيد ؟"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2444,9 +2454,9 @@
 "لا يمكن الحصول على الدليل البعيد المتعلق بالدليل المحلي '%s'\n"
 "تم تعطيل التصفح المتزامن"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "تعذرت فتح الحافظة"
 
@@ -2461,11 +2471,11 @@
 msgid "Could not parse remote path."
 msgstr "تعذر تحليل المسار البعيد"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "تعذر تحليل عنوان الخادم:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "تعذرت قراءة من المقبس : %s"
@@ -2474,12 +2484,12 @@
 msgid "Could not read server item."
 msgstr "تعذرت قراءة مادة الخادم"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "لا يمكن تقصي فارق %s ضمن الملف"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "لا يمكن تقصي النهاية للملف"
 
@@ -2487,22 +2497,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "تعذر إرسال الأمر إلى fzputtygen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "لا يمكن تفقيس مؤشر ترابط إدخال/إخراج"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "تعذر بدء ربط الملقم الوكيل : %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "تعذر بدء الإرسال"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2519,7 +2529,7 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "لا يمكن كتابة \"%s\" , تعذر حفظ العناوين المفضلة الشاملة : %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2528,14 +2538,14 @@
 "لا يمكن كتابة \"%s\" , تعذر حفظ قائمة الإنتظار\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "لا يمكن كتابة \"%s\" , تعذر تصدير المواقع المحددة : %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "تعذرت كتابة \"%s\" : %s"
@@ -2545,7 +2555,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "تعذرت كتابة ملف المفتاح : %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "تعذرت الكتابة إلى الملف المحلي"
 
@@ -2555,37 +2565,49 @@
 msgid "Could not write to log file: %s"
 msgstr "تعذرت الكتابة إلى ملف السجل : %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "تعذرت الكتابة إلى المقبس : %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "البلد:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "أعطال FileZilla الفورية . تستخدم فقط في تصحيح معالجة الإستثناء"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "إ&نشاء ملف جديد"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "إنشاء دليل فرعي جديد في الدليل الحالي"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "إنشاء ملف فارغ و جديد في الدليل الحالي"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "إنشاء دليل"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "إنشاء ملف فارغ"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "إنشاء دليل"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "جاري إنشاء الدليل '%s'..."
@@ -2603,7 +2625,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "خطأ حرج في إرسال الملفِ بعد إرسال %s في %s ـ"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2624,52 +2646,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "نوع الإرسال الحالي موضوع على ثنائي"
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "&مخصص"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "مجموعة مرشحات من ضبط المستخدم"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "خادم مخصص"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "&نوع البيانات"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "بادئات &عشرية تستخدم رموز SI مثال : (1 كب = 1000 بايت)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "الإ&فتراضى"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "&حذف"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "ت&عطيل الكل"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "&لا تحفظ كلمات المرور"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "إجراء ال&نقرة المزدوجة على الأدلة :"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "ت&كرار"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-like مع مسارات ظاهرية"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "نوع ملف خطير"
 
@@ -2677,16 +2703,16 @@
 msgid "Data"
 msgstr "بيانات"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "تم إغلاق مقبس البيانات مبكرا جدا"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "تاريخ"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "تنسيق البيانات"
 
@@ -2705,11 +2731,11 @@
 msgid "Debug"
 msgstr "التصحيح"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "إعدادات التصحيح"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "الدليل المحلي الإ&فتراضي"
 
@@ -2717,19 +2743,19 @@
 msgid "Default (Autodetect)"
 msgstr "إفتراضي (كشف آلي)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "لم يتم إقتباس المحرر الإفتراضي بشكل جيد"
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "إجراء الملف موجود الإفتراضى"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "الدليل الإ&فتراضى البعيد:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2741,15 +2767,15 @@
 msgid "Default system language"
 msgstr "لغة النظام الإفتراضية"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "نمط الإرسال الإفتراضى:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "نوع الإرسال الإفتراضى:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "http://ip.filezilla-project.org/ip.php الافتراضى"
 
@@ -2773,57 +2799,57 @@
 msgstr[4] "تأخير الإتصال لمدة %d ثانية بسبب محاولة إتصال فاشل مسبقا ..."
 msgstr[5] "تأخير الإتصال لمدة %d ثانية بسبب محاولة إتصال فاشل مسبقا ..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "حذف مدخلة مدير الموقع"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "حذف الدليل المحدد"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "حذف الملفات المحددة و الأدلة"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "حذف الأدلة"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "لم يتم بعد دعم الحذف للأدلة المتعددة الغير مرتبطة"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "حذف الرابط الترميزي"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "سطح المكتب"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "تفاصيل"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "التفاصيل للمفتاح الجديد:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "الا&دلة"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "الإتجاه"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "الدليل"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "مقارنة الأدلة"
 
@@ -2841,11 +2867,11 @@
 msgid "Directory listing aborted by user"
 msgstr "تم إنهاء الرفع من قبل المستخدم"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "فشل الرفع"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "مرشحات الرفع"
 
@@ -2853,16 +2879,16 @@
 msgid "Directory listing successful"
 msgstr "تم بنجاح الرفع"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "تعط&يل الكل"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr "تعطيل التصفح المتزامن و الإستمرار في تغيير الدليل البعيد ؟"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2870,50 +2896,49 @@
 "قم بتعطيل هذا الخيار ثانية إذا كنت لم تعد قادرا على مشاهدة محتويات الدليل "
 "بشكل صحيح"
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "قطع الاتصال من الخادم"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "قطع الاتصال من الخادم"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "قطع الاتصال من الخادم : %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "قطع الاتصال من الخادم السابق"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "لقطع الاتصال من الخادم الظاهر حاليا"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "عرض لائحة حول"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&عدم إستخدام المحرر الإفتراضي"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "بدون إ&جراء"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2922,8 +2947,8 @@
 "إذا لا تريد أن تجرب المميزات الجديدة ، أبقى على إستخدام النسخ المستقرة "
 "العادية"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "هل تريد فعلا إغلاق FileZilla ؟"
 
@@ -2936,7 +2961,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "هل تريد فعلا حذف كافة مدخلات مدير الموقع ؟"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "هل تريد فعلا حذف المدخلة المحددة ؟"
 
@@ -2944,32 +2969,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "هل تريد فعلا حذف قائمة إنتظار الإرسال هذه ؟"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "هل تريد فعلا إرسال '%s' إلى الخادم ؟"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "وثائق تعليمات"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "&عدم إستخدام عنوان IP خارجي مع الإتصالات المحلية"
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "الملفات ذات النقط هي أسماء الملفات تبدأ بنقطة مثل : - .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "إجراء النقرة المزدوجة"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "تحميل"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "حدود التحميل&:"
 
@@ -2982,98 +3007,111 @@
 msgid "Download limit: none"
 msgstr "حدود التحميل : بدون"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "تحميل نتائج البحث"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "تحميل الدليل المحدد"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "تحميل الملفات المحددة و الأدلة"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"سرعة التنزيل: %s/s\n"
+"سرعة الرفع: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "تحميل"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "تحميل %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "لم يتم بعد دعم التحميل للأدلة المتعددة الغير مرتبطة"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "تحميل نتائج البحث"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr "السحب و الإفلات بين حالات وجود مختلفة من FileZilla لا ينطبق بعد"
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "السحب و الإفلات بين خوادم مختلفة لا ينطبق بعد"
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "ت&كرار"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "ت&مكين الكل"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "إ&دخال دليل"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "ت&نفيذ"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&خروج"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "البريد:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "كل مرشح يحتاج على الأقل شرط واحد"
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "تحرير المرشحات"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr "تحرير الملف بواسطة محرر سبق تكوينه و من ثم رفع التغييرات إلى الخادم"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "فشل التحرير"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "البريد :"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "أمر فارغ"
 
@@ -3081,7 +3119,7 @@
 msgid "Empty command."
 msgstr "أمر فارغ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "قائمة دليل فارغ"
 
@@ -3093,101 +3131,113 @@
 msgid "Empty file extension."
 msgstr "إمتداد ملف فارغ"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "أسماء المرشحات الفارغة غير مسموح بإستخدامها"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "إسم فارغ"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "عبارة مقتبسة فارغة"
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "ت&مكين الكل"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "تمكين ال&فرز للرموز الغير صالحة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "مشفر"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "التشفير"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "تفاصيل التشفير"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "إنهاء المقارنة و تغيير نظام الترتيب ؟"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "إدخال أمر &مخصص..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "أدخل 0 للسرعة الغير المحدودة"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "إدخال أمر"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "إدخال أمر مخصص"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "إدخال دليل"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "إدخال إسم المرشح"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "إدخال إسم لمجموعة المرشحات"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "إدخال إسم جديد لمجموعة الملف"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "إدخل كلمة المرور"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "إدخال دليل محدد"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "أدخل عنوان الخادم\n"
 "لتعيين بروتوكول الخادم , ضع في أول الكلمة المضيف مع معرف البروتوكول . إذا لم "
 "يتم تعيين بروتوكول فإن البروتوكول الإفتراضي (ftp://) هو الذي سيستعمل\n"
-"يمكنك أيضا إدخال روابط كاملة بالتنسيق protocol://user:pass@host:port هنا ، "
-"علما إن القيم في الحقول الأخرى سيتم الكتابة عليها بعد ذلك"
+"يمكنك أيضا إدخال رابط كامل بالتنسيق protocol://user:pass@host:port هنا ، "
+"علما إن القيم في الحقول الأخرى سيتم الكتابة عليها بعد ذلك\n"
+"\n"
+"البروتوكولات المعتمدة هي :\n"
+"- ftp:// لـ FTP العادي\n"
+"- sftp:// لـ SSH بروتوكول إرسال الملفات\n"
+"- ftps:// لـ FTP فوق TLS (ضمني)\n"
+"- ftpes:// لـ FTP فوق TLS (واضح)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3198,7 +3248,7 @@
 "أدخل كلمة المرور للملف '%s'\n"
 "الرجاء ملاحظة أن الملف المحول لن يكون محميا بكلمة مرور"
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3220,7 +3270,7 @@
 msgid "Error importing"
 msgstr "خطأ بالإستيراد"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "خطأ في تحميل قائمة الإنتظار"
 
@@ -3229,27 +3279,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "خطأ في تحميل ملف xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "خطأ في حفظ قائمة الإنتظار"
 
@@ -3260,74 +3310,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "خطأ في كتابة ملف xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "خطأ ، إسم الملف لا يمكن تجزئته"
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "خطأ ، الملف المحلي موجود لكن لا يمكن إزالته"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "الخطأ:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "تأسيس إتصال في تبويب جديد"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "كل شهر"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "كل أسبوعين"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "مثال : png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "أمثلة"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "ت&نفيذ"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "تنفيذى"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "الملف التنفيذي لا يحتوي على أي معلومات عن النسخة ، لا يمكن التدقيق بحثا عن "
 "تحديثات"
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "المستكشف"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "تصدير &فائمة الإنتظار"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "تصدير الإ&عدادات"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "تصدير الإعدادات"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "اسم الم&رشح"
 
@@ -3335,7 +3393,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - بروتوكول نقل الملفات"
 
@@ -3347,25 +3405,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - بروتوكول نقل الغير آمن للملفات"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "لم يتم تهيئة محرك FTP ، لا يمكن الإتصال"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "ملقم FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "رابط FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3381,26 +3439,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP over implicit TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "فشل في تغيير الدليل"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "فشل في تغيير اللغة"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "فشل البحث عن نسخة جديدة من FileZilla"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "فشل نسخ أو تقل المواقع"
 
@@ -3408,41 +3466,41 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "فشل في إنشاء نسخة احتياطية من ملف xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "فشل في إنشاء مقبس الإستماع . إنهاء"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "فشل في إنشاء مقبس الإستماع لنمط الإرسال النشط"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "فشل في تحميل آخر نسخة من FileZilla"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "فشل الحصول على مسار 'المستندات'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "فشل الحصول على مسار سطح المكتب"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "فشل الحصول على عنوان النظير لإتصال التحكم ، تم إغلاق الإتصال"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "فشل الحصول على عنوان النظير لإتصال البيانات ، تم إغلاق الإتصال"
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "فشل في بدأ محرك FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "فشل في تهيئة TLS"
@@ -3456,24 +3514,24 @@
 msgid "Failed to load private key: %s"
 msgstr "فشل في تحميل المفتاح الخصوصي : %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "فشل في فتح \"%s\" للتذييل/للكتابة"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "فشل في فتح \"%s\" للقراءة"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "فشل في فتح \"%s\" للكتابة"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "تعذر تحليل المسار المرتد"
 
@@ -3481,7 +3539,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "فشل في تحليل شهادة الجذر الموثوقة"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "فشل في إستقبال البيانات"
 
@@ -3493,11 +3551,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "فشل في لإسترداد عنوان IP الخارجي ، إنهاء"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "فشل في لإسترداد عنوان IP الخارجي ، إستخدام العنوان المحلي"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "فشل في لإسترداد عنوان IP المحلي"
 
@@ -3513,35 +3571,35 @@
 msgid "Failed to send command."
 msgstr "فشل في إرسال الأمر"
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "فشل في وضع اللغة على %s (%s) إستخدام لغة النظام الافتراضية"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, 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:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "فشل في وضع اللغة على %s (%s) ، إستعمال لغة النظام الإفتراضية"
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "يتم استخدام لغة النظام الافتراضية%s فشل في ضبط اللغة الى"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr "فشل في وضع اللغة على %s ، إستعمال لغة النظام الإفتراضية (%s, %s) ."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "فشل في وضع اللغة على %s ، إستعمال لغة النظام الإفتراضية"
@@ -3550,7 +3608,7 @@
 msgid "Failed to validate settings"
 msgstr "فشل في التحقق من الإعدادات"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "فشل في التحقق من شهادة النظير"
 
@@ -3567,21 +3625,19 @@
 msgid "Failed transfers"
 msgstr "عمليات إرسال فاشلة"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "رجوع كامل إلى النمط النشط"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "ال&ملف:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "م&لفات"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "ملف"
 
@@ -3597,7 +3653,7 @@
 msgid "File editing"
 msgstr "تحرير الملف"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "الملف موجود"
 
@@ -3605,7 +3661,7 @@
 msgid "File exists action"
 msgstr "إجراء وجود الملف"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "تم تغيير الملف"
 
@@ -3613,14 +3669,14 @@
 msgid "File lists"
 msgstr "قوائم الملف"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "الملف غير موجود"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "بحث عن ملف"
 
@@ -3655,101 +3711,102 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "نجاح إرسال الملف ، تم إرسال %s في %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "عمليات إرسال الملف مستمرة"
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "قد يرسل الملف بنوع بيانات ASCII"
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "قد يرسل الملف بنوع بيانات ثنائية"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "خطأ FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 "يمكن الآن لـ FileZilla أن يفحص تكوينك للتأكد من أن كل شيء تم تكوينه بشكل صحيح"
 
-#: resources.h:477
-msgid "FileZilla is already connected to a server."
-msgstr "متصل مسبقا إلى خادم ما FileZilla"
-
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla شغال في نمط kiosk\n"
-"أنواع تسجيل الدخول 'العادي' و 'الحساب' ليسا متوفرين في هذا النمط"
+#: resources.h:487
+msgid "FileZilla is already connected to a server."
+msgstr "متصل مسبقا إلى خادم ما FileZilla"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "يحتاج FileZilla إلى إعادة التشغيل لتغيير اللغة لتصبح سارية المفعول"
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "تحديثات FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "أ&شرطة حالة قائمة الملفات"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "إسم الملف"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&مرشحات إسم الملف..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "إسم الملف لا يمكن أن يتم بناؤه للدليل %s و إسم الملف %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "إسم ملف غير صالح"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"أسماء الملفات لا يمكن ان تحتوى على رمز من الرموز الاتية / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "لم يتغير إسم الملف"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "إسم الملف:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "أسماء الملفات لا يمكن ان تحتوى على رمز من الرموز الاتية / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "أسماء الملفات لا يمكن ان تحتوى على رمز من الرموز الاتية / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "الملفات حاليا يتم تحريرها"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "حجم الملف"
@@ -3758,68 +3815,68 @@
 msgid "Filesize format"
 msgstr "تنسيق حجم الملف"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "نوع الملف"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "إشراكات نوع الملف"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "المرشح يطبق على:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "فرز الرموز الغير صالحة في أسماء الملفات"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "أسم المرشح موجود مسبقا"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "فرز المواد المطابقة لكل مما يلي"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "فرز المواد المطابقة لأي مما يلي"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "فرز المواد التي لا تطابق مما يلي"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "مجموعة المرشح موجودة مسبقا"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "فرز قوائم الدليل"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "فشل التحقق من المرشح"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "بصمة الأصبع (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "بصمة الأصبع (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "بصمة الأصبع:"
 
@@ -3827,7 +3884,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "معالج تكوين جهاز التوجيه و جدار الحماية"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3835,11 +3892,11 @@
 "من أجل مزيد من المعلومات حول تأثير هذه الخيارات , الرجاء تشغيل معالج تكوين "
 "الشبكة"
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "من أجل الفعالية يجب عليك على الأقل تحديد 10 منافذ"
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3847,31 +3904,31 @@
 "سيتم إستخدام الإعدادات الإفتراضية لهذه الجلسة ، لن يتم حفظ أي تغييرات على "
 "الإعدادات"
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "إجبار &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "إ&جبار إظهار الملفات المخفية"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "إجبار إظهار الملفات المخفية"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "مواصفات التنسيق :"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "التنسيق : الإمتداد متبوع بالأمر المقتبس بشكل صحيح و المعاملات"
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "تعليمات موسعة"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "عام"
 
@@ -3879,21 +3936,21 @@
 msgid "General SOCKS server failure"
 msgstr "فشل SOCKS عام للخادم"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "ملقم وكيل عام"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "الحصول على عنوان IP خارجي من الرابط التالي :"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "الحصول على تعليمات"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "إسم مجموعة المرشحات المعطى موجود مسبقا ، الكتابة على مجموعة المرشحات ؟"
 
@@ -3901,15 +3958,15 @@
 msgid "Global bookmarks"
 msgstr "عناوين مفضلة شاملة"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "أذونات المجموعة"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "ع&الى"
 
@@ -3917,21 +3974,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP over TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "التجزئة :"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "مخفي"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "عالى"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "أعلى"
 
@@ -3939,26 +3996,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "اعلى منفذ متاح يجب ان يكون رقما بين 1024 و 65535"
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "إستمر بالضغط على مفتاح shift للتبديل بين حالتي المرشح على كلا الجانبين في "
 "الوقت نفسه"
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "الصفحة الرئيسية"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "مفتاح بصمة الإصبع للمضيف :"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "مفتاح مضيف غير مطابق"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "الإستضافة تبدأ مع '[' لكن لا يوجد قوس مثله للإغلاق"
 
@@ -3966,20 +4023,20 @@
 msgid "Host unreachable"
 msgstr "الإستضافة غير قابلة للوصول"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "المضيف:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "ساعات،"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (مثال: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -3988,11 +4045,11 @@
 "إذا تعذر إرسال أو إستقبال بيانات اثناء التشغيل لأكثر من الوقت المحدد سيتم "
 "إغلاق الإتصال و من ثم سيتم إعادة الإتصال"
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "عند التقرير عن خطأ , الرجاء تقديم سجلات مع مستوى سجل \"Verbose\""
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4003,7 +4060,7 @@
 "خادم ما فقد يكون الخادم غير مكون و بالتالي ينبغي عليك أن تجرب النمط النشط . "
 "يمكنك وضع نمط الإرسال حسب كل خادم فى مدير الموقع"
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4011,7 +4068,7 @@
 "اذا كان خيار التراجع في وضع التمكين ، سيكون في إمكانك أن تتصل بالخوادم الغير "
 "مكونة و التي ترفض نمط الإرسال المحدد"
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4033,7 +4090,7 @@
 "عند إستمرار المشكلة ، بعض أجهزة التوجيه و/أو برامج جدران الحماية تواصل "
 "مقاطعة الإتصال"
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4042,7 +4099,7 @@
 "عند وصول حجم ملف السجل إلى الحد ، يتم تسميته بإضافة \"1\" إلى نهاية إسم "
 "الملف (و قد يتم الكتابة على ملفات السجلات القديمة) و من ثم إنشاء ملف جديد"
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4062,7 +4119,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "إذا أستمرت هذه المشكلة ، فالرجاء أتصل بمصنع جهاز التوجيه الخاص بك"
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4072,7 +4129,7 @@
 "مع توقيت الخادم . إذا أختلف الوقت (نطاق زمنى مختلف) قم بتعييد فارق التوقيت "
 "في مدير المواقع"
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4080,11 +4137,11 @@
 "عند إستخدام مقارنة تعتمد على طابع الوقت ، يكون الملفان متساويان إذا كان "
 "إختلاف طابع الوقت لهما لا يتجاوز هذه العتبة"
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "عند تغيير اللغة ، يجب إعادة تشغيل FileZilla"
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4092,21 +4149,21 @@
 "عند النقر على فحص ، FileZilla سيتصل بـ probe.filezilla-project.org و سينفذ "
 "بعض الفحوصات البسيطة"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "عند إغلاق FileZilla ، ستفقد تغييراتك"
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "عند إدخال أنواع ملفات خاطئة ، فإن هذه الملفات قد تتلف أثناء الإرسال"
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "اذا حصلت على اى خطأ ، فإن تكوينك غير صحيح"
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4124,7 +4181,7 @@
 "برنامج جدار الحماية ربما لم يتم تكوينه بطريقة صحيحة . في هذه الحالة حاول "
 "تشغيل النمط السلبي و التواصل مع مدير الخادم للمساعدة"
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4132,7 +4189,7 @@
 "عند إكمال المعالج بنجاح و عند نجاح الفحص النهائي ينبغي تكوين أي جهاز للتوجيه "
 "أو أي برنامج جدار حماية بشكل صحيح"
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4140,7 +4197,7 @@
 "اذا كنت تستخدم جدار نارى ، تأكد من ان البرنامج مسموح له باستقبال اتصالات على "
 "كل المنافذ المعطاة"
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4160,7 +4217,7 @@
 msgid "Import data from older version"
 msgstr "إستيراد البيانات من نسخة قديمة"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "إستيراد الإعدادات"
 
@@ -4174,7 +4231,7 @@
 msgid "Improperly quoted association."
 msgstr "إشراكات مقتبسة بشكل غير صحيح"
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4182,7 +4239,7 @@
 "فى النمط النشط ، البرنامج يستمع على منفذ من أجل إرسال البيانات . يتوجب عليك "
 "تحديد أي المنافذ التي سوف يستخدمها البرنامج"
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4190,7 +4247,7 @@
 "فى حالة انه لديك جهاز توجيه ، فانه يجب تقديم كافة المنافذ المتاحة , بما أن "
 "FileZilla ليس له تأثير على المنافذ التي يختارها نظامك"
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4198,13 +4255,13 @@
 "فى حالة انك تفضل التحديثات التلقائية ، فانك تستطيع تمكين البحث عن تحديثات "
 "تلقائيا من لائحة الإعدادات"
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "لكي تستعمل النمط النشط ، FileZilla يحتاج معرفة عنوان IP الخارجي"
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4213,26 +4270,26 @@
 "فى النمط السلبي الذى ينصح به لمعظم المستخدمين . البرنامج يسأل الخادم من أجل "
 "منفذ و يتصل بالمنفذ المعطى له , حيث لا يوجد الكثير من الضبط يجب عمله هنا"
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr "السلسلة ناقصة ، الشهادة العليا ليست شهادة موقّعة ذاتيا"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "كلمة مرور غير صحيحة"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "جاري تهيئة TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "خادم غير آمن ، لا يدعم FTP عبر TLS"
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "تفاعلي"
@@ -4242,8 +4299,8 @@
 msgstr "الواجهة"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "إنهاء من قبل المستخدم"
 
@@ -4255,8 +4312,8 @@
 msgid "Invalid HTTP Response"
 msgstr "إستجابة HTTP غير صالحة"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4279,12 +4336,13 @@
 msgid "Invalid date"
 msgstr "تاريخ غير صالح"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "اسم ملف غير صالح"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "إستضافة غير صالحة ، بعد إغلاق القوس فقط النقط و المنفذ قد تلي ذلك"
 
@@ -4292,28 +4350,34 @@
 msgid "Invalid input"
 msgstr "إدخال غير صالح"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "تم أدخال منفذ غير صالح ، قيمة المنفذ يجب ان تكون بين 1 الى 65535"
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "تم تعيين بروتوكول غير صالح . البروتوكولات الصالحة هي :\n"
 "ftp:// لـ FTP العادي\n"
 "sftp:// لـ SSH بروتوكول إرسال الملفات\n"
-"ftps:// لـ FTP فوق SSL (ضمني)\n"
-"ftpes:// لـ FTP فوق SSL (واضح)"
+"ftps:// لـ FTP فوق TLS (ضمني)\n"
+"ftpes:// لـ FTP فوق TLS (واضح)"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"خادم الإستضافة غير صالح، بعد إغلاق القوس فقط النقطة و المنفذ قد يلي كلاحقة"
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "تعبير إصطلاحي غير صالح في شروط البحث"
 
@@ -4321,7 +4385,7 @@
 msgid "Invalid response code"
 msgstr "رمز إستجابة غير صالح"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "شروط بحث غير صالحة : %s"
@@ -4333,38 +4397,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "مسار موقع غير صالح"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "حجم غير صالح فى الشرط"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "إسم المستخدم المعطى غير صالح"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "بلاد السلطة القضائية :"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "مركز السلطة القضائية :"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "ولاية أو محافظة السلطة القضائية :"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "إبقاء الأدلة في الأعلى"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4374,50 +4438,54 @@
 "الخيار في وضع التمكين . و مع ذلك فإن FileZilla يؤدي بعض الفحوصات للتأكد من "
 "أن الخادم يدعم هذه الميزة ، و الفحص قد يفشل"
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "تبديل المفتاح"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "تبديل المفتاح:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "الأ&قل"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "اللغة"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "تم تغيير اللغة"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "اخر تغيير"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "التخطيط"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "الحد لعمليات ال&تحميل المتزامنة:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "الحد لعمليات ال&رفع المتزامنة:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "حدود المنافذ المحلية"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "حد الحجم لملف السجل"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "الحدود :"
 
@@ -4425,7 +4493,7 @@
 msgid "Line length exceeded"
 msgstr "تجاوز حد السطر"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "مرتبط إلى"
 
@@ -4434,21 +4502,21 @@
 msgstr "مقبس الإستماع مغلق"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "القائمة:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "المنفذ المتوفر ال&أدنى :"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "محليا"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "الملف المحلي"
 
@@ -4464,7 +4532,7 @@
 msgid "Local file is not a valid filename."
 msgstr "إسم الملف المحلي ليس صالح"
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "المرشحات المحلية"
 
@@ -4472,7 +4540,7 @@
 msgid "Local site:"
 msgstr "الموقع المحلى:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "المحلية:"
 
@@ -4480,16 +4548,16 @@
 msgid "Log file"
 msgstr "ملف السجل"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "سجل التدقيق عن التحديث:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "السجل"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4497,7 +4565,7 @@
 "بيانات تسجيل الدخول تحتوى على رموز ليست-ASCII و الخادم قد يكون لا يوافق UTF-"
 "8 . لا يمكن التراجع إلى مجموعة الرموز المحلية و الملقم الوكيل هو المستخدم"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4505,15 +4573,15 @@
 "بيانات تسجيل الدخول تحتوى على رموز ليست-ASCII و الخادم قد يكون لا يوافق UTF-"
 "8 . تجربة مجموعة الرموز المحلية"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "تم التنفيذ بالكامل لسلسلة تسجيل الدخول و مع ذلك لم يتم الدخول . إنهاء"
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "نوع الدخول يجب أن يكون إما 'سؤال' أو 'تفاعلي' (بدون إقتباسات) ."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4522,13 +4590,13 @@
 "نوع الدخول ، يمكن فقط أن يستخدم مع رابط FTP . يجب أن يكون التعامل إما '%s' "
 "أو '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "منخفض"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "الأقل"
 
@@ -4536,11 +4604,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "أقل منفذ متاح يجب ان يكون رقما بين 1024 و 65535"
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr "تأكد من أن الملف يمكن الوصول إليه و أنه مستند بتنسيق XML صالح"
 
@@ -4561,7 +4629,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "إجابة محرفة ، الخادم لا يرسل نهايات صحيحة للسطر"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4572,58 +4640,58 @@
 msgid "Manual transfer"
 msgstr "إرسال يدوي"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "مطابقة كل ما يأتي"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "مطابقة أي مما يلي"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "عدم مطابقة ما يلي"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "أقصى &عمليات متزامنة للإرسال :"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "سجل الرسائل"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "مكان سجل الرسائل"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "مب"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "دقائق"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "تحريك ل&تحت"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "تحريك ل&فوق"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "جهاز الكمبيوتر"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "المستندات"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "مواقعى"
 
@@ -4632,33 +4700,33 @@
 msgid "N/a"
 msgstr "بدون"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "الإسم"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "الإسم موجود مسبقا"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "الإسم للعنوان المفضل موجود مسبقا"
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "الاسم:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "يجب ادخال اسم مرشح"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "مطلوب إدخال مسار بعيد صالح"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "يجب تحديد ترميز للحروف"
 
@@ -4666,19 +4734,23 @@
 msgid "Network unreachable"
 msgstr "الشبكة غير قابلة للوصول"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "بدون"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "مجلد &جديد"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "&تبويب جديد"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "&عنوان مفضل جديد"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4691,41 +4763,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "علامة جديدة"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "دليل جديد"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "الميزات الجديدة و التحسينات في %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "مرشح جديد"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "مجلد جديد"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "موقع جديد"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "التالي إلى قائمة إنتظار الإرسال"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "لا"
 
@@ -4733,25 +4805,25 @@
 msgid "No category to export selected"
 msgstr "لم يتم تحديد فئة للتصدير"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "لم يتم وضع أمر , مقاطعة"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "لم يتم تحديد IP خارجى ، محاولة الافتراضى"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "لا يوجد ملفات حاليا يتم تحريرها"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "لم يتم وضع إسم المرشح"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "لم يتم ادخال مضيف ، من فضلك ادخل عنوان مضيف"
 
@@ -4759,25 +4831,25 @@
 msgid "No images available"
 msgstr "لا توجد صور متاحة"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "لا يوجد المزيد من الملفات في قائمة الإنتظار"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "لم يتم وضع إسم لمجموعة المرشح"
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "لا يوجد برنامج مشروك مع نوع الملف"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "لا يوجد برنامج مشروك من أجل تحرير الملفات ذات الإمتداد '%s'"
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "لا يوجد نتائج بحث"
 
@@ -4795,23 +4867,23 @@
 msgid "No username given."
 msgstr "لم يتم وضع إسم المستخدم"
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "بدون"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "الغير محددة بعد"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "عادى"
 
@@ -4822,15 +4894,15 @@
 "ليست كل المواد يمكن إعادة وضعها في قائمة الإنتظار من أجل العرض أو التحرير"
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "غير متصل"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "غير متصل بأي خادم"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "غير متصل بأي خادم"
 
@@ -4838,19 +4910,19 @@
 msgid "Not connected."
 msgstr "غير متصل"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "لاحظ أن هذه الميزة مدعومة فقط باستخدام بروتوكول FTP"
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "ملاحظة : هذه تعمل فقط مع إتصالات FTP العادية الغير مشفرة"
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "ملاحظة : إستخدام ملقم وكيل عام يقوم بفرض النمط السلبي مع إتصالات FTP"
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "الرقم للمواضع العشرية:"
 
@@ -4858,21 +4930,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "عدد المحاولات يجب أن يكون بين 0 و 99"
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "&فتح ملف"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "حسنا"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4880,122 +4952,128 @@
 "على الصفحات التالية ، سيتم تكوين نمط الإرسال المحدد ، بالإضافة إلى نمط "
 "التراجع إذا كان في وضع التمكين"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "مرة"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr "سيتم فقط تسليم نسخ FileZilla و نظام التشغيل الذي تستخدمه إلى الخادم"
+#: resources.h:970
+msgid "Once a week"
+msgstr "مرة كل أسبوع"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "فتح الدليل في مدير ملفات النظام"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "فتح مدير المواقع"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "فتح إذارة المواقع"
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "لفتح إذارة المواقع, أنقر باليمين لعرض قائمة بالمواقع"
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "فتح الملف"
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "فتح لائحة إعدادات FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "فتح بهيئة:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "فشل الفتح"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "لفتح تبويب جديد"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "لفتح مدير المواقع"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "لفتح لائحة مرشح قائمة الدليل . النقرة اليمنى لتبديل المرشحات"
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "نظام التشغيل"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "إكتشاف مشكلة في نظام التشغيل"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "المنظمة:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "أخرى :"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "ترجمة الأستاذ عوض الغامدي"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "الكتابة على ال&ملف اذا المصدر أحدث"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "كتابة على الملف"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "الكتابة على الملف اذا الحجم مختلف"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "الكتابة على الملف اذا المصدر أحدث أو الحجم مختلف"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "الكتابة على الملف اذا المصدر أحدث"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "الكتابة على الملف إ&ذا الحجم مختلف"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "الكتابة &على الملف إذا المصدر أحدث أو الحجم مختلف"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "أذونات المالك"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "المالك/المجموعة"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 "م&نع النظام من دخول وضعية الإسبات أثناء عمليات الإرسال و العمليات الأخرى"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "الملقم ال&وكيل:"
@@ -5004,27 +5082,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "تم تحريف الأمر PORT بواسطة جهاز التوجيه أو جدار الحماية"
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "&سلبي (مستحسن)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "حزمة"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "المعيار ليس رابط صالح"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "كلمة &المرور:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "سلبي (مستحسن)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "النمط السلبي"
@@ -5039,42 +5117,46 @@
 msgid "Password required"
 msgstr "مطلوب كلمة مرور"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "مسار"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "لا يمكن بناء المسار للمجلد %s و للمجلد الفرعي %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "المسار غير موجود"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "مسارات"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "تعليق الإزالة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "الترخيص"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "الأذونات"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "النظام الأساسي:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5088,7 +5170,7 @@
 "الرجاء زيارة http://filezilla-project.org/probe.php لمعرفة إذا الخادم شغال و "
 "تاكد من إعداداتك بعناية مرة ثانية"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5096,7 +5178,7 @@
 "أبحث في مدير الحزم في نظامك عن حزمة محدثة أو قم بزيارة http://filezilla-"
 "project.org لتحميل رمز المصدر لـ FileZilla"
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5123,7 +5205,7 @@
 msgid "Please enter a custom time format."
 msgstr "الرجاء إدخال تنسيق مخصص للوقت"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "الرجاء إدخال تاريخ بالتنسيق سنة-شهر-يوم مثال 2010-07-18"
@@ -5134,20 +5216,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "أدخل من فضلك حدود سرعة التحميل تساوي أو أكبر من 0 %s/ث"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "من فضلك أدخل أسم للمرشح الجديد"
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "من فضلك أدخل أسم جديد للمرشح المنسوخ"
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "الرجاء إدخال إسم جديد لمجموعة المرشح \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "من فضلك أدخل إسم جديد للمرشح"
 
@@ -5168,11 +5250,11 @@
 "transfers."
 msgstr "من فضلك أدخل رقم بين 0 و 10 لعدد عمليات الإرسال المتزامنة"
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "من فضلك ادخل كلمة مرور لهذا الخادم"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5190,11 +5272,11 @@
 "الرجاء إدخل وقت إنقضاء المهلة بين 5 و 9999 ثانية أو 0 لتعطيل الوقت لإنقضاء "
 "المهلة"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "من فضلك أدخل أسم مميز لمجموعة المرشح هذه"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "الرجاء إدخال إسم المستخدم لهذا الخادم"
 
@@ -5206,17 +5288,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "من فضلك أدخل رابط للحصول على عنوانك الخارجي منه"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "الرجاء إدخال الفاصل الزمني للتحديث على الأقل 7 أيام"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../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/ث"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5224,14 +5302,18 @@
 "الرجاء إدخال أمر FTP خام\n"
 "إستخدام أوامر ftp سوف يمسح مخزون الدليل المؤقت"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "من فضلك أدخل اسم الدليل المراد إنشاؤه :"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "الرجاء ادخال إسم الملف المراد إنشاؤه:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "الرجاء إدخال إسم المستخدم و كلمة المرور لهذا الخادم"
 
@@ -5249,7 +5331,7 @@
 "الرجاء إدخال عنوان IP خارجى فى صفحة النمط النشط لهذا المعالج ، فى حالة أنه "
 "يوجد لديك عنوان فعال او لا تعرف عنوانك الخارجى ، أستخدم خيار التحليل الخارجى"
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5265,7 +5347,7 @@
 "الرجاء التأكد من أن FileZilla مسموح له بتأسيس إتصالات صادرة و من أنك كتبت "
 "العنوان بشكل صحيح"
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "الرجاء تأكد من ملف اللغة المطلوب مثبت على نظامك"
 
@@ -5280,7 +5362,7 @@
 "تكوينه بشكل صحيح . يجب عليك إستخدام توجيه المنفذ يدويا . لا تقوم بتشغيل جهاز "
 "التوجيه الخاص بك في 'نمط DMZ' أو 'نمط اللعب' ."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5291,7 +5373,7 @@
 "لذا فان الخادم قد يختار منفذ بحيث يظن الجدار الحماية أنه منفذ مستخدم فقط من "
 "قبل تروجان أو برنامج ضار آخر . قد يسبب ذلك إنذار خاطىء لكن تجاهله"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5299,7 +5381,7 @@
 "الرجاء ملاحظة أن إبقاء طوابع الوقت مع عمليات الرفع على خوادم FTP و FTPS و "
 "FTPES تعمل فقط إذا كانت تدعم الأمر MFMT ."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5307,7 +5389,7 @@
 "الرجاء ملاحظة أن بعض الخوادم قد تعمل لك حظر إذا حاولت إعادة الاتصال في فترات "
 "زمنية متقاربة أو بمعدل كبير"
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5316,7 +5398,7 @@
 "الرجاء قراءة http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "للتفاصيل"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5333,38 +5415,38 @@
 "من فضلك قم بتشغيل المعالج مرة ثانية فى حالة تغيير فى بيئة الشبكة أو فى حالة "
 "حدوث مشاكل مع الخوادم التي كانت تعمل سابقا"
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "الرجاء تحديد إجراء :"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "الرجاء تحديد الفئات المراد إستيرادها"
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "من فضلك قم باختيار نمط الإرسال الافتراضي المراد إستخدامه"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "الرجاء تحديد الخواص الجديدة للدليل \"%s\""
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "الرجاء تحديد الخواص الجديدة للملف \"%s\""
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "الرجاء تحديد الخواص الجديدة للأدلة المحددة"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "الرجاء تحديد الخواص الجديدة للملفات المحددة و الأدلة"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "الرجاء تحديد الخواص الجديدة للملفات المحددة"
 
@@ -5382,31 +5464,31 @@
 "توجيهك فيما يسمى بـ 'نمط DMZ' أو 'نمط اللعب' . كما يجب تعطيل أشياء أخرى مثل "
 "تفتيش البروتوكول أو بروتوكول 'fixups' معين"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
 "الرجاء زيارة http://filezilla-project.org للمزيد من المعلومات حول FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "الرجاء زيارة http://filezilla-project.org لتحميل آخر نسخة"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "الرمز البريدي :"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "المواقع المحددة مسبقاً"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "إبقاء طوابع وقت الملف"
 
@@ -5414,47 +5496,59 @@
 msgid "Preview:"
 msgstr "معاينة:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr "شهادة الإتصال الرئيسية و شهادة إتصال البيانات غير متطابقتين"
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "طباعة معلومات التشخيص المتعلقة ببدء تشغيل FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "طباعة معلومات النسخة إلى الناتج المعياري ثم خروج"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "وضع الأولوية للمجلدات (الإفتراضي)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "الأولوية"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "نهج الخصوصية :"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"سياسة الخصوصية: سيتم تقديم معلومات فقط عن الإصدار الخاص بك من FileZilla "
+"ونظام التشغيل المستخدم وبنية الـ CPU الخاصة بكمبيوترك إلى الخادم"
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "&مفاتيح الخصوصية:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "ال&بروتوكول :"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "كلمة المرور لل&ملقم:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "معالجة قائمة الإنتظار"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "البروتوكول:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "منفذ &الملقم:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&مستخدم الملقم:"
 
@@ -5462,12 +5556,16 @@
 msgid "Proxy authentication failed"
 msgstr "فشلت مصادقة الملقم"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "فشلت مصافحة الملقم : %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "ملقم الإستضافة بدأ بـ '[' لكن لا يوجد قوس الإغلاق"
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5482,23 +5580,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "فشل طلب الملقم الوكيل : نوع العنوان غير معروف في الرد CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "تم وضع الملقم الوكيل لكن مضيف الوكيل أو المنفذ غير صالح"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "مصادقة المفتاح العام"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "خوارزمية المفتاح العام:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "أذونات عمومية"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "تم معالجة قائمة الإنتظار بالكامل"
 
@@ -5517,39 +5615,39 @@
 msgid "Queue: empty"
 msgstr "قائمة الانتظار : فارغة"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "ملفات في الإنتظار"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "وضع بالإنتظار:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "إ&عادة تشغيل النظام"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "ت&فرع الدليل البعيد"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "&إستعادة و إعادة وضع الملفات المحددة في قائمة الإنتظار"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "أمر FTP خام"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "قر&اءة"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "ت&حديث"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "ت&سمية"
 
@@ -5561,73 +5659,82 @@
 "قم بإعادة تشغيل المعالج و تأكد من إعدادات بدقة ثم قم بتكوين أجهزة التوجيه و "
 "برامج جدران الحماية حسب ذلك"
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "قر&اءة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "للقراءة فقط"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "إلغاء العملية الحالية فعلا ؟"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "هل تريد فعلا حذف %d مجلد مع محتوياته ؟"
-msgstr[1] "هل تريد فعلا حذف %d مجلد مع محتوياته ؟"
-msgstr[2] "هل تريد فعلا حذف %d مجلد مع محتوياتهما ؟"
-msgstr[3] "هل تريد فعلا حذف %d مجلدات مع محتوياتها ؟"
-msgstr[4] "هل تريد فعلا حذف %d مجلد مع محتوياتها ؟"
-msgstr[5] "هل تريد فعلا حذف %d مجلد مع محتوياتها ؟"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "هل تريد فعلا حذف %d ملف ؟"
-msgstr[1] "هل تريد فعلا حذف %d ملف ؟"
-msgstr[2] "هل تريد فعلا حذف %d ملف ؟"
-msgstr[3] "هل تريد فعلا حذف %d ملفات ؟"
-msgstr[4] "هل تريد فعلا حذف %d ملف ؟"
-msgstr[5] "هل تريد فعلا حذف %d ملف ؟"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "هل تحذف فعلا %s و %s ؟"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياته ؟"
+msgstr[1] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياته ؟"
+msgstr[2] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياتهما ؟"
+msgstr[3] "هل تريد فعلا حذف %d مجلدات من الخادم مع محتوياتها ؟"
+msgstr[4] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياتها ؟"
+msgstr[5] "هل تريد فعلا حذف %d مجلد من الخادم مع محتوياتها ؟"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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 ملف من الخادم؟"
+msgstr[2] "هل تريد فعلا حذف %d من الملفات من الخادم؟"
+msgstr[3] "هل تريد فعلا حذف %d ملفات من الخادم؟"
+msgstr[4] "هل تريد فعلا حذف %d ملف من الخادم؟"
+msgstr[5] "هل تريد فعلا حذف %d ملف من الخادم؟"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "هل تريد حذف فعلا %s و %s من الخادم؟"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "هل تريد فهلا حذف كافة الملفات و/أو المجلدات المحددة من الخادم؟"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "هل تريد فهلا حذف كافة الملفات المحددة و/أو الأدلة ؟"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "هل تريد فهلا حذف كافة الملفات و/أو المجلدات المحددة من الكمبيوتر؟"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "السبب"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "إعادة تشغيل الكمبيوتر الآن"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "التكرار &ضمن الأدلة الفرعية"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"تلقي دليل قائمة أدلة أرشفة المواقع الأجنبية و التي تكون مشفرة بطريقة EBCDIC"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "تلقى خط تتجاوز 10000 حرف ، مقاطعة"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "تلف البيانات المستقبلة"
 
@@ -5639,11 +5746,11 @@
 "معلومات إعادة الإتصال لا يمكن مسحها أثناء الإتصال بالخادم\n"
 "عند الإستمرار ، سيتم قطع إتصالك"
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "إعدادات إعادة الاتصال"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "لاعادة الاتصال بأخر خادم مستخدم"
 
@@ -5651,34 +5758,38 @@
 msgid "Redirection to invalid address"
 msgstr "إعادة توجيه الى عنوان غير صالح"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "تحديث قوائم الملفات و المجلدات"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "تذكر كلمات المرور ؟"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "بعيد"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "الشهادة البعيدة غير موثوق بها"
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "الملف البعيد"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "البحث عن بعد عن ملف"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "المرشحات البعيدة:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "المسار البعيد"
 
@@ -5691,7 +5802,7 @@
 "تعذر تحليل المسار البعيد . تأكد من أنه مسار صالح و معتمد من قبل نوع الخادم "
 "للموقع الحالي (%s) ـ"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5702,7 +5813,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr "تعذر تحليل المسار البعيد . تأكد من أنه مسار صالح"
 
@@ -5710,11 +5821,11 @@
 msgid "Remote path could not be parsed."
 msgstr "لا يمكن تحليل المسار البعيد"
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "معالجة المسار البعيد :"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "المسار البعيد:"
 
@@ -5722,76 +5833,76 @@
 msgid "Remote site:"
 msgstr "الموقع البعيد:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "&إزالة الكل"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "إ&زالة المحددة"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "تسمية الملف"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "تسمية الدليل المحدد"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "تسمية الملفات المحددة و الأدلة"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "تسمية '%s' إلى '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "التبليغ عن أخطاء و طلب إضافة وظيفة ما"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "يتطلب FTP صريح عبر TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "يتطلب FTP ضمني عبر TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "إستعادة و إ&عادة وضع الكل في قائمة الإنتظار"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "إستخلاص عنوان الـ %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "تحليل إسم المضيف"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "الإستجابة:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "النتائج :"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "إستئناف إرسال الملف"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5799,38 +5910,38 @@
 "إستئناف ملفات ASCII قد يسبب مشاكل إذا كان الخادم يستخدم تنسيق مختلف لنهاية "
 "السطر تختلف عن التي مع التابع"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "إسترجاع قائمة الدليل..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "إسترجاع عنوان IP الخارجي من %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "شهادة الجذر غير موثوق بها"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "إ&ظهار الملفات التي حاليا يتم تحريرها..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "إ&ظهار مدير الموقع عند تشغيل"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "إ&غلاق الكمبيوتر"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "إ&يقاف"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "تصفح &متزامن"
 
@@ -5838,31 +5949,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "حفظ الإعدادات ؟"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "تم تعطيل حفظ كلمة مرور بواسطة مسؤول النظام لديك."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "تم تعطيل الحفظ لكلمات المرور بواسطتك أنت."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "البحث عن الملفات لاضافتها إلى قائمة الإنتظار"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "البحث عن ملفات لرفعها"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "&شروط البحث:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "&دليل البحث :"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "بحث عن الملفات بشكل تكراري"
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "البحث في الخادم عن الملفات"
 
@@ -5875,27 +6000,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "شاهد أيضا : http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "ت&حديد الخادم"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "منتديات عميد التعريب"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "تحديد سمة"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "تحديد الإجراء الإفتراضى المراد تنفيذه إذا كان الملف المستهدف للإرسال موجود "
 "مسبقا"
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "تحديد المحرر الإفتراضي"
 
@@ -5915,7 +6040,7 @@
 "تحديد الإجراء الإفتراضى المراد تنفيذه إذا كان الملف موجود مسبقا فقط للملفات "
 "المحددة حاليا فى قائمة الإنتظار"
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr ""
 "تحديد الإجراء الإفتراضى المراد تنفيذه إذا كان الملف موجود مسبقا فقط للملفات "
@@ -5938,7 +6063,7 @@
 msgstr "تحديد الملف لتصدير الإعدادات"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "تحديد ملف للمواقع المصدرة"
 
@@ -5954,12 +6079,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "تحديد الإسم للملف المفتاح المحول"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "تحديد كيفية فتح هذه الملفات"
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "تحديد الدليل الهدف للتحميل"
 
@@ -5967,15 +6092,15 @@
 msgid "Select target filename"
 msgstr "تحديد إسم الملف الهدف"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "تحديد الفئات للتصدير :"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "تحديد البيانات الخاصة المراد حذفها"
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5997,7 +6122,7 @@
 msgstr[4] "المحدد %d أدلة"
 msgstr[5] "المحدد %d دليل"
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6030,7 +6155,7 @@
 msgstr[4] "المحددة %d ملف . الحجم الكلي : على الأقل %s"
 msgstr[5] "المحددة %d ملف . الحجم الكلي : على الأقل %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "المحدد %s و %s للإرسال"
@@ -6045,13 +6170,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "المحددة %s و %s . الحجم الكلي : على الأقل %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "المحرر المحدد غير موجود"
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "الملف المحدد يتم تحريره حاليا"
 
@@ -6059,15 +6184,15 @@
 msgid "Selected file is already loaded"
 msgstr "الملف المحدد يتم التعامل معه حاليا"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "الملف المحدد مفتوح مسبقا"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "الملف المحدد لا يزال قيد التحرير"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "المرشح المحدد يعمل فقط من أجل الملفات المحلية"
 
@@ -6083,37 +6208,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "المنفذ المحدد عادة قيد الإستخدام من قبل بروتوكول مختلف"
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "إرسال &أوامر البقاء نشطا لـ FTP"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "إرسال أمر مخصص إلى الخادم ، غير ذلك فانه غير متاح"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "إرسال &أوامر البقاء نشطا"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "رقم التسلسل:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "نوع ال&خادم:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "الخادم ربما لم يغلق إتصال TLS بشكل صحيح"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "الخادم لا يدعم حروفا غير حروف ASCII"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "الخادم لا يدعم الإستئناف للملفات > %d غب"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6121,15 +6251,15 @@
 msgstr ""
 "الخادم لا يدعم إستئناف الملفات > %d غب . نهاية الإرسال بما أن الحجم كبير"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "الخادم لا يدعم الإستئناف للملفات > 2 غب"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "الخادم لا يدعم الإستئناف للملفات > 4 غب"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6137,28 +6267,28 @@
 msgstr ""
 "الخادم قد لا يدعم إستئناف الملفات > %d غب . نهاية الإرسال بما أن الحجم كبير"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr "الخادم قد يتطلب حساب . حاول تعيين حساب باستعمال مدير الموقع"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "الخادم أرسل رد بمسار فارغ"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 "أرسل الخادم مطالبة بتسجيل دخول إضافي . تحتاج لإستعمال نوع تسجيل دخول تفاعلي"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr "الخادم أرسل رد سلبي مع عنوان غير قابل للتوجيه . فشل النمط السلبي"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6178,101 +6308,112 @@
 msgid "Server sent unexpected reply."
 msgstr "الخادم أرسل رد غير متوقع"
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "الخادم إلى MAC العميل :"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "الخادم إلى شفرة العميل :"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "نوع &الخادم:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "الخادم/الملف المحلى"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "&الخادم :"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "تفاصيل الجلسة"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "&وضع الاولوية"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "وضع الأذونات لـ '%s' إلى '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "تم إستدعاء SetSocketBufferSize بدون مقبس"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "إعدادات"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "إظهار &قائمة الدليل الخام"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "إظهار لائحة &مرحبا بك..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "إظهار تفرع الدليل و متابعة المقارنة ؟"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "لعرض تشفير TLS المتوفر"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "لإظهار لائحة التعليمات هذه"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "إغلاق الكمبيوتر الآن"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "خوارزمية التواقيع:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "مدخلات مدير المواقع"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "مدير المواقع"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "مدير الموقع - لا يمكن تذكر كلمة المرور"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "مدير المواقع - بيانات غير صالحة"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "مدير المواقع مفتوح مسبقا"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "الموقع غير موجود"
 
@@ -6282,8 +6423,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "تم تشويه مسار الموقع"
 
@@ -6301,11 +6442,11 @@
 "تتطلب عناوين المفضلة للموقع المعين خادم من أجل حفظها في مدير الموقع\n"
 "إضافة الإتصال الحالي إلى مدير الموقع ؟"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "الحجم"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "تنسيق الحجم"
 
@@ -6314,31 +6455,31 @@
 msgid "Size unknown"
 msgstr "الحجم غير معروف"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "تجاوز الملف"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "تجاوز التحميل لـ %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "تجاوز الرفع لـ %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "بعض الملفات ما زالت قيد التحرير أو تحتاج إلى رفع"
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6346,19 +6487,19 @@
 "بعض الخوادم البعيدة التي لم يتم تكوينها و التي تكون من وراء جهاز توجيه ، قد "
 "ترد بعنوان IP المحلي الخاص بها"
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "ترتيب الأدلة بشكل مصطف"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "طريقة الترتيب لا يمكن تغييرها عند مقارنة الأدلة"
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "الترتيب"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&نمط الترتيب:"
 
@@ -6370,20 +6511,20 @@
 msgid "Source and target file may not be the same"
 msgstr "ملف المصدر و الهدف قد لا يكونا نفس الملف"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "المصدر والهدف لعملية الإفلات غير متطابقين"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "ملف المصدر :"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "حدود السرعة"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "حدود السرعة"
 
@@ -6395,7 +6536,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "تم تمكين حدود السرعة , أنقر للتغيير"
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "الإصدارات المستقرة و إصدارات بيتا"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "الإصدارات المستقرة فقط"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "بدء الإرسال &فورا"
 
@@ -6403,43 +6552,47 @@
 msgid "Start with opened Site Manager"
 msgstr "البدء مع مدير مواقع مفتوح"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "بدء التحميل لـ %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "بدء الرفع لـ %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "لتشغيل الموقع المحلي في المسار المعطى"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "الولاية أو المحافظة :"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "الحالة"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "الحالة:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "ايقاف و ازالة &الكل"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "الشارع:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "موضوع الشهادة"
 
@@ -6447,11 +6600,11 @@
 msgid "Successful transfers"
 msgstr "عمليات إرسال ناجحة"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "ملخص لنتائج الفحص"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6459,44 +6612,45 @@
 "الروابط الترميزية إلى الملفات لا تتأثر بهذا الإختيار ، لأن الروابط الترميزية "
 "يتم حذفها دائما"
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "تصفح متزامن"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "تم تعطيل التصفح المتزامن"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "خطأ فى بناء الجملة"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "خطأ فى بناء الجملة في سطر الأمر"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "النظام"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "شريط &أدوات"
 
@@ -6504,11 +6658,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "تم تأسيس إتصال TLS/SSL ، إرسال طلب HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "تم تأسيس إتصال TLS/SSL , إنتظار رسالة الترحيب..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "تم تأسيس إتصال TLS/SSL"
 
@@ -6516,27 +6670,31 @@
 msgid "TTL expired"
 msgstr "أنتهت صلاحية TTL"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "الملف المستهدف موجود اصلا"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "الملف الهدف :"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "الملف المستهدف موجود مسبقا"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "الملف الهدف موجود مسبقا ، هل تريد الإستمرار ؟"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "نتائج الفحص"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "فحص قدرات الإستئناف للخادم"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6553,7 +6711,7 @@
 "مدير الموقع مفتوح في وجود آخر لـ FileZilla 3\n"
 "الرجاء إغلاقه و إلا لن يتم حذف البيانات"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "لم يتم تنسيق وثيقة XML بشكل جيد : %s"
@@ -6564,11 +6722,11 @@
 msgstr "العنوان الذي أدخلته كان : %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "تعذرت الإضافة للعلامة"
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "لا يمكن مسح العناوين المفضلة"
 
@@ -6580,19 +6738,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "سلسلة تسجيل الدخول المخصصة لا يمكن أن تكون فارغة"
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "تعذّر تأسيس إتّصال البيانات: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "تعذر العثور على المحرر الإفتراضي للملفات النصية"
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "المحرر الإفتراضي للملفات النصية هو '%s'"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "إسم المرشح المدخل موجود مسبقا, الرجاء إختيار إسم مختلف"
 
@@ -6611,9 +6774,9 @@
 "الملف %s موجود مسبقا\n"
 "الرجاء إدخال إسم جديد :"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6629,14 +6792,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "تعذر تفعيل الملف '%s' أو لا يحتوي على مفتاح خاص"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "لا يمكن تحميل الملف '%s'"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6645,8 +6808,8 @@
 "تعذر فتح الملف '%s' :\n"
 "لا يوجد برنامج مشروك على نظامك مع نوع الملف هذا"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6688,7 +6851,7 @@
 "قبل FileZilla حتى الآن\n"
 "هل تريد تحويله إلى صيغة معتمدة و غير محمية ؟"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "الملف المحدد كمحرر إفتراضي غير موجود"
 
@@ -6724,11 +6887,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "الرموز التالية ستستبدل : %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "يتم حاليا تحرير الملفات التالية :"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "الحل مع FTP المصدر المجاني المفتوح"
 
@@ -6736,7 +6899,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "لا يمكن حفظ العناوين المفضلة الشاملة"
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6765,24 +6928,24 @@
 msgstr ""
 "أقل قيمة متاحة للمنفذ يجب ان تكون أقل من أعلى قيمة متاحة للمنفذ أو مساوية"
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 "تم تحميل آخر نسخة . أنقر على إنهاء لإغلاق FileZilla و بدء التثبيت"
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 ""
 "تم تحميل آخر نسخة . الرجاء تثبيتها مثلما فعلت في التثبيت السابق لهذه النسخة"
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "لن يتم حفظ قائمة الإنتظار"
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6795,22 +6958,22 @@
 msgid "The selected categories have been imported."
 msgstr "تم إستيراد الفئات المحددة"
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "يحتوي الملف المحدد على بيانات قابلة للإستيراد للفئات التالية :"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "الملف المحدد يتم تحريره حاليا :"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "لا يزال الملف المحدد مفتوح في برنامج آخر ، الرجاء إغلاقه"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6828,7 +6991,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "الخادم قام بإرسال رد غير متوقع أو غير مفهوم"
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "الخادم يستخدم مجموعة الترميز التالية لأسماء الملفات :"
 
@@ -6840,7 +7003,7 @@
 "شهادة هذا الخادم غير معروفة . الرجاء فحص الشهادة بعناية للتأكد من أن الخادم "
 "يمكن الوثوق به"
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6850,7 +7013,7 @@
 "المسؤول قد قام بتغيير مفتاح الإستضافة أو أنه في الواقع أنت تحاول الإتصال "
 "بكمبيوتر آخر يتظاهر بأنه هو الخادم"
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6864,15 +7027,15 @@
 "settings to have effect."
 msgstr "تم إستيراد الإعدادات . يجب إعادة تشغيل FileZilla لتفعيل جميع الإعدادات"
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "سيتم إعادة تشغيل النظام قريبا مالم تنقر على زر إلغاء الأمر"
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "سيتم إغلاق النظام قريبا مالم تنقر على زر إلغاء الأمر"
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6880,7 +7043,7 @@
 "الملف الهدف موجود مسبقا\n"
 "الرجاء إختيار أي إجراء"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "الفحص لم ينجح ، هل تريد فعلا حفظ الإعدادات ؟"
 
@@ -6888,11 +7051,11 @@
 msgid "Themes"
 msgstr "السمات"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "لا يمكن إزالة مجموعة المرشح هذه"
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "لا يمكن تسمية مجموعة المرشح هذه"
 
@@ -6904,14 +7067,14 @@
 "هذا يعني بأن جهاز التوجيه أو برنامج جدار الحماية أو كليهما يمنعان إتصال "
 "FileZilla"
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 "هذا يعمل فقط اذا لم تكن وراء جهاز توجيه , أو سوف يرجع نظامك بعنوانك الداخلى"
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6919,25 +7082,25 @@
 "هذا المعالج سيساعدك على تكوين إى جدران حماية او أجهزة توجيه لديك و من ثم "
 "لفحص تكوينك لها"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "الوقت"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "تنسيق الوقت"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "إ&نقضاء الوقت بالثواني:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "إنقضاء الوقت"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6946,26 +7109,26 @@
 "فارق منطقة التوقيت : الخادم : %d ثانية . المحلي : %d ثانية . الإختلاف : %d "
 "ثانية"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "العنوان:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "لمقارنة الأدلة ، يجب محاذاة كلتا قائمتي الملف"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr "لعمل هذا، يجب إظهار أو إخفاء كلا التفرعين للدليل معا"
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
 "لدعم مصادقة المفتاح العام ، يحتاج FileZilla لمعرفة المفاتيح الخاصة للإستخدام"
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6981,7 +7144,7 @@
 "الأخضر : الملف أحدث من الملف الغير مؤشر على الجانب الآخر\n"
 "الأحمر : أحجام الملف مختلفة"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6991,23 +7154,23 @@
 "عند التمكين ، التنقل في الدليل المحلي بشكل هرمي سيغير أيضا الدليل على الخادم "
 "وفقا لذلك و العكس بالعكس"
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "لتشغيل معالجة قائمة انتظار الإرسال"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "لتشغيل العرض لتفرع الدليل المحلي"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "لتبديل العرض لسجل الرسائل"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "لتشغيل العرض لتفرع الدليل البعيد"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "لتشغيل العرض لقائمة إنتظار الإرسال"
 
@@ -7020,37 +7183,37 @@
 msgstr "عمليات إعادة توجيه كثيرة جدا"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "الأثر:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "الإرسال"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "إ&تجاه الإرسال"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&نوع الإرسال"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "نمط الإرسال"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "قائمة إنتظار الإرسال"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "إعدادات الإرسال"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "تم إنهاء إتصال الإرسال : %s"
@@ -7059,8 +7222,8 @@
 msgid "Transferred data got tainted."
 msgstr "تلف البيانات المنقولة"
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "إرسال"
 
@@ -7068,69 +7231,69 @@
 msgid "Transfers"
 msgstr "عمليات الإرسال"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "إنتهاء عمليات الإرسال"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "معاملة الملفات &بدون إمتداد بهيئة ملف ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "معاملة أنواع الملفات &التالية بهيئة ملفات ASCII :"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "الثقة في Hostkey المتغيرة :"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "الثقة في Hostkey الجديدة :"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "الوثوق بالمفتاح الجديد و متابعة الإتصال ؟"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "الوثوق بهذه الشهادة و متابعة الإتصال؟"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "الوثوق بهذا المضيف و متابعة الاتصال؟"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "النوع"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "توع ملقم الـ FTP :"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "توع ملقم االعمومي :"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "&رفع"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "حدود الر&فع:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "إ&ستخدام إشراكات أنواع الملفات إذا توفرت"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "إستخدام إ&فتراضي النظام"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7139,16 +7302,16 @@
 msgid "Unassigned error code %d"
 msgstr "رمز خطأ غير محدد %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "وحدة:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "غير معروف"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "نوع ملقم وكيل FTP غير معروف ، لا يمكن توليد سلسلة تسجيل الدخول"
 
@@ -7161,7 +7324,7 @@
 msgid "Unknown certificate"
 msgstr "شهادة غير معروفة"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7169,7 +7332,7 @@
 "خطأ غير معروف في فتح الملف . تأكد من أن الملف يمكن الوصول إليه و أن مستند "
 "XML منسق بشكل جيد"
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "مفتاح مضيف غير معروف"
 
@@ -7182,7 +7345,7 @@
 "نسخة بروتوكول غير معروفة للمفاوضات الفرعية في SOCKS من أجل مصادقة إسم "
 "المستخدم/كلمة المرور : %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "عنصر جذر غير معروف ، الملف لا يبدو أنه من إنتاج FileZilla"
@@ -7204,7 +7367,7 @@
 "مالم يتم إصلاح هذه المشكلة , لن يعمل نمط FTP النشط و بالتالي سوف يستخدم "
 "النمط السلبي"
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "نوع شهادة غير مدعومة"
 
@@ -7212,25 +7375,24 @@
 msgid "Unsupported redirect"
 msgstr "إعادة توجيه غير مدعومة"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "&رفع و عدم تحرير"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "تدقيق التحديث"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "معالج التحديث"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "التحديثات"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "رفع"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "فشل الرفع"
 
@@ -7243,97 +7405,97 @@
 msgid "Upload limit: none"
 msgstr "حدود الرفع : بدون"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "رفع الأدلة المحددة"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "رفع الملفات و الأدلة المحددة"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "إرجاع هذا الملف إلى الخادم ؟"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "رفع هذا الملف إلى الخادم ؟"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "رفع"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "الرفع و تأجيل الإزالة"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "الرفع و عدم التحرير"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "مجموعة &رموز مخصصة"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "إ&ستخدام محرر مخصص:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "إستخدام المحرر الإ&فتراضي للملفات النصية"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "إستخدام ال&تصفح المتزامن"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "إستخدام UTF-8 إذا كان الخادم يدعم ذلك و إلا إستخدام مجموعة الرموز المحلية"
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "إستخدم الإجراء الأفتراضى"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "استخدام FTP عادي"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "إستخدام الخادم المتصل حاليا إلى"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "إستخدام الخادم من مدير الموقع"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "إستخدام إفتراضيات النظام"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "إستخدام عنوان IP التالي :"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "إستخدام نطاق المنفذ التالي :"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "إستخدام عنوان IP الخارجي للخادم بدلا من ذلك"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr "أستعمل هذا إذا كنت وراء جهاز توجيه و له عنوان IP خارجي ثابت"
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7343,84 +7505,84 @@
 "مرة في كل جلسة حالما تستعمل النمط النشط للمرة الأولى . فقط نسخة FileZilla "
 "التي تستخدمها يتم تسليمها إلى الخادم"
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "المستخدم:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "إسم المستخدم لا يمكن أن يكون سلسلة من المسافات"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "إستخدام الملقم %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "مجموعة الرموز الخاطئة قد يؤدى إستخدامها إلى عرض أسماء الملفات بطريقة غير "
 "صحيحة"
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "باستعمال هذا المعالج تستطيع معرفة التحديثات المتوفرة لـ FileZilla"
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "صالح من:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "صالح إلى:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "رسائل سجل مطولة من wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "جاري فحص الشهادة..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "النسخة :"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "مرتفعة جدا"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "عرض مجموعة الخيارات المخفية ، لكنها غير معتمدة من قبل الخادم"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "عرض/تحرير"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "الأعمدة المرئية"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "ك&تابة"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "إنتظار"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "إنتظار الإتصال من أجل التصفح"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "إنتظار كلمة المرور"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "إنتظار إلغاء الإرسال"
 
@@ -7428,7 +7590,7 @@
 msgid "Waiting to retry..."
 msgstr "جاري الإنتظار لإعادة المحاولة..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7457,11 +7619,11 @@
 "مالم تقوم بتعطيل جدار حماية Windows أو خدمة عبّارة طبقة التطبيق\n"
 "ستظهر لوحة إنتهاء المهلة عند عمل FileZilla مع عمليات الإرسال الكبيرة"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "تحذير ، تجاهل إتصال البيانات من IP خاطئ"
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7475,23 +7637,32 @@
 "\n"
 "هل تريد فعلا التدقيق بحثا عن إصدارات المحايدة ؟"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "تحذير : إختراق أمني محتمل"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "مرحبا بك FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "ما هو الجديد"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "ما هو الجديد :"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"عندما تسمح لـ FileZilla بتذكر كلمات المرور, بحيث يمكنك لاحقا من إعادة "
+"الاتصال من دون الحاجة إلى إعادة إدخال كلمة المرور الخاصة بك عند إعادة تشغيل "
+"FileZilla"
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7499,11 +7670,15 @@
 "عند التمكين ، يتم إستبدال الرموز التي لا يدعمها نظام التشغيل المحلي في أسماء "
 "الملفات عند تحميل مثل هذا الملف"
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "شاشة عريضة"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "هل تريد أن يتذكر FileZilla كلمة المرور هذه ؟"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "كت&ابة"
 
@@ -7516,25 +7691,31 @@
 msgid "Wrong line endings"
 msgstr "نهايات سطور خطأ"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "نعم"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "يبدو أنك تستخدم مضيف IPv6 فقط. هذا المعالج لا يدعم هذه البيئة"
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "انت تستخدم أحدث نسخة من FileZilla . الرجاء تحقق مرة ثانية مستقبلا"
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "يمكنك فتح هذه اللائحة مرة ثانية خلال قائمة تعليمات"
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "يمكنك ترك حقل المنفذ فارغا لاستخدام المنفذ الافتراضي"
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7556,18 +7737,18 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "أنت لم تدخل اسم جديد للملف ، هل تكتب على الملف بدلا من ذلك ؟"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "أنت قمت بتحديد رابط ترميزي واحد على الأقل"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "أنت قمت بتحديد أكثر من 10 ملفات للتحرير ، هل تريد فعلا الإستمرار ؟"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7575,11 +7756,11 @@
 "أنت قمت بتحديد أكثر من 10 ملفات أو أدلة للفتح ، هل تريد فعلا الإستمرار ؟"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "يجب أن تدخل أسم مضيف"
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "يجب إدخال دليل محلي"
 
@@ -7588,17 +7769,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "يجب أن تدخل عنوان IP صالح"
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "يجب إدخال دليل محلي قابل للكتابة"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "يجب أن تدخل اسم حساب"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "يجب أن تحدد أسم مستخدم"
 
@@ -7617,35 +7798,35 @@
 msgid "You need to enter a name for the log file."
 msgstr "يجب إدخال إسم لملف السجل"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "يجب إدخال أمر مناسب بين أقواس"
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "يجب إدخال إسم مضيف ملقم الوكيل"
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "يجب إدخال منفذ ملقم الوكيل في المدى من 1 إلى 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "تحتاج إلى إدخال مسار واحد على الأقل ، العلامات الفارغة غير مدعومة"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 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:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7676,44 +7857,49 @@
 "من المفترض ان لا يحدث اى مشاكل فى الاتصال بخوادم أخرى ، إرسال الملفات يجب ان "
 "يعمل بشكل صحيح"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "بعد"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "قبل"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "يبدأ بـ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "بايت"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "يحتوى"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "لا يحتوي على"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "لا يساوي"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "ينتهى بـ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "يساوى"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "ملف"
 
@@ -7732,165 +7918,81 @@
 "الرجاء التأكد من أن هذا الملف التنفيذي موجود في نفس الدليل كملف تنفيذي رئيسي "
 "لـ FileZilla"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp غير قادر على تشغيل"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers لم يرجع بشهادات"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "أكبر من"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "تجميع التنفيذية"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "تجميع القابلة للقراءة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "تجميع القابلة للكتابة"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "مساوى لـ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "موضوع"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "غير موضوع"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "اقل من"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "يطابق التعبير الإصطلاحي"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "ملف المالك التنفيذي"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "ملف قابل للقراءة للمالك"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "ملف قابل للكتابة للمالك"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "غير معروف"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "ملف عام تنفيذي"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "ملف قابل للقراءة للعام"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "ملف قابل للكتابة للعام"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
-
-#~ msgid "Duplicate filter name"
-#~ msgstr "إسم مرشح التكرار"
-
-#~ msgid "Only use plain FTP (insecure)"
-#~ msgstr "فقط إستخدام FTP عادي (غير آمن)"
-
-#~ msgid "Use explicit FTP over TLS if available"
-#~ msgstr "إستخدام FTP صريح عبر TLS إذا متوفر"
-
-#~ msgid "Serial Number:"
-#~ msgstr "رقم التسلسل :"
-
-#~ msgid "&Speed limits..."
-#~ msgstr "&حدود السرعة..."
-
-#~ msgid "Please enter an upload speedlimit greater or equal to 0 KB/s."
-#~ msgstr "الرجاء إدخل حدود سرعة الرفع أكبر أو مساوية إلى 0 كب/ث"
-
-#~ msgid "Cannot load main menu from resource file"
-#~ msgstr "تعذر تحميل القائمة الرئيسية من ملف الموارد"
-
-#~ msgid "bytes"
-#~ msgstr "بايت"
-
-#~ msgid "Downloads unlimited."
-#~ msgstr "عمليات تحميل غير محدودة"
-
-#~ msgid "Uploads unlimited."
-#~ msgstr "عمليات إرسال غير محدودة"
-
-#~ msgid "Yada yada"
-#~ msgstr "و هلم جرا"
-
-#~ msgid "Break current connection?"
-#~ msgstr "قطع الاتصال الحالى؟"
-
-#~ msgid ";1"
-#~ msgstr ";1"
-
-#~ msgid "A&sk for action"
-#~ msgstr "المطالبة بالإ&جراء"
-
-#~ msgid "O&verwrite"
-#~ msgstr "الكتابة &على الملف"
-
-#~ msgid "Over&write if source newer"
-#~ msgstr " ال&كتابة على الملف اذا المصدر أحدث"
-
-#~ msgid "Queue: %s%d bytes"
-#~ msgstr "قائمة الإنتظار : %s%d ب"
-
-#~ msgid "Rena&me"
-#~ msgstr "ت&سمية"
-
-#~ msgid "Res&ume"
-#~ msgstr "إ&ستئناف"
-
-#~ msgid "S&kip"
-#~ msgstr "ت&جاوز"
-
-#~ msgid "Sk&ip"
-#~ msgstr "ت&جاوز"
-
-#~ msgid "Use d&efault"
-#~ msgstr "استخدم& الأفتراضى"
-
-#~ msgid "Add &more"
-#~ msgstr "إ&ضافة المزيد"
-
-#~ msgid "Any of the following"
-#~ msgstr "أي من التالي"
-
-#~ msgid "Connecting to %s:%d..."
-#~ msgstr "جارى الاتصال إلى %s:%d ..."
-
-#~ msgid "Filter &out all files that:"
-#~ msgstr "فرز كافة الملفات التى:"
-
-#~ msgid "None of the following"
-#~ msgstr "لا شىء من الآتى"
-
-#~ msgid "Search for files that:"
-#~ msgstr "البحث عن الملفات التى :"
-
-#~ msgid "State:"
-#~ msgstr "الحالة:"
diff -Nru filezilla-3.5.3/locales/bg_BG.po filezilla-3.7.3~precise/locales/bg_BG.po
--- filezilla-3.5.3/locales/bg_BG.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/bg_BG.po	2013-04-29 03:30:05.000000000 +0000
@@ -1,43 +1,42 @@
 # This file is distributed under the same license as the FileZilla3 package.
 # Milen A. Radev <milen@radev.net>, 2005
 # Асен Генов, 07.2008
-# Стоян Димитров <stoyanster от гмаил>
-# ^#:(.+)\n
+# Стоян Димитров <stoyanster от гмаил> 2008, 2009, 2010, 2011, 2012.
+# ^#:(.+)\n - for removing source lines
+# ^[a-zA-Z0-9'\.\\ \(\)\?%:\/,\<\>@\-_!"\+;=\s]+\n - for spellcheck
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-03 20:45+0200\n"
-"Last-Translator: Стоян Димтиров <stoyanster от гмаил>\n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2013-01-01 21:52+0200\n"
+"Last-Translator: Стоян Димитров <stoyanster от гмаил>\n"
 "Language-Team: Bulgarian <dict@fsa-bg.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: bg\n"
-"X-Poedit-Country: BULGARIA\n"
-"X-Poedit-Language: Bulgarian\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S изминали"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S оставащи"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
 msgstr ""
-"%a - Регистрация (редовете съдържащи това ще бъдат прескачани ако не се "
-"използва удостоверяване тип Регистрация)"
+"%a - Сметка (редовете съдържащи това ще бъдат прескачани ако не се използва "
+"удостоверяване тип Сметка)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
@@ -48,9 +47,9 @@
 msgstr[0] "%d папка"
 msgstr[1] "%d папки"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -59,9 +58,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -82,7 +81,7 @@
 msgstr[0] "%d файл. Обща дължина: най-малко %s"
 msgstr[1] "%d файла. Обща дължина: най-малко %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d файла добавени в опашката"
@@ -94,31 +93,21 @@
 msgstr[0] "%d секунда"
 msgstr[1] "%d секунди"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Хост"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Парола"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -133,7 +122,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Още не е валиден!"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Прокси потребител"
@@ -155,27 +144,17 @@
 msgstr[0] "%s байт"
 msgstr[1] "%s байта"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s байта"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s байта (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s байта (%d.%d KB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s байта (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s байта (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -190,7 +169,7 @@
 "Моля, изтеглете FileZilla отново. Ако проблемът остане, моля, напишете "
 "доклад за дефект."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -204,7 +183,7 @@
 "работи.\n"
 "\n"
 "Възможни решения на проблема:\n"
-"- Уверетесе, че %s е в папка от променливата на средата PATH.\n"
+"- Уверете се, че %s е в папка от променливата на средата PATH.\n"
 "- Укажете пълният път до %s в променливата на средата FZ_FZSFTP."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:56
@@ -212,152 +191,148 @@
 msgid "%s with %d bits"
 msgstr "%s с %d бита"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Потребител"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Прокси парола"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "&Относно..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
-msgstr "&Регистрация:"
+msgstr "&Сметка:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Активен"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
 msgstr "&Добавяне на отметка..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "&Добавяне в опашката"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "&Добавяне файл-ключ..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "&Добавяне в опашката"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "&Часова разлика със сървъра:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "Доверяване на сертификата при &бъдещи сесии."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Доверяване на този хост, &добавяне ключа към кеша"
 
-#: resources.h:940
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "Използване на &редактора по подразбиране"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "&Винаги използвайте този избор за неасоциираните файлове"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "&Винаги това действие"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Запитване към операционната система"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Автоматичен"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "&Автоматично"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Двоичен"
 
-#: resources.h:900
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Двоичен суфикс по SI (пример 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Отметки"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Избор..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Търпимост към резки промени:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "От&каз"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "Проверка &бета версии на FileZilla"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
 msgstr "&Заличаване лични данни..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "За&тваряне FileZilla"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
 msgstr "О&граничение на скоростта..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Настройки..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Свързване"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Копиране"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Запис текуща връзка..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "&Копиране в системния буфер"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Срив"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "&Нова папка"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "&Нов подпрозорец"
 
@@ -365,168 +340,168 @@
 msgid "&Debug"
 msgstr "&Трасиране"
 
-#: resources.h:967
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "Т&расираща информация в дневника:"
 
-#: resources.h:933
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Редактор по подразбиране:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "&Подразбиращо се действие с файлове..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Изчакване след неуспешно удостоверяване:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "Изтрива&не"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
-msgstr "Изтрива&не на връзка"
+msgstr "Изтрива&не на символна връзка"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Сравняване папки"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Отхвърляне на местния файл и редакция наново"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "Прекъсване на &връзката"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "Прекъсване на &връзката"
 
-#: resources.h:876
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Показване моментна скорост на пренос, вместо средната"
 
-#: resources.h:898
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Показване дължината в байтове"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "Да &не бъдат запазвани пароли"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Да не се показва повече този диалог"
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "&Без използване на външен IP адрес при местни връзки."
 
-#: resources.h:920
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "При двойно натискане върху &файлове:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Изтегляне"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "&Изтегляне в:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
 msgstr "&Изтегляне..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "&Изтегляния:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "&Редакция"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
 msgstr "&Редактиране на филтрите..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Активно"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Автоматична проверка за актуализация"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "О&граничениe на скоростта"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "&Кодировка:"
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
 msgstr "&Криптиране:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
 msgstr "Въвеждане &ръчна команда..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
 msgstr "&Изпълнение"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Манипулатор връзки"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "&Експорт..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Отстъпване до активен режим"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Файл"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Атрибути..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "Права на &файл..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Файл:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "Набори &филтри:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "Набори &филтри:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Филтри:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Край"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "&Завършване на редакцията и изтриване на местния файл"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -534,479 +509,486 @@
 "&Събиране на отдалечените пътища - изтегляне на всички, съдържащи се файлове "
 "директно в целевата папка."
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
-"&Следване на символичната връзка, изтриване на целевата папка и съдържанието "
-"и"
+"&Следване на символната връзка, изтриване на целевата папка и съдържанието и"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
 msgstr "&Получаване на външния IP адрес от URL:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Получаване помощ..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Глобална отметка"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 използвайки методът CONNECT"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "&Помощ"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Скриване на идентичните файлове"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "Н&ай-висок"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
 msgstr "Най-&висок наличен порт:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Хост:"
 
-#: resources.h:899
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "IEC десетичен &суфикс (пример 1 KiB = 1024 bytes)"
 
-#: resources.h:887
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (пример: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "И&мпорт..."
 
-#: resources.h:942
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "&Наследяване от системните файлови асоциации"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Поддържане на отдалеченото дърво релативно спрямо корана на търсене"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "&Панели с файлове и папки:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Ограничаване портовете, използвани от FileZilla"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "Ограничаване броя на &едновременните връзки"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "&Местни папки"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "&Местна папка:"
 
-#: resources.h:957
+#: resources.h:981
 msgid "&Log to file"
 msgstr "Записване във &файл-дневник"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
-msgstr "Тия &удостоверяване:"
+msgstr "Тип &удостоверяване:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "&Удостоверяване:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "&Нисък"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
 msgstr "М&анипулатор отметки..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "&Ръчно прехвърляне..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "Максимален брой &връзки:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Максимален брой опити:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "&Дневник"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Минимизиране в системната лента"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Наименование:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
 msgstr "&Съветник настройки мрежа..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "Но&в"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "Нова &връзка"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Налична е нова версия!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Напред >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Не"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Никакъв"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "Н&ормален"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Брой дни между проверките за актуализация:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Цифрова стойност:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&ОК"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&Отваряне"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Отваряне"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "П&резапис"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Пасивен"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Парола:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "Из&даване на звук"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "П&орт:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "&Местоположение на дневника:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Запазване времената при прехвърляне"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "Опа&шка"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "&Бързо свързване"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "&Лента за бързо свързване"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Четене"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "Повторно &свързване"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Опресняване"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "&Запомняне на паролата за текущата сесия"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Запомняне на пароли"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "&Отдалечена папка:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "О&тдалечен път:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Премахване"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "&Заличаване ключ"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "П&ремахване на избраните"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "Преимен&уване"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "Преимен&уване..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
 msgstr "&Отваряне отново на местния файл"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "Замяна на &невалидните знаци с:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "&Доклад за дефект..."
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "Анулиране и &връщане в опашката на всички"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "&Отначало"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "Поднов&яване"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "Изпълнение на &команда..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
 msgstr "&Съветник настройки мрежа..."
 
-#: resources.h:951
+#: resources.h:976
 msgid "&Run update check now..."
-msgstr "&Проверка за актуализации..."
+msgstr "&Проверка за актуализация..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&Страница"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
 msgstr "Запис &като..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Търсене"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
 msgstr "&Търсене на отдалечени файлове..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "&Избор:"
 
-#: resources.h:931
+#: resources.h:951
 msgid "&Select language:"
 msgstr "&Избор:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "&Изберете колоните, които да бъдат видими:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Сървър"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Настройки"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "&Настройки..."
 
-#: resources.h:966
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "&Меню за трасиране"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "Показване на &съобщение"
 
-#: resources.h:956
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "&Вписване на времевия маркер"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "М&анипулатор връзки..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "Отметка към &връзка"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "&Прескачане"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
-msgstr "О&граничаване на скоростта"
+msgstr "О&граничение на скоростта"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "Започване на &прехвърлянето веднага"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Размяна на местните и отдалечените панели"
 
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "TLS &шифри"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Проверка"
 
-#: resources.h:879
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Тема:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
 msgstr "Пре&хвърляне"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "&Режим:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "Оп&ашка"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Файлови имена, започващи с точка са ASCII"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "Отказ от &редакция"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Актуализация на кеширания ключ за този хост"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Качване"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "&Качвания:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "Потре&бителска програма"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "&Синхронизирано разлистване"
 
-#: resources.h:935
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "Използване на &системния редактор за текстови файлове"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "&Използване на следния IP адрес:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "&Използване на външния IP адрес на сървъра вместо това"
 
-#: resources.h:902
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "&Използване разделител за хилядите"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
 msgstr "&Потребител:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
 msgstr "&Потребител:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Версия %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "Из&глед"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Преглед/Редакция"
 
-#: resources.h:941
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Следене за локално редактирани файлове и питане за качване"
 
-#: resources.h:136
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "При проверка за &актуализация, да се проверява за"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Запис"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Да"
 
@@ -1021,15 +1003,30 @@
 #: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' не е папка."
+msgstr "\"%s\" не е папка."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
+msgstr "Типът удостоверяване \"Сметка\" не се поддържа от избрания протокол"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"Удостоверяване тип \"Нормално\" и \"Сметка\" не са достъпни. Използване на "
+"\"Питане за парола\"."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
 msgstr ""
-"Типът удостоверяване \"Регистрация\" не се поддържа от избрания протокол"
+"Удостоверяване тип \"Нормално\" и \"Сметка\" не са достъпни. Добавената "
+"връзка беше променена на \"Питане за парола\"."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1047,120 +1044,116 @@
 msgstr[0] "(%d обект филтриран)"
 msgstr[1] "(%d обекта филтрирани)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(0 за неограничено)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 секунди)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 за изключване)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(най-малко 7 дни)"
-
-#: resources.h:895
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(пример: %H:%M)"
 
-#: resources.h:889
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(пример: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(в %s/с)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S остават"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- остават"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
 msgstr "- Повреден маршрутизатор и/или защитна стена"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- Файлът на огледалото е повреден"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- Злонамерен софтуер на вашата система"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- остават"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c не може да се използва заедно с FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l може да се бъде използвано само заедно с FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s и -c не могат да бъдат използвани заедно."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s не може да се използва заедно с FTP URL."
 
-#: resources.h:968
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Няма"
 
-#: resources.h:969
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Предупреждения"
 
-#: resources.h:970
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Информация"
 
-#: resources.h:971
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Подробна"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 битова система"
 
-#: resources.h:972
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Трасираща"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 битова система"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Назад"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1169,16 +1162,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Отметка с въведеното име вече съществува. Моля, въведете ново име."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Необходим е редактор по подразбиране."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Папка не може да бъде влачена в нейна подпапка."
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1188,30 +1182,30 @@
 "настроени. В такива случаи се налага използването на активен режим. В "
 "активен режим FileZilla отваря порт и моли сървъра да се свърже към него."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Вече отварян файл е бил променен."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
 "Файл с това име се редактира в момента. Искате ли да отворите отново \"%s\"?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Файл със същото име вече е бил прехвърлен."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Файл със същото име се редактира в момента. Моля, затворете го и пробвайте "
 "отново."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1226,11 +1220,11 @@
 "файлове.\n"
 "В тази сесия няма да бъдат показвани повече такива предупреждения."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Налична е по-нова версия на FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1238,7 +1232,7 @@
 "Добре конфигурираният сървър показва всички файлове, но някои не показват "
 "скритите. Използвайте тази опция да накарате сървъра да показва всички."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1254,15 +1248,15 @@
 "Отдалечена операция е в ход и синхронизирано разлистване е включено.\n"
 "Изключване на синхронизираното разлистване и смяна само на местната папка?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "До&бавяне"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "Подно&вяване и за ASCII файлове"
 
@@ -1274,55 +1268,55 @@
 msgid "A&pply only to uploads"
 msgstr "Само при &качване"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "прилагане върху &всички файлове и папки"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "&Автоматично премахване на успешните"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "A&SCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "&текущия подпрозорец"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "Относно FileZilla"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Над панела с файлове и папки"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
-msgstr "Регистрация"
+msgstr "Сметка"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Действие &след обработка на опашката"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Действие с избраните:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Действие:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "Действие:"
 
@@ -1357,23 +1351,23 @@
 "IP адрес, но вашият маршрутизатор или защитна стена подвеждащо е променил "
 "изпратения адрес."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "IP адрес за активен режим"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "&Добавяне в опашката"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Добавяне избраната папка в опашката"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Добавяне избраните файлове и папки в опашката"
 
-#: resources.h:922 resources.h:928
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Добавяне в опашката"
 
@@ -1381,46 +1375,60 @@
 msgid "Address type not supported"
 msgstr "Неподдържан тип на адрес"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Разширени"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Разширени настройки:"
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Съвет: Освен ако не искате да изпробвате някои нови функционалности, моля "
+"продължете да използвате стабилните версии. Бета версиите и нощните "
+"компилации са развойни версии, предназначени за тестване. Нощните компилации "
+"може да не работят по очаквания начин и дори могат да повредят системата ви. "
+"Използвайте бета версиите и нощните компилации на ваша отговорност."
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Алгоритъм:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Всички файлове са успешно прехвърлени"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Всички портове в обхвата трябва да са между 1024 и 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Всички прехвърляния приключени. %d файл не беше прехвърлен."
 msgstr[1] "Всички прехвърляния приключени. %d файла не бяха прехвърлени."
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "&Отстъпване до другия режим на прехвърляне при неуспех"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "&Отстъпване до другия режим на прехвърляне при неуспех"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Активна връзка"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1428,7 +1436,7 @@
 "Освен това можете да използвате инструмента Pageant от PuTTY да управлявате "
 "своите ключове, FileZilla разпознава Pageant."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1437,7 +1445,7 @@
 "направите това, уверете се, че променливата на средата SSH_AUTH_SOCK е "
 "зададена."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1445,7 +1453,7 @@
 "Или посетете http://filezilla-project.org/, за да изтеглите най-новата "
 "версия."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1454,7 +1462,7 @@
 "Възникна грешка при зареждане на опашката от \"%s\".\n"
 "Възможно е някои елементи да не са възстановени."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1463,35 +1471,35 @@
 "Възникна грешка при запазване на опашката от \"%s\".\n"
 "Възможно е някои елементи да не са запазени."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Елемент със същото име като влачения вече съществува в целевата папка."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Анонимно"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Друга отдалечена операция е в ход и папката не може да бъде разлистена."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "Никакви промени, направени в Манипулатор връзки няма да могат да бъдат "
 "запазени."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1499,60 +1507,60 @@
 "Никакви промени, направени в Манипулатор връзки няма да бъдат запазени, "
 "освен ако не поправите файла."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr ""
 "Никакви промени, направени в Манипулатор връзки няма да могат да бъдат "
 "запазени."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Никакви промени, направени във филтрите няма да бъдат запазени."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "прилагане само върху &папки"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "&Прилагане"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Само за &текущата опашка"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "прилагане само върху &файлове"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Архив"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Като раздел в панела на опашката"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Питане за действие"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
-msgstr "Парола"
+msgstr "Питане за парола"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
 msgstr "&Запитване към операционната система"
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "&Запитване към операционната система"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Задаване на въпроси във форумите на FileZilla"
 
@@ -1560,39 +1568,35 @@
 msgid "Associated program not found:"
 msgstr "Асоциираната програма не е намерена"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Поне едно условие във филтъра е непълно"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "Всичката необходима информация е събрана."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Неуспешно удостоверяване."
 
-#: resources.h:880
+#: resources.h:900
 msgid "Author:"
 msgstr "Автор:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "&Автоматичен"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Автоматично класифициране типовете файлове"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Автоматична проверка"
-
-#: resources.h:884
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Налични размери"
 
@@ -1601,66 +1605,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
 msgstr "&Заобикаляне прокси"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Основни инструкции за ползване"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Поведение"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Редактиран"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Еталониране на механизма за слепване на низове"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Пазете се! Сертификатът е анулиран"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "&Двоичен"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Черна дъска"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Отметка"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Отметка:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Отметки"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Дата на компилация:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Информация за компилацията"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Категория заетост:"
 
-#: resources.h:752
+#: resources.h:772
 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, "
@@ -1670,63 +1674,63 @@
 "активен режим. Ако желаете да ограничите FileZilla, в използвания обхват "
 "портове можете да въведете желаните портове по-долу."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "&Прекъсване текущата операция"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Проверка &нощни компилации на FileZilla"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "&Изчистване"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Копиране на URL в системния буфер"
 
-#: resources.h:888
+#: resources.h:908
 msgid "C&ustom"
 msgstr "По&требителски"
 
-#: resources.h:943
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "&Потребителски файлови асоциации:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Изчисляване часовата разлика със сървъра..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Грешка при четене от файл"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Неуспешен запис на данни във файл."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Неуспешен запис във файл: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "От&каз"
 
-#: resources.h:990
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Прекъсване текущата операция"
 
-#: resources.h:991
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Прекъсва операцията извършвана в момента"
 
@@ -1736,11 +1740,11 @@
 msgstr ""
 "Грешка при достъп до \"%s\" - няма сложен диск или устройството не е готово."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Неуспех при добавяне към Манипулатор връзки"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1756,30 +1760,30 @@
 "Невъзможност за сравняване, на месните и отдалечените папки са наложени "
 "различни филтри"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Неуспешно сравняване на папки, няма осъществена връзка със сървър."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Неуспешно създаване филтър"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Невъзможна редакция на файл"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Невъзможна редакция на файл, няма активна връзка със сървър."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Невъзможна редакция на файл. Отдалеченият път е неизвестен."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1787,8 +1791,8 @@
 "Не може да бъде установена FTP връзка със SFTP сървър. Моля изберете "
 "правилният протокол."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Грешка при зареждане на лентата \"Бързо свързване\" от ресурсен файл"
 
@@ -1800,44 +1804,48 @@
 msgid "Cannot load keyfile"
 msgstr "Неуспешно зареждане на файл-ключ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Грешка при зареждане на лента с инструменти от ресурсен файл"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Без запазване на пароли"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Грешка при преименуване на запис"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Грешка при преименуване на файл"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Неуспешен запис на набора филтри"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Неуспешен избор на филтър"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Асоциацията не може да бъде избрана"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Невъзможно показване на диалог"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Не може да прегледате/редактирате избрания файл"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Категории"
 
@@ -1845,82 +1853,82 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Сертификат и данни на сесия не са налични все още."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Детайли на сертификата"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
-msgstr "Публичен ключ:|Public key certificate:|Публичния ключ, сертификат"
+msgstr "Сертификат във верига:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Издател на сертификата"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Запитване:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Промяна на атрибутите"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Промяна на правата за файл."
 
-#: resources.h:964
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Промяната на настройките за файл-дневник изискват рестартиране на FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Проблем с знаковата кодировка"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Знаков набор"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Проверка за &бета версии на FileZilla"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
-msgstr "&Актуализации..."
+msgstr "&Актуализация..."
 
-#: resources.h:551
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "&Автоматична проверка за актуализация:"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
 msgstr "Проверка за по-нова версия на FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
-msgstr "Проверка за актуализации"
+msgstr "Проверка за актуализация"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
-msgstr "Проверката за актуализации беше неуспешна"
+msgstr "Проверката за актуализация беше неуспешна"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
-msgstr "Проверка за правилен външен IP адрес"
+msgstr "Проверяване за правилен външен IP адрес"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
-msgstr "Проверяване за актуализации"
+msgstr "Проверяване за актуализация"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Различна хеш сума на изтегления файл."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Избор на местна папка по подразбиране"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Избор на местна папка"
 
@@ -1928,43 +1936,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Неправилно завършени данни в пакета"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Шифър:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "З&атваряне на подпрозорец"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Класически"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "&Манипулатор връзки"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "&Заличаване кеш-паметта на изгледа"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "хронология &бързо свързване"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "информация &повторно свързване"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "о&пашка"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Заличаване хронологията"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1972,11 +1980,11 @@
 msgid "Clear private data"
 msgstr "Заличаване лични данни"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Изчистване лентата \"Бързо свързване\""
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Изчистване на механизма за слепване на низове"
 
@@ -1984,24 +1992,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Натиснете \"Край\", за да запишете настройките."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Натиснете \"Напред\", за да изтеглите новата версия."
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "MAC от клиента към сървъра:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Шифър от клиента към сървъра:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "Затваряне на &другите подпрозорци"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Затваряне на FileZilla"
 
@@ -2009,11 +2017,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Затваряне на всички активни прозорци на FileZilla"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Затваря текущия подпрозорец"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "&Коментар:"
 
@@ -2021,11 +2029,11 @@
 msgid "Column properties"
 msgstr "Настройка колони"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Настройка колони"
 
-#: resources.h:938
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Командата и аргументите трябва да бъдат поставени в кавички."
 
@@ -2044,9 +2052,9 @@
 msgstr "Команда, неподдържана от този протокол"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Команда:"
 
@@ -2054,7 +2062,7 @@
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Общо име:"
 
@@ -2063,15 +2071,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Комуникацията се влошава от защитна стена или маршрутизатор."
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "Сравняване &времената"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Сравняване &дължината"
 
-#: resources.h:918
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Пр&аг за сравнение (в минути):"
 
@@ -2079,60 +2087,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Прагът за сравнение трябва да бъде между 0 и 1440 минути."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Компилирано за:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Компилирано на:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Компилирано с:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Флагове за компилатора:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Компресиран"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Паралелни прехвърляния"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Правилата са &чувствителни към регистъра на знаците"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Проверка на настройките"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Настройване на пасивния режим"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Настройка на обхвата на портовете"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "Конфигуриране на FileZilla и мрежата"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Нужно е потвърждение"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Нужно е потвърждение"
 
@@ -2140,7 +2148,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Поздравления, изглежда настройките ви са правилни."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Свързване прескачайки прокси настройките"
 
@@ -2148,34 +2156,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Свързване към определена връзка от Манипулатор връзки"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Връзката осъществена"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Свързване"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Свързване към %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Свързване с %s през прокси"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Свързване към %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Свързване със сървър"
 
@@ -2183,17 +2191,17 @@
 msgid "Connection"
 msgstr "Връзка"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
 msgstr "Опитът за връзка неуспешен"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Неуспешен опит за връзка с \"%s\", пробване на следващ адрес."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Неуспешен опит за връзка с \"%s\"."
@@ -2207,12 +2215,12 @@
 msgid "Connection closed"
 msgstr "Връзката прекъсната"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Връзката прекъсната от сървъра"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Установена е връзка, инициализира се TLS..."
@@ -2221,7 +2229,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Установена е връзка, изпраща се заявка тип HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Връзка установена, очаква се приветствие..."
 
@@ -2237,15 +2245,15 @@
 msgid "Connection refused"
 msgstr "Връзката отказана"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Времето за изчакване за свързването изтече"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Времето за свързване изтече."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Връзката със сървъра загубена."
 
@@ -2265,27 +2273,23 @@
 msgid "Convert keyfile"
 msgstr "Превръщане на файл-ключ"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Копиране"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Копиране (%d) на %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Копиране на %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Копиране в системния буфер на URL на избраните елементи."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Неуспешно приемане на връзка: %s"
@@ -2295,16 +2299,21 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Невъзможно добавянето на връзката към Манипулатор връзки"
 
+#: ../../locales/../src/interface/state.cpp:842
+#, fuzzy
+msgid "Could not complete operation"
+msgstr "Невъзможно копирането на данните"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Неуспешно свързване със сървър"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Неуспешно свързване със сървър: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Неуспешно преобразуване на командата към кодировката на сървъра"
 
@@ -2313,17 +2322,17 @@
 msgid "Could not convert private key"
 msgstr "Невъзможно преобразуване на частния ключ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Невъзможно копирането на URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Невъзможно копирането на данните"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2333,11 +2342,11 @@
 "Или разширението на обвивката не е инсталирано правилно, или не сте пуснали "
 "файловете в прозорец на Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Неуспешно свързване със сървър"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2350,11 +2359,11 @@
 "командния ред \"--datadir <път>\" или чрез установяване на променливата от "
 "средата FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Невъзможно съставянето на специална входна последователност."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2362,7 +2371,7 @@
 "Не може да бъде взето името на издателя на сертификата, "
 "gnutls_x509_get_issuer_dn се провали"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2370,7 +2379,7 @@
 "Не може да бъде взето името на обекта на сертификата, gnutls_x509_get_dn се "
 "провали"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Не може да бъде получен пълен отдалечен път."
 
@@ -2379,24 +2388,24 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Неуспешно получаване на отговор от fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 "Невъзможно получаването на временна папка, в която да бъдат изтеглени "
 "файловете."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 "Не могат да бъдат импортирани партньорски сертификати, "
 "gnutls_x509_crt_import се провали"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
-"Не може да бъде инициализарана структурата на партньорски сертификати, "
+"Не може да бъде инициализирана структурата на партньорски сертификати, "
 "gnutls_x509_crt_init се провали"
 
 #: ../../locales/../src/interface/import.cpp:119
@@ -2419,7 +2428,7 @@
 msgid "Could not load private key"
 msgstr "Неуспешно зареждане на частен ключ"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2431,7 +2440,7 @@
 "Изключване на синхронизираното разлистване и смяна само на отдалечената "
 "папка?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2453,9 +2462,9 @@
 "s'.\n"
 "Синхронизираното разлистване е изключено."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Системният буфер не може да бъде отворен"
 
@@ -2470,11 +2479,11 @@
 msgid "Could not parse remote path."
 msgstr "Неуспешно разпознат отдалечен път."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Неуспешно разпознат адрес на сървър:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Неуспешно прочитане на сокет: %s"
@@ -2483,12 +2492,12 @@
 msgid "Could not read server item."
 msgstr "Невъзможно прочитане на елемент от отговора на сървъра."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Неуспешно придвижване до отместване %s във файл"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Неуспешно придвижване в края на файла"
 
@@ -2496,22 +2505,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Неуспешна команда към fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Неуспешно стартирането на входно-изходна нишка"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Неуспешно започване на прокси приветствие: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Неуспешно започване на прехвърляне"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2524,15 +2533,15 @@
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
 msgstr ""
-"Нвъзможен запис в \"%s\", отметките няма да могат да бъдат запазени: %s"
+"Невъзможен запис в \"%s\", отметките няма да могат да бъдат запазени: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr ""
-"Нвъзможен запис в \"%s\", глобалните отметки няма да бъдат запазени: %s"
+"Невъзможен запис в \"%s\", глобалните отметки няма да бъдат запазени: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2541,16 +2550,16 @@
 "Неуспешен запис в \"%s\", опашката няма да може да бъде запазена.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Не може да бъде записан \"%s\", избраните връзки няма да могат да бъдат "
 "експортирани: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Неуспешен запис в \"%s\": %s"
@@ -2560,7 +2569,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Неуспешен запис на файл-ключ: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Неуспешен запис в местен файл"
 
@@ -2570,39 +2579,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Невъзможно писането във файл-дневник: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Неуспешен запис в сокет: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Страна:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
-"Моментално забива Filezilla. Използва се само за откриване на грешки в "
+"Моментално забива FileZilla. Използва се само за откриване на грешки в "
 "обработката на изключения"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "Нов &файл"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Създаване нова подпапка в текущата папка"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Създаване на празен файл в текущата папка"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
-msgstr "Нова папка"
+msgstr "Нова &папка"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Създаване на файл"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Създаване на нова папка"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Създаване на нова папка \"%s\"..."
@@ -2620,7 +2641,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Критична грешка при прехвърляне след прехвърляне на %s за %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2641,52 +2662,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Текущият режим на прехвърляне е двоичен."
 
-#: resources.h:773 resources.h:894
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "&Потребителски"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Потребителски набор"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Потребителски сървър"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "Тип на &данните"
 
-#: resources.h:901
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Д&есетичен суфикс по SI (пример 1 KB = 1000 bytes)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "По по&дразбиране"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "Изтрива&не"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Изк&лючване всички"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "Да &не бъдат запазвани пароли"
 
-#: resources.h:925
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "При двойно натискане върху &папки:"
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr ""
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-подобни виртуални пътища"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Опасен тип файл"
 
@@ -2694,16 +2719,16 @@
 msgid "Data"
 msgstr "Информация"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Сокетът за данни затворен твърде рано."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Дата"
 
-#: resources.h:885
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Форматиране на датата"
 
@@ -2722,11 +2747,11 @@
 msgid "Debug"
 msgstr "Трасиране"
 
-#: resources.h:965
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Настройки на трасирането"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "&Местна папка:"
 
@@ -2734,19 +2759,19 @@
 msgid "Default (Autodetect)"
 msgstr "По подразбиране (автоматично)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Редакторът по подразбиране неправилно поставен в кавички."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Подразбиращо се действие с файлове"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "О&тдалечена папка:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2758,15 +2783,15 @@
 msgid "Default system language"
 msgstr "Системен език по подразбиране"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Режим на прехвърляне по подразбиране:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Режим на прехвърляне по подразбиране:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "По подразбиране: http://ip.filezilla-project.org/ip.php"
 
@@ -2792,57 +2817,57 @@
 "Забавяне на свързването с %d секунди поради предишни провалени опити за "
 "връзка..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Изтриване"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Изтриване избраната папка"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Изтриване избраните папки и файлове"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Изтриване на папки"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Изтриване на множество несвързани папки не се поддържа все още."
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Изтриване на символична връзка"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Работен плот"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Подробности"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Подробности за нов ключ:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "&папки"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Посока"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Папка"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Сравняване папки"
 
@@ -2861,11 +2886,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Разлистването на папката прекъснато от потребителя"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Неуспешно разлистване папка"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Филтри"
 
@@ -2873,67 +2898,66 @@
 msgid "Directory listing successful"
 msgstr "Успешно разлистване папка"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "Изключ&ване всички"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Изключване на синхронизираното разлистване и смяна само на отдалечената "
 "папка?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "Изключете тази опция, ако не виждате съдържанието на папките си."
 
-#: resources.h:992
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Прекъсване връзката със сървър"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Връзката със сървъра прекъсната"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Прекъсната връзка със сървър: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Прекъсване връзка с предишен сървър"
 
-#: resources.h:993
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Прекъсва връзката с текущо видимия сървър"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "Показване на \"Относно\""
 
-#: resources.h:934
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "&Да не се използва редакторът по подразбиране"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "&Нищо"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2942,8 +2966,8 @@
 "Освен ако не искате да изпробвате някои нови възможности, е по-добре да "
 "използвате стабилната версия."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Наистина ли желаете да затворите FileZilla?"
 
@@ -2956,7 +2980,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Наистина ли желаете да заличите Манипулатор връзки?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Наистина ли желаете да изтриете този запис?"
 
@@ -2964,32 +2988,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Наистина ли желаете да заличите опашката?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Наистина ли желаете да изпратите \"%s\" към сървъра?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Документация"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "&Без използване на външен IP адрес при местни връзки."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "Файлови имена, започващи с точка са ASCII, пример .htaccess"
 
-#: resources.h:919
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Действие при двойно натискане"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "&Изтегляне"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "при и&зтегляне:"
 
@@ -3002,41 +3026,50 @@
 msgid "Download limit: none"
 msgstr "Ограничение при изтегляне: няма"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Изтегляне на резултатите"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Изтегляне избраната папка"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Изтегляне избраните файлове и папки"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Скорост на теглене: %s/s\n"
+"Скорост на качване: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Изтегляне"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Изтегляне на %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Изтегляне на множество несвързани папки не се поддържа все още."
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Изтегляне на резултатите"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3045,59 +3078,63 @@
 "Плъзгане и пускане между различни инстанции на FileZilla не е реализирано "
 "все още."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Плъзгане и пускане между различни сървъри не е реализирано все още."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr ""
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "&Включване всички"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "&Разлистване на папка"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "Изпъ&лнение"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "&Изход"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "Ел. поща:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Всеки филтър изисква поне едно условие."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Редакция на филтри"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Редактиране на файла с конфигурирания редактор и качване промените на "
 "сървъра."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Неуспешна редакция"
 
-#: resources.h:882
+#: resources.h:902
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Празна команда"
 
@@ -3105,9 +3142,9 @@
 msgid "Empty command."
 msgstr "Празна команда."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
-msgstr "Празно съдържание на папка"
+msgstr "Празна папка"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:26
 msgid "Empty directory."
@@ -3117,95 +3154,101 @@
 msgid "Empty file extension."
 msgstr "Празно файлово разширение"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Не са разрешени празни имена на филтри."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Празно име"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Празен низ в кавичките."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "Включв&ане всички"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "&Филтриране на невалидни знаци"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Криптиран"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
 msgstr "Криптиране"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
 msgstr "Информация за криптирането"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Прекратяване на сравняването и промяна на подредбата?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
 msgstr "&Ръчна команда..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "0 - без ограничение"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Въвеждане команда"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Въвеждане команда"
 
-#: resources.h:926
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Разлистване на папка"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Име на филтър"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Име набор филтри"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Въвеждане на ново име за набор филтри"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Въведете парола"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Разлистване на избраната папка"
 
-#: resources.h:719
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Въведете адреса на сървъра.\n"
 "За да укажете протокола, сложете пред името на хоста идентификатор на "
@@ -3213,7 +3256,13 @@
 "подразбиране (ftp://).\n"
 "Тук можете да въведете и пълен URL във формата протокол://потребител:"
 "парола@хост:порт и стойностите, въведени в останалите полета, ще бъдат "
-"презаписани."
+"презаписани.\n"
+"\n"
+"Поддържани протоколи:\n"
+"- ftp:// за обикновен FTP\n"
+"- sftp:// за пренос на файлове по SSH\n"
+"- ftps:// FTP през скрит TLS\n"
+"- ftpes:// FTP през явен TLS"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3224,7 +3273,7 @@
 "Въведете паролата за файл \"%s\".\n"
 "Моля, забележете, че конвертирания файл няма да бъде защитен с парола."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3246,7 +3295,7 @@
 msgid "Error importing"
 msgstr "Неуспешен импорт"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Грешка при зареждане на опашката"
 
@@ -3255,27 +3304,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Грешка при зареждане на XML файл"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Грешка при запазване на опашката"
 
@@ -3286,74 +3335,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Грешка при запис на XML файл"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Грешка при разбора на името на файл."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Грешка, местния файл съществува, но не може да бъде изтрит"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Грешка:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "&нов подпрозорец"
 
-#: resources.h:945
+#: resources.h:971
+msgid "Every month"
+msgstr "ежемесечно"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "на две седмици"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Пример: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:924
 msgid "Examples"
 msgstr "Примери"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "Изпъл&нение"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Изпълним"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Изпълнимият файл не съдържа информация за версията, не може да бъде "
 "проверено за актуализация."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Explorer"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Оп&ашка"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "&Настройки"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Експорт"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "&Име на филтър:"
 
@@ -3361,7 +3418,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Протокол за пренос на файлове"
 
@@ -3373,25 +3430,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Несигурен протокол за пренос на файлове"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Механизмът за FTP не е инициализиран, свързването е невъзможно"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP Прокси"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3405,28 +3462,28 @@
 
 #: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr "FTPES - FTP през скрит TLS/SSL"
+msgstr "FTPS - FTP през скрит TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Неуспешна смяна папка"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Неуспешна смяна език"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Неуспешна проверка за по-нова версия на FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Неуспешно копиране или местене"
 
@@ -3434,43 +3491,43 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Неуспешно създаване на резервно копие на XML файл"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Неуспешно създаване на сокет за слушане, прекратяване"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Неуспешно създаване сокет за слушане в активен режим"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Неуспешно изтегляне най-новата версия на FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Неуспешно търсене пътя до \"Моите документи\""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Неуспешно търсене пътя до роботния плот"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Неуспешно получаване на адреса за контролна връзка, връзката прекратена."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Неуспешно получаване на адреса за връзката за данни, връзката прекратена."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Неуспешна инициализация на FTP машината"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Неуспешна инициализация на TLS."
@@ -3484,24 +3541,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Неуспешно зареждане частен ключ: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Неуспешно отваряне \"%s\" за добавяне/запис"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Неуспешно отваряне \"%s\" за четене"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Неуспешно отваряне \"%s\" за запис"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Неуспешно разпознат върнат път."
 
@@ -3509,7 +3566,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Неуспешно разпознат доверен коренов сертификат."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Неуспешно получаване данни"
 
@@ -3521,11 +3578,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Неуспешно получаване външния IP адрес, прекратяване"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Неуспешно получаване външния IP адрес, използва се вътрешния адрес"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Неуспешно получаване вътрешния IP адрес."
 
@@ -3541,14 +3598,14 @@
 msgid "Failed to send command."
 msgstr "Неуспешно изпращане команда."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Неуспешно установяване езика на %s (%s), използване системния език по "
 "подразбиране"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3556,28 +3613,28 @@
 "Неуспешно установяване езика на %s (%s), използване системния език по "
 "подразбиране%s (%s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Неуспешно установяване езика на %s (%s), използване системния език по "
 "подразбиране."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
 "Неуспешно установяване езика на %s, използване системния език по подразбиране"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Неуспешно установяване езика на %s, използване системния език по "
 "подразбиране (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3588,7 +3645,7 @@
 msgid "Failed to validate settings"
 msgstr "Неуспешна проверка настройки"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Неуспешна проверка на партньорски сертификат"
 
@@ -3605,21 +3662,19 @@
 msgid "Failed transfers"
 msgstr "Неуспешни прехвърляния"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "&Отстъпване до активен режим"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "Фа&йл:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "&файлове"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Файл"
 
@@ -3635,7 +3690,7 @@
 msgid "File editing"
 msgstr "Редакция файлове"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Файлът съществува"
 
@@ -3643,7 +3698,7 @@
 msgid "File exists action"
 msgstr "Действия с файлове"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Файлът е променян"
 
@@ -3651,14 +3706,14 @@
 msgid "File lists"
 msgstr "Списъци"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Файлът не е намерен"
 
-#: resources.h:1003
+#: resources.h:1028
 msgid "File search"
 msgstr "Търсене на файл"
 
@@ -3673,7 +3728,7 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
-msgstr "Прехвърлянето на файл неуспешено"
+msgstr "Прехвърлянето на файл неуспешно"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
@@ -3693,101 +3748,101 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Успешно прехвърляне на файл, прехвърлени %s за %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Все още се прехвърлят файлове."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Файлът ще бъде прехвърлен като ASCII тип."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Файлът ще бъде прехвърлен като двоичен тип."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Грешка на FileZilla"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr "Сега FileZilla ще провери настройките за грешки."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla е вече свързана към сървър. Установяване на новата връзка в:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla е стартирана в т. нар. kiosk mode.\n"
-"Удостоверяване тип \"Нормално\" и \"Регистрация\" не са достъпни в този "
-"режим."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "За да влезе в сила промяната на езика е нужен е рестарт на FileZilla."
 
-#: resources.h:517
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla актуализация"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "С&писъчен статус"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Име"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "&Филтри..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Файлово име не може да бъде съставено от папката %s и файловото име %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Невалидно име на файл"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Файловите имена не могат да съдържат следните знаци: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Непроменено име на файл"
 
-#: resources.h:307 resources.h:958
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Файлово име:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Файловите имена не могат да съдържат следните знаци: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Файловите имена не могат да съдържат следните знаци: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Отворени за редакция файлове"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Дължина"
@@ -3796,70 +3851,70 @@
 msgid "Filesize format"
 msgstr "Формат дължина"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Тип"
 
-#: resources.h:946
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Файлови асоциации"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Горните правила се прилагат към:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Невалидни знаци в имена на файлове"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Вече съществува филтър с това име"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Филтриране елементи, съответстващи на всички критерии"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr ""
 "Филтриране елементи, съответстващи на който и да е от следните критерии"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
 msgstr ""
 "Филтриране елементи, не съответстващи на нито един от следните критерии"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Съществуващ набор филтри"
 
-#: resources.h:996
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Филтриране съдържанието на папка"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Неуспешна проверка валидност на филтър"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Отпечатък (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Отпечатък (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Отпечатък:"
 
@@ -3867,7 +3922,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Съветник настройки мрежа"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3875,45 +3930,45 @@
 "За подробна информация относно тези настройки, моля, стартирайте Съветник "
 "настройки мрежа."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "За по-голяма надеждност трябва да укажете обхват от най-малко 10 порта."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr ""
-"За тази сесия ще бъдат използвани настройките по подразбиране. Ввсички "
-"промени в настройките няма да бъдат запазени."
+"За тази сесия ще бъдат използвани настройките по подразбиране. Промени в "
+"настройките няма да бъдат запазвани."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "&Налагане UTF-8"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "П&оказване скрити файлове"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Показване скрити файлове"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Легенда:"
 
-#: resources.h:944
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Формат: разширението последвано от поставена в кавички команда и аргументи."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Още документация"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Общи"
 
@@ -3921,21 +3976,21 @@
 msgid "General SOCKS server failure"
 msgstr "Грешка от общ тип на SOCKS сървъра"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Нормално прокси"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
 msgstr "&Получаване на външния IP адрес от URL:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Получаване помощ"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Вече съществува набор филтри с това име. Искате ли да бъде презаписан?"
 
@@ -3943,15 +3998,15 @@
 msgid "Global bookmarks"
 msgstr "Глобални отметки"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Права за групата"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "&Висок"
 
@@ -3959,21 +4014,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP върху TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Скрит"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Висока"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Най-висок"
 
@@ -3981,26 +4036,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Най-високият наличен порт трябва да е число от 1024 до 65535."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Задържане на \"Shift\" за превключване на състоянието на филтъра от двете "
 "страни едновременно."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Официална страница:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Ключов отпечатък на хоста:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Несъответствие на хост-ключа"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Хостът започва с \"[\", но липсва затварящата скоба."
 
@@ -4008,35 +4063,35 @@
 msgid "Host unreachable"
 msgstr "Хостът недостъпен"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Хост:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "часове,"
 
-#: resources.h:893
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (пример: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
 "Ако през този интервал няма изпратени или получени данни, връзката ще бъде "
-"затворена и FileZilla ще направи опит за свързване."
+"затворена и FileZilla ще направи нов опит за свързване."
 
-#: resources.h:974
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Ако подавате доклад за дефект, моля, осигурете дневник, създаден при ниво "
 "\"Подробна\"."
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -4044,33 +4099,33 @@
 "basis in the Site Manager."
 msgstr ""
 "Ако автоматичната проверка в края на съветника мине успешно, но не можете да "
-"прехвърляте файлове до определен сървър, този сървър вероятно е погрешно "
+"прехвърляте файлове до определен сървър, този сървър вероятно е грешно "
 "настроен и за връзка с него трябва да използвате активен режим. Може да "
-"настройвате режима на прехвърляне за всеки сървър поотделно в \"Манипулатор "
+"избирате режим на прехвърляне за всеки сървър поотделно в \"Манипулатор "
 "връзки\"."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
-"Ако режимът на отстъпване е включен, ще имате възможност да се свързвате с "
-"погрешно настроени сървъри, които отказват връзка чрез избрания режим."
+"Ако режимът на отстъпване е включен, ще можете да се свързвате с грешно "
+"настроени сървъри, които отказват връзка чрез избрания режим."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
 msgstr ""
-"Aко промяната на хост-ключа е неочаквана, моля свържете се с администратора "
-"на сървъра."
+"Ако промяна в хост-ключа е неочаквана, моля свържете се с администратора на "
+"сървъра."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:554
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"Ако проблемът продължава значи някой маршрутизатор и/или защитна стена "
+"Ако проблемът не изчезне, значи някой маршрутизатор и/или защитна стена "
 "продължават да блокират FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
@@ -4078,25 +4133,25 @@
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"Ако проблемът остане значи някой маршрутизатор и/или защитна стена "
+"Ако проблемът не изчезне, значи някой маршрутизатор и/или защитна стена "
 "продължават да прекъсват връзката."
 
-#: resources.h:963
+#: resources.h:987
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
-"Ако размерът на файла-дневник достигне лимита, то той ще бъде преименуван "
-"като бъде добавено \".1\" в края на името, вероятно презаписвайки стар файл, "
-"и нов файл бива създаден."
+"Ако размерът на файла-дневник достигне ограничението, то той ще бъде "
+"преименуван като бъде добавено \".1\" в края на името, вероятно "
+"презаписвайки стар файл, и нов файл бива създаден."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
-"Ако символична връзка сочи папка, FileZila може или да изтрие връзката, или "
+"Ако символна връзка сочи папка, FileZilla може или да изтрие връзката, или "
 "да изпразни целевата папка."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:624
@@ -4110,10 +4165,10 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
-"Ако проблемът остане, моля, обърнете се към производителя на вашия "
+"Ако проблемът не изчезне, моля, обърнете се към производителя на вашия "
 "маршрутизатор."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 "
@@ -4123,7 +4178,7 @@
 "синхронизирано с това на сървъра. Ако времената се различават (например "
 "заради часова разлика), укажете часовата разлика в Манипулатор връзки."
 
-#: resources.h:917
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4131,11 +4186,11 @@
 "При сравняване на файлове по времеви маркери, за еднакви се считат такива, "
 "чийто маркери имат разлика не по-голяма от този праг."
 
-#: resources.h:932
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
 msgstr "При промяна на езика, трябва да рестартирате FileZilla."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4143,11 +4198,11 @@
 "Като натиснете \"Проверка\", FileZilla ще се свърже с probe.filezilla-"
 "project.org и ще направи няколко теста."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "При затваряне на FileZilla промените ще бъдат загубени."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4155,11 +4210,11 @@
 "Ако сгрешите при въвеждането на файловите типове, тези файлове могат да "
 "бъдат повредени при прехвърлянето."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Ако получите някакви грешки, то настройките ви не са правилни."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4177,7 +4232,7 @@
 "отдалечен маршрутизатор да са погрешно настроени. В такъв случай превключете "
 "на пасивен режим и се обърнете за помощ към администратора на сървъра."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4185,7 +4240,7 @@
 "Ако съветникът завърши успешно и последният тест, всички налични защитни "
 "стени и маршрутизатори ще бъдат правилно настроени."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4193,7 +4248,7 @@
 "Ако използвате защитна стена настройте я така, че FileZilla може да приема "
 "връзки на всички посочени портове."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4213,7 +4268,7 @@
 msgid "Import data from older version"
 msgstr "Импорт на данни от по-стара версия"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Импорт настройки"
 
@@ -4227,7 +4282,7 @@
 msgid "Improperly quoted association."
 msgstr "Асоциацията неправилно поставена в кавички."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4235,7 +4290,7 @@
 "В активен режим FileZilla трябва да слуша на порт за прехвърляне на данни. "
 "Вие трябва да укажете кои портове да се използват от FileZilla."
 
-#: resources.h:703
+#: resources.h:723
 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."
@@ -4244,7 +4299,7 @@
 "като FileZilla не може да окаже влияние върху избора на портовете от "
 "операционната система."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4252,7 +4307,7 @@
 "Ако предпочитате автоматичното обновяване, може да включите тази проверка в "
 "диалоговия прозорец с настройките."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4260,7 +4315,7 @@
 "За използване на активен режим, FileZilla трябва да знае вашия външен IP "
 "адрес."
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4270,7 +4325,7 @@
 "изисква от сървъра порт и се свързва към него. В този случай няма много за "
 "настройване."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4278,20 +4333,20 @@
 "Не пълна верига, главният сертификат не е самоподписан сертификат от издател "
 "на сертификати."
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Грешна парола"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Инициализация на TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Несигурен сървър, неподдържащ FTP през TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Интерактивно"
@@ -4301,8 +4356,8 @@
 msgstr "Интерфейс"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
 msgstr "Прекъснато от потребителя."
 
@@ -4314,8 +4369,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Невалиден отговор за HTTP"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4339,12 +4394,13 @@
 msgid "Invalid date"
 msgstr "Невалидна дата"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Невалидно име на файл"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Невалидно име на хост - затварящата скоба може да бъде последвана само от "
@@ -4354,28 +4410,35 @@
 msgid "Invalid input"
 msgstr "Невалидни данни"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Невалиден порт. Портът е число между 1 и 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Указан е невалиден протокол. Валидни протоколи са:\n"
-"ftp:// за обикновен FTP,\n"
-"sftp:// за протокол с прехвърляне на файлове през SSH,\n"
-"ftps:// за FTP през SSL (скрит) и\n"
-"ftpes:// за FTP през SSL (явен)."
+"ftp:// за обикновен FTP\n"
+"sftp:// за пренос на файлове по SSH\n"
+"ftps:// FTP през скрит TLS и\n"
+"ftpes:// FTP през явен TLS"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Невалидно име на хост на прокси - затварящата скоба може да бъде последвана "
+"само от двоеточие и номер на порт."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Невалиден регулярен израз в условието на търсенето."
 
@@ -4383,7 +4446,7 @@
 msgid "Invalid response code"
 msgstr "Невалиден код на отговор"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Невалидни условия за търсене: %s"
@@ -4395,38 +4458,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Грешен път до връзка"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Невалиден размер в условие"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Невалидно потребителско име."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Държава по юрисдикция:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
-msgstr "Местност по юристикция:"
+msgstr "Местност по юрисдикция:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
-msgstr "Щат или провинция по юриздикция:"
+msgstr "Щат или провинция по юрисдикция:"
 
-#: resources.h:914
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Папките - отгоре"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4437,50 +4500,55 @@
 "FileZilla прави тестове дали сървъра поддържа тази функционалност тези "
 "проверки може да са неуспешни."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Размяна на ключове"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Размяна на ключове"
+
+#: resources.h:619
 msgid "L&owest"
 msgstr "Най-н&исък"
 
-#: resources.h:930
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Език"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Езикът променен"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Последна промяна"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Изглед"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Максимален брой паралелни &изтегляния:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
 msgstr "Максимален брой паралелни ка&чвания:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
 msgstr "Портове"
 
-#: resources.h:960
+#: resources.h:984
 msgid "Limit size of logfile"
-msgstr "Лимитиране на размера на файлът-дневник"
+msgstr "Ограничаване размера на файлът-дневник"
 
-#: resources.h:961
+#: resources.h:985
 msgid "Limit:"
 msgstr "Лимит:"
 
@@ -4488,7 +4556,7 @@
 msgid "Line length exceeded"
 msgstr "Надвишена дължина на ред"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Зависимости"
 
@@ -4497,21 +4565,21 @@
 msgstr "Слушащият сокет е затворен"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Списък:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
 msgstr "Най-&нисък наличен порт:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Местни"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Местен файл"
 
@@ -4527,7 +4595,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Местният файл не е валидно файлово име."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Местни филтри:"
 
@@ -4535,7 +4603,7 @@
 msgid "Local site:"
 msgstr "Местни:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Населено място:"
 
@@ -4543,16 +4611,16 @@
 msgid "Log file"
 msgstr "Файл-дневник"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
-msgstr "Дневник на проверките за актуализации:"
+msgstr "Дневник на проверките за актуализация:"
 
-#: resources.h:955
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Дневник"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4561,7 +4629,7 @@
 "разбира UTF-8. Невъзможност за отстъпване до местния знаков набор, поради "
 "използването на прокси."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4569,13 +4637,13 @@
 "Данните за удостоверяване съдържат не-ASCII знаци, а сървъра може да не "
 "разбира UTF-8. Проба с местния знаков набор."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Входната последователност е изцяло изпълнена, но пак няма удостоверение. "
 "Отмяна."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Удостоверяването трябва да бъде или \"ask\" или \"interactive\" (без "
@@ -4590,13 +4658,13 @@
 "Удостоверяването може да бъде използвано само с FTP URL. Аргументът трябва "
 "да бъде или \"%s\" или \"%s\""
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Нисък"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Най-нисък"
 
@@ -4604,11 +4672,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "Най-ниският наличен порт трябва да е число от 1024 до 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Уверете се, че файлът може да бъде достъпен и е добре форматиран XML "
@@ -4631,7 +4699,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Деформиран отговор, сървъра не изпраща правилни знаци за край на ред"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4642,58 +4710,58 @@
 msgid "Manual transfer"
 msgstr "Ръчно прехвърляне"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
-msgstr "&всички правила"
+msgstr "всички правила"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "някое от правилата"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "никое правило"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "&Максимален брой:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Дневник"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "Местоположение на дневника"
 
-#: resources.h:962
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "минути"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "Надо&лу"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "Наг&оре"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Моят компютър"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Моите документи"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Моите връзки"
 
@@ -4702,33 +4770,33 @@
 msgid "N/a"
 msgstr "Няма"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Наименование"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Името вече съществува"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Името вече съществува."
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Име:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Трябва да въведете име на филтър"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Трябва да въведете валиден отдалечен път"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Трябва да се укаже знакова кодировка"
 
@@ -4736,19 +4804,23 @@
 msgid "Network unreachable"
 msgstr "Мрежата недостъпна"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "никога"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "Нова &папка"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Нов &подпрозорец"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "Нова &отметка"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4761,41 +4833,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Нова отметка"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Нова папка"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Новата функционалност и подобрения в %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Нов филтър"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Нова папка"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Нова връзка"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "До опашката"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Не"
 
@@ -4803,25 +4875,25 @@
 msgid "No category to export selected"
 msgstr "Не е избрана категория за експорт"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Няма указана команда, прекратяване."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Няма въведен външен IP адрес, проба с адрес по подразбиране."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "В момента няма отворени за редакция файлове."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Филтърът няма име"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Не е указан хост. Моля, укажете хост."
 
@@ -4829,25 +4901,25 @@
 msgid "No images available"
 msgstr "Няма налични изображения"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Няма файлове в опашката"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Въведете име за набора филтри."
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Няма асоциирана програма към този файлов тип"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "Няма свързана програма за редактиране на файлове с разширение '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Няма намерени резултати"
 
@@ -4865,23 +4937,23 @@
 msgid "No username given."
 msgstr "Не е въведено потребителско име."
 
-#: resources.h:924 resources.h:929
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Никакъв"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Няма избрани"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Нормално"
 
@@ -4891,15 +4963,15 @@
 msgstr "Не всичко може да бъде върнато в опашката за преглед/редакция."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Без осъществена връзка"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Няма осъществена връзка"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Няма осъществена връзка."
 
@@ -4907,21 +4979,21 @@
 msgid "Not connected."
 msgstr "Без осъществена връзка"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Тази особеност се поддържа само при използване на протокола FTP."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Заб.: Работи само при некриптирана FTP връзка."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Забележка: Използването на нормално прокси налага пасивен режим на FTP "
 "връзките."
 
-#: resources.h:903
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Брой цифри след десетичния знак:"
 
@@ -4929,21 +5001,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Броят на опитите трябва да е между 0 и 99."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "Отваряне за &преглед"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "&ОК"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4951,119 +5023,124 @@
 "На следващите страници ще бъдат настройвани избраните режими на прехвърляне, "
 "както и режима за отстъпване, ако е включен."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Веднъж"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Единствено версиите на FileZilla и операционната система ще бъдат изпратени "
-"към сървъра."
+#: resources.h:969
+msgid "Once a week"
+msgstr "ежеседмично"
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Отваряне на папката във файловия мениджър на системата"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Отваряне Манипулатор връзки"
 
-#: resources.h:564
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Отваряне Манипулатор връзки."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Отваряне на Манипулатор връзки. Щракнете с десен бутон за списък с връзки."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Отваряне файл"
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
 msgstr "Отваряне на диалога с настройките на FileZilla"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Отворен като:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Неуспешно отваряне"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Отваряне на нов подпрозорец"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Отваря Манипулатор връзки"
 
-#: resources.h:997
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Отваря диалога за филтри на списъка с папки. Щракнете с десния бутон за "
 "превключване на филтрите."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "Операционна система"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Открит е проблем с операционната система"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Организация:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Друго:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Преглед"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Презапис при по-&нов"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Презапис"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Презапис при по-нов източник"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Презапис при по-нов източник"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Презапис при по-нов източник"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Презапис при &различна дължина"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Презапис при различна &дължина или по-нов източник"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Права на собственика"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Собственик/Група"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5071,7 +5148,7 @@
 "&Предпазване на системата от влизане в режим на сън по време на трансфери и "
 "други операции"
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "&Хост:"
@@ -5080,27 +5157,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Командата \"PORT\" е променена от маршрутизатор или защитна стена."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "&Пасивен (препоръчителен)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Пакет"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Параметърът е невалиден URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "П&арола:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "&Пасивен (препоръчително)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Пасивен режим"
@@ -5116,48 +5193,48 @@
 msgid "Password required"
 msgstr "Необходима парола"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Пътека"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Път име не може да бъде съставено от папката %s и подпапката %s"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Пътища"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Чака премахване"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Права"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Права"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
 msgstr ""
-"Моля, проверете на http://filezilla-project.org/probe.php за най-новата "
-"версия на FileZilla."
+"Моля, проверете на http://filezilla-project.org за най-новата версия на "
+"FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
@@ -5167,15 +5244,15 @@
 "Моля, проверете на http://filezilla-project.org/probe.php дали сървърът "
 "работи и внимателно огледайте отново настройките си."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 "Моля, проверете системния пакетен организатор за по-нов пакет или посетете "
-"http://filezilla-project.org/, за да изтеглите изходния код на FileZilla."
+"http://filezilla-project.org, за да изтеглите изходния код на FileZilla."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5205,33 +5282,33 @@
 msgid "Please enter a custom time format."
 msgstr "Моля, въведете формат за времето."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
-msgstr "Моля въведете дата във формтат ГГГГ-ММ-ДД, например 2010-07-18."
+msgstr "Моля въведете дата във формат ГГГГ-ММ-ДД, например 2010-07-18."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../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/с."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Моля, въведете името на новия филтър:"
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Моля, въведете ново име на копирания филтър."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Моля, въведете ново име за набора филтри \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Моля, въведете ново име за филтъра."
 
@@ -5253,13 +5330,13 @@
 "Please enter a number between 1 and 10 for the number of concurrent "
 "transfers."
 msgstr ""
-"Моля, въведете число между 0 и 10 за максимален брой паралелни прехвърляния."
+"Моля, въведете число между 1 и 10 за максимален брой паралелни прехвърляния."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Моля, въведете парола за този сървър:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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"
@@ -5276,11 +5353,11 @@
 "Моля, въведете продължителност на изчакване между 5 и 9999 секунди или 0 за "
 "неограничено изчакване."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Моля, въведете уникално име за този набор от филтри"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Моля, въведете потребителско име за този сървър:"
 
@@ -5292,19 +5369,15 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Моля, въведете URL, от който може да се извлече вашия външен адрес"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Моля, въведете интервал за обновяване, не по-кратък от 7 дни"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../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 %"
+"Моля, въведете ограничение на скоростта за качване по-голямо или равно на 0 %"
 "s/с."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5312,14 +5385,18 @@
 "Моля, въведете директна FTP команда.\n"
 "Използването на директни FTP команди ще изчисти кеш-паметта за папки."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Въведете име на папката:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Въведете име на файла, който да бъде създаден:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Моля, въведете потребителско име и парола за този сървър:"
 
@@ -5338,7 +5415,7 @@
 "съветник. Ако имате динамичен адрес или не знаете външния си адрес, "
 "използвайте опцията за външна услуга за имена."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5354,7 +5431,7 @@
 "Моля, проверете дали на FileZilla е разрешено да установява изходящи връзки "
 "и се уверете, че адреса на сървъра за имена е въведен правилно."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Уверете се, че исканият локал е инсталиран на вашата система."
 
@@ -5370,7 +5447,7 @@
 "ръчно пренасочванията на портовете. Не настройвайте маршрутизатора си да "
 "работи в така наречените \"режим DMZ\" или \"режим за игри\"."
 
-#: resources.h:686
+#: resources.h:706
 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 "
@@ -5382,7 +5459,7 @@
 "смята, че се използва само от вредни програми. Това може да предизвика "
 "фалшива тревога, която вие може спокойно да пренебрегнете."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5390,7 +5467,7 @@
 "Моля отбележете, че запазване на времената при качване на FTP, FTPS и FTPES "
 "сървъри работи само ако те поддържат командата MFMT."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5398,7 +5475,7 @@
 "Моля, забележете, че някои сървъри може да спрат да ви допускат, ако се "
 "опитвате да свържете с тях твърде често или през твърде кратък интервал."
 
-#: resources.h:890 resources.h:896
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5407,7 +5484,7 @@
 "Моля, прочетете http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "за подробности"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5424,38 +5501,38 @@
 "Моля, стартирайте отново този съветник в случай, че смените мрежовите си "
 "настройки или имате проблеми със сървъри, които преди са работели."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Изберете действие:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Моля, изберете категориите, които да бъдат импортирани."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Моля, изберете желаният режим на прехвърляне по подразбиране."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Моля, изберете новите атрибути на папката \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Моля, изберете новите атрибути на файла \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Моля, изберете новите атрибути на избраните папки."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Моля, изберете новите атрибути на избраните файлове и папки."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Моля, изберете новите атрибути на избраните файлове."
 
@@ -5474,7 +5551,7 @@
 "\"режим за игри\". Неща като \"инспекция на протокола\" или специфични "
 "\"поправки\" трябва да бъдат изключени"
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5482,8 +5559,8 @@
 "Посетете http://filezilla-project.org/ за повече информация относно "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5491,17 +5568,17 @@
 "Моля, посетете http://filezilla-project.org/, за да изтеглите най-новата "
 "версия."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Пощенски код:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Предварително определени връзки"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Запазване времената на файловете"
 
@@ -5509,47 +5586,61 @@
 msgid "Preview:"
 msgstr "Преглед:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Сертификатите на основната връзка и на връзката за данни не съвпадат."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Показване на диагностична информация, свързана със стартирането на FileZilla"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Изпращане на информация за версията към stdout и изход"
 
-#: resources.h:913
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Папките - с приоритет (по подразбиране)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Приоритет"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Политика за защита на лични данни:"
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Защита на личните данни: Единствено версиите на FileZilla, операционната "
+"система и архитектурата на процесора ще бъдат изпратени към сървъра."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "&Частни ключове:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "&Протокол:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
 msgstr "П&арола:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "&Обработка на опашката"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "&Протокол:"
+
+#: resources.h:818
 msgid "Proxy &port:"
 msgstr "&Прокси порт:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
 msgstr "По&требител:"
 
@@ -5557,12 +5648,16 @@
 msgid "Proxy authentication failed"
 msgstr "Неуспешно удостоверяване пред прокси."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Неуспешно приветствие от прокси: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Хостът на проксито започва с \"[\", но липсва затварящата скоба."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5578,23 +5673,23 @@
 msgstr ""
 "Запитване на прокси неуспешно: Неизвестен вид на адрес в CONNECT отговор"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Има определено прокси, но хоста или порта са невалидни"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Удостоверяване с публичен ключ"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Алгоритъм на публичния ключ:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Публични права"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "Опашката обработена"
 
@@ -5613,39 +5708,39 @@
 msgid "Queue: empty"
 msgstr "Опашка: празна"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Опашка"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "Опашка:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "&Презареждане на системата"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "О&тдалечени папки"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "Ану&лиране и връщане в опашката избраните"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Оригинална команда на FTP"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "Ч&етене"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Опресняване"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Преи&менуване"
 
@@ -5654,68 +5749,82 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"Пуснете още въднъж съветника и внимателно проверете настройките и "
+"Пуснете още веднъж съветника, внимателно проверете настройките, "
 "конфигурирайте всички маршрутизатори и защитни стени спрямо тях."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "Че&тене"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Само четим"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Наистина ли желаете да прекъснете текущата операция?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
+#, c-format
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] ""
+"Наистина ли да бъде изтрита %d папка и нейното съдържание от сървъра?"
+msgstr[1] ""
+"Наистина ли да бъдат изтрити %d папки и тяхното съдържание от сървъра?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Наистина ли да бъде изтрита %d папка и нейното съдържание?"
-msgstr[1] "Наистина ли да бъдат изтрити %d папки и тяхното съдържание?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Наистина ли да бъде изтрит %d файл?"
-msgstr[1] "Наистина ли да бъдат изтрити %d файла?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Наистина ли да бъдат изтрити %s и %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Наистина ли да бъдат изтрити %s и %s от сървъра?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Наистина ли желаете да изтриете всички избрани файлове и/или папки от "
+"сървъра?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Наистина ли желаете да изтриете всички избрани файлове и/или папки?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Наистина ли желаете да изтриете всички избрани файлове и/или папки от вашия "
+"компютър?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Причина"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Рестартиране"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "О&бхождане на подпапките"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Получен е опис на папката, който изглежда е кодиран като EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Получен ред превишаващ 10000 знака, прекратяване."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Получените данни са замърсени"
 
@@ -5728,11 +5837,11 @@
 "свързани кум сървър.\n"
 "Ако продължите, връзката ще бъде прекъсната."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Настройки на повторното свързване"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Повторно свързване с последно използвания сървър"
 
@@ -5740,34 +5849,38 @@
 msgid "Redirection to invalid address"
 msgstr "Препращане към невалиден адрес"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Опресняване списък с файлове и папки"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Запомняне на пароли?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Отдалечен"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Отдалечения сертификат не е доверен."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Отдалечен файл"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Търсене на отдалечен файл"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Отдалечени филтри:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Отдалечен път"
 
@@ -5780,7 +5893,7 @@
 "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден "
 "абсолютен път и поддържан от избрания тип сървър (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5792,7 +5905,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Отдалеченият път не може да бъде разпознат. Уверете се, че е валиден "
@@ -5802,11 +5915,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Отдалеченият път не може да бъде разпознат."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Манипулиране на отдалечения път:"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Отдалечен път:"
 
@@ -5814,76 +5927,76 @@
 msgid "Remote site:"
 msgstr "Отдалечени:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "&Изчистване"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "Изтрива&не"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Преименуване"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Преименуване избраната папка"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Преименуване избраните файлове и папки"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Преименуване от \"%s\" на \"%s\""
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
-msgstr "Докладване на дефект или искане за функциуналност"
+msgstr "Докладване на дефект или искане за функционалност"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Изискване на FTP през явен TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Изискване на FTP през скрит TLS"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Анулиране и &връщане в опашката на всички"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Запитване за адреса на %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Търсене на адреса на хост"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Отговор:"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Резултати:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Подновяване на трансфер"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5891,38 +6004,38 @@
 "Подновяването на ASCII файлове може да предизвика проблеми ако сървъра и "
 "клиента използват различни знаци за край на ред."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Разлистване папка..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Получаване на външен IP адрес от %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Кореновият сертификат е не доверен"
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
 msgstr "&Отворени за редакция файлове..."
 
-#: resources.h:875
+#: resources.h:895
 msgid "S&how the Site Manager on startup"
 msgstr "Показване на &Манипулатор връзки при зареждане"
 
-#: resources.h:609
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "&Изключване на системата"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "&Стоп"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "С&инхронизирано разлистване"
 
@@ -5930,31 +6043,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Запис на настройките?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Запазването на пароли е изключено от системният администратор."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Запазването на пароли е изключено от вас."
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
 msgstr "Търсене файлове за добавяне в опашката"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
 msgstr "Преглеждане за файлове за качване"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "&Условия за търсене:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "Търсене в &папка:"
 
-#: resources.h:1002
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Рекурсивно търсене на файлове"
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Претърсване на сървър за файлове, които удовлетворяват:"
 
@@ -5968,27 +6095,27 @@
 msgstr ""
 "Прочетете повече на: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Избор на &сървър"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "Избор на &страница:"
 
-#: resources.h:878
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Избор на тема"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Изберете действие по подразбиране в случай, че целевият файл при прехвърляне "
 "вече съществува."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Избор на редактор по подразбиране"
 
@@ -6008,7 +6135,7 @@
 "Изберете действие по подразбиране в случай, че файлът вече съществува, "
 "валидно само за избраните файлове на опашката."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Изберете местонахождение за изтегляне на пакет"
 
@@ -6029,7 +6156,7 @@
 msgstr "Изберете файл за експортираните настройки"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Изберете файл за експортиране на връзките"
 
@@ -6043,14 +6170,14 @@
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
-msgstr "Изберете име за кновертирания файл-ключ"
+msgstr "Изберете име за конвертирания файл-ключ"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Изберете как тези файлове трябва да бъдат отворени."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Избор на целева папка"
 
@@ -6058,15 +6185,15 @@
 msgid "Select target filename"
 msgstr "Избор на целеви файл"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Изберете категориите, които да бъдат експортирани:"
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Изберете данните, които искате да заличите"
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6080,7 +6207,7 @@
 msgstr[0] "Избрана %d папка."
 msgstr[1] "Избрани %d папки."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6101,7 +6228,7 @@
 msgstr[0] "Избран %d файл. Обща дължина: най-малко %s"
 msgstr[1] "Избрани %d файла. Обща дължина: най-малко %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Избрани %s и %s за прехвърляне."
@@ -6116,13 +6243,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Избрани %s и %s. Обща дължина: най-малко %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Избраният редактор не съществува"
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Избраният файл се редактира"
 
@@ -6130,15 +6257,15 @@
 msgid "Selected file is already loaded"
 msgstr "Избраният файл е зареден"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Избраният файл е вече отворен"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Избраният файл се редактира все още"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Избраният филтър работи само върху местните файлове."
 
@@ -6155,39 +6282,44 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Избраният порт обикновено се използва от друг протокол."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "&Изпращане на keep-alive команди"
 
-#: resources.h:543
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Изпращане на специална команда към сървъра, която не е достъпна по друг "
 "начин."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Изпраща на keep-alive команда"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Пореден номер:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "Тип &сървър:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Сървърът неправилно прекъсна TLS връзка"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Сървърът не поддържа не-ASCII символи."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Сървърът не поддържа подновяване на файлове по-дълги от %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6196,15 +6328,15 @@
 "Сървърът не поддържа подновяване на файлове по-дълги от %d GB. Край на "
 "прехвърлянето - дължината на файловете съвпада."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Сървърът не поддържа подновяване на файлове по-дълги от 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Сървърът не поддържа подновяване на файлове по-дълги от 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6213,18 +6345,18 @@
 "Сървърът вероятно не поддържа подновяване на файлове по-дълги от %d GB. Край "
 "на прехвърлянето - дължината на файловете съвпада."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
 "Сървърът изисква регистрация. Моля, укажете своята в Манипулатор връзки"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Сървърът изпрати празен път."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6232,13 +6364,13 @@
 "Сървърът изпрати допълнително запитване за вход. Трябва да използвате "
 "интерактивен тип вход."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Сървърът изпрати пасивен отговор с немаршрутируем адрес. Пасивният режим се "
 "провали."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6258,102 +6390,109 @@
 msgid "Server sent unexpected reply."
 msgstr "Сървърът изпрати неочакван отговор."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "MAC от сървъра към клиента:"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Шифър от сървъра към клиента:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "Тип &сървър:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Отдалечен/Местен файл"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "&Сървър:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Сесийна информация"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "&Установяване на приоритет"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Установяване на правата от \"%s\" на \"%s\""
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize извикан без сокет"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Настройки"
 
-#: resources.h:975
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "&Показване необработено съдържание на папки"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
 msgstr "Показване &начален диалог..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 "Показване на местните и отдалечени папки и продължаване на сравнението?"
 
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "Показване на наличните TLS шифри"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Показване този помощен диалог"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Изключване"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "Записи в &Манипулатор връзки"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Манипулатор връзки"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Манипулатор връзки - Без запазване на пароли"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Манипулатор връзки - Невалидна информация"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Манипулатор връзки е вече отворен"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Страницата не съществува."
 
@@ -6363,8 +6502,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Пътят на връзката е повреден."
 
@@ -6383,11 +6522,11 @@
 "връзки.\n"
 "Искате ли текущата връзка да бъде запазена?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Дължина"
 
-#: resources.h:897
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Форматиране дължина"
 
@@ -6396,31 +6535,31 @@
 msgid "Size unknown"
 msgstr "Неизвестна дължина"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Пропускане"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Прескачане на изтеглянето на %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Прескачане на качването на %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Има файлове, които биват редактирани или чакат качване."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6428,19 +6567,19 @@
 "Някои неправилно настроени сървъри зад маршрутизатор, може да отговарят с "
 "локалния си IP адрес."
 
-#: resources.h:915
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Папките - наравно с всички"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Сортирането не може да се променя при сравняване на папки."
 
-#: resources.h:911
+#: resources.h:931
 msgid "Sorting"
 msgstr "Сортиране"
 
-#: resources.h:912
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "&Сортиране:"
 
@@ -6452,32 +6591,40 @@
 msgid "Source and target file may not be the same"
 msgstr "Изходният и целевия файл не може да са един и същ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Източникът и целта на операцията пускане са идентични"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Изходен файл:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
-msgstr "Ограничениe на скоростта"
+msgstr "Ограничение на скоростта"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
-msgstr "Ограничениe на скоростта"
+msgstr "Ограничение на скоростта"
 
 #: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr "Ограничениe на скоростта изключенo, натиснете за промяна."
+msgstr "Ограничение на скоростта изключено, натиснете за промяна."
 
 #: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr "Ограничение на скоростта включено, натиснете за промяна."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "стабилна и бета версии"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "само стаблина версия"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "Започване на &прехвърлянето веднага"
 
@@ -6485,43 +6632,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Старт с отворен Манипулатор връзки"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Начало изтегляне %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Начало на качване на %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Щат или провинция:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Статус"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Състояние:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "Прекратяване и &изчистване"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Улица:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Предмет на сертификата"
 
@@ -6529,56 +6676,56 @@
 msgid "Successful transfers"
 msgstr "Успешни прехвърляния"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Резюме на резултатите от проверката:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
-"Символични връзки към файлове не се влияят от този избор, те винаги биват "
+"Този избор не влияе на символните връзки към файлове, те винаги биват "
 "изтривани."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Синхронизирано разлистване"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Синхронизираното разлистване е било изключено."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Синтактична грешка"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Синтактична грешка в командната линия"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Системен"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "Лента за инструм&енти"
 
@@ -6586,11 +6733,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Установена е TLS/SSL връзка, изпраща се HTTP заявка"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Връзка от тип TLS/SSL е установена, очаква се приветствие..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Връзка от тип TLS/SSL е установена."
 
@@ -6598,35 +6745,39 @@
 msgid "TTL expired"
 msgstr "TTL изтече"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Целевият файл вече съществува"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Целеви файл"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Целевият файл съществува!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Целевият файл съществува, желаете ли да продължите?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Резултат"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Проверка на способността на сървъра за подновяване на прехвърляния."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"Манипулатор връзки е отворен в друг екзампляр на FileZilla 3.\n"
-"Желаете ли да продължите? В този случай промените в Манипулатор връзки няма "
-"да бъдат запазени."
+"\"Манипулатор връзки\" е отворен в друг екземпляр на FileZilla 3.\n"
+"Желаете ли да продължите? В този случай промените в \"Манипулатор връзки\" "
+"няма да бъдат запазени."
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
@@ -6636,7 +6787,7 @@
 "Манипулатор връзки е отворен в друг екземпляр на FileZilla 3.\n"
 "Моля, затворете го, иначе данните не могат да бъдат изтрити."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML документът е недобре форматиран: %s"
@@ -6647,11 +6798,11 @@
 msgstr "Въведеният адрес е: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Отметката не може да бъде добавена."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Отметките не могат да бъдат изчистени."
 
@@ -6663,20 +6814,20 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Специалната входна последователност не може да бъде празна."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr ""
 "Подразбиращият се редактор за текстови файлове не можа да бъде намерен."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "По подразбиране редакторът за текстови файлове е '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Въведеното име за филтър вече съществува, моля, изберете друго."
 
@@ -6695,9 +6846,9 @@
 "Файл с име %s вече съществува.\n"
 "Моля, въведете ново име:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6713,14 +6864,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Файлът \"%s\" не може да бъде зареден или не съдържа частен ключ."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Файлът \"%s\" не може да бъде зареден."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6729,8 +6880,8 @@
 "Файлът \"%s\" не може да бъде отворен:\n"
 "С този файлов тип няма свързана програма."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6772,7 +6923,7 @@
 "поддържат все още от FileZilla.\n"
 "Искате ли да бъде конвертиран в поддържан, но незащитен формат?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Избраният като редактор по подразбиране не съществува."
 
@@ -6808,11 +6959,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Следните знаци ще бъде заменени: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "Списък на отворените за редакция файлове:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "Свободното FTP решение с отворен код"
 
@@ -6820,7 +6971,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Глобалните отметки не могат да бъдат запазени."
 
-#: resources.h:973
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6832,7 +6983,7 @@
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr "Лимитът трябва да бъде между 1 и 2000 MiB"
+msgstr "Ограничението трябва да бъде между 1 и 2000 MiB"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6851,7 +7002,7 @@
 "Най-ниският наличен порт трябва да е по-малък или равен на най-високия "
 "наличен порт."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6859,7 +7010,7 @@
 "Най-новата версия е изтеглена. Натиснете \"Край\", за да затворите FileZilla "
 "и да започне инсталацията."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6867,11 +7018,11 @@
 "Най-новата версия е била изтеглена. Моля, инсталирайте я по същия начин, по "
 "който сте инсталирали текущата версия."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Опашката няма да бъде запазена."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6885,23 +7036,23 @@
 msgid "The selected categories have been imported."
 msgstr "Избраните категории бяха импортирани."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "От избрания файл е възможно да бъдат импортирани данни от следните категории:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Избраният файл се редактира:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Избраният файл е отворен от друга програма, моля, затворете я."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6919,7 +7070,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Сървърът изпрати неочакван или непознат отговор."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Имена на файловете на сървъра са на:"
 
@@ -6931,7 +7082,7 @@
 "Сертификата на сървъра е неизвестен. Моля, внимателно прегледайте "
 "сертификата и преценете дали да се доверите на сървъра."
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6941,7 +7092,7 @@
 "че или администраторът му е сменил хост-ключа или правите опит да се "
 "свържете със сървър, който се представя за оригиналния."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6957,15 +7108,15 @@
 "Настройките са импортирани. Трябва да рестартирате FileZilla,за да имат "
 "ефект всички настройки."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Системата ще бъде рестартирана освен ако не натиснете Отказ."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Системата ще се изключи, освен ако не изберете Отказ."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6973,7 +7124,7 @@
 "Целеви файл с това име вече съществува.\n"
 "Моля, изберете действие."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Проверката се провали. Наистина ли желаете да запазите настройките?"
 
@@ -6981,11 +7132,11 @@
 msgid "Themes"
 msgstr "Теми"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Този набор филтри не може да бъде изтрит."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Този набор филтри не може да бъде преименуван."
 
@@ -6997,7 +7148,7 @@
 "Това означава, че някой маршрутизатор и/или защитна стена пречи все още на "
 "FileZilla."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7005,7 +7156,7 @@
 "Това работи само ако сте зад маршрутизатор. В противен случай операционната "
 "система ще върне вашия вътрешен адрес."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7013,25 +7164,25 @@
 "Този помощник ще ви помогне правилно да конфигурирате наличните "
 "маршрутизатори и защитни стени и тества вашата конфигурация."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Време"
 
-#: resources.h:891
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Форматиране на времето"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Изчакване в &секунди:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Време за изчакване"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7039,21 +7190,21 @@
 msgstr ""
 "Часова разлика: сървър: %d секунди. местна: %d секунди. Разлика: %d секунди."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Заглавие:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "За да сравнявате папки двата списъка трябва да са подравнени."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "За да направите това, местните и отдалечени папки трябва да бъдат и двете "
 "показани или и двете скрити."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7061,7 +7212,7 @@
 "За удостоверяване чрез публичен ключ, FileZilla трябва да знае частния ключ, "
 "който да използва."
 
-#: resources.h:998
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7078,7 +7229,7 @@
 "Зелен: Файлът е по-нов от немаркирания файл от другата страна\n"
 "Червен: Разлика в дължината на файловете"
 
-#: resources.h:1000
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7088,23 +7239,23 @@
 "Когато е активна тази опция, разлистването на папка от местното дърво ще "
 "разлисти съответстващата и папка на сървъра и обратно."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Превключва обработката на опашката"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Превключва показването на местното дърво"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Превключва показването на дневника"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Превключва показването на отдалеченото дърво"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Превключва показването на опашката"
 
@@ -7117,37 +7268,37 @@
 msgstr "Твърде много препращания"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Трасиране:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Прехвърляне"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "&Посока на прехвърляне"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "&Метод на прехвърляне"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
 msgstr "Режим на прехвърляне"
 
-#: resources.h:877
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Опашка"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Прехвърляне"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Връзката за прехвърляне прекъсната: %s"
@@ -7156,8 +7307,8 @@
 msgid "Transferred data got tainted."
 msgstr "Прехвърляните данни бяха замърсени."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Прехвърляне"
 
@@ -7165,69 +7316,69 @@
 msgid "Transfers"
 msgstr "Прехвърляния"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Прехвърлянията приключени"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "Файлове &без разширения са ASCII"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Файлове &със следните разширения са ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Доверяване на променения ключ на хоста:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Доверяване на новия ключ на хоста:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Доверяване на новия ключ и продължаване със свързването?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Доверяване на сертификата и продължаване със свързването"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Доверяване на хоста и продължаване със свързването?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Тип"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
 msgstr "Тип FTP прокси:"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
 msgstr "Тип нормално прокси:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "&Качване"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "при к&ачване:"
 
-#: resources.h:939
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "Използване на \"&Файлови асоциации\" ако има"
 
-#: resources.h:892
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "И&зползване на системните стойности"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
 msgstr "&ИМЕ@ХОСТ"
 
@@ -7236,16 +7387,16 @@
 msgid "Unassigned error code %d"
 msgstr "Неизползван код за грешка %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Поделение:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "неизвестен"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Непознат тип FTP прокси, невъзможно създаване на входна последователност."
@@ -7259,7 +7410,7 @@
 msgid "Unknown certificate"
 msgstr "Неизвестен сертификат"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7267,7 +7418,7 @@
 "Неизвестна грешка при отваряне на файла. Уверете се, че файлът може да бъде "
 "достъпен и е добре формирани XML документ."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Неизвестен хост-ключ"
 
@@ -7280,7 +7431,7 @@
 "Неизвестна версия на протокол на диалог при SOCKS удостоверяване, чрез "
 "потребителско име и парола: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7303,7 +7454,7 @@
 "Докато не бъде отстранен този проблем, активният режим няма да работи и ще "
 "трябва да се използва пасивен режим."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Неподдържан тип сертификат"
 
@@ -7311,25 +7462,24 @@
 msgid "Unsupported redirect"
 msgstr "Неподдържано препращане"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "К&ачване и отказ от редакция"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Актуализация"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Съветник по обновяването"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Актуализация"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "&Качване"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Неуспешно качване"
 
@@ -7342,98 +7492,98 @@
 msgid "Upload limit: none"
 msgstr "Ограничение при качване: няма"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Качване избраната папка"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Качване избраните файлове и папки"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Качване файла обратно на сървъра?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Качване файла на сървъра?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Качване"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Чака качване и премахване"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Качване и отказ от редакция"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Потре&бителски"
 
-#: resources.h:936
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "Потре&бителски редактор:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "Използване на &редакторът по подразбиране за текстови файлове."
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "&Синхронизирано разлистване"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr "Използване на UTF-8 ако сървърът поддържа, иначе местния знаков набор."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Използване подразбиращото се"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Използване на чист FTP"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Използване на текущия сървър"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Използване на сървър от Манипулатор връзки"
 
-#: resources.h:886
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "&Използване на системните стойности"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "&Използване на следния IP адрес:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "&Използване на следния обхват портове:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "&Използване външния IP адрес на сървъра"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Използвайте тази опция, ако сте зад маршрутизатор и имате статичен външен IP "
 "адрес."
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7443,38 +7593,38 @@
 "към горния сървър веднъж всяка сесия, стига да ползвате активният режим за "
 "пръв път. Към сървъра се предава само версията на FileZilla."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
 msgstr "Потребител:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Потребителското име не трябва да е последователност от шпации"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Използване прокси %s"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Използването на грешен знаков набор ще доведе до неправилно показване "
 "имената на папки и файлове."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
-"Може да използвате този съветник, да проверите за налични актуализации за "
+"Може да използвате този съветник, да проверите за налична актуализация на "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Валиден от:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Валиден до:"
 
@@ -7482,47 +7632,47 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Подробен дневник от wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Проверяване на сертификат..."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Версия:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Много висока"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Показването на скрити файлове е включено, но не се поддържа от сървъра"
 
-#: resources.h:923
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Преглед/Редакция"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Видими колони"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "З&апис"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Изчакване"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Изчакване на връзка за разлистване"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Изчакване на парола"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Изчакване за отменяна на прехвърлянето"
 
@@ -7530,7 +7680,7 @@
 msgid "Waiting to retry..."
 msgstr "Изчакване за нов опит..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7560,11 +7710,11 @@
 "\"Application Layer Gateway\",\n"
 "FileZilla ще надхвърля времето за изчакване при големи прехвърляния."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Внимание: игнориране на връзка за данни от грешен IP адрес."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7579,23 +7729,32 @@
 "\n"
 "Наистина ли искате да проверите за нощни компилации?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Внимание: Възможен пробив в сигурността!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Добре дошли във FileZilla"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Новото в тази версия"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Новото в тази версия:"
 
-#: resources.h:821
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Позволявайки на FileZilla да запомня пароли, можете да се свързвате "
+"повторно, без да се налага да въвеждате паролата си отново след рестартиране "
+"на FileZilla."
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7603,11 +7762,15 @@
 "Когато е активна тази опция, при изтегляне на файл, съдържащ в името си "
 "неподдържани знаци от локалната операционна система те ще бъдат заменяни."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Широк екран"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Бихте ли искали FileZilla да запомня пароли?"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "Запи&с"
 
@@ -7620,29 +7783,36 @@
 msgid "Wrong line endings"
 msgstr "Грешни символи за край на ред"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Да"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Изглежда използвате хост само с IPv6. Този съветник не поддържа такава мрежа."
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 "Използвате последната стабилна версия на FileZilla. Проверете отново по-"
-"късно за актуализации."
+"късно за актуализация."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Винаги можете отново да отворите този прозорец от менюто за помощ."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Може да оставите полето за порт празно, за да бъде използван този по "
 "подразбиране."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7667,12 +7837,12 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Не сте въвели ново име за файла. Желаете ли да бъде презаписан?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "Избрали сте поне една символична връзка."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7680,7 +7850,7 @@
 "Избрани са повече от 10 файла за редактиране, сигурни ли сте, че искате да "
 "продължите?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7689,11 +7859,11 @@
 "искате да продължите?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Трябва да въведете име на хост."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Трябва да въведете местна папка."
 
@@ -7702,17 +7872,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Трябва да въведете валиден IP адрес."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Трябва да въведете местна папка с разрешение за писане."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Трябва да въведете име на регистрация"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Трябва да въведете потребителско име"
 
@@ -7732,28 +7902,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Моля, въведете име на файла-дневник."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Трябва да въведете команда, правилно поставена в кавички."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Трябва да въведете прокси."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Трябва да въведете прокси порт в обхвата от 1 до 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Трябва да въведете поне една пътека, празни отметки не се поддържат."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7761,7 +7931,7 @@
 "Трябва да въведете и местен и отдалечен път, за да активирате синхронизирано "
 "разлистване за тази отметка."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7793,44 +7963,50 @@
 "Не би трябвало да имате проблеми при свързването с други сървъри, "
 "прехвърлянията би трябвало да работят."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "след"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "преди"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "започва с"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+#, fuzzy
+msgid "bytes"
+msgstr "%s байта"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "съдържа"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "не съдържа"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "не равно"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "окончава на"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "равно"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "файл"
 
@@ -7848,78 +8024,87 @@
 "fzputtygen не можа да бъде стартиран.\n"
 "Уверете се, че той е в същата папка, където е и изпълнимия файл на FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
-msgstr "fzsftp не можа да бъде старитран"
+msgstr "fzsftp не можа да бъде стартиран"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers не върна сертификати"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "по-голямо от"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "изпълнение от групата"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "четене от групата"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "писане от групата"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "е равно на"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "е"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "не е"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "по-малко от"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "удовлетворява регулярния израз"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "изпълнение от собственика"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "четене от собственика"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "писане от собственика"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "неизвестен"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "изпълнение от всички"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "четене от всички"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "писане от всички"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
+
+#~ msgid "&Copy"
+#~ msgstr "&Копиране"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Копиране"
diff -Nru filezilla-3.5.3/locales/da_DK.po filezilla-3.7.3~precise/locales/da_DK.po
--- filezilla-3.5.3/locales/da_DK.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/da_DK.po	2013-06-18 20:02:24.000000000 +0000
@@ -2,29 +2,28 @@
 msgstr ""
 "Project-Id-Version: FileZilla 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-08-30 15:42+0100\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-13 15:59+0100\n"
 "Last-Translator: Niels Fanøe <niels.f@noee.dk>\n"
 "Language-Team: Team Fanøe <niels.f@noee.dk>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Danish\n"
-"X-Poedit-Country: DENMARK\n"
+"Language: da_DK\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S forløbet"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S tilbage"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -42,9 +41,9 @@
 msgstr[0] "%d mappe"
 msgstr[1] "%d mapper"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -53,9 +52,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -76,7 +75,7 @@
 msgstr[0] "%d fil. Samlet størrelse: Mindst %s"
 msgstr[1] "%d filer. Samlet størrelse: Mindst %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d filer tilføjet i køen"
@@ -88,31 +87,21 @@
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Vært"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
-msgstr "%p - Kodeord"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
+msgstr "%p - Adgangskode"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -127,7 +116,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Endnu ikke gyldig!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxy-bruger"
@@ -149,27 +138,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s byte (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s byte (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s byte (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -183,7 +162,7 @@
 "Download FileZilla igen. Hvis dette problem fortsætter, så rapporter det som "
 "en fejl."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -206,152 +185,148 @@
 msgid "%s with %d bits"
 msgstr "%s med %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Brugernavn"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
-msgstr "%w - Proxy-kodeord"
+msgstr "%w - Proxy-adgangskode"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Om..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Konto:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "Akti&v"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Tilføj bogmærke..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Tilføj filer i køen"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Tilføj nøglefil..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Tilføj i køen"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Juster serverens tidszoneforskydning:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "Stol &altid på certifikater i fremtidige sessioner"
 
-#: resources.h:182
+#: resources.h:192
 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"
 
-#: resources.h:939
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Brug &altid standard-editor"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "Brug &altid det valgte til uassocierede filer"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "Brug &altid denne handling"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Bed operativsystemet om den eksterne IP-adresse"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Autodetektér"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binær"
 
-#: resources.h:899
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Binært præfiks med SI-symboler (f.eks. 1 KB = 1024 byte)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Bogmærker"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Gennemse..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Burst-tolerance:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Annullér"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Søg efter betaversioner af FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Slet private data..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "Af&slut FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Konfigurér hastighedsgrænser..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Konfigurér..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Tilslut"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "Kop&ier"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopier aktuel forbindelse til Websted Manager..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Kopier til Udklipsholder"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Afbryd med fejl"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Opret mappe"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "Åbn &ny fane"
 
@@ -359,644 +334,652 @@
 msgid "&Debug"
 msgstr "&Debug"
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Debug-informationer i beskedlog:"
 
-#: resources.h:932
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Standard-editor:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Standard fil findes-handling..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Pause mellem mislykkede login-forsøg"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "Sl&et"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "Sl&et symlink"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Mappesammenligning"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Ryd lokal fil, og hent og rediger filen igen"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Afbryd forbindelse"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Afbryd forbindelse til server"
 
-#: resources.h:875
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Vis aktuel overførselshastighed i stedet for gennemsnitlig hastighed"
 
-#: resources.h:897
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Vis størrelse i byte"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Husk ikke adgangskoder"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Vis ikke denne meddelelse igen."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser."
 
-#: resources.h:919
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Handling ved &dobbeltklik på filer:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "Do&wnload"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "Do&wnload til:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "Do&wnload..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Downloadet:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Rediger"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Rediger filterregler..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "Slå &til"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "&Slå automatisk søgning efter opdateringer til"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "Slå hastighedsgrænser &til"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "Ind&kodning:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "Kr&yptering:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Indtast brugerdefineret kommando..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Udfør"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "Eksportér &websteder"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Eksportér..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Fald tilbage til aktiv tilstand"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Fil"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Fil-attributter..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Filtilladelser..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Fil:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Filter&betingelser:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Filtersæt:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtre:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Afslut"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Afslut redigering, og slet lokal fil"
 
-#: resources.h:447
+#: resources.h:457
 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"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Følg symlink, slet indholdet af målmapper"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "Hent &ekstern IP-adresse fra denne URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Få hjælp..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Globalt &bogmærke"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 ved brug af CONNECT-metoden"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Hjælp"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Gem identiske filer"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Højeste"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Højeste nr. port til rådighed:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Vært:"
 
-#: resources.h:898
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC binært præfiks (f.eks. 1 KiB = 1024 byte)"
 
-#: resources.h:886
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (eksempel: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importér..."
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
-msgstr "&Hent filtype-associationer fra systemet"
+msgstr "&Hent filtypeassociationer fra systemet"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Bevar struktur i fjernsti relativ til søgeroden"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "Udseende for fil- og mappe-ruder:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "Be&græns antal lokale porte, der bruges af FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Begræns antal samtidige forbindelser"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Lo&kalt mappetræ"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Lokal mappe:"
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Log til fil"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Logontype:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Logontype:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Lav"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Administrer bogmærker..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Manuel overførsel..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Ma&ks. antal forbindelser:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Maks. antal forsøg:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Beskedlog"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "Mi&nimer til systembakke"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Navn:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Konfigurationsassistent..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Ny"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Nyt websted"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Ny version findes!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Næste >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Nej"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Ingen"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Antal dage mellem opdateringskontroller:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Numerisk værdi:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&ÅBEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Åbn"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Overskriv"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passiv"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
-msgstr "&Kodeord:"
+msgstr "&Adgangskode:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "Afspil &lyd"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Placering af beskedloggen:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Bevar tidsstempel på overførte filer"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Sæt i kø"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Lyntilslut"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Lyntilslutningsbjælke"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Læs"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Tilslut igen"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Genopfrisk"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
-msgstr "&Husk kodeord for denne session"
+msgstr "&Husk adgangskode for denne session"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Husk adgangskoder"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Fjern-mappe:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Sti på f&jernsted:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Fjern"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Fjern nøgle"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "Fjern &valgte"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "Om&døb"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "Om&døb..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Genåbn lokal fil"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Erstat ugyldige tegn med:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Rapportér en fejl..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Nulstil og sæt alle i kø igen"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Genstart assistent"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Genoptag"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Kør kommando..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Kør konfigurationsassistent nu..."
 
-#: resources.h:950
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "S&øg efter opdateringer nu..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "Gem &som..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Søg"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
-msgstr "&Søg efter filer på fjernsted..."
+msgstr "S&øg efter filer på fjernsted..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Vælg indgang:"
 
-#: resources.h:930
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Vælg sprog"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "Vælg, hvilke &kolonner der skal vises:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Indstillinger"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Indstillinger..."
 
-#: resources.h:965
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Vis debug-menu"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Vis besked"
 
-#: resources.h:955
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Vis &tidsstempler i beskedlog"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Websted Manager..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Sted-specifikt bogmærke"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Spring over"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Hastighedsgrænser"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Start overførsel &straks"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Ombyt lokalt sted og fjernsted"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS-koder"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Test"
 
-#: resources.h:878
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Overfør"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Over&førselstilstand:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Overførselskø"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Behandl &dot-filer som ASCII-filer"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Fortryd redigering"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Opdater cachet nøgle for denne vært"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Upload"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Uploadet:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Anvend brugerdef. program"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Anvend &synkroniseret bladring"
 
-#: resources.h:934
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Brug systemets standard-editor til tekstfiler"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Anvend denne IP-adresse:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "Anvend &serverens eksterne IP-adresse i stedet for"
 
-#: resources.h:901
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "Brug &tusindadskiller"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Bruger:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Brugernavn:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Version %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Vis"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Vis/Rediger"
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Overvåg lokalt redigerede filer, og spørg om upload af ændringer"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Ved søgning efter opdateringer skal følgende kontrolleres:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "S&kriv"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Ja"
 
@@ -1014,11 +997,27 @@
 msgstr "'%s' er ikke en mappe."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Logontypen 'Konto' understøttes ikke af den valgte protokol"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Bruger 'Bed om "
+"adgangskode' i stedet."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Login-typerne 'Normal' og 'Konto' er ikke tilgængelige. Din indtastning er "
+"ændret til 'Bed om adgangskode'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1035,120 +1034,116 @@
 msgstr[0] "(%d objekt filtreret)"
 msgstr[1] "(%d objekter filtreret)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 for ingen begrænsning)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekunder)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 for at slå fra)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(mindst 7 dage)"
-
-#: resources.h:894
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(eksempel: %H:%M)"
 
-#: resources.h:888
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(eksempel: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(i %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S tilbage"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- tilbage"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Router og/eller firewall nede"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Fil ødelagt på mirrorsite"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware (spyware/virus) på dit system"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- tilbage"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c kan ikke anvendes sammen med en FTP-URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l kan kun anvendes sammen med en FTP-URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s og -c kan ikke anvendes samtidig."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s kan ikke anvendes sammen med en FTP-URL."
 
-#: resources.h:967
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Ingen"
 
-#: resources.h:968
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Advarsel"
 
-#: resources.h:969
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Info"
 
-#: resources.h:970
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Mange ord"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-bit system"
 
-#: resources.h:971
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-bit system"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Tilbage"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1159,16 +1154,17 @@
 "Et bogmærke med det angivne navn findes allerede. Angiv et navn, der ikke er "
 "i brug."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Du skal angive en standard-editor."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "En mappe kan ikke trækkes ind i en af dens undermapper."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1178,28 +1174,28 @@
 "sådanne tilfælde skal du anvende aktiv tilstand. I aktiv tilstand åbner "
 "FileZilla en port og beder serveren oprette forbindelse til denne."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "En tidligere åbnet fil er ændret."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "En fil med det navn redigeres allerede. Ønsker du at genåbne '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 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/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 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:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1213,11 +1209,11 @@
 "mapper.\n"
 "Der vises ikke flere advarsler om dette i denne session."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Der findes en nyere version af FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1226,7 +1222,7 @@
 "servere skjuler filer fra brugeren. Brug denne parameter til at tvinge "
 "serveren til at vise alle filer."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1244,15 +1240,15 @@
 "Vil du slå synkroniseret bladring fra, og fortsætte med at ændre den lokale "
 "mappe?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Tilføj"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "T&illad genoptagelse af ASCII-filer"
 
@@ -1264,55 +1260,55 @@
 msgid "A&pply only to uploads"
 msgstr "S&kal kun gælde upload"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "S&kal gælde alle filer og mapper"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Fjern &automatisk fuldførte overførsler"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Afslut forrige forbindelse, og forbind i aktuelle fane"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Om FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Oven over fil-listerne"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "&Handling efter afvikling af kø"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Handling for den valgte fil:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Handling, der skal udføres:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Handling:"
 
@@ -1346,23 +1342,23 @@
 "adresse, men din router eller firewall har lavet en fejl og ændret den "
 "sendte adresse."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Aktiv tilstand IP"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Tilføj blot filer i køen"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Tilføj den valgte mappe i overførselskøen"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Tilføj valgte filer og mapper i overførselskøen"
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Tilføj i kø"
 
@@ -1370,46 +1366,60 @@
 msgid "Address type not supported"
 msgstr "Adressetype ikke understøttet"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avanceret"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Avancerede indstillinger:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Et godt råd: Medmindre du ønsker at teste nye funktioner, bør du kun bruge "
+"stabile versioner. Betaversioner og daglige byg er udviklingsversioner, der "
+"er beregnet til testformål. De daglige byg af FileZilla fungerer måske ikke "
+"som forventet, og kunne endda forvolde skade på dit system. Brugen af "
+"betaversioner og daglige byg er på egen risiko."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritme:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Overførsel af alle filer lykkedes"
 
-#: resources.h:706
+#: resources.h:727
 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:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Alle overførsler afsluttet. %d fil kunne ikke overføres."
 msgstr[1] "Alle overførsler afsluttet. %d filer kunne ikke overføres."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "&Tillad at falde tilbage til anden overførselsmåde ved fejl"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Tillad tilbagegang til anden overførsels-måde ved fejl"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Allerede tilsluttet"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1417,7 +1427,7 @@
 "Du kan som alternativ anvende Pageant-værktøjet fra PuTTY til at håndtere "
 "dine nølger - FileZilla kan se Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1425,13 +1435,13 @@
 "Du kan som alternativ bruge SSH-agenten på dit system. For at gøre dette "
 "skal du sikre dig, at miljøvariablen SSH_AUTH_SOCK er sat."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr "Besøg http://filezilla-project.org for at hente den nyeste version."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1440,7 +1450,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1449,7 +1459,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:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1457,26 +1467,26 @@
 "Et objekt med samme navn som det trukne objekt findes allerede på "
 "destinationsstedet."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 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:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 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:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1484,58 +1494,58 @@
 "Eventuelle ændringer i Websted-manager vil ikke blive gemt, medmindre du "
 "reparerer filen."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Eventuelle ændringer i filtre kunne ikke gemmes."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Eventuelle ændringer i filtrene vil ikke blive gemt."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Skal kun gælde &mapper"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Anvend"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Skal kun gælde &aktuelle kø"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Skal kun gælde &filer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arkiv"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Som faneblad i overførselskø-ruden"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Spørg efter handling"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
-msgstr "Spørg efter kodeord"
+msgstr "Spørg efter adgangskode"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Bed operativsystemet om en port."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Bed operativsystemet om den eksterne IP-adresse"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Stil spørgsmål i FileZillas fora"
 
@@ -1543,39 +1553,35 @@
 msgid "Associated program not found:"
 msgstr "Det associerede program kunne ikke findes:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Mindst en filterbetingelse er ufuldstændig"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "På dette tidspunkt er al nødvendig information indsamlet."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Validering fejlede."
 
-#: resources.h:879
+#: resources.h:901
 msgid "Author:"
 msgstr "Forfatter:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Automatisk filtypeklassificering"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Automatisk søgning efter opdateringer"
-
-#: resources.h:883
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Mulige størrelser"
 
@@ -1584,66 +1590,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Unit symbol for bytes. Only translate first letter>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "F&orbigå proxy"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Grundlæggende anvendelse"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Adfærd"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Under redigering"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Udmålingsstreng-samler"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Pas på! Certifikat er tilbagekaldt"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binær"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Tavle"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Bogmærke"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Bogmærke:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Bogmærker"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Build-dato:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Build-information"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Forretningskategori:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1653,63 +1659,63 @@
 "tilstand. Hvis du ønsker at begrænse FileZilla til kun at bruge et lille "
 "interval af porte, kan du angive det pågældende interval nedenfor."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "A&nnuller aktuel handling"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "Sø&g efter natlige builds af FileZilla"
+msgstr "Sø&g efter daglige byg af FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "F&jern alle"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "Kopiér &URL til Udklipsholder"
 
-#: resources.h:887
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Brugerdefineret"
 
-#: resources.h:942
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Br&ugerdefinerede filtypeassociationer:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Beregner serverens tidszoneforskydning..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Kan ikke læse fra fil"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Kan ikke skrive data til fil."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Kan ikke skrive data til filen: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Annullér"
 
-#: resources.h:989
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Annuller aktuel handling"
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Annuller aktuel handling"
 
@@ -1718,11 +1724,11 @@
 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:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Kan ikke tilføje server i Websted Manager"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1738,30 +1744,30 @@
 "Kan ikke sammenligne mapper - forskellige filtre for lokale og fjerne mapper "
 "er slået til"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Kan ikke sammenligne mapper, ikke forbundet til en server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Kan ikke oprette nyt filter"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Kan ikke redigere fil"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Kan ikke redigere mapper, ikke forbundet til en server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Kan ikke redigere fil - sti på fjernsted ukendt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1769,8 +1775,8 @@
 "Kan ikke etablere FTP-forbindelse til en SFTP server. Vælg venligst den "
 "korrekte protokol."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Kan ikke indlæse Lyntilslut-bjælken fra ressourcefilen"
 
@@ -1782,44 +1788,48 @@
 msgid "Cannot load keyfile"
 msgstr "Kan ikke indlæse nøglefil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Kan ikke indlæse værktøjsbjælke fra ressourcefilen"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Har glemt adgangskode"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Kan ikke omdøbe enhed"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Kan ikke omdøbe fil"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Kan ikke gemme filtersæt"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Kan ikke vælge filter"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Kan ikke sætte filtypeassociation"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Kan ikke vise dialog"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Kan ikke vise/redigere den valgte fil"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -1827,59 +1837,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certifikat og sessionsdata er ikke til rådighed endnu."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detaljer om certifikat"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certifikat i kæde:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Certifikat-udsteder"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Udfordr:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Rediger fil-attributter"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Rediger filtilladelser"
 
-#: resources.h:963
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Ændringer i logfil-indstillinger kræver genstart af FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problem med tegnindkodning"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Tegnsæt"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "Søg efter &betaversioner og release-kandidater"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "&Søg efter opdateringer..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Søg automatisk efter &opdateringer til FileZilla:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Søg efter nyere versioner af FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Søg efter opdateringer"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Søgning efter opdateringer fejlede"
 
@@ -1887,21 +1897,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Kontrollerer korrekt ekstern IP-adresse"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Søger efter opdateringer"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Checksum passede ikke på den hentede fil."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Vælg lokal standardmappe"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Vælg den lokale mappe"
 
@@ -1909,43 +1919,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Data-chunk ikke afsluttet korrekt"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Kode:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "&Luk fane"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Klassisk"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "&Tøm listen i Websted Manager"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Ryd &layout-cache"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Tøm Lyntilslut-historik"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Tøm gentilslut-information"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Tøm overførselskø"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Tøm historik"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1953,11 +1963,11 @@
 msgid "Clear private data"
 msgstr "Tøm private data"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Fjern Lyntilslut-bjælken"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Klar tekststreng-samler"
 
@@ -1965,48 +1975,48 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klik på Udfør for at gemme konfigurationen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klik på Næste for at hente den nye version."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Klient til server-MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Klient-til-server-kode:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Luk alle &andre faner"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Afslut FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Luk alle åbne instanser af FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Lukker den aktuelle fane"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
-msgstr "Komment&arer:"
+msgstr "Kommenta&rer:"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr "Kolonneegenskaber"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Kolonneopsætning"
 
-#: resources.h:937
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Kommandoen og dens parametre skal sættes korrekt i anførselstegn."
 
@@ -2025,9 +2035,9 @@
 msgstr "Kommandoen understøttes ikke af denne protokol"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Kommando:"
 
@@ -2035,7 +2045,7 @@
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Kommando navn:"
 
@@ -2044,15 +2054,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Kommunikationen forstyrret af router eller firewall"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Sammenlign &ændringstidspunkt"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Sammenlign &filstørrelse"
 
-#: resources.h:917
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Sammenlignings&grænse (minutter)"
 
@@ -2060,60 +2070,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Sammenligningsgrænsen skal være mellem 0 og 1440 minutter."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Kompileret til:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Kompileret på:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Kompileret med:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Compiler-flag:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Komprimeret"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Samtidige overførsler"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Betingelser skelner mellem s&tore og små bogstaver"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Konfigurationstest"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Konfigurer passiv tilstand"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Konfigurer portinterval"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Konfigurering af FileZilla og dit netværk"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Bekræft sletning"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Foretag et valg"
 
@@ -2121,7 +2131,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Tillykke - din konfiguration ser ud til at fungere."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Opret forbindelse ved at forbigå proxy-indstillinger"
 
@@ -2129,34 +2139,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Forbind til angivne Websted Manager-sted"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Tilsluttet"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Tilslutter"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Tilslutter til %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Tilslutter til %s gennem proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Tilslutter til %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Tilslutter til server"
 
@@ -2164,17 +2174,17 @@
 msgid "Connection"
 msgstr "Forbindelse"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Forbindelsesforsøg mislykkedes"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Forbindelsesforsøg mislykkedes med \"%s\"."
@@ -2188,12 +2198,12 @@
 msgid "Connection closed"
 msgstr "Forbindelse lukket"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Forbindelse lukket af server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Forbindelse etableret, initialiserer TLS..."
@@ -2202,7 +2212,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Forbindelse etableret, sender HTTP-anmodning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Forbindelse etableret, venter på velkomstbesked..."
 
@@ -2218,15 +2228,15 @@
 msgid "Connection refused"
 msgstr "Forbindelse nægtet"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Forbindelse mistet ved timeout"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Forbindelse mistet ved timeout."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Forbindelse til server tabt."
 
@@ -2246,27 +2256,23 @@
 msgid "Convert keyfile"
 msgstr "Konvertér nøglefil"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Kopier"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopiér (%d) af %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopi af %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 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:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Kunne ikke acceptere forbindelse: %s"
@@ -2276,16 +2282,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Kunne ikke tilføje forbindelsen i Websted Manager"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Kunne ikke færdiggøre handling"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Kunne ikke forbinde til server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunne ikke forbinde til server: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Kunne ikke konvertere kommando til serveres indkodning"
 
@@ -2294,17 +2304,17 @@
 msgid "Could not convert private key"
 msgstr "Kunne ikke konvertere privatnøgle"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Kunne ikke kopiere URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Kunne ikke kopiere data"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2314,11 +2324,11 @@
 "Enten er shell-udvidelsen ikke installeret korrekt, eller slap du ikke "
 "filerne i et Stifinder-vindue."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Kunne ikke etablere forbindelse til server"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2329,11 +2339,11 @@
 "Du kan angive datamappe for FileZilla ved at bruge kommandolinieparameteren "
 "'--datadir <sti til mappe>' eller ved at sætte miljøvariablen FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Kunne ikke generere en brugerdefineret login-sekvens."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2341,7 +2351,7 @@
 "Kunne ikke få DN (Distinguished Name) på certifikat-udstederen - "
 "gnutls_x509_get_issuer_dn fejlede"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2349,7 +2359,7 @@
 "Kunne ikke få DN (Distinguished Name) på certifikat-emnet - "
 "gnutls_x509_get_dn fejlede"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Kunne ikke hente den fulde fjernsti."
 
@@ -2358,16 +2368,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Kunne ikke få svar fra fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2395,7 +2405,7 @@
 msgid "Could not load private key"
 msgstr "Kunne ikke indlæse privatnøgle"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2407,7 +2417,7 @@
 "Vil du slå synkroniseret bladring fra, og fortsætte med at ændre mappe på "
 "fjernstedet?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2427,9 +2437,9 @@
 "Kunne ikke finde tilsvarende fjernmappe for den lokale mappe '%s'.\n"
 "Synkroniseret bladring er slået fra."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Kunne ikke åbne Udklipsholder"
 
@@ -2444,11 +2454,11 @@
 msgid "Could not parse remote path."
 msgstr "Kunne ikke fortolke fjernstien."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Kunne ikke fortolke serveradressen:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Kunne ikke læse fra socket: %s"
@@ -2457,12 +2467,12 @@
 msgid "Could not read server item."
 msgstr "Kunne ikke læse fra server."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Kunne ikke søge til slutningen af filen (end of file)"
 
@@ -2470,22 +2480,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Kunne ikke sende kommando til fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Kunne ikke danne IO-tråd"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Kunne ikke starte proxy-handshake: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Kunne ikke starte overførsel"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2504,7 +2514,7 @@
 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:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2513,14 +2523,14 @@
 "Kunne ikke skrive \"%s\" - køen kunne ikke gemmes.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, 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/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Kunne ikke skrive \"%s\": %s"
@@ -2530,7 +2540,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Kunne ikke skrive nøglefil: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Kunne ikke skrive til lokal fil"
 
@@ -2540,39 +2550,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Kunne ikke skrive til logfil: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Kunne ikke skrive til socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Land:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Standser (crasher) FileZilla øjeblikkeligt. Skal kun bruges til debug af "
 "fejlhåndteringen"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Opret &ny fil"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Opret ny undermappe i den aktuelle mappe"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Opret ny, tom fil i den aktuelle mappe"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Opret mappe"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Opret tom fil"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Opretter mappe"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Opretter mappe '%s'..."
@@ -2590,7 +2612,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2611,52 +2633,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Den aktuelle overførselstype er sat til binær."
 
-#: resources.h:773 resources.h:893
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Bruger&defineret"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Brugerdefineret filtersæt"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Brugerdefineret server"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "D&atatype"
 
-#: resources.h:900
+#: resources.h:922
 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)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Standa&rd"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "S&let"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Slå &alle fra"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
-msgstr "Gem ikke &kodeord"
+msgstr "Gem ikke &adgangskode"
 
-#: resources.h:924
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Handling ved &dobbeltklik på mapper:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "Lav &kopi"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-agtig med virtuelle stier"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Farlig filtype"
 
@@ -2664,16 +2690,16 @@
 msgid "Data"
 msgstr "Data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Data-socket lukket for tidligt."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Dato"
 
-#: resources.h:884
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Datoformatering"
 
@@ -2692,11 +2718,11 @@
 msgid "Debug"
 msgstr "Debug"
 
-#: resources.h:964
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Indstillinger for debug"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Standard-&lokalmappe:"
 
@@ -2704,19 +2730,19 @@
 msgid "Default (Autodetect)"
 msgstr "Standard (Autodetekter)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Standard-editor ikke korrekt sat i anførselstegn."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Standardhandling for fil findes"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Standard-&fjernmappe:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2728,15 +2754,15 @@
 msgid "Default system language"
 msgstr "Standard-systemsprog"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Standard-overførselstype:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Standard-overførselstype:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Standard: http://ip.filezilla-project.org/ip.php"
 
@@ -2762,57 +2788,57 @@
 "Udsætter forbindelse i %d sekunder på grund af tidligere mislykkedes "
 "forbindelses-forsøg..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Slet indgang i Websted Manager"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Slet valgte mappe"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Slet valgte filer og mapper"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Sletter mapper"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Sletning af flere urelaterede mapper er endnu ikke understøttet"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Sletter symbolsk link"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Skrivebord"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detaljer"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detaljer for ny nøgle:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Ma&pper"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Retning"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Mappe"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Mappesammenligning"
 
@@ -2830,11 +2856,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Mappevisning afbrudt af bruger"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Visning af mappeindhold fejlede"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Mappefiltre"
 
@@ -2842,16 +2868,16 @@
 msgid "Directory listing successful"
 msgstr "Mappeindhold vist"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "S&lå alle fra"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2859,50 +2885,49 @@
 "Slå denne funktion fra igen, hvis du ikke længere vil se det korrekte "
 "mappeindhold."
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Afbryd forbindelse til server"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Forbindelse til server afbrudt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Forbindelse til server afbrudt: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Afbryder forbindelsen til forrige server"
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Afbryder forbindelsen til aktuelt synlige server"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Vis Om-dialogen"
 
-#: resources.h:933
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "Brug &ikke standard-editor"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Gør &intet"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2911,8 +2936,8 @@
 "Medmindre du ønsker at afprøve nye funktioner bør du bruge de stabile "
 "versioner."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Vil du virkelig lukke FileZilla?"
 
@@ -2926,7 +2951,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:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Vil du virkelig slette det valgte objekt?"
 
@@ -2934,33 +2959,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Vil du virkelig slette overførselskøen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Vil du virkelig sende '%s' til serveren?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Brug ikke eksterne IP-adresser til &lokale forbindelser."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Dot-filer er filer med navne, der begynder med punktum, f.eks. .htaccess"
 
-#: resources.h:918
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Handling ved dobbeltklik"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Download"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Download-grænse"
 
@@ -2973,41 +2998,50 @@
 msgid "Download limit: none"
 msgstr "Download-grænse: ingen"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Hent søgeresultater"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Download valgte mappe"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Download valgte filer og mapper"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Download-hastighed: %s/s\n"
+"Upload-hastighed: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Downloader"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Henter %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Henter søgeresultater"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3015,58 +3049,62 @@
 msgstr ""
 "Træk&Slip mellem andre instancer af FileZilla er endnu ikke implementeret."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Træk&Slip mellem forskellige servere er endnu ikke implementeret."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Lav &kopi"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Sl&å alle til"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "&Gå ned i mappe"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "U&dfør"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Afslut"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Hvert filter skal bruge mindst en betingelse."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Rediger filtre"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Rediger filen med den valgte editor, og overfør ændringerne til serveren."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Kunne ikke redigere"
 
-#: resources.h:881
+#: resources.h:903
 msgid "Email:"
 msgstr "E-post:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Tom kommando"
 
@@ -3074,7 +3112,7 @@
 msgid "Empty command."
 msgstr "Tom kommando."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Tom mappeliste"
 
@@ -3086,101 +3124,113 @@
 msgid "Empty file extension."
 msgstr "Tomt filtypenavn."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Tomme filternavne ikke tilladt."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Tomt navn"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Tom streng i anførselstegn."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Slå alle &til"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Slå &filtrering af ugyldige tegn til"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Krypteret"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Krypteringsdetaljer"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Afslut sammenligning og skift sorteringsrækkefølge?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Indtast &brugerdefineret kommando..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Skriv 0 for ubegrænset hastighed."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Indtast kommando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Indtast brugerdefineret kommando"
 
-#: resources.h:925
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Gå ned i mappe"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Angiv et filternavn"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Angiv navn på filtersæt"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Angiv nyt navn på filtersæt"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
-msgstr "Indtast kodeord"
+msgstr "Indtast adgangskode"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Gå ned i valgte mappe"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Indtast serveradressen.\n"
 "Angiv serverens protokol ved at angive protokollen før servernavnet. Hvis du "
 "ikke angiver en protokol, anvendes standardprotokollen (ftp://).\n"
-"Du kan også indtaste en hel URL på formen protokol://bruger:kodeord@vært:"
-"port her, hvorved værdierne i de øvrige felter overskrives."
+"Du kan også indtaste en hel URL på formen protokol://bruger:adgangskode@vært:"
+"port her, hvorved værdierne i de øvrige felter overskrives.\n"
+"\n"
+"Følgende protokoller er understøttet:\n"
+"- ftp:// til normal FTP\n"
+"- sftp:// til filoverførsel med SSH\n"
+"- ftps:// til FTP via TLS (implicit)\n"
+"- ftpes:// til FTP via TLS (explicit)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3188,10 +3238,10 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
-"Angiv kodeordet til filen '%s'.\n"
-"Bemærk, at den konverterede fil ikke vil være kodeordsbeskyttet."
+"Angiv adgangskoden til filen '%s'.\n"
+"Bemærk, at den konverterede fil ikke vil være beskyttet med adgangskode."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3201,7 +3251,7 @@
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
 msgid "Enter username and password"
-msgstr "Indtast brugernavn og kodeord"
+msgstr "Indtast brugernavn og adgangskode"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
@@ -3213,7 +3263,7 @@
 msgid "Error importing"
 msgstr "Fejl-importering"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Fejl ved indlæsning af kø"
 
@@ -3222,27 +3272,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Fejl ved indlæsning af xml-fil"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Fejl ved gem af kø"
 
@@ -3253,74 +3303,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Fejl ved skrivning af xml-fil"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Fejl - filnavnet kan ikke fortolkes."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Fejl - den lokale fil findes, men kan ikke fjernes"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Fejl:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Etabler forbindelse i en ny fane"
 
-#: resources.h:944
+#: resources.h:972
+msgid "Every month"
+msgstr "Hver måned"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Hveranden uge"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Eksempel: png \"c:\\programmer\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:925
 msgid "Examples"
 msgstr "Eksempler"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Ud&før"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Eksekvérbar fil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Den eksekverbare fil indeholder ingen oplysninger om version - kan ikke søge "
 "efter opdateringer."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Stifinder"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Eksportér &kø"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Eksportér &indstillinger"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Eksportér indstillinger"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "F&ilternavn:"
 
@@ -3328,7 +3386,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - File Transfer Protocol"
 
@@ -3340,25 +3398,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Usikker File Transfer Protocol"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-systemet ikke initialiseret - kan ikke oprette forbindelse"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP keep alive-signal"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP-URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3374,26 +3432,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP via implicit TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Kunne ikke skifte mappe"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Kunne ikke skifte sprog"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Kunne ikke søge efter nyere version af FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Kunne ikke kopiere eller flytte steder"
 
@@ -3401,43 +3459,43 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Kunne ikke oprette sikkerhedskopi af xml-fil"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Kunne ikke oprette lytte-socket - afslutter"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Kunne ikke hente den nyeste version af FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Kunne ikke åbne 'Dokumenter'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Kunne ikke skifte til Skrivebord"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Kunne ikke initialisere FTP-systemet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Kunne ikke initialisere TLS."
@@ -3451,24 +3509,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Kunne ikke indlæse privatnøgle: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Kunne ikke åbne \"%s\" for tilføjelse/skrivning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Kunne ikke åbne \"%s\" for læsning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Kunne ikke åbne \"%s\" for skrivning"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Kunne ikke fortolke den returnerede sti."
 
@@ -3476,7 +3534,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Kunne ikke fortolke trusted rodcert."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Kunne ikke modtage data"
 
@@ -3488,11 +3546,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Kunne ikke hente ekstern IP-adresse - afslutter"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Kunne ikke hente lokal IP-adresse."
 
@@ -3508,12 +3566,12 @@
 msgid "Failed to send command."
 msgstr "Kunne ikke sende kommando."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3521,24 +3579,24 @@
 "Kunne ikke sætte sproget til %s (%s) - anvender standardsystemsproget (%s, %"
 "s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, 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:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Kunne ikke sætte sproget til %s - anvender standardsystemsproget."
@@ -3547,7 +3605,7 @@
 msgid "Failed to validate settings"
 msgstr "Kunne ikke validere indstillinger"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Kunne ikke verificere peer-certifikat"
 
@@ -3564,21 +3622,19 @@
 msgid "Failed transfers"
 msgstr "Mislykkede overførsler"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Fald tilbage til aktiv tilstand"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "F&il:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fil&er"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Filer"
 
@@ -3594,7 +3650,7 @@
 msgid "File editing"
 msgstr "Filredigering"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Filen findes"
 
@@ -3602,7 +3658,7 @@
 msgid "File exists action"
 msgstr "Fil findes-handling"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Filen er ændret"
 
@@ -3610,14 +3666,14 @@
 msgid "File lists"
 msgstr "Fil-lister"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Fil ikke fundet"
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "File search"
 msgstr "Filsøgning"
 
@@ -3652,25 +3708,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Filoverførsel lykkedes, overført %s på %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Filoverførsler stadig i gang."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Filen kunne overføres med ASCII-datatypen."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Filen kunne overføres med den binære datatype."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Fejl i FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3678,75 +3734,76 @@
 "FileZilla kan nu teste din konfiguration nu for at sikre, at alt er "
 "konfigureret korrekt."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla er allerede forbundet til en server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla kører i kiosk-tilstand.\n"
-"Login-typerne 'Normal' og 'Konto' er ikke tilgængelige i denne tilstand."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 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."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "FileZilla-opdateringer"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Filliste-&statuslinier"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Filnavn"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filnavnefiltre..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Ugyldigt filnavn"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Filnavnet må ikke indeholde nogen af følgende tegn: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Filnavn ikke ændret"
 
-#: resources.h:307 resources.h:957
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Filnavn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Filnavne må ikke indeholde nogen af følgende tegn: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Filnavne må ikke indeholde nogen af følgende tegn: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Filer, der aktuelt redigeres"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Filstørrelse"
@@ -3755,68 +3812,68 @@
 msgid "Filesize format"
 msgstr "Filstørrelsesformat"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Filtype"
 
-#: resources.h:945
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Filetypeassociationer"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filtret vedrører:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrér ugyldige tegn i filnavne"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Filternavn findes allerede"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Bortfiltrér emner, der matcher alt det følgende"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Bortfiltrér emner, der matcher noget af det følgende"
 
-#: resources.h:223
+#: resources.h:233
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtersæt findes allerede"
 
-#: resources.h:995
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrer mappelisterne"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Validering af filter fejlede"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Fingeraftryk (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Fingeraftryk (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Fingeraftryk:"
 
@@ -3824,7 +3881,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Assistent til firewall- og router-konfiguration"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3832,13 +3889,13 @@
 "For at få flere oplysninger om disse funktioner skal du køre "
 "konfigurationsassistenten."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "For størst mulig driftsikkerhed skal du angive et interval på mindst 10 "
 "porte."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3846,33 +3903,33 @@
 "Standardindstillingerne vil blive brugt i denne session. Eventuelle "
 "ændringer i indstillingerne vil ikke blive gemt."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Gennemtving &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "&Se skjulte filer"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Se skjulte filer"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Formatspecifikationer:"
 
-#: resources.h:943
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Format: Filtypen, efterfulgt af kommandoer og parametre med korrekt "
 "angivelse af anførselstegn."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Yderligere dokumentation"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Generelt"
 
@@ -3880,21 +3937,21 @@
 msgid "General SOCKS server failure"
 msgstr "Generel SOCKS-serverfejl"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Generisk proxy"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Hent ekstern IP-adresse fra følgende URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Få hjælp"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Det angivne filtersæt findes allerede, ønsker du at overskrive filtersættet?"
@@ -3903,15 +3960,15 @@
 msgid "Global bookmarks"
 msgstr "Globale bogmærker"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Gruppetilladelser"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "Hø&jt"
 
@@ -3919,21 +3976,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP via TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash-værdi:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Skjult"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Høj"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Højest"
 
@@ -3941,25 +3998,25 @@
 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."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Hold Shift-tasten nede for at skifte filterstatus på begge sider samtidig."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Hjemmeside:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Fingeraftryk for værtsnøgle:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Værtsnøgle stemmer ikke"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Vært starter med '[', men en slutparentes kunne ikke findes."
 
@@ -3967,20 +4024,20 @@
 msgid "Host unreachable"
 msgstr "Vært kan ikke nås"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Vært:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "timer,"
 
-#: resources.h:892
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (eksempel: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -3990,13 +4047,13 @@
 "det angivne, vil forbindelsen blive lukket, og FileZilla vil forsøge at "
 "genoprette forbindelsen."
 
-#: resources.h:973
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Hvis du indrapporterer fejl, så medsend log, hvor log-niveauet er \"Mange ord"
 "\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4008,7 +4065,7 @@
 "fejlkonfigureret, og du skal prøve i aktiv tilstand. Du kan sætte "
 "overførselstilstand pr. server i Websted Manager."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4016,7 +4073,7 @@
 "hvis tilbagefalds-funktionen er slået til, vil du kunne forbinde til "
 "fejlkonfigurerede servere som afviser den valgte overførsels-metode."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4040,7 +4097,7 @@
 "Hvis problemet vedbliver, er der en router og/eller firewall, der bliver ved "
 "at afbryde forbindelsen."
 
-#: resources.h:962
+#: resources.h:988
 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 "
@@ -4050,7 +4107,7 @@
 "tilføje \".1\" efter filnavnet (og derved evt. overskrive ældre logfiler), "
 "og en ny fil oprettes."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4070,7 +4127,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Hvis problemet vedbliver, skal du kontakte fabrikanten af din router."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4080,7 +4137,7 @@
 "synkroniseres med serveren. Hvis der er forskel i tid (f.eks. forskellige "
 "tidszoner), skal du angive en tidszoneforskydning i Websted Manager."
 
-#: resources.h:916
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4088,11 +4145,11 @@
 "Hvis du baserer sammenligning på klokkeslæt, vil to filer bedømmes som ens "
 "hvis forskellen på tid ikke overskrider denne grænse."
 
-#: resources.h:931
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Hvis du skifter sprog, skal du genstarte FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4100,11 +4157,11 @@
 "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:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Hvis du lukker FileZilla, vil du miste dine ændringer."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4112,11 +4169,11 @@
 "Hvis du angiver forkerte filtyper, kan de pågældende filer blive ødelagt "
 "under overførslen."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Hvis du får fejl, er din konfiguration ikke korrekt."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4135,7 +4192,7 @@
 "tilfælde kan du forsøge at slå passiv tilstand til eller fra og kontakte "
 "serverens administrator."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4143,7 +4200,7 @@
 "Hvis det lykkes at gennemføre denne assistent, og den afsluttende test ikke "
 "giver fejl, skulle alle firewalls og routere være konfigureret korrekt."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4151,7 +4208,7 @@
 "Hvis du bruger en firewall, skal du sikre dig, at FileZilla har tilladelse "
 "til at modtage forbindelser på alle de angivne porte."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4171,7 +4228,7 @@
 msgid "Import data from older version"
 msgstr "Importér data fra ældre version"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Import-indstillinger"
 
@@ -4185,7 +4242,7 @@
 msgid "Improperly quoted association."
 msgstr "Anførselstegn ikke sat korrekt for filtypeassociation."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4193,7 +4250,7 @@
 "I aktiv tilstand skal FileZilla lytte til en port for at finde "
 "dataoverførsel. Du skal angive, hvilken port FileZilla skal lytte til."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4202,7 +4259,7 @@
 "rådighed, da FileZilla ikke har nogen indflydelse på, hvilken port dit "
 "operativsystem vælger."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4210,14 +4267,14 @@
 "Hvis du foretrækker automatiske opdateringer, kan du slå automatisk søgning "
 "efter opdateringer til i dialogen Indstillinger."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "For at anvende aktiv tilstand skal FileZilla kende din eksterne IP-adresse."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4227,7 +4284,7 @@
 "serveren om en port, og opretter forbindelse til den givne port. Dette "
 "kræver ikke meget konfiguration."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4235,20 +4292,20 @@
 "Kæde ikke komplet - øverste certifikat er ikke selv-signeret certifikat fra "
 "autoriseret certifikat-udsteder"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
-msgstr "Forkert kodeord"
+msgstr "Forkert adgangskode"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Initialiserer TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Usikker server, understøtter ikke FTP over TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiv"
@@ -4258,8 +4315,8 @@
 msgstr "Interface"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Afbrudt af bruger"
 
@@ -4271,8 +4328,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Ugyldig HTTP Response"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4295,12 +4352,13 @@
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Ugyldigt filnavn"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 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."
 
@@ -4308,28 +4366,33 @@
 msgid "Invalid input"
 msgstr "Ugyldig indtastning"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Ugyldig port angivet. Porten skal have en værdi mellem 1 og 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Ugyldig protokol valgt. Gyldige protokoller er:\n"
+"Ugyldig protokol angivet. Gyldige protokoller er:\n"
 "ftp:// til normal FTP,\n"
-"sftp:// til SSH fil-overførselsprotokol,\n"
-"ftps:// til FTP via SSL (implicit) og\n"
-"ftpes:// til FTP via SSL (explicit)."
+"sftp:// til filoverførsel med SSH\n"
+"ftps:// til FTP via TLS (implicit) og\n"
+"ftpes:// til FTP via TLS (explicit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Ugyldigt regulært udtryk i søgebetingelser."
 
@@ -4337,7 +4400,7 @@
 msgid "Invalid response code"
 msgstr "Ugyldig svarkode"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Ugyldige søgebetingelser: %s"
@@ -4349,38 +4412,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ugyldig sti til sted"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ugyldig størrelse i betingelse"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Ugyldigt brugernavn angivet."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Jurisdiktion (land):"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Jurisdiktion (by):"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Jurisdiktion (stat eller provins):"
 
-#: resources.h:913
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Hold mapper øverst"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4391,50 +4454,54 @@
 "nogle tests for at se om serveren understøtter denne funktion, kan testen "
 "godt fejle."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Nøgleudveksling"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Nøgleudveksling:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "L&aveste"
 
-#: resources.h:929
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Sprog"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Sprog ændret"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Sidst ændret"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Udseende"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "&Grænse for samtidige download:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Grænse for samtidige &upload:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Begræns lokale porte"
 
-#: resources.h:959
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Begræns størrelsen på logfil"
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit:"
 msgstr "Grænse:"
 
@@ -4442,7 +4509,7 @@
 msgid "Line length exceeded"
 msgstr "Linielængde oversteget"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Linket mod"
 
@@ -4451,21 +4518,21 @@
 msgstr "Lytte-socket lukket"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Liste:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "La&veste nr. port til rådighed:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokal"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Lokal fil"
 
@@ -4481,7 +4548,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Den lokale fil har ikke et gyldigt filnavn."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Lokale filtre:"
 
@@ -4489,7 +4556,7 @@
 msgid "Local site:"
 msgstr "Lokalt sted:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Lokalitet:"
 
@@ -4497,16 +4564,16 @@
 msgid "Log file"
 msgstr "Logfil"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Log over automatisk søgning efter opdateringer:"
 
-#: resources.h:954
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Logning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4515,7 +4582,7 @@
 "muligvis ikke UTF-8. Kan ikke falde tilbage på lokalt tegnsæt, da proxy "
 "anvendes."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4523,17 +4590,17 @@
 "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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Login-proceduren er helt gennemført, men du er ikke logget ind. Afslutter."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Login-typen skal være enten 'spørg' eller 'interaktiv' (uden anførselstegn)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4542,13 +4609,13 @@
 "Login-typen kan kun anvendes sammen med FTP-URL. Argumentet skal være enten "
 "'%s' eller '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Lav"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Lavest"
 
@@ -4556,11 +4623,11 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 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."
 
@@ -4582,7 +4649,7 @@
 msgstr ""
 "Forkert formet svar: serveren sender ikke korrekte linieafslutningstegn"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4593,58 +4660,58 @@
 msgid "Manual transfer"
 msgstr "Manuel overførsel"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Matcher alt det følgende"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Match noget af det følgende"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Match intet af det følgende"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
-msgstr "Maksimalt antal samtidig &overførsler:"
+msgstr "Maksimalt antal samtidige &overførsler:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Beskedlog"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Placering af beskedlog"
 
-#: resources.h:961
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "minutter"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Flyt &ned"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Flyt &op"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Denne Computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Dokumenter"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Mine steder"
 
@@ -4653,33 +4720,33 @@
 msgid "N/a"
 msgstr "I/A"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Navn"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Navn findes allerede"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Navnet på bogmærket findes allerede."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Navn:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Du skal angive et navn på filteret"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Du skal angive en gyldig fjernsti"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Du skal angive tegnsæt-indkodning"
 
@@ -4687,19 +4754,23 @@
 msgid "Network unreachable"
 msgstr "Netværk kan ikke tilgås"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Aldrig"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Ny &mappe"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Ny &fane"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Nyt bo&gmærke"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4712,41 +4783,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nyt bogmærke"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Ny mappe"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nye funktioner og forbedringer i %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nyt filter"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Ny mappe"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nyt sted"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Ved siden af overførselskøen"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nej"
 
@@ -4754,25 +4825,25 @@
 msgid "No category to export selected"
 msgstr "Ingen kategori til eksport valgt"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Ingen kommando afgivet, afslutter."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Ingen ekstern IP-adresse angivet - forsøger standard."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Der redigeres aktuelt ingen filer."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Intet filternavn angivet"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Ingen vært angivet, angiv en vært."
 
@@ -4780,25 +4851,25 @@
 msgid "No images available"
 msgstr "Ingen billeder til rådighed"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Ikke flere filer i køen!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Intet navn på filtersæt angivet."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Intet program associeret med filtypen"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Ingen søgeresultater"
 
@@ -4816,23 +4887,23 @@
 msgid "No username given."
 msgstr "Intet brugernavn angivet"
 
-#: resources.h:923 resources.h:928
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ingen"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Ingen er valgt endnu"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4842,15 +4913,15 @@
 msgstr "Ikke alle poster kunne genindsættes i køen til visning/redigering."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Ikke tilsluttet"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Ikke forbundet til nogen server"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Ikke forbundet til nogen server."
 
@@ -4858,21 +4929,21 @@
 msgid "Not connected."
 msgstr "Ikke tilsluttet."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 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."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Bemærk: Dette fungerer kun med enkle, ukrypterede FTP-forbindelser."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Bemærk: Brugen af generisk proxy gennemtvinger passiv tilstand på FTP-"
 "forbindelser."
 
-#: resources.h:902
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Antal decimalpladser:"
 
@@ -4880,21 +4951,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Antallet af forsøg skal være mellem 0 og 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Å&bn fil"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4902,124 +4973,128 @@
 "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:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Én gang"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Kun oplysninger om versionerne på FileZilla og dit operativsystem vil blive "
-"sendt til serveren."
+#: resources.h:970
+msgid "Once a week"
+msgstr "En gang om ugen"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Åbn mappe i systemets filhåndtering"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Åbn Websted Manager"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Åbn Websted Manager."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Åbn Websted Manager. Højreklik for at se en liste over websteder."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Åbn filen."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Åbn FileZillas indstillingsvindue"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Åbnet som:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Kunne ikke åbne"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Åbner en ny fane"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Åbner Websted Manager"
 
-#: resources.h:996
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "Åbner dialogen mappelistefilter. Højreklik for at skifte filtre."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Operativsystem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Operativsystem-problem opdaget"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Andet:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Overblik"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Overskriv &hvis kilden er nyere"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Overskriv fil"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Overskriv fil, hvis størrelsen er forskellig"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Overskriv fil, hvis størrelsen er forskellig, eller kildefilen er nyere"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Overskriv fil, hvis kildefilen er nyere"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Overskriv hvis &forskellig størrelse"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Overskriv hvis forskellig str. eller kilden &er nyere"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Ejertilladelser"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Ejer/Gruppe"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "Und&lad at systemet går i dvale under overførsler og andre handlinger"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "P&roxy-vært:"
@@ -5028,27 +5103,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-kommando forstyrret af router eller firewall."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "&Passiv (anbefalet)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pakke"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Parameter er ikke en gyldig URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
-msgstr "Kode&ord:"
+msgstr "&Adgangskode:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passiv (anbefalet)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passiv tilstand"
@@ -5061,44 +5136,48 @@
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
-msgstr "Kodeord påkrævet"
+msgstr "Adgangskode påkrævet"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Sti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Sti kan ikke opbygges for mappen %s og undermappen %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Sti ikke fundet:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Stier"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Afventer fjernelse"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Tilladelse"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Tilladelser"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Platform:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5114,7 +5193,7 @@
 "Kontroller på http://filezilla-project.org/probe.php, at serverem kører, og "
 "kontroller omhyggeligt dine indstillinger en gang til."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5122,7 +5201,7 @@
 "Kontroller pakke-manageren på dit system for en opdateret pakke, eller besøg "
 "http://filezilla-project.org for at hente kildekoden til FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5150,7 +5229,7 @@
 msgid "Please enter a custom time format."
 msgstr "Angiv et brugerdefineret klokkeslætformat."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 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."
@@ -5161,20 +5240,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Angiv en hastighedsgrænse for download højere end eller lig 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Angiv et navn for det nye filter."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Angiv et nyt navn for det kopierede filter."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Angiv et nyt navn for filtersættet \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Angiv et nyt navn for dette filter."
 
@@ -5195,11 +5274,11 @@
 "transfers."
 msgstr "Vælg et tal mellem 1 og 10 for antallet af samtidige overførsler."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
-msgstr "Angiv et kodeord til denne server:"
+msgstr "Angiv en adgangskode til denne server:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5215,11 +5294,11 @@
 msgstr ""
 "Vælg en timeout mellem 5 og 9999 sekunder eller 0 for at slå timeout fra."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Angiv et unikt navn for dette filtersæt"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Angiv et brugernavn til denne server:"
 
@@ -5231,17 +5310,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Angiv den URL, hvorfra din eksterne adresse skal hentes"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Angiv et opdateringsinterval på mindst 7 dage"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Angiv en upload-hastighedsgrænse højere end eller lig 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5249,16 +5324,20 @@
 "Angiv en rå FTP-kommando.\n"
 "Ved anvendelse af rå FTP-kommandoer slettes mappe-cache."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Angiv navnet på den mappe, der skal oprettes:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Angiv navnet på den fil, der skal oprettes:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
-msgstr "Angiv et brugernavn og kodeord til denne server:"
+msgstr "Angiv et brugernavn og en adgangskode til denne server:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
@@ -5275,7 +5354,7 @@
 "Hvis du har en dynamisk adresse eller ikke kender din eksterne adresse kan "
 "du bruge den eksterne adresse-verifikationsenhedsfunktion."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5291,7 +5370,7 @@
 "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:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 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."
 
@@ -5307,7 +5386,7 @@
 "bliver nødt til at anvende manuel port-viderestilling. Du skal ikke køre din "
 "router i den såkaldte 'DMZ'-tilstand eller 'game mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5319,7 +5398,7 @@
 "heste eller andet malware. Dette kan give anledning til en falsk alarm, som "
 "du kan afvise med sindsro."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5327,7 +5406,7 @@
 "Bemærk, at bevarelse af tidsstempler ved upload på FTP-, FTPS- og FTPES-"
 "servere kun fungerer, hvis de understøtter MFMT-kommandoen."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5335,7 +5414,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."
 
-#: resources.h:889 resources.h:895
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5344,7 +5423,7 @@
 "Besøg http://wiki.filezilla-project.org/Date_and_Time_formatting for flere "
 "oplysninger"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5361,38 +5440,38 @@
 "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."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Vælg en handling:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Vælg den kategori, du ønsker at importere."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Vælg den overførselstilstand, du ønsker at bruge som standard."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Vælg de nye attributter for mappen \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Vælg de nye attributter for filen \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Vælg de nye attributter til de valgte mapper."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Vælg de nye attributter for de valgte filer og mapper."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Vælg de nye attributter til de valgte filer."
 
@@ -5410,30 +5489,30 @@
 "tilstand' eller 'game mode'. Desuden skal ting som protokol-kontrol eller "
 "protokol-specifikke 'rettelser' været slået fra"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr "Besøg http://filezilla-project.org for flere oplysninger om FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "Besøg http://filezilla-project.org for at hente den nyeste version."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Postnummer:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Prædefineret Sider"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Bevarer fil-tidsstempler"
 
@@ -5441,47 +5520,60 @@
 msgid "Preview:"
 msgstr "Visning:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Primær forbindelse og data-forbindelse certifikater er ikke ens."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Udskriv diagnostiske informationer i forbindelse med start af FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Udskriv versionsinformation til stdout, og afslut"
 
-#: resources.h:912
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Prioriter mapper (standard)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritet"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Politik om personlige oplysninger:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Anonymitet: Kun oplysninger om din version af FileZilla, dit operativsystem "
+"og din CPU-arkitektur vil blive sendt til serveren."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Private &nøgler:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tokol:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Proxy-kode&ord:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Udfør &kø"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Proxy-port:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Pro&xy-bruger:"
 
@@ -5489,12 +5581,16 @@
 msgid "Proxy authentication failed"
 msgstr "Validering af proxy fejlede"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Proxy-handshake fejlede: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5509,23 +5605,23 @@
 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:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy er defineret, men proxy-vært eller -port er ugyldig"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Validering med offentlig nøgle"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Offentlig nøgle algoritme:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Offentlige tilladelser"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Køen er fuldt behandlet"
 
@@ -5544,39 +5640,39 @@
 msgid "Queue: empty"
 msgstr "Kø: tom"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Filer i kø"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Sætter i kø:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "&Genstart system"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Fjernmappe&træ"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "N&ulstil og sæt valgte filer i kø igen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Rå FTP-kommando"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "L&æs"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "&Genopfrisk"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Om&døb"
 
@@ -5588,65 +5684,77 @@
 "Kør assistenten igen, undersøg omhyggeligt dine indstillinger, og konfigurer "
 "alle routere og firewalls tilsvarende."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Læ&s"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Læsbar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Ønsker du virkelig at annullere den aktuelle handling?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Ønsker du at slette %d mappe med dens indhold?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] ""
+"Ønsker du virkelig at slette mappen %d med dens indhold fra serveren?"
 msgstr[1] "Ønsker du at slette %d mapper med deres indhold?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Ønsker du at slette %d fil?"
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Ønsker du virkelig at slette filen %d fra serveren?"
 msgstr[1] "Ønsker du at slette %d filer?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Ønsker du at slette %s og %s?"
+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:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Ønsker du virkelig at slette alle valgte filer og/eller mapper?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Årsag"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Genstart nu"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Rek&ursivt i undermapper"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Modtaget linie med flere end 10000 tegn - afslutter."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "De hentede data er forstyrret"
 
@@ -5659,11 +5767,11 @@
 "server.\n"
 "Hvis du fortsætter, vil forbindelsen blive afbrudt."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Indstillinger for genetablering af forbindelse"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Genopret forbindelse til sidst anvendte server"
 
@@ -5671,34 +5779,38 @@
 msgid "Redirection to invalid address"
 msgstr "Redirect til ugyldig adresse"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Genopfrisk fil- og mappelisterne"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Husk adgangskoder?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Fjern"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Fjern-certifikat ikke sikkert."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Fil på fjernsted"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Filsøgning på fjernsted"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Fjerne filtre:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Sti på fjernsted"
 
@@ -5711,7 +5823,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:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5723,7 +5835,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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."
@@ -5732,11 +5844,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Sti på fjernsted kunne ikke parses."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Håndtering af sti på fjernsted:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Sti på fjernsted:"
 
@@ -5744,76 +5856,76 @@
 msgid "Remote site:"
 msgstr "Fjernsted:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Fjern &alle"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Fjern &valgte"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Omdøb fil"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Omdøb den valgte mappe"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Omdøb valgte filer og mapper"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Omdøber '%s' til '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Indberet fejl og ønsker om nye funktioner"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Forlang eksplicit FTP over TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Forlang implicit FTP over TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Nulstil og sæt &alle i kø igen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Kontrollerer adressen på %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Kontrollerer værtsnavn"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Respons:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Resultater:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Genoptag filoverførsel"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5821,34 +5933,38 @@
 "Genoptagelse af hentning af ASCII-filer kan give problemer, hvis serveren "
 "anvender et andet linieafslutningsformat end klienten."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Henter mappeliste..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Henter ekstern IP-adresse fra %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Rodcertifikat er ikke sikkert"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "&Vis de filer der aktuelt redigeres..."
 
-#: resources.h:609
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "Vis &Websted Manger ved start"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "L&uk systemet ned"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "S&top"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "S&ynkroniseret bladring"
 
@@ -5856,31 +5972,46 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Gem indstillinger?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+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:1822
 msgid "Scanning for files to add to queue"
 msgstr "Skanner efter filer, der skal tilføjes i køen"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Skanner efter filer til upload"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Søge&betingelser:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Søg i &mappe:"
 
-#: resources.h:1001
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Søg rekursivt efter filer."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Søg efter filer på serveren"
 
@@ -5893,27 +6024,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Se også: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "V&ælg server"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Vælg s&ide:"
 
-#: resources.h:877
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Vælg tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Vælg standardhandling, der skal udføres, hvis filen i en overførsel allerede "
 "findes på destinationen."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Vælg standard-editor"
 
@@ -5932,7 +6063,7 @@
 msgstr ""
 "Vælg standardhandling for fil findes for de aktuelt valgte filer i køen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Vælg download-sted for pakken"
 
@@ -5953,7 +6084,7 @@
 msgstr "Vælg fil til eksporterede indstillinger"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Vælg fil til eksporterede steder"
 
@@ -5969,12 +6100,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Vælg filnavn til konverteret nøglefil"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Vælg, hvordan disse filer skal åbnes."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Vælg målmappe til download"
 
@@ -5982,15 +6113,15 @@
 msgid "Select target filename"
 msgstr "Vælg navn på destinationsfil"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Vælg kategorier der skal eksporteres:"
 
-#: resources.h:282
+#: resources.h:292
 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:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6004,7 +6135,7 @@
 msgstr[0] "Valgt %d mappe."
 msgstr[1] "Valgt %d mapper."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6025,7 +6156,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Valgt %s og %s til overførsel."
@@ -6040,13 +6171,13 @@
 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:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Den valgte editor findes ikke."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Den valgte fil redigeres allerede"
 
@@ -6054,15 +6185,15 @@
 msgid "Selected file is already loaded"
 msgstr "Den valgte fil er allerede indlæst"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Den valgte fil er allerede åbnet"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Den valgte fil redigeres stadig"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Det valgte filter fungerer kun for lokale filer."
 
@@ -6079,37 +6210,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Den valgte port er som regel brugt af anden protokol."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Send FTP &keep alive-kommandoer"
 
-#: resources.h:543
+#: resources.h:560
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Sender keep-alive-kommando"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Serienummer:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Servert&ype:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Serveren lukkede ikke TLS-forbindelsen korrekt ned"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Serveren understøtter ikke tegn uden for ASCII-tegnsættet."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6118,15 +6254,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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 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:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 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:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6135,7 +6271,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6143,24 +6279,24 @@
 "Serveren kræver muligvis en konto. Prøv at angive en konto vha. Websted "
 "Manager"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Serveren sendte en tom sti."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 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:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6180,101 +6316,112 @@
 msgid "Server sent unexpected reply."
 msgstr "Serveren sendte et uventet svar."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Server til klient-MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Server-til-klient-kode:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Servert&ype:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Server/Lokal fil"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Sessionsdetaljer"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Sæt &prioritet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Sæt tilladelser for '%s' til '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize blev kaldt uden socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Indstillinger"
 
-#: resources.h:974
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Vis &rå mappeliste"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Vis &velkomstdialog..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Vis begge mappetræer, og fortsæt med at sammenligne?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Viser tilgængelige TLS-koder"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Viser denne hjælpedialog"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Luk ned nu"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Signaturalgoritme:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Websted Manager liste"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Websted Manager"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Websted Manager - har glemt adgangskode"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Websted Manager - ugyldige data"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Websted Manager allerede åben"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Stedet findes ikke."
 
@@ -6284,8 +6431,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Stedstien er ikke skrevet korrekt."
 
@@ -6303,11 +6450,11 @@
 "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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Størrelse"
 
-#: resources.h:896
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Størrelsesformatering"
 
@@ -6316,31 +6463,31 @@
 msgid "Size unknown"
 msgstr "Størrelse ukendt"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Overspring fil"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Springer download af %s over"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Springer upload af %s over"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Nogle filer er stadig under redigering, eller skal uploades."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6348,19 +6495,19 @@
 "Servere, som står bag en router, kan være fejlkonfigurerede til at svare med "
 "deres lokale IP-adresser."
 
-#: resources.h:914
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Sorter alfabetisk"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Sorteringsorden kan ikke ændres når du sammenligner mapper."
 
-#: resources.h:910
+#: resources.h:932
 msgid "Sorting"
 msgstr "Sortering"
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Sorterings&metode:"
 
@@ -6372,20 +6519,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Kilde- og destinationsfil må ikke være ens"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Kilde og destination"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Kildefil:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Hastighedsgrænser"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Hastighedsgrænser"
 
@@ -6397,7 +6544,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Hastighedsgrænser er slået til - klik for at ændre."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Stabile og betaversioner"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Kun stabile versioner"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Start overførsel &straks"
 
@@ -6405,43 +6560,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Start med åben Websted Manager"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Påbegynder download af %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Påbegynder upload af %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Starter det lokale websted på den givne sti"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Stat eller provins:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Stop og fjern &alle"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Gade:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Certifikat-type"
 
@@ -6449,11 +6608,11 @@
 msgid "Successful transfers"
 msgstr "Gennemførte overførsler"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Opsummering af testresultater:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6461,44 +6620,45 @@
 "Symlink til filer påvirkes ikke af dette valg; sådanne symlinks slettes "
 "altid."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synkroniseret bladring"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synkroniseret bladring er slået fra."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaksfejl"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Syntaksfejl i kommandolinie"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "System"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "&Værktøjslinje"
 
@@ -6506,11 +6666,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL-forbindelse etableret, sender HTTP-anmodning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL-forbindelse oprettet, venter på velkomstbesked..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL-fobindelse etableret."
 
@@ -6518,27 +6678,31 @@
 msgid "TTL expired"
 msgstr "TTL udløbet"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Destinationsfil findes allerede"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Destinationsfil:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Destinationsfilnavnet findes allerede!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Destinationsfil findes allerede, ønsker du virkelig at fortsætte?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Testresultater"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Tester serverens funktioner til genoptagelse af hentning"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6556,7 +6720,7 @@
 "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:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-dokumentet er ikke velformet: %s"
@@ -6567,11 +6731,11 @@
 msgstr "Den indtastede adresse var: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Bogmærket kunne ikke tilføjes."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Bogmærkerne kunne ikke ryddes."
 
@@ -6583,19 +6747,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Den brugerdefinerede login-sekvens må ikke være tom."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Dataforbindelsen kunne ikke etableres: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Kunne ikke finde standard-editoren for tekstfiler."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Standard-editoren for tekstfiler er '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Det angivne filternavn findes allerede. Vælg et andet navn."
 
@@ -6614,9 +6783,9 @@
 "Filen %s findes allerede.\n"
 "Angiv et nyt navn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6632,14 +6801,14 @@
 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:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Filen '%s' kunne ikke indlæses."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6648,8 +6817,8 @@
 "Filen '%s' kunne ikke åbnes:\n"
 "Intet program i dit system er associeret med denne filtype."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6667,7 +6836,7 @@
 "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 kodeordsbeskyttet. Kodeordsbeskyttede nøglefiler er endnu "
+"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?"
 
@@ -6687,11 +6856,11 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
-"Filen '%s' er kodeordsbeskyttet. Kodeordsbeskyttede nøglefiler er endnu ikke "
+"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:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Den fil, der er valgt som standard-editor, findes ikke."
 
@@ -6727,11 +6896,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Følgende tegn vil blive erstattet: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Følgende filer redigeres aktuelt:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Den gratis open source FTP-løsning"
 
@@ -6739,7 +6908,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "De globale bogmærker kunne ikke gemmes."
 
-#: resources.h:972
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6769,7 +6938,7 @@
 "Den lavest tilgængelige port skal være mindre end eller lig med den højest "
 "tilgængelige port."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6777,7 +6946,7 @@
 "Den nyeste version er hentet. Klik på Afslut for at lukke FileZilla og "
 "starte installationen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6785,11 +6954,11 @@
 "Den nyeste version er hentet. Installer den, som du installerede denne "
 "version."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Køen vil ikke blive gemt."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6802,22 +6971,22 @@
 msgid "The selected categories have been imported."
 msgstr "De valgte kategorier blev importeret."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Den valgte fil indeholder importerbar data for følgende kategorier:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Den valgte fil er allerede under redigering:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 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/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6835,7 +7004,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Serveren sendte et uventet svar eller et, der ikke kan genkendes."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Serveren anvender følgende tegnsæt-indkodning til filnavne:"
 
@@ -6847,7 +7016,7 @@
 "Serverens certifikat er ukendt. Undersøg venligst certifikatet grundigt, så "
 "du er sikker på at serveren er sikker."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6858,7 +7027,7 @@
 "faktisk forsøger at tilslutte dig til en anden compter, der lader som om den "
 "er serveren."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6874,15 +7043,15 @@
 "Indstillingerne er blevet importeret. Du skal genstarte FileZilla før "
 "indstillingerne træder i kraft."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Systemet genstartes snart, medmindre du klikker på Annuller."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Systemet lukkes snart ned, medmindre du klikker på Annuller."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6890,7 +7059,7 @@
 "Destinationsfilen findes allerede.\n"
 "Vælg en handling."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testen mislykkedes. Ønsker du virkelig at gemme indstillingerne?"
 
@@ -6898,11 +7067,11 @@
 msgid "Themes"
 msgstr "Temaer"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Dette filtersæt kan ikke fjernes."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Dette filtersæt kan ikke omdøbes."
 
@@ -6913,7 +7082,7 @@
 msgstr ""
 "Dette betyder, at en router og/eller firewall stadig forstyrrer FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6921,7 +7090,7 @@
 "Dette virker kun, hvis du ikke er bag en router. Ellers vil dit system blot "
 "returnere din interne adresse."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6929,25 +7098,25 @@
 "Denne assistent hjælper til at konfigurere evt. routere og firewalls, du "
 "måtte have, og tester din konfiguration."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Tidspunkt"
 
-#: resources.h:890
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Klokkeslætformatering"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "&Timeout i sekunder:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6956,20 +7125,20 @@
 "Tidszoneforskydninger: Server: %d sekunder. Lokal: %d sekunder. Forskel: %d "
 "sekunder."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -6977,7 +7146,7 @@
 "For at understøtte validering med offentlig nøgle skal FileZilla vide, "
 "hvilke private nøgler der skal bruges."
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6993,7 +7162,7 @@
 "Grøn: Filen er nyere end den umarkerede fil på den anden side\n"
 "Rød: Filstørrelser er forskellige"
 
-#: resources.h:999
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7003,23 +7172,23 @@
 "Når slået til, vil navigering i det lokale mappetræ skifte til de "
 "tilsvarende mapper på serveren, og omvendt."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Slå behandling af overførselskøen til eller fra"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Slå visning af det lokale mappetræ til eller fra"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Slå visning af beskedloggen til eller fra"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Slå visning af fjernstedets mappetræ til eller fra"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Slå visning af overførselskøen til eller fra"
 
@@ -7032,37 +7201,37 @@
 msgstr "For mange redirect"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Spor:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Overfør"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Overførsels&retning"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Overførsels&type"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Overførselstilstand"
 
-#: resources.h:876
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Overførselskø"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Overførselsindstillinger"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Overførselsforbindelsen afbrudt: %s"
@@ -7071,8 +7240,8 @@
 msgid "Transferred data got tainted."
 msgstr "Overførte data er forstyrret."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Overfører"
 
@@ -7080,69 +7249,69 @@
 msgid "Transfers"
 msgstr "Overførsler"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Overførsler afsluttet"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Behandl filer uden fil&typenavn som ASCII-filer"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Behandl &følgende filtyper som ASCII-filer:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Stol på ændret værtsnøgle:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Stol på ny værtsnøgle:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Hav tillid til den nye nøgle, og fortsæt tilslutning?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Hav tillid til dette certifikat, og fortsæt tilslutning?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Hav tillid til denne vært, og fortsæt tilslutning?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Type"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Type af FTP-proxy:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Type af generisk proxy:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "U&pload"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "U&pload-grænse:"
 
-#: resources.h:938
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "B&rug filtypeassociationer hvor muligt"
 
-#: resources.h:891
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Brug systemst&andard"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "BRUGER@&VÆRT"
 
@@ -7151,16 +7320,16 @@
 msgid "Unassigned error code %d"
 msgstr "Ukendt fejlkode %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Enhed:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Ukendt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Ukendt FTP-proxy-type, kan ikke generere login-sekvens."
 
@@ -7173,7 +7342,7 @@
 msgid "Unknown certificate"
 msgstr "Ukendt certifikat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7181,7 +7350,7 @@
 "Ukendt fejl ved åbning af filen. Sørg for, at der er adgang til filen, og at "
 "den er et velformet XML-dokument."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Ukendt værtsnøgle"
 
@@ -7191,10 +7360,10 @@
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
 msgstr ""
-"Ukendt protokolversion ved subnegotiering af SOCKS brugernavn/kodeord-"
+"Ukendt protokolversion ved subnegotiering af SOCKS brugernavn/adgangskode-"
 "validering: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7217,7 +7386,7 @@
 "Medmindre dette problem løses, vil FTP i aktiv tilstand ikke fungere, og du "
 "skal anvende passiv tilstand."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Certifikat-type ikke understøttet"
 
@@ -7225,25 +7394,24 @@
 msgid "Unsupported redirect"
 msgstr "Redirect ikke understøttet"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Up&load og ophæv redigering"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Opdateringskontrol"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Opdateringsassistent"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Opdateringer"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Upload"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Upload fejlede"
 
@@ -7256,98 +7424,98 @@
 msgid "Upload limit: none"
 msgstr "Upload-grænse: ingen"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Upload valgte mappe"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Upload valgte filer og mapper"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Upload denne fil tilbage til serveren?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Upload denne fil til serveren?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Uploader"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Uploader og afventer fjernelse"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Uploader og ophæver redigering"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Anvend &brugerdef. tegnsæt"
 
-#: resources.h:935
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Anvend &brugerdef. editor:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Brug &standard-editor til tekstfiler"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Anvend &synkroniseret bladring"
 
-#: resources.h:108
+#: resources.h:117
 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."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Brug standardhandling"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Brug enkel FTP"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Anvend server, der aktuelt er forbundet med"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Anvend server fra Websted Manager"
 
-#: resources.h:885
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Brug systemstanda&rd"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Brug følgende IP-adresse:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Brug følgende interval af porte:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Anvend serverens eksterne IP-adresse istedet"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Brug denne, hvis du er bag en router og har en statisk ekstern IP-adresse."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7357,85 +7525,85 @@
 "kontakter ovennævnte server for hver session, første gang du anvender aktiv "
 "tilstand. Kun oplysninger om din version af FileZilla sendes til serveren."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Bruger:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Brugernavn kan ikke bestå af en række mellemrum"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Bruger proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Anvendelse af forkert tegnsæt kan bevirke, at filnavne ikke vises korrekt."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Ved hjælp af denne assistent kan du se om der findes opdateringer til "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Gyldig fra:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Gyldig til:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Log-meddelelser med mange ord fra wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Godkender certifikat..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Version:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Meget høj"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Se skjulte funktioner, som ikke understøttes af serveren"
 
-#: resources.h:922
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Vis/Rediger"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Synlige kolonner"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "Sk&riv"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Venter"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Venter på browser-forbindelse"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
-msgstr "Venter på kodeord"
+msgstr "Venter på adgangskode"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Venter på at annullere overførsel"
 
@@ -7443,7 +7611,7 @@
 msgid "Waiting to retry..."
 msgstr "Venter på at prøve igen..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7473,11 +7641,11 @@
 "servicen fra,\n"
 "vil FileZilla få timeouts ved store overførsler."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Advarsel: Ignorerer dataforbindelse fra forkert IP."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7485,30 +7653,39 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"Advarsel: Anvendelsen af natlige builds er for egen risiko.\n"
-"Der ydes ingen support på natlige builds.\n"
-"Natlige builds fungerer måske ikke som forventet og kan måske endda skade "
-"dit system.\n"
+"Advarsel: Anvendelsen af daglige byg er for egen risiko.\n"
+"Der ydes ingen support på daglige byg.\n"
+"Daglige byg fungerer måske ikke som forventet, og kan måske endda skade dit "
+"system.\n"
 "\n"
-"Ønsker du virkelig at se om der er en ny natlig build?"
+"Ønsker du virkelig at søge efter daglige byg?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Advarsel: Mulig sikkerhedsrisiko!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Velkommen til FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Sidste nye"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Sidste nye:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Hvis du tillader FileZilla at huske adgangskoder, kan du oprette forbindelse "
+"igen senere, efter at FileZilla har været lukket ned, uden at skulle "
+"indtaste adgangskoden."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7517,11 +7694,15 @@
 "lokale operativsystem, blive erstattet i navnene på filer med sådanne tegn i "
 "sig, når du henter dem."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Widescreen"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Skal FileZilla huske adgangskoder?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Skr&iv"
 
@@ -7534,11 +7715,19 @@
 msgid "Wrong line endings"
 msgstr "Forkerte linieslut-tegn"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ja"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Det ser ud til, at du bruger en vært der kun anvender IPv6. Denne assistent "
+"understøtter ikke dette miljø."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7546,15 +7735,15 @@
 "Du bruger allerede den nyeste version af FileZilla. Prøv igen om et stykke "
 "tid."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Du kan altid åbne denne dialog igen via Hjælp-menuen."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Du kan lade portfeltet stå tomt for at bruge standardporten."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7581,12 +7770,12 @@
 msgstr ""
 "Du angav ikke et nyt navn på filen. Vil du overskrive filen i stedet for?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Du har valgt mindst ét symbolsk link."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7594,7 +7783,7 @@
 "Du har valgt at ville redigere mere end 10 filer - ønsker du virkelig at "
 "fortsætte?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7603,11 +7792,11 @@
 "virkelig at fortsætte?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Du skal angive et værtsnavn."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Du skal angive en lokal mappe."
 
@@ -7616,17 +7805,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Du skal angive en gyldig IP-adresse."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Du skal angive en skrivbar lokal mappe."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Du skal angive et kontonavn."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Du skal angive et brugernavn"
 
@@ -7645,28 +7834,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Angiv et navn for logfilen."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Du skal angive en kommando med anførselstegn sat korrekt."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Du skal angive en proxy-vært."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 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:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 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:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7674,7 +7863,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:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7706,44 +7895,49 @@
 "Du burde ikke have problemer med at oprette forbindelse til andre servere, "
 "filoverførseler burde fungere korrekt."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "efter"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "inden"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "begynder med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "indeholder"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "indeholder ikke"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "er ikke lig med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "slutter med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "svarer til"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "fil"
 
@@ -7762,82 +7956,130 @@
 "Sørg for, at denne eksekverbare fil findes i samme mappe som FileZillas "
 "eksekverbare fil."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp kunne ikke startes"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers returnerede ingen certifikater"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "større end"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "eksekvérbar af gruppe"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "læsbar af gruppe"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "skrivbar af gruppe"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "er lig med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "er sat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "er ikke sat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "mindre end"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "svarer til regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "eksekvérbar af ejer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "læsbar af ejer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "skrivbar af ejer"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "ukendt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "eksekvérbar globalt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "globalt læsbar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "globalt skrivbar"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "Kop&ier"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Slå automatisk søgning efter opdateringer til"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Antal dage mellem opdateringskontroller:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(mindst 7 dage)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automatisk søgning efter opdateringer"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Søg efter &betaversioner og release-kandidater"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Kopier"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Angiv et opdateringsinterval på mindst 7 dage"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Politik om personlige oplysninger:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s byte (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s byte (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "&Husk denne og alle fremtidigie adgangskoder"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "Forkert opState: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Filternavn findes allerede"
 
diff -Nru filezilla-3.5.3/locales/de.po filezilla-3.7.3~precise/locales/de.po
--- filezilla-3.5.3/locales/de.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/de.po	2013-06-18 20:02:24.000000000 +0000
@@ -1,38 +1,38 @@
 # Translation for FileZilla Client - German
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2009-02-06 21:17+0100\n"
-"Last-Translator: Tim Kosse <tim.kosse@filezilla-project.org>\n"
-"Language-Team: Kay Urbach <Kay.Urbach@gmx.de>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-13 01:45+0200\n"
+"Last-Translator: Peter Körner <18427@gmx.net>\n"
+"Language-Team: German\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: de\n"
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S vergangen"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S verbleibend"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
 msgstr ""
-"%a - Konto (Zeilen die dies beinhalten werden ausgelassen, falls kein "
+"%a - Konto (Zeilen, die dies beinhalten, werden ausgelassen, falls kein "
 "Kontozugangstyp benutzt wird)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
@@ -44,9 +44,9 @@
 msgstr[0] "%d Verzeichnis"
 msgstr[1] "%d Verzeichnisse"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -78,7 +78,7 @@
 msgstr[0] "%d Datei. Gesamtgröße: mindestens %s"
 msgstr[1] "%d Dateien. Gesamtgröße: mindestens %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d Dateien zur Warteschlange hinzugefügt"
@@ -90,31 +90,21 @@
 msgstr[0] "%d Sekunde"
 msgstr[1] "%d Sekunden"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Server"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Passwort"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d,%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d,%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -129,7 +119,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Noch nicht gültig!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxy-Benutzer"
@@ -151,27 +141,17 @@
 msgstr[0] "%s Byte"
 msgstr[1] "%s Bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s Bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s Bytes (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s Bytes (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s Bytes (%d,%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s Bytes (%d,%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -186,7 +166,7 @@
 "Bitte laden Sie FileZilla erneut herunter. Falls dieses Problem weiterhin "
 "auftritt, senden Sie bitte einen Fehlerbericht."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -200,7 +180,7 @@
 "funktionieren.\n"
 "\n"
 "Mögliche Lösungen:\n"
-"- Stellen Sie sicher dass %s sich in einem Verzeichnis befindet das in der "
+"- Stellen Sie sicher, dass %s sich in einem Verzeichnis befindet, das in der "
 "PATH-Umgebungsvariable enthalten ist.\n"
 "- Geben Sie den vollständigen Pfad zu %s in der FZ_FZSFTP-Umgebungsvariable "
 "an."
@@ -210,152 +190,148 @@
 msgid "%s with %d bits"
 msgstr "%s mit %d Bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Benutzername"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proxy-Passwort"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "Ü&ber..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Konto:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Aktiv"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "Lesezeichen &hinzufügen..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "Dateien zur W&arteschlange hinzufügen"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "Schlüsseldatei &hinzufügen..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "Zur W&arteschlange hinzufügen"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Zeitzonenabweichung des Servers anpassen:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Zertifikat zukünftig immer vertrauen."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Diesem Server immer vertr&auen, diesen Schlüssel speichern"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Immer Standardeditor verwenden"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Auswahl immer für Dateien ohne Zuordnung verwenden"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "Immer &diese Aktion ausführen"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Betriebssystem nach der externen IP-Adresse fragen"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automatisch"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "Auto&matische Erkennung"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binär"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Bi&näre Präfixe mit SI-Einheit (Beispiel: 1 KB = 1024 Bytes)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Lesezeichen"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Durchsuchen..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Burst-&Toleranz:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "Abbre&chen"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "Nach neuen FileZilla-&Beta-Versionen suchen"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Persönliche Daten löschen..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&FileZilla beenden"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Geschwindigkeitsbegrenzungen einstellen..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Einstellen..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Verbinden"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopieren"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "Aktuelle &Verbindung in Servermanager aufnehmen..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "In die Zwis&chenablage kopieren"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Crash"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Verzeichnis erstellen"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Neuen Tab erzeugen"
 
@@ -363,170 +339,170 @@
 msgid "&Debug"
 msgstr "&Debug"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "Debug-Informationen im &Nachrichtenprotokoll:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "St&andardeditor:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Umgang mit bereits existierenden Dateien..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Verzögerung nach ungültigen Login-Versuchen:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Löschen"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Symbolische Verknüpfung löschen"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Verzeichnisvergleich"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
-msgstr "Lokale &Datei verwerfen, dann Datei neu herunterladen und editieren"
+msgstr "Lokale &Datei verwerfen, dann Datei neu herunterladen und bearbeiten"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Trennen"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Verbindung zum Server trennen"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "A&ktuelle Transfergeschwindigkeit anstelle der Durchschnittsgeschwindigkeit "
 "anzeigen"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Größe in Bytes anzeigen"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Passwörter &nicht speichern"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Diesen Dialog nicht nochmals anzeigen."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "E&xterne IP-Adresse nicht für lokale Verbindungen benutzen."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "&Doppelklick-Aktion für Dateien:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "Herunterla&den"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Herunterladen nach:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Herunterladen..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Downloads:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Bearbeiten"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "Filterregeln &bearbeiten..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Aktivieren"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Automatische Suche nach Updates aktivieren"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Geschwindigkeitsbegrenzungen aktivieren"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Zeichensatz:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "Vers&chlüsselung:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "B&enutzerdefinierten Befehl eingeben..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "Ausführ&en"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Servermanager-Einträge"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Export..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Auf aktiven Modus zurückgreifen"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Datei"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Dateiattribute..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Dateiberechtigungen..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "D&atei:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Filterbedingungen:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Filtersätze:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filter:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Beenden"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
-msgstr "Bearbeitung &beenden und lokale Datei löschen"
+msgstr "Bearbeiten &beenden und lokale Datei löschen"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -534,482 +510,490 @@
 "Dateipfad auf Server nicht berücksichtigen; Dateien direkt in das "
 "&Zielverzeichnis herunterladen"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 "Symbolischer &Verknüpfung folgen, Inhalt des Zielverzeichnisses löschen"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Externe IP-Adresse von folgender URL beziehen:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Onlinesupport..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Globales Lesezeichen"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 unter Verwendung der 'CONNECT'-Methode"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Hilfe"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "Identische &Dateien verstecken"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Höchste"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Höchster verfügbarer Port:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "Se&rver:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Binäre Präfixe mit IEC-Einheit (Beispiel: 1 KiB = 1024 Bytes)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "ISO &8601 (Beispiel: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Import..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "Ü&bernehme Dateizuordnungen des Systems"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 "Dateipfad wie auf &Server beibehalten (relativ zum Wurzelverzeichnis der "
 "Suche)"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Datei- und Verzeichnisansicht:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Lokale Ports, die von FileZilla benutzt werden, begrenzen"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "Anzahl &gleichzeitiger Verbindungen begrenzen"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Lokaler Verzeichnisbaum"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Lokales Verzeichnis:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Log in Datei speichern"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "Verbindun&gsart:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "Verbindun&gsart:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "Ni&edrig"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "Lesezeichen &verwalten..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Manueller Transfer..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Maximale Anzahl der Verbindungen:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Maximale Anzahl der Versuche:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Nachrichtenprotokoll"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "In den System-&Tray minimieren"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Name:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Netzwerkkonfigurations-Assistent..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Neu"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Neuer Server"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Neue Version verfügbar!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Weiter >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Nein"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Keiner"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "Anzahl an &Tagen zwischen dem Suchen nach Updates:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Numerischer Wert:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "OP&EN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "Ö&ffnen"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "Ü&berschreiben"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passiv"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Passwort:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Klang abspielen"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Position des Nachrichtenprotokolls:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "Ä&nderungszeitpunkt der übertragenen Dateien beibehalten"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Warteschlange"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Verbinden"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Quickconnect-Leiste"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Lesen"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Wiederverbinden"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Aktualisieren"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "Passwo&rt für diese Sitzung merken"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "Passwörter &speichern"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "S&erver-Verzeichnis:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Se&rver-Pfad:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Entfernen"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "Schlüssel entfe&rnen"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "Auswahl &entfernen"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Umbenennen"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Umbenennen..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Lokale Datei neu öffnen"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Ungültige Zeichen ersetzen durch:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Einen Fehler melden..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "Alle &Dateien zurücksetzen und wieder zur Warteschlange hinzufügen"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "Assistent neusta&rten"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "Wiedera&ufnehmen"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Befehl eingeben..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Konfigurationsassistenten jetzt ausführen..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Jetzt nach Updates suchen..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "S&OCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Speichern unter..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Suchen"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Dateisuche auf Server..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "Eintrag aus&wählen:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "Sprache &auswählen:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Wählen Sie die Spalten aus, die angezeigt werden sollen:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "Ein&stellungen"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Einstellungen..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Debugmenü anzeigen"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Nachricht anzeigen"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Zeitstempel im Nachrichtenprotokoll anzeigen"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Servermanager..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Serverspezifisches Lesezeichen"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "Übers&pringen"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Geschwindigkeitsbegrenzungen"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&Transfer sofort starten"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Lokal- und Serveransicht vertauschen"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS-Chiffren"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Test"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Design:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transfer"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Transfermodus:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Transfer-Warteschlange"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "'dotfiles' als ASCII-Dateie&n behandeln"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
-msgstr "&Bearbeiten rückgängig machen"
+msgstr "&Bearbeiten beenden"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "Für diesen Server gespeicherten Schlüssel akt&ualisieren"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Hochladen"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Uploads:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Benutzerdefiniertes Programm verwenden"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "S&ynchronisierten Verzeichniswechsel verwenden"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "System-Standardeditor für &Textdateien verwenden"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Folgende IP-Adresse benutzen:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "Stattdessen &externe IP-Adresse des Servers benutzen"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Tausender-Trennzeichen benutzen"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Benutzer:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Ben&utzername:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Version %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Ansicht"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Ansehen/Bearbeiten"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Lokal bearbeitete Dateien beobachten und bei Änderungen das Hochladen "
 "vorschlagen"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Bei der Suche nach Updates, suche nach:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Schreiben"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Ja"
 
@@ -1027,18 +1011,34 @@
 msgstr "'%s' ist kein Verzeichnis."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Anmeldung via 'Konto' wird vom gewählten Protokoll nicht unterstützt."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Anmeldung via 'Normal' oder 'Konto' ist nicht verfügbar; stattdessen wird "
+"'Nach Passwort fragen' verwendet."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Anmeldung via 'Normal' oder 'Konto' ist nicht verfügbar. Ihr Eintrag wurde "
+"auf 'Nach Passwort fragen' geändert."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
 "'quote' ist normalerweise ein lokales Kommando, das Befehlszeilen-Clients "
-"verwenden, um die Argumente die auf 'quote' folgen unverarbeitet an den "
+"verwenden, um die Argumente, die auf 'quote' folgen, unverarbeitet an den "
 "Server zu senden. Wollen Sie nicht vielmehr den Befehl ohne 'quote' senden?"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
@@ -1049,120 +1049,116 @@
 msgstr[0] "(%d Objekt ausgefiltert)"
 msgstr[1] "(%d Objekte ausgefiltert)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 für unbegrenzt)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 Sekunden)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "Sekunden (5-9999, 0 zum Deaktivieren)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Mindestens 7 Tage)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(Beispiel: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(Beispiel: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(in %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S verbleibend"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- verbleibend"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Kaputter Router und/oder Firewall"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Datei auf Mirror beschädigt"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware auf Ihrem System"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- verbleibend"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c kann nicht zusammen mit einer FTP-URL verwendet werden."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l kann nur zusammen mit einer FTP-URL verwendet werden."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s und -c können nicht gleichzeitig verwendet werden."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s kann nicht zusammen mit einer FTP-URL verwendet werden."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Keine"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Warnungen"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Infos"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Ausführlich"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-Bit-System"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-Bit-System"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Zurück"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1173,18 +1169,19 @@
 "Ein Lesezeichen mit dem angegebenen Namen existiert bereits. Bitte geben Sie "
 "einen noch nicht verwendeten Namen an."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Es muss ein Standardeditor eingestellt sein."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr ""
 "Ein Verzeichnis kann nicht in eines seiner Unterverzeichnisse verschoben "
 "werden."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1195,11 +1192,11 @@
 "öffnet FileZilla selbst einen Port und fordert den Server auf, sich zu "
 "diesem zu verbinden."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Eine zuvor geöffnete Datei wurde geändert."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2066
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
@@ -1207,19 +1204,19 @@
 "Eine Datei mit diesem Namen wird bereits bearbeitet. Soll '%s' neu geöffnet "
 "werden?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Eine Datei mit diesem Namen wird bereits übertragen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Eine Datei mit diesem Namen wird noch bearbeitet. Bitte schließen Sie diese "
 "und versuchen Sie es erneut."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1234,11 +1231,11 @@
 "Dateiauflistungen fehlen.\n"
 "In dieser Sitzung werden keine weiteren Warnungen angezeigt."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Es ist eine neuere Version von FileZilla verfügbar:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1247,7 +1244,7 @@
 "Server verstecken allerdings Dateien vor dem Benutzer. Benutzen Sie diese "
 "Option, um den Server zu zwingen, alle Dateien anzuzeigen."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1266,15 +1263,15 @@
 "Synchronisierten Verzeichniswechsel deaktivieren und das lokale Verzeichnis "
 "wechseln?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "ASC&II"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Hinzufügen"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "&Fortsetzen des Downloads von ASCII-Dateien erlauben"
 
@@ -1286,55 +1283,55 @@
 msgid "A&pply only to uploads"
 msgstr "&Nur auf Uploads anwenden"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "&Auf alle Dateien und Verzeichnisse anwenden"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Erf&olgreiche Übertragungen automatisch entfernen"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Bestehende Verbindung unterbrechen und in aktuellem Tab verbinden"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Über FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Über den Dateilisten"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "A&ktion nach dem Abarbeiten der Warteschlange"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Aktion für ausgewählte Datei:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Durchzuführende Aktion:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Aktion:"
 
@@ -1369,23 +1366,23 @@
 "externe IP-Adresse, aber Ihr Router oder die Firewall hat fälschlicherweise "
 "die Sendeadresse verändert."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP für aktiven Modus"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "Dateien nur zur &Warteschlange hinzufügen"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Ausgewähltes Verzeichnis zur Warteschlange hinzufügen"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Auswahl zur Warteschlange hinzufügen"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Zur Warteschlange hinzufügen"
 
@@ -1393,28 +1390,43 @@
 msgid "Address type not supported"
 msgstr "Adresstyp nicht unterstützt"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Erweitert"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Erweiterte Optionen:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Hinweis: Bitte verwenden Sie weiterhin nur stabile Versionen, außer Sie "
+"möchten neue Funktionen testen. Beta-Versionen und Nightly Builds sind "
+"Entwicklungsversionen und für Testzwecke gedacht. Nightly Builds von "
+"FileZilla könnten nicht wie erwartet funktionieren und könnten sogar Ihr "
+"System beschädigen. Sie verwenden Beta-Versionen und Nightly Builds auf "
+"eigene Gefahr."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algorithmus:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Alle Dateien wurden erfolgreich übertragen"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Alle Ports im angegebenen Bereich müssen zwischen 1024 und 65535 liegen."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1424,19 +1436,19 @@
 "Alle Übertragungen wurden beendet. %d Dateien konnten nicht übertragen "
 "werden."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "&Ermögliche Zurückgreifen auf anderen Transfermodus bei Fehlschlag"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Ermögliche Zurückgreifen auf anderen Transfermodus bei Fehlschlag"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Bereits verbunden"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1444,7 +1456,7 @@
 "Alternativ können Sie PuTTYs 'Pageant' verwenden, um Ihre Schlüssel zu "
 "verwalten (Pageant wird von FileZilla erkannt)."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1453,7 +1465,7 @@
 "in diesem Fall sicher, dass die 'SSH_AUTH_SOCK'-Umgebungsvariable gesetzt "
 "ist."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1461,7 +1473,7 @@
 "Alternativ können Sie die aktuelle FileZilla-Version auf http://filezilla-"
 "project.org herunterladen."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1471,7 +1483,7 @@
 "aufgetreten.\n"
 "Möglicherweise wurden einige Warteschlangeneinträge nicht wiederhergestellt."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1481,95 +1493,95 @@
 "aufgetreten.\n"
 "Möglicherweise wurden einige Warteschlangeneinträge nicht gespeichert."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 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:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Es wird schon eine andere Serveroperation ausgeführt; kann Verzeichnis im "
 "Moment nicht wechseln"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "Keine der im Servermanager durchgeführten Änderungen konnte gespeichert "
 "werden."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 ""
-"Im Servermanager durchgeführte Änderungen werden nicht gespeichert bis Sie "
+"Im Servermanager durchgeführte Änderungen werden nicht gespeichert, bis Sie "
 "die Datei reparieren."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Änderungen an den Filtern werden nicht gespeichert."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "&Nur auf Verzeichnisse anwenden"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Anwenden"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Nur auf aktuelle &Warteschlange anwenden"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Nur au&f Dateien anwenden"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archiv"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Als Tab in der Warteschlangenansicht"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Aktion erfragen"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Nach Passwort fragen"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Betriebssystem nach Port fragen."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Betriebssystem nach der externen IP-Adresse fragen."
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "In den FileZilla-Foren Fragen stellen"
 
@@ -1577,40 +1589,36 @@
 msgid "Associated program not found:"
 msgstr "Verknüpftes Programm nicht gefunden:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Wenigstens eine Filterbedingung ist unvollständig"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Nun sind alle notwendigen Informationen zusammengestellt."
 
 # TODO:? Eigenschaft
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Authentifizierung fehlgeschlagen."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Automatisch"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Automatische Bestimmung des Dateityps"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Automatische Suche nach Updates"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Vorhandene Größen"
 
@@ -1619,66 +1627,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "&Proxy umgehen"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Grundlegende Verwendungshinweise"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Verhalten"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Wird bearbeitet"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "String-Coalescer-Benchmark durchführen"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Vorsicht! Zertifikat wurde widerrufen"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binär"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Schwarzes Brett"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Lesezeichen"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Lesezeichen:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Lesezeichen"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Erstellungsdatum:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Versionsinformationen"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Geschäftskategorie:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1688,63 +1696,63 @@
 "beliebigen lokalen Port. Wenn Sie FileZilla auf einen kleineren Portbereich "
 "beschränken wollen, geben Sie ihn bitte nachfolgend an."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "&Aktuelle Operation abbrechen"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "Nach &Entwicklerversionen (Nightly Builds) von FileZilla suchen"
+msgstr "Nach &Nightly Builds von FileZilla suchen"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "Alles &löschen"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "U&RL(s) in die Zwischenablage kopieren"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "B&enutzerdefiniert"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Ben&utzerdefinierte Dateizuordnungen:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Berechne Zeitzonenabweichung des Servers..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Kann nicht aus Datei lesen"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "In die Datei kann nicht geschrieben werden."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "In die Datei kann nicht geschrieben werden: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Abbrechen"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Aktuelle Operation abbrechen"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Bricht die aktuelle Operation ab"
 
@@ -1755,11 +1763,11 @@
 "Kein Zugriff auf '%s' möglich, kein Datenträger im Laufwerk oder Laufwerk "
 "nicht bereit."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Kann Server nicht zum Servermanager hinzufügen"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1775,31 +1783,31 @@
 "Kann Verzeichnisse nicht vergleichen, es sind unterschiedliche Filter für "
 "lokale und Serververzeichnisse aktiviert."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr ""
 "Kann Verzeichnisse nicht vergleichen, keine Verbindung zu einem Server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Kann neuen Filter nicht erstellen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Kann die Datei nicht bearbeiten"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Kann Datei nicht bearbeiten, nicht mit einem Server verbunden."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Kann Datei nicht bearbeiten, Pfad auf Server unbekannt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1807,8 +1815,8 @@
 "Kann keine FTP-Verbindung zu einem SFTP-Server aufbauen. Bitte wählen Sie "
 "ein geeignetes Protokoll."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Quickconnect-Leiste kann nicht aus Ressourcendatei geladen werden"
 
@@ -1820,44 +1828,48 @@
 msgid "Cannot load keyfile"
 msgstr "Kann Schlüsseldatei nicht laden"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Werkzeugleiste kann nicht aus Ressourcendatei geladen werden"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Kann Passwort nicht speichern"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Kann Eintrag nicht umbenennen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Kann Datei nicht umbenennen"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Kann Filtersatz nicht speichern"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Kann Filter nicht auswählen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Kann Dateizuordnung nicht setzen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Kann Dialog nicht anzeigen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Kann die gewählte Datei nicht ansehen/bearbeiten"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Kategorien"
 
@@ -1865,60 +1877,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Zertifikats- und Sitzungsdaten sind noch nicht verfügbar."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Zertifikatsdetails"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Zertifikat in Kette:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Herausgeber des Zertifikats"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Aufforderung:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Dateiattribute ändern"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Dateiberechtigungen ändern."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Das Ändern der Logdatei-Einstellungen erfordert einen FileZilla-Neustart."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Probleme mit Zeichensatz"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Zeichensatz"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Nach &Beta-Versionen und Release Candidates suchen"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Nach &Updates suchen..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Auto&matisch nach FileZilla-Updates suchen:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Nach neueren FileZilla-Versionen suchen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Nach Updates suchen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Suche nach Updates fehlgeschlagen"
 
@@ -1926,21 +1938,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Überprüfe Korrektheit der externen IP-Adresse"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Suche nach Updates"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Prüfsumme der heruntergeladenen Datei stimmt nicht."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Lokales Standard-Verzeichnis auswählen"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Lokales Verzeichnis auswählen"
 
@@ -1948,43 +1960,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "HTTP-Datenblock nicht ordnungsgemäß terminiert"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Chiffre:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Tab s&chließen"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Klassisch"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "&Servermanager-Einträge"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "&Layout-Cache leeren"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "&Quickconnect-Verlauf"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "&Wiederverbindungsinformationen"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "&Transfer-Warteschlange"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Verlauf leeren"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1992,48 +2004,48 @@
 msgid "Clear private data"
 msgstr "Persönliche Daten löschen"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Quickconnect-Leiste leeren"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "String Coalescer leeren"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr "Klicken Sie auf Beenden um Ihre Konfiguration zu speichern."
+msgstr "Klicken Sie auf Beenden, um Ihre Konfiguration zu speichern."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
-msgstr "Klicken Sie auf weiter um die neue Version herunterzuladen."
+msgstr "Klicken Sie auf Weiter, um die neue Version herunterzuladen."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Client-zu-Server-MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Client-zu-Server-Chiffre:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Andere Tabs &schließen"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "FileZilla beenden"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Alle offenen Instanzen von FileZilla schließen"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Schließt den aktuellen Tab"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Ko&mmentare:"
 
@@ -2041,11 +2053,11 @@
 msgid "Column properties"
 msgstr "Spalteneigenschaften"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Spaltenauswahl"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 "Der Befehl und seine Argumente sollten korrekt mit Anführungszeichen "
@@ -2066,9 +2078,9 @@
 msgstr "Der Befehl wird von diesem Protokoll nicht unterstützt"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Befehl:"
 
@@ -2076,7 +2088,7 @@
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Allgemeiner Name:"
 
@@ -2085,15 +2097,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Kommunikation vom Router oder der Firewall beeinträchtigt"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Vergleiche Ä&nderungszeitpunkt"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Vergleiche Datei&größe"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Sc&hwellwert für Vergleiche (in Minuten):"
 
@@ -2101,60 +2113,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Der Vergleichsschwellwert muss zwischen 0 und 1440 Minuten liegen."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Kompiliert für:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Kompiliert auf:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Kompiliert mit:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Compilerflags:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Komprimiert"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Gleichzeitige Übertragungen"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "&Groß-/Kleinschreibung berücksichtigen"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Konfigurationstest"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Passiven Modus einrichten"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Portbereich einrichten"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "FileZilla und Ihr Netzwerk konfigurieren"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Löschen bestätigen"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Bestätigung erforderlich"
 
@@ -2162,7 +2174,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Herzlichen Glückwunsch, Ihre Konfiguration scheint zu funktionieren."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Verbinden (Proxy-Einstellungen umgehen)"
 
@@ -2170,34 +2182,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Mit angegebenem Server aus dem Servermanager verbinden"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Verbunden"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Verbindung wird hergestellt"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinde mit %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Verbinde mit %s über Proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Verbinde mit %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Verbinde mit Server"
 
@@ -2205,18 +2217,18 @@
 msgid "Connection"
 msgstr "Verbindung"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Verbindungsversuch fehlgeschlagen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Verbindungsversuch fehlgeschlagen mit \"%s\"."
@@ -2230,12 +2242,12 @@
 msgid "Connection closed"
 msgstr "Verbindung getrennt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Verbindung vom Server geschlossen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Verbindung hergestellt, initialisiere TLS..."
@@ -2244,7 +2256,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Verbindung hergestellt, schicke HTTP-Anfrage"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Verbindung hergestellt, warte auf Willkommensnachricht..."
 
@@ -2260,15 +2272,15 @@
 msgid "Connection refused"
 msgstr "Verbindung verweigert"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Zeitüberschreitung der Verbindung"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Zeitüberschreitung der Verbindung."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Verbindung zu Server verloren."
 
@@ -2288,27 +2300,23 @@
 msgid "Convert keyfile"
 msgstr "Schlüsseldatei konvertieren"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Kopieren"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopie (%d) von %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie von %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 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:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Konnte Verbindung nicht akzeptieren: %s"
@@ -2318,16 +2326,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Konnte Verbindung nicht in Servermanager aufnehmen"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Konnte Operation nicht abschließen"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Herstellen der Verbindung zum Server fehlgeschlagen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Herstellen der Verbindung zum Server fehlgeschlagen: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Befehl konnte nicht im Serverzeichensatz kodiert werden"
 
@@ -2336,17 +2348,17 @@
 msgid "Could not convert private key"
 msgstr "Konnte privaten Schlüssel nicht konvertieren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Konnte URLs nicht kopieren"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Konnte Daten nicht kopieren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2356,11 +2368,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:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Konnte keine Verbindung zum Server aufbauen"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2373,11 +2385,11 @@
 "Kommandozeilenoption '--datadir <custompath>' oder setzen Sie die "
 "Umgebungsvariable 'FZ_DATADIR'."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Es konnte keine benutzerdefinierte Anmeldesequenz erstellt werden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2385,7 +2397,7 @@
 "Konnte 'Distinguished Name' des Zertifikatsausstellers nicht ermitteln; "
 "gnutls_x509_get_issuer_dn fehlgeschlagen"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2393,7 +2405,7 @@
 "Konnte 'Distinguished Name' des Zertifikat-Betreffs nicht ermitteln; "
 "gnutls_x509_get_dn fehlgeschlagen"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Konnte kompletten Pfad auf Server nicht bestimmen."
 
@@ -2402,17 +2414,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Keine Antwort von fzputtygen erhalten."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "Kann temporäres Download-Verzeichnis nicht finden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2440,7 +2452,7 @@
 msgid "Could not load private key"
 msgstr "Konnte privaten Schlüssel nicht laden"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2452,7 +2464,7 @@
 "Synchronisierten Verzeichniswechsel deaktivieren und das Verzeichnis auf dem "
 "Server wechseln?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2474,9 +2486,9 @@
 "nicht bestimmen.\n"
 "Synchronisierter Verzeichniswechsel wurde deaktiviert."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Konnte Zwischenablage nicht öffnen"
 
@@ -2491,11 +2503,11 @@
 msgid "Could not parse remote path."
 msgstr "Konnte Server-Pfad nicht verarbeiten."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Konnte Serveradresse nicht verarbeiten:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Konnte vom Socket nicht lesen: %s"
@@ -2504,12 +2516,12 @@
 msgid "Could not read server item."
 msgstr "Konnte Servereintrag nicht lesen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Es konnte nicht zum Dateiende gesprungen werden"
 
@@ -2517,22 +2529,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Konnte Befehl nicht an fzputtygen senden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "IO-Thread konnte nicht gestartet werden"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Proxy-Handshake konnte nicht gestartet werden: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Übertragung konnte nicht gestartet werden"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2555,7 +2567,7 @@
 "Konnte \"%s\" nicht schreiben; die globalen Lesezeichen konnten nicht "
 "gespeichert werden: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2565,16 +2577,16 @@
 "werden.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Konnte \"%s\" nicht schreiben; die ausgewählten Server konnten nicht "
 "exportiert werden: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Konnte \"%s\" nicht schreiben: %s"
@@ -2584,7 +2596,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Konnte Schlüsseldatei nicht schreiben: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Konnte nicht in lokale Datei schreiben"
 
@@ -2594,39 +2606,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Konnte nicht in Logdatei schreiben: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Konnte nicht in Socket schreiben: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Staat:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Bringt FileZilla sofort zum Abstürzen. Wird nur zum Testen der "
 "Ausnahmebehandlung benötigt"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "&Neue Datei erstellen"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Neues Unterverzeichnis im aktuellen Verzeichnis erstellen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Eine neue, leere Datei im aktuellen Verzeichnis erstellen"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Verzeichnis erstellen"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Leere Datei erstellen"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Erstelle Verzeichnis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Erstelle Verzeichnis '%s'..."
@@ -2644,7 +2668,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Kritischer Dateitransferfehler nach Übertragung von %s in %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2666,52 +2690,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Als Transfertyp ist 'Binär' eingestellt."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "&Benutzerdefiniert"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Eigener Filtersatz"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Benutzerdefinierter Server"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Datent&yp"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "&Dezimale Präfixe mit SI-Einheit (Beispiel: 1 KB = 1000 Bytes)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "&Standard"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "Lösch&en"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Alle &deaktivieren"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "&Passwörter nicht speichern"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "D&oppelklick-Aktion für Verzeichnisse:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "&Kopieren"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-ähnlich mit virtuellen Pfaden"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Gefährlicher Dateityp"
 
@@ -2719,16 +2747,16 @@
 msgid "Data"
 msgstr "Daten"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Datensocket wurde zu früh geschlossen."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Datum"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Datumsformat"
 
@@ -2747,11 +2775,11 @@
 msgid "Debug"
 msgstr "Debug"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Debug-Einstellungen"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Lokales Standard-Verzeic&hnis:"
 
@@ -2759,19 +2787,19 @@
 msgid "Default (Autodetect)"
 msgstr "Standard (Automatische Erkennung)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Standardeditor nicht korrekt mit Anführungszeichen versehen."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Standardaktion bei bereits existierender Datei"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "&Standard-Verzeichnis auf Server:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2784,15 +2812,15 @@
 msgid "Default system language"
 msgstr "System-Standardsprache"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Standard-Transfermodus:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Standard-Transfertyp:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Standard: http://ip.filezilla-project.org/ip.php"
 
@@ -2818,59 +2846,59 @@
 "Verzögere Verbindungsversuch für %d Sekunden, da der vorherige "
 "fehlgeschlagen ist..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Servermanagereintrag löschen"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Markiertes Verzeichnis löschen"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Ausgewählte Dateien und Verzeichnisse löschen"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Verzeichnisse löschen"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 "Das Löschen von mehreren, nicht zusammengehörenden Verzeichnissen, wird noch "
 "nicht unterstützt"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Symbolische Verknüpfung löschen"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Desktop"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Details"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Details für neuen Schlüssel:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Verzei&chnisse"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Richtung"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Verzeichnis"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Verzeichnisvergleich"
 
@@ -2890,11 +2918,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Anzeigen des Verzeichnisinhalts durch Benutzer abgebrochen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Anzeigen des Verzeichnisinhalts fehlgeschlagen"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Datei-/Verzeichnisfilter"
 
@@ -2902,18 +2930,18 @@
 msgid "Directory listing successful"
 msgstr "Anzeigen des Verzeichnisinhalts abgeschlossen"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Alle d&eaktivieren"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Synchronisierten Verzeichniswechsel deaktivieren und das Serververzeichnis "
 "wechseln?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2921,50 +2949,49 @@
 "Deaktivieren Sie diese Option wieder, wenn Verzeichnisinhalte nicht mehr "
 "richtig angezeigt werden."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Verbindung zum Server trennen"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Verbindung zum Server getrennt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Verbindung zum Server getrennt: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Trenne Verbindung zu vorherigem Server"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Trennt Verbindung zu aktuellem Server"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Informationsdialog anzeigen"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Keinen Standardeditor verwenden"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Nichts &machen"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2973,8 +3000,8 @@
 "Wenn Sie nicht unbedingt neue Funktionen ausprobieren wollen, bleiben Sie "
 "bei der stabilen Version."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Wollen Sie FileZilla wirklich beenden?"
 
@@ -2989,7 +3016,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Wollen Sie wirklich alle Servermanagereinträge löschen?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Wollen Sie wirklich den gewählten Eintrag löschen?"
 
@@ -2997,34 +3024,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Wollen Sie wirklich die Transfer-Warteschlange löschen?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Wollen Sie wirklich '%s' zum Server senden?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Externe IP-Adresse nicht für &lokale Verbindungen benutzen."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "'dotfiles' sind Dateien, deren Name mit einem Punkt beginnt (bspw. '."
 "htaccess')."
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Doppelklick-Aktion"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Herunterladen"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Begrenzung der Do&wnloadgeschwindigkeit:"
 
@@ -3037,43 +3064,52 @@
 msgid "Download limit: none"
 msgstr "Download-Begrenzung: keine"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Suchergebnisse herunterladen"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Ausgewähltes Verzeichnis herunterladen"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Ausgewählte Dateien und Verzeichnisse herunterladen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Downloadgeschwindigkeit: %s/s\n"
+"Uploadgeschwindigkeit: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Wird heruntergeladen"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Lade %s herunter"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Suchergebnisse herunterladen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3082,59 +3118,63 @@
 "Drag&Drop zwischen verschiedenen Instanzen von FileZilla ist derzeit noch "
 "nicht möglich."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Drag&Drop zwischen verschiedenen Servern ist derzeit noch nicht möglich."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Kop&ieren"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "&Alle aktivieren"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "V&erzeichnis betreten"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "A&usführen"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Beenden"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Jeder Filter muss wenigstens eine Bedingung enthalten."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Filter bearbeiten"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Datei mit dem eingestellten Editor bearbeiten und auf den Server hochladen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Bearbeiten fehlgeschlagen"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Leerer Befehl"
 
@@ -3142,7 +3182,7 @@
 msgid "Empty command."
 msgstr "Leerer Befehl."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Leeres Verzeichnis"
 
@@ -3154,95 +3194,101 @@
 msgid "Empty file extension."
 msgstr "Leere Dateierweiterung."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Geben Sie einen nicht-leeren Namen für den Filter an."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Leerer Name"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Leere Zeichenkette innerhalb der Anführungszeichen."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Alle a&ktivieren"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "&Filtern ungültiger Zeichen aktivieren"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Verschlüsselt"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Verschlüsselung"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Verschlüsselungsdetails"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Vergleichen beenden und Sortierreihenfolge ändern?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Benutzerdefinierten Befehl eingeben..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Geben Sie 0 für unbegrenzte Geschwindigkeit ein."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Befehl eingeben"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Benutzerdefinierten Befehl eingeben"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Verzeichnis betreten"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
-msgstr "Bitte einen Filternamen angegeben"
+msgstr "Bitte einen Filternamen angeben"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Bitte einen Namen für den Filtersatz eingeben"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Neuen Namen für den Filtersatz eingeben"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Passwort eingeben"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Ausgewähltes Verzeichnis betreten"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Geben Sie die Adresse des Servers ein.\n"
 "Um das Server-Protokoll festzulegen, können Sie einen Protokollnamen vor dem "
@@ -3250,7 +3296,13 @@
 "Standardprotokoll (ftp://) verwendet.\n"
 "Sie können auch eine komplette URL in der Form protokoll://benutzer:"
 "passwort@server:port angeben. Die Werte in den anderen Feldern werden dann "
-"überschrieben."
+"überschrieben.\n"
+"\n"
+"Unterstützte Protokolle sind:\n"
+"- ftp:// für normales FTP\n"
+"- sftp:// für das 'SSH File Transfer Protocol'\n"
+"- ftps:// für FTP über TLS (implizit)\n"
+"- ftpes:// für FTP über TLS (explizit)."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3262,7 +3314,7 @@
 "Bitte beachten Sie, dass die konvertierte Datei nicht passwortgeschützt sein "
 "wird."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3284,7 +3336,7 @@
 msgid "Error importing"
 msgstr "Fehler beim Importieren"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Fehler beim Laden der Warteschlange"
 
@@ -3293,27 +3345,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "xml-Datei kann nicht geladen werden"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Fehler beim Speichern der Warteschlange"
 
@@ -3324,74 +3376,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "xml-Datei kann nicht geschrieben werden"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Fehler; Dateiname kann nicht verarbeitet werden."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Fehler; lokale Datei existiert, kann aber nicht gelöscht werden"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Fehler:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Verbindung in einem neuen Tab aufbauen"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Jeden Monat"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Jede zweite Woche"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Beispiel: png \"c:\\Programme\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Beispiele"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Aus&führen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Ausführbare Datei"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Programm enthält keine Versionsinformationen, Suche nach Updates nicht "
 "möglich."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorer"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "&Warteschlange"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "&Einstellungen"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exporteinstellungen"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Filte&rname:"
 
@@ -3399,7 +3459,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - File Transfer Protocol"
 
@@ -3411,25 +3471,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Unsicheres File Transfer Protocol"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-Engine nicht initialisiert, keine Verbindung möglich."
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP-Verbindungserhaltung"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-Proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP-URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3445,26 +3505,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP über implizites TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Verzeichnis konnte nicht gewechselt werden"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Wechseln der Sprache fehlgeschlagen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Fehler beim Suchen einer neueren FileZilla-Version."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Kopieren oder Verschieben der Servereinträge fehlgeschlagen"
 
@@ -3472,48 +3532,48 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Sicherheitskopie der xml-Datei konnte nicht erstellt werden"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 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:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Die aktuelle FileZilla-Version konnte nicht heruntergeladen werden."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Pfad für 'Eigene Dateien' konnte nicht gefunden werden"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Desktop-Pfad konnte nicht gefunden werden"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "FTP-Engine konnte nicht initialisiert werden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "TLS konnte nicht initialisiert werden."
@@ -3529,24 +3589,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Laden des privaten Schlüssels fehlgeschlagen: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, 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:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "%s konnte nicht zum Lesen geöffnet werden"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "%s konnte nicht zum Schreiben geöffnet werden"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Zurückgegebener Pfad konnte nicht geparst werden."
 
@@ -3554,7 +3614,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Parsen des vertrauenswürdigen Stammzertifikats fehlgeschlagen."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Daten konnten nicht empfangen werden"
 
@@ -3566,13 +3626,13 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Externe IP-Adresse konnte nicht ermittelt werden, breche ab"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Lokale IP-Adresse konnte nicht ermittelt werden."
 
@@ -3588,14 +3648,14 @@
 msgid "Failed to send command."
 msgstr "Fehler beim Senden des Befehls."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3603,14 +3663,14 @@
 "Die Sprache konnte nicht in %s (%s) geändert werden, die Standard-"
 "Systemsprache (%s, %s) wird benutzt."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3618,14 +3678,14 @@
 "Die Sprache konnte nicht in %s geändert werden. Die Standard-Systemsprache "
 "wird benutzt."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3636,7 +3696,7 @@
 msgid "Failed to validate settings"
 msgstr "Überprüfung der Einstellungen fehlgeschlagen"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Verifizierung des Zertifikats der Gegenstelle fehlgeschlagen"
 
@@ -3653,21 +3713,19 @@
 msgid "Failed transfers"
 msgstr "Fehlgeschlagene Übertragungen"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Auf aktiven Modus zurückgreifen"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Dat&ei:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "D&ateien"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Datei"
 
@@ -3683,7 +3741,7 @@
 msgid "File editing"
 msgstr "Bearbeiten von Dateien"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Datei existiert"
 
@@ -3691,7 +3749,7 @@
 msgid "File exists action"
 msgstr "Aktion bei existierender Datei"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Datei wurde geändert"
 
@@ -3699,14 +3757,14 @@
 msgid "File lists"
 msgstr "Dateilisten"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Datei nicht gefunden"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Dateisuche"
 
@@ -3741,105 +3799,106 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Dateitransfer erfolgreich, %s in %s übertragen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Dateiübertragungen dauern noch an."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Datei würde mit Datentyp 'ASCII' übertragen werden."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Datei würde mit Datentyp 'Binär' übertragen werden."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-Fehler"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
-"FileZilla kann nun Ihre Konfiguration testen um sicherzustellen, dass alles "
+"FileZilla kann nun Ihre Konfiguration testen, um sicherzustellen, dass alles "
 "ordnungsgemäß eingestellt ist."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla ist schon mit einem Server verbunden."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla läuft im Kiosk-Modus.\n"
-"Anmeldung via 'Normal' oder 'Konto' ist in diesem Modus nicht verfügbar."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla muss neu gestartet werden, damit das Ändern der Sprache wirksam "
 "wird."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "FileZilla-Updates"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Stat&usleisten für Verzeichnisanzeige"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Dateiname"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Datei-/Verzeichnisfilter..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Dateiname ungültig"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Dateiname darf keines der folgenden Zeichen enthalten: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Dateiname nicht geändert"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Dateiname:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Dateinamen dürfen keines der folgenden Zeichen enthalten: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Dateinamen dürfen keines der folgenden Zeichen enthalten: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
-msgstr "Zur Bearbeitung geöffnete Dateien"
+msgstr "Momentan bearbeitete Dateien"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Dateigröße"
@@ -3848,68 +3907,68 @@
 msgid "Filesize format"
 msgstr "Dateigrößenformat"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Dateityp"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Dateitypzuordnungen"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filter anwenden auf:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Ungültige Zeichen in Dateinamen filtern"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Filtername existiert bereits"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Objekte ausfiltern, die alle Folgenden erfüllen"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Objekte ausfiltern, die beliebige der Folgenden erfüllen"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Objekte ausfiltern, die keine der Folgenden erfüllen"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtersatz existiert bereits"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Verzeichnisinhalte filtern"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filter-Gültigkeitsprüfung fehlgeschlagen"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "MD5-Fingerprint:"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "SHA1-Fingerprint:"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Fingerabdruck:"
 
@@ -3917,7 +3976,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Assistent zur Firewall- und Routerkonfiguration"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3925,13 +3984,13 @@
 "Um eine detaillierte Beschreibung dieser Optionen zu erhalten, führen Sie "
 "bitte den Netzwerkkonfigurationsassistenten aus."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
-"Um eine zuverlässige Verbindung bzw. Datenübertragung zu garantieren sollten "
-"Sie einen Bereich von mindestens 10 Ports angeben."
+"Um eine zuverlässige Verbindung bzw. Datenübertragung zu garantieren, "
+"sollten Sie einen Bereich von mindestens 10 Ports angeben."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3939,33 +3998,33 @@
 "In dieser Sitzung werden die Standard-Einstellungen verwendet. Änderungen an "
 "den Einstellungen werden nicht gespeichert."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "&UTF-8 erzwingen"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "A&uflistung versteckter Dateien erzwingen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Auflistung versteckter Dateien erzwingen"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Formatspezifikationen:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Format: Erweiterung gefolgt von korrektem Befehl und Argumenten in "
 "Anführungszeichen."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Weitere Dokumentation"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Allgemein"
 
@@ -3973,21 +4032,21 @@
 msgid "General SOCKS server failure"
 msgstr "Allgemeines Versagen des SOCKS-Servers"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Generischer Proxy"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Externe IP-Adresse von folgender URL beziehen:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Hilfe erhalten"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Ein Filtersatz mit diesem Namen existiert bereits, Filtersatz überschreiben?"
@@ -3996,15 +4055,15 @@
 msgid "Global bookmarks"
 msgstr "Globale Lesezeichen"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Gruppen-Berechtigungen"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "H&och"
 
@@ -4012,21 +4071,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP über TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Versteckt"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Hoch"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Höchste"
 
@@ -4035,26 +4094,26 @@
 msgstr ""
 "Der größte verfügbare Port muss eine Zahl zwischen 1024 und 65535 sein."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
-"Halten Sie die Umschalttaste gedrückt um den Filterstatus auf beiden Seiten "
+"Halten Sie die Umschalttaste gedrückt, um den Filterstatus auf beiden Seiten "
 "gleichzeitig zu ändern."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Homepage:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Fingerabdruck des Server-Schlüssels:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Server-Schlüssel stimmen nicht überein"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 "Host fängt mit '[' an, es wurde aber keine schließende Klammer gefunden."
@@ -4063,20 +4122,20 @@
 msgid "Host unreachable"
 msgstr "Host nicht erreichbar"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Server:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Stunden,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "ISO 8&601 (Beispiel: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4086,13 +4145,13 @@
 "übertragen oder empfangen werden, wird die Verbindung geschlossen und "
 "FileZilla wird versuchen, sich erneut zu verbinden."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Wenn Sie Fehler melden, dann schicken Sie bitte Protokolle, die mit dem "
 "Debug-Modus \"Ausführlich\" erstellt wurden."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4105,7 +4164,7 @@
 "ausprobieren. Sie können den Transfermodus für jeden Server individuell im "
 "Servermanager auswählen."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4114,7 +4173,7 @@
 "Sie auch auf falsch konfigurierte Server zugreifen, die den ausgewählten "
 "Modus ablehnen."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4138,17 +4197,17 @@
 "Wenn das Problem weiterhin besteht, wird die Verbindung durch einen Router "
 "oder eine Firewall unterbrochen."
 
-#: resources.h:963
+#: resources.h:988
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
-"Falls die Größe der Logdatei das Limit erreicht, wird sie umbenannt indem "
+"Falls die Größe der Logdatei das Limit erreicht, wird sie umbenannt, indem "
 "\".1\" an den Dateinamen angehängt wird (hierbei werden gegebenenfalls "
-"ältere Logdateien überschrieben) und eine neue Datei wird erzeugt."
+"ältere Logdateien überschrieben), und eine neue Datei wird erzeugt."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4162,7 +4221,7 @@
 "manufacturer for a solution."
 msgstr ""
 "Wenn das Problem weiterhin besteht, wenden Sie sich bitte an den Hersteller "
-"Ihres Routers oder Ihrer Firewall um eine Lösung zu erfragen."
+"Ihres Routers oder Ihrer Firewall, um eine Lösung zu erfragen."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
@@ -4170,7 +4229,7 @@
 "Wenn das Problem weiterhin besteht, wenden Sie sich bitte an den Hersteller "
 "Ihres Routers."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4178,24 +4237,24 @@
 msgstr ""
 "Wenn Sie 'Überschreiben wenn aktueller' verwenden, muss Ihre Systemzeit mit "
 "der des Servers synchronisiert werden. Wenn sich (z.B. durch "
-"unterschiedliche Zeitzonen) die Zeiten unterscheiden, stellen Sie Ihre "
-"Zeitzone im Servermanager ein."
+"unterschiedliche Zeitzonen) die Zeiten unterscheiden, stellen Sie die "
+"Abweichung im Servermanager ein."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
 "Falls ein Verzeichnisvergleich anhand des Änderungszeitpunkts durchgeführt "
-"wird, werden zwei Dateien als gleich angesehen falls ihre "
+"wird, werden zwei Dateien als gleich angesehen, falls ihre "
 "Änderungszeitpunkte nicht weiter als der eingestellten Schwellwert "
 "auseinander liegen."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Wenn Sie die Sprache wechseln, sollten Sie FileZilla neu starten."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4203,11 +4262,11 @@
 "Wenn Sie auf \"Test\" klicken, wird sich FileZilla mit probe.filezilla-"
 "project.org verbinden und einige einfache Tests ausführen."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Wenn Sie FileZilla schließen, werden Ihre Änderungen verloren gehen."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4215,11 +4274,11 @@
 "Wenn Sie einer Datei einen falschen Dateityp zuweisen, kann diese beim "
 "Transfer beschädigt werden."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Sollten Fehler auftreten, so ist Ihre Konfiguration nicht korrekt."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4236,9 +4295,9 @@
 "Wenn Sie wiederholt Probleme mit einem bestimmten Server haben, könnte der "
 "Server selbst oder der dortige Router oder die Firewall falsch konfiguriert "
 "sein. Versuchen Sie in diesem Fall zum passiven Modus zu wechseln und wenden "
-"Sie sich an den Serveradministrator um Hilfe zu erhalten."
+"Sie sich an den Serveradministrator, um Hilfe zu erhalten."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4247,7 +4306,7 @@
 "Test erfolgreich ist, dann sollten alle Ihre Firewalls und Router korrekt "
 "konfiguriert sein."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4255,7 +4314,7 @@
 "Wenn Sie eine Firewall benutzen, stellen Sie sicher, dass es FileZilla "
 "erlaubt ist, auf allen angegebenen Ports Verbindungen anzunehmen."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4275,7 +4334,7 @@
 msgid "Import data from older version"
 msgstr "Importiere Daten von einer älteren Version"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importeinstellungen"
 
@@ -4289,7 +4348,7 @@
 msgid "Improperly quoted association."
 msgstr "Anführungszeichen bei Zuordnung nicht korrekt gesetzt."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4298,7 +4357,7 @@
 "Verbindungen. Bitte geben Sie an, welche Ports FileZilla hierfür verwenden "
 "darf."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4307,7 +4366,7 @@
 "('port forwarding'), da FileZilla keinen Einfluss darauf hat, welche Ports "
 "vom System zugewiesen werden."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4315,7 +4374,7 @@
 "Wenn Sie Updates lieber automatisch erhalten wollen, dann aktivieren Sie "
 "automatische Updates im Einstellungsdialog."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4323,7 +4382,7 @@
 "Um den aktiven Modus zu benutzen, muss FileZilla Ihre externe IP-Adresse "
 "kennen."
 
-#: resources.h:676
+#: resources.h:697
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
@@ -4333,7 +4392,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:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4341,20 +4400,20 @@
 "Unvollständige Kette; oberstes Zertifikat ist kein selbst-unterzeichnetes "
 "Zertifikat einer Zertifizierungsstelle"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Falsches Passwort"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Initialisiere TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 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:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiv"
@@ -4364,8 +4423,8 @@
 msgstr "Oberfläche"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Unterbrochen durch Benutzer"
 
@@ -4377,14 +4436,14 @@
 msgid "Invalid HTTP Response"
 msgstr "Ungültige HTTP-Rückmeldung"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
 "Ungültige Zeichenfolge empfangen, UTF-8 wird deaktiviert. Wählen Sie UTF-8 "
-"im Servermanager um UTF-8 zu erzwingen."
+"im Servermanager, um UTF-8 zu erzwingen."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
@@ -4401,12 +4460,13 @@
 msgid "Invalid date"
 msgstr "Ungültiges Datum"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Ungültiger Dateiname"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Ungültiger Host; nach der schließenden Klammer dürfen nur Doppelpunkt und "
@@ -4416,28 +4476,35 @@
 msgid "Invalid input"
 msgstr "Ungültige Eingabe"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Ungültiger Port angegeben. Der Port muss zwischen 1 und 65535 liegen."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Ungültiges Protokoll angegeben. Gültige Protokolle sind:\n"
 "ftp:// für normales FTP,\n"
 "sftp:// für das 'SSH File Transfer Protocol',\n"
-"ftps:// für FTP über SSL (implizit) und\n"
-"ftpes:// für FTP über SSL (explizit)."
+"ftps:// für FTP über TLS (implizit) und\n"
+"ftpes:// für FTP über TLS (explizit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Ungültiger regulärer Ausdruck in Suchbedingungen."
 
@@ -4445,7 +4512,7 @@
 msgid "Invalid response code"
 msgstr "Ungültiger Antwortcode"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Ungültige Suchbedingungen: %s"
@@ -4457,92 +4524,96 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ungültiger Pfad für Servereintrag"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ungültige Größe in Bedingung"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Ungültiger Benutzername angegeben."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Staat des Gerichtsstands:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Ort des Gerichtsstands:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Land oder Provinz des Gerichtsstands:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Verzeichnisse immer oben"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"Beachten Sie, dass nicht alle Server dieses Feature unterstützten und "
+"Beachten Sie, dass nicht alle Server dieses Feature unterstützen und "
 "möglicherweise falsche Auflistungen liefern, falls diese Option aktiviert "
-"ist. Obwohl FileZilla einige Tests durchführt um herauszufinden ob der "
+"ist. Obwohl FileZilla einige Tests durchführt, um herauszufinden, ob der "
 "Server das Feature unterstützt, könnten diese fehlschlagen."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Schlüsselaustausch"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Schlüsselaustausch:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Niedri&gste"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Sprache"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Sprache gewechselt"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Zuletzt geändert"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Ansicht"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Maximale gleichzeitige &Downloads:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Maximale gleichzeitige &Uploads:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Lokale Ports beschränken"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Größe der Logdatei beschränken"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limit:"
 
@@ -4550,7 +4621,7 @@
 msgid "Line length exceeded"
 msgstr "Maximale Zeilenlänge überschritten"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Gelinkt gegen"
 
@@ -4559,21 +4630,21 @@
 msgstr "Socket für eingehende Verbindungen geschlossen"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Auflistung:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "&Niedrigster verfügbarer Port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokal"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Lokale Datei"
 
@@ -4589,7 +4660,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Lokale Datei ist kein gültiger Dateiname."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Lokale Filter:"
 
@@ -4597,7 +4668,7 @@
 msgid "Local site:"
 msgstr "Lokal:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Ort:"
 
@@ -4605,16 +4676,16 @@
 msgid "Log file"
 msgstr "Logdatei"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Log der Update-Suche:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Logging"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4623,7 +4694,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:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4631,18 +4702,18 @@
 "Anmeldedaten enthalten nicht-ASCII-konforme Zeichen und der Server "
 "unterstützt möglicherweise kein UTF-8. Versuche lokalen Zeichensatz."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Anmeldevorgang vollständig ausgeführt, jedoch nicht angemeldet. Abbruch."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Kontozugangstyp muss entweder 'ask' oder 'interactive' (ohne die Apostrophe) "
 "sein."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4651,13 +4722,13 @@
 "Kontozugangstyp; kann nur in Verbindung mit einer FTP-URL verwendet werden. "
 "Argument muss entweder '%s' oder '%s' sein."
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Niedrig"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Niedrigste"
 
@@ -4665,11 +4736,11 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Stellen Sie sicher, dass auf die Datei zugegriffen werden kann und dass sie "
@@ -4692,7 +4763,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Falsche Rückmeldung, der Server schickt keine gültigen Zeilenenden"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4703,58 +4774,58 @@
 msgid "Manual transfer"
 msgstr "Manueller Transfer"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Jede der folgenden Bedingungen muss zutreffen"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Mindestens eine der folgenden Bedingungen muss zutreffen"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Keine der folgenden Bedingungen darf zutreffen"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Maximale Anzahl gleichzeitiger Ü&bertragungen:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Nachrichtenprotokoll"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Position des Nachrichtenprotokolls"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minuten"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Nach &unten"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Nach &oben"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Arbeitsplatz"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Eigene Dateien"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Eigene Server"
 
@@ -4763,33 +4834,33 @@
 msgid "N/a"
 msgstr "Nicht verfügbar"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Name"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Name existiert bereits"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Lesezeichenname existiert bereits."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Name:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Filtername muss angegeben werden"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Es muss ein gültiger Server-Pfad eingegeben werden"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Sie müssen einen Zeichensatz angeben"
 
@@ -4797,19 +4868,23 @@
 msgid "Network unreachable"
 msgstr "Netzwerk nicht erreichbar"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Nie"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "N&eues Verzeichnis"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Neuer &Tab"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Neue&s Lesezeichen"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4822,41 +4897,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Neues Lesezeichen"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Neues Verzeichnis"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Neue Features und Verbesserungen in %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Neuer Filter"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Neues Verzeichnis"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Neuer Server"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Neben der Warteschlange"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nein"
 
@@ -4864,25 +4939,25 @@
 msgid "No category to export selected"
 msgstr "Keine Kategorie zum Exportieren ausgewählt"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Kein Befehl angegeben, Abbruch."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Keine externe IP-Adresse angegeben, versuche Standard-Adresse."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Es werden derzeit keine Dateien bearbeitet."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Bitte einen Filternamen angeben"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Kein Server angegeben, bitte Server eingeben."
 
@@ -4890,27 +4965,27 @@
 msgid "No images available"
 msgstr "Keine Bilder verfügbar"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Keine weiteren Dateien in der Warteschlange!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Bitte einen Namen für den Filtersatz angeben."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Keine Programmzuordnung für Dateityp"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Keine Suchergebnisse"
 
@@ -4928,23 +5003,23 @@
 msgid "No username given."
 msgstr "Kein Benutzername angegeben."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Keine"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Noch keiner ausgewählt"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4956,15 +5031,15 @@
 "hinzugefügt werden."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Nicht verbunden"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Derzeit mit keinem Server verbunden"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Derzeit mit keinem Server verbunden."
 
@@ -4972,24 +5047,24 @@
 msgid "Not connected."
 msgstr "Nicht verbunden."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Beachten Sie, dass dieses Feature nur bei Verwendung des FTP-Protokolls "
 "unterstützt wird."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Anmerkung: Dies funktioniert nur mit unverschlüsselten FTP-Verbindungen."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Hinweis: Das Verwenden eines generischen Proxys erzwingt den passiven Modus "
 "für FTP-Verbindungen."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Anzahl der Dezimalstellen:"
 
@@ -4997,21 +5072,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Anzahl der Versuche muss zwischen 0 und 99 liegen."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "&Datei öffnen"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -5020,120 +5095,124 @@
 "Transfermodus und (falls aktiviert) den alternativen Transfermodus im "
 "Fehlerfall festgelegt."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Einmal"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Nur die Version von FileZilla und des Betriebssystems, welches Sie "
-"verwenden, wird an den Server übermittelt."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Jede Woche"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Verzeichnis im System-Dateimanager öffnen"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
-msgstr "Öffnet den Servermanager"
+msgstr "Den Servermanager öffnen"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Den Servermanager öffnen."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Den Servermanager öffnen. Rechtsklick zeigt eine Server-Liste an."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Datei öffnen."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Einstellungsdialog von FileZilla öffnen"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Geöffnet als:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Öffnen fehlgeschlagen"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Öffnet einen neuen Tab"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Öffnet den Servermanager"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Öffnet den Datei-/Verzeichnisfilter-Dialog. Rechtsklick (de)aktiviert die "
 "Filterung."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Betriebssystem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Betriebssystem-Problem festgestellt"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Andere:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Übersicht"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Überschreiben falls &Quelldatei aktueller"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Datei überschreiben"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Datei überschreiben falls Größe unterschiedlich"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Datei überschreiben falls Größe unterschiedlich oder Quelldatei aktueller"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Datei überschreiben falls Quelldatei aktueller"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Überschreiben falls &Größe unterschiedlich"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Überschr&eiben falls Größe unterschiedlich oder Quelldatei aktueller"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Besitzer-Berechtigungen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Besitzer/Gruppe"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5141,7 +5220,7 @@
 "&Verhindern, dass System während Übertragungen usw. in einen automatischen "
 "Schlafmodus geht"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "P&roxy-Server:"
@@ -5150,27 +5229,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-Befehl wurde vom Router oder der Firewall beeinträchtigt."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "&Passiv (empfohlen)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paket"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Parameter keine gültige URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Pass&wort:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passiv (empfohlen)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passiver Modus"
@@ -5185,44 +5264,48 @@
 msgid "Password required"
 msgstr "Passwort benötigt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Pfad"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Pfad nicht gefunden:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Pfade"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Ausstehende Entfernung"
 
 # TODO
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Berechtigung"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Berechtigungen"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5238,16 +5321,16 @@
 "Bitte prüfen Sie auf http://filezilla-project.org/probe.php, ob der Server "
 "läuft und prüfen Sie nochmals sorgfältig Ihre Einstellungen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
-"Bitte überprüfen Sie im Paketmanager Ihres Systems ob ein aktualisiertes "
+"Bitte überprüfen Sie im Paketmanager Ihres Systems, ob ein aktualisiertes "
 "Paket vorhanden ist, oder laden Sie sich den FileZilla-Quellcode unter "
 "http://filezilla-project.org herunter."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5277,7 +5360,7 @@
 msgid "Please enter a custom time format."
 msgstr "Bitte geben Sie ein benutzerdefiniertes Zeitformat ein."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5292,20 +5375,20 @@
 "Bitte tragen Sie für die Begrenzung der Downloadgeschwindigkeit einen Wert "
 "größer oder gleich 0 %s/s ein."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Bitte geben Sie einen Namen für den neuen Filter an."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 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:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Bitte geben Sie einen neuen Namen für den Filtersatz \"%s\" an"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Bitte geben Sie einen neuen Namen für den Filter an."
 
@@ -5332,11 +5415,11 @@
 "Bitte geben Sie eine Zahl zwischen 1 und 10 für die Anzahl gleichzeitiger "
 "Datenübertragungen an."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Bitte geben Sie ein Passwort für diesen Server ein:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5351,14 +5434,14 @@
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
-"Bitte geben Sie ein Timeout zwischen 5 und 9999 Sekunden an, oder 0 um "
+"Bitte geben Sie ein Timeout zwischen 5 und 9999 Sekunden an, oder 0, um "
 "Timeouts zu deaktivieren."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Bitte geben Sie einen eindeutigen Namen für diesen Filtersatz an."
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Bitte geben Sie einen Benutzernamen für diesen Server ein:"
 
@@ -5371,11 +5454,6 @@
 msgstr ""
 "Bitte geben Sie die URL an, von der Ihre externe Adresse bezogen werden soll"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr ""
-"Bitte geben Sie ein Aktualisierungsintervall von mindestens 7 Tagen ein"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5384,7 +5462,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:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5392,14 +5470,18 @@
 "Bitte geben Sie einen FTP-Befehl ein.\n"
 "Die Benutzung eigener FTP-Befehle leert den Verzeichniscache."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Bitte geben Sie den Namen des zu erstellenden Verzeichnisses ein:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Bitte geben Sie den Namen der zu erstellenden Datei ein:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr ""
 "Bitte geben Sie einen Benutzernamen und ein Passwort für diesen Server ein:"
@@ -5420,7 +5502,7 @@
 "Sie die externe Adresse nicht wissen, benutzen Sie bitte die Option 'Externe "
 "Auflösung'."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5437,7 +5519,7 @@
 "Verbindungen aufzubauen und die Adresse des Adressauflösers korrekt "
 "eingegeben ist."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 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 "
@@ -5455,7 +5537,7 @@
 "Weiterleitung ('port forwarding') und verwenden Sie Ihren Router nicht im "
 "sogenannten 'DMZ mode' oder im 'Game mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5463,12 +5545,12 @@
 "discard."
 msgstr ""
 "Bitte beachten Sie, dass FileZilla nicht beeinflussen kann, welchen Port der "
-"Server auswählt. Der Server könnte beispielsweise einen Port auswählen von "
+"Server auswählt. Der Server könnte beispielsweise einen Port auswählen, von "
 "dem Ihre Firewall denkt, dass er von Trojanern oder anderer bösartiger "
 "Software benutzt wird. Sollte dies einen Fehlalarm auslösen, können Sie "
 "diesen ohne weiteres ignorieren."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5477,7 +5559,7 @@
 "Hochladen auf FTP-, FTPS- und FTPES-Server nur funktioniert, wenn diese den "
 "MFMT-Befehl unterstützen."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5485,7 +5567,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."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5494,7 +5576,7 @@
 "Bitte lesen Sie http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "für Einzelheiten"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5513,43 +5595,43 @@
 "funktionierenden Servern auf Probleme stoßen, führen Sie bitte diesen "
 "Assistenten erneut aus."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Bitte wählen Sie eine Aktion aus:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Bitte wählen Sie die Kategorien aus, welche Sie importieren möchten."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr ""
 "Bitte wählen Sie den Transfermodus aus, der standardmäßig benutzt werden "
 "soll."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Bitte wählen Sie die neuen Attribute für das Verzeichnis \"%s\" aus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Bitte wählen Sie die neuen Attribute für die Datei \"%s\" aus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr ""
 "Bitte wählen Sie die neuen Attribute für die ausgewählten Verzeichnisse."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
 "Bitte wählen Sie die neuen Attribute für die ausgewählten Dateien und "
 "Verzeichnisse."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Bitte wählen Sie die neuen Attribute für die ausgewählten Dateien."
 
@@ -5568,7 +5650,7 @@
 "sogenannten 'DMZ mode' oder 'Game mode'. Dinge wie Protokollprüfungen oder "
 "protokollspezifische 'Korrekturen' müssen deaktiviert sein."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5576,8 +5658,8 @@
 "Weitere Informationen über FileZilla erhalten Sie unter http://filezilla-"
 "project.org."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5585,17 +5667,17 @@
 "Die aktuellste FileZilla-Version können Sie auf http://filezilla-project.org "
 "herunterladen."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Postleitzahl:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Vordefinierte Server"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Änderungszeitpunkt der Dateien beibehalten"
 
@@ -5603,49 +5685,61 @@
 msgid "Preview:"
 msgstr "Vorschau:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Das Zertifikat der Datenverbindung stimmt nicht mit dem der Hauptverbindung "
 "überein."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Diagnose-Informationen bezogen auf den FileZilla-Start ausgeben"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Versionsinformationen auf stdout ausgeben und verlassen"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Bevorzuge Verzeichnisse (Standard)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Priorität"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Datenschutzerklärung:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Datenschutzerklärung: Nur die FileZilla-Version, das verwendete "
+"Betriebssystem und die CPU-Architektur werden an den Server übermittelt."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "&Private Schlüssel:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tokoll:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Proxy-Pass&wort:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "&Warteschlange abarbeiten"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Proxy-&Port:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Proxy-Ben&utzer:"
 
@@ -5653,12 +5747,18 @@
 msgid "Proxy authentication failed"
 msgstr "Proxy-Authentifizierung fehlgeschlagen."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Proxy-Handshake fehlgeschlagen: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5674,23 +5774,23 @@
 msgstr ""
 "Proxy-Anfrage fehlgeschlagen: Unbekannter Adresstyp in 'CONNECT'-Antwort"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy wurde eingestellt, aber der Proxyserver oder -port ist ungültig"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Public-Key-Authentifizierung"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algorithmus des öffentlichen Schlüssels:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Öffentliche Berechtigungen"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Warteschlange wurde komplett abgearbeitet"
 
@@ -5709,40 +5809,40 @@
 msgid "Queue: empty"
 msgstr "Warteschlange: leer"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Zu übertragende Dateien"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Warteschlange:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "&System neu starten"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "&Server-Verzeichnisbaum"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr ""
 "A&usgewählte Dateien zurücksetzen und wieder zur Warteschlange hinzufügen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Raw-FTP-Befehl"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "&Lesen"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "A&ktualisieren"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "U&mbenennen"
 
@@ -5754,66 +5854,77 @@
 "Führen Sie den Assistenten erneut aus, prüfen Sie dabei sorgfältig die "
 "Einstellungen und stellen Sie alle Router und Firewalls entsprechend ein."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Lese&n"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Schreibgeschützt"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Aktuelle Operation wirklich abbrechen?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] "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:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Wirklich %d Verzeichnis und dessen Inhalt löschen?"
-msgstr[1] "Wirklich %d Verzeichnisse und deren Inhalt löschen?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Wirklich %d Datei löschen?"
-msgstr[1] "Wirklich %d Dateien löschen?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Wirklich %s und %s löschen?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Wirklich %s und %s vom Server löschen?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr ""
-"Wollen Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse löschen?"
+"Möchten Sie wirklich alle ausgewählten Dateien und/oder Verzeichnisse von "
+"Ihrem Rechner löschen?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Grund"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Jetzt neustarten"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "&Unterverzeichnisse einbeziehen"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 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:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Empfangene Daten fehlerhaft"
 
@@ -5822,15 +5933,15 @@
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
-"Die Wiederverbindungsinformationen können nicht gelöscht werden solange eine "
-"Verbindung zu einem Server besteht.\n"
+"Die Wiederverbindungsinformationen können nicht gelöscht werden, solange "
+"eine Verbindung zu einem Server besteht.\n"
 "Falls Sie fortsetzen, wird Ihre Verbindung unterbrochen."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Wiederverbindungseinstellungen"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Stellt Verbindung mit dem zuletzt benutzten Server wieder her"
 
@@ -5838,34 +5949,38 @@
 msgid "Redirection to invalid address"
 msgstr "Umleitung zu ungültiger Adresse"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Datei- und Verzeichnislisten aktualisieren"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Passwörter speichern?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Server"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Zertifikat des Servers nicht vertrauenswürdig."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Datei auf Server"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Dateisuche auf Server"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Server-Filter:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Server-Pfad"
 
@@ -5880,7 +5995,7 @@
 "unterstützt wird."
 
 # TODO
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5892,7 +6007,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Server-Pfad kann nicht verarbeitet werden. Stellen Sie sicher, dass er ein "
@@ -5902,11 +6017,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Server-Pfad konnte nicht geparst werden."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Verarbeiten des Server-Pfads:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Server-Pfad:"
 
@@ -5914,76 +6029,76 @@
 msgid "Remote site:"
 msgstr "Server:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "&Alle entfernen"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Auswahl &entfernen"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Datei umbenennen"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Ausgewähltes Verzeichnis umbenennen"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Ausgewählte Dateien und Verzeichnisse umbenennen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "'%s' wird in '%s' umbenannt"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Fehler und Verbesserungswünsche mitteilen"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Explizites FTP über TLS erfordern"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Implizites FTP über TLS erfordern"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Alle &Dateien zurücksetzen und wieder zur Warteschlange hinzufügen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Auflösen der IP-Adresse für %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Auflösen des Hostnamens"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Antwort:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Ergebnisse:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Dateiübertragung wiederaufnehmen"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5991,38 +6106,38 @@
 "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:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Empfange Verzeichnisinhalt..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Beziehe externe IP-Adresse von %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Dem Stammzertifikat wird nicht vertraut"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "&Anzeigen der gerade bearbeiteten Dateien..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "&Servermanager bei Programmstart anzeigen"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "S&ystem herunterfahren"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "S&top"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "S&ynchronisierter Verzeichniswechsel"
 
@@ -6030,31 +6145,47 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Einstellungen speichern?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Das Speichern von Passwörtern wurde von Ihnen deaktiviert."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Suche nach Dateien, die zur Warteschlange hinzugefügt werden sollen"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Suche nach Dateien, die hochgeladen werden sollen"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Such&bedingungen:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "&Zu durchsuchendes Verzeichnis:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Rekursiv nach Dateien suchen."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Auf Server nach Dateien suchen"
 
@@ -6067,27 +6198,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Siehe auch: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "&Server auswählen"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "&Seite auswählen:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Design auswählen"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Wählen Sie eine Standardaktion im Umgang mit bereits existierenden Dateien "
 "aus."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Standardeditor auswählen"
 
@@ -6107,7 +6238,7 @@
 "Wählen Sie eine Standardaktion im Umgang mit bereits existierenden Dateien "
 "für die markierten Dateien in der Warteschlange aus."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Bitte das Zielverzeichnis für das herunterzuladende Paket angeben"
 
@@ -6128,14 +6259,14 @@
 msgstr "Wählen Sie die Datei für die exportierten Einstellungen"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Wählen Sie die Datei für die exportierten Server"
 
 #: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr ""
-"Wählen Sie die Datei von welcher die Einstellungen importiert werden sollen."
+"Wählen Sie die Datei, von der die Einstellungen importiert werden sollen."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
@@ -6145,12 +6276,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Dateinamen für die konvertierte Schlüsseldatei auswählen"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Geben Sie an, wie diese Dateien geöffnet werden sollen."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Zielverzeichnis für Download auswählen"
 
@@ -6158,15 +6289,15 @@
 msgid "Select target filename"
 msgstr "Zieldateiname auswählen"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Wählen Sie die zu exportierenden Kategorien:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
-msgstr "Wählen Sie die Einträge welche gelöscht werden sollen:"
+msgstr "Wählen Sie die Einträge, die gelöscht werden sollen:"
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6180,7 +6311,7 @@
 msgstr[0] "%d Verzeichnis ausgewählt."
 msgstr[1] "%d Verzeichnisse ausgewählt."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6201,7 +6332,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "%s und %s für Transfer ausgewählt."
@@ -6216,13 +6347,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s und %s ausgewählt. Gesamtgröße: mindestens %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Der gewählte Editor existiert nicht."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Gewählte Datei wird bereits bearbeitet"
 
@@ -6230,15 +6361,15 @@
 msgid "Selected file is already loaded"
 msgstr "Die gewählte Datei ist bereits geladen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Gewählte Datei ist bereits geöffnet"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Gewählte Datei wird immer noch bearbeitet"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Der ausgewählte Filter funktioniert nur bei lokalen Dateien."
 
@@ -6257,41 +6388,46 @@
 "Warnung: Der gewählte Port wird üblicherweise von einem anderen Protokoll "
 "verwendet."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "&FTP-Verbindungserhaltungs-Befehle senden"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Benutzerdefinierten Befehl, der sonst nicht verfügbar wäre, an den Server "
 "schicken."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Sende Verbindungserhaltungs-Befehl"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Seriennummer:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Server&typ:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Server hat die TLS-Verbindung nicht ordnungsgemäß geschlossen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Der Server unterstützt keine Nicht-ASCII-Zeichen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6300,19 +6436,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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 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:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 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:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6322,7 +6458,7 @@
 "Dateigrößen bis %d GB. Die Übertragung wird beendet, da die Dateigrößen "
 "übereinstimmen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6330,11 +6466,11 @@
 "Der Server benötigt möglicherweise ein Konto. Bitte geben Sie ein Konto im "
 "Servermanager an."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Server gab leeren Pfad zurück."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6342,13 +6478,13 @@
 "Server sendete eine zusätzliche Login-Aufforderung. Sie müssen den Login-Typ "
 "'interaktiv' verwenden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6368,101 +6504,112 @@
 msgid "Server sent unexpected reply."
 msgstr "Server sendete unerwartete Antwort."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Server-zu-Client-MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Server-zu-Client-Chiffre:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Server&typ:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Server/Lokale Datei"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Sitzungsdetails"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "&Priorität setzen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Berechtigungen für '%s' werden auf '%s' gesetzt"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize ohne Socket aufgerufen"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Einstellungen"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "&Unverarbeiteten Verzeichnisinhalt anzeigen"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "&Begrüßungsdialog anzeigen..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Beide Verzeichnisbäume anzeigen und Vergleich fortsetzen?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Zeigt verfügbare TLS-Chiffren an"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Zeigt diesen Hilfe-Dialog an"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Jetzt herunterfahren"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Signaturalgorithmus:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Server&managereinträge"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Servermanager"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Servermanager - Kann Passwort nicht speichern"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Servermanager - Ungültige Daten"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Servermanager bereits geöffnet"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Servereintrag existiert nicht."
 
@@ -6472,8 +6619,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Serverpfad ist ungültig."
 
@@ -6492,11 +6639,11 @@
 "gespeichert ist.\n"
 "Die aktuelle Verbindung in den Servermanager aufnehmen?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Größe"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Größenformatierung"
 
@@ -6505,32 +6652,32 @@
 msgid "Size unknown"
 msgstr "Dateigröße unbekannt"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Datei überspringen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Überspringe Download von %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Überspringe Upload von %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 "Einige Dateien werden immer noch bearbeitet oder müssen hochgeladen werden."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6538,21 +6685,21 @@
 "Falsch konfigurierte Server, die sich hinter einem Router befinden, könnten "
 "mit ihrer lokalen IP-Adresse antworten."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Verzeichnisse einsortieren"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "Die Sortierreihenfolge kann nicht geändert werden, wenn die Verzeichnisse "
 "verglichen werden."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Sortierung"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Sortier&modus:"
 
@@ -6564,20 +6711,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Quell- und Zieldateiname dürfen nicht identisch sein"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Quelle und Ziel der Einfügeoperation sind identisch"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Quelldatei:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Geschwindigkeitsbegrenzungen"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Geschwindigkeitsbegrenzungen"
 
@@ -6592,7 +6739,15 @@
 msgstr ""
 "Geschwindigkeitsbegrenzungen sind aktiviert; klicken Sie, um dies zu ändern."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Stabilen und Beta-Versionen"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Stabilen Versionen"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Transfer s&ofort starten"
 
@@ -6600,43 +6755,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Mit geöffnetem Servermanager starten"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Starte Download von %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Starte Upload von %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Legt den Startpfad für die lokale Ansicht fest"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Land oder Provinz:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "&Anhalten und alle entfernen"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Straße:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Betreff des Zertifikats"
 
@@ -6644,11 +6803,11 @@
 msgid "Successful transfers"
 msgstr "Erfolgreiche Übertragungen"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Zusammenfassung der Testergebnisse:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6656,44 +6815,45 @@
 "Symbolische Verknüpfungen auf Dateien sind von dieser Wahl nicht betroffen - "
 "solche Verknüpfungen werden immer gelöscht."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synchronisierter Verzeichniswechsel"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synchronisierter Verzeichniswechsel wurde deaktiviert."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaxfehler"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Syntaxfehler in der Kommandozeile"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "System"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "&Werkzeugleiste"
 
@@ -6701,11 +6861,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL-Verbindung hergestellt, schicke HTTP-Anfrage"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL-Verbindung hergestellt, warte auf Willkommensnachricht..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL-Verbindung hergestellt."
 
@@ -6713,27 +6873,31 @@
 msgid "TTL expired"
 msgstr "TTL abgelaufen"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Zieldatei existiert bereits"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Zieldatei:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Zieldateiname existiert bereits!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
-msgstr "Zieldatei existiert bereits - trotzdem fortfahren?"
+msgstr "Zieldateiname existiert bereits - trotzdem fortfahren?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Testergebnisse"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Überprüfe, ob der Server das Fortsetzen von Downloads unterstützt."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6753,7 +6917,7 @@
 "geöffnet.\n"
 "Bitte schließen Sie ihn oder die Daten können nicht gelöscht werden."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Das XML-Dokument ist nicht wohlgeformt: %s"
@@ -6764,11 +6928,11 @@
 msgstr "Die eingegebene Adresse lautet: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Das Lesezeichen konnte nicht hinzugefügt werden."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Die Lesezeichen konnten nicht gelöscht werden."
 
@@ -6782,19 +6946,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Die benutzerdefinierte Anmeldesequenz darf nicht leer sein."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Die Datenverbindung konnte nicht hergestellt werden: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Der Standardeditor für Textdateien konnte nicht gefunden werden."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Der Standardeditor für Textdateien ist '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
 "Der angegebene Filtername existiert bereits; wählen Sie bitte einen anderen "
@@ -6815,9 +6984,9 @@
 "Die Datei %s existiert bereits.\n"
 "Bitte geben Sie einen neuen Namen ein:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6835,14 +7004,14 @@
 "Die Datei '%s' konnte nicht geladen werden oder enthält keinen privaten "
 "Schlüssel."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Die Datei '%s' konnte nicht geladen werden."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6851,8 +7020,8 @@
 "Die Datei '%s' konnte nicht geöffnet werden:\n"
 "Auf Ihrem System ist diesem Dateityp kein Programm zugeordnet."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6895,7 +7064,7 @@
 "werden von FileZilla noch nicht unterstützt.\n"
 "Möchten Sie sie in eine nicht geschützte Datei umwandeln?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Die als Standardeditor gewählte Datei existiert nicht."
 
@@ -6931,11 +7100,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Die folgenden Zeichen werden ersetzt: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Folgende Dateien werden im Moment bearbeitet:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Die freie, quelloffene FTP-Lösung"
 
@@ -6943,7 +7112,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Die globalen Lesezeichen konnten nicht gespeichert werden."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6976,15 +7145,15 @@
 "Der niedrigste verfügbare Port darf nicht größer sein als der größte "
 "verfügbare Port."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 ""
-"Die aktuellste Version wurde heruntergeladen. Klicken Sie auf Fertig um "
+"Die aktuellste Version wurde heruntergeladen. Klicken Sie auf Beenden, um "
 "FileZilla zu schließen und die Installation zu starten."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6992,11 +7161,11 @@
 "Die aktuellste Version wurde heruntergeladen. Bitte installieren Sie die "
 "neue Version so, wie Sie diese installiert haben."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Die Warteschlange wird nicht gespeichert werden."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -7011,25 +7180,25 @@
 msgid "The selected categories have been imported."
 msgstr "Die ausgewählten Kategorien wurden importiert."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Die ausgewählte Datei enthält importierbare Daten folgender Kategorien:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Die gewählte Datei wird bereits bearbeitet:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Die gewählte Datei ist bereits in einem anderen Programm geöffnet. Bitte "
 "schließen Sie diese dort."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -7047,7 +7216,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Der Server sendete eine unerwartete oder nicht erkannte Antwort."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Der Server verwendet folgenden Zeichensatz für Dateinamen:"
 
@@ -7056,10 +7225,10 @@
 "The server's certificate is unknown. Please carefully examine the "
 "certificate to make sure the server can be trusted."
 msgstr ""
-"Das Zertifikat des Servers ist unbekannt. Bitte überprüfen Sie es sorgfältig "
-"um sicherzustellen dass Sie dem Server vertrauen können."
+"Das Zertifikat des Servers ist unbekannt. Bitte überprüfen Sie es "
+"sorgfältig, um sicherzustellen, dass Sie dem Server vertrauen können."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -7070,7 +7239,7 @@
 "versuchen eine Verbindung zu einem anderen Computer herzustellen, der "
 "vorgibt, der gewünschte Server zu sein."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -7086,19 +7255,19 @@
 "Die Einstellungen wurden importiert. Sie müssen FileZilla neu starten, damit "
 "alle Einstellungen wirksam werden."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
-"Das System wird in Kürze neu gestartet sofern Sie nicht auf Abbrechen "
+"Das System wird in Kürze neu gestartet, sofern Sie nicht auf Abbrechen "
 "klicken."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
-"Das System wird in Kürze heruntergefahren sofern Sie nicht auf Abbrechen "
+"Das System wird in Kürze heruntergefahren, sofern Sie nicht auf Abbrechen "
 "klicken."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -7106,7 +7275,7 @@
 "Die Zieldatei existiert bereits.\n"
 "Bitte wählen Sie eine Aktion aus."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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 "
@@ -7116,11 +7285,11 @@
 msgid "Themes"
 msgstr "Designs"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Dieser Filtersatz kann nicht entfernt werden."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Dieser Filtersatz kann nicht umbenannt werden."
 
@@ -7132,7 +7301,7 @@
 "Dies bedeutet, dass FileZilla immer noch durch einen Router und/oder eine "
 "Firewall gestört wird."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7140,7 +7309,7 @@
 "Dies funktioniert nur, wenn Sie nicht hinter einem Router sind, ansonsten "
 "würde Ihr System nur die interne Adresse zurückliefern."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7148,25 +7317,25 @@
 "Dieser Assistent wird Ihnen dabei helfen, eventuell vorhandende Router und "
 "Firewalls zu konfigurieren und Ihre Konfiguration zu testen."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Zeitpunkt"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Zeitformat"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "&Zeitüberschreitung nach"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Zeitüberschreitung"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7175,22 +7344,22 @@
 "Zeitzonenabweichungen: Server: %d Sekunden. Lokal: %d Sekunden. Differenz: %"
 "d Sekunden."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7198,7 +7367,7 @@
 "Um die Public-Key-Authentifizierung zu unterstützen, muss FileZilla die zu "
 "verwendenden privaten Schlüssel kennen."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7215,7 +7384,7 @@
 "Grün: Datei ist neuer als die unmarkierte Datei auf der anderen Seite\n"
 "Rot: Dateigrößen unterschiedlich"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7225,23 +7394,23 @@
 "Falls aktiviert, wird beim Navigieren der lokalen Verzeichnishierarchie auch "
 "das Verzeichnis auf dem Server entsprechend gewechselt und umgekehrt."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Abarbeiten der Warteschlange starten/stoppen"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Anzeige des lokalen Verzeichnisbaums an-/ausschalten"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Anzeige des Nachrichtenprotokolls an-/ausschalten"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Anzeige des Server-Verzeichnisbaums an-/ausschalten"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Anzeige der Warteschlange an-/ausschalten"
 
@@ -7254,37 +7423,37 @@
 msgstr "Zu viele Adressumleitungen"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Trace:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Übertragen"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Tra&nsferrichtung"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Transfertyp"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Transfermodus"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Transfer-Warteschlange"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Transfer-Einstellungen"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Transferverbindung unterbrochen: %s"
@@ -7293,8 +7462,8 @@
 msgid "Transferred data got tainted."
 msgstr "Übermittelte Daten waren fehlerhaft."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Wird übertragen"
 
@@ -7302,69 +7471,69 @@
 msgid "Transfers"
 msgstr "Übertragungen"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Übertragungen abgeschlossen"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "&Dateien ohne Endung als ASCII-Dateien behandeln"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "&Folgende Dateitypen als ASCII-Dateien behandeln:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Verändertem Serverschlüssel vertrauen:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Neuem Serverschlüssel vertrauen:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Neuem Schlüssel vertrauen und Verbindung herstellen?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Diesem Zertifikat vertrauen und Verbindung herstellen?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Diesem Server vertrauen und Verbindung herstellen?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Typ"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Typ des FTP-Proxys:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Typ des generischen Proxys:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "&Hochladen"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Begrenzung der U&ploadgeschwindigkeit:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "&Verwende Dateitypzuordnungen falls verfügbar"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Stand&ardeinstellung des Systems verwenden"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "&BENUTZER@SERVER"
 
@@ -7373,16 +7542,16 @@
 msgid "Unassigned error code %d"
 msgstr "Nicht zugewiesener Fehlercode %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Element:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Unbekannt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Unbekannter FTP-Proxy-Typ. Es kann keine Anmeldesequenz erstellt werden."
@@ -7396,7 +7565,7 @@
 msgid "Unknown certificate"
 msgstr "Unbekanntes Zertifikat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7405,7 +7574,7 @@
 "Datei zugegriffen werden kann und dass sie ein wohlgeformtes XML-Dokument "
 "ist."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Unbekannter Server-Schlüssel"
 
@@ -7418,7 +7587,7 @@
 "Unbekannte Version des Protokolls für die SOCKS-Benutzernamen/Passwort-"
 "Authentifizierungs-Unterverhandlung: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7442,7 +7611,7 @@
 "Solange dieses Problem nicht gelöst ist, funktioniert der Aktive Modus "
 "nicht. Stattdessen muss der Passive Modus verwendet werden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Nicht unterstützter Zertifikatstyp"
 
@@ -7450,25 +7619,24 @@
 msgid "Unsupported redirect"
 msgstr "Diese Art der Adressumleitung wird nicht unterstützt"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
-msgstr "H&ochladen und Bearbeiten rückgängig machen"
-
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Suche nach Updates"
+msgstr "H&ochladen und Bearbeiten beenden"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Update-Assistent"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Updates"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Hochladen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Upload fehlgeschlagen"
 
@@ -7481,100 +7649,100 @@
 msgid "Upload limit: none"
 msgstr "Upload-Begrenzung: keine"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Ausgewähltes Verzeichnis hochladen"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Ausgewählte Dateien und Verzeichnisse hochladen"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Soll diese Datei zurück zum Server hochgeladen werden?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Soll diese Datei zum Server hochgeladen werden?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Hochladen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Hochladen und anstehendes Entfernen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
-msgstr "Hochladen und Bearbeiten rückgängig machen"
+msgstr "Hochladen und Bearbeiten beenden"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "&Benutzerdefinierten Zeichensatz verwenden"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "B&enutzerdefinierten Editor verwenden:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "&Standardeditor für Textdateien verwenden"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "S&ynchronisierten Verzeichniswechsel verwenden"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Benutze UTF-8, wenn der Server dies unterstützt. Ansonsten benutze lokalen "
 "Zeichensatz."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Standardaktion verwenden"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Unverschlüsseltes FTP verwenden"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Server der aktuellen Verbindung verwenden"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Server aus Servermanager verwenden"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Stan&dardeinstellung des Systems verwenden"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Folgende IP-Adresse benutzen:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Folgenden Port-Bereich nutzen:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Benutze stattdessen die externe IP-Adresse des Servers."
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Benutzen Sie diese Option, wenn Sie hinter einem Router sind und eine feste "
 "IP-Adresse haben."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7585,85 +7753,85 @@
 "erstmals den aktiven Modus benutzen. Dabei wird die Versionsnummer von "
 "FileZilla an den Server übermittelt."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Benutzer:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Benutzername kann nicht nur aus Leerzeichen bestehen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Benutze Proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Die Verwendung eines falschen Zeichensatzes kann zur falschen Darstellung "
 "von Dateinamen führen."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "Mit diesem Assistenten können Sie nach Updates für FileZilla suchen."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Gültig ab:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Gültig bis:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Ausführliche wxWidgets-Logmeldungen"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Überprüfe Zertifikat..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Version:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Sehr hoch"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 "Anzeige versteckter Dateien aktiviert, aber vom Server nicht unterstützt"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Ansehen/Bearbeiten"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Sichtbare Spalten"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "S&chreiben"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Warte"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Warten auf Browsing-Verbindung"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Warten auf Passworteingabe"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Warte auf Abbruch der Übertragung"
 
@@ -7671,7 +7839,7 @@
 msgid "Waiting to retry..."
 msgstr "Nächsten Versuch abwarten..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7701,11 +7869,11 @@
 "Gateway-Dienst deaktiviert wird,\n"
 "bricht FileZilla bei großen Übertragungen ab."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Warnung, eine Datenverbindung von einer falschen IP wird ignoriert."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7713,31 +7881,39 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"Warnung, Sie verwenden Entwicklerversionen (Nightly Builds) auf eigene "
-"Gefahr.\n"
+"Warnung, Sie verwenden Nightly Builds auf eigene Gefahr.\n"
 "Es gibt keinerlei Unterstützung für Nightly Builds.\n"
 "Nightly Builds können eventuell nicht wie erwartet funktionieren und könnten "
 "sogar Ihr System beschädigen.\n"
 "\n"
 "Wollen Sie wirklich nach Nightly Builds suchen?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Warnung: Mögliche Sicherheitslücke!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Willkommen bei FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Neuerungen"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Neuerungen:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Wenn Sie FileZilla das Speichern von Passwörtern erlauben, können Sie "
+"Verbindungen auch nach dem Neustarten von FileZilla ohne erneute "
+"Passworteingabe wiederherstellen."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7745,11 +7921,15 @@
 "Wenn aktiviert, werden Zeichen, die vom lokalen Betriebssystem in Dateinamen "
 "nicht unterstützt werden, beim Download ersetzt."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Breitbild"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Soll FileZilla Passwörter speichern?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Sc&hreiben"
 
@@ -7762,11 +7942,19 @@
 msgid "Wrong line endings"
 msgstr "Falsche Zeilenenden"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ja"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Sie verwenden anscheinend einen Nur-IPv6-Host. Diese Umgebung wird von "
+"diesem Assistenten nicht unterstützt."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7774,16 +7962,16 @@
 "Sie verwenden bereits die neueste Version von FileZilla. Bitte versuchen Sie "
 "es zu einem späteren Zeitpunkt erneut."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Sie können diesen Dialog auch über das Hilfe-Menü öffnen."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Sie können das Port-Feld leer lassen, um den Standard-Port zu verwenden."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7793,7 +7981,7 @@
 #: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr ""
-"Sie können keine Einstellungen aus dem Verzeichnis importieren in welchem "
+"Sie können keine Einstellungen aus dem Verzeichnis importieren, in dem "
 "FileZilla die eigenen Einstellungen speichert."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
@@ -7810,20 +7998,20 @@
 "Sie haben keinen neuen Namen für die Datei angegeben. Die Datei stattdessen "
 "überschreiben?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Sie haben mindestens eine symbolische Verknüpfung ausgewählt."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
-"Sie haben mehr als 10 Dateien zum Editieren ausgewählt; möchten Sie wirklich "
-"fortfahren?"
+"Sie haben mehr als 10 Dateien zum Bearbeiten ausgewählt; möchten Sie "
+"wirklich fortfahren?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7832,11 +8020,11 @@
 "möchten Sie wirklich fortfahren?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Sie müssen einen Servernamen angeben."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Sie müssen ein lokales Verzeichnis angeben."
 
@@ -7845,17 +8033,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Sie müssen eine gültige IP-Adresse eingeben."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Sie müssen ein beschreibbares lokales Verzeichnis angeben."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Sie müssen einen Kontonamen angeben."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Sie müssen einen Benutzernamen angeben."
 
@@ -7875,23 +8063,23 @@
 msgid "You need to enter a name for the log file."
 msgstr "Sie müssen einen Namen für die Logdatei angeben."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr ""
 "Sie müssen einen korrekt mit Anführungszeichen versehenen Befehl eingeben."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Sie müssen einen Proxy-Servernamen angeben."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Sie müssen einen Proxy-Port im Bereich von 1 bis 65535 angeben"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Sie müssen mindestens einen Pfad angeben; leere Lesezeichen werden nicht "
@@ -7899,7 +8087,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7907,7 +8095,7 @@
 "Sie müssen sowohl einen lokalen Pfad als auch einen Serverpfad angeben, um "
 "den synchronisierten Verzeichniswechsel für dieses Lesezeichen zu aktivieren."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7939,44 +8127,49 @@
 "Sie sollten keine Probleme haben, eine Verbindung zu anderen Servern "
 "herzustellen, Dateiübertragungen sollten richtig funktionieren."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "nach"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "vor"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "beginnt mit"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "Bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "enthält"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "enthält nicht"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "ist nicht gleich"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "hört auf mit"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "ist gleich"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "Datei"
 
@@ -7995,81 +8188,81 @@
 "Bitte stellen Sie sicher, dass sich diese ausführbare Datei im gleichen "
 "Verzeichnis wie das FileZilla-Hauptprogramm befindet."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp konnte nicht gestartet werden"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers gab keine Zertifikate zurück"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "größer als"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "'group executable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "'group readable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "'group writeable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "ist gleich"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "ist gesetzt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "ist nicht gesetzt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "kleiner als"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "entspricht regulärem Ausdruck"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "'owner executable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "'owner readable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "'owner writeable'"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "unbekannt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "'world executable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "'world readable'"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "'world writeable'"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
-
-#~ msgid "Duplicate filter name"
-#~ msgstr "Filtername schon vorhanden"
diff -Nru filezilla-3.5.3/locales/el.po filezilla-3.7.3~precise/locales/el.po
--- filezilla-3.5.3/locales/el.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/el.po	2013-06-18 20:02:24.000000000 +0000
@@ -5,32 +5,31 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: FileZilla Client 3.5.2\n"
+"Project-Id-Version: FileZilla Client 3.7.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-02 07:07+0200\n"
-"Last-Translator: Stamatis H. Stamatellos <ydatografida@gmail.com>\n"
-"Language-Team: Ydatografida <ydatografida@gmail.com>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-12 18:42+0200\n"
+"Last-Translator: Ydatografida <ydatografida@gmail.com>\n"
+"Language-Team: Stamatis H. Stamatellos <ydatografida@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Greek\n"
-"X-Poedit-Country: GREECE\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: el_GR\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S πέρασαν"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S απομένουν"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -48,9 +47,9 @@
 msgstr[0] "%d φάκελος"
 msgstr[1] "%d φάκελοι"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -59,9 +58,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -82,7 +81,7 @@
 msgstr[0] "%d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s"
 msgstr[1] "%d αρχεία. Συνολικό μέγεθος: Τουλάχιστον %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d αρχεία προστέθηκαν στη λίστα αναμονής"
@@ -94,31 +93,21 @@
 msgstr[0] "%d δευτερόλεπτο"
 msgstr[1] "%d δευτερόλεπτα"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Κόμβος"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Κωδικός πρόσβασης"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -133,7 +122,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Δεν είναι ακόμα έγκυρο!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Διαμεσολαβητής χρήστη"
@@ -155,27 +144,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -190,7 +169,7 @@
 "Παρακαλώ, κάντε ξανά λήψη του FileZilla. Εάν το πρόβλημα παραμένει να "
 "αποστείλετε αναφορά σφάλματος."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -211,153 +190,149 @@
 msgid "%s with %d bits"
 msgstr "%s με %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Όνομα χρήστη"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Κωδικός πρόσβασης διαμεσολαβητή"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Μνεία..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Λογαριασμός:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Ενεργητική"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Προσθήκη σελιδοδείκτη..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Προσθήκη αρχείων στη λίστα αναμονής"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Προσθήκη του αρχείου-κλειδιού..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Προσθήκη στη λίστα αναμονής"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Ρύθμιση της απόκλισης χρονικής ζώνης του εξυπηρετητή:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Πάντα να εμπιστέυεσαι τα πιστοποιητικά στις μελλοντικές συνεδρίες."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
 "&Πάντα να εμπιστεύεσαι αυτό τον κόμβο, πρόσθεσε αυτό το κλειδί στην μνήμη"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Χρήση πάντα του προκαθορισμένου επεξεργαστή"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Πάντα κατόπιν επιλογής για όλα τα μη συσχετιζόμενα αρχεία"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Να γίνεται πάντα χρήση αυτής της ενέργειας"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Ερώτηση στο λειτουργικό σας σύστημα για την εξωτερική διεύθυνση IP"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Αυτόματος"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Αυτόματος εντοπισμός"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Δυαδικός"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Σύμβολα SI στα δυαδικά προθέματα. (π.χ. 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Σελιδοδείκτες"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Περιήγηση..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Ανοχή &φορτίου:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Άκυρο"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Έλεγχος για beta εκδόσεις του FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Καθαρισμός των προσωπικών δεδομένων..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Κλείσιμο του FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Ρύθμιση ορίων ταχυτήτας..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Ρύθμιση..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Σύνδεση"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Αντιγραφή"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Αντιγραφή τρέχουσας σύνδεσης στο διαχειριστή τοποθεσιών..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Αντιγραφή στο πρόχειρο"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Κατάρρευση"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Δημιουργία φακέλου"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Δημιουργία νέας καρτέλας"
 
@@ -365,652 +340,660 @@
 msgid "&Debug"
 msgstr "&Αποσφαλμάτωση"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Πληροφορίες αποσφαλμάτωσης στο αρχείο συμβάντων:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Προκαθορισμένος επεξεργαστής:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Προεπιλογή ενέργειας υπάρχοντος αρχείου..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Καθυστέρηση μεταξύ αποτυχημένων προσπαθειών σύνδεσης:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Διαγραφή"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Διαγραφή συμβολικής σύνδεσης"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Σύγκριση φακέλων"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
 "&Απόρριψη τοπικού αρχείου κατόπιν της εκ νέου λήψης και επεξεργασίας του."
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Αποσύνδεση"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Αποσύνδεση από τον εξυπηρετητή"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "& Προβολή της στιγμιαίας ταχύτητας μεταφοράς αντί για της μέσης ταχύτητας"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Εμφάνιση του μεγέθους σε bytes"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Να μην αποθηκεύονται οι κωδικοί πρόσβασης"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Να μην εμφανιστεί ξανά αυτό το παράθυρο."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Να μη γίνεται χρήση εξωτερικής διεύθυνσης IP στις τοπικές συνδέσεις."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "&Διπλό-κλικ ως ενέργεια στα αρχεία:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Λήψη"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Λήψη στο:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Λήψη..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Ληφθέντα:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Επεξεργασία"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Επεξεργασία κανόνων φίλτρου..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Ενεργοποίηση"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Ενεργοποίηση αυτόματου ελέγχου αναβαθμίσεων"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Ενεργοποίηση ορίων ταχύτητας"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Κωδικοποίηση:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Κρυπτογράφηση:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Εισαγωγή προσαρμοσμένης εντολής..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Εκτέλεση"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Εξαγωγή των εγγραφών από το διαχειριστή τοποθεσιών"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Εξαγωγή..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Επιστροφή σε ενεργητική κατάσταση"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Αρχείο"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Ιδιότητες αρχείου..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Δικαιώματα αρχείου..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Αρχείο:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Όροι φίλτρου:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Oρίσματα φίλτρου:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Φίλτρα:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Ολοκλήρωση"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Ολοκλήρωση επεξεργασίας και διαγραφή τοπικού αρχείου"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "&Ισοπέδωση των απομακρυσμένων διαδρομών, λήψη απευθείας στο φάκελο προορισμού"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 "&Η ακόλουθη συμβολική σύνδεση, διαγράφει τα περιεχόμενα του φακέλου "
 "προορισμού"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Λήψη εξωτερικής διεύθυνσης IP από την ακόλουθη URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Λήψη βοήθειας..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Καθολικός σελιδοδείκτης"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 μέθοδος σύνδεσης"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Βοήθεια"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Απόκρυψη ομοιότυπων αρχείων"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Μέγιστη"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Μέγιστη διαθέσιμη θύρα:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Κόμβος:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC δυαδικά προθέματα (π.χ. 1 KiB = 1024 bytes)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (παράδειγμα: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Εισαγωγή..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Οικειοποίηση των συσχετίσεων από το σύστημα"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Διατήρηση δομής της απομακρυσμένης διαδρομής"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Διάταξη αρχείων και πλαίσια φακέλων:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Όριο στις τοπικές θύρες που χρησιμοποιούνται από το FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Όριο στον αριθμό των συνεχόμενων συνδέσεων"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Δομή τοπικών φακέλων"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Τοπικός φάκελος:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Συμβάντα στο αρχείο"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Τύπος σύνδεσης:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Τύπος σύνδεσης:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Χαμηλή"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Διαχειριστής σελιδοδεικτών..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Χειροκίνητη μεταφορά..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Μέγιστος αριθμός συνδέσεων:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Μέγιστος αριθμός προσπαθειών:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Αρχείο συμβάντων"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Ελαχιστοποίηση στην περιοχή ειδοποιήσεων"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Όνομα:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Οδηγός ρύθμισης δικτύου..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Νέο"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Νέα τοποθεσία"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Διαθέσιμη νέα έκδοση!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Επόμενο >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Όχι"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Τίποτα"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
-msgstr "&Κανονική"
-
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Αριθμός ημερών ανάμεσα στους ελέγχους αναβαθμίσεων:"
+msgstr "&Τυπικός"
 
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Αριθμητική τιμή:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&ΑΝΟΙΓΜΑ"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Άνοιγμα"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Αντικατάσταση"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Παθητική"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Κωδικός πρόσβασης:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Αναπαραγωγή ήχου"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Θύρα:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Θέση του αρχείου συμβάντων:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Διατήρηση των χρονικών σφραγίδων στα αρχεία που μεταφέρθηκαν"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Λίστα αναμονής"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Γρήγορη σύνδεση"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Γραμμή γρήγορης σύνδεσης"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Ανάγνωση"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Επανασύνδεση"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Ανανέωση"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Απομνημόνευση κωδικού πρόσβασης γι' αυτήν τη συνεδρία"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Απομνημόνευση κωδικών πρόσβασης"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Απομακρυσμένος φάκελος:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Απομακρυσμένη διαδρομή:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Αφαίρεση"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Αφαίρεση κλειδιού"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Διαγραφή επιλεγμένου"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Μετονομασία"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Μετονομασία..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Επανάληψη ανοίγματος τοπικού αρχείου"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Αντικατάσταση των μη έγκυρων χαρακτήρων με:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Αναφορά σφάλματος..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Επαναφορά και επανατοποθέτηση όλων"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Επανεκκίνηση οδηγού"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Συνέχιση"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Εκτέλεση εντολής..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Εκτέλεση οδηγού ρύθμισης τώρα..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Εκτέλεση ελέγχου αναβαθμίσεων τώρα..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&ΤΟΠΟΘΕΣΙΑ"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Αποθήκευση ως..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Αναζήτηση"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Αναζήτηση απομακρυσμένων αρχείων..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Επιλογή εγγραφής:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Επιλογή γλώσσας:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Επιλέξτε τις στήλες που θα εμφανίζονται:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Εξυπηρετητής"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Ρυθμίσεις"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Ρυθμίσεις..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Εμφάνιση του μενού αποσφαλμάτωσης"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Εμφάνιση μηνύματος"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Ενεργοποίηση καταγραφής ώρας στο αρχείο συμβάντων"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Διαχειριστής τοποθεσιών..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Ειδικός σελιδοδείκτης"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Παράκαμψη"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Όρια ταχυτήτων"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Επείγουσα &έναρξη μεταφοράς"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Εναλλαγή τοπικών και απομακρυσμένων πλαισίων"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS Αλγόριθμοι Κρυπτογράφησης"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Δοκιμή"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Θέμα:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Μεταφορά"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Κατάσταση μεταφοράς:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Λίστα αναμονής"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Χειρισμός των παρακάτω τύπων αρχείων ως ASCII αρχεία"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Αναίρεση"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Ανανέωση του αποθηκευμένου κλειδιού γι' αυτόν το κόμβο"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Αποστολή"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Απεσταλμένα:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Χρήση προσαρμοσμένης εφαρμογής"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Χρήση συγχρονισμένης περιήγησης"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Χρήση του προκαθορισμένου από το σύστημα επεξεργαστή αρχείων κειμένων"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Χρησή της ακόλουθης διεύθυνσης IP:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr ""
 "&Να γίνεται χρήση της εξωτερικής διεύθυνσης IP του εξυπηρετητή αντ' αυτής"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Χρήση διαχωριστικού χιλιάδων"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Χρήστης:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Όνομα χρήστη:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Έκδοση %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Προβολή"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Προβολή/Επεξεργασία"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Προβολή των τροποποιημένων τοπικών αρχείων και υπόμνηση για την αποστολή "
 "των τροποποιήσεων"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "Κατά τον έλεγχο ενημερώσεων, ελέγξτε:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Εγγραφή"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Ναι"
 
@@ -1028,12 +1011,29 @@
 msgstr "'%s' δεν είναι φάκελος."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
-"Ο τύπος σύνδεσης 'Λογαριασμός' δεν υποστηρίζεται από το επιλεγμένο πρωτόκολλο"
+"Ο τύπος σύνδεσης 'Λογαριασμός ' δεν υποστηρίζεται από το επιλεγμένο "
+"πρωτόκολλο"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Οι τύποι σύνδεσης 'Τυπικός' και 'Λογαριασμός' δεν είναι διαθέσιμοι, αντ "
+"'αυτών χρησιμοποιήστε ερώτημα 'Να ζητηθεί κωδικός πρόσβασης'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Οι τύποι σύνδεσης 'Τυπικός' και 'Λογαριασμός' δεν είναι διαθέσιμοι. Η "
+"καταχώρησή σας έχει αλλάξει σε 'Να ζητηθεί κωδικός πρόσβασης'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1051,121 +1051,117 @@
 msgstr[0] "(%d αντικείμενο που φιλτραρίστηκε)"
 msgstr[1] "(%d αντικείμενα που φιλτραρίστηκαν)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(χωρίς όριο το 0)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 δευτερόλεπτα)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 για απενεργοποίηση)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Τουλάχιστον 7 ημέρες)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(παράδειγμα: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(παράδειγμα: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(σε %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S απομένουν"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- απομένουν"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr ""
 "- Προβληματικός δρομολογητής (router) και/ή τοίχος προστασίας (firewall)"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Κατεστραμμένο αρχείο"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Κακόβουλο λογισμικό στο σύστημά σας"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- απομένουν"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c δε μπορεί να χρησιμοποιηθεί συγχρόνως με μία διεύθυνση FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-το l μπορεί να χρησιμοποιηθεί συγχρόνως με μόνο μία διεύθυνση FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s και -c δε μπορούν να είναι συγχρόνως παρών."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s δε μπορεί να χρησιμοποιηθεί συγχρόνως με μία διεύθυνση FTP."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Καμία"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Προειδοποιήσεις"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Πληροφορίες"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Αναλυτικές"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 bit σύστημα"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Αποσφαλματώσεις"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 bit σύστημα"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Προηγούμενο"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr ";"
 
@@ -1175,16 +1171,17 @@
 msgstr ""
 "Το όνομα σελιδοδείκτη υπάρχει ήδη. Παρακαλώ, καταχωρίστε ένα νέο όνομα."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Πρέπει να οριστεί ένας προκαθοριμένος επεξεργαστής."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Ο φάκελος δε μπορεί να συρθεί μέσα σε έναν από τους υποφακέλους του."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1195,11 +1192,11 @@
 "ενεργητική κατάσταση, το FileZilla ανοίγει μια θύρα και ζητά από τον "
 "εξυπηρετητή να συνδεθεί σε αυτή."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Το αρχείο που ανοίχτηκε νωρίτερα έχει αλλάξει."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2066
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
@@ -1207,19 +1204,19 @@
 "Ένα αρχείο με αυτό το όνομα επεξεργάζεται ήδη. Να ανοιχθεί ξανά το αρχείο '%"
 "s';"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Ένα αρχείο με αυτό το όνομα έχει ήδη μεταφερθεί."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Ένα αρχείο με αυτό το όνομα ακόμα επεξεργάζεται. Παρακαλώ, κλείστε το και "
 "προσπαθήστε ξανά."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1233,11 +1230,11 @@
 "Αν δε διορθωθεί το πρόβλημα, πιθανόν να λείπουν αρχεία από τις λίστες.\n"
 "Καμία άλλη προειδοποίηση δε θα εμφανιστεί σε αυτή τη σύνοδο."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Μία νέα έκδοση του FileZilla είναι διαθέσιμη:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1247,7 +1244,7 @@
 "Χρησιμοποιήστε αυτή την επιλογή για να εξαναγκαστεί ο εξυπηρετητής να "
 "εμφανίσει όλα τα αρχεία."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1265,15 +1262,15 @@
 "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του "
 "τοπικού φακέλου;"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "Π&ροσθήκη"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "Να είναι επιτρεπτή η συνέχιση της μεταφοράς των αρχείων ASCII"
 
@@ -1285,56 +1282,56 @@
 msgid "A&pply only to uploads"
 msgstr "Ε&φαρμογή μόνο στα αρχεία που είναι προς αποστολή"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "Ε&φαρμογή σε όλα τα αρχεία και τους φακέλους"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Α&υτόματη απομάκρυνση των επιτυχημένων μεταφορών"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr ""
 "Διακοπή της προηγούμενης σύνδεσης και συνδέση σύμφωνα με τη τρέχουσα καρτέλα"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Μνεία για το FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Πιο πάνω από τις λίστες αρχείων"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Λογαριασμός"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Ενέργεια έπειτα από τη &συμπλήρωση της λίστας αναμονής"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Ενέργεια στο επιλεγμένο αρχείο:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Ενέργεια προς εκτέλεση:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Ενέργεια:"
 
@@ -1369,24 +1366,24 @@
 "σωστή εξωτερική διεύθυνση IP, αλλά ο δρομολογητής (router) ή το τοίχος "
 "προστασίας (firewall), άλλαξε την διεύθυνση του παραλήπτη."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP ενεργητικής κατάστασης"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "Προσθήκη αρχείων στη &λίστα αναμονής"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Προσθήκη του επιλεγμένου φακέλου στη λίστα αναμονής για μεταφορά"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr ""
 "Προσθήκη των επιλεγμένων αρχείων και φακέλων στη λίστα αναμονής για μεταφορά"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Προσθήκη στη λίστα αναμονής"
 
@@ -1394,46 +1391,60 @@
 msgid "Address type not supported"
 msgstr "Μη υποστηριζόμενος τύπος διεύθυνσης"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Για προχωρημένους"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Επιλογές για προχωρημένους:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Συμβουλή: Οι Beta εκδόσεις και οι Νυχτερινές εκδόσεις είναι δοκιμαστικές "
+"εκδόσεις που προορίζονται για σκοπούς έλεγχου των νέων χαρακτηριστικών του "
+"FileZilla. Οι Νυχτερινές εκδόσεις του FileZilla ενδέχεται να μη λειτουργούν "
+"όπως αναμένεται και μπορεί να βλάψουν ακόμη και το σύστημά σας. "
+"Χρησιμοποιείτε τις παραπάνω δοκιμαστικές εκδόσεις με δική σας ευθύνη."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Αλγόριθμος:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Οι μεταφορά όλων των αρχείων ολοκληρώθηκε επιτυχώς"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Όλες οι θύρες που θα δωθούν πρέπει να είναι μεταξύ 1024 και 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Όλες οι μεταφορές ολοκληρώθηκαν. %d αρχείο δεν μεταφέρθηκε."
 msgstr[1] "Όλες οι μεταφορές ολοκληρώθηκαν. %d αρχεία δεν μεταφέρθηκαν."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Επιτρέπεται η &επιστροφή σε άλλη μέθοδο μεταφοράς κατά την αποτυχία"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Επιτρεπτή η επιστροφή σε άλλες καταστάσεις μεταφοράς κατά την αποτυχία"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Συνδέθηκε ήδη"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1441,7 +1452,7 @@
 "Εναλλακτικά, μπορείτε να χρησιμοποιήσετε το εργαλείο Pageant από το PuTTY "
 "για να διαχειριστείτε τα κλειδιά σας, το FileZilla αναγνωρίζει το Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1449,7 +1460,7 @@
 "Εναλλακτικά, μπορείτε να χρησιμοποιήσετε το αναγνωριστικό SSH του συστήματος "
 "σας. Βεβαιωθείτε ότι οι μεταβλητές περιβάλλοντος SSH_AUTH_SOCK έχουν οριστεί."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1457,7 +1468,7 @@
 "Εναλλακτικά, επισκευθείτε την τοποθεσία http://filezilla-project.org για να "
 "αποκτήσετε την πιο πρόσφατη έκδοση."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1466,7 +1477,7 @@
 "Προέκυψε σφάλμα κατά τη φόρτωση της Λίστας μεταφοράς από το \"%s\".\n"
 "Ορισμένα αντικείμενα ίσως δεν έχουν ανακτηθεί."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1475,36 +1486,36 @@
 "Προέκυψε σφάλμα κατά την αποθήκευση της Λίστας μεταφοράς από το \"%s\".\n"
 "Ορισμένα αντικείμενα ίσως δεν έχουν αποθηκευθεί."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Ένα αντικείμενο με το ίδιο όνομα υπάρχει ήδη στη τοποθεσία προορισμού."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonymous"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Μία άλλη απομακρυσμένη λειτουργία βρίσκεται ήδη σε εξέλιξη, αδυναμία "
 "τροποποίησης του φακέλου."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "Οι οποιεσδήποτε αλλαγές στο διαχειριστή τοποθεσιών δε μπορούν να "
 "αποθηκευτούν."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1512,58 +1523,58 @@
 "Οποιαδήποτε αλλαγή γίνει στο διαχειριστή τοποθεσιών δε θα αποθηκευτεί, εκτός "
 "αν επισκευάσετε το αρχείο."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Οι οποιεσδήποτε αλλαγές στα φίλτρα δε μπορούν να αποθηκευτούν."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Οποιαδήποτε αλλαγή γίνει στα φίλτρα δε θα αποθηκευτεί."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Εφα&ρμογή μόνο στους φακέλους"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Εφαρμογή"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Εφαρμογή μόνο στην &τρέχουσα λίστα αναμονής"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Εφαρμογή στα &αρχεία μόνο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Αρχείο"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Ως ετικέττα στο πλακίδιο της λίστας αναμονής μεταφορών"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Ερώτηση για ενέργεια"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Αίτημα για κωδικό πρόσβασης"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Ερώτηση στο λειτουργικό σύστημα για μία θύρα."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Ερώτηση στο λειτουργικό σας σύστημα για την εξωτερική διεύθυνση IP"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Απαντήσεις ερωτημάτων στα FileZilla forums"
 
@@ -1571,39 +1582,35 @@
 msgid "Associated program not found:"
 msgstr "Δε βρέθηκε το συσχετιζόμενο πρόγραμμα:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Τουλάχιστον μία συνθήκη φίλτρου είναι ημιτελής"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Σε αυτό το σημείο, όλες οι απαραίτητες πληροφορίες έχουν συγκεντρωθεί."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Ιδιότητα"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Αποτυχία πιστοποίησης."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Συγγραφέας:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Αυτόματος"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Αυτόματη ταξινόμηση τύπων αρχείων"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Αυτόματος έλεγχος αναβαθμίσεων"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Διαθέσιμα μεγέθη"
 
@@ -1612,66 +1619,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "&Παράκαμψη διαμεσολαβητή"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Βασικές οδηγίες χρήσης"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Συμπεριφορά"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Επεξεργάστηκε"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Σημείο αναφοράς συνένωσης συμβολοσειράς"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Προσοχή! Το πιστοποιητικό έχει ανακληθεί"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Δυαδικός"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Μαυροπίνακα"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Σελιδοδείκτης"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Σελιδοδείκτης:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Σελιδοδείκτες"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Ημερομηνία κατασκευής:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Πληροφορίες κατασκευής"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Κατηγορία επιχείρισης:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1682,63 +1689,63 @@
 "FileZilla σε ένα μικρότερο εύρος θυρών, παρακαλώ καταχωρίστε το εύρος θυρών "
 "παρακάτω."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "&Ακύρωση τρέχουσας λειτουργίας"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Έ&λεγχος για τα nightly builds του FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "Κ&αθαρισμός όλων"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Αντιγραφή των URLs στο πρόχειρο"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "Π&ροσαρμογή"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Π&ροσαρμοσμένες συσχετίσεις:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Υπολογισμός απόκλισης χρονικής ζώνης από τον εξυπηρετητή..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Αδύνατη η ανάγνωση από το αρχείο"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Αδύνατη η εγγραφή δεδομένων στο αρχείο."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Αδύνατη η εγγραφή δεδομένων στο αρχείο: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Άκυρο"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Ακύρωση τρέχουσας λειτουργίας"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Ακυρώνει την τρέχουσα λειτουργία"
 
@@ -1748,11 +1755,11 @@
 msgstr ""
 "Αδύνατη η πρόσβαση στο '%s', δεν υπάρχει μέσο ή ο οδηγός δεν είναι έτοιμος."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Αδυναμία προσθήκης του εξυπηρετητή στο διαχειριστή τοποθεσιών"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1768,32 +1775,32 @@
 "Αδυναμία σύγκρισης φακέλων, λόγω ενεργοποίησης διαφορετικών φίλτρων στους "
 "τοπικούς και στους απομακρυσμένους φακέλους."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr ""
 "Αδύνατη η σύγκριση των φακέλων, δεν υπάρχει σύνδεση με τον εξυπηρετητή."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Αδυναμία δημιουργίας νέου φίλτρου"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Αδύνατη η επεξεργασία του αρχείου"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr ""
 "Αδύνατη η επεξεργασία του αρχείου, δεν υπάρχει σύνδεση με τον εξυπηρετητή."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Αδύνατη η επεξεργασία του αρχείου, άγνωστη απομακρυσμένη διαδρομή."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1801,8 +1808,8 @@
 "Δε μπορεί να εδραιώθεί σύνδεση FTP σε έναν εξυπηρετητή SFTP. Παρακαλώ, "
 "επιλέξτε το κατάλληλο πρωτόκολλο."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Αδυναμία φόρτωσης γραμμής γρήγορης σύνδεσης από το αρχείο resource"
 
@@ -1814,44 +1821,48 @@
 msgid "Cannot load keyfile"
 msgstr "Αδυναμία φόρτωσης του αρχείου-κλειδιού"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Αδυναμία φόρτωσης γραμμής εργαλείων από το αρχείο resource"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Να μην αποθηκεύονται οι κωδικοί πρόσβασης"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Δε μπορεί να μετονομαστεί η είσοδος"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Το αρχείο δε μπορεί να μετονομαστεί"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Αδυναμία αποθήκευσης των ορισμάτων φίλτρου"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Αδυναμία επιλογής φίλτρου"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Δεν έχει ορισθεί συσχετιζόμενο αρχείο"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Ο διάλογος δε μπορεί να εμφανιστεί"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Το επιλεγμένο αρχείο δε μπορεί να προβληθεί/επεξεργαστεί"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Κατηγορίες"
 
@@ -1859,61 +1870,61 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Το πιστοποιητικό και τα δεδομένα συνεδρίας δεν είναι διαθέσιμα."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Λεπτομέρειες πιστοποιητικού"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Πιστοποιητικό σε αλληλουχία:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Εκδότης Πιστοποιητικών:"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Πρόκληση:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Αλλαγή ιδιοτήτων αρχείου"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Αλλαγή δικαιωμάτων αρχείου"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Για την εφαρμογή των αλλαγών στο αρχείο συμβάντων απαιτείται η επανεκκίνηση "
 "του FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Θέμα κωδικοποίησης χαρακτήρων"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Κωδικοποίηση χαρακτήρων"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Έλεγχος για δοκιμαστικές εκδόσεις (&beta) του FileZilla"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Έλεγχος για &αναβαθμίσεις..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Έλεγχος για &ενημερώσεις FileZilla αυτόματα:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Έλεγχος για νεώτερες εκδόσεις του FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Έλεγχος για αναβαθμίσεις"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Επέτυχε ο έλεγχος για αναβαθμίσεις"
 
@@ -1921,21 +1932,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Έλεγχος για τη σωστή εξωτερική διεύθυνση IP"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Έλεγχος αναβαθμίσεων"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Αναντιστοιχία αθροίσματος ελέγχου (checksum) στο ληφθέν αρχείο."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Επιλέξτε τον προκαθορισμένο τοπικό φάκελο"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Επιλέξτε τον τοπικό φάκελο"
 
@@ -1943,43 +1954,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Ακατάλληλος τερματισμός τμήματος δεδομένων"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Αποτύπωμα:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Κ&λείσιμο καρτέλας"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Κλασσική"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Καθαρισμός των εγγραφών στο &διαχειριστή τοποθεσιών"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Καθαρισμός της &διάταξης μνήμης"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Καθαρισμός του ιστορικού &γρήγορης σύνδεσης"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Καθαρισμός των πληροφοριών &επανασύνδεσης"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Καθαρισμός της &λίστας αναμονής"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Καθαρισμός ιστορικού"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1987,11 +1998,11 @@
 msgid "Clear private data"
 msgstr "Καθαρισμός προσωπικών δεδομένων"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Καθαρισμός της γραμμής γρήγορης σύνδεσης"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Εκκαθάριση συνένωσης συμβολοσειράς"
 
@@ -1999,36 +2010,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Κάντε κλικ στο τέλος για να αποθηκεύσετε τις ρυθμίσεις σας."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Κάνε κλικ στο συνέχεια για να αποκτήσετε την νέα έκδοση."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Πελάτης πρός Φυσική Διεύθυνση (MAC) εξυπηρετητή:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Πελάτης προς αποτύπωμα εξυπηρετητή:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Κλείσιμο &όλων των άλλων καρτελών"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Κλείσιμο του FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Κλείσιμο όλων των ενεργών διεργασιών του FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Κλείσιμο τρέχουσας καρτέλας"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Σχ&όλια:"
 
@@ -2036,11 +2047,11 @@
 msgid "Column properties"
 msgstr "Ιδιότητες στήλης"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Ρύθμιση στήλης"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Η εντολή και τα ορίσματα αυτής, πρέπει να παραθέτονται σωστά."
 
@@ -2059,9 +2070,9 @@
 msgstr "Η εντολή δεν υποστηρίζεται από αυτό το πρωτόκολλο"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Εντολή:"
 
@@ -2069,7 +2080,7 @@
 msgid "Comment"
 msgstr "Σχόλιο"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Σύνηθες όνομα:"
 
@@ -2080,15 +2091,15 @@
 "Προβληματική επικοινωνία από το δρομολογητή (router) ή από το τοίχος "
 "προστασίας (firewall)"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Σύγκριση αριθμού &τροποποιήσεων"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Σύγκριση &μεγέθους αρχείου"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Κατώτατο όριο σύγκρισης (σε λεπτά):"
 
@@ -2096,60 +2107,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Το κατώτατο όριο σύγκρισης πρέπει να είναι μεταξύ 0 και 1440 λεπτά."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Μεταγλωττισμένο για:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Μεταγλώττιση βασισμένη στο:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Μεταγλωττισμένο με:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Σημαίες μεταγλωττιστή:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Συμπιεσμένο"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Σύγχρονες μεταφορές"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Διάκριση πεζών και κεφαλαίων χαρακτήρων"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Δοκιμή ρυθμίσεων"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Ρύθμιση παθητικής κατάστασης"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Ρύθμιση εύρους θύρας"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Ρύθμιση του FileZilla και του δικτύου σας"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Επιβεβαίωση διαγραφής"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Χρειάζεται επιβεβαίωση"
 
@@ -2157,7 +2168,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Συγχαρητήρια, οι ρυθμίσεις σας φαίνεται πως δουλεύουν."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Η σύνδεση προσπέρασε τις ρυθμίσεις του διαμεσολαβητή"
 
@@ -2165,34 +2176,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Σύνδεση σε καθορισμένη τοποθεσία του διαχειριστή δικτυακού τόπου"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Συνδεδεμένος"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Σύνδεση"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Σύνδεση στο %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Σύνδεση στο %s διαμέσου διαμεσολαβητή"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Σύνδεση στο %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Σύνδεση στον εξυπηρετητή"
 
@@ -2200,18 +2211,18 @@
 msgid "Connection"
 msgstr "Σύνδεση"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Προσπάθεια σύνδεσης απέτυχε"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr ""
 "Απέτυχε η προσπάθεια σύνδεσης με \"%s\", προσπάθεια με την επόμενη διεύθυνση."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Απέτυχε η προσπάθεια σύνδεσης με \"%s\"."
@@ -2225,12 +2236,12 @@
 msgid "Connection closed"
 msgstr "Σύνδεση τερματίστηκε"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Σύνδεση τερματίστηκε από τον εξυπηρετητή"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Σύνδεση εδραιώθηκε, αρχικοποίηση του TLS..."
@@ -2239,7 +2250,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Σύνδεση εδραιώθηκε, αποστολή HTTP αιτήματος"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Σύνδεση εδραιώθηκε, αναμονή για μήνυμα υποδοχής..."
 
@@ -2255,15 +2266,15 @@
 msgid "Connection refused"
 msgstr "Η σύνδεση απορρίφθηκε"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Η σύνδεση διακόπηκε"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Τέλος χρονικού ορίου σύνδεσης."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Διακόπηκε η σύνδεση με τον εξυπηρετητή."
 
@@ -2283,27 +2294,23 @@
 msgid "Convert keyfile"
 msgstr "Μετατροπή του αρχείου-κλειδιού"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Αντ&ιγραφή"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Αντιγραφή (%d) από %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Αντιγραφή του %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Αντιγραφή στο πρόχειρο των URLs (από τα επιλεγμέναν αντικείμενα)."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Αδυνατη η αποδοχή της σύνδεσης: %s"
@@ -2313,16 +2320,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Αδυναμία εισαγωγής της σύνδεσης στο διαχειριστή τοποθεσιών"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Αδυναμία ολοκλήρωσης της λειτουργίας"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Αδύνατη η σύνδεση στον εξυπηρετητή"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Αδύνατη η σύνδεση στον εξυπηρετητή: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Αδυναμία μετατροπής εντολής στην κωδικοποίηση του εξυπηρετητή"
 
@@ -2331,17 +2342,17 @@
 msgid "Could not convert private key"
 msgstr "Αδυναμία μετατροπής ιδιωτικού κλειδιού"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Αδυναμία αντιγραφής των URLs"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Αδυναμία αντιγραφής δεδομένων"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2351,11 +2362,11 @@
 "Ίσως η επέκταση του κελύφους δεν έχει εγκατασταθεί σωστά ή δεν τοποθετήσατε "
 "τα αρχεία στο παράθυρο του περιηγητή."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Αδύνατη η εδραίωση σύνδεσης με τον εξυπηρετητή"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2367,11 +2378,11 @@
 "παραμέτρου γραμμής εντολών '--datadir <custompath>' ή ορίζοντας την "
 "μεταβλητή περιβάλλοντος FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Αδυναμία δημιουργίας προσαρμοσμένης ακολουθίας εισόδου."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2379,7 +2390,7 @@
 "Αδυναμία λήψης διακεκριμένου ονόματος για τον εκδότη πιστοποίησης, απέτυχε "
 "gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2387,7 +2398,7 @@
 "Αδυναμία λήψης διακεκριμένου ονόματος για το αντικείμενο πιστοποίησης, "
 "απέτυχε gnutls_x509_get_dn"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Αδυναμία εύρεσης της πλήρους απομακρυσμένης διαδρομής."
 
@@ -2396,16 +2407,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Αδυναμία λήψης του κατάλληλου τύπου από το fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "Δε βρέθηκε ο προσωρινός φάκελος για να αποθηκευτεί εκεί το αρχείο."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 "Αδυναμία εισαγωγής ομότιμων πιστοποιητικών, απέτυχε gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2433,7 +2444,7 @@
 msgid "Could not load private key"
 msgstr "Αδυναμία φόρτωσης του ιδιωτικού κλειδιού"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2445,7 +2456,7 @@
 "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του "
 "απομακρυσμένου φακέλου;"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2467,9 +2478,9 @@
 "'%s'.\n"
 "Ο συγχρονισμός περιήγησης έχει απενεργοποιηθεί."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Αδυναμία ανοίγματος του προχείρου"
 
@@ -2484,11 +2495,11 @@
 msgid "Could not parse remote path."
 msgstr "Αδυναμία ανάλυσης της απομακρυσμένης διαδρομής."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Αδυναμία ανάλυσης της διεύθυνσης του εξυπηρετητή:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Αδυναμία ανάγνωσης από την υποδοχή: %s"
@@ -2497,12 +2508,12 @@
 msgid "Could not read server item."
 msgstr "Αδυναμία ανάγνωσης αντικειμένου εξυπηρετητή."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Αδυναμία έναρξης αιτήματος %s εντός του αρχείου"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Αδυναμία λήξης αιτήματος κατά το τελείωμα του αρχείου"
 
@@ -2510,22 +2521,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Αδυναμία αποστολής εντολής στο fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Αδύνατη η δημιουργία ΙΟ thread"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Αδύνατη η εκκίνηση χειραψίας με το διαμεσολαβητή: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Αδύνατη η εκκίνηση της μεταφοράς"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2546,7 +2557,7 @@
 "Αδυναμία εγγραφής \"%s\", οι καθολικοί σελιδοδείκτες ήταν αδύνατο να "
 "αποθηκευτούν: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2555,16 +2566,16 @@
 "Αδυναμία εγγραφής \"%s\", η λίστα αναμονής δε μπόρεσε να αποθηκευτεί.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Αδυναμία εγγραφής \"%s\", οι επιλεγμένες τοποθεσίες δε μπόρεσαν να εξαχθούν: "
 "%s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Αδύνατη η εγγραφή του \"%s\": %s"
@@ -2574,7 +2585,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Αδυναμία εγγραφής του αρχείου-κλειδιού: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Αδυναμία εγγραφής στο τοπικό αρχείο"
 
@@ -2584,39 +2595,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Αδυναμία εγγραφής στο αρχείο συμβάντων: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Αδυναμία εγγραφής στην υποδοχή: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Χώρα:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Στιγμιαίες καταρρεύσεις του FileZilla. Χρήση της αποσφαλμάτωσης αποκλειστικά "
 "για διορθώσεις του χειριστή εξαιρέσεων"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "&Δημιουργία νέου αρχείου"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Δημιουργία υποφακέλου στον τρέχον φάκελο"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Δημιουργία ενός νέου κενού αρχείου στον τρέχον φάκελο"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Δημιουργία φακέλου"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Δημιουργία κενού αρχείου"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Δημιουργία φακέλου"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Δημιουργία φακέλου '%s'..."
@@ -2634,7 +2657,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Κρίσιμο σφάλμα μετά τη μεταφορά του %s στη %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2657,52 +2680,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Ο τρέχον τύπος μεταφοράς έχει ορισθεί ως δυαδικός."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Προσ&αρμογή"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Προσαρμοσμένα ορίσματα φίλτρου"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Προσαρμοσμένος εξυπηρετητής"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Τύπος δ&εδομένων"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Σύμβολα SI στα δ&εκαδικά προθέματα (π.χ. 1 KB = 1000 bytes)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Π&ροκαθορισμένη"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "Δ&ιαγραφή"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Α&πενεργοποίηση όλων"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Ν&α μην αποθηκεύονται οι κωδικοί πρόσβασης"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Ενέργεια δι&πλό-κλικ στους φακέλους:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "Δι&πλότυπο"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Σαν DOS με εικονικές διαδρομές"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Επικίνδυνος τύπος αρχείου"
 
@@ -2710,16 +2737,16 @@
 msgid "Data"
 msgstr "Δεδομένα"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Το socket δεδομένων έκλεισε πολύ σύντομα."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Ημερομηνία"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Μορφή ημερομηνίας"
 
@@ -2738,11 +2765,11 @@
 msgid "Debug"
 msgstr "Αποσφαλμάτωση"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Ρυμίσεις αποσφαλμάτωσης"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Προκαθορισμένος &τοπικός φάκελος:"
 
@@ -2750,19 +2777,19 @@
 msgid "Default (Autodetect)"
 msgstr "Προεπιλογή (Αυτόματος εντοπισμός)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Ο προκαθορισμένος επεξεργαστής δεν έχει σωστά εισαγωγικά."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Προεπιλογή ενέργειας υπάρχοντος αρχείου"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Προκαθορισμένος α&πομακρυσμένος φάκελος:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2774,15 +2801,15 @@
 msgid "Default system language"
 msgstr "Προκαθορισμένη γλώσσα συστήματος"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Προκαθορισμένη κατάσταση μεταφοράς:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Προκαθορισμένος τύπος μεταφοράς:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Προκαθορισμένη: http://ip.filezilla-project.org/ip.php"
 
@@ -2808,58 +2835,58 @@
 "Καθύστερηση σύνδεσης για %d δευτερόλεπτα, λόγω της προηγούμενης αποτυχημένης "
 "προσπάθειας..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Διαγραφή εγγραφής του διαχειριστή τοποθεσιών"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Διαγραφή επιλεγμένου φακέλου"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Διαγραφή επιλεγμένων αρχείων και φακέλων"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Διαγραφή φακέλων"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 "Δεν υποστηρίζεται προς το παρόν η διαγραφή πολλαπλών ανεξάρτητων φακέλων."
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Διαγραφή συμβολικής σύνδεσης"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Επιφάνεια Εργασίας"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Λεπτομέρειες"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Λεπτομέρειες για νέο κλειδί:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Φάκε&λοι"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Κατεύθυνση"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Φάκελος"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Σύγκριση φακέλου"
 
@@ -2879,11 +2906,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Λίστα φακέλου ακυρώθηκε από τον χρήστη"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Λίστα φακέλου απέτυχε"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Φίλτρα λίστας φακέλου"
 
@@ -2891,18 +2918,18 @@
 msgid "Directory listing successful"
 msgstr "Λίστα φακέλου επιτυχής"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Απεν&εργοποίηση όλων"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Απενεργοποίηση του συγχρονισμού περιήγησης και στη συνέχεια τροποποίηση του "
 "απομακρυσμένου φακέλου;"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2910,50 +2937,49 @@
 "Απενεργοποιείστε ξανά αυτή την επιλογή εάν δεν εμφανίζονται σωστά τα "
 "περιεχόμενα του φακέλλου."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Αποσύνδεση από τον εξυπηρετητή"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Αποσύνδεση από τον εξυπηρετητή"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Αποσύνδεση από τον εξυπηρετητή: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Αποσύνδεση από τον προηγούμενο εξυπηρετητή"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Αποσύνδεση από τον παρόντα ορατό εξυπηρετητή"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Εμφάνιση του διαλόγου Μνεία"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "Να μη γίνει χρήση του προκαθορισμένου επεξεργαστή"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "&Καμία ενέργεια"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2962,8 +2988,8 @@
 "Συνεχίστε να χρησιμοποιείτε τις σταθερές εκδόσεις, εκτός κι αν θέλετε να "
 "δοκιμάσετε τα νέα χαρακτηριστικά των εκδόσεων beta."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Θέλετε πραγματικά να κλείσετε το FileZilla;"
 
@@ -2978,7 +3004,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Θέλετε να διαγράψετε όλες τις εγγραφές του διαχειριστή τοποθεσιών;"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Θέλετε πραγματικά να διαγράψετε την επιλεγμένη εγγραφή;"
 
@@ -2986,33 +3012,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Θέλετε πραγματικά να διαγράψετε τη λίστα αναμονής;"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Θέλετε πραγματικά να στείλετε το '%s' στον εξυπηρετητή;"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Τεκμηρίωση"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr ""
 "Να μη γίνεται χρήση της εξωτερικής διεύθυνσης IP στις &τοπικές συνδέσεις."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "Τα αρχεία που ξεκινούν με τελεία, π.χ. .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Ενέργεια διπλό-κλικ"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Λήψη"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Όριο λήψης:"
 
@@ -3025,41 +3051,50 @@
 msgid "Download limit: none"
 msgstr "Όριο λήψης: όχι"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Λήψη αποτελεσμάτων αναζήτησης"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Λήψη επιλεγμένου φακέλου"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Λήψη των επιλεγμένων αρχείων και φακέλων"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Tαχύτητα λήψης: %s/s\n"
+"Tαχύτητα αποστολής: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Λήψη"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Λήψη %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Δεν υποστηρίζεται προς το παρόν η λήψη πολλαπλών ανεξάρτητων φακέλων."
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Λήψη των αποτελεσμάτων αναζήτησης"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3068,60 +3103,64 @@
 "Το Drag&Drop ανάμεσα στα διαφορετικά στιγμιότυπα του FileZilla δεν έχει "
 "υλοποιηθεί."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Το Drag&Drop ανάμεσα σε διαφορετικούς εξυπηρετητές δεν έχει υλοποιηθεί."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "&Διπλότυπο"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Ε&νεργοποίηση όλων"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "Ε&ισαγωγή φακέλου"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "Ε&κτέλεση"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "Έ&ξοδος"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Κάθε φίλτρο χρειάζεται τουλάχιστον μία συνθήκη."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Επεξεργασία φίλτρων"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Τροποποιήστε το αρχείο με έναν επεξεργαστή και στείλτε τις αλλαγές στον "
 "εξυπηρετητή."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Αποτυχία Επεξεργασίας"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Κενή εντολή"
 
@@ -3129,7 +3168,7 @@
 msgid "Empty command."
 msgstr "Κενή εντολή."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Άδειασμα λίστας φακέλου"
 
@@ -3141,95 +3180,101 @@
 msgid "Empty file extension."
 msgstr "Κενή επέκταση αρχείου."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Απαγορεύονται τα κενά ονόματα φίλτρων."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Κενό όνομα"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Κενή αλφαριθμητική σε παράθεση."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Ε&νεργοποίηση όλων"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Ενεργοποίηση &φιλτραρίσματος μη έγκυρων χαρακτήρων"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Κρυπτογραφημένο"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Κρυπτογράφηση"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Λεπτομέρειες κρυπτογράφησης"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Να ολοκληρωθεί σύγκριση και η αλλαγή των ορισμάτων ταξινόμησης;"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Εισαγωγή &προσαρμοσμένης εντολής..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Επιλέξτε 0 για απεριόριστη ταχύτητα."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Εισαγωγή εντολής"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Εισαγωγή προσαρμοσμένης εντολής"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Εισαγωγή φακέλου"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Εισαγωγή ονόματος φίλτρου"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Εισαγωγή ονόματος για τα ορίσματα φίλτρου"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Εισαγωγή νέου ονόματος για τα ορίσματα φίλτρου"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Εισαγωγή κωδικού πρόσβασης"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Εισαγωγή επιλεγμένου φακέλου"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Εισαγωγή διεύθυνσης από τον εξυπηρετητή.\n"
 "Για να ορίσετε το πρωτόκολλο εξυπηρετητή, προσθέστε στον κόμβο το "
@@ -3237,7 +3282,13 @@
 "χρησιμοποιηθεί το προκαθορισμένο (ftp://).\n"
 "Επίσης, μπορείτε να καταχωρίσετε πλήρη URLs με την μορφή πρωτόκολλου://"
 "χρήστης:κωδικός@κόμβος:θύρα εδώ, τότε οι τιμές στα αλλά πεδία θα "
-"αντικατασταθούν."
+"αντικατασταθούν.\n"
+"\n"
+"Τα υποστηριζόμενα πρωτόκολλα είναι:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3249,7 +3300,7 @@
 "Να λάβετε υπόψιν σας ότι, ίσως το αρχείο να μην είναι προστατευμένο με "
 "κωδικό."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3271,7 +3322,7 @@
 msgid "Error importing"
 msgstr "Σφάλμα εισαγωγής"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Σφάλμα κατά τη φόρτωση της Λίστας αναμονής"
 
@@ -3280,27 +3331,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Σφάλμα φόρτωσης xml αρχείου"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Σφάλμα κατά την αποθήκευση της Λίστας αναμονής"
 
@@ -3311,74 +3362,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Σφάλμα εγγραφής αρχείου xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Σφάλμα, το όνομα αρχείου δεν μπορεί να αναλυθεί."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Σφάλμα, το τοπικό αρχείο υπάρχει αλλά δεν μπορεί να απομακρυνθεί"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Σφάλμα:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Εδραίωση σύνδεσης της νέας καρτέλας"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Κάθε μήνα"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Κάθε δύο εβδομάδες"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Παράδειγμα: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Παραδείγματα"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Εκτ&έλεση"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Εκτελέσιμο"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Το εκτελέσιμο δεν περιέχει πληροφορίες έκδοσης, δεν είναι εφικτός ο έλεγχος "
 "αναβαθμίσεων."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Εξερευνητή"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Εξαγωγή της &λίστας αναμονής"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Εξαγωγή των &ρυθμίσεων"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Εξαγωγή ρυθμίσεων"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Όνομα φ&ίλτρου:"
 
@@ -3386,7 +3445,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Πρωτόκολλο Μεταφοράς Αρχείων"
 
@@ -3398,25 +3457,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Επισφαλές Πρωτόκολλο Μεταφοράς Αρχείων"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Η μηχανή FTP δεν έχει αρχικοποιηθεί, αδύνατη η σύνδεση"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Διατήρηση ενεργού FTP"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Διαμεσολαβητής FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "Διεύθυνση FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3433,26 +3492,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP over implicit TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Απέτυχε η αλλαγή φακέλου"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Απέτυχε η αλλαγή γλώσσας"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Απέτυχε ο έλεγχος για νέα έκδοση του FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Αποτυχία αντιγραφής ή μετακίνησης τοποθεσιών"
 
@@ -3460,44 +3519,44 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Απέτυχε η δημιουργία αντιγράφου ασφαλείας για το αρχείου xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Αποτυχία δημιουργίας listen socket, ακύρωση"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Αποτυχία δημιουργίας listen socket για μεταφορά σε ενεργητική κατάσταση"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Αποτυχία λήψης της νεώτερης έκδοσης του FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Αποτυχία πρόσβασης στην διαδρομή 'Τα Εγγραφά Μου'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Αποτυχία πρόσβασης στην διαδρομή της επιφάνειας εργασίας"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "Αποτυχία λήψης ομότιμης διεύθυνσης, η σύνδεση έκλεισε."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Αποτυχία λήψης ομότιμης διεύθυνσης από τα δεδομένα σύνδεσης, η σύνδεση "
 "έκλεισε."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Αποτυχία αρχικοποίησης της μηχανής FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Αποτυχία αρχικοποίησης του TLS."
@@ -3511,24 +3570,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Αποτυχία φόρτωσης του ιδιωτικού κλειδιού: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Αποτυχία ανοίγματος του \"%s\" για επισύναψη/εγγραφή"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Αποτυχία ανοίγματος του \"%s\" για ανάγνωση"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Αποτυχία ανοίγματος του \"%s\" για εγγραφή"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Αποτυχία ανάλυσης τις επιστρεφόμενης διαδρομής."
 
@@ -3536,7 +3595,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Αποτυχία ανάλυσης του εμπιστευτικού πιστοποιητικού βάσης."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Αποτυχία λήψης δεδομένων"
 
@@ -3548,11 +3607,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, ακύρωση"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Αποτυχία ανάκτησης εξωτερικής διεύθυνσης IP, χρήση τοπικής διεύθυνσης"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Αποτυχία ανάκτησης τοπικής διεύθυνσης IP."
 
@@ -3568,14 +3627,14 @@
 msgid "Failed to send command."
 msgstr "Αποτυχία αποστολής εντολής."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση της προκαθορισμένης γλώσσας από "
 "το σύστημα"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3583,14 +3642,14 @@
 "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση της προκαθορισμένης γλώσσας από "
 "το σύστημα (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Αποτυχία ορισμού γλώσσας σε %s (%s), χρήση προκαθορισμένης γλώσσας από το "
 "σύστημα."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3598,14 +3657,14 @@
 "Αποτυχία ορισμού γλώσσας σε %s, χρήση της προκαθορισμένης από το σύστημα "
 "γλώσσας"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Αποτυχία ορισμού γλώσσας σε %s, χρήση της προκαθορισμένης γλώσσας από το "
 "σύστημα (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3616,7 +3675,7 @@
 msgid "Failed to validate settings"
 msgstr "Αποτυχία πιστοποίησης ρυθμίσεων"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Αποτυχία επαλήθευσης ομότιμου πιστοποιητικού"
 
@@ -3633,21 +3692,19 @@
 msgid "Failed transfers"
 msgstr "Αποτυχημένες μεταφορές"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Επιστροφή σε ενεργητική κατάσταση"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Αρχ&είο:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Αρχ&εία"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Αρχείο"
 
@@ -3663,7 +3720,7 @@
 msgid "File editing"
 msgstr "Επεξεργασία αρχείου"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Το αρχείο υπάρχει"
 
@@ -3671,7 +3728,7 @@
 msgid "File exists action"
 msgstr "Ενέργεια για ήδη υπάρχον αρχείο"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Το αρχείο άλλαξε"
 
@@ -3679,14 +3736,14 @@
 msgid "File lists"
 msgstr "Λίστες αρχείων"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Το αρχείο δε βρέθηκε"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Aναζήτηση αρχείου"
 
@@ -3721,25 +3778,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Επιτυχής μεταφορά αρχείου, μεταφέρθηκε %s στο %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Μεταφορά αρχείων σε πρόοδο."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Το αρχείο θα μεταφερθεί ως ASCII τύπος δεδομένων."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Το αρχείο θα μεταφερθεί ως δυαδικός τύπος δεδομένων."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Σφάλμα FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3747,68 +3804,69 @@
 "Το FileZilla θα δοκιμάσει τώρα τις ρυθμίσεις σας για να εξασφαλίσει ότι "
 "είναι όλα σωστά ρυθμισμένα."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "Το FileZilla συνδέθηκε ήδη με τον εξυπηρετητή."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"Το FileZilla εκτελείτε σε λειτουργία 'kiosk'.\n"
-"Οι τύποι σύνδεσης 'Κανονικός' και 'Λογαριασμός' δεν υποστηρίζονται αυτή τη "
-"λειτουργία."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "Το FileZilla πρέπει να επανεκκινηθεί για να εφαρμοστεί η γλωσσική αλλαγή."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Ενημερώσεις FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Γραμμές κατάστασης"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Όνομα αρχείου"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "Όνομα αρχείου &φίλτρων..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "Δε μπορεί να κατασκευαστεί όνομα αρχείου για τον φάκελο %s και το αρχείο %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Λανθασμένο όνομα αρχείου"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Το ονόμα αρχείου δε πρέπει να περιέχει κανέναν από τους ακόλουθους "
+"χαρακτήρες: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Το όνομα αρχείου δεν αλλάχθηκε"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Όνομα αρχείου:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Τα ονόματα των αρχείων δε μπορούν να περιέχουν κανένα από τους ακόλουθους "
 "χαρακτήρες: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3816,13 +3874,13 @@
 "Τα ονόματα των αρχείων δε μπορούν να περιέχουν κανένα από τους ακόλουθους "
 "χαρακτήρες: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Αρχεία που επεξεργάζονται"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Μέγεθος αρχείου"
@@ -3831,68 +3889,68 @@
 msgid "Filesize format"
 msgstr "Μορφή μεγέθους αρχείου"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Τύπος αρχείου"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Συσχετίσεις τύπων αρχείων"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Εφαρμογή φίλτρου σε:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Φιλτράρισμα μη έγκυρων χαρακτήρων στα ονόματα αρχείων"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Το όνομα φίλτρου υπάρχει ήδη"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Ταίριασμα με όλα τα ακόλουθα"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Ταίριασμα με οτιδήποτε από τα ακόλουθα"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Ταίριασμα με κανένα από τα ακόλουθα"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Τα ορίσματα φίλτρου υπάρχουν ήδη"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Φιλτράρισμα λιστών φακέλων"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Αποτυχία πιστοποίησης φίλτρου"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Αποτύπωμα (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Αποτύπωμα (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Αποτύπωμα:"
 
@@ -3900,7 +3958,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Οδηγός ρύθμισης δρομολογητή (router) και τοίχους προστασίας (firewall)"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3908,11 +3966,11 @@
 "Εκτελέστε τον οδηγό ρύθμισης δικτύου για πιο λεπτομερείς πληροφορίες σχετικά "
 "με τις επιλογές αυτές."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Για αξιοπιστία πρέπει να ορίσετε ένα εύρος από το λιγότερο 10 θύρες."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3920,33 +3978,33 @@
 "Για αυτή τη σύνοδο θα χρησιμοποιηθούν οι προκαθορισμένες ρυθμίσεις. Η "
 "οποιαδήποτε αλλαγή στις ρυθμίσεις δε θα αποθηκευθεί."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Επιβολή &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Εμφάνιση των &κρυφών αρχείων"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Εξαναγκασμένη εμφάνιση των κρυφών αρχείων"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Προδιαγραφές μορφοποίησης:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Μορφή: Μετά την επέκταση παραθέτεται (μέσα σε εισαγωγικά) η πλήρης διαδρομή "
 "της συσχετιζόμενης εφαρμογής και ακολουθούν τα ορίσματα, με σωστή σύνταξη."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Περαιτέρω τεκμηρίωση"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Γενικά"
 
@@ -3954,21 +4012,21 @@
 msgid "General SOCKS server failure"
 msgstr "Γενική αποτυχία εξυπηρετητή SOCKS"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Γενικός διαμεσολαβητής"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Λήψη εξωτερικής διεύθυνσης IP από την ακόλουθη URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Λήψη βοήθειας"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Το εν λόγω όνομα των ορισμάτων φίλτρου υπάρχει ήδη, να αντικατασταθεί;"
 
@@ -3976,15 +4034,15 @@
 msgid "Global bookmarks"
 msgstr "Καθολικοί σελιδοδείκτες"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Δικαιώματα ομάδας"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "Υ&ψηλή"
 
@@ -3992,21 +4050,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP over TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Δίεση:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Κρυφό"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Υψηλή"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Υψηλότερη"
 
@@ -4014,26 +4072,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "O υψηλότερος αριθμός θύρας πρέπει να είναι ανάμεσα στο 1024 και 65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Κρατήστε το πλήκτρο shift για την εναλλαγή της κατάστασης του φίλτρου και "
 "στις δύο πλευρές ταυτόχρονα."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Προσωπική Σελίδα:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Αποτύπωμα κλειδιών Διακομιστή:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Το κλειδί του κόμβου δεν ταιριάζει"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Ο κόμβος ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε."
 
@@ -4041,20 +4099,20 @@
 msgid "Host unreachable"
 msgstr "Μη προσπελάσιμος κόμβος"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Κόμβος:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Ώρες,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (παράδειγμα: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4064,13 +4122,13 @@
 "μεγαλύτερο από το προκαθορισμένο, η σύνδεση θα τερματιστεί και το FileZilla "
 "θα επιχειρήσει να επανασυνδεθεί."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Για την αποστολή αναφορών σφαλμάτων, απαιτούνται \"Αναλυτικές\" πληροφορίες "
 "αποσφαλμάτωσης στο αρχείο συμβάντων."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4083,7 +4141,7 @@
 "ενεργητική κατάσταση. Μπορείτε να ορίσετε την κατάσταση μεταφοράς σε μία ανά-"
 "εξυπηρετητή βάση στο διαχειριστή τοποθεσιών."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4092,7 +4150,7 @@
 "με λάθος ρυθμισμένους εξυπηρετητές που απορρίπτουν την επιλεγμένη κατάσταση "
 "μεταφοράς."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4116,7 +4174,7 @@
 "Εάν το πρόβλημα συνέχισει να υπάρχει, πιθανόν κάποιος δρομολογητής (router) "
 "ή/και τοίχος προστασίας (firewall) συνεχίζει να διακόπτει τη σύνδεση."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4127,7 +4185,7 @@
 "επικαλύπτοντας παλαιότερα αρχεία συμβάντων), με αποτέλεσμα την δημιουργία "
 "νέου αρχείου."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4150,7 +4208,7 @@
 "Εάν το πρόβλημα παραμένει, επικοινωνήστε με τον κατασκευαστή του δρομολογητή "
 "σας."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4161,7 +4219,7 @@
 "διαφέρει (δλδ. διαφορετική ζώνη), όριστε την διαφορά ζώνης στο διαχειριστή "
 "τοποθεσιών."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4170,13 +4228,13 @@
 "χρονικής σφραγίδας, θα πρέπει η διαφορά της χρονικής σφραγίδας να μην "
 "υπερβαίνει το κατώτατο όριο που έχει οριστεί."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr ""
 "Για να εφαρμοστούν οι αλλαγές στη γλώσσα θα πρέπει να επανεκκινηθεί το "
 "FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4184,11 +4242,11 @@
 "Εάν κάνετε κλικ στο δοκιμή, το FileZilla θα συνδεθεί στο probe.filezilla-"
 "project.org και θα εκτελέσει κάποιες απλές δοκιμές."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Εάν κλείσετε το FileZilla, οι αλλαγές θα χαθούν"
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4196,11 +4254,11 @@
 "Εάν καταχωρίσετε λάθος τύπους αρχείων, μπορεί αυτά τα αρχεία να καταστραφούν "
 "κατά την μεταφορά."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Εάν λάβετε κάποιο σφάλμα, τότε οι ρυθμίσεις σας δεν είναι οι σωστές."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4219,7 +4277,7 @@
 "σωστά ρυθμισμένοι. Σε αυτή την περίπτωση δοκιμάστε εναλλαγή της παθητικής "
 "κατάστασης και επικοινωνήστε με το διαχειριστή του εξυπηρετητή για βοήθεια."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4228,7 +4286,7 @@
 "τοίχος προστασίας (firewalls) και οι δρομολογητές (routers) που έχετε είναι "
 "σωστά ρυθμισμένοι."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4236,7 +4294,7 @@
 "Εάν χρησιμοποιείτε κάποιο τοίχος προστασίας (firewall), ελέγξτε ότι "
 "επιτρέπει στο FileZilla να έχει πρόσβαση σε όλες τις θύρες που ορίσατε."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4256,7 +4314,7 @@
 msgid "Import data from older version"
 msgstr "Εισαγωγή δεδομένων από παλαιότερη έκδοση"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Εισαγωγή ρυθμίσεων"
 
@@ -4270,7 +4328,7 @@
 msgid "Improperly quoted association."
 msgstr "Λάθος εισαγωγικά στην σχέση."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4278,7 +4336,7 @@
 "Στην ενεργητική κατάσταση, το FileZilla πρέπει να ακούει σε μία θύρα για τη "
 "μεταφορά δεδομένων. Πρέπει να ορίσετε ποιες θύρες θα χρησιμοποιεί."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4287,7 +4345,7 @@
 "διαθέσιμες θύρες, καθώς το FileZilla δεν επηρεάζει τις θύρες που επιλέγει το "
 "σύστημα σας."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4295,7 +4353,7 @@
 "Σε περίπτωση που προτιμάτε τις αυτόματες αναβαθμίσεις, μπορείτε να "
 "ενεργοποιήσετε τους αυτόματους ελέγχους αναβαθμίσεων στις ρυθμίσεις."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4303,7 +4361,7 @@
 "Για να χρησιμοποιηθεί η ενεργητική κατάσταση, το FileZilla πρέπει να "
 "γνωρίζει την εξωτερική διεύθυνση IP σας."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4313,7 +4371,7 @@
 "χρήστες, το FileZilla ζητά από τον εξυπηρετητή μία θύρα και συνδέεται σε "
 "αυτή. Δε χρειάζονται ιδιαίτερες ρυθμίσεις γι' αυτό."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4321,20 +4379,20 @@
 "Ελλιπής αλυσίδα, το κορυφαίο πιστοποιητικό δεν είναι υπογεγραμμένο "
 "πιστοποιητικό από την αρμόδια αρχή έκδοσης πιστοποιητικών"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Λανθασμένος κωδικός πρόσβασης"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Αρχικοποίηση TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Επισφαλής εξυπηρετητής, δεν υποστηρίζει FTP με TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Διαδραστικός"
@@ -4344,8 +4402,8 @@
 msgstr "Διεπαφή"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Διακόπηκε από τον χρήστη"
 
@@ -4357,8 +4415,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Μη έγκυρη απάντηση HTTP"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4381,12 +4439,13 @@
 msgid "Invalid date"
 msgstr "Λανθασμένη ημερομηνία"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Λανθασμένο όνομα αρχείου"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Μη έγκυρος κόμβος. Μετά τον εγκιβωτισμό (κλείνει η αγκύλη) πρέπει να "
@@ -4396,32 +4455,36 @@
 msgid "Invalid input"
 msgstr "Μη έγκυρη εισαγωγή"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Δόθηκε λανθασμένος αριθμός θύρας. Η θύρα πρέπει να έχει τιμή από 1 εως 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Λανθασμένη επιλογή πρωτοκόλλου. Τα έγκυρα πρωτόκολλα είναι:\n"
-"ftp:// για κανονικό πρωτόκολλο μεταφοράς αρχείων (FTP),\n"
-"sftp:// για ασφαλές πρωτόκολλο μεταφοράς αρχείων (SSH file transfer "
-"protocol),\n"
-"ftps:// για ασφαλές κρυπτογραφημένο πρωτόκολλο μεταφοράς αρχείων με "
-"πιστοποίηση (SSL implicit) και\n"
-"ftpes:// για ασφαλές κρυπτογραφημένο πρωτόκολλο μεταφοράς αρχείων με "
-"πιστοποίηση (SSL explicit)."
+"ftp:// for normal FTP,\n"
+"sftp:// for SSH file transfer protocol,\n"
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Μη έγκυρος κόμβος. Μετά την αγκύλη κλεισίματος πρέπει να ακολουθούν η άνω "
+"κάτω τελεία και η θύρα."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Μη έγκυρη έκφραση στις συνθήκες αναζήτησης."
 
@@ -4429,7 +4492,7 @@
 msgid "Invalid response code"
 msgstr "Μη έγκυρος κωδικός απάντησης"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Μη έγκυρες συνθήκες αναζήτησης: %s"
@@ -4441,38 +4504,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Μη έγκυρη διαδρομή"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Μη έγκυρο μέγεθος στην συνθήκη"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Δόθηκε μη έγκυρο όνομα χρήστη."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Κράτος δραστηριοποίησης:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Περιοχή δραστηριοποίησης:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Περιφέρεια ή νομαρχία δραστηριοποίησης:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Κράτησε τους φακέλους στο επάνω μέρος"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4483,50 +4546,54 @@
 "ενεργοποιημένη. Παρότι το FileZilla εκτελεί κάποιες δοκιμές για να ελέγξει "
 "αν ο εξυπηρετητής υποστηρίζει αυτή τη δυνατότητα, μπορεί να αποτύχει."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Ανταλλαγή κλειδιού"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Ανταλλαγή κλειδιού:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Χ&αμηλότερη"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Γλώσσα"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Εφαρμογή τροποποίησης γλώσσας"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Τελευταία τροποποίηση"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Εμφάνιση"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Όριο ταυτόχρονων &λήψεων:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Όριο ταυτόχρονων &αποστολών:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Όριο τοπικών θυρών"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Όριο μεγέθους του αρχείου συμβάντων"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Όριο:"
 
@@ -4534,7 +4601,7 @@
 msgid "Line length exceeded"
 msgstr "Το μήκος γραμμής ξεπεράστηκε"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Πρόσθετα στοιχεία"
 
@@ -4543,21 +4610,21 @@
 msgstr "Το listen socket έκλεισε"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Λίστα:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Χα&μηλότερη διαθέσιμη θύρα:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Τοπικά"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Τοπικό αρχείο"
 
@@ -4573,7 +4640,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Το τοπικό αρχείο δεν έχει έγκυρο όνομα αρχείου."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Τοπικά φίλτρα:"
 
@@ -4581,7 +4648,7 @@
 msgid "Local site:"
 msgstr "Τοπική τοποθεσία:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Τοποθεσία:"
 
@@ -4589,16 +4656,16 @@
 msgid "Log file"
 msgstr "Αρχείο Συμβάντων"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Συμβάντα έλεγχου αναβαθμίσεων:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Καταγραφή"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4607,7 +4674,7 @@
 "να μην υποστηρίζει UTF-8. Δεν είναι δυνατή η επαναφορά στην τοπική "
 "κωδικοποίηση χαρακτήρων που χρησιμοποιεί ο διαμεσολαβητής."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4615,19 +4682,19 @@
 "Τα στοιχεία σύνδεσης περιέχουν μη-ASCII χαρακτήρες και ο εξυπηρετητής μπορεί "
 "να μην υποστηρίζει UTF-8. Δοκιμάστε μια τοπική κωδικοποίηση χαρακτήρων."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Η ακολουθία σύνδεσης που εκτελείται δε διεκπεραιώθηκε ακόμα, δε συνδέθηκε. "
 "Απόρριψη."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Ο τύπος σύνδεσης πρέπει να είναι είτε 'ask' είτε 'interactive' (χωρίς τα "
 "εισαγωγικά)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4636,13 +4703,13 @@
 "Ο τύπος σύνδεσης, μπορεί να χρησιμοποιείτε συγχρόνως με μόνο μία διεύθυνση "
 "FTP. Τα ορίσματα πρέπει να είναι είτε'%s' είτε '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Χαμηλή"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Χαμηλότερη"
 
@@ -4652,11 +4719,11 @@
 "Η χαμηλότερη διαθέσιμη θύρα πρέπει να είναι ένας αριθμός μεταξύ του 1024 και "
 "65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "Φυσική διεύθυνση (MAC):"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Σιγουρευτείτε, ότι το αρχείο μπορεί να προσπελαστεί και είναι ένα "
@@ -4681,7 +4748,7 @@
 "Κατεστραμένη απάντηση, ο εξυπηρετητής δε στέλνει τις κατάλληλες γραμμές "
 "τερματισμού"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4692,58 +4759,58 @@
 msgid "Manual transfer"
 msgstr "Χειροκίνητη μεταφορά"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Με όλα τα ακόλουθα"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Να ταιριάζει με οτιδήποτε από τα ακόλουθα"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Να μην ταιριάζει με οτιδήποτε από τα ακόλουθα"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Μέγιστος αριθμός ταυτόχρονων &μεταφορών:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Αρχείο συμβάντων"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Θέση αρχείου συμβάντων"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Λεπτά"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Μετακίνηση &κάτω"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Μετακίνηση &πάνω"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Ο Υπολογιστής Μου"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Τα Εγγραφά Μου"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Οι Τοποθεσίες μου"
 
@@ -4752,33 +4819,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Όνομα"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "To όνομα ήδη υπάρχει"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "To εν λόγω όνομα σελιδοδείκτη υπάρχει ήδη."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Όνομα:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Πρέπει να καταχωρίσετε όνομα φίλτρου"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Πρέπει να καταχωρίσετε έγκυρη απομακρυσμένη διαδρομή"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Πρέπει να ορίσετε μία κωδικοποίηση χαρακτήρων"
 
@@ -4786,19 +4853,23 @@
 msgid "Network unreachable"
 msgstr "Μη προσπελάσιμο δίκτυο"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Ποτέ"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Νέος &φάκελος"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Νέα &καρτέλα"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Νέος σελιδο&δείκτης"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4811,41 +4882,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Νέος σελιδοδείκτης"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Νέος φάκελος"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Νέες δυνατότητες και άλλες βελτιώσεις στην έκδοση %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Νέο Φίλτρο"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Νέος φάκελος"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Νέα τοποθεσία"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Επόμενο στη λίστα αναμονής μεταφορών"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Όχι"
 
@@ -4853,26 +4924,26 @@
 msgid "No category to export selected"
 msgstr "Δεν έχει επιλεχθεί καμία κατηγορία για εξαγωγή"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Δε δόθηκε καμία εντολή, ακύρωση."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr ""
 "Καμία εξωτερική διεύθυνση IP δεν έχει οριστεί, δοκιμή της προκαθορισμένης."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Δε μπορείτε να επεξεργαστείτε κανένα απομακρυσμένο αρχείο."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Δε δόθηκε όνομα φίλτρου"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Δε δόθηκε κόμβος, παρακαλώ καταχωρίστε ένα κόμβο."
 
@@ -4880,27 +4951,27 @@
 msgid "No images available"
 msgstr "Καμία διαθέσιμη εικόνα"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Δεν υπάρχουν άλλα αρχεία στη λίστα αναμονής!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Δε δόθηκε όνομα για τα ορίσματα φίλτρου."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Καμία εφαρμογή δε συσχετίζεται μ' αυτόν το τύπο αρχείου"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 "Καμία εφαρμογή δεν έχει συσχετιστεί για να επεξεργαστεί αρχεία με επέκταση '%"
 "s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Κανένα αποτέλεσμα αναζήτησης"
 
@@ -4918,25 +4989,25 @@
 msgid "No username given."
 msgstr "Δε δόθηκε όνομα χρήστη."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Κανένα"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Τίποτε δεν έχει επιλεχθεί ακόμα"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
-msgstr "Κανονική"
+msgstr "Τυπικός"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:326
 #: ../../locales/../src/interface/queueview_failed.cpp:351
@@ -4946,15 +5017,15 @@
 "επεξεργασθούν."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Δε συνδέθηκε"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Δε συνδέθηκε με κανέναν εξυπηρετητή"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Δε συνδέθηκε με κανέναν εξυπηρετητή."
 
@@ -4962,22 +5033,22 @@
 msgid "Not connected."
 msgstr "Δε συνδέθηκε."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Σημείωση: Αυτό το χαρακτηριστικό υποστηρίζεται μόνο από το πρωτόκολλο FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Σημείωση: Λειτουργεί μόνο με απλές, μη κρυπτογραφημένες συνδέσεις FTP."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Σημείωση: Η χρήση ενός γενικού διαμεσολαβητή αναγκάζει τις συνδέσεις FTP να "
 "λειτουργούν σε παθητική κατάσταση."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Αριθμός δεκαδικών θέσεων:"
 
@@ -4985,21 +5056,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Ο Αριθμός των προσπαθειών πρέπει να είναι ανάμεσα σε 0 και 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Ά&νοιγμα αρχείου"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "ΟΚ"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -5007,120 +5078,126 @@
 "Στις επόμενες σελίδες, θα ρυθμιστεί η κατάσταση μεταφοράς, καθώς και η "
 "κατάσταση επιστροφής αν είναι ενεργοποιημένη."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Μία"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Μόνο η εκδοσή του FileZilla και του λειτουργικού συστήματος που "
-"χρησιμοποιείτε θα υποβληθούν στον εξυπηρετητή."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Κάθε εβδομάδα"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Ανοικτός κατάλογος στο διαχειριστή αρχείων του συστήματος"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Άνοιγμα του διαχειριστή τοποθεσιών"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Άνοιγμα του Διαχειριστή τοποθεσιών."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Άνοιγμα του Διαχειριστή τοποθεσιών. Δεξί-πλήκτρο για τη λίστα αρχείων της "
+"τοποθεσίας."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Άνοιγμα αρχείου."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Ανοίγμα διαλόγου ρυθμίσεων του FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Ανοιγμένα ως:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Αποτυχία ανοίγματος"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Άνοιγμα νέας καρτέλας"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Άνοιγμα του διαχειριστή τοποθεσιών"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Άνοιγμα διαλόγου της λίστας φακέλων. Δεξί-πλήκτρο για την εναλλαγή των "
 "φίλτρων."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Λειτουργικό σύστημα"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Εντοπίστηκε πρόβλημα λειτουργικού συστήματος"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Οργανισμός:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Άλλα:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Περιγραφή"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Αντικατάσταση &αν είναι νεώτερο"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Αντικατάσταση αρχείου"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Αντικατάσταση αρχείου αν είναι διαφορετικού μεγέθους"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Αντικατάσταση αρχείου αν είναι διαφορετικού μεγέθους ή αν είναι νεώτερο"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Αντικατάσταση αρχείου αν είναι νεώτερο"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Αντικατάσταση αν είναι &διαφορετικού μεγέθους"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Αντικατάσταση αν είναι διαφορετικού &μεγέθους ή αν είναι νεώτερο"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Δικαιώματα ιδιοκτήτη"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Ιδιοκτήτης/Ομάδα"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5128,7 +5205,7 @@
 "Αποτροπή του συστήματος να εισέλθει το σε κατάσταση ύπνωσης κατά τη διάρκεια "
 "των ενεργών μεταφορών και των άλλων διαδικασιών"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Κόμβος διαμεσολαβητή:"
@@ -5139,27 +5216,27 @@
 "Η εντολή PORT μολύνθηκε από το δρομολογητή (router) ή από το τοίχος "
 "προστασίας (firewall)."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Πα&θητική (συνιστάται)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Πακέτο"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Η παράμετρος δεν είναι έγκυρη URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Κωδ&ικός πρόσβασης:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Παθητική (συνιστάται)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Παθητική κατάσταση"
@@ -5174,42 +5251,46 @@
 msgid "Password required"
 msgstr "Απαιτείται κωδικός πρόσβασης"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Διαδρομή"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Αδυναμία δημιουργίας διαδρομής για τον φάκελο %s και τον υποφάκελο %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Η διαδρομή δεν βρέθηκε:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Διαδρομές"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Αναμονή διαγραφής"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Άδεια"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Δικαιώματα"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Πλατφόρμα:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5226,7 +5307,7 @@
 "filezilla-project.org/probe.php και στη συνέχεια ελέγξτε προσεκτικά τις "
 "ρυθμίσεις σας."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5235,7 +5316,7 @@
 "αναβαθμισμένο πακέτο ή επισκευθείτε την τοποθεσία http://filezilla-project."
 "org για να αποκτήσετε τον πηγάιο κώδικα του FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5266,7 +5347,7 @@
 msgid "Please enter a custom time format."
 msgstr "Παρακαλώ, καταχωρίστε μία προσαρμοσμένη μορφή ώρας."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5280,20 +5361,20 @@
 msgstr ""
 "Παρακαλώ, καταχωρίστε ένα όριο ταχύτητας λήψης μεγαλύτερο ή ίσο με 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Παρακαλώ, καταχωρίστε ένα όνομα για το νέο φίλτρο."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για το αντιγραμμένο φίλτρο."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για τα ορίσματα φίλτρου \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Παρακαλώ, καταχωρίστε ένα νέο όνομα για το φίλτρο."
 
@@ -5320,11 +5401,11 @@
 "Παρακαλώ, καταχωρίστε έναν αριθμό μεταξύ 0 και 10 για τον αριθμό ταυτόχρονων "
 "μεταφορών."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Παρακαλώ, καταχωρίστε τον κωδικό γι' αυτό τον εξυπηρετητή:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5341,11 +5422,11 @@
 "Παρακαλώ, καταχωρίστε ένα χρόνο διακοπής ανάμεσα σε 5 και 9999 δευτερόλεπτα "
 "ή 0 για να απενεργοποιήσετε τις διακοπές."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Παρακαλώ, καταχωρίστε ένα μοναδικό όνομα για αυτό το όρισμα φίλτρου"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Παρακαλώ, καταχωρίστε το όνομα χρήστη γι' αυτόν τον εξυπηρετητή:"
 
@@ -5359,12 +5440,6 @@
 "Παρακαλώ καταχωρίστε ένα URL από το οποίο παίρνετε την εξωτερική σας "
 "διεύθυνση"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr ""
-"Παρακαλώ, καταχωρίστε ένα διάστημα ελέγχου αναβάθμισης που να είναι "
-"τουλάχιστον 7 ημέρες"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5373,7 +5448,7 @@
 "Παρακαλώ, καταχωρίστε ένα όριο ταχύτητας αποστολής μεγαλύτερο ή ίσο με 0 %s/"
 "s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5381,14 +5456,18 @@
 "Παρακαλώ, καταχωρίστε μία ακατέργαστη εντολή FTP.\n"
 "Η χρήση ακατέργαστων εντολών FTP θα καθαρίσουν την προσωρινή μνήμη φακέλων."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Παρακαλώ, καταχωρίστε το όνομα του φακέλου που πρέπει να δημιουργηθεί:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Παρακαλώ, καταχωρίστε το όνομα του αρχείου που πρέπει να δημιουργηθεί:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr ""
 "Παρακαλώ, καταχωρίστε όνομα χρήστη και κωδικό πρόσβασης γι' αυτό τον "
@@ -5410,7 +5489,7 @@
 "γνωρίζετε την εξωτερική σας διεύθυνση, χρησιμοποιείστε την επιλογή "
 "εξωτερικού αναλυτή."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5427,7 +5506,7 @@
 "και ελέγξτε αν έχετε πληκτρολογήσει σωστά την διεύθυνση του αναλυτή "
 "διευθύνσεων."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Σιγουρευτείτε ότι η αιτούμενη τοπική προσαρμογή θα εγκατασταθεί στο σύστημα "
@@ -5445,7 +5524,7 @@
 "ρυθμισμένος. Θα πρέπει να χρησιμοποιήσετε χειροκίνητη προώθηση θυρών. Ο "
 "δρομολογητή δεν πρέπει να λειτουργεί σε καταστάσεις 'DMZ' ή 'game mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5458,7 +5537,7 @@
 "trojan ή άλλο κακόβουλο πρόγραμμα. Αυτό μπορεί να προκαλέσει λάθος συναγερμό "
 "που εσείς πρέπει να αγνοήσετε."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5467,7 +5546,7 @@
 "εξυπηρετητές FTP, FTPS και FTPES λειτουργεί μόνο εάν αυτοί υποστηρίζουν την "
 "εντολή MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5476,7 +5555,7 @@
 "απαγορέψουν την πρόσβαση, αν προσπαθείτε να επανασυνδεθείτε σε τακτά και "
 "πολύ μικρά χρονικά διαστήματα."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5485,7 +5564,7 @@
 "Παρακαλώ, για λεπτομέρειες επισκεφθείτε την τοποθεσία http://wiki.filezilla-"
 "project.org/Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5503,39 +5582,39 @@
 "περίπτωση που ξαφνικά υπάρχουν προβλήματα με εξυπηρετητές που λειτουργούσαν "
 "παλαιότερα."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Παρακαλώ, επιλέξτε ενέργεια:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Παρακαλώ, επιλέξτε τις κατηγορίες που θέλετε να εισάγετε."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Παρακαλώ, επιλέξτε την προκαθορισμένη κατάσταση μεταφοράς."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τον φάκελο \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για το αρχείο \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τους επιλεγμένους φακέλους."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
 "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τα επελεγμένα αρχεία και φακέλους."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Παρακαλώ, επιλέξτε τις νέες ιδιότητες για τα επιλεγμένα αρχεία."
 
@@ -5553,7 +5632,7 @@
 "χρησιμοποιήσετε τη χειροκίνητη προώθηση δεδομένων στις θύρες. Ο δρομολογητή "
 "δεν πρέπει να λειτουργεί σε καταστάσεις 'DMZ' ή 'game mode'."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5561,8 +5640,8 @@
 "Παρακαλώ, επισκευθείτε την τοποθεσία http://filezilla-project.org για "
 "περισσότερες πληροφορίες σχετικά με το FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5570,17 +5649,17 @@
 "Παρακαλώ, επισκευθείτε την τοποθεσία http://filezilla-project.org για να "
 "αποκτήσετε την πιο πρόσφατη έκδοση."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Ταχυδρομικός κωδικός:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Προκαθορισμένες τοποθεσίες"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Διατήρηση των χρονικών σφραγίδων στα αρχεία"
 
@@ -5588,48 +5667,62 @@
 msgid "Preview:"
 msgstr "Προεπισκόπηση:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Η κύρια σύνδεση και τα πιστοποιητικά σύνδεσης δεδομένων δεν ταιριάζουν."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Εκτύπωση διαγνωστικών πληροφοριών που σχετίζονται με την εκκίνηση του "
+"FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Εκτύπωση πληροφοριών έκδοσης και έξοδος"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Προταιρεότητα στους φακέλους (προκαθορισμένο)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Προτεραιότητα"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Πολιτική προστασίας απορρήτου:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Πολιτική απορρήτου: Μόνο η αρχιτεκτονική της CPU, η εκδοσή του FileZilla και "
+"το λειτουργικό σύστημα που χρησιμοποιείτε θα υποβληθούν στον εξυπηρετητή."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Ιδιωτικά κλειδιά:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Πρω&τόκολλο:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Κωδικός πρόσβασης διαμεσολαβητή:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Επεξεργασία &λίστας αναμονής"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Πρωτόκολλο:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Θύρα διαμεσολαβητή:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Διαμεσολαβητής &χρήστη:"
 
@@ -5637,12 +5730,16 @@
 msgid "Proxy authentication failed"
 msgstr "Αποτυχία πιστοποίησης διαμεσολαβητή"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Απέτυχε η χειραψία με το διαμεσολαβητή: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Ο διαμεσολαβητής ξεκινάει με '[' αλλά η αγκύλη κλεισίματος δε βρέθηκε."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5659,23 +5756,23 @@
 "Το αίτημα του διαμεσολαβητή απορρίφθηκε: Άγνωστος τύπος διεύθυνσης ως "
 "απάντηση κατά την σύνδεση"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Μη έγκυρη θύρα διαμεσολαβητή"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Πιστοποίηση Δημόσιου Κλειδιού"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Αλγόριθμος δημοσίου κλειδιού:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Δημόσια δικαιώματα"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Η λίστα αναμονής έχει υποβληθεί σε πλήρης επεξεργασία"
 
@@ -5694,39 +5791,39 @@
 msgid "Queue: empty"
 msgstr "Λίστα αναμονής: κενή"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Αρχεία σε λίστα αναμονής"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Λίστα αναμονής:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "Ε&πανεκκίνηση συστήματος"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "&Δομή απομακρυσμένων φακέλων"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "Ε&παναφορά και επανατοποθέτηση των επιλεγμένων αρχείων"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Aκατέργαστη εντολή FTP"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Αν&άγνωση"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Ανα&νέωση"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Με&τονομασία"
 
@@ -5739,65 +5836,79 @@
 "τις επιλογές όλων των δρομολογητών (routers) και των τοίχων προστασίας "
 "(firewalls)."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Ανά&γνωση"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Μόνο-Ανάγνωση"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Ακύρωση τρέχουσας λειτουργίας;"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
 msgstr[0] "Να διαγραφεί ο φάκελος %d, καθώς και τα περιεχόμενα του;"
-msgstr[1] "Να διαγραφούν οι φάκελοι %d, καθώς και τα περιεχόμενα τους;"
+msgstr[1] ""
+"Να διαγραφούν οι φάκελοι %d, καθώς και τα περιεχόμενα τους από το διακομιστή;"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Να διαγραφεί το αρχείο %d;"
-msgstr[1] "Να διαγραφούν τα αρχεία %d;"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Να διαγραφεί το %s και το %s;"
+msgid "Really delete %s and %s from the server?"
+msgstr "Να διαγραφεί το %s και το %s από το διακομιστή;"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Να διαγραφούν όλα τα επιλεγμένα αρχεία και/ή οι φάκελοι από το διακομιστή;"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Διαγραφή όλων το επιλεγμένων αρχείων και/ή φακέλων;"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Να διαγραφούν όλα τα επιλεγμένα αρχεία και/ή οι φάκελοι από τον υπολογιστή "
+"σας;"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Αιτία"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Επανεκκίνηση τώρα"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Επα&ναληπτικά στους υποφακέλους"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"Ελήφθησαν περιεχόμενα καταλόγου τα οποία πυθανόν να έχουν κωδικοποιηθεί σε "
+"EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Λήφθηκε μια γραμμή με πάνω από 10000 χαρακτήρες, ματαίωση."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Λαμβάνονται ανεπιθύμητα δεδομένα"
 
@@ -5810,11 +5921,11 @@
 "σύνδεσης σε έναν εξυπηρετητή.\n"
 "Αν συνεχίσετε, η σύνδεση σας θα τερματιστεί."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Ρυθμίσεις επανασύνδεσης"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Επανασύνδεση στον εξυπηρετητή που χρησιμοποιήθηκε την τελευταία φορά"
 
@@ -5822,34 +5933,38 @@
 msgid "Redirection to invalid address"
 msgstr "Αναδρομολόγηση σε λάθος διεύθυνση"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Ανανέωση των λιστών αρχείων και φακέλων"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Απομνημόνευση κωδικών πρόσβασης;"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Αφαίρεση"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Απομακρυσμένο πιστοποιητικό μη εμπιστεύσιμο."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Απομακρυσμένο αρχείο"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Αναζήτηση απομακρυσμένου αρχείου"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Απομακρυσμένα φίλτρα:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Απομακρυσμένη διαδρομή"
 
@@ -5863,7 +5978,7 @@
 "έγκυρη, καθώς επίσης και ότι την υποστηρίζει ο τρέχων τύπος εξυπηρετητή (%s) "
 "της τοποθεσίας αυτής."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5875,7 +5990,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Αδυναμία προσπέλασης της απομακρυσμένης διαδρομής. Βεβαιωθείτε ότι είναι "
@@ -5885,11 +6000,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Η απομακρυσμένη διαδρομή ήταν αδύνατο να αναλυθεί."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Διαχείριση απομακρυσμένης διαδρομής:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Απομακρυσμένη διαδρομή:"
 
@@ -5897,76 +6012,76 @@
 msgid "Remote site:"
 msgstr "Απομακρυσμένη τοποθεσία:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Αφαίρεση &όλων"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Αφαίρεση &επιλεγμένων"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Μετονομασία αρχείου"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Μετονομασία επιλεγμένου φακέλου"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Μετονομασία επιλεγμένων αρχείων και φακέλων"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Μετονομασία του '%s' σε '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Αναφορά δυσλειτουργιών και αιτήματα για νέες δυνατότητες"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Ρητή απαίτηση FTP με TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Σιωπηρή απαίτηση FTP με TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Επαναφορά και επανατοποθέτηση &όλων"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Ανάλυση διεύθυνσης για %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Ανάλυση ονόματος κόμβου"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Απάντηση:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Αποτελέσματα:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Συνέχιση μεταφοράς αρχείου"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5975,38 +6090,38 @@
 "εξυπηρετητής χρησιμοποιεί διαφορετική μορφή τερματισμού γραμμής από τον "
 "πελάτη."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Ανάκτηση λίστας φακέλου..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Ανάκτηση εξωτερικής διεύθυνσης IP από %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Πιστοποιητικό βάσης μη εμπιστεύσιμο"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Ε&μφάνιση των αρχείων που επεξεργάζονται τώρα..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "Ε&μφάνιση του Διαχειριστή τοποθεσιών κατά την εκκίνηση"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Τ&ερματισμός συστήματος"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Διακοπή"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Σ&υγχρονισμός περιήγησης"
 
@@ -6014,31 +6129,47 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Αποθήκευση ρυθμίσεων;"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+"Η αποθήκευση του κωδικού πρόσβασης έχει απενεργοποιηθεί από το διαχειριστή "
+"του συστήματος σας .."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Η αποθήκευση των κωδικών πρόσβασης έχει απενεργοποιηθεί από εσάς."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Ανίχνευση αρχείων για πρόσθεση στην ουρά αναμονής"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Ανίχνευση αρχείων προς αποστολή"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Όροι &αναζήτησης:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Aναζήτηση &φακέλου:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Αναζήτηση αρχείων"
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Αναζήτηση αρχείων στον εξυπηρετητή"
 
@@ -6051,27 +6182,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Δείτε επίσης: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Επιλο&γή εξυπηρετητή"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Επιλογή &σελίδας:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Επιλογή θέματος"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Επιλογή προκαθορισμένης ενέργειας στην περίπτωση που ένα αρχείο σε μία "
 "μεταφορά υπάρχει ήδη."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Επιλογή προκαθορισμένου επεξεργαστή"
 
@@ -6091,7 +6222,7 @@
 "Επιλογή προεπιλογής ενέργειας υπάρχοντος αρχείου μόνο για τα επιλεγμένα "
 "αρχεία στη λίστα αναμονής."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Επιλογή τοποθεσίας αποθήκευσης του πακέτου"
 
@@ -6112,7 +6243,7 @@
 msgstr "Επιλογή αρχείου για τις εξαγόμενες ρυθμίσεις"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Επιλογή αρχείου για τις εξαγόμενες τοποθεσίες"
 
@@ -6128,12 +6259,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Επιλογή ονόματος αρχείου για το αρχείο-κλειδιού"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Επιλέξτε τον τρόπο με τον οποίο αυτά τα αρχεία θα ανοιχτούν."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Επιλογή προορισμού του φακέλου λήψης"
 
@@ -6141,15 +6272,15 @@
 msgid "Select target filename"
 msgstr "Επιλογή ονόματος αρχείου προορισμού"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Επιλογή κατηγοριών για εξαγωγή:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Επιλέξτε τα προσωπικά δεδομένα που θέλετε να διαγράψετε."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6164,7 +6295,7 @@
 msgstr[0] "Επιλεγμένος %d φάκελος."
 msgstr[1] "Επιλεγμένοι %d φάκελοι."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6185,7 +6316,7 @@
 msgstr[0] "Επιλεγμένο %d αρχείο. Συνολικό μέγεθος: Τουλάχιστον %s"
 msgstr[1] "Επιλεγμένα %d αρχεία. Συνολικό μέγεθος: Τουλάχιστον %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Επιλέχθηκε το %s και το %s για μεταφορά."
@@ -6200,13 +6331,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Επιλεγμένα %s και %s. Συνολικό μέγεθος: Τουλάχιστον %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Ο επιλεγμένος επεξεργαστής δεν υπάρχει."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Το επιλεγμένο αρχείο ήδη επεξεργάζεται"
 
@@ -6214,15 +6345,15 @@
 msgid "Selected file is already loaded"
 msgstr "Το επιλεγμένο αρχείο έχει ήδη φορτωθεί"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Το επιλεγμένο αρχείο είναι ήδη ανοιχτό"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Το επιλεγμένο αρχείο είναι ακόμα προς επεξεργασία"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Το επιλεγμένο φίλτρο λειτουργεί μόνο για τα τοπικά αρχεία."
 
@@ -6239,39 +6370,44 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Η επιλεγμένη θύρα συνήθως χρησιμοποιείτε από ένα άλλο πρωτόκολλο."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Αποστολή εντολών διατήρησης ενεργού FTP"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Αποστολή προσαρμοσμένης εντολής στον εξυπηρετητή, σε διαφορετική περίπτωση "
 "δεν είναι διαθέσιμος"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Αποστολή εντολής διατήρησης ενεργού"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Σειριακός Αριθμός:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Τύπος &εξυπηρετητή:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Ο εξυπηρετητής δε διέκοψε κανονικά τη σύνδεση TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Ο εξυπηρετητής δεν υποστηρίζει χαρακτήρες που δεν είναι ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6280,15 +6416,15 @@
 "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > %d GB. Τερματισμός "
 "μεταφοράς εφόσον το μέγεθος ταιριάζει."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Ο εξυπηρετητής δεν υποστηρίζει την επαναφορά αρχείων > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6297,7 +6433,7 @@
 "Ο εξυπηρετητής ίσως να μην υποστηρίζει την επαναφορά αρχείων > %d GB. "
 "Τερματισμός μεταφοράς εφόσον το μέγεθος ταιριάζει."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6305,11 +6441,11 @@
 "Ο εξυπηρετητής απαιτεί έναν λογαριασμό. Ορίστε έναν λογαριασμό "
 "χρησιμοποιώντας το διαχειριστή τοποθεσιών"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Ο εξυπηρετητής επέστρεψε κενή διαδρομή."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6317,13 +6453,13 @@
 "Ο εξυπηρετητής υπαγορεύει τη σύνδεση. Πρέπει να χρησιμοποιήσετε το "
 "διαδραστικό τύπο σύνδεσης."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Ο εξυπηρετητής απέστειλε παθητική απάντηση σε μη-δρομολογήσιμη διεύθυνση. "
 "Απέτυχε η παθητική μέθοδος λειτουργίας."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6343,102 +6479,113 @@
 msgid "Server sent unexpected reply."
 msgstr "Ο εξυπηρετητής έστειλε μία αναπάντεχη απάντηση."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Εξυπηρετητής προς Φυσική διεύθυνση (MAC) πελάτη:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Εξυπηρετητής προς αποτύπωμα πελάτη:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Τύπος εξυπηρετητή:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Εξυπηρετητής/Τοπικό αρχείο"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Εξυπηρετητής:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Λεπτομέρειες συνεδρίας"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Ορισμός &Προτεραιότητας"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Ορισμός δικαιωμάτων του '%s' στο '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize κλήθηκε χωρίς όνομα υποδοχής"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Ρυθμίσεις"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Εμφάνιση της &ακατέργαστης λίστας φακέλου"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Εμφάνιση του διαλόγου &καλωσορίσματος..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 "Να εμφανιστούν οι δομές των φακέλων και να συνεχιστεί η σύγκριση μεταξύ τους;"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Εμφανίζει τους διαθέσιμους αλγόριθμους κρυπτογράφησης TLS"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Εμφάνιση του διαλόγου βοήθειας"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Τερματισμός συστήματος"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Αλγόριθμος υπογραφής:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Εγγραφές &Διαχειριστή Τοποθεσιών"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Διαχειριστής τοποθεσιών"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Διαχειριστής Τοποθεσιών - Να μην αποθηκεύονται οι κωδικοί πρόσβασης"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Διαχειριστής τοποθεσιών - Μη έγκυρα δεδομένα"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοικτός"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Η επιλεγμένη τοποθεσία δεν υπάρχει."
 
@@ -6448,8 +6595,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Η διαδρομή τοποθεσίας είναι κακοσχηματισμένη."
 
@@ -6468,11 +6615,11 @@
 "αποθηκευτούν στο Διαχειριστή Τοποθεσιών\n"
 "Να προσθέτει η τρέχουσα σύνδεση στον διαχειριστή τοποθεσιών;"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Μέγεθος"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Μορφή μεγέθους"
 
@@ -6481,31 +6628,31 @@
 msgid "Size unknown"
 msgstr "Άγνωστο μέγεθος"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Παράβλεψη αρχείου"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Παράκαμψη λήψης του %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Παράκαμψη αποστολής του %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Κάποια αρχεία ακόμα επεξεργάζονται ή πρέπει να αποσταλούν."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6514,20 +6661,20 @@
 "από έναν δρομολογητή (router), μπορούν να απαντήσουν με την τοπική διεύθυνση "
 "IP τους."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Ταξινόμηση φακέλων σε σειρά"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "Η εντολή ταξινόμησης δε μπορεί να αλλάξει κατά την σύγκριση των φακέλων."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Ταξινόμηση"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Κατάσταση ταξινόμησης:"
 
@@ -6539,20 +6686,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Το πηγαίο αρχείο και αρχείο προορισμού δεν πρέπει να είναι ίδια"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Ο προορισμός και ο στόχος της λειτουργίας καταστροφής είναι όμοιοι"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Πηγαίο αρχείο:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Όρια ταχυτήτας"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Όρια ταχυτήτων"
 
@@ -6564,7 +6711,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Τα όρια ταχύτητας είναι ενεργά, πιέστε για να αλλάξουν."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Σταθερές και δοκιμαστικές εκδόσεις"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Σταθερές εκδόσεις μόνο"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "&Επείγουσα έναρξη μεταφοράς"
 
@@ -6572,43 +6727,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Εκκίνηση με άνοιγμα του διαχειριστή τοποθεσιών"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Εκκίνηση λήψης του %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Εκκίνηση αποστολής του %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Εκκίνηση τοπικής τοποθεσίας στη δεδομένη διαδρομή"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Περιφέρεια ή νομαρχία:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Κατάσταση"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Κατάσταση:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Διακοπή και απομάκρυνση &όλων"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Οδός:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Θέμα του πιστοποιητικού"
 
@@ -6616,11 +6775,11 @@
 msgid "Successful transfers"
 msgstr "Επιτυχημένες μεταφορές"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Σύνοψη αποτελεσμάτων δοκιμής:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6628,44 +6787,45 @@
 "Οι Συμβολικές συνδέσεις στα αρχεία δεν επηρεάζονται από αυτή την επιλογή, "
 "τέτοιες συμβολικές συνδέσεις διαγράφονται πάντα."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Συγχρονισμός περιήγησης"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Ο Συγχρονισμός περιήγησης έχει απενεργοποιηθεί."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Συντακτικό λάθος"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Συντακτικό σφάλμα στην γραμμή εντολών"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Σύστημα"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "&Γραμμή εργαλείων"
 
@@ -6673,11 +6833,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Η σύνδεση TLS/SSL εδραιώθηκε, αποστολή αιτήματος HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Σύνδεση TLS/SSL εδραιώθηκε, αναμονή μηνύματος υποδοχής..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Σύνδεση TLS/SSL εδραιώθηκε."
 
@@ -6685,27 +6845,31 @@
 msgid "TTL expired"
 msgstr "Έληξε TTL"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Το αρχείο υπάρχει ήδη"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Απομακρυσμένο αρχείο:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Το αρχείο προορισμού υπάρχει ήδη!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Το όνομα του αρχείου υπάρχει ήδη, θέλετε να συνεχίσετε;"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Αποτελέσματα δοκιμής"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Δοκιμή δυνατότητας επαναφοράς του εξυπηρετητή"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6723,7 +6887,7 @@
 "Ο Διαχειριστής τοποθεσιών είναι ήδη ανοιχτός σε ένα άλλο FileZilla 3.\n"
 "Παρακαλώ, κλείστε το διότι τα δεδομένα δε θα διαγραφούν."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Το έγγραφο XML δεν είναι καλοσχηματισμένο: %s"
@@ -6734,11 +6898,11 @@
 msgstr "Η διεύθυνση που εισάγατε ήταν: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Ο σελιδοδείκτης ήταν αδύνατο να προστεθεί."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Οι σελιδοδείκτες ήταν αδύνατο να απομακρυνθούν."
 
@@ -6750,19 +6914,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Η Προσαρμοσμένη ακολουθία σύνδεσης δεν πρέπει να είναι κενή."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Η σύνδεση δεδομένων δεν εδραιώθηκε: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Ο προκαθορισμένος επεξεργαστής αρχείων κειμένου δεν εντοπίσθηκε."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Ο προκαθορισμένος επεξεργαστής αρχείων κειμένου είναι '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
 "Αυτό το όνομα φίλτρου υπάρχει ήδη. Παρακαλώ, επιλέξτε ένα διαφορετικό όνομα."
@@ -6782,9 +6951,9 @@
 "Το αρχείο %s υπάρχει ήδη.\n"
 "Παρακαλώ, καταχωρίστε ένα νέο όνομα:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6800,14 +6969,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Το αρχείο '%s' δε μπορεί να φορτωθεί ή δεν περιέχει ιδιωτικό κλειδί."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Το αρχείο '%s' δε μπορεί να φορτωθεί."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6816,8 +6985,8 @@
 "Το αρχείο '%s' δε μπορεί να ανοιχθεί:\n"
 "Κανένα πρόγραμμα δεν έχει συσχετιστεί με αυτόν τον τύπο αρχείου."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6860,7 +7029,7 @@
 "που προστατεύει το αρχείο-κλειδιού δεν υποστηρίζεται από FileZilla.\n"
 "Επιθυμείτε να μετατραπεί σε ένα μη προστατευμένο αρχείο;"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Για το αρχείο που επιλέχθηκε δεν υπάρχει προεπιλεγμένος επεξεργαστής."
 
@@ -6896,11 +7065,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Οι ακόλουθοι χαρακτήρες θα αντικατασταθούν: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Τα ακόλουθα αρχεία επεξεργάζονται τώρα:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr ""
 "Το ελεύθερο λογισμικό ανοιχτού κώδικα (Πρωτόκολλο Μεταφοράς Αρχείων FTP)"
@@ -6909,7 +7078,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Οι καθολικοί σελιδοδείκτες ήταν αδύνατο να αποθηκευτούν."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6941,7 +7110,7 @@
 "Η χαμηλότερη θύρα πρέπει να είναι λιγότερο ή ίσο με την υψηλότερη διαθέσιμη "
 "θύρα."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6949,7 +7118,7 @@
 "Η νεώτερη έκδοση έχει ληφθεί. Κάντε κλικ στο Τερματισμός για να κλείσετε το "
 "FileZilla και να εκκινήσετε την εγκατάσταση."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6957,11 +7126,11 @@
 "Η νεώτερη έκδοση έχει ληφθεί. Παρακαλώ, εγκαταστήστε την με τον ίδιο τρόπο, "
 "όπως κάνετε και με αυτή την έκδοση."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Η λίστα αναμονής δε μπόρεσε να αποθηκευτεί."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6975,26 +7144,26 @@
 msgid "The selected categories have been imported."
 msgstr "Εισήχθησαν οι επιλεγμένες κατηγορίες."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Το επιλεγμένο αρχείο περιέχει δεδομένα για εισαγωγή στις ακόλουθες "
 "κατηγορίες:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Το επιλεγμένο αρχείο ήδη επεξεργάζεται:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Το επιλεγμένο αρχείο είναι ήδη ανοιγμένο σε κάποιο άλλο πρόγραμμα, παρακαλώ "
 "κλείστε το."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -7012,7 +7181,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Ο εξυπηρετητής απέστειλε μία αναπάντεχη ή μη αναγνωρισμένη απάντηση."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "Ο εξυπηρετητής χρησιμοποιεί την ακόλουθη κωδικοποίηση χαρακτήρων για τα "
@@ -7027,7 +7196,7 @@
 "το πιστοποιητικό και βεβαιωθείτε ότι μπορείτε να εμπιστευτείτε αυτόν τον "
 "εξυπηρετητή."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -7037,7 +7206,7 @@
 "σημαίνει ότι ο διαχειριστής άλλαξε το κλειδί ή προσπαθείτε να συνδεθείτε σε "
 "έναν άλλον υπολογιστή, προσποιούμενοι τον εξυπηρετητή."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -7053,17 +7222,17 @@
 "Οι ρυθμίσεις έχουν εισαχθεί. Επανεκκινήστε το FileZilla για να εκτελεστούν "
 "οι ρυθμίσεις."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "Το σύστημα θα επανεκκίνηθεί, εκτός αν επιλέξετε να ακυρωθεί η ενέργεια αυτή."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 "Το σύστημα θα τερματίσει την λειτουργία του, εκτός αν επιλέξετε Ακύρωση."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -7071,7 +7240,7 @@
 "Το αρχείο προορισμού υπάρχει ήδη.\n"
 "Παρακαλώ, επιλέξτε μία ενέργεια."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr ""
 "Η δοκιμή απέτυχε. Είστε σίγουροι ότι θέλετε να αποθηκεύσετε τις ρυθμίσεις;"
@@ -7080,11 +7249,11 @@
 msgid "Themes"
 msgstr "Θέματα"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Τα ορίσματα του φίλτρου δε μπορούν να απομακρυνθούν."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Αυτά τα ορίσματα φίλτρου δε μπορούν να μετονομασθούν."
 
@@ -7096,7 +7265,7 @@
 "Αυτό σημαίνει ότι κάποιος δρομολογητής (router) ή/και τοίχος προστασίας "
 "(firewall) παρεμποδίζουν ακόμα το FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7104,7 +7273,7 @@
 "Αυτό λειτουργεί μόνο αν βρίσκεστε πίσω από δρομολογητή (router), αλλιώς το "
 "σύστημα σας θα επιστρέψει την εσωτερική διευθυνσή σας."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7113,25 +7282,25 @@
 "τα τοίχοι προστασίας (firewalls) που μπορεί να έχετε και θα δοκιμάσει τις "
 "ρυθμίσεις σας."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Ώρα"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Μορφοποίηση ώρας"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Διακ&οπή σε δευτερόλεπτα:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Διακοπή"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7140,23 +7309,23 @@
 "Απόκλιση χρονικής ζώνης: Εξυπηρετητής: %d δευτερόλεπτα. Τοπική: %d "
 "δευτερόλεπτα. Διαφορά: %d δευτερόλεπτα."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Τίτλος:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Για να συγκρίνουν οι φάκελοι, οι δύο λίστες αρχείων πρέπει να "
 "ευθυγραμμιστούν."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Για να γίνει αυτό, θα πρέπει και οι δύο δομές των φακέλων να είναι "
 "ταυτόχρονα σε κατάσταση εμφάνισης ή απόκρυψης."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7164,7 +7333,7 @@
 "Για να υποστηρίξει το FileZilla την πιστοποίηση του δημόσιου κλειδιού, "
 "πρέπει να γνωρίζει το ιδιωτικό κλειδί του χρήστη."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7181,7 +7350,7 @@
 "πλευρά\n"
 "Κόκκινο: Διαφορετικό μέγεθος αρχείου"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7192,24 +7361,24 @@
 "ανάλογες αλλαγές στη δομή των απομακρυσμένων φακέλων στον εξυπηρετητή ή και "
 "αντίστροφα."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Εναλλαγές σχετικές με την επεξεργασία της λίστας αναμονής μεταφορών"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Εναλλαγές σχετικές με την εμφάνιση της δομής των τοπικών φακέλων"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Εναλλαγές σχετικές με την εμφάνιση του αρχείου συμβάντων"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr ""
 "Εναλλαγές σχετικές με την εμφάνιση της δομής των απομακρυσμένων φακέλων"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Εναλλαγές σχετικές με την εμφάνιση της λίστας αναμονής μεταφορών"
 
@@ -7222,37 +7391,37 @@
 msgstr "Πάρα πολλές αναδρομολογήσεις"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Εντοπισμός:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Μεταφορά"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Κατεύθυνση μεταφοράς"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Τύπος μεταφοράς"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Κατάσταση μεταφοράς"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Λίστα αναμονής"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Ρυθμίσεις μεταφοράς"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Διακόπηκε η μεταφορά: %s"
@@ -7261,8 +7430,8 @@
 msgid "Transferred data got tainted."
 msgstr "Τα δεδομένα που μεταφέρθηκαν μολύνθηκαν."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Μεταφορά"
 
@@ -7270,69 +7439,69 @@
 msgid "Transfers"
 msgstr "Μεταφορές"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Οι μεταφορές ολοκληρώθηκαν"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Χειρισμός των αρχείων &χωρίς επέκταση ως ASCII αρχεία"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Χειρισμός των &ακόλουθων τύπων αρχείων ως ASCII αρχεία:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Έμπιστο αλλαγμένο κλειδί κόμβου:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Νέο έμπιστο κλειδί κόμβου:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Να θεωρηθεί έμπιστο το νέο κλειδί και να συνεχίσει η σύνδεση;"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Να θεωρηθεί έμπιστο αυτό το πιστοποιητικό και να συνεχίσει η σύνδεση;"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Να θεωρηθεί έμπιστος αυτός ο κόμβος και να συνεχίσει η σύνδεση;"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Τύπος"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Τύπος του διαμεσολαβητή FTP:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Τύπος του γενικού διαμεσολαβητή:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "Α&ποστολή"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Όριο α&ποστολής:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Χ&ρήση διαθέσιμων συσχετίσεων"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Χ&ρήση των προκαθορισμένων από το σύστημα"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "ΧΡΗΣΤΗΣ@&ΚΟΜΒΟΣ"
 
@@ -7341,16 +7510,16 @@
 msgid "Unassigned error code %d"
 msgstr "Απροσδιόριστος ο κωδικός σφάλματος %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Μονάδα:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Άγνωστο"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Άγνωστος τύπος διαμεσολαβητή FTP, δε μπορεί δημιουργηθεί ακολουθία σύνδεσης."
@@ -7364,7 +7533,7 @@
 msgid "Unknown certificate"
 msgstr "Άγνωστο πιστοποιητικό"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7372,7 +7541,7 @@
 "Άγνωστο σφάλμα κατά το άνοιγμα του αρχείου. Σιγουρευτείτε, ότι το αρχείο "
 "μπορεί να προσπελαστεί και είναι ένα καλοσχηματισμένο έγγραφο XML."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Άγνωστο κλειδί κόμβου"
 
@@ -7385,7 +7554,7 @@
 "Άγνωστης έκδοσης πρωτόκολλο SOCKS, το Όνομα Χρήστη και ο κωδικός πρόσβασης "
 "υπό διαπραγμάτευση πιστοποίησης: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7409,7 +7578,7 @@
 "Αν δεν επιδιορθωθεί αυτό το πρόβλημα, η ενεργητική κατάσταση FTP δε μπορεί "
 "να χρησιμοποιηθεί και θα χρησιμοποιηθεί η παθητική."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Μη υποστηριζόμενος τύπος πιστοποίησης"
 
@@ -7417,25 +7586,24 @@
 msgid "Unsupported redirect"
 msgstr "Μη υποστηριζόμενη αναδρομολογήση"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Απ&οστολή και αναίρεση επεξεργασίας"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Έλεγχος αναβαθμίσεων"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Οδηγός αναβάθμισης"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Ενημερώσεις"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Αποστολή"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Αποτυχία αποστολής"
 
@@ -7448,102 +7616,102 @@
 msgid "Upload limit: none"
 msgstr "Όριο αποστολής: όχι"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Αποστολή επιλεγμένου φακέλου"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Αποστολή επιλεγμένων αρχείων και φακέλων"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Ααποστολή αυτού του αρχείου πίσω στον εξυπηρετητή;"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Αποστολή αυτού του αρχείου στον εξυπηρετητή;"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Αποστολή"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Αποστολή και αναμονή αφαίρεσης"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Αποστολή και αναίρεση επεξεργασίας"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Χρήση &προσαρμοσμένης κωδικοποίησης χαρακτήρων"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Χρήση &προκαθορισμένου επεξεργαστή:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Χρήση &προκαθορισμένου επεξεργαστή για τα αρχεία κειμένου"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Χρήση &συγχρονισμού περιήγησης"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Χρήση της κωδικοποίησης χαρακτήρων UTF-8 εάν υποστηρίζεται από τον "
 "εξυπηρετητή, αλλιώς κάντε χρήση της τοπικής κωδικοποίησης χαρακτήρων."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "&Χρήση προκαθορισμένης ενέργειας"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Χρήση απλού FTP"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Ο τρέχον εξυπηρετητής είναι συνδεμένος στο"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Χρήση εξυπηρετητή από το διαχειριστή τοποθεσιών"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Χρήση των &προκαθορισμένων από το σύστημα"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Χρησή της ακόλουθης διεύθυνσης IP:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Χρήση του ακόλουθου εύρους θυρών:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr ""
 "Σε αντίθετη περίπτωση, να γίνεται χρήση της εξωτερικής διεύθυνση IP του "
 "εξυπηρετητή"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Χρησημοποιήστε αυτό αν είστε πίσω από δρομολογητή (router) και έχετε στατική "
 "εξωτερική διεύθυνση IP."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7554,89 +7722,89 @@
 "χρησιμοποιήσετε για πρώτη φορά την ενεργητική κατάσταση μεταφοράς. Μόνο η "
 "έκδοση του FileZilla που χρησιμοποιείτε θα δωθεί στον εξυπηρετητή."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Χρήστης:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Το όνομα χρήστη δε μπορεί να είναι μια σειρά κενών διαστημάτων"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Χρήση του διαμεσολαβητή %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Η χρήση λανθασμένης κωδικοποίησης χαρακτήρων προκαλεί σφάλματα στην εμφάνιση "
 "των ονομάτων των αρχείων."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Χρησιμοποιώντας τον οδηγό αυτό μπορείτε να ελέγξετε τις διαθέσιμες "
 "αναβαθμίσεις του FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Έγκυρο από:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Έγκυρο προς:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr ""
 "Περιφραστικά μηνύματα καταγραφής από τα wxWidgets (γραφικά συστατικά μορφής "
 "wx)"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Επικύρωση πιστοποιητικού..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Έκδοση:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Πολύ υψηλό"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 "Προβολή κρυφών ενεργοποιήθηκε, αλλά δεν υποστηρίζεται από τον εξυπηρετητή"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Προβολή/Επεξεργασία"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Ορατές στήλες"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "Ε&γγραφή"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Αναμονή"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Αναμονή για σύνδεση αναζήτησης"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Αναμονή για κωδικό πρόσβασης"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Αναμονή για ματαίωση της μεταφοράς"
 
@@ -7644,7 +7812,7 @@
 msgid "Waiting to retry..."
 msgstr "Αναμονή για νέα προσπάθεια..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7673,12 +7841,12 @@
 "com/kb/931130\n"
 "Το FileZilla θα τερματίζει σε μεγάλες μεταφορές."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr ""
 "Προειδοποίηση, αγνόηση δεδομένων σύνδεσης λόγω εσφαλμένης διεύθυνσης IP."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7693,23 +7861,32 @@
 "\n"
 "Θέλετε να ελέγξετε τις nightly builds;"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Προειδοποίηση: Πιθανή παραβίαση της ασφαλείας!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Καλωσορίσατε στο FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Τι νέο υπάρχει"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Ενημερώσεις:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Επιτρέποντας στο FileZilla να απομνημονεύσει τους κωδικούς πρόσβασης, "
+"μπορείτε να συνδεθείτε ξανά χωρίς να χρειάζεται να εισαγάγετε ξανά τον "
+"κωδικό πρόσβασής σας μετά την επανεκκίνηση του προγράμματος."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7718,11 +7895,15 @@
 "υποστηρίζονται από το τοπικό λειτουργικό σύστημα θα αντικαθίστανται κατά την "
 "λήψη τέτοιων αρχείων."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Ευρεία οθόνη"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Επιθυμείτε το FileZilla να απομνημονεύσει τον κωδικό πρόσβασης;"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Εγ&γραφή"
 
@@ -7735,11 +7916,19 @@
 msgid "Wrong line endings"
 msgstr "Εσφαλμένοι τερματισμοί γραμμών"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ναι"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Φαίνεται να χρησιμοποιείτε μόνο IPv6 κόμβο. Αυτός ο οδηγός δεν υποστηρίζει "
+"αυτό το περιβάλλον."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7747,18 +7936,18 @@
 "Χρησιμοποιείτε την τελευταία έκδοση του FileZilla. Παρακαλώ, ελέγξτε ξανά "
 "στο μέλλον."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 "Μπορείτε να ανοίξετε τον εν λόγω διάλογο επιλογών και μέσα από τη βοήθεια."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Μπορείτε να αφήσετε το πεδίο θύρας κενό για να χρησιμοποιηθεί η "
 "προεπιλεγμένη θύρα."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7783,12 +7972,12 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Δε δώσατε νέο όνομα στο αρχείο. Αντικατάσταση του αρχείου;"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Έχετε επιλέξει μία τουλάχιστον συμβολική σύνδεση."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7796,7 +7985,7 @@
 "Έχετε επιλέξει περισσότερα από 10 αρχεία για επεξεργασία, θέλετε πραγματικά "
 "να συνεχιστείτε;"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7805,11 +7994,11 @@
 "πραγματικά να συνεχιστείτε;"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Πρέπει να καταχωρίσετε ένα όνομα κόμβου."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Πρέπει να καταχωρίσετε ένα τοπικό φάκελο."
 
@@ -7818,17 +8007,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Πρέπει να καταχωρίσετε μία έγκυση διεύθυνση IP."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Πρέπει να καταχωρίσετε έναν εγγράψιμο τοπικό φάκελο."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Πρέπει να καταχωρίσετε ένα όνομα λογαριασμού"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Πρέπει να ορίσετε ένα όνομα χρήστη"
 
@@ -7848,22 +8037,22 @@
 msgid "You need to enter a name for the log file."
 msgstr "Απαιτείται η εισαγωγή ονόματος για το αρχείο συμβάντων."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Πρέπει να καταχωρίσετε μία κατάλληλη αναφορά εντολής."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Πρέπει να καταχωρίσετε έναν κόμβο διαμεσολαβητή."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Απαιτείται η εισαγωγή θήρας διαμεσολαβητή, με εύρος από 1 έως 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Απαιτείται η εισαγωγή τουλάχιστον μίας διαδρομής, δεν υποστηρίζονται κενοί "
@@ -7871,7 +8060,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7880,7 +8069,7 @@
 "προκειμένου να ενεργοποιηθεί ο συγχρονισμός περιήγησης για αυτόν το "
 "σελιδοδείκτη."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7912,44 +8101,49 @@
 "Δε θα πρέπει να έχετε προβλήματα σύνδεσης σε άλλους εξυπηρετητές, οι "
 "μεταφορές αρχείων πρέπει να λειτουργούν σωστά."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "μετά από"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "πριν από"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "ξεκινάει με"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "περιέχει"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "δεν περιέχει"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "δεν ισούται"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "τελειώνει με"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "ισούται"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "αρχείο"
 
@@ -7968,82 +8162,132 @@
 "Σιγουρευτείτε ότι το εκτελέσιμο αρχείο συνυπάρχει στον ίδιο φάκελο με το "
 "κύριο εκτελέσιμο αρχείο του FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "το fzsftp δε μπόρεσε να εκκινήθει"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "επέστρεψε το gnutls_certificate_get_peers, δεν υπάρχουν πιστοποιητικά"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "μεγαλύτερο από"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "ομαδικά εκτελέσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "ομαδικά αναγνώσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "ομαδικά εγγράψιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "είναι ίσο με το"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "είναι ορισμένο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "δεν είναι ορισμένο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "μικρότερο από"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "κανονικό ταίριασμα"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "ιδιωτικά εκτελέσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "ιδιωτικά αναγνώσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "ιδιωτικά εγγράψιμο"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "άγνωστο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "δημόσια εκτελέσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "δημόσια αναγνώσιμο"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "δημόσια εγγράψιμο"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Αντιγραφή"
+
+#~ msgid "Cop&y"
+#~ msgstr "Αντ&ιγραφή"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Ενεργοποίηση αυτόματου ελέγχου αναβαθμίσεων"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Αριθμός ημερών ανάμεσα στους ελέγχους αναβαθμίσεων:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Τουλάχιστον 7 ημέρες)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Αυτόματος έλεγχος αναβαθμίσεων"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Έλεγχος για δοκιμαστικές εκδόσεις (&beta) του FileZilla"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr ""
+#~ "Παρακαλώ, καταχωρίστε ένα διάστημα ελέγχου αναβάθμισης που να είναι "
+#~ "τουλάχιστον 7 ημέρες"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Πολιτική προστασίας απορρήτου:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "Να θυμάστε αυτό για κάθε μελλοντική χρήση κωδικού πρόσβασης"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "Λανθασμένο opState: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Υπάρχει όμοιο όνομα φίλτρου"
 
@@ -8067,9 +8311,6 @@
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Αδυναμία φόρτωσης του κυρίως μενού από το αρχείο resource "
 
-#~ msgid "bytes"
-#~ msgstr "bytes"
-
 #~ msgid "Downloads unlimited."
 #~ msgstr "Λήψη απεριόριστη."
 
@@ -8307,9 +8548,6 @@
 #~ msgid "Theme error"
 #~ msgstr "Σφάλμα Θέματος"
 
-#~ msgid "item not found"
-#~ msgstr "το στοιχείο δεν βρέθηκε"
-
 #~ msgid "themes.xml missing, can not get theme data"
 #~ msgstr "το themes.xml λέιπει, δεν μπορούν να βρεθούν τα δεδομένα θέματος"
 
diff -Nru filezilla-3.5.3/locales/es.po filezilla-3.7.3~precise/locales/es.po
--- filezilla-3.5.3/locales/es.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/es.po	2013-06-10 18:45:03.000000000 +0000
@@ -3,30 +3,28 @@
 msgstr ""
 "Project-Id-Version: Filezilla 3.2.5\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-10-27 13:25+0100\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-04-07 09:12+0100\n"
 "Last-Translator: \n"
 "Language-Team: American English <kde-i18n-doc@kde.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Country: SPAIN\n"
-"X-Poedit-Language: Spanish\n"
+"Language: es_ES\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 1.0\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S transcurrido"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "quedan %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -44,9 +42,9 @@
 msgstr[0] "%d directorio"
 msgstr[1] "%d directorios"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -55,9 +53,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -78,7 +76,7 @@
 msgstr[0] "%d archivo. Tamaño total: Al menos %s"
 msgstr[1] "%d archivos. Tamaño total: Al menos %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d archivos añadidos a la cola"
@@ -90,31 +88,21 @@
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Servidor"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Contraseña"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, fuzzy, c-format
+msgid "%s (%s/s)"
 msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -129,7 +117,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - ¡Todavía no es válido!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Usuario del proxy"
@@ -151,27 +139,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
+#: ../../locales/../src/interface/updatewizard.cpp:902
+#, fuzzy, c-format
+msgid "%s bytes (%s/s)"
 msgstr "%s bytes (%d B/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -186,7 +164,7 @@
 "Por favor descargue FileZilla de nuevo. Si este problema persiste, por favor "
 "envíe un informe del fallo."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -209,152 +187,148 @@
 msgid "%s with %d bits"
 msgstr "%s con %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nombre de usuario"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Contraseña del proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Acerca de..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Cuenta:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Activo"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Añadir marcador..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Añadir archivos a la cola"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Añadir archivo de clave..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Añadir a la cola"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "Ajustar zona horaria del servidor:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Siempre confiar en el certificado en futuras sesiones."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Confiar siempre en este sitio, añadir su clave a la caché"
 
-#: resources.h:939
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Us&ar siempre el editor predeterminado"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "Us&ar siempre selección para archivos no asociados"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "Usar &siempre esta acción"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Preguntar su dirección IP externa al sistema operativo"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automático"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "Detectar &automáticamente"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binario"
 
-#: resources.h:899
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Prefijos &binarios usando símbolos SI (p. ej. 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Marcadores"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Examinar..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Tolerancia a ráfa&gas:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Comprobar si hay versiones beta de FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Limpiar información privada..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Cerrar FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configurar los límites de velocidad..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Configurar..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Conectar"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "Cop&iar"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Copiar conexión actual al gestor de sitios..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copiar al portapapeles"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Fallo"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Crear directorio"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "Abrir una nueva pestaña"
 
@@ -362,170 +336,171 @@
 msgid "&Debug"
 msgstr "&Depuración"
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Información de depuración en el log de mensajes:"
 
-#: resources.h:932
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "E&ditor predeterminado:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Acción predeterminada si el archivo ya existe..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Intervalo entre intentos de conexión fallidos:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Borrar"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Borrar enlace simbólico"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "Comparación de &directorios"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Descartar archivo local y entonces descargar y editar archivo nuevo"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Desconectar"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Desconectar del servidor"
 
-#: resources.h:875
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "&Mostrar la velocidad de transferencia momentánea en lugar de la velocidad "
 "media"
 
-#: resources.h:897
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Mostrar tamaño en bytes"
 
+#: resources.h:503
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "N&o guardar contraseñas"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&No mostrar de nuevo este diálogo"
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&No usar dirección IP externa en conexiones locales."
 
-#: resources.h:919
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Acciones de &doble clic sobre archivos:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Descargar"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Descargar a:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Descargar..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Descargas:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Edición"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Editar reglas de filtro..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Activar"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "&Permitir comprobación automática de actualizaciones"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "Activar límites de velocidad"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Codificación:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "Ci&frado:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Introducir comando personalizado..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Ejecutar"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Exportar entradas del gestor de sitios"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exportar..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Revertir a modo activo"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Archivo"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Atributos de archivo..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Permisos de &archivo..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Archivo:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Conjuntos de Filtros:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "Conjuntos de Filtros:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtros:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Finalizar"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Terminar edición y borrar el archivo local"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -533,479 +508,490 @@
 "Simplificar rutas remotas, descargar todos los archivos que contengan "
 "directamente al directorio destino"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Borrar destino de enlaces simbólicos a directorios con su contenido"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "O&btener la IP externa a partir de la siguiente URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "Obtener a&yuda..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Marcador &global"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 usando método CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "A&yuda"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Ocultar archivos idénticos"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "La más &alta"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "Puerto más &alto disponible:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Servidor:"
 
-#: resources.h:898
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Prefijos binarios &IEC (p.ej. 1 KiB = 1024 bytes)"
 
-#: resources.h:886
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (ejemplo: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importar..."
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "Usar asociaciones de t&ipos de archivo del sistema"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Matener estructura de la ruta remota relativa a raíz de búsqueda"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "Distribución de los pane&les de archivos y directorios:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limitar puertos locales usados por FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limitar el número de conexiones simultáneas"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Árbol de directorio &local"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Directorio &local:"
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Log to file"
 msgstr "Guardar registro en &archivo"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Modo de acceso:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Modo de acceso:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Baja"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Gestionar marcadores..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transferencia &manual..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Número &máximo de conexiones"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Número &máximo de reintentos:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Registro de mensajes"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimizar a la barra de tareas"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nombre:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Asistente de configuración de red..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Nuevo"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Nuevo sitio"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "¡Nueva versión disponible!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Siguiente >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&No"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Ninguno"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Número de días entre comprobaciones de actualización:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "Valor &numérico:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&Aceptar"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&Abrir"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Abrir"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "S&obreescribir"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Pasivo"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Contraseña:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "Re&producir sonido"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Puerto:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Posición del registro de mensajes:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Preservar información horaria de los archivos transferidos"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "Co&la de transferencia"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Conexión rápida"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Barra de &conexión rápida"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "Lee&r"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Reconectar"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Actualizar"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Recordar la contraseña para esta sesión"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+#, fuzzy
+msgid "&Remember passwords"
+msgstr "&Recordar la contraseña para esta sesión"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Directorio &remoto:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Ruta remota:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Quitar"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Eliminar clave"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "Quitar los seleccionados"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Renombrar"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Renombrar..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Reabrir archivo local"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Reemplazar los caracteres no válidos por:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "Informar de un &fallo..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Reiniciar y poner de nuevo en cola todo"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Reiniciar Asistente"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Reanudar"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "Ejecuta&r comando..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Ejecutar ahora el asistente de configuración..."
 
-#: resources.h:950
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Ejecutar ahora la comprobación de actualizaciones..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&Sitio"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "Guardar como..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "Bu&scar"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "Bu&scar archivos en remoto..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "Seleccione el sitio:"
 
-#: resources.h:930
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Seleccione el idioma:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Seleccione las columnas que deberían mostrarse:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Servidor"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Opciones"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Opciones..."
 
-#: resources.h:965
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Mostrar menú de depuración"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "Mostrar men&saje"
 
-#: resources.h:955
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Mo&strar fecha y hora en el registro de mensajes"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Gestor de sitios..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Marcador específico de &sitio"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Saltar"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "Límites de &velocidad"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Comenzar tran&sferencia inmediatamente"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Intercambiar paneles local y remoto"
 
+#: resources.h:638
+#, fuzzy
+msgid "&TLS Ciphers"
+msgstr "Cifrado:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "Probar"
 
-#: resources.h:878
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transferencia"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Modo de &transferencia:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Cola de &transferencia"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Tratar los archivos punto como ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Deshacer edición"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Actualizar en caché la clave de este sitio"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Subir"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Subidas:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Usar programa personalizado"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Usar navegación s&incronizada"
 
-#: resources.h:934
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Usar editor predeterminado del sistema para archivos de texto"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Usar la siguiente dirección IP:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Utilizar en su lugar la dirección IP externa del servidor"
 
-#: resources.h:901
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Usar separador de miles"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Usuario:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Nombre de &usuario:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versión %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Ver"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Ver/Editar"
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Monitorizar los ficheros editados localmente y preguntar si subir "
 "modificaciones"
 
-#: resources.h:136
+#: resources.h:973
+#, fuzzy
+msgid "&When checking for updates, check for:"
+msgstr "Comprobando actualizaciones"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Escribir"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Sí"
 
@@ -1023,11 +1009,29 @@
 msgstr "'%s' no es un directorio."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "El acceso con cuenta no está soportado por el protocolo seleccionado"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+#, fuzzy
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"FileZilla se está ejecuntado en modo kiosko.\n"
+"Los inicios de sesión 'Normal' y 'Cuenta' no están disponibles en este modo."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+#, fuzzy
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Los inicios de sesión 'Normal' y 'Cuenta' no están disponibles. Tu entrada "
+"se ha cambiado a \"Solicitar contraseña\"."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1045,120 +1049,116 @@
 msgstr[0] "(%d objecto filtrado)"
 msgstr[1] "(%d objectos filtrados)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 para no limitar)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 segundos)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 para desactivar)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(Mínimo 7 días)"
-
-#: resources.h:894
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(ejemplo: %H:%M)"
 
-#: resources.h:888
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(ejemplo: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(en %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S restantes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", Quedan --:--:--"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- El enrutador y/o cortafuegos no funciona"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Fichero corrupto en el servidor espejo"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Software malicioso en tu sistema"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "Quedan --:--:--"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c no puede ser usado junto con una URL de FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "- Sólo se puede usar con una URL de FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s y -c no pueden estar presentes al mismo tiempo."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s no puede ser usado junto con una URL de FTP."
 
-#: resources.h:967
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Ninguno"
 
-#: resources.h:968
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Alerta"
 
-#: resources.h:969
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Informativo"
 
-#: resources.h:970
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Detallado"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "Sistema de 32 bit"
 
-#: resources.h:971
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Depuración"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "Sistema de 64 bit"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Atrás"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1169,17 +1169,18 @@
 "Ya existe un marcador con el nombre introducido. Por favor introduzca un "
 "nombre sin usar."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Es necesario fijar un editor predeterminado."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr ""
 "No se puede arrastrar un directoriodentro de uno de sus subdirectorios."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1189,30 +1190,30 @@
 "tales casos, se debería usar el modo activo. En modo activo, FileZilla abre "
 "un puerto y pide al servidor que se conecte al mismo."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Ha sido cambiado un archivo abierto previamente."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 ""
 "Un archivo con ese nombre ya está siendo editado. ¿Desea volver a abrir '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Ya se está transfiriendo un archivo con ese nombre."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Un archivo con ese nombre ya está siendo editado. Por favor ciérralo e "
 "inténtalo de nuevo."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1226,11 +1227,11 @@
 "Si no corrige este problema, podrían faltar archivos en los listados.\n"
 "No se mostrarán más avisos durante esta sesión."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Hay disponible una versión nueva de FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1239,7 +1240,7 @@
 "servidores con problemas ocultan archivos al usuario. Use esta opción para "
 "forzar al servidor a mostrar todos los archivos."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1257,15 +1258,15 @@
 "¿Desactivar navegación sincronizada y continuar cambiando el directorio "
 "local?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "A&gregar"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "Permitir &la reanudación de archivos ASCII"
 
@@ -1277,55 +1278,55 @@
 msgid "A&pply only to uploads"
 msgstr "A&plicar sólo a las subidas"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "Aplicar a todos los ficheros y directorios"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Eliminar a&utomáticamente transferencias satisfactorias"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Abortar la conexión anterior y conectar en la pestaña actual"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Acerca de FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Encima de la lista de archivos"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Cuenta"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Acción después de &completar la cola de archivos"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Acción sobre archivo seleccionado:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Acción a realizar:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Acción:"
 
@@ -1360,23 +1361,23 @@
 "dirección IP externa correcta, pero su enrutador o el cortafuegos ha "
 "modificado erróneamente la dirección IP enviada."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP para modo activo"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Añadir archivos sólo a la cola"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Añadir carpeta seleccionada a la cola de transferencia"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Añadir archivos y carpetas seleccionados a la cola de transferencia"
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Añadir a la cola"
 
@@ -1384,28 +1385,44 @@
 msgid "Address type not supported"
 msgstr "Tipo de dirección no admitida"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avanzado"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opciones avanzadas:"
 
-#: resources.h:338
+#: resources.h:976
+#, fuzzy
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Consejo: A menos que quieras probar las nuevas funciones, por favor sigue "
+"usando sólo versiones estables. Las versiones beta y nightly builds son "
+"versiones de desarrollo destinadas a realizar pruebas. Las versiones nightly "
+"builds de FileZilla pueden no funcionar como se esperaba, e incluso podrían "
+"dañar su sistema. Utiliza las versiones beta y nightly builds asumiendo el "
+"riesgo."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritmo:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Todos los ficheros se han transferido con éxito"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Todos los puertos del intervalo dado tienen que estar entre 1024 y 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1416,19 +1433,19 @@
 "Todos los ficheros se han transferido con éxito, salvo %d ficheros que no "
 "pudieron transferirse."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Permitir volver a otro modo de trans&ferencia si falla"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Permitir probar otro modo de transferencia si falla"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Ya está conectado"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1436,7 +1453,7 @@
 "Alternativamente puede usar la herramienta Pageant de PuTTy para gestionar "
 "sus claves, FileZilla reconoce Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1444,7 +1461,7 @@
 "Alternativamente puede usar su cliente de SSH del sistema. Para hacerlo, "
 "asegúrese de que la variable de entorno SSH_AUTH_SOCK está definida."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1452,7 +1469,7 @@
 "Alternativamente, visite http://filezilla-project.org para descargar la "
 "versión más reciente."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1461,7 +1478,7 @@
 "Ha ocurrido un error cargando la cola de transfererencia desde \"%s\".\n"
 "Algunos objetos de la cola prodrían no haberse restaurado."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1470,7 +1487,7 @@
 "Ha ocurrido un error guardando la cola de transfererencia en \"%s\".\n"
 "Algunos objetos de la cola prodrían no haberse guardado."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1478,28 +1495,28 @@
 "Ya existe un elemento con el mismo nombre que el que se ha arrastrado en la "
 "localización indicada."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Otra operación remota está ya en ejecución, ahora no puedo cambiar el "
 "directorio."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "No se pudo guardar ningún cambio realizado al gestor de sitios."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1507,58 +1524,58 @@
 "No se guardará ningún cambio realizado en el gestor de sitios a menos que "
 "repare el archivo."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "No se pudo guardar ningún cambio realizado a los filtros."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "No se guardará ningún cambio realizado a los filtros."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Aplicar sólo a directorios"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Aplicar"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Aplicar solamente a la &cola actual"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Aplicar sólo a ficheros"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archivo"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Como pestaña en el panel de cola de transferencia"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Preguntar acción"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Preguntar la contraseña"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Pedir un puerto al sistema operativo."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Pregunta la dirección IP externa al sistema operativo."
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Hacer preguntas en el foro de FileZilla"
 
@@ -1566,40 +1583,36 @@
 msgid "Associated program not found:"
 msgstr "Programa asociado no encontrado:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Al menos una condición de filtro está incompleta"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr ""
 "Llegados a este punto, toda la información obligatoria ha sido recogida."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "La autenticación falló."
 
-#: resources.h:879
+#: resources.h:901
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Automático"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Clasificación automática de tipos de archivo"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Comprobación automática de actualizaciones"
-
-#: resources.h:883
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Tamaños disponibles"
 
@@ -1608,66 +1621,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Evitar prox&y"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instrucciones de uso básicas"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Comportamiento"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Siendo editado"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Marcar unión de cadenas"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "¡Atención! El certificado ha sido revocado"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binario"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Blackboard"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Marcador:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Fecha de creación:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Información de creación"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Categoría de negocio:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1678,63 +1691,63 @@
 "sólo un pequeño intervalo de puertos, por favor introduzca el intervalo a "
 "continuación."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "C&ancelar operación actual"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Comprobar últimas versiones de desarrollo de FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&Limpiar todo"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opiar URL(s) al portapapeles"
 
-#: resources.h:887
+#: resources.h:909
 msgid "C&ustom"
 msgstr "Personali&zado"
 
-#: resources.h:942
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Aso&ciaciones de tipo de archivo personalizadas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Calculando compensación de la zona horaria del servidor..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "No se pudo leer desde el archivo"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "No se pudo escribir en el archivo."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "No se pudo escribir datos en el archivo: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: resources.h:989
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Cancelar operación en curso"
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Cancela la operación en curso"
 
@@ -1745,11 +1758,11 @@
 "No puedo acceder a '%s', no hay disco insertado o el dispositivo no está "
 "listo."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "No puedo añadir el servidor al gestor de sitios"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1765,30 +1778,30 @@
 "No puedo comparar directorios, hay distintos filtros activos para los "
 "directorios locales y remotos."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "No puedo comparar directorios, no estoy conectado a un servidor."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "No se pudo crear un nuevo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "No se puede editar el archivo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "No puedo editar archivo, no conectado a ningún servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "No puedo editar archivo, ruta remota desconocida."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1796,8 +1809,8 @@
 "No se puede establecer una conexión FTP a un servidor SFTP. Por favor "
 "seleccione el protocolo apropiado."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr ""
 "No se pudo cargar la barra de conexión rápida desde el archivo de recursos"
@@ -1810,45 +1823,50 @@
 msgid "Cannot load keyfile"
 msgstr "No se puede cargar el archivo clave"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr ""
 "No se pudo cargar la barra de de herramientas desde el archivo de recursos"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+#, fuzzy
+msgid "Cannot remember password"
+msgstr "Escriba la contraseña"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "No se puede renombrar la entrada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "No se pudo renombrar el archivo"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "No se pudo guardar el conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "No se pudo seleccionar filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "No puedo establecer la asociación de archivo"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "No puedo mostrar el diálogo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "No puedo ver/editar el archivo seleccionado"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Categorías"
 
@@ -1856,60 +1874,61 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Los datos de sesión y el certificado no están disponibles todavía."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detalles del certificado"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certificar en cadena:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Agente de certificado"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Desafío:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Cambiar los atributos del archivo"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Cambiar los permisos del archivo."
 
-#: resources.h:963
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Cambiar los ajustes del archivo de registro precisa reiniciar FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problema de codificación de caracteres"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Juego de caracteres"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "Comprobar si hay versiones &beta y candidatas al lanzamiento"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Comprobar si hay act&ualizaciones..."
 
-#: resources.h:551
+#: resources.h:968
+#, fuzzy
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Comprobación de actualizaciones fallida"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Comprueba si hay nuevas versiones de FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Comprueba si hay actualizaciones"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Comprobación de actualizaciones fallida"
 
@@ -1917,21 +1936,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Comprobando si la IP externa es correcta"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Comprobando actualizaciones"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "La suma de bits no concuerda para el fichero descargado"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Seleccione el directorio local predeterminado"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Seleccione el directorio local"
 
@@ -1939,43 +1958,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Trozo de datos terminado incorrectamente"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cifrado:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "C&errar pestaña"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Clásico"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Limpiar entradas del gestor de &sitios"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Borrar caché"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Limpiar historial de conexión rá&pida"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Limpiar información de &reconexión"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Limpiar cola de &transferencia"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Borrar historial"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1983,11 +2002,11 @@
 msgid "Clear private data"
 msgstr "Limpiar información privada"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Borrar barra de conexión rápida"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Borrar unión de cadenas"
 
@@ -1995,36 +2014,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Pulse Finalizar para guardar la configuración."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Haga clic en siguiente para descargar la nueva versión."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC de cliente a servidor:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Cifrado cliente a servidor:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Cerrar todas las pestañas"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Cerrar FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Cerrar todas las copias de FileZilla en ejecución."
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Cierra la pestaña actual"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mentarios:"
 
@@ -2032,11 +2051,11 @@
 msgid "Column properties"
 msgstr "Propiedades de columna"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Configuración de columna"
 
-#: resources.h:937
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "El comando y sus argumentos deben estar correctamente entrecomillados."
 
@@ -2055,9 +2074,9 @@
 msgstr "Comando no soportado por el protocolo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Comando:"
 
@@ -2065,7 +2084,7 @@
 msgid "Comment"
 msgstr "Comentario"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nombre común:"
 
@@ -2074,15 +2093,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Comunicación contaminada por el enrutador o el cortafuegos"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Comparar tiempo de &modificación"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Comparar &tamaño de archivo"
 
-#: resources.h:917
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "&Umbral de comparación (en minutos):"
 
@@ -2090,60 +2109,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "El umbral de comparación necesita estar entre 0 y 1440 minutos."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilado para:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilado el:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilado con:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Parámetros de compilación:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Comprimido"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transferencias simultáneas"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Las condiciones son sensibles a mayúsculas y minúsculas"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Prueba de configuración"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Configurar modo pasivo"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Configurar intervalo de puertos"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Configurar FileZilla y su red"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Confirmar borrado"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Se necesita confirmación"
 
@@ -2151,7 +2170,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Enhorabuena, su configuración parece funcionar."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Conectar evitando ajustes de proxy"
 
@@ -2159,34 +2178,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Conectar a un sitio específico del gestor de sitios"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando a %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Conectando a %s a través de proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectando a %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Conectando al servidor"
 
@@ -2194,18 +2213,18 @@
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Falló intento de conexión"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr ""
 "Falló intento de conexión con \"%s\", intentando la siguiente dirección."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Falló intento de conexión con \"%s\"."
@@ -2219,12 +2238,12 @@
 msgid "Connection closed"
 msgstr "Conexión cerrada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Conexión cerrada por el servidor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Conexión establecida, inicializando TLS..."
@@ -2233,7 +2252,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Conexión establecida, enviando petición HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Conexión establecida, esperando el mensaje de bienvenida..."
 
@@ -2249,15 +2268,15 @@
 msgid "Connection refused"
 msgstr "Conexión rechazada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Conexión superó el tiempo de espera"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "La conexión superó el tiempo de espera."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Conexión al servidor perdida."
 
@@ -2277,27 +2296,23 @@
 msgid "Convert keyfile"
 msgstr "Convertir archivo de clave"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Cop&iar"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Copiado (%d) de %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Copiar al portapapeles las URLs de los elementos seleccionados."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "No se pudo aceptar la conexión con el servidor: %s"
@@ -2307,16 +2322,21 @@
 msgid "Could not add connection to Site Manager"
 msgstr "No se pudo añadir conexión al gestor de sitios"
 
+#: ../../locales/../src/interface/state.cpp:842
+#, fuzzy
+msgid "Could not complete operation"
+msgstr "No se pudieron copiar datos"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "No se pudo conectar al servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "No se pudo conectar al servidor: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "No se pudo convertir el comando a la codificación del servidor"
 
@@ -2325,17 +2345,17 @@
 msgid "Could not convert private key"
 msgstr "No se pudo convertir la clave privada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "No se pudieron copiar las URLs"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "No se pudieron copiar datos"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2345,11 +2365,11 @@
 "O bien la extensión de consola no está instalada adecuadamente o no soltó "
 "los archivos en una ventana del Explorador."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "No se pudo establecer conexión con el servidor"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2362,11 +2382,11 @@
 "línea de comandos '--datadir <custompath>', o bien definiendo la variable de "
 "entorno FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "No se pudo generar la secuencia de inicio de sesión personalizado."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2374,7 +2394,7 @@
 "No se pudo un nombre diferente del emisor del certificado, fallo en "
 "gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2382,7 +2402,7 @@
 "No se pudo obtener un nombre diferente del asunto del certificado, fallo en "
 "gnutls_x509_get_dn"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "No se pudo obtener la ruta remota completa."
 
@@ -2391,16 +2411,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "No se obtuvo respuesta de fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 "No se pudo obtener un directorio temporal para descargar el archivo dentro."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "No se pudo importar el certificado, fallo en gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2428,7 +2448,7 @@
 msgid "Could not load private key"
 msgstr "No se pudo cargar la clave privada"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2440,7 +2460,7 @@
 "¿Desactivar navegación sincronizada y continuar cambiando el directorio "
 "remoto?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2462,9 +2482,9 @@
 "local '%s'.\n"
 "La navegación sincronizada ha sido desactivada."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "No se pudo abrir el portapapeles"
 
@@ -2479,11 +2499,11 @@
 msgid "Could not parse remote path."
 msgstr "No se pudo analizar la ruta remota."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "No se pudo analizar la dirección del servidor:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "No se pudo leer desde el socket: %s"
@@ -2492,12 +2512,12 @@
 msgid "Could not read server item."
 msgstr "No se pudo leer elemento del servidor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "No se pudo buscar la posición %s dentro del archivo"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "No se pudo buscar hasta el fin del archivo"
 
@@ -2505,22 +2525,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "No se pudo enviar el comando a fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "No se pudo crear un hilo de entrada/salida"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "No se pudo comenzar la negociación con el proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "No se pudo comenzar la transferencia"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2541,7 +2561,7 @@
 "No se pudo escribir \"%s\", los marcadores globales no se pudieron guardar: %"
 "s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2550,16 +2570,16 @@
 "No se pudo escribir \"%s\", la cola no pudo guardarse.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "No se pudo escribir \"%s\", los sitios seleccionados no pudieron exportarse: "
 "%s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "No pude escribir \"%s\": %s"
@@ -2569,7 +2589,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "No pude escribir el archivo clave: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "No se pudo escribir al archivo local"
 
@@ -2579,39 +2599,54 @@
 msgid "Could not write to log file: %s"
 msgstr "No se pudo escribir al archivo de registro: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "No se pudo escribir al socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "País:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Cierra FileZilla inmediatamente. Sólo usado para depurar el gestor de "
 "excepciones"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "No se pudo crear un nuevo filtro"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Crear un nuevo subdirectorio en el directorio actual"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Crear un nuevo subdirectorio en el directorio actual"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Crear directorio"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+#, fuzzy
+msgid "Create empty file"
+msgstr "No se puede editar el archivo"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Creando directorio"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Creando directorio '%s'..."
@@ -2630,7 +2665,7 @@
 msgstr ""
 "Error crítico de transferencia de fichero después de transferir %s en %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2652,52 +2687,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Tipo de transferencia actual está fijado en binario."
 
-#: resources.h:773 resources.h:893
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Personali&zado"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Conjunto de filtros personalizado"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Servidor personalizado"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tipo de d&atos"
 
-#: resources.h:900
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Prefijos d&ecimales usando símbolos SI (p. ej. 1 KB = 1000 bytes)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Por d&efecto"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "&Borrar"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Desactivar todo"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "N&o guardar contraseñas"
 
-#: resources.h:924
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Acciones de doble clic sobre directorios:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplicado"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Con rutas virtuales al estilo DOS"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Tipo de archivo peligroso"
 
@@ -2705,16 +2744,16 @@
 msgid "Data"
 msgstr "Datos"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Socket de datos cerrado demasiado pronto."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Fecha"
 
-#: resources.h:884
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Formato de fecha"
 
@@ -2733,11 +2772,11 @@
 msgid "Debug"
 msgstr "Depuración"
 
-#: resources.h:964
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Parámetros de depuración"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Directorio &local predeterminado:"
 
@@ -2745,19 +2784,19 @@
 msgid "Default (Autodetect)"
 msgstr "Predeterminado (Detectar automáticamente)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Editor predeterminado entrecomillado incorrectamente."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Acción predeterminada si el archivo existe"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Directorio &remoto predeterminado:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2769,15 +2808,15 @@
 msgid "Default system language"
 msgstr "Idioma predeterminado del sistema"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Tipo de transferencia predeterminada:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Tipo de transferencia predeterminada:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Predeterminada: http://ip.filezilla-project.org/ip.php"
 
@@ -2803,57 +2842,57 @@
 "Retrasando conexión por %d segundos debido a un intento previo de conexión "
 "fallido..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Borrar entrada del gestor de sitios"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Borrar directorio seleccionado"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Borrar archivos y carpetas seleccionadas"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Borrando directorios"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Borrar múltiples directorios sin relación ya no se admite"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Borrando enlace simbólico"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detalles"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detalles para nueva clave:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Dire&ctorios"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Dirección"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Directorio"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Comparación de directorios"
 
@@ -2873,11 +2912,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Listado de directorio cancelado por el usuario"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Falló el listado del directorio"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtros de listado de directorio"
 
@@ -2885,18 +2924,18 @@
 msgid "Directory listing successful"
 msgstr "Directorio listado correctamente"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Desactivar todo"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "¿Desactivar navegación sincronizada y continuar cambiando el directorio "
 "remoto?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2904,50 +2943,49 @@
 "Desactiva esta opción de nuevo si ya no puedes volver a ver correctamente "
 "los contenidos del directorio."
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Desconectar del servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Desconectado del servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Desconectado del servidor: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Desconectando del servidor anterior"
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Desconectar del servidor actualmente visible"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Mostrar el diálogo acerca de"
 
-#: resources.h:933
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&No usar el editor predeterminado"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "No hacer &nada"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2956,8 +2994,8 @@
 "A no ser que quiera probar nuevas funcionalidades, es mejor que siga "
 "utilizando versiones estables."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "¿Realmente quiere cerrar FileZilla?"
 
@@ -2972,7 +3010,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "¿Realmente quiere borrar todas las entradas del gestor de sitios?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "¿Realmente quiere borrar la entrada seleccionada?"
 
@@ -2980,34 +3018,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "¿Realmente quiere borrar la cola de transferencia?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "¿Desea realmente enviar '%s' al servidor?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentación"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "No usar dirección IP externa en conexiones locales."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Los archivos punto son nombres de archivo que comienzan con un punto, p. "
 "ej. .htaccess"
 
-#: resources.h:918
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Acción de doble clic"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Descargar"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Límite de descarga:"
 
@@ -3020,41 +3058,50 @@
 msgid "Download limit: none"
 msgstr "Límite de descarga: ninguno"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Descargar resultados de búsqueda"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Descargar directorio seleccionado"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Bajar archivos y carpetas seleccionadas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Descarga a: %s/s\n"
+"Subida a: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Descargando"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Descargando %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Descargar múltiples directorios sin relación ya no se admite"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Descargando resultados de búsqueda"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3063,60 +3110,64 @@
 "Todavía no ha sido implementada la función de arrastrar y soltar entre "
 "diferentes instancias de FileZilla."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Arrastrar y soltar entre diferentes servidores no ha sido implementado "
 "todavía."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&icado"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Activar todo"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "E&ntrar en directorio"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&jecutar"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "Sali&r"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "Correo-e:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Cada filtro necesita al menos una condición."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Editar filtros"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Editar el archivo con el editor configurado y subir los cambios al servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Edición fallida"
 
-#: resources.h:881
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Comando en blanco"
 
@@ -3124,7 +3175,7 @@
 msgid "Empty command."
 msgstr "Comando vacío."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Listado del directorio vacío"
 
@@ -3136,95 +3187,102 @@
 msgid "Empty file extension."
 msgstr "Extensión de archivo vacía."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "No se permite nombre de filtro en blanco."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nombre en blanco"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Cadena entrecomillada vacía."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Activar todo"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Activar &filtrado de caracteres no válidos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Cifrado"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Cifrado"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Detalles de cifrado"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "¿Finalizar comparación y cambiar el orden de clasificación?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Introducir comando personalizado..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Introduzca 0 para no limitar la velocidad."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Introduzca el comando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Introducir comando personalizado"
 
-#: resources.h:925
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Introduzca directorio"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Introduzca el nombre del filtro"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Introduzca el nombre del conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Introduzca el nuevo nombre para el conjunto de filtros"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Escriba la contraseña"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Introduzca directorio seleccionado"
 
-#: resources.h:719
+#: resources.h:740
+#, fuzzy
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Introduzca la dirección del servidor.\n"
 "Para especificar el protocolo del servidor, escriba el identificador de "
@@ -3244,7 +3302,7 @@
 "Por favor tenga en cuenta que el archivo convertido no será protegido por "
 "contraseña."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3266,7 +3324,7 @@
 msgid "Error importing"
 msgstr "Error al importar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Error cargando la cola"
 
@@ -3275,27 +3333,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Error cargando el archivo xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Error guardando la cola"
 
@@ -3306,74 +3364,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Error escribiendo el archivo xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Error, no se puede procesar el archivo."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Error: el fichero local existe y no se puede borrar"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Error:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Establecer conexión en un pestaña nueva"
 
-#: resources.h:944
+#: resources.h:972
+msgid "Every month"
+msgstr "Cada mes"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Cada 2 semanas"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Ejemplo: png \"c:\\archivos de programa\\visor\\visor.exe\" -open"
 
-#: resources.h:903
+#: resources.h:925
 msgid "Examples"
 msgstr "Ejemplos"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Eje&cutar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Ejecutable"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "El ejecutable no contiene información de versión, no puedo comprobar si hay "
 "actualizaciones."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorador"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exportar c&ola de transferencia"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exportar &opciones"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportar opciones"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "&Nombre del filtro:"
 
@@ -3381,7 +3447,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferencia de Archivos"
 
@@ -3393,25 +3459,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferencia de Archivos no seguro"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Motor de FTP no inicializado, no puedo conectar"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "URL de FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3427,26 +3493,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP sobre TLS/SSL implícito"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Error al cambiar de directorio"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Error al cambiar de idioma"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Error al comprobar si existen nuevas versiones de FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Error al copiar o mover sitios"
 
@@ -3454,45 +3520,45 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Error al crear copia de seguridad del archivo xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Error al crear socket de escucha, abortando"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Error al crear socket para transferencia en modo activo"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Error al descargar la última versión de FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Error al obtener la ruta de 'Mis Documentos'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Error al obtener ruta del escritorio"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Error al obtener la dirección homónima de la conexión de control, conexión "
 "cerrada."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Error al obtener la dirección homónima de la conexión de datos, conexión "
 "cerrada."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Error al inicializar el motor de FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Error al inicializar TLS."
@@ -3506,24 +3572,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Error al cargar la clave privada: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Falló al abrir \"%s\" para añadir/escribir"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Error al abrir \"%s\" para leer"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Error al abrir \"%s\" para escribir"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "No se pudo analizar la ruta devuelta."
 
@@ -3531,7 +3597,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Error al procesar certificado raíz de confianza."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Error al recibir datos"
 
@@ -3543,12 +3609,12 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Error al recuperar la dirección ip externa, abortando"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr ""
 "Error al recuperar la dirección ip externa, usarando la dirección local"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Error al recuperar la dirección ip local."
 
@@ -3564,14 +3630,14 @@
 msgid "Failed to send command."
 msgstr "Error al enviar comando."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Error al cambiar al idioma %s (%s), usando el idioma predeterminado del "
 "equipo."
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3579,28 +3645,28 @@
 "Error al cambiar al idioma %s (%s), usando el idioma predeterminado del "
 "equipo (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Error al cambiar al idioma %s (%s), usando el idioma predeterminado del "
 "equipo."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
 "Error al establecer el idioma %s, usando el idioma predeterminado del sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Error al cambiar al idioma %s, usando el idioma predeterminado del equipo (%"
 "s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3610,7 +3676,7 @@
 msgid "Failed to validate settings"
 msgstr "Error al validar configuraciones"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Fallo al verificar el certificado del destino"
 
@@ -3627,21 +3693,19 @@
 msgid "Failed transfers"
 msgstr "Transferencias fallidas"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Revertir a modo activo"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "&Archivo:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "&Archivos"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Archivo"
 
@@ -3657,7 +3721,7 @@
 msgid "File editing"
 msgstr "Edición de archivo"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "El archivo existe"
 
@@ -3665,7 +3729,7 @@
 msgid "File exists action"
 msgstr "Acción si el fichero existe"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "El archivo ha cambiado"
 
@@ -3673,14 +3737,14 @@
 msgid "File lists"
 msgstr "Listados de archivos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Fichero no encontrado"
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "File search"
 msgstr "Búsqueda de archivo"
 
@@ -3716,25 +3780,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Transferencia correcta, transferidos %s en %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Todavía hay transferencias en progreso."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "El archivo se transferiría como tipo de datos ASCII."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "El archivo se transferiría como tipo de datos binario."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Error de Filezilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3742,68 +3806,72 @@
 "FileZilla puede comprobar ahora su configuración para asegurarse de que todo "
 "está configurado adecuadamente."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla ya está conectado a un servidor"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla se está ejecuntado en modo kiosko.\n"
-"Los inicios de sesión 'Normal' y 'Cuenta' no están disponibles en este modo."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla necesita ser reiniciado para que el cambio de idioma haga efecto."
 
-#: resources.h:517
+#: resources.h:979
+#, fuzzy
+msgid "FileZilla updates"
+msgstr "Error de Filezilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Barras y estado de lista de archivos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nombre de archivo"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtros de nombre de archivo..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "No se puede construir el nombre de archivo para el directorio %s y nombre de "
 "archivo %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Nombre de archivo inválido"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"El nombre de archivo no puede contener ninguno de los siguientes "
+"caracteres: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nombre de archivo no cambiado"
 
-#: resources.h:307 resources.h:957
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nombre de archivo:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "el nombre de archivo no puede contener ninguno de los siguientes "
 "caracteres: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3811,13 +3879,13 @@
 "El nombre de archivo no puede contener ninguno de los siguientes "
 "caracteres: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Archivos que están siendo editados actualmente"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Tamaño de archivo"
@@ -3826,68 +3894,68 @@
 msgid "Filesize format"
 msgstr "Formato de tamaño"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tipo de archivo"
 
-#: resources.h:945
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Asociaciones de tipo de archivo"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Aplicar filtro a:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrar caracteres inválidos en los nombres de fichero"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "El nombre del filtro ya existe"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Filtrar los elementos que cuadren con todos los siguientes"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Filtrar los elementos que cuadren con alguno los siguientes"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Filtrar los elementos que no cuadren con ninguno de los siguientes"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "El conjunto de filtros ya existe"
 
-#: resources.h:995
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrar el listado del directorio"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Fallo en la validación del filtro"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Huella digital (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Huella digital (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Huella digital:"
 
@@ -3895,7 +3963,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Asistente de configuración de cortafuegos y enrutador"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3903,12 +3971,12 @@
 "Para información más detallada sobre qué hace cada opción, ejecute por favor "
 "el asistente de configuración de red."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Para más fiabilidad, debería especificar un intervalo de al menos 10 puertos."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3916,33 +3984,33 @@
 "Para esta sesión se usarán los ajustes predeterminados. No se guardará "
 "ningún cambio de los ajustes."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forzar &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Forzar mostrar arc&hivos ocultos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Forzar ver archivos ocultos"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Especificaciones del formato:"
 
-#: resources.h:943
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formato: Extensión seguida del comando correctamente entrecomillado y sus "
 "argumentos."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Documentación adicional"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "General"
 
@@ -3950,21 +4018,21 @@
 msgid "General SOCKS server failure"
 msgstr "Fallo general de servidor SOCKS"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy genérico"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Consiguir la IP externa a partir de la siguiente URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Obtener ayuda"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Ya existe un conjunto de filtros con ese nombre, ¿desea sobrescribirlo?"
@@ -3973,15 +4041,15 @@
 msgid "Global bookmarks"
 msgstr "Marcadores globales"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permisos de grupo"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "A&lta"
 
@@ -3989,21 +4057,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP sobre TLS/SSL"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Oculto"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Alto"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "El más alto"
 
@@ -4011,26 +4079,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "El puerto más alto disponible debe ser un número entre 1024 y 65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Mantener pulsada la tecla mayúsculas para cambiar el estado del filtro en "
 "ambos lados simultaneamente."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Página principal:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Huella digital de la clave del servidor:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Clave de sitio no coincidente"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 "El servidor comienza con '[' pero no se ha encontrado el cierre de corchete."
@@ -4039,20 +4107,20 @@
 msgid "Host unreachable"
 msgstr "Servidor inalcanzable"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Sitio:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Horas,"
 
-#: resources.h:892
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (ejemplo: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4061,13 +4129,13 @@
 "Si no se envían o reciben datos en una operación durante un tiempo superior "
 "al especificado, la conexión se cerrará y FileZilla intentará reconectarse."
 
-#: resources.h:973
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Si quiere informar de errores, por favor envíe logs con un nivel de "
 "depuración \"Verboso\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4080,7 +4148,7 @@
 "configurar el modo de transferencia individualmente por servidor en el "
 "Gestor de Sitios."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4088,7 +4156,7 @@
 "Si el modo alternativo está activado, le será posible conectar a servidores "
 "mal configurados que rechacen el modo de transferencia seleccionado."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4112,7 +4180,7 @@
 "Si el problema persiste, algún enrutador y/o cortafuegos continua "
 "interrumpiendo la conexión."
 
-#: resources.h:962
+#: resources.h:988
 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 "
@@ -4122,7 +4190,7 @@
 "añadiendo \".1\" al final del nombre de archivo (posiblemente "
 "sobreescribiendo antiguos archivos de registro) y se crea un nuevo archivo."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4145,7 +4213,7 @@
 "Si el problema persiste, contacte por favor con el fabricante de su "
 "enrutador."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4156,7 +4224,7 @@
 "diferentes (por ejemplo por diferencia de husos horarios), especifique la "
 "diferencia de horas en el gestor de sitios."
 
-#: resources.h:916
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4164,11 +4232,11 @@
 "Si se está usando comparación basada en la fecha de edición, considerar dos "
 "archivos iguales si la diferencia entre fechas no excede este umbral."
 
-#: resources.h:931
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Si cambia el idioma, debe reiniciar FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4176,11 +4244,11 @@
 "Si pulsa Probar, FileZilla se conectará a probe.filezilla-project.org y "
 "llevará a cabo unas cuantas comprobaciones sencillas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Si cierra FileZilla, sus cambios se perderán."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4188,11 +4256,11 @@
 "Si escribe tipos de archivo incorrectos, es posible que se corrompan al ser "
 "transferidos."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Si obtiene algún error, su configuración no es correcta."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4210,7 +4278,7 @@
 "enrutador remoto podrían estar mal configurados. En este caso, intente "
 "alternar el modo pasivo y pida ayuda al administrador del servidor."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4219,7 +4287,7 @@
 "éxito, cualquier contafuegos y enrutadores que tenga deberían estar "
 "configurados apropiadamente."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4227,7 +4295,7 @@
 "Si usa un cortafuegos, asegúrese que a FileZilla se le permiten las "
 "conexiones entrantes en todos los puertos escogidos."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4247,7 +4315,7 @@
 msgid "Import data from older version"
 msgstr "Importar datos de una versión anterior"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importar opciones"
 
@@ -4261,7 +4329,7 @@
 msgid "Improperly quoted association."
 msgstr "Asociación entrecomillada incorrectamente."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4269,7 +4337,7 @@
 "En modo activo, FileZilla tiene que escuchar en un puerto para transferir "
 "datos. Tiene que especificar qué puertos usará FileZilla."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4278,7 +4346,7 @@
 "disponibles, pues en dicho caso FileZilla no puede escoger los puertos que "
 "se utilizarán."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4286,14 +4354,14 @@
 "Si prefiere actualizaciones automáticas, puede activar la comprobación "
 "automática en el diálogo de configuración."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "Para usar el modo activo, FileZilla necesita conocer su dirección IP externa."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4303,7 +4371,7 @@
 "FileZilla le pide un puerto al servidor y se conecta a ese puerto. Para ello "
 "no hay que configurar nada."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4311,20 +4379,20 @@
 "Cadena incompleta, el certificado raíz no está auto-firmado por una "
 "autorizada certificada"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Contraseña incorrecta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Inicializando TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Servidor no seguro, no soporta FTP sobre TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactivo"
@@ -4334,8 +4402,8 @@
 msgstr "Intefaz"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Interrumpido por el usuario"
 
@@ -4347,8 +4415,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Respuesta HTTP inválida"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4371,12 +4439,13 @@
 msgid "Invalid date"
 msgstr "Fecha no válida"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nombre de archivo no válido"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Servidor no válido, después del cierre de corchete sólo pueden seguirle dos "
@@ -4386,22 +4455,23 @@
 msgid "Invalid input"
 msgstr "Entrada no válida"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "El puerto introducido no es válido. El puerto debe ser un valor entre 1 y "
 "65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#, fuzzy
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "El protocolo especificado no es válido. Los protocolos válidos son:\n"
 "ftp:// para un FTP normal,\n"
@@ -4409,7 +4479,15 @@
 "ftps:// para FTP sobre SSL (implícito) y\n"
 "ftpes:// para FTP sobre SSL (explícito)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Servidor no válido, después del cierre de corchete sólo pueden seguirle dos "
+"puntos y el puerto."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Expresión regular no válida en las condiciones de búsqueda."
 
@@ -4417,7 +4495,7 @@
 msgid "Invalid response code"
 msgstr "Código de respuesta inválido"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Condiciones de búsqueda no válidas: %s"
@@ -4429,38 +4507,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ruta del sitio no válida"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Tamaño no válido en la condición"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "El nombre de usuario introducido no es válido."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Jurisdicción del país:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Localidad de jurisdicción:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Jurisdicción provincial:"
 
-#: resources.h:913
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Poner los directorios arriba"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4471,50 +4549,55 @@
 "realiza algunas pruebas para comprobar si el servidor permite esta función, "
 "la comprobación podría fallar."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Intercambio de clave"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Intercambio de clave"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "La más ba&ja"
 
-#: resources.h:929
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Idioma"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Idioma cambiado"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Última modificación"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Distribución"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Límite para descargas simultáneas:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Límite para subidas simultáneas:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limitar puertos locales"
 
-#: resources.h:959
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Límite de tamaño para el archivo de registro"
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit:"
 msgstr "Límite:"
 
@@ -4522,7 +4605,7 @@
 msgid "Line length exceeded"
 msgstr "Longitud de línea excedida"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Enlazado contra"
 
@@ -4531,21 +4614,21 @@
 msgstr "Socket de escucha cerrado"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listado:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "P&uerto más bajo disponible:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Local"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Archivo local"
 
@@ -4561,7 +4644,7 @@
 msgid "Local file is not a valid filename."
 msgstr "El archivo local no tiene un nombre de archivo válido."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtros locales:"
 
@@ -4569,7 +4652,7 @@
 msgid "Local site:"
 msgstr "Sitio local:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Localidad:"
 
@@ -4577,16 +4660,16 @@
 msgid "Log file"
 msgstr "Archivo de registro"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Registrar comprabaciones de actualizaciones"
 
-#: resources.h:954
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Registro"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4595,7 +4678,7 @@
 "servidor podría no ser compatible con UTF-8. No puedo volver al juego de "
 "carácteres local ya que se está usando un proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4604,18 +4687,18 @@
 "servidor podría no ser compatible con UTF-8. Probando juego de caracteres "
 "local."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Secuencia de inicio de sesión ejecutada completamente pero no se ha iniciado "
 "sesión. Abortando."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "El tipo de registro debe ser 'preguntar' o 'interactivo' (sin comillas)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4624,13 +4707,13 @@
 "El registro puede sólo usarse con una URL FTP. El argumento ha de ser bien '%"
 "s' o '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Bajo"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "El más bajo"
 
@@ -4639,11 +4722,11 @@
 msgstr ""
 "El puerto más bajo disponible tiene que ser un número entre 1024 y 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Asegúrese de que se puede acceder al archivo y es un documento XML bien "
@@ -4667,7 +4750,7 @@
 msgstr ""
 "Respuesta malformada, el servidor no está enviando finales de línea adecuados"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4678,58 +4761,58 @@
 msgid "Manual transfer"
 msgstr "Transferencia manual"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Todas estas condiciones"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Usar alguna de las siguientes"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "No usar ninguna de las siguientes"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Máximo número de transferencias simultáneas:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Registro de mensajes"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Posición del registro de mensajes"
 
-#: resources.h:961
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minutos"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Ba&jar"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Su&bir"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Mi PC"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Mis Documentos"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Mis sitios"
 
@@ -4738,33 +4821,33 @@
 msgid "N/a"
 msgstr "N/D"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nombre"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "El nombre ya existe"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "El nombre del marcador ya existe."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nombre:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Debe escribir el nombre del filtro"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Necesita introducir una ruta remota válida"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Debe especificar una codificación de caracteres"
 
@@ -4772,19 +4855,23 @@
 msgid "Network unreachable"
 msgstr "Red inalcanzable"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Nunca"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Nueva &carpeta"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Nueva &pestaña"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Nuevo &marcador"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4797,41 +4884,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nuevo marcador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nuevo directorio"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nuevas características y mejoras en %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nuevo filtro"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nueva carpeta"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nuevo sitio"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Cerca de la cola de transferencia"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "No"
 
@@ -4839,27 +4926,27 @@
 msgid "No category to export selected"
 msgstr "No hay seleccionada ninguna categoría a exportar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "No se ha dado ningún comando, abortando."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr ""
 "No se ha configurado la dirección IP externa, intentando con el valor "
 "predeterminado."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Actualmente no se están editando archivos."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "No se ha dado ningún nombre al filtro"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "No ha especificado un sitio, por favor introduzca uno."
 
@@ -4867,26 +4954,26 @@
 msgid "No images available"
 msgstr "No hay imágenes disponibles"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "¡No hay más archivos en la cola!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "No se ha dado nombre al conjunto de filtros."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "No hay programa asociado con el tipo de archivo"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 "Ningún programa ha sido asociado para editar archivos con la extensión '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Sin resultados"
 
@@ -4904,23 +4991,23 @@
 msgid "No username given."
 msgstr "No se ha dado ningún nombre de usuario."
 
-#: resources.h:923 resources.h:928
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ninguno"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Nada seleccionado todavía"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4930,15 +5017,15 @@
 msgstr "No todos los elementos podrán volver a la cola para ver/editar."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "No conectado"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "No está conectado a ningún servidor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "No está conectado a ningún servidor."
 
@@ -4946,21 +5033,21 @@
 msgid "Not connected."
 msgstr "No conectado."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Ten en cuenta que esta función sólo está disponible usando el protocolo FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Nota: Esto sólo funciona con conexiones FTP simples, sin cifrar."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Nota: Usar un proxy genérico obliga al modo pasivo en las conexiones FTP."
 
-#: resources.h:902
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Número de posiciones decimales:"
 
@@ -4968,21 +5055,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Número de reintentos tiene que estar entre 0 y 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "A&brir archivo"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "Aceptar"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4990,119 +5077,127 @@
 "En las páginas siguientes, se configurará el modo de transferencia "
 "seleccionado, así como el modo alternativo, si se está activado."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Una vez"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Sólo se enviará al servidor la versión de FileZilla y del sistema operativo "
-"que esté usando."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Cada semana"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Abrir directorio en el gestor del sistema de ficheros"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Abrir el Gestor de Sitios"
 
-#: resources.h:564
+#: resources.h:1002
+#, fuzzy
+msgid "Open the Site Manager."
+msgstr "Abrir el Gestor de Sitios"
+
+#: resources.h:1003
+#, fuzzy
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Abrir la ventana de filtro de listado de directorios. Clic en botón derecho "
+"para alternar filtros."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Abrir el archivo."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Abre el diálogo de configuración de FileZilla."
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Abierto como:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Fallo al abrir"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Abre una nueva pestaña"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Abre el Gestor de Sitios"
 
-#: resources.h:996
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Abrir la ventana de filtro de listado de directorios. Clic en botón derecho "
 "para alternar filtros."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Detectado problema del sistema operativo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organización:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Otro:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Vista previa"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Sobreescribir s&i el origen es más reciente"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Sobrescribir fichero"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Sobrescribir si tienen distinto tamaño"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Sobreescribir si tienen distinto tamaño o el origen es más reciente"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Sobrescribir si el origen es más reciente"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Sobrescribir si tienen &distinto tamaño"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Sobreescribir si tienen distinto &tamaño o el origen es más reciente"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permisos de propietario"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Propietario/Grupo"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5110,7 +5205,7 @@
 "E&vitar que el sistema entre en espera (stand-by) durante la transferencia y "
 "otras operaciones"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Servidor p&roxy:"
@@ -5119,27 +5214,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Comando PORT contaminado por el enrutador o cortafuegos."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pasivo (recomendado)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paquete"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "El parámetro no es una URL válida"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Contra&seña:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Pasivo (recomendado)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Modo pasivo"
@@ -5155,42 +5250,47 @@
 msgid "Password required"
 msgstr "Contraseña obligatoria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Ruta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "No se puede construir la ruta para el directorio %s y subdirectorio %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+#, fuzzy
+msgid "Path not found:"
+msgstr "Fichero no encontrado"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Rutas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Pendiente de eliminación"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Permiso"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permisos"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plataforma:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5206,7 +5306,7 @@
 "Por favor compruebe en http://filezilla-project.org que el servidor está "
 "activo y vuelva a comprobar cuidadosamente su configuración."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5215,7 +5315,7 @@
 "paquete actualizado o visite http://filezilla-project.org para descargar el "
 "código fuente de FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5245,7 +5345,7 @@
 msgid "Please enter a custom time format."
 msgstr "Por favor, introduzca un formato de hora personalizado."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5260,21 +5360,21 @@
 "Por favor, introduzca un límite de velocidad de descarga igual o superior a "
 "0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Por favor, introduzca un nombre para el nuevo filtro."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Por favor, introduzca un nuevo nombre para la copia del filtro."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr ""
 "Por favor introduzca un nuevo nombre para el conjunto de filtros \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Por favor, introduzca un nuevo nombre para el filtro."
 
@@ -5301,11 +5401,11 @@
 "Por favor introduzca un número entre 1 y 10 para el número de transferencias "
 "simultáneas."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Por favor, introduzca la contraseña para este servidor:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5323,11 +5423,11 @@
 "Por favor introduzca un tiempo de espera entre 5 y 9999 segundos, ó 0 para "
 "desactivar el tiempo de espera."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Por favor, introduzca un nombre único para este conjunto de filtros."
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Por favor introduzca un nombre de usuario para este servidor:"
 
@@ -5340,10 +5440,6 @@
 msgstr ""
 "Por favor introduzca una URL de dónde se pueda obtener su dirección externa"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Por favor introduzca un intervalo de actualización de al menos 7 días"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5352,7 +5448,7 @@
 "Por favor, introduzca un límite de velocidad de subida igual o superior a 0 %"
 "s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5360,14 +5456,19 @@
 "Por favor, introduzca el comando FTP.\n"
 "Al usar comandos FTP se vaciará la cache de directorios."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Por favor, introduzca el nombre del directorio que debe ser creado:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Por favor, introduzca el nombre del directorio que debe ser creado:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr ""
 "Por favor introduzca un nombre de usuario y una contraseña para este "
@@ -5388,7 +5489,7 @@
 "asistente. En caso que tenga una dirección dinámica o que no la conozca, use "
 "la opción de resolución externa."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5405,7 +5506,7 @@
 "salientes y asegúrese de que ha escrito correctamente la dirección del "
 "servidor de resolución de direcciones."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Por favor asegúrese de que el idioma solicitado está instalado en su equipo."
@@ -5422,7 +5523,7 @@
 "Tendrá que hacer redirección manual de puertos. No configure su enrutador en "
 "el modo denominado 'DMZ' o 'de juegos'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5434,7 +5535,7 @@
 "enrutador estima que sólo se utiliza para troyanos o código malicioso. Ello "
 "podría ocasionar una falsa alarma que usted puede ignorar tranquilamente."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5442,7 +5543,7 @@
 "Por favor tenga en cuenta que presevar la fecha y hora en las subidas a "
 "servidores FTP, FTPS y FTPES sólo funcionará si admiten el comando MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5450,7 +5551,7 @@
 "Por favor, considere que algunos servidores podrían denegarle el acceso si "
 "intenta reconectar demasiado a menudo o a intervalos demasiado cortos."
 
-#: resources.h:889 resources.h:895
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5459,7 +5560,7 @@
 "Por favor lea http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "para más detalles"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5476,44 +5577,44 @@
 "Por favor vuelva a ejecutar este asistente en caso que su red cambie, o si "
 "de repente encuentra problemas con servidores que funcionaban anteriormente."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Por favor, seleccione una acción:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Por favor, seleccione las categorías que le gustaría importar."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr ""
 "Por favor seleccione el modo de transferencia predeterminado que le gustaría "
 "usar."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Por favor, seleccione los nuevos atributos para el directorio \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Por favor, seleccione los nuevos atributos para el archivo \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr ""
 "Por favor, seleccione los nuevos atributos para los directorios "
 "seleccionados."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
 "Por favor, seleccione los nuevos atributos para los archivos y directorios "
 "seleccionados."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr ""
 "Por favor, seleccione los nuevos atributos para los archivos seleccionados."
@@ -5533,7 +5634,7 @@
 "inspección de protocolo o parches específicos de protocolo deben ser "
 "desactivados."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5541,8 +5642,8 @@
 "Por favor visite http://filezilla-project.org para más información acerca de "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5550,17 +5651,17 @@
 "Por favor visite http://filezilla-project.org para descargar la versión más "
 "reciente."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Código postal:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Sitios predefinidos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Preservando información horaria de archivos"
 
@@ -5568,48 +5669,64 @@
 msgid "Preview:"
 msgstr "Previo:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "La conexión primaria y los certificados de conexión de datos no coinciden."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Imprimir la información de diagnóstico relacionada con la puesta en marcha "
+"de FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Imprimir información de la versión por pantalla y salir"
 
-#: resources.h:912
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Priorizar directorios (predeterminado)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioridad"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Política de privacidad:"
+#: resources.h:978
+#, fuzzy
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Sólo se enviará al servidor la versión de FileZilla y del sistema operativo "
+"que esté usando."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Claves pri&vadas:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tocolo:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Contraseña del pro&xy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Procesar &cola"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+#, fuzzy
+msgid "Protocol:"
+msgstr "Pro&tocolo:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Puerto del proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Usuario proxy:"
 
@@ -5617,12 +5734,18 @@
 msgid "Proxy authentication failed"
 msgstr "La autenticación del proxy falló"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Falló negociación con el proxy: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"El servidor comienza con '[' pero no se ha encontrado el cierre de corchete."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5639,23 +5762,23 @@
 "Falló petición del proxy: Tipo de dirección desconocida en la respuesta a "
 "CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy fijado pero el servidor proxy o el puerto no es válido"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Autenticación con clave pública"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritmo de clave pública:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permisos públicos"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "La cola ha sido procesada completamente."
 
@@ -5674,39 +5797,39 @@
 msgid "Queue: empty"
 msgstr "Cola: vacía"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Archivos en cola"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Encolando:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&einiciar sistema"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Árbol de directorio r&emoto"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "R&einiciar y poner de nuevo en cola archivos seleccionados"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Comando FTP directo"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "&Leer"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "&Actualizar"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Re&nombrar"
 
@@ -5718,66 +5841,77 @@
 "Vuelva a ejecutar el asistente y compruebe cuidadosamente sus ajustes y "
 "configure todos los enrutadores y cortafuegos adecuadamente."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "&Leer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Sólo lectura"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "¿Realmente desea cancelar la operación actual?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
+#, fuzzy, 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] "¿Borrar %d directorio y sus contenidos, seguro?"
 msgstr[1] "¿Borrar %d directorios y sus contenidos, seguro?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, fuzzy, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
 msgstr[0] "¿Borrar %d archivo, seguro?"
 msgstr[1] "¿Borrar %d archivos, seguro?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
-#, c-format
-msgid "Really delete %s and %s?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, fuzzy, c-format
+msgid "Really delete %s and %s from the server?"
 msgstr "¿Borrar %s y %s, seguro?"
 
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+#, fuzzy
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"¿Realmente desea borrar todos los archivos y directorios seleccionados?"
+
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
+#, fuzzy
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr ""
 "¿Realmente desea borrar todos los archivos y directorios seleccionados?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Razón"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Reiniciar ahora"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Incl&uir todos los subdirectorios"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "La lista de directorios recibida parece estar codificada en EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Recibida una línea que excede de 10000 caracteres, anulando."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Datos recibidos han sido modificados."
 
@@ -5790,11 +5924,11 @@
 "servidor.\n"
 "Si continúa, la conexión se perderá."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Opciones de reconexión"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Reconectar al último servidor usado"
 
@@ -5802,34 +5936,39 @@
 msgid "Redirection to invalid address"
 msgstr "Redirección a una dirección inválida"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Actualizar las listas de archivos y carpetas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+#, fuzzy
+msgid "Remember passwords?"
+msgstr "&Recordar la contraseña para esta sesión"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "No se confió en el certificado remoto."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Archivo remoto"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Búsqueda de archivo remoto"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filtros remotos:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Ruta remota"
 
@@ -5842,7 +5981,7 @@
 "No se puede analizar la ruta remota. Asegúrese de que es una ruta absoluta "
 "válida y permitida por el tipo de servidor actual (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5854,7 +5993,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "No se puede analizar la ruta remota. Asegúrese de que es una ruta absoluta "
@@ -5864,11 +6003,11 @@
 msgid "Remote path could not be parsed."
 msgstr "No se pudo analizar la ruta remota."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Gestión de ruta remota:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Ruta remota:"
 
@@ -5876,76 +6015,76 @@
 msgid "Remote site:"
 msgstr "Sitio remoto:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Elimin&ar todo"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Quitar las &seleccionadas"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Renombrar archivo"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Renombrar carpeta seleccionada"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Renombrar archivos y carpetas seleccionadas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Renombrando '%s' a '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Informar de errores y solicitud de características"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Requiere FTP explícito sobre TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Requiere FTP implícito sobre TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Reiniciar y poner de nuevo en cola &todo"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Resolviendo la dirección de %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Resolviendo el nombre de máquina"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Respuesta:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Resultados:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Continuar transferencia de fichero"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5953,34 +6092,39 @@
 "Reanudar ficheros ASCII puede causar problemas si el servidor usa un formato "
 "de fin de línea diferente al del cliente."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Recuperando el listado del directorio..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Obteniendo la dirección IP externa de %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "El certificado raíz no es de confianza."
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Mostrar arc&hivos que están siendo editados..."
 
-#: resources.h:609
+#: resources.h:896
+#, fuzzy
+msgid "S&how the Site Manager on startup"
+msgstr "&Exportar entradas del gestor de sitios"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Apa&gar sistema"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Parar"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Navegación s&incronizada"
 
@@ -5988,31 +6132,47 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "¿Guardar configuración?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+"La opción de guardar la contraseña ha sido desactivada por el administrador "
+"del sistema."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Has desactivado la opción de guardar la contraseña."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Buscando archivos para agregar a la cola"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Buscando archivos para subir"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Condiciones de &búsqueda:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Directorio de búsque&da:"
 
-#: resources.h:1001
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Buscar archivos recursivamente."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Buscar archivos en servidor"
 
@@ -6025,27 +6185,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Vea también: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Seleccione servidor"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Seleccione página:"
 
-#: resources.h:877
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Seleccione un tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Seleccione la acción predeterminada a realizar si el archivo de destino de "
 "una transferencia ya existe."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Selecciona el editor predeterminado"
 
@@ -6065,7 +6225,7 @@
 "Seleccione la opción predetermianda a realizar si el archivo existe, sólo "
 "para los archivos actualmente seleccionados en la cola."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Escoja el destino de descarga del paquete"
 
@@ -6086,7 +6246,7 @@
 msgstr "Seleccione archivo para las opciones exportadas"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Seleccione un archivo para los sitios exportados"
 
@@ -6102,12 +6262,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Seleccione nombre para el archivo clave convertido"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Seleccione como deberían abrirse estos archivos."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Seleccionar directorio destino de descarga"
 
@@ -6115,15 +6275,15 @@
 msgid "Select target filename"
 msgstr "Seleccione nombre de archivo de destino"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Seleccione las categorías a exportar:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Seleccione la información privada que desearía borrar."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6137,7 +6297,7 @@
 msgstr[0] "%d directorio seleccionado"
 msgstr[1] "%d directorios seleccionados"
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6158,7 +6318,7 @@
 msgstr[0] "%d archivo seleccionado. Tamaño total: Al menos %s"
 msgstr[1] "%d archivos seleccionados. Tamaño total: Al menos %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Seleccionado %s y %s para transferir."
@@ -6173,13 +6333,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Seleccionado %s y %s. Tamaño total: Al menos %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "El editor seleccionado no existe."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "El archivo seleccionado ya está siendo editado"
 
@@ -6187,15 +6347,15 @@
 msgid "Selected file is already loaded"
 msgstr "El archivo seleccionado ya está cargado."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "El archivo seleccionado ya está abierto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "El archivo seleccionado sigue editándose"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "El filtro seleccionado sólo funciona con archivos locales."
 
@@ -6213,37 +6373,43 @@
 msgstr ""
 "El puerto seleccionado normalmente está en uso por un protocolo diferente."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Enviar comandos FTP &keep-alive"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "Enviar comando personalizado al servidor no disponible de otra manera"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Enviando el comando keep-alive"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Número de serie:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Tipo de servidor:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "El servidor no respondió adecuadamente, cierre de conexión TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+#, fuzzy
+msgid "Server does not support non-ASCII characters."
+msgstr "El servidor no permite reanudar ficheros mayores de 2 GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "El servidor no permite reanudar ficheros mayores de %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6252,15 +6418,15 @@
 "El servidor no permite reanudar ficheros mayores de %d GB. Finaliza la "
 "transferencia ya que los tamaños coinciden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "El servidor no permite reanudar ficheros mayores de 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "El servidor no permite reanudar ficheros mayores de 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6269,7 +6435,7 @@
 "El servidor podría no permitir reanudar ficheros mayores de %d GB. Finaliza "
 "la transferencia ya que los tamaños coinciden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6277,11 +6443,11 @@
 "El servidor puede necesitar una cuenta. Inténtelo especificando una cuenta "
 "utilizando el gestor de sitios."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "El servidor devolvió una ruta vacia."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6289,13 +6455,13 @@
 "El servidor envío una petición adicional de inicio de sesión. Necesita usar "
 "el inicio de sesión interactivo."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "El servidor envió una respuesta pasiva con una dirección no enrutable. El "
 "modo pasivo falló."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6315,101 +6481,115 @@
 msgid "Server sent unexpected reply."
 msgstr "El servidor envió una respuesta inesperada."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "MAC servidor a cliente:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Cifrado servidor a cliente:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Tipo de servidor:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Servidor/Archivo local"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Servidor:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Detalles de la sesión"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Ajustar &prioridad"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Ajustar permisos de '%s' a '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize invocado sin socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Opciones"
 
-#: resources.h:974
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Mostrar tal cual el listado del directorio"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Mostrar mensaje de &bienvenida..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "¿Mostrar ambos árboles de directorio y continuar comparando?"
 
+#: resources.h:639
+#, fuzzy
+msgid "Shows available TLS ciphers"
+msgstr "P&uerto más bajo disponible:"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Mostrar esta ventana de ayuda"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Apagar ahora"
 
-#: resources.h:299
+#: resources.h:9
+#, fuzzy
+msgid "Signature algorithm:"
+msgstr "Algoritmo de clave pública:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "E&ntradas del gestor de sitios"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Gestor de sitios"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+#, fuzzy
+msgid "Site Manager - Cannot remember password"
+msgstr "E&ntradas del gestor de sitios"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Gestor de sitios - Datos no válidos"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Gestor de Sitios ya abierto"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "El sitio no existe."
 
@@ -6419,8 +6599,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "La ruta del sitio está malformada."
 
@@ -6439,11 +6619,11 @@
 "en el gestor de sitios.\n"
 "¿Añadir la conexión actual al gestor de sitios?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Tamaño"
 
-#: resources.h:896
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Formato de tamaño"
 
@@ -6452,31 +6632,31 @@
 msgid "Size unknown"
 msgstr "Tamaño desconocido"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Saltar archivo"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Omitiendo la descarga de %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Omitiendo la subida de %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Algunos archivos siguen editándose o necesitan ser subidos."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6484,21 +6664,21 @@
 "Algunos servidores remotos mal configurados que se hallen tras un enrutador, "
 "podrían responder con su dirección IP local."
 
-#: resources.h:914
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Ordenar directorios mezclados"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "El orden de clasificación no puede cambiarse si se están comparando "
 "directorios."
 
-#: resources.h:910
+#: resources.h:932
 msgid "Sorting"
 msgstr "Clasificación"
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Modo de clasificación:"
 
@@ -6510,20 +6690,20 @@
 msgid "Source and target file may not be the same"
 msgstr "El archivo de origen y destino no pueden ser el mismo"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Origen y destino de la operación de soltar son idénticos"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Archivo origen:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Límites de velocidad"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Límites de velocidad"
 
@@ -6535,7 +6715,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Los límites de velocidad están sactivados, haga clic para cambiar."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versiones estables y beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Sólo versiones estables"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Comenzar transferencia &inmediatamente"
 
@@ -6543,43 +6731,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Comenzar con el gestor de sitios abierto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Comenzando la descarga de %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Comenzando la subida de %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Estado o provincia:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Estado"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Estado:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Detener y eliminar todo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Calle:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Asunto del certificado"
 
@@ -6587,11 +6779,11 @@
 msgid "Successful transfers"
 msgstr "Transferencias satisfactorias"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Resumen de resultados de la comprobación:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6599,44 +6791,45 @@
 "Los enlaces simbólicos no están afectados por esta opción, éstos siempre se "
 "borran."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Navegación sincronizada"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "La navegación sincronizada ha sido desactivada."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Error de sintaxis"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Error de sintaxis en la línea de comandos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistema"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "B&arra de herramientas"
 
@@ -6644,11 +6837,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Conexión TLS/SSL establecida, enviando petición HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Conexión TLS/SSL establecida, esperando el mensaje de bienvenida..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Conexión TLS/SSL establecida."
 
@@ -6656,27 +6849,32 @@
 msgid "TTL expired"
 msgstr "TTL caducado"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "El archivo de destino ya existe"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Archivo destino:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "El archivo de destino ya existe"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "El archivo de destino ya existe, ¿desea continuar?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Resultados de la comprobación"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Comprobando capacidades de reanudación del servidor"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6694,7 +6892,7 @@
 "El gestor de sitios está abierto en otra instancia de FileZilla 3.\n"
 "Por favor ciérrelo o los datos no podrán ser borrados."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "El documento XML no está bien formado: %s"
@@ -6705,11 +6903,11 @@
 msgstr "La dirección introducida era: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "No se pudo añadir el marcador."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "No se pudieron limpiar los marcadores."
 
@@ -6721,19 +6919,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "La secuencia de inicio de sesión personalizado no puede estar vacía."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, fuzzy, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Conexión TLS/SSL establecida."
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "No se pudo encontrar el editor predeterminado para archivos de texto."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "El editor predeterminado para archivos de texto es '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
 "El nombre de filtro introducido ya existe, por favor escoga un nombre "
@@ -6754,9 +6957,9 @@
 "El archivo %s ya existe.\n"
 "Por favor, escriba un nuevo nombre:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6772,14 +6975,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "El archivo '%s' no se pudo cargar o no contiene una clave privada."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "El archivo '%s' no se pudo cargar."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6788,8 +6991,8 @@
 "El archivo '%s' no se pudo abrir:\n"
 "Ningún programa en su equipo ha sido asociado con este tipo de archivo."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6831,7 +7034,7 @@
 "los archivos de clave protegidos por contraseña.\n"
 "¿Le gustaría convertirlo en un archivo desprotegido?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "El archivo seleccionado como editor predeterminado no existe."
 
@@ -6867,11 +7070,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Los siguientescaracteres serán reemplazados: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Los siguientes archivos están siendo editados actualmente:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "La solución FTP de código abierto"
 
@@ -6879,7 +7082,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "No se pudieron guardar los marcadores globales."
 
-#: resources.h:972
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6911,7 +7114,7 @@
 "El puerto más bajo disponible debe ser menor o igual al puerto más alto "
 "disponible."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6919,7 +7122,7 @@
 "La versión más reciente ha sido descargada. Haga clic en finalizar para "
 "cerrar y comenzar la instalación."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6927,11 +7130,11 @@
 "Se ha descargado la versión más reciente. Por favor, instálela de la misma "
 "que esta versión."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "La cola no será guardada."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6945,26 +7148,26 @@
 msgid "The selected categories have been imported."
 msgstr "Las categorías seleccionadas han sido importadas."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "El archivo seleccionado contiene datos importables para las siguientes "
 "categorías:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "El archivo seleccionado ya está siendo editado:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "El archivo seleccionado sigue abierto en algún otro programa, por favor "
 "ciérrelo."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6982,7 +7185,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "El servidor envió una respuesta inesperada o irreconocible."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "El servidor usa el siguiente juego de caracteres para los nombres de archivo:"
@@ -6996,7 +7199,7 @@
 "cuidadosamente el certificado para asegurarse de que se puede confiar en el "
 "servidor."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -7007,7 +7210,7 @@
 "host, o está usted intentando conectarse a otro ordenador que finge ser el "
 "servidor."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -7023,15 +7226,15 @@
 "Las opciones han sido importadas. Tendrá que reiniciar FileZilla para que "
 "todas las opciones hagan efecto."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "El equipo se reiniciará pronto a menos que haga clic en Cancelar."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "El equipo se apagará en breves instantes si no presiona Cancelar."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -7039,7 +7242,7 @@
 "El archivo de destino ya existe.\n"
 "Por favor escoja una acción."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "La comprobación falló. ¿De verdad desea guardar la configuración?"
 
@@ -7047,11 +7250,11 @@
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Este conjunto de filtros no puede ser eliminado."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Este conjunto de filtros no puede ser renombrado."
 
@@ -7063,7 +7266,7 @@
 "Esto significa que algún enrutador y/o cortafuegos todavía está "
 "interfiriendo con FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7071,7 +7274,7 @@
 "Esto sólo funciona si no se halla tras un enrutador, de otro modo el sistema "
 "sólo devolvería la dirección interna."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7079,25 +7282,25 @@
 "Este asistente le ayudará a configurar correctamente sus enrutadores y "
 "cortafuegos, y comprobará su configuración."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Hora"
 
-#: resources.h:890
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Formato de hora"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Tiempo de espera en segundos:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Tiempo de espera"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7106,23 +7309,23 @@
 "Compensaciones de zona horaria: Servidor: %d segundos. Local: %d segundos. "
 "Diferencia: %d segundos."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Título:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Para comparar directorios, ambas listas de archivos tienen que estar "
 "alineadas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Para hacer esto, es necesario que ambos árboles de directorio se estén "
 "mostrando o estén ocultos."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7130,7 +7333,7 @@
 "Para permitir la autenticación con clave pública, FileZilla necesita saber "
 "las claves privadas a usar."
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7147,7 +7350,7 @@
 "Verde: El archivo es más nuevo que el archivo sin marcar en el otro lado\n"
 "Rojo: Los tamaños de los archivos son diferentes"
 
-#: resources.h:999
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7157,23 +7360,23 @@
 "Si está activada, navegar por la estructura local de directorios también "
 "cambiará el directorio correspondiente en el servidor y viceversa."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Iniciar o detener el proceso de la cola de transferencias"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Ocultar o mostrar el árbol de directorios local"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Ocultar o mostrar el área de mensajes"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Ocultar o mostrar el árbol de directorios remoto"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Ocultar o mostrar la cola de transferencia"
 
@@ -7186,37 +7389,37 @@
 msgstr "Demasiadas redirecciones"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Traza:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transferencia"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Dirección de la transferencia"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Tipo de transferencia"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Modo de transferencia"
 
-#: resources.h:876
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Cola de transferencia"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Opciones de Transferencia"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Conexión de transferencia interrumpida: %s"
@@ -7225,8 +7428,8 @@
 msgid "Transferred data got tainted."
 msgstr "Los datos transferidos se han corrompido."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Transfiriendo"
 
@@ -7234,69 +7437,69 @@
 msgid "Transfers"
 msgstr "Transferencias"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transferencia completada"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Tratar archivos sin e&xtensión como archivos ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Tratar los &siguientes tipos de archivo como ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Confiar en clave de host cambiada:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Confiar en nueva clave de host:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "¿Confiar en la nueva clave y seguir con la conexión?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "¿Confiar en este certificado y seguir conectando?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "¿Confiar en este sitio y seguir con la conexión?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tipo"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Tipo de Proxy FTP:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Tipo de proxy genérico:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "&Subir"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Límite de s&ubida:"
 
-#: resources.h:938
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "U&sar asociaciones de tipo de archivo si están disponibles"
 
-#: resources.h:891
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "U&sar valores predeterminados del sistema"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "usuario@&servidor"
 
@@ -7305,16 +7508,16 @@
 msgid "Unassigned error code %d"
 msgstr "Código de error no asignado %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unidad:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Desconocido"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Tipo de proxy FTP desconocido, no se puede generar la secuencia de inicio de "
@@ -7329,7 +7532,7 @@
 msgid "Unknown certificate"
 msgstr "Certificado desconocido"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7337,7 +7540,7 @@
 "Error desconocido al abrir el archivo. Asegúrese de que se puede acceder al "
 "archivo y es un documento XML bien formado."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Clave de sitio desconocida"
 
@@ -7350,7 +7553,7 @@
 "Versión desconocida de protocolo SOCKS de subnegociación de autenticación "
 "usuario/contraseña: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7374,7 +7577,7 @@
 "A no ser que este problema se solucione, FTP no funcionará en modo activo y "
 "deberá usarse el modo pasivo."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Tipo de certificado no soportado."
 
@@ -7382,25 +7585,25 @@
 msgid "Unsupported redirect"
 msgstr "Redirección no permitida."
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Subir y des&hacer edición"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Comprobación de actualización"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Asistente de actualización"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+#, fuzzy
+msgid "Updates"
+msgstr "Comprobación de actualización"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Subir"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "La subida falló"
 
@@ -7413,100 +7616,100 @@
 msgid "Upload limit: none"
 msgstr "Límite de subida: ninguno"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Subir directorio seleccionado"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Subir los archivos y carpetas seleccionadas"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "¿Volver a subir este archivo al servidor?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "¿Subir este archivo al servidor?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Subiendo"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Subiendo y pendiente de eliminar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Subiendo y deshaciendo"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Usar set de caracteres &personalizado"
 
-#: resources.h:935
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Usar editor &personalizado:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Usar editor pre&determinado para archivos de texto"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Usar navegación s&incronizada"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Usar UTF-8 si el servidor lo admite. Si no, usar el juego de carácteres "
 "local."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Usar acción predeterminada"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Utilizar FTP simple"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Usar servidor actualmente conectado"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Usar servidor del gestor de sitios"
 
-#: resources.h:885
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Usar valores pre&determinados del sistema"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Usar la siguiente dirección IP:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Usar el siguiente intervalo de puertos:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Use en su lugar la dirección IP externa del servidor"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Use esto si se halla tras un enrutador y tiene una dirección IP externa "
 "estática."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7517,86 +7720,86 @@
 "activo por primera vez. Sólo se envía al servidor la versión de FileZilla "
 "que está usando."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "El nombre de usuario no puede ser una serie de espacios"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Usando proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Si no se usa el juego de caracteres adecuado, los nombres de archivo pueden "
 "no mostrarse correctamente."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Usando este asistente puede usted comprobar si hay disponibles "
 "actualizaciones de FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Desde válido:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Hasta válido"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Registro de mensajes detallado de wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Verificando certificado..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versión:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Muy alta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Opción ver ocultos fijada, pero no permitida por el servidor"
 
-#: resources.h:922
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Ver/Editar"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Columnas visibles"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "&Escribir"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Esperando"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Esperando la conexión del navegador"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Esperando la contraseña"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Esperando a que la transferencia sea cancelada"
 
@@ -7604,7 +7807,7 @@
 msgid "Waiting to retry..."
 msgstr "Esperando para reintentar..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7634,11 +7837,11 @@
 "enlace de capa de aplicación,\n"
 "FileZilla fallará en las transferencias grandes."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Aviso, ignorando conexión de datos desde IP incorrecta."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7653,23 +7856,31 @@
 "\n"
 "¿De verdad que quiere comprobar si hay versiones de desarrollo?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "¡Peligro: Potencial agujero de seguridad!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Bienvenido a FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "¿Qué es nuevo?"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Qué hay de nuevo:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Al permitir que FileZilla recuerde las contraseñas, puede volver a conectar "
+"sin tener que volver a introducirla al reiniciar FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7677,11 +7888,15 @@
 "Cuando se habilite, los caracteres no soportados para los nombres de "
 "ficheros, se reemplazan durante la descarga"
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Pantalla panorámica"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "¿Te gustaría FileZilla guardara las contraseñas?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Escr&ibir"
 
@@ -7694,11 +7909,19 @@
 msgid "Wrong line endings"
 msgstr "Finales de línea incorrectos"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Sí"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Usted parece estar utilizando un host IPv6-only. Este asistente no es "
+"compatible con este entorno."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7706,17 +7929,17 @@
 "Ya está usted utilizando la última versión de FileZilla. Por favor vuelva a "
 "comprobarlo en el futuro."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Siempre podrá ver este mensaje a través del menú de ayuda."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Puede dejar el campo del puerto en blanco para utilizar el puerto por "
 "defecto."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7743,19 +7966,19 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "No ha escrito un nuevo nombre para el archivo. ¿Desea sobreescribirlo?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Has seleccionado, al menos, un enlace simbólico."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 "Ha seleccionado más de 10 archivos para editar, ¿realmente quiere continuar?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7764,11 +7987,11 @@
 "quiere continuar?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Debe introducir un nombre de máquina."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Tiene que introducir un directorio local."
 
@@ -7777,17 +8000,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Tiene que introducir una dirección IP válida."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Tiene que introducir un directorio local con permisos de escritura."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Debe introducir un nombre de cuenta"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Tiene que especificar un nombre de usuario"
 
@@ -7807,29 +8030,29 @@
 msgid "You need to enter a name for the log file."
 msgstr "Necesita introducir un nombre para el fichero de registro."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Necesita introducir un comando entrecomillado adecuadamente."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Necesita introducir un servidor proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Necesita introducir un puerto proxy en el rango de 1 a 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Necesita introducir al menos una ruta, no se admiten marcadores vacíos."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7837,7 +8060,7 @@
 "Necesita introducir tanto la ruta remota como la local para activar la "
 "navegación sincronizada en este marcador."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7869,44 +8092,50 @@
 "No debería tener problemas al conectar con otros servidores, las "
 "tranferencias de ficheros deberían funcionar correctamente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "después"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "antes"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "empieza con"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+#, fuzzy
+msgid "bytes"
+msgstr "%s bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "contiene"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "no contiene"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "no es igual"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "acaba con"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "es igual a"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "archivo"
 
@@ -7925,81 +8154,124 @@
 "Por favor asegúrese de que este ejecutable existe en el mismo directorio que "
 "el archivo ejecutable de FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp no pudo ser iniciado"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers no retornó certificados"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "mayor que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "el grupo lee"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "el grupo lee"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "el gurpo escribe"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "igual a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "está activado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "está desactivado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "menor que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "concuerda con expresión regular"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "propietario ejecuta"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "propietario lee"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "propietario escribe"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "desconocido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "todos ejecutan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "todos leen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "todos escriben"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Copy"
+#~ msgstr "Cop&iar"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Permitir comprobación automática de actualizaciones"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Número de días entre comprobaciones de actualización:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Mínimo 7 días)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Comprobación automática de actualizaciones"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Comprobar si hay versiones &beta y candidatas al lanzamiento"
+
+#~ msgid "Cop&y"
+#~ msgstr "Cop&iar"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr ""
+#~ "Por favor introduzca un intervalo de actualización de al menos 7 días"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Política de privacidad:"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Duplicar el nombre de filtro"
diff -Nru filezilla-3.5.3/locales/et_EE.po filezilla-3.7.3~precise/locales/et_EE.po
--- filezilla-3.5.3/locales/et_EE.po	2011-05-08 17:37:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/et_EE.po	2012-11-02 10:15:07.000000000 +0000
@@ -2,29 +2,29 @@
 msgstr ""
 "Project-Id-Version: filezilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-08 15:13+0200\n"
-"PO-Revision-Date: 2011-03-28 21:23+0200\n"
+"POT-Creation-Date: 2012-11-02 11:10+0100\n"
+"PO-Revision-Date: 2012-10-22 20:56+0200\n"
 "Last-Translator: Janek Hortla <peemot ät gmail punkt com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Country: ESTONIA\n"
+"Language: et_EE\n"
 "X-Poedit-SourceCharset: utf-8\n"
-"X-Poedit-Language: Estonian\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:228
 msgid "%H:%M:%S elapsed"
 msgstr "Aega kulunud: %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "%H:%M:%S left"
 msgstr "Aega lõpuni: %H:%M:%S"
 
-#: resources.h:777
+#: resources.h:790
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -42,9 +42,9 @@
 msgstr[0] "%d kataloog"
 msgstr[1] "%d kataloogi"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1666
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1026
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -53,9 +53,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -76,7 +76,7 @@
 msgstr[0] "%d fail. Kogusuurus: Vähemalt %s"
 msgstr[1] "%d faili. Kogusuurus: Vähemalt %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2928
+#: ../../locales/../src/interface/QueueView.cpp:2939
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d faili lisatud järjekorda"
@@ -88,34 +88,34 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:774
+#: resources.h:787
 msgid "%h - Host"
 msgstr "%h - Server"
 
-#: resources.h:776
+#: resources.h:789
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Parool"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#, c-format
 msgid "%s (%d B/s)"
-msgstr "%s baiti (%d B/s)"
+msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:182
+#, c-format
 msgid "%s (%d.%d KB/s)"
-msgstr "%s baiti (%d.%d KB/s)"
+msgstr "%s (%d.%d KB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:180
+#, c-format
 msgid "%s (%d.%d MB/s)"
-msgstr "%s baiti (%d.%d MB/s)"
+msgstr "%s (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:187
+#, c-format
 msgid "%s (? B/s)"
-msgstr "%s baiti (? B/s)"
+msgstr "%s (? B/s)"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
@@ -127,7 +127,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ei ole veel kehtiv!"
 
-#: resources.h:778
+#: resources.h:791
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proksi kasutaja"
@@ -203,41 +203,41 @@
 msgid "%s with %d bits"
 msgstr "%s %d bitiga"
 
-#: resources.h:775
+#: resources.h:788
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Kasutajanimi"
 
-#: resources.h:779
+#: resources.h:792
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proksi parool"
 
-#: resources.h:554
+#: resources.h:563
 msgid "&About..."
 msgstr "&Programmist..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "Ko&nto:"
 
-#: resources.h:101 resources.h:679 resources.h:743
+#: resources.h:101 resources.h:692 resources.h:756
 msgid "&Active"
 msgstr "&Aktiivne"
 
-#: resources.h:545
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr "&Lisa järjehoidja..."
 
-#: resources.h:558 resources.h:575
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "&Failide lisamine järjekorda"
 
-#: resources.h:787
+#: resources.h:800
 msgid "&Add keyfile..."
 msgstr "&Lisa võtmefail..."
 
-#: resources.h:629 resources.h:648
+#: resources.h:642 resources.h:661
 msgid "&Add to queue"
 msgstr "&Lisa järjekorda"
 
@@ -249,15 +249,15 @@
 msgid "&Always trust certificate in future sessions."
 msgstr "&Usalda sertifikaati ka tulevastel sessioonidel."
 
-#: resources.h:182
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Usalda seda serverit alati ja lisa tema võti mällu"
 
-#: resources.h:938
+#: resources.h:952
 msgid "&Always use default editor"
 msgstr "&Kasuta alati vaikimisi editori"
 
-#: resources.h:427
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr ""
 
@@ -265,11 +265,11 @@
 msgid "&Always use this action"
 msgstr "K&asuta alati seda toimingut"
 
-#: resources.h:755
+#: resources.h:768
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Küsi operatsioonisüsteemilt välist IP aadressi"
 
-#: resources.h:527 resources.h:659 resources.h:824
+#: resources.h:536 resources.h:672 resources.h:837
 msgid "&Auto"
 msgstr "&Auto"
 
@@ -277,50 +277,50 @@
 msgid "&Autodetect"
 msgstr "&Automaatne tuvastus"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:538 resources.h:674 resources.h:839
 msgid "&Binary"
 msgstr "&Binaarne"
 
-#: resources.h:898
+#: resources.h:912
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Binaarne - kasutatakse SI sümboleid. (näit. 1 KB = 1024 baiti)"
 
-#: resources.h:544
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr "&Järjehoidjad"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:935 resources.h:957
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:949 resources.h:971
 msgid "&Browse..."
 msgstr "&Sirvi..."
 
-#: resources.h:814
+#: resources.h:827
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Kiiruse kõikumise tolerants:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:727
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:740
 msgid "&Cancel"
 msgstr "&Loobu"
 
-#: resources.h:235
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Kontrolli FileZilla beeta versioonide olemasolu"
 
-#: resources.h:505
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "&Privaatsete andmete kustutamine..."
 
-#: resources.h:602
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&Sulge FileZilla"
 
-#: resources.h:669
+#: resources.h:682
 msgid "&Configure speed limits..."
-msgstr ""
+msgstr "&Seadista kiiruspiirangud..."
 
-#: resources.h:532
+#: resources.h:541
 msgid "&Configure..."
 msgstr "&Seadista..."
 
@@ -328,129 +328,133 @@
 msgid "&Connect"
 msgstr "&Ühenda"
 
-#: resources.h:218
+#: resources.h:219
 msgid "&Copy"
 msgstr "&Kopeeri"
 
-#: resources.h:493
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopeeri aktiivne ühendus saidihaldurisse..."
 
-#: resources.h:172 resources.h:611
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "&Kopeeri lõikemällu"
 
-#: resources.h:616
+#: resources.h:627
 msgid "&Crash"
 msgstr "&Avarii"
 
-#: resources.h:566 resources.h:580 resources.h:631 resources.h:652
+#: resources.h:575 resources.h:589 resources.h:644 resources.h:665
 msgid "&Create directory"
 msgstr "&Loo kataloog"
 
-#: resources.h:664
-#, fuzzy
+#: resources.h:677
 msgid "&Create new tab"
-msgstr "Avab uue saki"
+msgstr "&Ava uus sakk"
 
 #: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Silumine"
 
-#: resources.h:965
+#: resources.h:979
 msgid "&Debug information in message log:"
 msgstr "&Siluri info teadete logis:"
 
-#: resources.h:931
+#: resources.h:945
 msgid "&Default editor:"
 msgstr "&Vaikimisi editor:"
 
-#: resources.h:525 resources.h:594
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr "&Vaikimisi toiming faili olemasolul..."
 
-#: resources.h:737
+#: resources.h:750
 msgid "&Delay between failed login attempts:"
 msgstr "Sisselogimiskatsete vaheline aeg:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:569 resources.h:654
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:667
 msgid "&Delete"
 msgstr "Kus&tuta"
 
-#: resources.h:457
+#: resources.h:458
 msgid "&Delete symlink"
 msgstr "&Kustuta symlink"
 
-#: resources.h:511
+#: resources.h:519
 msgid "&Directory comparison"
 msgstr "V&õrdle katalooge"
 
-#: resources.h:325
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Tühista kohalik fail ning tõmba ja muuda uuesti"
 
-#: resources.h:538
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "&Katkesta ühendus"
 
-#: resources.h:603
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "&Katkesta ühendus serveriga"
 
-#: resources.h:874
+#: resources.h:888
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr "Näita ülekande hetkekiirust, mitte keskmist kiirust"
+msgstr "&Näita ülekande hetkekiirust, mitte keskmist kiirust"
 
-#: resources.h:896
+#: resources.h:910
 msgid "&Display size in bytes"
 msgstr "&Näita failisuurusi baitides"
 
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "Sisesta parool"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Ära enam näita seda dialoogi."
 
-#: resources.h:760
+#: resources.h:773
 msgid "&Don't use external IP address on local connections."
 msgstr "Ärge kasutage välist IP aadressi &kohalikel ühendustel."
 
-#: resources.h:918
+#: resources.h:932
 msgid "&Double-click action on files:"
 msgstr "&Topelt-klõps failidel:"
 
-#: resources.h:573 resources.h:627
+#: resources.h:582 resources.h:640
 msgid "&Download"
 msgstr "&Allalaadimine"
 
-#: resources.h:443
+#: resources.h:444
 msgid "&Download to:"
 msgstr "&Lae kausta:"
 
-#: resources.h:662
+#: resources.h:675
 msgid "&Download..."
 msgstr "&Lae alla..."
 
-#: resources.h:257 resources.h:836
+#: resources.h:258 resources.h:849
 msgid "&Downloads:"
 msgstr "&Allalaadimised:"
 
-#: resources.h:503 resources.h:564
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "&Muutmine"
 
-#: resources.h:210
+#: resources.h:211
 msgid "&Edit filter rules..."
 msgstr "&Filtrite muutmine..."
 
-#: resources.h:512 resources.h:531 resources.h:642 resources.h:668
+#: resources.h:520 resources.h:540 resources.h:655 resources.h:681
 msgid "&Enable"
 msgstr "&Luba"
 
-#: resources.h:946
+#: resources.h:960
 msgid "&Enable automatic update check"
 msgstr "&Luba automaatne uuenduste kontroll"
 
-#: resources.h:481 resources.h:809
+#: resources.h:482 resources.h:822
 msgid "&Enable speed limits"
 msgstr "&Luba kiiruste piirangud"
 
@@ -462,7 +466,7 @@
 msgid "&Encryption:"
 msgstr "K&rüpteering:"
 
-#: resources.h:610
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "&Sisesta oma käsk..."
 
@@ -470,44 +474,43 @@
 msgid "&Execute"
 msgstr "&Käivita"
 
-#: resources.h:292
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "&Saidihalduri kirjete eksport"
 
-#: resources.h:498 resources.h:658
+#: resources.h:506 resources.h:671
 msgid "&Export..."
 msgstr "&Eksport..."
 
-#: resources.h:765
+#: resources.h:778
 msgid "&Fall back to active mode"
 msgstr "&Tagasi aktiivse laadi juurde"
 
-#: resources.h:490
+#: resources.h:498
 msgid "&File"
 msgstr "&Fail"
 
-#: resources.h:639
+#: resources.h:652
 msgid "&File Attributes..."
 msgstr "&Faili atribuudid..."
 
-#: resources.h:589
+#: resources.h:600
 msgid "&File permissions..."
 msgstr "&Faili õigused..."
 
-#: resources.h:365
+#: resources.h:366
 msgid "&File:"
 msgstr "&Fail:"
 
-#: resources.h:220
-#, fuzzy
+#: resources.h:221
 msgid "&Filter conditions:"
-msgstr "&Filtrikogumik:"
+msgstr "&Filtri tingimused:"
 
-#: resources.h:199
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "&Filtrikogumik:"
 
-#: resources.h:214
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&Filtrid:"
 
@@ -516,82 +519,82 @@
 msgid "&Finish"
 msgstr "&Lõpeta muutmine"
 
-#: resources.h:317
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "&Lõpeta muutmine ja kustuta kohalik fail"
 
-#: resources.h:447
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "&Tõmba kõik failid otse sihtkausta olenemata nende paiknemisest serveris"
 
-#: resources.h:458
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 
-#: resources.h:758
+#: resources.h:771
 msgid "&Get external IP address from the following URL:"
 msgstr "&Võta väline IP aadress järgnevalt URL'ilt:"
 
-#: resources.h:552
+#: resources.h:561
 msgid "&Getting help..."
 msgstr "&Abilehed..."
 
-#: resources.h:397
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr "&Globaalne järjehoidja"
 
-#: resources.h:794
+#: resources.h:807
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 kasutab CONNECT-meetodit"
 
-#: resources.h:548
+#: resources.h:557
 msgid "&Help"
 msgstr "&Abi"
 
-#: resources.h:515 resources.h:645
+#: resources.h:523 resources.h:658
 msgid "&Hide identical files"
 msgstr "&Peida identsed failid"
 
-#: resources.h:596
+#: resources.h:607
 msgid "&Highest"
 msgstr "&Tähtsaim"
 
-#: resources.h:753
+#: resources.h:766
 msgid "&Highest available port:"
 msgstr "&Kõrgeim vaba port:"
 
-#: resources.h:79 resources.h:378 resources.h:717
+#: resources.h:79 resources.h:379 resources.h:730
 msgid "&Host:"
 msgstr "&Server:"
 
-#: resources.h:897
+#: resources.h:911
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC binaarne kuju (näit. 1 KiB = 1024 baiti)"
 
-#: resources.h:885
+#: resources.h:899
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (näiteks: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:507
 msgid "&Import..."
 msgstr "&Import..."
 
-#: resources.h:940
+#: resources.h:954
 msgid "&Inherit system's filetype associations"
 msgstr "&Kasuta süsteemi failitüüpide seoseid"
 
-#: resources.h:446
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr "Säilita &kaustade liigendatus otsingu juurkausta suhtes"
 
-#: resources.h:859
+#: resources.h:872
 msgid "&Layout of file and directory panes:"
 msgstr "&Faili- ja kataloogipaneelide paigutus:"
 
-#: resources.h:750
+#: resources.h:763
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Filezilla poolt kasutatud kohalike portide arv"
 
@@ -599,15 +602,15 @@
 msgid "&Limit number of simultaneous connections"
 msgstr "&Erinevate ühenduste limiitarv"
 
-#: resources.h:520
+#: resources.h:529
 msgid "&Local directory tree"
 msgstr "K&ohalik kataloogipuu"
 
-#: resources.h:402 resources.h:408
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
 msgstr "&Kohalik kataloog:"
 
-#: resources.h:955
+#: resources.h:969
 msgid "&Log to file"
 msgstr "&Logi faili"
 
@@ -615,19 +618,19 @@
 msgid "&Logon Type:"
 msgstr "&Autentimine:"
 
-#: resources.h:381
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&Sisselogimise tüüp:"
 
-#: resources.h:599
+#: resources.h:610
 msgid "&Low"
 msgstr "&Madal"
 
-#: resources.h:546
+#: resources.h:555
 msgid "&Manage bookmarks..."
 msgstr "&Halda järjehoidjaid..."
 
-#: resources.h:534
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "K&äsitsi ülekanne..."
 
@@ -635,27 +638,27 @@
 msgid "&Maximum number of connections:"
 msgstr "&Maksimaalne ühenduste arv:"
 
-#: resources.h:735
+#: resources.h:748
 msgid "&Maximum number of retries:"
 msgstr "Maksimaalne korduskatsete arv:"
 
-#: resources.h:519
+#: resources.h:528
 msgid "&Message log"
 msgstr "&Teadete logi"
 
-#: resources.h:872
+#: resources.h:885
 msgid "&Minimize to tray"
 msgstr "&Minimeeri süsteemisalve (kella kõrvale)"
 
-#: resources.h:400
+#: resources.h:401
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: resources.h:504
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "&Võrgu seadistamise nõustaja..."
 
-#: resources.h:215
+#: resources.h:216
 msgid "&New"
 msgstr "&Uus"
 
@@ -671,19 +674,19 @@
 msgid "&Next >"
 msgstr ""
 
-#: resources.h:319
+#: resources.h:320
 msgid "&No"
 msgstr "&Ei"
 
-#: resources.h:768 resources.h:793
+#: resources.h:781 resources.h:806
 msgid "&None"
 msgstr "&Puudub"
 
-#: resources.h:598
+#: resources.h:609
 msgid "&Normal"
 msgstr "&Normaalne"
 
-#: resources.h:947
+#: resources.h:961
 msgid "&Number of days between update checks:"
 msgstr "Uuenduste kontrollimise intervall päevades:"
 
@@ -691,15 +694,15 @@
 msgid "&Numeric value:"
 msgstr "&Numbriline väärtus:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:771
+#: resources.h:784
 msgid "&OPEN"
 msgstr "&AVA"
 
-#: resources.h:562 resources.h:650
+#: resources.h:571 resources.h:663
 msgid "&Open"
 msgstr "&Ava"
 
@@ -715,31 +718,31 @@
 msgid "&Password:"
 msgstr "&Parool:"
 
-#: resources.h:606
+#: resources.h:617
 msgid "&Play sound"
 msgstr "&Mängi heli"
 
-#: resources.h:80 resources.h:379 resources.h:721
+#: resources.h:80 resources.h:380 resources.h:734
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:865
+#: resources.h:878
 msgid "&Position of the message log:"
 msgstr "&Teadete logi asukoht:"
 
-#: resources.h:530
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Säilita ülekantud failide ajaväärtused"
 
-#: resources.h:301
+#: resources.h:302
 msgid "&Queue"
 msgstr "&Järjekord"
 
-#: resources.h:723
+#: resources.h:736
 msgid "&Quickconnect"
 msgstr "&Kiirühendus"
 
-#: resources.h:518
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "&Kiirühenduse riba"
 
@@ -747,11 +750,11 @@
 msgid "&Read"
 msgstr "&Loe"
 
-#: resources.h:537
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "&Taasühenda"
 
-#: resources.h:509 resources.h:667
+#: resources.h:517 resources.h:680
 msgid "&Refresh"
 msgstr "&Värskenda"
 
@@ -759,53 +762,57 @@
 msgid "&Remember password for this session"
 msgstr "&Jäta selleks seansiks parool meelde"
 
-#: resources.h:404 resources.h:410
+#: resources.h:493
+#, fuzzy
+msgid "&Remember passwords"
+msgstr "Sisesta parool"
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
 msgstr "S&erveri kataloog:"
 
-#: resources.h:368
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "&Serveri kaustatee:"
 
-#: resources.h:830
+#: resources.h:843
 msgid "&Remove"
 msgstr "&Eemalda"
 
-#: resources.h:788
+#: resources.h:801
 msgid "&Remove key"
 msgstr "&Eemalda võti"
 
-#: resources.h:593
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "&Eemalda valitud"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:571
-#: resources.h:585 resources.h:635 resources.h:656
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:648 resources.h:669
 msgid "&Rename"
 msgstr "Nimeta üm&ber"
 
-#: resources.h:201
+#: resources.h:202
 msgid "&Rename..."
 msgstr "&Nimeta ümber..."
 
-#: resources.h:324
+#: resources.h:325
 msgid "&Reopen local file"
 msgstr "&Taasava kohalik fail"
 
-#: resources.h:821
+#: resources.h:834
 msgid "&Replace invalid characters with:"
 msgstr "Asenda vigased sümbolid &märgendiga:"
 
-#: resources.h:553
+#: resources.h:562
 msgid "&Report a bug..."
 msgstr "&Teavita veast..."
 
-#: resources.h:619
-#, fuzzy
+#: resources.h:632
 msgid "&Reset and requeue all"
-msgstr "Tühista ja aseta valitud failid uuesti järjekorda"
+msgstr "Tühista ja &aseta kõik failid uuesti järjekorda"
 
-#: resources.h:716
+#: resources.h:729
 msgid "&Restart Wizard"
 msgstr "&Käivita nõustaja uuesti"
 
@@ -813,35 +820,35 @@
 msgid "&Resume"
 msgstr "&Jätka"
 
-#: resources.h:604
+#: resources.h:615
 msgid "&Run command..."
-msgstr "&Käivita käsk..."
+msgstr "K&äivita käsk..."
 
-#: resources.h:730
+#: resources.h:743
 msgid "&Run configuration wizard now..."
 msgstr "&Käivita võrgu seadistamise nõustaja..."
 
-#: resources.h:949
+#: resources.h:963
 msgid "&Run update check now..."
 msgstr "&Kontrolli uuendusi kohe ..."
 
-#: resources.h:770
+#: resources.h:783
 msgid "&SITE"
 msgstr "&SAIT"
 
-#: resources.h:795
+#: resources.h:808
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&Salvesta uue nimega..."
 
-#: resources.h:432
+#: resources.h:433
 msgid "&Search"
 msgstr "&Otsi"
 
-#: resources.h:539
+#: resources.h:548
 msgid "&Search remote files..."
 msgstr "&Otsi kaugeid faile..."
 
@@ -849,43 +856,43 @@
 msgid "&Select Entry:"
 msgstr "&Vali kirje:"
 
-#: resources.h:929
+#: resources.h:943
 msgid "&Select language:"
 msgstr "&Vali keel:"
 
-#: resources.h:356
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "&Vali kuvatavad veerud:"
 
-#: resources.h:370 resources.h:535
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:301
 msgid "&Settings"
 msgstr "&Seaded"
 
-#: resources.h:506
+#: resources.h:514
 msgid "&Settings..."
 msgstr "&Seaded..."
 
-#: resources.h:964
+#: resources.h:978
 msgid "&Show debug menu"
 msgstr "&Näita siluri menüüd"
 
-#: resources.h:605
+#: resources.h:616
 msgid "&Show message"
 msgstr "&Näita teadet"
 
-#: resources.h:954
+#: resources.h:968
 msgid "&Show timestamps in message log"
 msgstr "&Näita ajaväärtusi teadete logis"
 
-#: resources.h:491
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "&Saidihaldur..."
 
-#: resources.h:398
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr "S&aidikeskne järjehoidja"
 
@@ -893,27 +900,32 @@
 msgid "&Skip"
 msgstr "J&äta vahele"
 
-#: resources.h:533
+#: resources.h:542
 msgid "&Speed limits"
 msgstr "&Kiiruspiirangud"
 
-#: resources.h:449
+#: resources.h:450
 msgid "&Start transfer immediately"
 msgstr "&Alusta koheselt ülekannet"
 
-#: resources.h:864
+#: resources.h:877
 msgid "&Swap local and remote panes"
-msgstr "Vaheta kohalik ja serveri aken"
+msgstr "&Vaheta kohalik ja serveri aken"
+
+#: resources.h:629
+#, fuzzy
+msgid "&TLS Ciphers"
+msgstr "Šiffer:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Test"
 
-#: resources.h:877
+#: resources.h:891
 msgid "&Theme:"
 msgstr "&Teema:"
 
-#: resources.h:523
+#: resources.h:532
 msgid "&Transfer"
 msgstr "&Ülekanne"
 
@@ -921,31 +933,31 @@
 msgid "&Transfer mode:"
 msgstr "&Ülekande laad:"
 
-#: resources.h:522
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "&Ülekande järjekord"
 
-#: resources.h:833
+#: resources.h:846
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Loe punkt-failid ASCII failideks"
 
-#: resources.h:330
+#: resources.h:331
 msgid "&Unedit"
 msgstr "&Tühista muutused"
 
-#: resources.h:195
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr "&Uuenda selle serveri salvestatud võtit"
 
-#: resources.h:556 resources.h:646
+#: resources.h:565 resources.h:659
 msgid "&Upload"
 msgstr "&Üleslaadimine"
 
-#: resources.h:267 resources.h:845
+#: resources.h:268 resources.h:858
 msgid "&Uploads:"
 msgstr "&Üleslaadimised:"
 
-#: resources.h:425
+#: resources.h:426
 msgid "&Use custom program"
 msgstr "&Vali programm"
 
@@ -953,27 +965,27 @@
 msgid "&Use synchronized browsing"
 msgstr "Kasuta &sünkroniseeritud brausimist"
 
-#: resources.h:933
+#: resources.h:947
 msgid "&Use system's default editor for text files"
 msgstr "&Kasuta vaikimisi tekstitoimetusprogrammi"
 
-#: resources.h:756
+#: resources.h:769
 msgid "&Use the following IP address:"
 msgstr "&Kasuta järgmist IP aadressi:"
 
-#: resources.h:764
+#: resources.h:777
 msgid "&Use the server's external IP address instead"
 msgstr "&Kasuta selle asemel serveri välist IP aadressi"
 
-#: resources.h:900
+#: resources.h:914
 msgid "&Use thousands separator"
 msgstr "&Kasuta tuhandete eraldajat"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "Kasuta&ja:"
 
-#: resources.h:719
+#: resources.h:732
 msgid "&Username:"
 msgstr "&Kasutajanimi:"
 
@@ -982,15 +994,15 @@
 msgid "&Version %s"
 msgstr "&Versioon %s"
 
-#: resources.h:508
+#: resources.h:516
 msgid "&View"
 msgstr "&Vaade"
 
-#: resources.h:579
+#: resources.h:588
 msgid "&View/Edit"
 msgstr "&Vaata/Muuda"
 
-#: resources.h:939
+#: resources.h:953
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Jälgi kohalikult muudetud faile ja paku muudatuste üleslaadimist"
 
@@ -998,7 +1010,7 @@
 msgid "&Write"
 msgstr "&Kirjuta"
 
-#: resources.h:318
+#: resources.h:319
 msgid "&Yes"
 msgstr "&Jah"
 
@@ -1016,11 +1028,11 @@
 msgstr "'%s' ei ole kataloog."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "'Konto' tüüpi sisselogimine ei ole valitud protokolli poolt toetatud"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1038,42 +1050,42 @@
 msgstr[0] "(%d objekt filtreeritud)"
 msgstr[1] "(%d objekti filtreeritud)"
 
-#: resources.h:805 resources.h:807
+#: resources.h:818 resources.h:820
 msgid "(0 for no limit)"
 msgstr "(0 limiidivaba)"
 
-#: resources.h:736
+#: resources.h:749
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:738
+#: resources.h:751
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekundit)"
 
-#: resources.h:803
+#: resources.h:816
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:732
+#: resources.h:745
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 keelamiseks)"
 
-#: resources.h:948
+#: resources.h:962
 msgid "(At least 7 days)"
 msgstr "(Vähemalt 7 päeva)"
 
-#: resources.h:893
+#: resources.h:907
 msgid "(example: %H:%M)"
 msgstr "(näiteks: %H:%M)"
 
-#: resources.h:887
+#: resources.h:901
 msgid "(example: %Y-%m-%d)"
 msgstr "(näiteks: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:811 resources.h:813
-#, fuzzy, c-format
+#: resources.h:484 resources.h:486 resources.h:824 resources.h:826
+#, c-format
 msgid "(in %s/s)"
-msgstr "(KB/s)"
+msgstr "(%s/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:896
 msgid ", %H:%M:%S left"
@@ -1083,23 +1095,23 @@
 msgid ", --:--:-- left"
 msgstr ", aega lõpuni: --:--:--"
 
-#: resources.h:704
+#: resources.h:717
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr ""
 
-#: resources.h:249
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr ""
 
-#: resources.h:247
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr ""
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:239
 msgid "--:--:-- left"
 msgstr "Aega lõpuni: --:--:--"
 
@@ -1108,9 +1120,8 @@
 msgstr "-c'd ei saa kasutada koos FTP URL'ga."
 
 #: ../../locales/../src/interface/cmdline.cpp:89
-#, fuzzy
 msgid "-l can only be used together with an FTP URL."
-msgstr "-c'd ei saa kasutada koos FTP URL'ga."
+msgstr "-l'i saab kasutada ainult koos FTP URL'ga."
 
 #: ../../locales/../src/interface/cmdline.cpp:68
 msgid "-s and -c cannot be present at the same time."
@@ -1120,41 +1131,39 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s'i ei saa kasutada koos FTP URL'ga."
 
-#: resources.h:966
+#: resources.h:980
 msgid "0 - None"
 msgstr "0 - Puudub"
 
-#: resources.h:967
+#: resources.h:981
 msgid "1 - Warning"
 msgstr "1 - Hoiatus"
 
-#: resources.h:968
+#: resources.h:982
 msgid "2 - Info"
 msgstr "2 - Info"
 
-#: resources.h:969
+#: resources.h:983
 msgid "3 - Verbose"
 msgstr "3 - Paljusõnaline"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
-msgstr "S&üsteemi ümberlaadimine"
+msgstr "32-bitine süsteem"
 
-#: resources.h:970
+#: resources.h:984
 msgid "4 - Debug"
 msgstr "4 - Silur"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
-msgstr "S&üsteemi ümberlaadimine"
+msgstr "64-bitine süsteem"
 
 #: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "< &Back"
 msgstr ""
 
-#: resources.h:547
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
@@ -1167,13 +1176,13 @@
 msgid "A default editor needs to be set."
 msgstr "Vaikimisi kasutatav tekstitoimetusprogramm vajab seadistamist."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
+#: ../../locales/../src/interface/RemoteListView.cpp:155
 #: ../../locales/../src/interface/RemoteTreeView.cpp:115
 #, fuzzy
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Kataloogi ei saa lohistada oma enda alamkatoogi."
 
-#: resources.h:676
+#: resources.h:689
 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 "
@@ -1183,22 +1192,22 @@
 "Sellistel juhtudel peab kasutama aktiivset laadi. Aktiivse laadi puhul "
 "FileZilla avab pordi ja palub serveril sinna ühenduda."
 
-#: resources.h:306
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr "Eelnevalt avatud faili on muudetud."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Selle nimega faili on juba muutmisel. Kas soovid '%s' uuesti avada?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "Selle nimega fail on juba üle kantud."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2651
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
@@ -1217,11 +1226,11 @@
 "Kuni probleem pole lahendatud, võivad failid nimekirjast puududa.\n"
 "Selle sessiooni jooksul hoiatust rohkem ei kuvata."
 
-#: resources.h:237
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr "Uuem versioon FileZillast on kättesaadav:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:677
 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."
@@ -1230,7 +1239,7 @@
 "serverid peidavad kasutaja eest. Kasuta seda valikut, et sundida serverit "
 "näitama kõiki faile."
 
-#: resources.h:748
+#: resources.h:761
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1244,15 +1253,15 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:537 resources.h:673 resources.h:838
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:829
+#: resources.h:842
 msgid "A&dd"
 msgstr "L&isa"
 
-#: resources.h:856
+#: resources.h:869
 msgid "A&llow resume of ASCII files"
 msgstr "L&uba ASCII failide ülekande jätkamist"
 
@@ -1268,16 +1277,15 @@
 msgid "A&pply to all files and directories"
 msgstr "R&akenda kõikidele failidele ja kataloogidele"
 
-#: resources.h:626
-#, fuzzy
+#: resources.h:639
 msgid "A&utomatically remove successful transfers"
 msgstr "&Eemalda automaatselt õnnestunud ülekanded"
 
-#: resources.h:389
+#: resources.h:390
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
 msgstr "Katkesta eelmine ühendus ja ava uus ühendus samas sakis"
 
@@ -1285,31 +1293,31 @@
 msgid "About FileZilla"
 msgstr "FileZillast"
 
-#: resources.h:866
+#: resources.h:879
 msgid "Above the file lists"
 msgstr "Failide nimekirja kohal"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:160
 #: ../../locales/../src/interface/manual_transfer.cpp:161
 #: ../../locales/../src/interface/manual_transfer.cpp:194
 #: ../../locales/../src/interface/manual_transfer.cpp:560
 #: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:601
+#: resources.h:612
 msgid "Action after queue &completion"
-msgstr "Tegevus järjekorra &lõppemisel"
+msgstr "&Tegevus järjekorra lõppemisel"
 
-#: resources.h:329
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "Tegevus valitud failile:"
 
-#: resources.h:323
+#: resources.h:324
 msgid "Action to perform:"
 msgstr "Sooritatavad tegevused"
 
@@ -1346,23 +1354,23 @@
 "Aktiivse laadi FTP test ebaõnnestus. FileZilla küll teab korrektset välist "
 "IP aadressi, kuid teie ruuter või tulemüür muutis eksitavalt seda."
 
-#: resources.h:761
+#: resources.h:774
 msgid "Active mode IP"
 msgstr "Aktiivse laadi IP"
 
-#: resources.h:450
+#: resources.h:451
 msgid "Add files to &queue only"
 msgstr "Lisa &failid järjekorda"
 
-#: resources.h:630 resources.h:649
+#: resources.h:643 resources.h:662
 msgid "Add selected directory to the transfer queue"
 msgstr "Lisa valitud kataloog ülekande järjekorda"
 
-#: resources.h:559 resources.h:576
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Lisa valitud failid ja kataloogid ülekande järjekorda"
 
-#: resources.h:920 resources.h:926
+#: resources.h:934 resources.h:940
 msgid "Add to queue"
 msgstr "Lisa järjekorda"
 
@@ -1374,43 +1382,43 @@
 msgid "Advanced"
 msgstr "Lisad"
 
-#: resources.h:234
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "Täiendavad valikud:"
 
-#: resources.h:338
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "Algoritm"
 
-#: ../../locales/../src/interface/QueueView.cpp:3130
+#: ../../locales/../src/interface/QueueView.cpp:3141
 #, fuzzy
 msgid "All files have been successfully transferred"
 msgstr "&Eemalda automaatselt õnnestunud ülekanded"
 
-#: resources.h:705
+#: resources.h:718
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Kõik pordid antud piires peavad jääma vahemikku 1024 - 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3126
+#: ../../locales/../src/interface/QueueView.cpp:3137
 #, fuzzy, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Kõik muudatused filtrites jäävad salvestamata."
 msgstr[1] "Kõik muudatused filtrites jäävad salvestamata."
 
-#: resources.h:744
+#: resources.h:757
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Ülekande laadi ennistamine vea puhul lubatud"
 
-#: resources.h:680
+#: resources.h:693
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Lubada ülekande laadi ennistamine vea puhul"
 
-#: resources.h:476
+#: resources.h:477
 msgid "Already connected"
 msgstr "Esisteerib aktiivne ühendus"
 
-#: resources.h:789
+#: resources.h:802
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1418,7 +1426,7 @@
 "Võid kasutada ka PuTTY Pageant tööriista oma võtmete haldamiseks - FileZilla "
 "ei tunnista Pageant'i."
 
-#: resources.h:790
+#: resources.h:803
 #, fuzzy
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
@@ -1435,33 +1443,33 @@
 "FileZilla värskeima versiooni allalaadimiseks külastage saiti http://"
 "filezilla-project.org."
 
-#: ../../locales/../src/interface/QueueView.cpp:2042
+#: ../../locales/../src/interface/QueueView.cpp:2053
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
 "Some queue items might not have been restored."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1944
+#: ../../locales/../src/interface/QueueView.cpp:1952
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
 "Some queue items might not have been saved."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Sama nimega fail on juba sihtkohas olemas."
 
-#: ../../locales/../src/engine/server.cpp:869
+#: ../../locales/../src/engine/server.cpp:879
 #: ../../locales/../src/interface/manual_transfer.cpp:159
 #: ../../locales/../src/interface/manual_transfer.cpp:197
 #: ../../locales/../src/interface/manual_transfer.cpp:213
 #: ../../locales/../src/interface/manual_transfer.cpp:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Anonüümne"
 
@@ -1470,21 +1478,21 @@
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Kõik muudatused saidihalduris jäävad salvestamata."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 ""
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Kõik muudatused filtrites jäävad salvestamata."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr ""
 
@@ -1492,7 +1500,7 @@
 msgid "App&ly to directories only"
 msgstr "Ra&kenda ainult kataloogidele"
 
-#: resources.h:213
+#: resources.h:214
 msgid "Apply"
 msgstr "Rakenda"
 
@@ -1504,34 +1512,34 @@
 msgid "Apply to &files only"
 msgstr "Rakenda ainult &failidele"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "Arhiiv"
 
-#: resources.h:868
+#: resources.h:881
 msgid "As tab in the transfer queue pane"
 msgstr "Sakina ülekande järjekorra paanis"
 
-#: resources.h:259 resources.h:269 resources.h:837 resources.h:846
+#: resources.h:260 resources.h:270 resources.h:850 resources.h:859
 msgid "Ask for action"
 msgstr "Küsi mida teha"
 
-#: ../../locales/../src/engine/server.cpp:844
-#: ../../locales/../src/engine/server.cpp:863
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Küsi parooli"
 
-#: resources.h:701
+#: resources.h:714
 msgid "Ask operating system for a port."
-msgstr "Küsi opsüsteemilt porti."
+msgstr "Küsi porti operatsioonisüsteemilt."
 
-#: resources.h:691
+#: resources.h:704
 msgid "Ask your operating system for the external IP address"
 msgstr "Küsi opsüsteemilt välist IP aadressi"
 
-#: resources.h:471
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr ""
 
@@ -1543,11 +1551,11 @@
 msgid "At least one filter condition is incomplete"
 msgstr "Vähemalt üks filtreerimistingimus on mittetäielik"
 
-#: resources.h:710
+#: resources.h:723
 msgid "At this point, all required information has been gathered."
 msgstr "Nüüdseks on kogu vajalik informatsioon kätte saadud."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:136
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
 msgstr "Atribuut"
 
@@ -1555,23 +1563,23 @@
 msgid "Authentication failed."
 msgstr "Autentimine ebaõnnestus."
 
-#: resources.h:878
+#: resources.h:892
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:387
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:827
+#: resources.h:840
 msgid "Automatic file type classification"
 msgstr "Automaatne failitüübi määramine"
 
-#: resources.h:945
+#: resources.h:959
 msgid "Automatic update check"
 msgstr "Automaatne uuenduste kontroll"
 
-#: resources.h:882
+#: resources.h:896
 msgid "Available sizes"
 msgstr "Saadaval olevad suurused"
 
@@ -1584,46 +1592,46 @@
 msgid "B&ypass proxy"
 msgstr "&Möödu proksist"
 
-#: resources.h:467
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr ""
 
-#: resources.h:870
+#: resources.h:883
 msgid "Behaviour"
 msgstr "Käitumine"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr "Hetkel muutmisel"
 
-#: resources.h:615
+#: resources.h:626
 msgid "Benchmark string coalescer"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:911
 msgid "Beware! Certificate has been revoked"
 msgstr ""
 
-#: resources.h:390
+#: resources.h:391
 msgid "Binary"
 msgstr "Binaarne"
 
-#: resources.h:863
+#: resources.h:876
 msgid "Blackboard"
 msgstr "Tahvel"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
-#: ../../locales/../src/interface/menu_bar.cpp:311
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Järjehoidja"
 
-#: resources.h:413
+#: resources.h:414
 msgid "Bookmark:"
 msgstr "Järjehoidjad:"
 
-#: resources.h:412
+#: resources.h:413
 msgid "Bookmarks"
 msgstr "Järjehoidjad"
 
@@ -1639,7 +1647,7 @@
 msgid "Business category:"
 msgstr ""
 
-#: resources.h:751
+#: resources.h:764
 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, "
@@ -1648,63 +1656,63 @@
 "Vaikimisi kasutatakse ülekanneteks aktiivses laadis suvalist vaba porti. Kui "
 "te tahate limiteerida portide kasutust, sisestage lubatud portide piirkond."
 
-#: resources.h:536
+#: resources.h:545
 msgid "C&ancel current operation"
 msgstr "T&ühista käesolev operatsioon"
 
-#: resources.h:236
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "K&ontrolli FileZilla ööversioonide olemasolu"
 
-#: resources.h:612
+#: resources.h:623
 msgid "C&lear all"
 msgstr "P&uhasta kõik"
 
-#: resources.h:587 resources.h:637
+#: resources.h:598 resources.h:650
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Kopeeri URL(id) lõikemällu"
 
-#: resources.h:886
+#: resources.h:900
 msgid "C&ustom"
 msgstr "V&alitav"
 
-#: resources.h:941
+#: resources.h:955
 msgid "C&ustom filetype associations:"
 msgstr "Va&litud failitüüpide seosed:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
 msgstr "Arvutan serveri ajatsooni nihet..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:731
 msgid "Can't read from file"
 msgstr "Ei saa faili lugeda"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
 msgid "Can't write data to file."
 msgstr "Ei saa kirjutada andmeid faili."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:708
+#: ../../locales/../src/engine/transfersocket.cpp:782
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Ei saa kirjutada andmeid faili: %s"
 
 #: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Loobu"
 
-#: resources.h:988
+#: resources.h:1002
 msgid "Cancel current operation"
 msgstr "Tühista käesolev tegevus"
 
-#: resources.h:989
+#: resources.h:1003
 msgid "Cancels the current operation"
 msgstr "Tühista käesolev tegevus"
 
@@ -1714,7 +1722,7 @@
 msgstr ""
 "'%s' -i ei saa lugeda, puudub loetav meedia või kettaseade ei ole korras."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
 msgstr "Ei saa lisada serverit saidihaldurisse"
 
@@ -1732,26 +1740,26 @@
 "Katalooge ei õnnestu võrrelda, kasutatakse erinevaid filtreid kohaliku ja "
 "serveri kataloogi jaoks."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2750
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Ei saa võrrelda katalooge, pole serveriga ühendatud."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Ei saa luua uut filtrit"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2580
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "Ei saa faili muuta"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 msgid "Cannot edit file, not connected to any server."
 msgstr "Ei saa faili muuta, pole serveriga ühendatud."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
 msgstr ""
 
@@ -1761,8 +1769,8 @@
 "protocol."
 msgstr "Ei saa luua FTP ühendust SFTP serveriga. Palun valige õige protokoll."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Ei saa laadida kiirühenduse riba ressursifailist"
 
@@ -1774,44 +1782,44 @@
 msgid "Cannot load keyfile"
 msgstr "Ei õnnestu võtmefaili laadida"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1042
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
 msgid "Cannot load toolbar from resource file"
 msgstr "Ei saa laadida tööriistariba ressursifailist"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr "Ei saa ümber nimetada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1864
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "Ei saa faili ümber nimetada"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Ei saa salvestada filtreid"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Ei saa selekteerida filtreid"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
 msgstr "Ei saa lisada failitüübi seoseid"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "Ei saa näidata dialoogi"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
 msgstr "Valitud faili ei saa vaadata ega muuta"
 
-#: resources.h:283
+#: resources.h:284
 msgid "Categories"
 msgstr "Kategooriad"
 
@@ -1839,11 +1847,11 @@
 msgid "Change file attributes"
 msgstr "Muuda faili atribuute"
 
-#: resources.h:590 resources.h:640
+#: resources.h:601 resources.h:653
 msgid "Change the file permissions."
 msgstr "Muuda faili õigusi."
 
-#: resources.h:962
+#: resources.h:976
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Logifaili seadete muutmine vajab FileZilla restarti"
 
@@ -1855,15 +1863,15 @@
 msgid "Charset"
 msgstr "Kooditabel"
 
-#: resources.h:950
+#: resources.h:964
 msgid "Check for &beta versions and release candidates"
 msgstr "&Kontrolli FileZilla beetade ja reliisikandidaatide olemasolu"
 
-#: resources.h:549
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "&Kontrolli uuendusi..."
 
-#: resources.h:550
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "Kontrolli FileZilla uuemate versioonide olemasolu"
 
@@ -1871,7 +1879,7 @@
 msgid "Check for updates"
 msgstr "Uuenduste kontroll"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1758
+#: ../../locales/../src/interface/Mainfrm.cpp:1791
 msgid "Check for updates failed"
 msgstr "Uuenduste kontroll ebaõnnestus"
 
@@ -1879,7 +1887,7 @@
 msgid "Checking for correct external IP address"
 msgstr "Välise IP aadressi kontrollimine"
 
-#: resources.h:232
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "Kontrollin uuendusi"
 
@@ -1887,13 +1895,13 @@
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
 msgstr "Vali vaikimisi kohalik kataloog"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
 msgstr "Vali kohalik kataloog"
 
@@ -1905,39 +1913,39 @@
 msgid "Cipher:"
 msgstr "Šiffer:"
 
-#: resources.h:496 resources.h:665
+#: resources.h:504 resources.h:678
 msgid "Cl&ose tab"
-msgstr "Su&lge sakk"
+msgstr "&Sulge sakk"
 
-#: resources.h:860
+#: resources.h:873
 msgid "Classic"
 msgstr "Klassikaline"
 
-#: resources.h:286
+#: resources.h:287
 msgid "Clear &Site Manager entries"
 msgstr "Kustuta &Saidihalduri sissekanded"
 
-#: resources.h:613
+#: resources.h:624
 msgid "Clear &layout cache"
 msgstr "Puhasta &paigutuse vahemälu"
 
-#: resources.h:284
+#: resources.h:285
 msgid "Clear &quickconnect history"
 msgstr "Puhasta &kiirühenduste ajalugu"
 
-#: resources.h:285
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "Kustuta &taasühendamise info"
 
-#: resources.h:287
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "Kustuta &ülekannete järjekord"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Ajaloo kustutamine"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1945,11 +1953,11 @@
 msgid "Clear private data"
 msgstr "Privaatsete andmete kustutamine"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Puhasta kiirühenduse riba"
 
-#: resources.h:614
+#: resources.h:625
 msgid "Clear string coalescer"
 msgstr ""
 
@@ -1959,22 +1967,22 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:1096
 msgid "Click on next to download the new version."
-msgstr "Uue versiooni allalaadimiseks kliki next."
+msgstr "Uue versiooni allalaadimiseks klõpsa next."
 
-#: resources.h:347
+#: resources.h:348
 msgid "Client to server MAC:"
 msgstr "Klient-server MAC:"
 
-#: resources.h:345
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr "Klient-server šiffer:"
 
-#: resources.h:666
+#: resources.h:679
 msgid "Close &all other tabs"
-msgstr ""
+msgstr "Sulge &kõik teised sakid"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1114
-#: ../../locales/../src/interface/Mainfrm.cpp:1137
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1203
+#: ../../locales/../src/interface/Mainfrm.cpp:1226
 msgid "Close FileZilla"
 msgstr "Sulge FileZilla"
 
@@ -1982,7 +1990,7 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Sulge kõik käivitatud FileZilla eksemplarid."
 
-#: resources.h:497
+#: resources.h:505
 msgid "Closes current tab"
 msgstr "Sulgeb eesoleva saki"
 
@@ -1994,11 +2002,11 @@
 msgid "Column properties"
 msgstr "Veeru seaded"
 
-#: resources.h:354
+#: resources.h:355
 msgid "Column setup"
 msgstr "Veeru seadistus"
 
-#: resources.h:936
+#: resources.h:950
 msgid "Command and its arguments should be properly quoted."
 msgstr "Käsklus ja tema argumendid peavad olema õigesti märgistatud."
 
@@ -2017,8 +2025,8 @@
 msgstr "Antud protokoll ei toeta seda korraldust"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Käsk:"
@@ -2036,15 +2044,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Ruuter või tulemüür peab ühendust vigaseks"
 
-#: resources.h:514 resources.h:644
+#: resources.h:522 resources.h:657
 msgid "Compare &modification time"
 msgstr "Võrdle &muutmisaega"
 
-#: resources.h:513 resources.h:643
+#: resources.h:521 resources.h:656
 msgid "Compare file&size"
 msgstr "Võrdle &suurust"
 
-#: resources.h:916
+#: resources.h:930
 msgid "Comparison &threshold (in minutes):"
 msgstr "Võrdluse piirmäär (minutites):"
 
@@ -2068,45 +2076,44 @@
 msgid "Compiler flags:"
 msgstr "Kompileerimise lipud:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr "Tihendatud"
 
-#: resources.h:801
+#: resources.h:814
 msgid "Concurrent transfers"
 msgstr "Konkureerivad ülekanded"
 
-#: resources.h:224 resources.h:438
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
-msgstr "Tingimused on tõs&tutundlikud"
+msgstr "&Tingimused on tõstutundlikud"
 
-#: resources.h:709
+#: resources.h:722
 msgid "Configuration test"
 msgstr "Seadistuse test"
 
-#: resources.h:683
+#: resources.h:696
 msgid "Configure passive mode"
 msgstr "Seadista passiivne laad"
 
-#: resources.h:699
+#: resources.h:712
 msgid "Configure port range"
 msgstr "Seadista portide vahemik"
 
-#: resources.h:468
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:1030
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
-msgstr "Vajalik kinnitus"
+msgstr "Kinnita kustutamine"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1670
-#: ../../locales/../src/interface/RemoteListView.cpp:2597
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Vajalik kinnitus"
 
@@ -2114,7 +2121,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Õnnitlused, teie programmi seadistus tundub töötavat."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Ühenda ignoreerides proksi-seadeid"
 
@@ -2126,12 +2133,12 @@
 msgid "Connected"
 msgstr "Ühendatud"
 
-#: ../../locales/../src/interface/QueueView.cpp:1448
+#: ../../locales/../src/interface/QueueView.cpp:1456
 msgid "Connecting"
 msgstr "Ühendumine"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ühendumine %s"
@@ -2157,7 +2164,7 @@
 msgid "Connection"
 msgstr "Ühendus"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1072
 msgid "Connection attempt failed"
 msgstr "Ühenduskatse ebaõnnestus"
 
@@ -2219,7 +2226,7 @@
 msgid "Connection timed out."
 msgstr "Ühendus aegus."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 #, fuzzy
 msgid "Connection to server lost."
 msgstr "Ühendumine serveriga"
@@ -2240,27 +2247,27 @@
 msgid "Convert keyfile"
 msgstr "Konverdi võtmefail"
 
-#: resources.h:77 resources.h:417
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "Kop&eeri"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Koopia (%d) %s -ist"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr "%s koopia"
 
-#: resources.h:588 resources.h:638
+#: resources.h:599 resources.h:651
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr ""
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Ei luba ühendust: %s"
@@ -2288,19 +2295,19 @@
 msgid "Could not convert private key"
 msgstr "Ei suuda konvertida privaatvõtit"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3054
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not copy URLs"
 msgstr "Ei suuda ühenduda serveriga"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 #, fuzzy
 msgid "Could not copy data"
 msgstr "Ei suuda lahendada IO lõimi"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2519
-#: ../../locales/../src/interface/RemoteTreeView.cpp:899
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 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 "
@@ -2310,7 +2317,7 @@
 "Kas keskkond ei ole korralikult installeeritud või te ei pukseerinud faile "
 "Exploreri aknasse."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
 msgstr "Ei suuda luua ühendust serveriga"
 
@@ -2329,13 +2336,13 @@
 msgid "Could not generate custom login sequence."
 msgstr "Ei suuda genereerida kohandatud login-jada."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1041
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1016
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2350,15 +2357,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Ei saa fzputtygen'lt vastust."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2580
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr "Ei leia ajutist kataloogi faili allalaadimiseks."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:969
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:962
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2408,9 +2415,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3054
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not open clipboard"
 msgstr "&Kopeeri lõikemällu"
@@ -2426,7 +2433,7 @@
 msgid "Could not parse remote path."
 msgstr "Ei suuda parsida serveri kaustateed."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Ei suuda parsida serveri aadressi:"
 
@@ -2439,12 +2446,12 @@
 msgid "Could not read server item."
 msgstr "Ei suuda lugeda serveri üksust."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Ei leia failist nihet %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
 msgstr "Ei leia faili lõppu"
 
@@ -2452,7 +2459,7 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Ei suuda saata käsklust fzputtygen'le."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
 msgstr "Ei suuda lahendada IO lõimi"
 
@@ -2461,13 +2468,13 @@
 msgid "Could not start proxy handshake: %s"
 msgstr "Proksi-kätlus ebaõnnestus: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
-#: ../../locales/../src/interface/QueueView.cpp:1120
+#: ../../locales/../src/interface/QueueView.cpp:1123
+#: ../../locales/../src/interface/QueueView.cpp:1128
 msgid "Could not start transfer"
 msgstr "Ei saanud alustada ülekannet"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2490,7 +2497,7 @@
 "Ei saa kirjutada \"%s\", järjekorda ei salvestata.\n"
 "%s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1976
+#: ../../locales/../src/interface/QueueView.cpp:1987
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2499,14 +2506,14 @@
 "Ei saa kirjutada \"%s\", järjekorda ei salvestata.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Ei saa kirjutada \"%s\", valitud saite ei õnnestunud eksportida: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Ei saa kirjutada \"%s\": %s"
@@ -2516,7 +2523,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Ei õnnestu kirjutada võtmefaili: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1109
+#: ../../locales/../src/interface/QueueView.cpp:1117
 msgid "Could not write to local file"
 msgstr "Ei saa kirjutada kohalikku faili"
 
@@ -2536,28 +2543,42 @@
 msgid "Country:"
 msgstr "Riik:"
 
-#: resources.h:617
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "FileZilla kaotab koheselt töövõime. Kasutatakse ainult erandite halduri "
 "silumiseks."
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:591
+msgid "Crea&te new file"
+msgstr "Loo &uus fail"
+
+#: resources.h:576 resources.h:590 resources.h:645 resources.h:666
 msgid "Create a new subdirectory in the current directory"
 msgstr "Loo jooksvasse kataloogi uus alamkataloog"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1574
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Loo jooksvasse kataloogi uus alamkataloog"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "Loo kataloog"
 
-#: ../../locales/../src/interface/QueueView.cpp:1521
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "Ei saa faili muuta"
+
+#: ../../locales/../src/interface/QueueView.cpp:1529
 msgid "Creating directory"
 msgstr "Kataloogi loomine"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
@@ -2596,23 +2617,23 @@
 msgid "Current transfer type is set to binary."
 msgstr "Ülekandetüüp hetkel: binaarne."
 
-#: resources.h:772 resources.h:892
+#: resources.h:785 resources.h:906
 msgid "Cus&tom"
 msgstr "Val&itav"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Kohandatud filtrikogumik"
 
-#: resources.h:376 resources.h:377
+#: resources.h:377 resources.h:378
 msgid "Custom server"
 msgstr "Kohandatud server"
 
-#: resources.h:385
+#: resources.h:386
 msgid "D&ata type"
 msgstr "Andmetüüp"
 
-#: resources.h:899
+#: resources.h:913
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "&Detsimaalne - kasutatakse SI sümboleid. (näit. 1 KB = 1000 baiti.)"
 
@@ -2620,20 +2641,19 @@
 msgid "D&efault"
 msgstr "V&aikeväärtused"
 
-#: resources.h:583 resources.h:633 resources.h:663
+#: resources.h:594 resources.h:646 resources.h:676
 msgid "D&elete"
 msgstr "K&ustuta"
 
-#: resources.h:205
+#: resources.h:206
 msgid "D&isable all"
 msgstr "K&eela kõik"
 
-#: resources.h:871
-#, fuzzy
+#: resources.h:884
 msgid "D&o not save passwords"
-msgstr "Sisesta parool"
+msgstr "&Ära salvesta parooli"
 
-#: resources.h:923
+#: resources.h:937
 msgid "D&ouble-click action on directories:"
 msgstr "T&opelt-klõps kaustadel:"
 
@@ -2641,8 +2661,8 @@
 msgid "DOS-like with virtual paths"
 msgstr "DOS'i-sarnane virtuaalteedega"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2631
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "Ohtlik failitüüp"
 
@@ -2655,12 +2675,11 @@
 msgid "Data socket closed too early."
 msgstr "Andmeühendus suleti liiga vara."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:151
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
 msgid "Date"
-msgstr "Andmed"
+msgstr "Kuupäev"
 
-#: resources.h:883
+#: resources.h:897
 msgid "Date formatting"
 msgstr "Kuupäeva vorming"
 
@@ -2679,7 +2698,7 @@
 msgid "Debug"
 msgstr "Silur"
 
-#: resources.h:963
+#: resources.h:977
 msgid "Debugging settings"
 msgstr "Silumise seaded"
 
@@ -2695,7 +2714,7 @@
 msgid "Default editor not properly quoted."
 msgstr "Vaikimisi editor ei ole korralikult määratud."
 
-#: resources.h:255 resources.h:277 resources.h:854
+#: resources.h:256 resources.h:278 resources.h:867
 msgid "Default file exists action"
 msgstr "Vaikimisi toiming faili olemasolul"
 
@@ -2703,7 +2722,7 @@
 msgid "Default r&emote directory:"
 msgstr "Vaikimisi k&auge kataloog:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 #, fuzzy
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
@@ -2716,15 +2735,15 @@
 msgid "Default system language"
 msgstr "Vaikimisi süsteemikeel"
 
-#: resources.h:677
+#: resources.h:690
 msgid "Default transfer mode:"
 msgstr "Ülekande vaikelaad:"
 
-#: resources.h:823
+#: resources.h:836
 msgid "Default transfer type:"
 msgstr "Ülekande vaiketüüp:"
 
-#: resources.h:696 resources.h:759
+#: resources.h:709 resources.h:772
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Vaikimisi: http://ip.filezilla-project.org/ip.php"
 
@@ -2746,58 +2765,58 @@
 msgstr[0] "Ühendumine viibib eelnevalt ebõnnestunud ühenduskatse tõttu..."
 msgstr[1] "Ühendumine viibib eelnevalt ebõnnestunud ühenduskatse tõttu..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
 msgstr "Kustuta Saidihalduri sissekanne"
 
-#: resources.h:634 resources.h:655
+#: resources.h:647 resources.h:668
 msgid "Delete selected directory"
 msgstr "Kustuta valitud kataloog"
 
-#: resources.h:570 resources.h:584
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
 msgstr "Kustuta valitud failid ja kataloogid"
 
-#: ../../locales/../src/interface/search.cpp:1014
+#: ../../locales/../src/interface/search.cpp:1018
 #, fuzzy
 msgid "Deleting directories"
 msgstr "Kataloogi loomine"
 
-#: ../../locales/../src/interface/search.cpp:1014
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:453
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1055
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "Töölaud"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Detailid"
 
-#: resources.h:189
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "Uue võtme detailid:"
 
-#: resources.h:227
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "Kata&loogid"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Direction"
 msgstr "Suund"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:524
 msgid "Directory"
 msgstr "Kataloog"
 
-#: resources.h:641 resources.h:914 resources.h:997
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2315
+#: resources.h:654 resources.h:928 resources.h:1011
+#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/Mainfrm.cpp:2354
 msgid "Directory comparison"
 msgstr "Võrdle katalooge"
 
@@ -2815,11 +2834,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Kataloogi lehitsemine katkestati kasutaja poolt"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2319
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
 msgstr "Kataloogi kuvamine ebaõnnestus"
 
-#: resources.h:198
+#: resources.h:199
 msgid "Directory listing filters"
 msgstr "Kataloogi kuvamise filtrid"
 
@@ -2827,7 +2846,7 @@
 msgid "Directory listing successful"
 msgstr "Kataloogi lehitsemine õnnestus"
 
-#: resources.h:208
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "Keel&a kõik"
 
@@ -2836,13 +2855,13 @@
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "Keelake see valik, kui te ei näe enam kataloogi sisu korrektselt."
 
-#: resources.h:990
+#: resources.h:1004
 msgid "Disconnect from server"
 msgstr "Katkesta ühendus serveriga"
 
@@ -2852,8 +2871,8 @@
 #: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1062
-#: ../../locales/../src/interface/QueueView.cpp:1106
+#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Disconnected from server"
 msgstr "Ühendus serveriga katkestatud"
 
@@ -2863,24 +2882,24 @@
 msgid "Disconnected from server: %s"
 msgstr "Ühendus serveriga %s katkestatud"
 
-#: ../../locales/../src/interface/QueueView.cpp:1423
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Disconnecting from previous server"
 msgstr "Lahtiühendumine eelmisest serverist"
 
-#: resources.h:991
+#: resources.h:1005
 msgid "Disconnects from the currently visible server"
 msgstr "Katkesta ühendus praegu nähtava serveriga"
 
-#: resources.h:555
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "Näita info dialoogi"
 
-#: resources.h:932
+#: resources.h:946
 msgid "Do &not use default editor"
 msgstr "&Ära kasuta vaikimisi editori"
 
-#: resources.h:609
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "Ära tee &midagi"
 
@@ -2893,8 +2912,8 @@
 "Kas te tõesti tahate kontrollida beetaversioone?\n"
 "Kui te just ei taha testida uusi võimalusi, kasutage stabiilset versiooni."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1117
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
+#: ../../locales/../src/interface/Mainfrm.cpp:1206
+#: ../../locales/../src/interface/Mainfrm.cpp:1230
 msgid "Do you really want to close FileZilla?"
 msgstr "Kas te tõesti tahate sulgeda FileZilla?"
 
@@ -2909,7 +2928,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Kas tõesti tahate kustutada kõik Saidihalduri sissekanded?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
 msgstr "Kas te tõesti tahate kustutada valitud sissekannet?"
 
@@ -2917,33 +2936,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Kas tõesti tahate kustutada ülekannete järjekorra?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Kas tõesti tahate saata '%s' serverisse?"
 
-#: resources.h:466
+#: resources.h:467
 msgid "Documentation"
 msgstr "Dokumentatsioon"
 
-#: resources.h:698
+#: resources.h:711
 msgid "Don't use external IP address on &local connections."
 msgstr "Ärge kasutage välist IP aadressi &kohalikel ühendustel."
 
-#: resources.h:834
+#: resources.h:847
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Punkt-failid on failid, millede nimi algab punktiga - näiteks .htaccess"
 
-#: resources.h:917
+#: resources.h:931
 msgid "Double-click action"
 msgstr "Topelt-klõpsu toime"
 
-#: resources.h:362
+#: resources.h:363
 msgid "Download"
 msgstr "Allalaadimine"
 
-#: resources.h:482 resources.h:810
+#: resources.h:483 resources.h:823
 msgid "Download &limit:"
 msgstr "Allalaadimise &piirkiirus:"
 
@@ -2957,21 +2976,21 @@
 msgid "Download limit: none"
 msgstr "Allalaadimise &piirkiirus:"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:442 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 #, fuzzy
 msgid "Download search results"
 msgstr "Lae valitud kataloog alla"
 
-#: resources.h:628
+#: resources.h:641
 msgid "Download selected directory"
 msgstr "Lae valitud kataloog alla"
 
-#: resources.h:574
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "Lae valitud failid ja kataloogid alla"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "Allalaadimine"
 
@@ -2981,19 +3000,19 @@
 msgid "Downloading %s"
 msgstr "%s -i allatõmbamine"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 #, fuzzy
 msgid "Downloading search results"
 msgstr "%s -i allatõmbamine"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3001,25 +3020,19 @@
 msgstr ""
 "Pukseerimine FileZilla erinevate instantside vahel ei ole veel realiseeritud."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Pukseerimine kahe erineva serveri vahel ei ole veel realiseeritud."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Korduv filtri nimi"
-
-#: resources.h:204
+#: resources.h:205
 msgid "E&nable all"
 msgstr "L&uba kõik"
 
-#: resources.h:560 resources.h:577
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
 msgstr "&Ava kataloog"
 
@@ -3027,7 +3040,7 @@
 msgid "E&xecute"
 msgstr "K&äivita"
 
-#: resources.h:501
+#: resources.h:509
 msgid "E&xit"
 msgstr "&Välju"
 
@@ -3039,25 +3052,25 @@
 msgid "Each filter needs at least one condition."
 msgstr "Igas filtris peab olema vähemalt üks tingimus."
 
-#: resources.h:230
+#: resources.h:231
 msgid "Edit filters"
 msgstr "Filtrite muutmine"
 
-#: resources.h:565
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr "Muuda faili seadistatud editoriga ja lae muudatused serverisse."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
 #: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Editing failed"
 msgstr "Muutmine ebaõnnestus"
 
-#: resources.h:880
+#: resources.h:894
 msgid "Email:"
 msgstr "E-kiri:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2288
+#: ../../locales/../src/interface/QueueView.cpp:2299
 msgid "Empty command"
 msgstr "Tühi kasklus"
 
@@ -3065,7 +3078,7 @@
 msgid "Empty command."
 msgstr "Tühi käsklus."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2321
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
 msgstr "Tühi kataloogi nimekiri"
 
@@ -3077,13 +3090,13 @@
 msgid "Empty file extension."
 msgstr "Puudub faili laiend."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Ilma nimeta filtrid ei ole lubatud."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nime koht tühi"
 
@@ -3091,62 +3104,62 @@
 msgid "Empty quoted string."
 msgstr "Tühi string."
 
-#: resources.h:207
+#: resources.h:208
 msgid "En&able all"
 msgstr "Lu&ba kõik"
 
-#: resources.h:819
+#: resources.h:832
 msgid "Enable invalid character &filtering"
 msgstr "Luba vigaste sümbolite &filtreerimine"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr "Krüpteeritud"
 
-#: resources.h:344
+#: resources.h:345
 msgid "Encryption"
 msgstr "Krüpteering"
 
-#: resources.h:336
+#: resources.h:337
 msgid "Encryption details"
 msgstr "Krüpteeringu detailid"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:448
 msgid "End comparison and change sorting order?"
 msgstr "Lõpeta võrdlus ja muuda sorteerimisjärjekorda?"
 
-#: resources.h:541
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "&Sisesta oma käsk..."
 
-#: resources.h:486
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Kiiruse mittepiiramiseks sisesta 0."
 
-#: ../../locales/../src/interface/QueueView.cpp:2277
+#: ../../locales/../src/interface/QueueView.cpp:2288
 msgid "Enter command"
 msgstr "Sisesta käsk"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
 msgstr "Sisesta oma käsk"
 
-#: resources.h:924
+#: resources.h:938
 msgid "Enter directory"
 msgstr "Ava kataloog"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Sisestage filtri nimi"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Sisesta nimi filtrikogumikule"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Sisesta filtrikogumikule uus nimi"
 
@@ -3154,11 +3167,11 @@
 msgid "Enter password"
 msgstr "Sisesta parool"
 
-#: resources.h:561 resources.h:578
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
 msgstr "Ava valitud kataloog"
 
-#: resources.h:718
+#: resources.h:731
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3183,7 +3196,7 @@
 "Sisesta parool failile '%s'.\n"
 "Konverditud fail ei saa olema parooliga kaitstud."
 
-#: resources.h:722
+#: resources.h:735
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3205,7 +3218,7 @@
 msgid "Error importing"
 msgstr "Viga importimisel"
 
-#: ../../locales/../src/interface/QueueView.cpp:2043
+#: ../../locales/../src/interface/QueueView.cpp:2054
 #, fuzzy
 msgid "Error loading queue"
 msgstr "XML faili laadimise viga"
@@ -3215,27 +3228,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
 #: ../../locales/../src/interface/import.cpp:120
 #: ../../locales/../src/interface/import.cpp:311
-#: ../../locales/../src/interface/Options.cpp:213
-#: ../../locales/../src/interface/QueueView.cpp:1957
-#: ../../locales/../src/interface/search.cpp:1091
-#: ../../locales/../src/interface/search.cpp:1112
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1967
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "XML faili laadimise viga"
 
-#: ../../locales/../src/interface/QueueView.cpp:1945
+#: ../../locales/../src/interface/QueueView.cpp:1953
 #, fuzzy
 msgid "Error saving queue"
 msgstr "XML faili laadimise viga"
@@ -3247,13 +3260,13 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/QueueView.cpp:1988
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "XML faili kirjutamise viga"
 
@@ -3268,21 +3281,21 @@
 msgstr "Seda filtrikogumit ei saa kustutada"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Viga:"
 
-#: resources.h:478
+#: resources.h:479
 msgid "Establish connection in a new tab"
 msgstr "Loo ühendus uues sakis"
 
-#: resources.h:943
+#: resources.h:957
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Näide: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:902
+#: resources.h:916
 msgid "Examples"
 msgstr "Näited"
 
@@ -3294,37 +3307,37 @@
 msgid "Executable"
 msgstr "Käivitatav"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1758
+#: ../../locales/../src/interface/Mainfrm.cpp:1791
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Ei ole võimalik kontrollida uuenduste olemasolu, sest käivitusfail ei "
 "sisalda versiooniinfot."
 
-#: resources.h:861
+#: resources.h:874
 msgid "Explorer"
 msgstr "Sirvija"
 
-#: resources.h:294
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "Ekspordi &järjekord"
 
-#: resources.h:293
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "Ekspordi &seaded"
 
-#: resources.h:290
+#: resources.h:291
 msgid "Export settings"
 msgstr "Ekspordi seaded"
 
-#: resources.h:219
+#: resources.h:220
 msgid "F&ilter name:"
-msgstr "F&iltri nimi:"
+msgstr "Filtri &nimi:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr ""
 
@@ -3336,16 +3349,16 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP mootor ei ole algväärtustatud - ei saa ühenduda"
 
-#: resources.h:746
+#: resources.h:759
 msgid "FTP Keep-alive"
 msgstr "FTP elushoid"
 
-#: resources.h:766
+#: resources.h:779
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP proksi"
@@ -3354,7 +3367,7 @@
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:674
+#: resources.h:687
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3370,11 +3383,11 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP üle varjatud (implicit) TLS/SSL-i"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:913
-#: ../../locales/../src/interface/viewheader.cpp:522
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Kataloogi vahetamine ebaõnnestus"
 
@@ -3389,11 +3402,11 @@
 msgid "Failed to check for newer version of FileZilla."
 msgstr "FileZilla uuema versiooni olemasolu kontroll ebaõnnestus"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
 msgstr "Saitide kopeerimine või liigutamine ebaõnnestus"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:511
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr "XML faili tagavarakoopia loomine ebaõnnestus"
 
@@ -3401,8 +3414,8 @@
 msgid "Failed to create listen socket, aborting"
 msgstr "Kuulava liidese (socket) loomine ebaõnnestus, katkestamine"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Kuulava liidese (socket) loomine aktiivset laadi ülekandele ebaõnnestus."
@@ -3411,11 +3424,11 @@
 msgid "Failed to download the latest version of FileZilla."
 msgstr "FileZilla viimase versiooni allalaadimine ebaõnnestus."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:667
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
 msgstr "Ei õnnestunud leida teed 'Minu dokumentideni'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:653
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
 msgstr "Ei õnnestunud leida teekonda töölauani"
 
@@ -3447,23 +3460,28 @@
 msgid "Failed to load private key: %s"
 msgstr "Privaatvõtme laadimine ebaõnnestus: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "\"%s\" avamine lisamiseks/kirjutamiseks ebaõnnestus"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "\"%s\" avamine lugemiseks ebaõnnestus"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "\"%s\" avamine kirjutamiseks ebaõnnestus"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+#, fuzzy
+msgid "Failed to parse returned path."
+msgstr "Ei suuda parsida serveri kaustateed."
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr ""
@@ -3480,11 +3498,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Välise IP aadressi leidmine ebaõnnestus, katkestan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Välise IP aadressi leidmine ebaõnnestus, kasutame kohalikku aadressi."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
 msgstr "Kohaliku IP aadressi leidmine ebaõnnestus."
 
@@ -3542,7 +3560,7 @@
 msgid "Failed to validate settings"
 msgstr "Seadete kontroll ebaõnnestus"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:904
 #, fuzzy
 msgid "Failed to verify peer certificate"
 msgstr "Andmete vastuvõtt ebaõnnestus"
@@ -3552,7 +3570,7 @@
 msgid "Failed to write to file %s"
 msgstr "Faili %s kirjutamine ebaõnnestus"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:529
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "XML faili kirjutamine ebaõnnestus"
 
@@ -3560,21 +3578,21 @@
 msgid "Failed transfers"
 msgstr "Ebaõnnestunud ülekanded"
 
-#: resources.h:689
+#: resources.h:702
 msgid "Fall back to active mode"
 msgstr "Tagasi aktiivse laadi juurde"
 
-#: resources.h:369
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "Fai&l:"
 
-#: resources.h:226
+#: resources.h:227
 msgid "Fil&es"
 msgstr "Fai&lid"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:501
+#: ../../locales/../src/interface/filelistctrl.cpp:519
+#: ../../locales/../src/interface/filelistctrl.cpp:528
 msgid "File"
 msgstr "Fail"
 
@@ -3590,7 +3608,7 @@
 msgid "File editing"
 msgstr "Serveris asuvate failide muutmine"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1878
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "Fail on olemas"
 
@@ -3598,7 +3616,7 @@
 msgid "File exists action"
 msgstr "Toiming faili olemasolul"
 
-#: resources.h:305
+#: resources.h:306
 msgid "File has changed"
 msgstr "Fail on muudetud"
 
@@ -3606,14 +3624,14 @@
 msgid "File lists"
 msgstr "Faililoetelud"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/FileZilla.cpp:702
 #: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "Faili ei leitud"
 
-#: resources.h:1001
+#: resources.h:1015
 msgid "File search"
 msgstr "Faili otsing"
 
@@ -3651,36 +3669,36 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Faili ülekanne õnnestus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1116
+#: ../../locales/../src/interface/Mainfrm.cpp:1205
 msgid "File transfers still in progress."
 msgstr "Faili ülekanne on veel pooleli."
 
-#: resources.h:387
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr "Fail edastataks ASCII-andmetüübina."
 
-#: resources.h:388
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr "Fail edastataks binaarse andmetüübina."
 
 #: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla viga"
 
-#: resources.h:711
+#: resources.h:724
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr "FileZilla võib nüüd kontrollida programmi seadete korrektsust."
 
-#: resources.h:477
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla on juba serveriga ühendatud."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
@@ -3688,62 +3706,68 @@
 "FileZilla töötab kiosk-laadis.\n"
 "'Normaalne' ja 'Konto' tüüpi sisselogimised pole selles laadis kättesaadavad."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1503
+#: ../../locales/../src/interface/Mainfrm.cpp:1540
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "FileZilla vajab keeleseadete muudatuste aktiveerimiseks taaskäivitust."
 
-#: resources.h:517
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "Failinimekirja &inforibad"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:126
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
 #: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Failinimi"
 
-#: resources.h:510
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "&Failinimede filtrid..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Failinime loomine kataloogile %s ja failile %s ebaõnnestus"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1864
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "Vigane failinimi"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Failinimes ei tohi kasutada järgnevaid sümboleid: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Failinime ei muudetud"
 
-#: resources.h:307 resources.h:956
+#: resources.h:308 resources.h:970
 msgid "Filename:"
 msgstr "Failinimi:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Failinimes ei tohi kasutada järgnevaid sümboleid: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Failinimes ei tohi kasutada järgnevaid sümboleid: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "Failid, mis on praegu muutmisel"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:131
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
 #: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "Faili suurus"
@@ -3752,56 +3776,56 @@
 msgid "Filesize format"
 msgstr "Failisuuruse vorming"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Faili tüüp"
 
-#: resources.h:944
+#: resources.h:958
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Failitüüpide seosed"
 
-#: resources.h:225
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "Filter rakendub:"
 
-#: resources.h:818
+#: resources.h:831
 msgid "Filter invalid characters in filenames"
 msgstr "Filtreeri vigased sümbolid failinimedest"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Sellise nimega filter juba olemas"
 
-#: resources.h:221
-#, fuzzy
+#: resources.h:222
 msgid "Filter out items matching all of the following"
-msgstr "Sobivad kõigi järgnevate filtritega"
+msgstr "Filtreeri välja, kui sobib kõigi järgnevate tingimustega"
 
-#: resources.h:222
-#, fuzzy
+#: resources.h:223
 msgid "Filter out items matching any of the following"
-msgstr "Sobivad kõigi järgnevate filtritega"
+msgstr "Filtreeri välja, kui sobib vähemalt ühe järgneva tingimusega"
 
-#: resources.h:223
-#, fuzzy
+#: resources.h:224
 msgid "Filter out items matching none of the following"
-msgstr "Sobivad kõigi järgnevate filtritega"
+msgstr "Filtreeri välja, kui ei sobi ühegi järgneva tingimusega"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Selline filtrikogumik on juba olemas"
 
-#: resources.h:994
+#: resources.h:1008
 msgid "Filter the directory listings"
 msgstr "Filtreeri kataloogi sisu"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filtri õigsuse kontroll ebaõnnestus"
 
@@ -3813,7 +3837,7 @@
 msgid "Fingerprint (SHA-1):"
 msgstr "Sõrmejälg (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr "Sõrmejälg:"
 
@@ -3821,7 +3845,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Tulemüüri ja ruuteri seadistamise nõustaja"
 
-#: resources.h:729
+#: resources.h:742
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3829,11 +3853,11 @@
 "Et saada lisainfot nende seadistuse toime kohta, käivitage võrguseadistuse "
 "nõustaja."
 
-#: resources.h:706
+#: resources.h:719
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Töökindluse huvides määrake vähemalt 10 -ne pordine vahemik."
 
-#: ../../locales/../src/interface/Options.cpp:212
+#: ../../locales/../src/interface/Options.cpp:215
 #, fuzzy
 msgid ""
 "For this session the default settings will be used. Any changes to the "
@@ -3847,24 +3871,24 @@
 msgid "Force &UTF-8"
 msgstr "Eelista &UTF-8"
 
-#: resources.h:543
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr "&Näita peidetud faile"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:661
+#: ../../locales/../src/interface/Mainfrm.cpp:674
 msgid "Force showing hidden files"
 msgstr "Näita peidetud faile"
 
-#: resources.h:773
+#: resources.h:786
 msgid "Format specifications:"
 msgstr "Formaadi spetsifikatsioon:"
 
-#: resources.h:942
+#: resources.h:956
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formaat: Laiendile järgneb korrektselt määratud käsklus ja tema argumendid."
 
-#: resources.h:469
+#: resources.h:470
 msgid "Further documentation"
 msgstr ""
 
@@ -3876,21 +3900,21 @@
 msgid "General SOCKS server failure"
 msgstr "SOCKS serveri tõrge"
 
-#: resources.h:791
+#: resources.h:804
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Üldine proksi"
 
-#: resources.h:695
+#: resources.h:708
 msgid "Get external IP address from the following URL:"
 msgstr "Võta väline IP aadress järgnevalt URL'ilt:"
 
-#: resources.h:470
+#: resources.h:471
 msgid "Getting help"
 msgstr "Abilehed"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "See nimi on juba kasutuses, kas kirjutame üle?"
 
@@ -3900,13 +3924,13 @@
 
 #: resources.h:166
 msgid "GnuTLS:"
-msgstr ""
+msgstr "GnuTLS:"
 
 #: resources.h:138
 msgid "Group permissions"
 msgstr "Grupi õigused"
 
-#: resources.h:597
+#: resources.h:608
 msgid "H&igh"
 msgstr "K&õrge"
 
@@ -3915,21 +3939,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "FTPS - FTP üle varjatud (implicit) TLS/SSL-i "
 
-#: resources.h:340
+#: resources.h:341
 msgid "Hash:"
 msgstr "Räsi:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr "Peidetud"
 
-#: resources.h:816 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:829 ../../locales/../src/interface/queue.cpp:921
+#: ../../locales/../src/interface/queue.cpp:1008
 msgid "High"
 msgstr "Suur"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:923
+#: ../../locales/../src/interface/queue.cpp:1010
 msgid "Highest"
 msgstr "Kõrgeim"
 
@@ -3937,7 +3961,7 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Kõrgeima vaba pordi number peab olema vahemikus 1024 kuni 65535."
 
-#: resources.h:209
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
@@ -3947,11 +3971,11 @@
 msgid "Homepage:"
 msgstr "Koduleht:"
 
-#: resources.h:342
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr "Serveri võtme sõrmejälg:"
 
-#: resources.h:185
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "Serveri võti ei sobi"
 
@@ -3963,8 +3987,8 @@
 msgid "Host unreachable"
 msgstr "Server pole ligipääsetav"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "Server:"
 
@@ -3972,11 +3996,11 @@
 msgid "Hours,"
 msgstr "Tunnid,"
 
-#: resources.h:891
+#: resources.h:905
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (näiteks: 15:47)"
 
-#: resources.h:733
+#: resources.h:746
 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 "
@@ -3985,13 +4009,13 @@
 "Kui ülalmääratud aja jooksul andmeid ei edastata ega võeta vastu, ühendus "
 "suletakse ja FileZilla püüab luua uut ühendust."
 
-#: resources.h:972
+#: resources.h:986
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Kui teatate vigadest, palun andke logi, kus on kasutatud \"Paljusõnalist\" "
 "logimise taset."
 
-#: resources.h:686
+#: resources.h:699
 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 "
@@ -4002,7 +4026,7 @@
 "serveriga, on see server valesti seadistatud ja te peate kasutama aktiivset "
 "ülekande laadi. Ülekande laadi saab valida serverite kaupa saidihalduris."
 
-#: resources.h:681
+#: resources.h:694
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4010,7 +4034,7 @@
 "Kui seadete ennistamine on lubatud, on võimalik ühenduda halvasti "
 "seadistatud serveritega, mis keelduvad valitud ülekande laadist."
 
-#: resources.h:188
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4032,7 +4056,7 @@
 msgstr ""
 "Kui see probleem ei lahendu, võtke ühendust ruuteri või tulemüüri tootjaga."
 
-#: resources.h:961
+#: resources.h:975
 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 "
@@ -4042,7 +4066,7 @@
 "failinime lõppu \".1\") ja luuakse uus fail. Selle käigus kustutatakse varem "
 "eksisteerinud .1-lõpuga logifail."
 
-#: resources.h:455
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4059,7 +4083,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Kui see probleem ei lahendu, võtke ühendust ruuteri tootjaga."
 
-#: resources.h:278 resources.h:855
+#: resources.h:279 resources.h:868
 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 "
@@ -4069,7 +4093,7 @@
 "ajaga. Kui ajad erinevad (näiteks erinevad ajavööndid), kirjelda ajavööndi "
 "nihe saidihalduris."
 
-#: resources.h:915
+#: resources.h:929
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4077,11 +4101,11 @@
 "Kui kasutad ajaväärtustel põhinevat võrdlust, loe kaks faili võrdseks, kui "
 "nende ajaväärtuste erinevus ei ületa seda piirmäära."
 
-#: resources.h:930
+#: resources.h:944
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Kui muudate kasutatavat keelt, tuleb programm uuesti käivitada."
 
-#: resources.h:712
+#: resources.h:725
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4089,21 +4113,21 @@
 "Kui te vajutate nuppu TEST, ühendub FileZilla probe.filezilla-project.org -"
 "iga ja teeb mõned lihtsad testid."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1229
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Kui te sulgete FileZilla, muudatusi ei salvestata."
 
-#: resources.h:831
+#: resources.h:844
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "Kui sisestate vale failitüübi, võivad failid ülekandel kahjustuda."
 
-#: resources.h:713
+#: resources.h:726
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Kui tekib mõni viga, ei ole seadistus korrektne."
 
-#: resources.h:745
+#: resources.h:758
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4122,7 +4146,7 @@
 "püüdke kasutada passivset laadi ja abi saamiseks võtke ühendust serveri "
 "administraatoriga."
 
-#: resources.h:672
+#: resources.h:685
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4130,7 +4154,7 @@
 "Kui nõustaja ja testid on edukalt lõpetatud, siis peaks su tulemüürid ja "
 "ruuterid olema korrektselt seadistatud."
 
-#: resources.h:708
+#: resources.h:721
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4138,7 +4162,7 @@
 "Kui kasutate tulemüüri, veenduge, et FileZillal on lubatud ühenduda kõigi "
 "märgitud portidega."
 
-#: resources.h:707
+#: resources.h:720
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4156,7 +4180,7 @@
 msgid "Import data from older version"
 msgstr "Andmete import vanemast versioonist"
 
-#: resources.h:297
+#: resources.h:298
 msgid "Import settings"
 msgstr "Impordi seaded"
 
@@ -4170,7 +4194,7 @@
 msgid "Improperly quoted association."
 msgstr "Valesti määratud seos."
 
-#: resources.h:700
+#: resources.h:713
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4178,7 +4202,7 @@
 "Aktiivse laadi puhul kuulab FileZilla ühte porti andmete transpordi jaoks. "
 "Te peate selle pordi määrama."
 
-#: resources.h:702
+#: resources.h:715
 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."
@@ -4186,19 +4210,19 @@
 "Juhul kui teil on ruuter, peate kõik võimalikud pordid edasi suunama, sest "
 "FileZilla ei avalda mingit mõju teie süsteemi pordivalikule."
 
-#: resources.h:254
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr "Kui te eelistate automaatset uuendamist, peate selle lubama seadetes."
 
-#: resources.h:690 resources.h:754
+#: resources.h:703 resources.h:767
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "Aktiivse laadi puhul peab FileZilla teadma teie välimist IP aadressi."
 
-#: resources.h:675
+#: resources.h:688
 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 "
@@ -4208,13 +4232,13 @@
 "küsib serverilt porti ja ühendub sinna. Muid seadistusi selle jaoks pole "
 "vaja teha."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:918
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1058
+#: ../../locales/../src/interface/QueueView.cpp:1066
 msgid "Incorrect password"
 msgstr "Vale parool"
 
@@ -4226,8 +4250,8 @@
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiivne"
@@ -4237,8 +4261,8 @@
 msgstr "Liides"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1015
-#: ../../locales/../src/interface/QueueView.cpp:1591
+#: ../../locales/../src/interface/QueueView.cpp:1023
+#: ../../locales/../src/interface/QueueView.cpp:1599
 msgid "Interrupted by user"
 msgstr "Katkestatud kasutaja poolt"
 
@@ -4274,8 +4298,9 @@
 msgid "Invalid date"
 msgstr "Vigane kuupäev"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "Vigane failinimi"
 
@@ -4295,7 +4320,7 @@
 "Vale pordi number. Pordi numbriks võib olla väärtus vahemikust 1 kuni 65535."
 
 #: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4309,7 +4334,13 @@
 "ftps:// FTP üle SSL-i (varjatud - implicit) ja\n"
 "ftpes:// FTP üle SSL-i (otsene - explicit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr "Vigane host: peale lõpetavat sulgu on lubatud ainult koolon ja port."
+
+#: ../../locales/../src/interface/search.cpp:699
 #, fuzzy
 msgid "Invalid regular expression in search conditions."
 msgstr "Tingimuse vigane suurus"
@@ -4318,7 +4349,7 @@
 msgid "Invalid response code"
 msgstr "Vigane vastuse kood"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, fuzzy, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Tingimuse vigane suurus"
@@ -4330,10 +4361,10 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Vigane aadress"
 
@@ -4357,11 +4388,11 @@
 msgid "Jurisdiction state or province:"
 msgstr ""
 
-#: resources.h:912
+#: resources.h:926
 msgid "Keep directories on top"
 msgstr "Hoia kataloogid nimekirja alguses"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:665
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4371,50 +4402,50 @@
 "nimekirja, kui see valik on lubatud. Kuigi FileZilla püüab tuvastada serveri "
 "sellekohast võimekust, võib kontroll ebaõnnestuda."
 
-#: resources.h:337
+#: resources.h:338
 msgid "Key exchange"
 msgstr "Võtmevahetus"
 
-#: resources.h:600
+#: resources.h:611
 msgid "L&owest"
 msgstr "M&adalaim"
 
-#: resources.h:928
+#: resources.h:942
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Keel"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1503
+#: ../../locales/../src/interface/Mainfrm.cpp:1540
 msgid "Language changed"
 msgstr "Keel muudetud"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Viimati muudetud"
 
-#: resources.h:858
+#: resources.h:871
 msgid "Layout"
 msgstr "Paigutus"
 
-#: resources.h:804
+#: resources.h:817
 msgid "Limit for concurrent &downloads:"
 msgstr "Konkureerivate &allalaadimiste limiit:"
 
-#: resources.h:806
+#: resources.h:819
 msgid "Limit for concurrent &uploads:"
 msgstr "Konkureerivate &üleslaadimiste limiit:"
 
-#: resources.h:749
+#: resources.h:762
 msgid "Limit local ports"
 msgstr "Kohalike portide piirangud"
 
-#: resources.h:958
+#: resources.h:972
 msgid "Limit size of logfile"
 msgstr "Määra logifaili maksimaalne suurus"
 
-#: resources.h:959
+#: resources.h:973
 msgid "Limit:"
 msgstr "Maksimaalselt:"
 
@@ -4422,7 +4453,7 @@
 msgid "Line length exceeded"
 msgstr "Rea lubatud pikkus ületatud"
 
-#: resources.h:167
+#: resources.h:168
 msgid "Linked against"
 msgstr "Lingitud"
 
@@ -4431,21 +4462,21 @@
 msgstr "Jälgitav ühendus suleti"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Loetelu:"
 
-#: resources.h:752
+#: resources.h:765
 msgid "Lo&west available port:"
 msgstr "&Madalaim vaba port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "Kohalik:"
 
-#: resources.h:364
+#: resources.h:365
 msgid "Local file"
 msgstr "Kohalik fail"
 
@@ -4462,11 +4493,11 @@
 msgid "Local file is not a valid filename."
 msgstr "Ei saa avada faili, see pole korrektne XML fail."
 
-#: resources.h:203
+#: resources.h:204
 msgid "Local filters:"
 msgstr "Kohalikud filtrid:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Kohalik:"
 
@@ -4478,12 +4509,12 @@
 msgid "Log file"
 msgstr "Logi fail"
 
-#: resources.h:251
+#: resources.h:252
 #, fuzzy
 msgid "Log of update check:"
 msgstr "Automaatne uuenduste kontroll"
 
-#: resources.h:953
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Logimine"
@@ -4520,13 +4551,13 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:916
+#: ../../locales/../src/interface/queue.cpp:1003
 msgid "Low"
 msgstr "Madal"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:914
+#: ../../locales/../src/interface/queue.cpp:1001
 msgid "Lowest"
 msgstr "Madalaim"
 
@@ -4538,7 +4569,7 @@
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4559,7 +4590,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Vigane vastus, server ei saada korrektseid realõppe"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:395 ../../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
@@ -4570,34 +4601,32 @@
 msgid "Manual transfer"
 msgstr "Käsitsi ülekanne"
 
-#: resources.h:434
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "Sobivad kõigi järgnevate filtritega"
 
-#: resources.h:435
-#, fuzzy
+#: resources.h:436
 msgid "Match any of the following"
-msgstr "Sobivad kõigi järgnevate filtritega"
+msgstr "Sobib vähemalt ühe järgneva filtriga"
 
-#: resources.h:436
-#, fuzzy
+#: resources.h:437
 msgid "Match none of the following"
-msgstr "Sobivad kõigi järgnevate filtritega"
+msgstr "Ei sobi ühegi järgneva filtriga"
 
-#: resources.h:802
+#: resources.h:815
 msgid "Maximum simultaneous &transfers:"
 msgstr "&Samaaegsete ülekannete maksimum:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:376
-#: ../../locales/../src/interface/Mainfrm.cpp:1835
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1868
 msgid "Message log"
 msgstr "Teadete logi"
 
-#: resources.h:869
+#: resources.h:882
 msgid "Message log position"
 msgstr "Teadete logi asukoht"
 
-#: resources.h:960
+#: resources.h:974
 msgid "MiB"
 msgstr "MiB"
 
@@ -4605,25 +4634,25 @@
 msgid "Minutes"
 msgstr "Minutid"
 
-#: resources.h:358
+#: resources.h:359
 msgid "Move &down"
 msgstr "Liiguta &alla"
 
-#: resources.h:357
+#: resources.h:358
 msgid "Move &up"
 msgstr "Liiguta &üles"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1074
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "Minu arvuti"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1064
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "Minu dokumendid"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Minu saidid"
 
@@ -4632,34 +4661,34 @@
 msgid "N/a"
 msgstr "Kasutamatu"
 
-#: resources.h:399
+#: resources.h:400
 msgid "Name"
 msgstr "Nimi"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "Selline nimi on juba olemas"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Järjehoidja nimi on juba olemas."
 
-#: resources.h:120 resources.h:168
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Vaja sisestada filtri nimi"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 #, fuzzy
 msgid "Need to enter valid remote path"
 msgstr "Vaja sisestada filtri nimi"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr "On vaja määrata sümbolite kodeering"
 
@@ -4671,15 +4700,15 @@
 msgid "New &Folder"
 msgstr "Uus &kaust"
 
-#: resources.h:494
+#: resources.h:502
 msgid "New &tab"
 msgstr "&Uus ühenduse sakk"
 
-#: resources.h:74 resources.h:414
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr "&Uus järjehoidja"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4692,37 +4721,37 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr "Uus järjehoidja"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1192
-#: ../../locales/../src/interface/RemoteListView.cpp:1588
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
 msgstr "Uus kataloog"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr ""
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Uus filter"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Uus kaust"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Uus sait"
 
-#: resources.h:867
+#: resources.h:880
 msgid "Next to the transfer queue"
 msgstr "Ülekande järjekorra kõrval"
 
@@ -4734,19 +4763,19 @@
 msgid "No category to export selected"
 msgstr "Puudub kategooriate valik ekspordiks"
 
-#: ../../locales/../src/interface/QueueView.cpp:2288
+#: ../../locales/../src/interface/QueueView.cpp:2299
 msgid "No command given, aborting."
 msgstr "Käsklust pole antud, katkestan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr "Välist IP aadressi pole seatud, proovime vaikeaadressi."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "Ükski fail pole hetkel muutmisel"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Puudub filtri nimi"
 
@@ -4760,25 +4789,25 @@
 msgid "No images available"
 msgstr "Siin pilte pole."
 
-#: ../../locales/../src/interface/QueueView.cpp:3159
+#: ../../locales/../src/interface/QueueView.cpp:3170
 msgid "No more files in the queue!"
 msgstr "Failide järjekord tühi!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Filtrikogumikul puudub nimi."
 
-#: resources.h:430
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr "Failitüübiga pole seostatud ühtegi programmi"
 
-#: resources.h:420
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Otsing ei leidnud midagi"
 
@@ -4796,23 +4825,23 @@
 msgid "No username given."
 msgstr "Kasutajanimi puudub."
 
-#: resources.h:922 resources.h:927
+#: resources.h:936 resources.h:941
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Puudub"
 
-#: resources.h:374
+#: resources.h:375
 msgid "None selected yet"
 msgstr "Pole veel valitud"
 
-#: resources.h:815 ../../locales/../src/engine/server.cpp:842
-#: ../../locales/../src/engine/server.cpp:861
+#: resources.h:828 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
 #: ../../locales/../src/interface/manual_transfer.cpp:160
 #: ../../locales/../src/interface/manual_transfer.cpp:185
 #: ../../locales/../src/interface/manual_transfer.cpp:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Normaalne"
 
@@ -4827,33 +4856,32 @@
 msgid "Not connected"
 msgstr "Ühenduseta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2317
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "Ei ole ühendatud ühegi serveriga"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
 msgstr "Ei ole ühendatud ühegi serveriga."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:27
-#, fuzzy
 msgid "Not connected."
-msgstr "Ühenduseta"
+msgstr "Ei ole ühendatud."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:663
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "See omadus on kasutatav ainult FTP protokolli puhul."
 
-#: resources.h:783
+#: resources.h:796
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Märkus: Töötab vaid krüpteerimata FTP ühendusega."
 
-#: resources.h:800
+#: resources.h:813
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Märkus: Kasutades üldist proksit surutakse FTP-ühendustele peale passiivlaad."
 
-#: resources.h:901
+#: resources.h:915
 msgid "Number of decimal places:"
 msgstr "Kümnendikkohtade arv:"
 
@@ -4861,21 +4889,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Kordusühenduste arv peab jääma vahemikku 0 ja 99."
 
-#: resources.h:333
+#: resources.h:334
 msgid "O&pen file"
 msgstr "&Ava fail"
 
 #: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:726
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:739
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:682
+#: resources.h:695
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4887,7 +4915,7 @@
 msgid "Once"
 msgstr "Ükskord"
 
-#: resources.h:952
+#: resources.h:966
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
@@ -4895,48 +4923,48 @@
 "Serverile saadetakse ainult sinu FileZilla versioon ja kasutatav "
 "operatsioonisüsteem."
 
-#: resources.h:651
+#: resources.h:664
 msgid "Open directory in system's file manager"
 msgstr ""
 
-#: resources.h:974 resources.h:975
+#: resources.h:988 resources.h:989
 msgid "Open the Site Manager"
 msgstr "Ava saidihaldur"
 
-#: resources.h:563
+#: resources.h:572
 msgid "Open the file."
 msgstr "Ava fail"
 
-#: resources.h:507
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "Avatakse FileZille seadistuste dialoog."
 
-#: resources.h:309
+#: resources.h:310
 msgid "Opened as:"
 msgstr "Avatud kui:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2619
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
 msgstr "Avamine ebaõnnestus"
 
-#: resources.h:495
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr "Avab uue saki"
 
-#: resources.h:492
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "Avatakse saidihaldur"
 
-#: resources.h:995
+#: resources.h:1009
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "Avab kataloogi kuvamise filtrid. Paremklikk aktiveerib filtrid."
 
-#: resources.h:171
+#: resources.h:172
 msgid "Operating system"
 msgstr "Operatsioonisüsteem"
 
@@ -4952,7 +4980,7 @@
 msgid "Other:"
 msgstr "Muu:"
 
-#: resources.h:728
+#: resources.h:741
 msgid "Overview"
 msgstr "Ülevaade"
 
@@ -4960,19 +4988,19 @@
 msgid "Overwrite &if source newer"
 msgstr "Kirjuta üle kui &uuem"
 
-#: resources.h:260 resources.h:270 resources.h:838 resources.h:847
+#: resources.h:261 resources.h:271 resources.h:851 resources.h:860
 msgid "Overwrite file"
 msgstr "Kirjuta üle"
 
-#: resources.h:262 resources.h:272 resources.h:840 resources.h:849
+#: resources.h:263 resources.h:273 resources.h:853 resources.h:862
 msgid "Overwrite file if size differs"
 msgstr "Kirjuta üle kui erinev suurus"
 
-#: resources.h:263 resources.h:273 resources.h:841 resources.h:850
+#: resources.h:264 resources.h:274 resources.h:854 resources.h:863
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Kirjuta üle kui erinev suurus või allikas uuem"
 
-#: resources.h:261 resources.h:271 resources.h:839 resources.h:848
+#: resources.h:262 resources.h:272 resources.h:852 resources.h:861
 msgid "Overwrite file if source file newer"
 msgstr "Kirjuta üle kui allikas uuem"
 
@@ -4988,12 +5016,12 @@
 msgid "Owner permissions"
 msgstr "Omaniku õigused"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Omanik/grupp"
 
-#: resources.h:873
+#: resources.h:886
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5001,7 +5029,7 @@
 "&Takista süsteemil sleepmode minekut aktiivsete ülekannete ja muude "
 "operatsioonide korral"
 
-#: resources.h:780 resources.h:796
+#: resources.h:793 resources.h:809
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Proksi s&erver:"
@@ -5010,7 +5038,7 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Käsklust PORT peab ruuter või tulemüür vigaseks."
 
-#: resources.h:742
+#: resources.h:755
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssiivne (soovituslik)"
 
@@ -5018,19 +5046,19 @@
 msgid "Package"
 msgstr "Pakett"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2460
+#: ../../locales/../src/interface/Mainfrm.cpp:2505
 msgid "Parameter not a valid URL"
 msgstr "Parameeter pole valiidne URL"
 
-#: resources.h:85 resources.h:383 resources.h:720
+#: resources.h:85 resources.h:384 resources.h:733
 msgid "Pass&word:"
 msgstr "Pa&rool:"
 
-#: resources.h:678
+#: resources.h:691
 msgid "Passive (recommended)"
 msgstr "Passiivne laad (soovituslik)"
 
-#: resources.h:762
+#: resources.h:775
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passiivne laad"
@@ -5045,42 +5073,42 @@
 msgid "Password required"
 msgstr "Parool nõutud"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:146
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Kaustatee"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Kaustatee loomine kataloogile %s ja alamkaustale %s ebaõnnestus"
 
-#: resources.h:401
+#: resources.h:402
 msgid "Paths"
 msgstr "Kaustateed"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "Eemaldamine ootel"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:141
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "Õigus"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Õigused"
 
-#: resources.h:170
+#: resources.h:171
 msgid "Platform:"
 msgstr "Platvorm:"
 
-#: resources.h:250
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5104,7 +5132,7 @@
 "külastage saiti http://filezilla-project.org FileZilla lähtekoodi "
 "allalaadimiseks."
 
-#: resources.h:684
+#: resources.h:697
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5146,20 +5174,20 @@
 msgstr ""
 "Sisestage allalaadimise kiiruse piirväärtuseks suurem või võrdne 0 KB/s -ga."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Palun sisestage nimi uuele filtrile."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Palun sisestage kopeeritud filtrile uus nimi."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Palun sisestage filtrikogumikule uus nimi: \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Palun sisestage filtrile uus nimi."
 
@@ -5184,7 +5212,7 @@
 msgid "Please enter a password for this server:"
 msgstr "Sisestage selle serveri parool:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2277
+#: ../../locales/../src/interface/QueueView.cpp:2288
 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"
@@ -5201,7 +5229,7 @@
 "Palun sisestage aegumise määr vahemikus 5 ja 9999 sekundit või 0 selle "
 "keelamiseks."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Sisestage sellele filtrikogumikule unikaalne nimi"
 
@@ -5228,7 +5256,7 @@
 msgstr ""
 "Sisestage üleslaadimise kiiruse piirväärtuseks suurem või võrdne 0 KB/s -ga."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5236,13 +5264,18 @@
 "Sisestage FTP otsekäsklus.\n"
 "FTP otsekäskluste kasutamine tühjendab kataloogi vahemälu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1574
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Sisestage loodava kataloogi nimi:"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Sisestage loodava kataloogi nimi:"
+
 #: resources.h:119
 msgid "Please enter username and password for this server:"
 msgstr "Sisestage serveri kasutajanimi ja parool:"
@@ -5262,7 +5295,7 @@
 "kui teil on dünaamiline aadress või te ei tea oma aadressi, kasutage välist "
 "lahendajat."
 
-#: resources.h:671
+#: resources.h:684
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5293,7 +5326,7 @@
 "seadistatud. Te peate kasutama manuaalset portide suunamist. Ärge kasutage "
 "ruuteris nn 'DMZ mode'-t või 'game mode'-t."
 
-#: resources.h:685
+#: resources.h:698
 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 "
@@ -5304,7 +5337,7 @@
 "server võib valida pordi, mida teie tulemüür peab troojakate ja muu saasta "
 "läbikäigu kohaks. See võib tekitada lisaprobleeme."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:713
+#: ../../locales/../src/interface/Mainfrm.cpp:726
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5312,7 +5345,7 @@
 "Ajaväärtuste säilitamine toimib ainult MFMT toega FTP, FTPS ja FTPES "
 "serveritesse faile laadides."
 
-#: resources.h:739
+#: resources.h:752
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5320,7 +5353,7 @@
 "Pange tähele, et mõned serverid võivad keelduda ühendumast teiega kui "
 "proovite korduvühendusi liiga tihti või liiga lühikese intervalliga."
 
-#: resources.h:888 resources.h:894
+#: resources.h:902 resources.h:908
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5329,7 +5362,7 @@
 "Rohkem infot loe saidilt http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5344,38 +5377,38 @@
 "Käivitage nõustaja uuesti, et muuta oma võrgu keskkonna seadistust või "
 "juhul, kui teil tekivad probleemid serveriga, mis varemalt töötas."
 
-#: resources.h:456
+#: resources.h:457
 msgid "Please select an action:"
 msgstr "Valige tegevus:"
 
-#: resources.h:302
+#: resources.h:303
 msgid "Please select the categories you would like to import."
 msgstr "Valige kategooriad, mida soovite importida."
 
-#: resources.h:673
+#: resources.h:686
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Valige ülekande vaikelaad."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Valige kataloogile \"%s\" uued atribuudid."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Valige failile \"%s\" uued atribuudid."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Seadke valitud kataloogidele uued atribuudid."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Seadke valitud kataloogidele ja failidele uued atribuudid."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Seadke valitud failidele uued atribuudid."
 
@@ -5393,7 +5426,7 @@
 "t. Sellised asjad nagu protokolli kontroll või protokollipõhised \"parandused"
 "\" peaksid olema keelatud."
 
-#: resources.h:253
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5415,11 +5448,11 @@
 msgstr ""
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr "Eeldefineeritud saidid"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:712
+#: ../../locales/../src/interface/Mainfrm.cpp:725
 msgid "Preserving file timestamps"
 msgstr "Faili ajaväärtuste säilitamine"
 
@@ -5427,7 +5460,7 @@
 msgid "Preview:"
 msgstr "Eelvaade:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Primaarse ühenduse ja andmete sertifikaadid ei ühti."
 
@@ -5435,19 +5468,19 @@
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:911
+#: resources.h:925
 msgid "Prioritize directories (default)"
 msgstr "Eelistused kataloogidel (vaikimisi)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Priority"
 msgstr "Prioriteet"
 
-#: resources.h:951
+#: resources.h:965
 msgid "Privacy policy:"
 msgstr "Privaatsuspoliitika:"
 
-#: resources.h:786
+#: resources.h:799
 msgid "Private &keys:"
 msgstr "&Privaatvõtmed:"
 
@@ -5455,19 +5488,19 @@
 msgid "Pro&tocol:"
 msgstr "Protoko&ll:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:795 resources.h:812
 msgid "Pro&xy password:"
 msgstr "Proksi p&arool:"
 
-#: resources.h:524 resources.h:591
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "&Järjekorra täitmine"
 
-#: resources.h:797
+#: resources.h:810
 msgid "Proxy &port:"
 msgstr "Proksi p&ort:"
 
-#: resources.h:781 resources.h:798
+#: resources.h:794 resources.h:811
 msgid "Proxy &user:"
 msgstr "Proksi &kasutaja:"
 
@@ -5475,12 +5508,17 @@
 msgid "Proxy authentication failed"
 msgstr "Proksi autentimine ebaõnnestus"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Proxy kätlus ebaõnnestus: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Host algab '[' suluga, kuid lõpetavat sulgu ei leitud."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5495,11 +5533,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Proksi päring ebaõnnestus: Tundmatu aadressitüüp CONNECT vastuses"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proksi on määratud, kuid server või port on vigane"
 
-#: resources.h:784
+#: resources.h:797
 msgid "Public Key Authentication"
 msgstr "Avaliku võtmega autentimine"
 
@@ -5511,47 +5549,46 @@
 msgid "Public permissions"
 msgstr "Avalikud õigused"
 
-#: ../../locales/../src/interface/QueueView.cpp:3214
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "Queue has been fully processed"
 msgstr "Järjekord on täielikult töödeldud."
 
 #: ../../locales/../src/interface/statusbar.cpp:462
-#, fuzzy, c-format
+#, c-format
 msgid "Queue: %s MiB"
-msgstr "Järjekord: %s%d MiB"
+msgstr "Järjekord: %s MiB"
 
 #: ../../locales/../src/interface/statusbar.cpp:392
-#, fuzzy, c-format
+#, c-format
 msgid "Queue: %s%s"
-msgstr "Järjekord: %s%d %c"
+msgstr "Järjekord: %s%s"
 
 #: ../../locales/../src/interface/statusbar.cpp:388
 #: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Järjekord: tühi"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Järjekorras olevad failid"
 
-#: resources.h:448
+#: resources.h:449
 msgid "Queueing:"
 msgstr "Järjekord:"
 
-#: resources.h:607
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "S&üsteemi ümberlaadimine"
 
-#: resources.h:521
+#: resources.h:530
 msgid "R&emote directory tree"
 msgstr "K&auge kataloogipuu"
 
-#: resources.h:621 resources.h:625
-#, fuzzy
+#: resources.h:634 resources.h:638
 msgid "R&eset and requeue selected files"
-msgstr "Tühista ja aseta valitud failid uuesti järjekorda"
+msgstr "Tühista ja aseta valitud &failid uuesti järjekorda"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr "Puhas FTP käsk"
 
@@ -5559,8 +5596,7 @@
 msgid "Re&ad"
 msgstr "Lo&e"
 
-#: resources.h:568 resources.h:582
-#, fuzzy
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
 msgstr "&Värskenda"
 
@@ -5580,46 +5616,52 @@
 msgid "Rea&d"
 msgstr "Lo&e"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
 msgstr "Ainult lugemisõigus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1071
+#: ../../locales/../src/interface/Mainfrm.cpp:1103
 msgid "Really cancel current operation?"
 msgstr "Kas tõesti katkestame käesoleva operatsiooni?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1022
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] ""
-msgstr[1] ""
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1026
+#, fuzzy, 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] "Valitud %d kataloog koos oma sisuga ülekandeks."
+msgstr[1] "Valitud %d kataloogi koos oma sisuga ülekandeks."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:1020
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1024
+#, fuzzy, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
 msgstr[0] "Kustuta %d fail?"
 msgstr[1] "Kustuta %d faili?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1667
-#: ../../locales/../src/interface/search.cpp:1027
-#, c-format
-msgid "Really delete %s and %s?"
-msgstr ""
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1031
+#, fuzzy, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Kas tõesti tahate saata '%s' serverisse?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#, fuzzy
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Kas tõesti kustutame kõik valitud failid ja/või kataloogid?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
-msgid "Really delete all selected files and/or directories?"
+#, fuzzy
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr "Kas tõesti kustutame kõik valitud failid ja/või kataloogid?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Reason"
 msgstr "Põhjus"
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Reboot now"
 msgstr "Restardi nüüd"
 
@@ -5627,8 +5669,12 @@
 msgid "Rec&urse into subdirectories"
 msgstr "Kaasa alamkataloogid"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr ""
 
@@ -5646,11 +5692,11 @@
 "Taasühendamise infot ei saa kustutada, kui olete serveriga ühenduses.\n"
 "Jätkamise korral ühendus katkestatakse."
 
-#: resources.h:740
+#: resources.h:753
 msgid "Reconnection settings"
 msgstr "Korduvühenduse seaded"
 
-#: resources.h:992 resources.h:993
+#: resources.h:1006 resources.h:1007
 msgid "Reconnects to the last used server"
 msgstr "Ühenda uuesti viimati kasutatud serveriga"
 
@@ -5658,34 +5704,39 @@
 msgid "Redirection to invalid address"
 msgstr "Ümbersuunamine vigasele aadressile"
 
-#: resources.h:984 resources.h:985
+#: resources.h:998 resources.h:999
 msgid "Refresh the file and folder lists"
 msgstr "Värskenda failide ja kaustade nimekirja"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:497
+#, fuzzy
+msgid "Remember passwords?"
+msgstr "Sisesta parool"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "Server"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:867
 msgid "Remote certificate not trusted."
 msgstr "Kaugsertifikaat ei ole usaldusväärne."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1222
 msgid "Remote file"
 msgstr "Kauge fail"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:441 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Kauge faili otsing"
 
-#: resources.h:206
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "Kaugkataloogi filtrid:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "Serveri kaustatee"
 
@@ -5698,7 +5749,7 @@
 "Serveri kaustatee parsimine ei õnnestunud. Veenu, et see on korrektne ja et "
 "valitud serveritüüp (%s) toetab seda."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5709,7 +5760,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr "Serveri kaustatee parsimine ei õnnestunud. Veenu, et see on korrektne."
 
@@ -5717,61 +5768,60 @@
 msgid "Remote path could not be parsed."
 msgstr "Serveri kaustatee parsimine ebaõnnestus"
 
-#: resources.h:445
+#: resources.h:446
 msgid "Remote path handling:"
 msgstr "Serveri kaustatee arvestamine:"
 
-#: resources.h:313
+#: resources.h:314
 msgid "Remote path:"
 msgstr "Serveri kaustatee:"
 
-#: ../../locales/../src/interface/viewheader.cpp:547
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Server:"
 
-#: resources.h:618 resources.h:622
+#: resources.h:631 resources.h:635
 msgid "Remove &all"
 msgstr "Eemalda &kõik"
 
-#: resources.h:620 resources.h:624
+#: resources.h:633 resources.h:637
 msgid "Remove &selected"
 msgstr "Eemalda &valitud"
 
-#: resources.h:265 resources.h:275 resources.h:843 resources.h:852
+#: resources.h:266 resources.h:276 resources.h:856 resources.h:865
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Faili ümbernimetamine"
 
-#: resources.h:636 resources.h:657
+#: resources.h:649 resources.h:670
 msgid "Rename selected directory"
 msgstr "Nimeta valitud kataloog ümber"
 
-#: resources.h:572 resources.h:586
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "Nimeta valitud failid ja kataloogid ümber"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Ümbernimetamine '%s' -> '%s'"
 
-#: resources.h:472
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr ""
 
-#: resources.h:623
-#, fuzzy
+#: resources.h:636
 msgid "Reset and requeue &all"
-msgstr "Tühista ja aseta valitud failid uuesti järjekorda"
+msgstr "Tühista ja aseta kõik failid uuesti järjekorda"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
@@ -5785,21 +5835,21 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Vastus:"
 
-#: resources.h:439
+#: resources.h:440
 msgid "Results:"
 msgstr "Tulemused:"
 
-#: resources.h:264 resources.h:274 resources.h:842 resources.h:851
+#: resources.h:265 resources.h:275 resources.h:855 resources.h:864
 msgid "Resume file transfer"
 msgstr "Jätka ülekannet"
 
-#: resources.h:857
+#: resources.h:870
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5812,30 +5862,34 @@
 msgid "Retrieving directory listing..."
 msgstr "Laetakse kataloogi nimekirja..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Välise IP aadressi vastuvõtt %s -lt"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:925
 #, fuzzy
 msgid "Root certificate is not trusted"
 msgstr "Kaugsertifikaat ei ole usaldusväärne."
 
-#: resources.h:500
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "&Näita muutmisel olevaid faile..."
 
-#: resources.h:608
+#: resources.h:887
+msgid "S&how the Site Manager on startup"
+msgstr "&Ava käivitumisel saidihalduri"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "&Süsteemi väljalülitamine"
 
-#: resources.h:437
+#: resources.h:438
 msgid "S&top"
 msgstr "&Stop"
 
-#: resources.h:516
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr "&Sünkroniseeritud brausimine"
 
@@ -5843,33 +5897,35 @@
 msgid "SFTP"
 msgstr "SFTP"
 
+#: resources.h:167
+msgid "SQLite:"
+msgstr "SQLite:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "Salvestame seaded?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1825
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to add to queue"
 msgstr "Skaneerin järjekorda seatavaid faile"
 
-#: ../../locales/../src/interface/QueueView.cpp:1827
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to upload"
 msgstr "Skaneerin üleslaetavaid faile"
 
-#: resources.h:433
-#, fuzzy
+#: resources.h:434
 msgid "Search &conditions:"
-msgstr "Tingimuse vigane suurus"
+msgstr "Otsingu &tingimused:"
 
-#: resources.h:431
-#, fuzzy
+#: resources.h:432
 msgid "Search &directory:"
-msgstr "Otsi kataloogist:"
+msgstr "Otsi &kataloogist:"
 
-#: resources.h:1000
+#: resources.h:1014
 msgid "Search for files recursively."
 msgstr "Otsi faile rekursiivselt"
 
-#: resources.h:540
+#: resources.h:549
 #, fuzzy
 msgid "Search server for files"
 msgstr "Serveri/kohalik fail"
@@ -5883,24 +5939,24 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Vaata ka: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:376
 msgid "Sele&ct server"
 msgstr "&Vali server"
 
-#: resources.h:725
+#: resources.h:738
 msgid "Select &page:"
 msgstr "&Vali lehekülg:"
 
-#: resources.h:876
+#: resources.h:890
 msgid "Select Theme"
 msgstr "Vali teema"
 
-#: resources.h:835
+#: resources.h:848
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Vali vaikimisi tegevus juhuks, kui ülekande sihtfail on juba olemas."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "Vali vaikimisi editor"
@@ -5942,7 +5998,7 @@
 msgstr "Vali fail eksporditud seadetele"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
 msgstr "Vali fail eksporditud saitidele"
 
@@ -5958,12 +6014,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Vali konverditud võtmefailile nimi"
 
-#: resources.h:421
+#: resources.h:422
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Vali kuidas neid faile avada."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Vali sihtkaust"
 
@@ -5971,15 +6027,15 @@
 msgid "Select target filename"
 msgstr "Vali failinimi"
 
-#: resources.h:291
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "Vali kategooriad ekspordiks:"
 
-#: resources.h:282
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "Valige kustutamisele minevad privaatsed andmed."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5993,7 +6049,7 @@
 msgstr[0] "Valitud %d kataloog."
 msgstr[1] "Valitud %d kataloogi."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6014,7 +6070,7 @@
 msgstr[0] "Valitud %d fail. Kogusuurus: Vähemalt %s"
 msgstr[1] "Valitud %d faili. Kogusuurus: Vähemalt %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Ülekandeks valitud %s ja %s."
@@ -6029,13 +6085,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Valitud %s ja %s. Kogusuurus: Vähemalt %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "Selected editor does not exist."
 msgstr "Valitud editori ei leitud."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
 msgstr "Valitud fail on juba muutmisel"
 
@@ -6043,21 +6099,21 @@
 msgid "Selected file is already loaded"
 msgstr "Valitud fail on juba laetud"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2651
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 #, fuzzy
 msgid "Selected file is already opened"
 msgstr "Valitud fail on juba avatud."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 #, fuzzy
 msgid "Selected file is still being edited"
 msgstr "Valitud fail on veel muutmisel"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Valitud filter toimib vaid kohalike failide puhul."
 
-#: ../../locales/../src/interface/menu_bar.cpp:311
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6069,15 +6125,15 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Valitud port on tavaliselt kasutuses teise protokolli poolt."
 
-#: resources.h:747
+#: resources.h:760
 msgid "Send FTP &keep-alive commands"
 msgstr "Saada FTP elushoiuks vajalikke käsklusi"
 
-#: resources.h:542
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr "Kirjuta käsitsi serverile käsk, kui teisiti ei ole võimalik"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr "Saadetakse FTP elushoiuks vajalikku käsklust"
 
@@ -6090,16 +6146,16 @@
 msgid "Server &Type:"
 msgstr "&Serveri tüüp:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:751
 msgid "Server did not properly shut down TLS connection"
 msgstr "Server ei sulgend korrektselt TLS ühendust"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Server ei toeta suuremate kui %d GB failide ülekande jätkatavust."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6108,15 +6164,15 @@
 "Server ei toeta suuremate kui %d GB failide ülekande jätkamist. Lõpeta "
 "ülekanne, kui faili suurus kattub."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
 msgstr "Server ei toeta suuremate kui 2GB failide ülekande jätkatavust."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
 msgstr "Server ei toeta suuremate kui 4GB failide ülekande jätkatavust."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6131,6 +6187,11 @@
 "Manager"
 msgstr "Server nõuab kontot. Palun täpsustage Saidihalduris konto"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+#, fuzzy
+msgid "Server returned empty path."
+msgstr "Server saatis vigase vastuse."
+
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
@@ -6139,13 +6200,13 @@
 "Server saatis täiendavaks identifitseerimiseks login-viiba. Kasuta "
 "interaktiivset sisselogimise tüüpi."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Server saatis passiivse vastuse mittesuunatava aadressiga. Passiivne laad "
 "ebaõnnestus."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6165,23 +6226,23 @@
 msgid "Server sent unexpected reply."
 msgstr "Server saatis vigase vastuse."
 
-#: resources.h:351
+#: resources.h:352
 msgid "Server to client MAC:"
 msgstr "Server-klient MAC:"
 
-#: resources.h:349
+#: resources.h:350
 msgid "Server to client cipher:"
 msgstr "Server-klient šiffer:"
 
-#: resources.h:380
+#: resources.h:381
 msgid "Server&type:"
 msgstr "Serveri &tüüp:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Server/Local file"
 msgstr "Serveri/kohalik fail"
 
-#: resources.h:311 resources.h:373
+#: resources.h:312 resources.h:374
 msgid "Server:"
 msgstr "Server:"
 
@@ -6189,45 +6250,50 @@
 msgid "Session details"
 msgstr "Sessiooni detailid:"
 
-#: resources.h:595
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "Sea &prioriteet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Sea õigused '%s' -> '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:858
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize käivitati ilma ühenduseta (socket)"
 
-#: resources.h:724
+#: resources.h:737
 msgid "Settings"
 msgstr "Seaded"
 
-#: resources.h:973
+#: resources.h:987
 msgid "Show &raw directory listing"
 msgstr "Näita &kataloogi algnimekirja"
 
-#: resources.h:551
+#: resources.h:560
 msgid "Show &welcome dialog..."
 msgstr "&Näita tervitusakent..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2318
+#: ../../locales/../src/interface/Mainfrm.cpp:2357
 msgid "Show both directory trees and continue comparing?"
 msgstr "Näita mõlemat kataloogipuud ja jätka võrdlemist?"
 
+#: resources.h:630
+#, fuzzy
+msgid "Shows available TLS ciphers"
+msgstr "&Madalaim vaba port:"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Kuvab selle abiakna."
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Shutdown now"
 msgstr "Lülita süsteem välja"
 
-#: resources.h:299
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "&Saidihalduri kirjed"
 
@@ -6235,32 +6301,31 @@
 msgid "Site Manager"
 msgstr "Saidihaldur"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "Site Manager - Invalid data"
-msgstr "Saidihaldur on juba avatud"
+msgstr "Saidihaldur - vigased andmed"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Saidihaldur on juba avatud"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Saiti ei leitud."
 
@@ -6270,8 +6335,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Kaustatee on vigane."
 
@@ -6289,11 +6354,11 @@
 "Saidikesksed järjehoidjad vajavad kirjet saidihalduris.\n"
 "Lisa praegune ühendus saidihaldurisse?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Size"
 msgstr "Suurus"
 
-#: resources.h:895
+#: resources.h:909
 msgid "Size formatting"
 msgstr "Failisuuruse vormindamine"
 
@@ -6302,7 +6367,7 @@
 msgid "Size unknown"
 msgstr "Suurus pole teada"
 
-#: resources.h:266 resources.h:276 resources.h:844 resources.h:853
+#: resources.h:267 resources.h:277 resources.h:857 resources.h:866
 msgid "Skip file"
 msgstr "Jäta fail vahele"
 
@@ -6322,11 +6387,11 @@
 msgid "Skipping upload of %s"
 msgstr "%s üleslaadimise vahelejätmine"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1139
+#: ../../locales/../src/interface/Mainfrm.cpp:1228
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Mõned failid on ikka veel muutmisel või vajavad üleslaadimist."
 
-#: resources.h:687 resources.h:763
+#: resources.h:700 resources.h:776
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6334,19 +6399,19 @@
 "Mõned ruuterite taga asuvad halvasti seadistatud serverid võivad vastata oma "
 "lokaalse IP aadressiga."
 
-#: resources.h:913
+#: resources.h:927
 msgid "Sort directories inline"
 msgstr "Sorteeri kataloogid"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Sorteerimisvalikut ei saa muuta kataloogide võrdlemisel."
 
-#: resources.h:909
+#: resources.h:923
 msgid "Sorting"
 msgstr "Sorteerimine"
 
-#: resources.h:910
+#: resources.h:924
 msgid "Sorting &mode:"
 msgstr "Sorteerimise &viis:"
 
@@ -6358,7 +6423,7 @@
 msgid "Source and target file may not be the same"
 msgstr "Lähte- ja sihtfail ei saa olla samad"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Pukseerimisoperatsiooni algus- ja sihtkoht on identsed"
 
@@ -6366,25 +6431,24 @@
 msgid "Source file:"
 msgstr "Lähtefail:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
-#, fuzzy
 msgid "Speed Limits"
-msgstr "Kiiruste piirväärtused"
+msgstr "Kiiruspiirangud"
 
-#: resources.h:808
+#: resources.h:821
 msgid "Speed limits"
-msgstr "Kiiruste piirväärtused"
+msgstr "Kiiruspiirangud"
 
 #: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr ""
+msgstr "Kiiruspiiranguid ei ole seadistatud. Klõpsa, et muuta."
 
 #: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr ""
+msgstr "Kiiruspiirangud on seadistatud. Klõpsa, et muuta."
 
-#: resources.h:391
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "&Alusta kohe ülekannet"
 
@@ -6392,13 +6456,13 @@
 msgid "Start with opened Site Manager"
 msgstr "Alusta avatud saidihalduriga"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "%s allalaadimise alustamine"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
@@ -6408,19 +6472,19 @@
 msgid "State or province:"
 msgstr "Osariik või maakond:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Status"
 msgstr "Staatus"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Staatus:"
 
-#: resources.h:592
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "Peatu ja eemalda &kõik"
 
@@ -6436,17 +6500,17 @@
 msgid "Successful transfers"
 msgstr "Õnnestunud ülekanded"
 
-#: resources.h:715
+#: resources.h:728
 msgid "Summary of test results:"
 msgstr "Testi tulemuste kokkuvõte:"
 
-#: resources.h:459
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:999 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1013 ../../locales/../src/interface/state.cpp:249
 #: ../../locales/../src/interface/state.cpp:278
 #: ../../locales/../src/interface/state.cpp:285
 #: ../../locales/../src/interface/state.cpp:297
@@ -6465,8 +6529,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr "Sünkroniseeritud brausimine on välja lülitatud."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Süntaksi viga"
 
@@ -6475,14 +6539,18 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2462
+#: ../../locales/../src/interface/Mainfrm.cpp:2507
 msgid "Syntax error in command line"
 msgstr "Käsureas süntaksi viga"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr "Süsteem"
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "&Tööriistariba"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 #, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
@@ -6508,19 +6576,24 @@
 msgid "Target file:"
 msgstr "Sihtfail:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1878
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "Sihtfail on juba olemas"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "Sihtfaili nimi on juba kasutuses, kas tõesti jätkame?"
 
-#: resources.h:714
+#: resources.h:727
 msgid "Test results"
 msgstr "Testi tulemused"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr "Testitakse serveri võimalusi failide jätkatavuseks"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6537,7 +6610,7 @@
 "Saidihaldur on avatud Filezilla 3 teise instantsi poolt.\n"
 "Palun sulgege see või andmeid ei saa kustutada."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:421
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr ""
@@ -6548,11 +6621,11 @@
 msgstr "Aadress, mille sisestasite oli: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Järjehoidjat ei saanud lisada."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Järjehoidjate puhastamine ebaõnnestus"
 
@@ -6564,20 +6637,21 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Kohandatud login-jada ei saa olla tühi."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Ei leitud vaikimisi kasutatavat tekstitoimetusprogrammi."
 
-#: resources.h:423
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Vaikimisi kasutatav tekstitoimetusprogramm on '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#, fuzzy
+msgid "The entered filter name already exists, please choose a different name."
 msgstr "Sellise nimega filter on juba olemas."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
@@ -6595,9 +6669,9 @@
 "Fail %s on juba olemas.\n"
 "Sisesta uus nimi:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6610,14 +6684,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Faili '%s' ei õnnestunud laadida või ei sisalda see privaatvõtit."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:59
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Faili '%s' ei õnnestunud laadida."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2619
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6626,8 +6700,8 @@
 "Ei saa '%s' avada:\n"
 "Selle failitüübiga pole sinu süsteemis ühtegi programmi seostatud."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6704,11 +6778,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Järgnevad sümbolid asendatakse: %s"
 
-#: resources.h:328
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "Järgnevad failid on hetkel muutmisel:"
 
-#: resources.h:463
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr "Vaba, avatud lähtekoodiga FTP-lahendus"
 
@@ -6716,7 +6790,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Globaalseid järjehoidjaid ei saanud salvestada."
 
-#: resources.h:971
+#: resources.h:985
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6761,7 +6835,7 @@
 "Kõige uuem versioon on alla laetud. Palun installeerige see versioon "
 "tavalisel moel."
 
-#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/QueueView.cpp:1966
 msgid "The queue will not be saved."
 msgstr "Järjekorda ei salvestata."
 
@@ -6776,22 +6850,22 @@
 msgid "The selected categories have been imported."
 msgstr "Valitud kategooriad on imporditud."
 
-#: resources.h:298
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Valitud fail sisaldab imporditavat infot järgmiste kategooriate jaoks:"
 
-#: resources.h:321
+#: resources.h:322
 msgid "The selected file is already being edited:"
 msgstr "Valitud fail on juba muutmisel:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Valitud fail on juba avatud teise programmi poolt, palun sulgege see."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2631
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6821,7 +6895,7 @@
 "Serveri sertifikaat on tundmatu. Enne serveri usaldamist kontrolli hoolega "
 "sertifikaati."
 
-#: resources.h:187
+#: resources.h:188
 #, fuzzy
 msgid ""
 "The server's host key does not match the key that has been cached. This "
@@ -6834,7 +6908,7 @@
 "Kui võtme muutumine ei ole ootuspärane, võtke ühendust serveri "
 "administraatoriga."
 
-#: resources.h:175
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6849,12 +6923,12 @@
 msgstr ""
 "Seaded on imporditud. Et need toimiksid, peaksite FileZilla uuesti käivitama."
 
-#: ../../locales/../src/interface/QueueView.cpp:3212
+#: ../../locales/../src/interface/QueueView.cpp:3224
 #, fuzzy
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Süsteem läheb peagi restardile, kui sa ei klõpsa Loobu."
 
-#: ../../locales/../src/interface/QueueView.cpp:3210
+#: ../../locales/../src/interface/QueueView.cpp:3222
 #, fuzzy
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Arvuti lülitab end peagi välja, kui sa ei klõpsa 'cancel'."
@@ -6875,11 +6949,11 @@
 msgid "Themes"
 msgstr "Teemad"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Seda filtrikogumit ei saa kustutada"
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Seda filtrikogumit ei saa ümber nimetada"
 
@@ -6889,7 +6963,7 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:692
+#: resources.h:705
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6897,7 +6971,7 @@
 "See töötab ainult siis, kui te ei ole ruuteri taga. Vastasel juhul tagastab "
 "süsteem ainult teie sisemise aadressi."
 
-#: resources.h:670
+#: resources.h:683
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6905,25 +6979,24 @@
 "See nõustaja aitab teil seadistada kõik ruuterid ja tulemüürid ning "
 "kontrollib teie kasutatavat seadistust."
 
-#: ../../locales/../src/interface/queue.cpp:1223
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Time"
-msgstr "Aegumine"
+msgstr "Aeg"
 
-#: resources.h:889
+#: resources.h:903
 msgid "Time formatting"
 msgstr "Kellaaja vorming"
 
-#: resources.h:731
+#: resources.h:744
 msgid "Time&out in seconds:"
 msgstr "Aegu&mine sekundites:"
 
-#: resources.h:734 ../../locales/../src/interface/QueueView.cpp:1060
-#: ../../locales/../src/interface/QueueView.cpp:1104
+#: resources.h:747 ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Timeout"
 msgstr "Aegumine"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
@@ -6938,23 +7011,23 @@
 msgstr "Tiitel:"
 
 # On ikka joondatud?
-#: ../../locales/../src/interface/Mainfrm.cpp:2316
+#: ../../locales/../src/interface/Mainfrm.cpp:2355
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "Kataloogide võrdlemiseks peavad olema mõlemad joondatud."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2317
+#: ../../locales/../src/interface/Mainfrm.cpp:2356
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Selleks tegevuseks peavad olema mõlemad kataloogipuud kas nähtaval või "
 "peidetud."
 
-#: resources.h:785
+#: resources.h:798
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr "Et toetada avaliku võtmega autentimist vajab FileZilla privaatvõtit."
 
-#: resources.h:996
+#: resources.h:1010
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6970,7 +7043,7 @@
 "Roheline: Fail on uuem kui võrreldav värvimata fail teises kataloogis\n"
 "Punane: Failisuurused erinevad"
 
-#: resources.h:998
+#: resources.h:1012
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6981,23 +7054,23 @@
 "navigeerimine avab samaaegselt ka serveris olevaid samu kaustu ning "
 "vastupidi."
 
-#: resources.h:986 resources.h:987
+#: resources.h:1000 resources.h:1001
 msgid "Toggles processing of the transfer queue"
 msgstr "Näita/ära näita ülekande järjekorra toiminguid"
 
-#: resources.h:978 resources.h:979
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the local directory tree"
 msgstr "Näita/ära näita kohalikku kataloogipuud"
 
-#: resources.h:976 resources.h:977
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the message log"
 msgstr "Näita/ära näita teadete logi"
 
-#: resources.h:980 resources.h:981
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the remote directory tree"
 msgstr "Näita/ära näita serveri kataloogipuud"
 
-#: resources.h:982 resources.h:983
+#: resources.h:996 resources.h:997
 msgid "Toggles the display of the transfer queue"
 msgstr "Näita/ära näita ülekande järjekorda"
 
@@ -7010,28 +7083,28 @@
 msgstr "Liiga palju ümbersuunamisi"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Täitmine:"
 
-#: resources.h:919 resources.h:925
+#: resources.h:933 resources.h:939
 msgid "Transfer"
 msgstr "Ülekanne"
 
-#: resources.h:361
+#: resources.h:362
 msgid "Transfer &direction"
 msgstr "Ülekande suund"
 
-#: resources.h:526
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "&Ülekande tüüp"
 
-#: resources.h:741
+#: resources.h:754
 msgid "Transfer Mode"
 msgstr "Ülekande laad"
 
-#: resources.h:875
+#: resources.h:889
 msgid "Transfer Queue"
 msgstr "Ülekande järjekord"
 
@@ -7039,8 +7112,8 @@
 msgid "Transfer Settings"
 msgstr "Ülekande seaded"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:497
+#: ../../locales/../src/engine/transfersocket.cpp:521
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Ühendus katkestati: %s"
@@ -7049,8 +7122,8 @@
 msgid "Transferred data got tainted."
 msgstr "Ülekantud andmed on vigased"
 
-#: ../../locales/../src/interface/QueueView.cpp:1485
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1493
+#: ../../locales/../src/interface/statuslinectrl.cpp:281
 msgid "Transferring"
 msgstr "Ülekanne"
 
@@ -7058,16 +7131,16 @@
 msgid "Transfers"
 msgstr "Ülekanded"
 
-#: ../../locales/../src/interface/QueueView.cpp:3127
-#: ../../locales/../src/interface/QueueView.cpp:3130
+#: ../../locales/../src/interface/QueueView.cpp:3138
+#: ../../locales/../src/interface/QueueView.cpp:3141
 msgid "Transfers finished"
 msgstr "Ülekanded lõpetatud"
 
-#: resources.h:832
+#: resources.h:845
 msgid "Treat files &without extension as ASCII file"
 msgstr "&Loe laiendita failid ASCII failideks"
 
-#: resources.h:828
+#: resources.h:841
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Kohtle &järgnevaid failitüüpe ASCII-failidena:"
 
@@ -7081,7 +7154,7 @@
 msgid "Trust new Hostkey:"
 msgstr "Usalda uut serverivõtit:"
 
-#: resources.h:194
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr "Kas usaldad uut võtit ja jätkad ühendust?"
 
@@ -7089,40 +7162,40 @@
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Usalda seda sertifikaati ja jätka ühendust"
 
-#: resources.h:181
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr "Kas usaldad seda serverit ja jätkad ühendust?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "Tüüp"
 
-#: resources.h:767
+#: resources.h:780
 msgid "Type of FTP Proxy:"
 msgstr "FTP proksi tüüp:"
 
-#: resources.h:792
+#: resources.h:805
 msgid "Type of generic proxy:"
 msgstr "Üldise proksi tüüp:"
 
-#: resources.h:331
+#: resources.h:332
 msgid "U&pload"
 msgstr "Ü&leslaadimine"
 
-#: resources.h:484 resources.h:812
+#: resources.h:485 resources.h:825
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Ül&eslaadimise piirkiirus:"
 
-#: resources.h:937
+#: resources.h:951
 msgid "U&se filetype associations if available"
 msgstr "K&asuta failitüüpide seoseid kui võimalik"
 
-#: resources.h:890
+#: resources.h:904
 msgid "U&se system defaults"
 msgstr "K&asuta süsteemi vaikeväärtusi"
 
-#: resources.h:769
+#: resources.h:782
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7135,8 +7208,8 @@
 msgid "Unit:"
 msgstr "Üksus:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "Tundmatu"
 
@@ -7153,13 +7226,13 @@
 msgid "Unknown certificate"
 msgstr "Tundmatu sertifikaat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:409
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:174
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "Tundmatu serveri võti"
 
@@ -7171,7 +7244,7 @@
 "subnegotiation: %d"
 msgstr "Tundmatu SOCKS kasutajanimi/parool autoriseerimise versioon: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:454
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7193,7 +7266,7 @@
 "Kuni selle probleemi lahendamiseni aktiivne FTP laad ei tööta ning kasutuses "
 "on passiivne laad."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:896
 msgid "Unsupported certificate type"
 msgstr "Mittetoetatud sertifikaaditüüp"
 
@@ -7201,7 +7274,7 @@
 msgid "Unsupported redirect"
 msgstr "Mittetoetatud ümbersuunamine"
 
-#: resources.h:332
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr "&Lae üles ja tühista muudatused"
 
@@ -7215,53 +7288,52 @@
 msgid "Update wizard"
 msgstr "Täiendamise nõustaja"
 
-#: resources.h:363
+#: resources.h:364
 msgid "Upload"
 msgstr "Üleslaadimine"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "Üleslaadimine ebaõnnestus"
 
 #: ../../locales/../src/interface/statusbar.cpp:609
-#, fuzzy, c-format
+#, c-format
 msgid "Upload limit: %s/s"
-msgstr "Ü&leslaadimise piirkiirus:"
+msgstr "Üleslaadimise piirkiirus: %s/s"
 
 #: ../../locales/../src/interface/statusbar.cpp:611
-#, fuzzy
 msgid "Upload limit: none"
-msgstr "Ü&leslaadimise piirkiirus:"
+msgstr "Üleslaadimise piirkiirus: puudub"
 
-#: resources.h:647
+#: resources.h:660
 msgid "Upload selected directory"
 msgstr "Lae valitud kataloog üles"
 
-#: resources.h:557
+#: resources.h:566
 msgid "Upload selected files and directories"
 msgstr "Lae valitud failid ja kataloogid üles"
 
-#: resources.h:316
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "Laeme selle faili tagasi serverisse?"
 
-#: resources.h:315
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr "Laeme faili serverisse?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "Üleslaadimine"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "Laeb üles, eemaldamine ootel"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr "Lae üles ja tühista muudatused"
 
@@ -7269,15 +7341,15 @@
 msgid "Use &custom charset"
 msgstr "Kasuta &kohandatud kooditabelit"
 
-#: resources.h:934
+#: resources.h:948
 msgid "Use &custom editor:"
 msgstr "&Vali editor:"
 
-#: resources.h:422
+#: resources.h:423
 msgid "Use &default editor for text files"
 msgstr "Kasutatav tekstifailide jaoks vaikimisi tekstitoimetusprogrammi"
 
-#: resources.h:405 resources.h:411
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr "Kasuta &sünkroniseeritud brausimist"
 
@@ -7287,46 +7359,46 @@
 "Kui server toetab, kasuta UTF-8't. Vastasel juhul kasuta kohalikku "
 "kooditabelit."
 
-#: resources.h:258 resources.h:268
+#: resources.h:259 resources.h:269
 msgid "Use default action"
 msgstr "Kasuta vaiketegevust"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr ""
 
-#: resources.h:371
+#: resources.h:372
 msgid "Use server currently connected to"
 msgstr "Kasuta hetkel ühendatud serverit"
 
-#: resources.h:372
+#: resources.h:373
 msgid "Use server from site manager"
 msgstr "Vali server saidihaldurist"
 
-#: resources.h:884
+#: resources.h:898
 msgid "Use system &defaults"
 msgstr "Kasuta süsteemi &vaikeväärtusi"
 
-#: resources.h:693
+#: resources.h:706
 msgid "Use the following IP address:"
 msgstr "Kasuta järgmist IP aadressi:"
 
-#: resources.h:703
+#: resources.h:716
 msgid "Use the following port range:"
 msgstr "Kasuta järgmist portide vahemikku:"
 
-#: resources.h:688
+#: resources.h:701
 msgid "Use the server's external IP address instead"
 msgstr "Kasuta selle asemel serveri välist IP aadressi"
 
-#: resources.h:694 resources.h:757
+#: resources.h:707 resources.h:770
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Kasutage seda, kui te olete ruuteri taga ja omate staatilist välist IP "
 "aadressi."
 
-#: resources.h:697
+#: resources.h:710
 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 "
@@ -7342,11 +7414,11 @@
 msgstr "Kasutaja:"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
 msgstr "Kasutajanimi ei saa koosneda tühikutest"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
 msgstr "Kasutusel proksi %s"
@@ -7356,7 +7428,7 @@
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "Vale kooditabeli puhul ei näidata failinimesid korrektselt."
 
-#: resources.h:231
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Kasutades seda nõustajat, võite kontrollida FileZilla uuenduste olemasolu."
@@ -7373,27 +7445,27 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Ohtrasõnaline logiteade wxWidgetsilt"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1086
 msgid "Verifying certificate..."
 msgstr "Sertifikaadi kontrollimine..."
 
-#: resources.h:169
+#: resources.h:170
 msgid "Version:"
 msgstr "Versioon:"
 
-#: resources.h:817
+#: resources.h:830
 msgid "Very high"
 msgstr "Väga suur"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr "Peidetud failide näitamine lubatud, kuid server ei toeta seda"
 
-#: resources.h:921
+#: resources.h:935
 msgid "View/Edit"
 msgstr "Vaata/Muuda"
 
-#: resources.h:355
+#: resources.h:356
 msgid "Visible columns"
 msgstr "Nähtavad veerud"
 
@@ -7401,19 +7473,19 @@
 msgid "W&rite"
 msgstr "K&irjuta"
 
-#: ../../locales/../src/interface/QueueView.cpp:1784
+#: ../../locales/../src/interface/QueueView.cpp:1792
 msgid "Waiting"
 msgstr "Ootamine"
 
-#: ../../locales/../src/interface/QueueView.cpp:1392
+#: ../../locales/../src/interface/QueueView.cpp:1400
 msgid "Waiting for browsing connection"
 msgstr "Ootan ühenduste ülevaadet"
 
-#: ../../locales/../src/interface/QueueView.cpp:1435
+#: ../../locales/../src/interface/QueueView.cpp:1443
 msgid "Waiting for password"
 msgstr "Ootan parooli"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 msgid "Waiting for transfer to be cancelled"
 msgstr "Ootan ülekande katkestamist"
 
@@ -7470,23 +7542,29 @@
 "\n"
 "Kas te tõesti tahate kontrollida ööversioone?"
 
-#: resources.h:186
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "Hoiatus: Võimalik turvaprobleem!"
 
-#: resources.h:475
+#: resources.h:476
 msgid "Welcome to FileZilla"
 msgstr "Tere tulemast FileZilla'sse"
 
-#: resources.h:464
+#: resources.h:465
 msgid "What's new"
 msgstr "Mis on uut"
 
-#: resources.h:241
+#: resources.h:242
 msgid "What's new:"
 msgstr "Mis on uut:"
 
-#: resources.h:820
+#: resources.h:492
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:833
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7494,10 +7572,15 @@
 "Kohaliku operatsioonisüsteemi poolt mittetoetatud märgid asendatakse "
 "tõmmatavates failides"
 
-#: resources.h:862
+#: resources.h:875
 msgid "Widescreen"
 msgstr "Laiekraan"
 
+#: resources.h:491
+#, fuzzy
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Sisesta parool"
+
 #: resources.h:144
 msgid "Wr&ite"
 msgstr "Ki&rjuta"
@@ -7515,7 +7598,7 @@
 msgid "Yes"
 msgstr "Jah"
 
-#: resources.h:252
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7523,7 +7606,7 @@
 "Te juba kasutate FileZilla värskeimat versiooni. Edaspidi, kui aega saate, "
 "korrake seda kontrolli."
 
-#: resources.h:473
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr "Sa saad käesoleva akna alati läbi Abi-menüü uuesti avada."
 
@@ -7554,29 +7637,29 @@
 msgstr ""
 "Te ei ole failile uut nime andnud. Kas kirjutame faili sellegipoolest üle?"
 
-#: resources.h:454
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2598
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Te peate sisestama serverinime."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Te peate sisestama kohaliku kataloogi."
 
@@ -7585,17 +7668,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Te peate sisestama korrektse IP aadressi."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Te peate sisestama kirjutatava kohaliku kataloogi."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
 msgstr "Te peate sisestama konto nime"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr "Te peate sisestama kasutajanime"
 
@@ -7615,7 +7698,7 @@
 msgid "You need to enter a name for the log file."
 msgstr "Te peate sisestama logifaili nime."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1640
 msgid "You need to enter a properly quoted command."
 msgstr "Te peate sisestama korralikult jutumärkidega eraldatud käsu."
 
@@ -7630,19 +7713,19 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Sisesta vähemalt üks kaustatee, tühjad järjehoidjad pole lubatud."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7672,45 +7755,44 @@
 "Teil ei tohiks olla probleeme ühendumisel teiste serveritega ja failide "
 "ülekanne peaks töötama korralikult."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "after"
-msgstr "Ülekanne"
+msgstr "hilisem kui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "before"
-msgstr ""
+msgstr "varasem kui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "alguses on"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "sisaldab"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
-msgstr ""
+msgstr "ei sisalda"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
 msgid "does not equal"
-msgstr ""
+msgstr "ei võrdu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
 msgstr "lõpus on"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
 msgstr "võrdub"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:498
+#: ../../locales/../src/interface/filelistctrl.cpp:516
+#: ../../locales/../src/interface/filelistctrl.cpp:541
+#: ../../locales/../src/interface/filelistctrl.cpp:557
 msgid "file"
 msgstr "fail"
 
@@ -7732,55 +7814,55 @@
 msgid "fzsftp could not be started"
 msgstr "fzsftp startimine ebaõnnestus"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:934
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr "suurem kui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
 msgstr "grupi käivitatav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr "grupi loetav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr "grupi kirjutatav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr "võrdub"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr "on seatud"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr "on seadmata"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "väiksem kui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr "vastab regulaaravaldisele"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
 msgstr "omaniku käivitatav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
 msgstr "omaniku loetav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
 msgstr "omaniku kirjutatav"
 
@@ -7788,18 +7870,21 @@
 msgid "unknown"
 msgstr "tundmatu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
 msgstr "kõigi käivitatav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr "kõigi loetav"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr "kõigi kirjutatav"
 
 #: resources.h:165
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Korduv filtri nimi"
diff -Nru filezilla-3.5.3/locales/eu.po filezilla-3.7.3~precise/locales/eu.po
--- filezilla-3.5.3/locales/eu.po	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/locales/eu.po	2013-04-29 03:30:04.000000000 +0000
@@ -0,0 +1,8096 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: Filezilla\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2013-02-24 13:28+0100\n"
+"Last-Translator: Xabier Aramendi (Azpidatziak) <azpidatziak@gmail.com>\n"
+"Language-Team: EUS_Xabier Aramendi <azpidatziak@gmail.com>\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.5.5\n"
+"Language: Euskara (Basque)\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:65
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
+msgid "%H:%M:%S elapsed"
+msgstr "%H:%M:%S igarota"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:69
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
+msgid "%H:%M:%S left"
+msgstr "%H:%M:%S gelditzen da"
+
+#: resources.h:798
+#, no-c-format
+msgid ""
+"%a - Account (Lines containing this will be omitted if not using Account "
+"logontype)"
+msgstr ""
+"%a - Kontua (Hau duten lerroak ezikusi egingo dira Kontu saiohaste-mota "
+"erabiltzen ez bada)"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:63
+#: ../../locales/../src/interface/filelist_statusbar.cpp:74
+#: ../../locales/../src/interface/filelist_statusbar.cpp:86
+#, c-format
+msgid "%d directory"
+msgid_plural "%d directories"
+msgstr[0] "%d zuzenbide"
+msgstr[1] "%d zuzenbide"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
+#, c-format
+msgid "%d directory with its contents"
+msgid_plural "%d directories with their contents"
+msgstr[0] "%d zuzenbide bere edukiekin"
+msgstr[1] "%d zuzenbide beren edukiekin"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:62
+#: ../../locales/../src/interface/filelist_statusbar.cpp:85
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
+#, c-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d agiri"
+msgstr[1] "%d agiri"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:81
+#, c-format
+msgid "%d file. Total size: %s"
+msgid_plural "%d files. Total size: %s"
+msgstr[0] "%d agiri. Neurria guztira: %s"
+msgstr[1] "%d agiri. Neurria guztira: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:79
+#, c-format
+msgid "%d file. Total size: At least %s"
+msgid_plural "%d files. Total size: At least %s"
+msgstr[0] "%d agiri. Neurria guztira: Gutxienez %s"
+msgstr[1] "%d agiri. Neurria guztira: Gutxienez %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:2941
+#, c-format
+msgid "%d files added to queue"
+msgstr "%d agiri lerrora gehituta"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:104
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d segundu"
+msgstr[1] "%d segundu"
+
+#: resources.h:795
+msgid "%h - Host"
+msgstr "%h - Hostalaria"
+
+#: resources.h:797
+#, no-c-format
+msgid "%p - Password"
+msgstr "%p - Sarhitza"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, c-format
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
+#, c-format
+msgid "%s (? B/s)"
+msgstr "%s (? B/s)"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
+#, c-format
+msgid "%s - Certificate expired!"
+msgstr "%s - Egiaztagiria iraungituta!"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
+#, c-format
+msgid "%s - Not yet valid!"
+msgstr "%s - Ez da baliozkoa oraindik!"
+
+#: resources.h:799
+#, no-c-format
+msgid "%s - Proxy user"
+msgstr "%s - Proxy erabiltzailea"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:91
+#, c-format
+msgid "%s and %s. Total size: %s"
+msgstr "%s eta %s. Neurria guztira: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:89
+#, c-format
+msgid "%s and %s. Total size: At least %s"
+msgstr "%s eta %s. Neurria guztira: Gutxienez %s"
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:31
+#, c-format
+msgid "%s byte"
+msgid_plural "%s bytes"
+msgstr[0] "%s byte"
+msgstr[1] "%s byte"
+
+#: ../../locales/../src/interface/updatewizard.cpp:918
+#, c-format
+msgid "%s bytes"
+msgstr "%s byte"
+
+#: ../../locales/../src/interface/updatewizard.cpp:902
+#, c-format
+msgid "%s bytes (%s/s)"
+msgstr "%s byte (%s/s)"
+
+#: ../../locales/../src/interface/FileZilla.cpp:711
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Please download FileZilla again. If this problem persists, please submit a "
+"bug report."
+msgstr ""
+"%s ezin da aurkitu. FileZilla-ren osagai hau gabe, SFTP-ak ez du lan "
+"egingo.\n"
+"\n"
+"Mesedez jeitsi FileZilla berriro. Arazo honek jarraitzen badu, mesedez "
+"aurkeztu akats jakinarazpen bat."
+
+#: ../../locales/../src/interface/FileZilla.cpp:805
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Possible solutions:\n"
+"- Make sure %s is in a directory listed in your PATH environment variable.\n"
+"- Set the full path to %s in the FZ_FZSFTP environment variable."
+msgstr ""
+"%s ezin da aurkitu. FileZilla-ren osagai hau gabe, SFTP-ak ez du lan "
+"egingo.\n"
+"\n"
+"Ahalezko konponbideak:\n"
+"- Zihurtatu %s zure HELBURU inguru aldakorrean zerrendaturiko zuzenbide "
+"batean dagoela.\n"
+"- Ezarri helburu osoa %s-ra FZ_FZSFTP inguru aldakorrean."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
+#, c-format
+msgid "%s with %d bits"
+msgstr "%s %d bit-rekin"
+
+#: resources.h:796
+#, no-c-format
+msgid "%u - Username"
+msgstr "%u - Erabiltzaile-izena"
+
+#: resources.h:800
+#, no-c-format
+msgid "%w - Proxy password"
+msgstr "%w - Proxy sarhitza"
+
+#: resources.h:571
+msgid "&About..."
+msgstr "&Honi buruz..."
+
+#: resources.h:94 resources.h:393
+msgid "&Account:"
+msgstr "Kont&ua:"
+
+#: resources.h:109 resources.h:700 resources.h:764
+msgid "&Active"
+msgstr "A&ktiboa"
+
+#: resources.h:562
+msgid "&Add bookmark..."
+msgstr "&Gehitu lastermarka..."
+
+#: resources.h:575 resources.h:592
+msgid "&Add files to queue"
+msgstr "Gehitu &agiriak lerrora"
+
+#: resources.h:808
+msgid "&Add keyfile..."
+msgstr "&Gehitu Giltza-agiria..."
+
+#: resources.h:650 resources.h:669
+msgid "&Add to queue"
+msgstr "Gehitu &Lerrora"
+
+#: resources.h:103
+msgid "&Adjust server timezone offset:"
+msgstr "Zehaztu zerbitzariaren orduere&mu oreka:"
+
+#: resources.h:27
+msgid "&Always trust certificate in future sessions."
+msgstr "&Betik fidatu egiaztagiriaz etorkizuneko saioetan."
+
+#: resources.h:191
+msgid "&Always trust this host, add this key to the cache"
+msgstr "&Betik fidatu hostalari honetaz, gehitu giiltza hau katxera"
+
+#: resources.h:960
+msgid "&Always use default editor"
+msgstr "Beti&k erabili berezko editatzailea"
+
+#: resources.h:436
+msgid "&Always use selection for unassociated files"
+msgstr "&Betik erabili hautapena elkartugabeko agirientzat"
+
+#: resources.h:73
+msgid "&Always use this action"
+msgstr "&Betik erabili ekintza hau"
+
+#: resources.h:776
+msgid "&Ask your operating system for the external IP address"
+msgstr "&Galdetu zure sistema eragileari kanpoko IP helbidea"
+
+#: resources.h:544 resources.h:680 resources.h:845
+msgid "&Auto"
+msgstr "&Berez"
+
+#: resources.h:115
+msgid "&Autodetect"
+msgstr "Berez&-atzeman"
+
+#: resources.h:546 resources.h:682 resources.h:847
+msgid "&Binary"
+msgstr "Bi&narioa"
+
+#: resources.h:920
+msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
+msgstr ""
+"&SI sinboloak erabiltzen dituzten aurrizki binarioak. (adib. 1 KB = 1024 "
+"bytes)"
+
+#: resources.h:561
+msgid "&Bookmarks"
+msgstr "Laster&markak"
+
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
+msgid "&Browse..."
+msgstr ""
+
+#: resources.h:835
+#, no-c-format
+msgid "&Burst tolerance:"
+msgstr "Ja&sangarritasun leherketa"
+
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
+msgid "&Cancel"
+msgstr "E&zeztatu"
+
+#: resources.h:244
+msgid "&Check for beta versions of FileZilla"
+msgstr "Egiaztatu FileZilla &beta bertsiorik dagoen"
+
+#: resources.h:521
+msgid "&Clear private data..."
+msgstr "&Garbitu datu pribatuak..."
+
+#: resources.h:621
+msgid "&Close FileZilla"
+msgstr "It&xi FileZilla"
+
+#: resources.h:690
+msgid "&Configure speed limits..."
+msgstr "&Itxuratu abiadura mugak..."
+
+#: resources.h:549
+#, fuzzy
+msgid "&Configure..."
+msgstr "&Itxuratu abiadura mugak..."
+
+#: resources.h:121
+msgid "&Connect"
+msgstr "&Elkarketatu"
+
+#: resources.h:509
+msgid "&Copy current connection to Site Manager..."
+msgstr "&Kopiatu oraingo elkarketa Gune Kudeatzailera..."
+
+#: resources.h:181 resources.h:630
+msgid "&Copy to clipboard"
+msgstr "&Kopiatu gakora"
+
+#: resources.h:635
+msgid "&Crash"
+msgstr "&Matxura"
+
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
+msgid "&Create directory"
+msgstr "Sortu &zuzenbidea"
+
+#: resources.h:685
+msgid "&Create new tab"
+msgstr "Sortu &hegats berria"
+
+#: ../../locales/../src/interface/menu_bar.cpp:72
+msgid "&Debug"
+msgstr "&Garbiketa"
+
+#: resources.h:991
+msgid "&Debug information in message log:"
+msgstr "&Garbiketa argibideak mezu oharrean:"
+
+#: resources.h:953
+msgid "&Default editor:"
+msgstr "&Berezko editatzailea:"
+
+#: resources.h:542 resources.h:613
+msgid "&Default file exists action..."
+msgstr "&Berezko ekintza badagoen agiriarentzat..."
+
+#: resources.h:758
+msgid "&Delay between failed login attempts:"
+msgstr "&Atzerapena huts egindakosasio haste saiakera artean:"
+
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
+msgid "&Delete"
+msgstr "E&zabatu"
+
+#: resources.h:466
+msgid "&Delete symlink"
+msgstr "Ezabatu &Symlotura"
+
+#: resources.h:527
+msgid "&Directory comparison"
+msgstr "&Zuzenbide alderaketa"
+
+#: resources.h:334
+msgid "&Discard local file then download and edit file anew"
+msgstr "&Baztertu tokiko agiria ondoren jeitsi eta editatu agiria berriro"
+
+#: resources.h:555
+msgid "&Disconnect"
+msgstr "&Eten"
+
+#: resources.h:622
+msgid "&Disconnect from server"
+msgstr "Eten elkarketa &zerbitzaritik"
+
+#: resources.h:896
+msgid "&Display momentary transfer speed instead of average speed"
+msgstr "Erakutsi &uneko eskualdaketa abiadura bataz-besteko abiaduraren ordez"
+
+#: resources.h:918
+msgid "&Display size in bytes"
+msgstr "&Erakutsi neurria byte-tan"
+
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "E&z gogoratu sarhitzak"
+
+#: ../../locales/../src/interface/conditionaldialog.cpp:25
+msgid "&Don't show this dialog again."
+msgstr "&Ez erakutsi elkarrizketa hau berriro."
+
+#: resources.h:781
+msgid "&Don't use external IP address on local connections."
+msgstr "Ez e&rabili kanpoko IP helbiderik tokiko elkarketetan."
+
+#: resources.h:940
+msgid "&Double-click action on files:"
+msgstr "Klik-&bikoitz ekintza agirietan:"
+
+#: resources.h:590 resources.h:648
+msgid "&Download"
+msgstr "&Jeitsi"
+
+#: resources.h:452
+msgid "&Download to:"
+msgstr "Jeitsi &hona:"
+
+#: resources.h:683
+msgid "&Download..."
+msgstr "&Jeitsi..."
+
+#: resources.h:266 resources.h:857
+msgid "&Downloads:"
+msgstr "&Jeisketak:"
+
+#: resources.h:519 resources.h:581
+msgid "&Edit"
+msgstr "&Editatu"
+
+#: resources.h:219
+msgid "&Edit filter rules..."
+msgstr "&Editatu iragazki arauak..."
+
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
+msgid "&Enable"
+msgstr "&Gaitu"
+
+#: resources.h:490 resources.h:830
+msgid "&Enable speed limits"
+msgstr "&Gaitu abiadura mugak"
+
+#: resources.h:119
+msgid "&Encoding:"
+msgstr "&Kodeaketa:"
+
+#: resources.h:90
+msgid "&Encryption:"
+msgstr "Enk&riptaketa:"
+
+#: resources.h:629
+msgid "&Enter custom command..."
+msgstr "&Sartu norbere agindua..."
+
+#: resources.h:145
+msgid "&Execute"
+msgstr "&Exekutatu"
+
+#: resources.h:301
+msgid "&Export Site Manager entries"
+msgstr "Esportatu &Gune Kudeaketa sarrerak"
+
+#: resources.h:514 resources.h:679
+#, fuzzy
+msgid "&Export..."
+msgstr "&Inportatu..."
+
+#: resources.h:786
+msgid "&Fall back to active mode"
+msgstr "&Itzuli modu aktibora"
+
+#: resources.h:506
+msgid "&File"
+msgstr "&Agiria"
+
+#: resources.h:660
+msgid "&File Attributes..."
+msgstr "&Agiri Ezaugarriak..."
+
+#: resources.h:608
+#, fuzzy
+msgid "&File permissions..."
+msgstr "Jabe baimenak"
+
+#: resources.h:374
+msgid "&File:"
+msgstr "&Agiria:"
+
+#: resources.h:229
+msgid "&Filter conditions:"
+msgstr "Iragazki baldi&ntzak:"
+
+#: resources.h:208
+msgid "&Filter sets:"
+msgstr "&Iragazki ezarpenak:"
+
+#: resources.h:223
+msgid "&Filters:"
+msgstr "&Iragazkiak:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:30
+msgid "&Finish"
+msgstr "&Amaitu"
+
+#: resources.h:326
+msgid "&Finish editing and delete local file"
+msgstr "&Amaitu edizioa eta ezabatu tokiko agiria"
+
+#: resources.h:456
+msgid ""
+"&Flatten remote paths, download all contained files directly into target "
+"directory"
+msgstr ""
+"&Lautu hurruneko helburuak, jeitsi agiri guztiak zuzenean xede zuzenbide "
+"barnera"
+
+#: resources.h:467
+msgid "&Follow symlink, delete target directory contents"
+msgstr "&Hurrengo sinlotura, ezabatu xede zuzenbideko edukiak"
+
+#: resources.h:779
+msgid "&Get external IP address from the following URL:"
+msgstr "&Lortu kanpoko IP helbidea hurrengo URL-tik:"
+
+#: resources.h:569
+msgid "&Getting help..."
+msgstr "&Lortu laguntza..."
+
+#: resources.h:406
+msgid "&Global bookmark"
+msgstr "&Lastermarka orokorra"
+
+#: resources.h:815
+msgid "&HTTP/1.1 using CONNECT method"
+msgstr "H&TTP/1.1 ELKARKETA metodoa erabiliz"
+
+#: resources.h:565
+msgid "&Help"
+msgstr "&Laguntza"
+
+#: resources.h:531 resources.h:666
+msgid "&Hide identical files"
+msgstr "&Ezkutatu agiri berdinak"
+
+#: resources.h:615
+msgid "&Highest"
+msgstr "&Handiena"
+
+#: resources.h:774
+msgid "&Highest available port:"
+msgstr "Ataka eskuragarri &handiena:"
+
+#: resources.h:87 resources.h:387 resources.h:738
+msgid "&Host:"
+msgstr "Hostalaria&:"
+
+#: resources.h:919
+msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
+msgstr "&IEC binario aurrizkiak (adib. 1 KiB = 1024 byte)"
+
+#: resources.h:907
+msgid "&ISO 8601 (example: 2007-09-15)"
+msgstr "&ISO 8601 (adibidea: 2007-09-15)"
+
+#: resources.h:515
+msgid "&Import..."
+msgstr "&Inportatu..."
+
+#: resources.h:962
+msgid "&Inherit system's filetype associations"
+msgstr "Ondorengotu sistemaren agirimota elkarketak"
+
+#: resources.h:455
+msgid "&Keep remote path structure relative to search root"
+msgstr "&Heutsi hurruneko helburu egitura erlatiboari erroa bilatzeko"
+
+#: resources.h:880
+msgid "&Layout of file and directory panes:"
+msgstr "&Agiri eta zuzenbide panelen antolakuntza:"
+
+#: resources.h:771
+msgid "&Limit local ports used by FileZilla"
+msgstr "&Mugatu FileZillak erabiltzeko tokiko atakak"
+
+#: resources.h:111
+msgid "&Limit number of simultaneous connections"
+msgstr "&Mugatu aldibereko elkarketa zenbatekoa"
+
+#: resources.h:537
+msgid "&Local directory tree"
+msgstr "&Tokiko zuzenbide zuhaitza"
+
+#: resources.h:411 resources.h:417
+msgid "&Local directory:"
+msgstr "&Tokiko zuzenbidea:"
+
+#: resources.h:981
+msgid "&Log to file"
+msgstr "&Oharreratu agirira"
+
+#: resources.h:91
+msgid "&Logon Type:"
+msgstr "Saiohaste &Mota:"
+
+#: resources.h:390
+msgid "&Logontype:"
+msgstr "&Saiohaste-mota:"
+
+#: resources.h:618
+msgid "&Low"
+msgstr "&Apala"
+
+#: resources.h:563
+msgid "&Manage bookmarks..."
+msgstr "&Kudeatu lastermarkak..."
+
+#: resources.h:551
+msgid "&Manual transfer..."
+msgstr "&Eskuzko eskualdaketa..."
+
+#: resources.h:112
+msgid "&Maximum number of connections:"
+msgstr "Gehi&nezko elkarketa zenbatekoa:"
+
+#: resources.h:756
+msgid "&Maximum number of retries:"
+msgstr "&Gehinezko sarrera zenbatekoa:"
+
+#: resources.h:536
+msgid "&Message log"
+msgstr "&Mezu oharra"
+
+#: resources.h:893
+msgid "&Minimize to tray"
+msgstr "&Ikurtu erretilura"
+
+#: resources.h:409
+msgid "&Name:"
+msgstr "&Izena:"
+
+#: resources.h:520
+msgid "&Network configuration wizard..."
+msgstr "&Sare itxurapen laguntzailea..."
+
+#: resources.h:224
+msgid "&New"
+msgstr "&Berria"
+
+#: resources.h:80
+msgid "&New Site"
+msgstr "&Gune Berria"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1058
+msgid "&New version available!"
+msgstr "&Bertsio berri bat eskuragarri!"
+
+#: ../../locales/../src/interface/updatewizard.cpp:28
+msgid "&Next >"
+msgstr "&Hurrengoa >"
+
+#: resources.h:328
+msgid "&No"
+msgstr "&Ez"
+
+#: resources.h:789 resources.h:814
+msgid "&None"
+msgstr "&Ezer ez"
+
+#: resources.h:617
+msgid "&Normal"
+msgstr "&Arrunta"
+
+#: resources.h:154
+msgid "&Numeric value:"
+msgstr "&Zenbakizko balioa:"
+
+#: resources.h:122 resources.h:135 resources.h:427
+msgid "&OK"
+msgstr "&Ongi"
+
+#: resources.h:792
+msgid "&OPEN"
+msgstr "&IREKI"
+
+#: resources.h:579 resources.h:671
+msgid "&Open"
+msgstr "&Ireki"
+
+#: resources.h:66
+msgid "&Overwrite"
+msgstr "&Gainidatzi"
+
+#: resources.h:110
+msgid "&Passive"
+msgstr "&Pasiboa"
+
+#: resources.h:133
+msgid "&Password:"
+msgstr "&Sarhitza"
+
+#: resources.h:625
+msgid "&Play sound"
+msgstr "&Irakurri soinua"
+
+#: resources.h:88 resources.h:388 resources.h:742
+msgid "&Port:"
+msgstr "A&taka:"
+
+#: resources.h:886
+msgid "&Position of the message log:"
+msgstr "&Mezu oharraren kokapena:"
+
+#: resources.h:547
+msgid "&Preserve timestamps of transferred files"
+msgstr ""
+
+#: resources.h:310
+msgid "&Queue"
+msgstr "&Lerroa"
+
+#: resources.h:744
+msgid "&Quickconnect"
+msgstr "Elkarketa&-azkarra"
+
+#: resources.h:535
+msgid "&Quickconnect bar"
+msgstr "&Elkarketa-azkarra barra"
+
+#: resources.h:143
+msgid "&Read"
+msgstr "&Irakurri"
+
+#: resources.h:554
+msgid "&Reconnect"
+msgstr "&Berrelkarketatu"
+
+#: resources.h:525 resources.h:688
+msgid "&Refresh"
+msgstr "&Berritu"
+
+#: resources.h:134
+msgid "&Remember password for this session"
+msgstr "&Gogoratu sarhitzak saio honentzat"
+
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Gogoratu sarhitzak"
+
+#: resources.h:413 resources.h:419
+msgid "&Remote directory:"
+msgstr "&Hurruneko zuzenbidea:"
+
+#: resources.h:377
+msgid "&Remote path:"
+msgstr "H&urruneko helburua:"
+
+#: resources.h:851
+msgid "&Remove"
+msgstr "&Kendu"
+
+#: resources.h:809
+msgid "&Remove key"
+msgstr "&Kendu giltza"
+
+#: resources.h:612
+msgid "&Remove selected"
+msgstr "&Kendu hautaturikoa(k)"
+
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
+msgid "&Rename"
+msgstr "Be&rrizendatu"
+
+#: resources.h:210
+msgid "&Rename..."
+msgstr "&Berrizendatu..."
+
+#: resources.h:333
+msgid "&Reopen local file"
+msgstr "&Berrireki tokiko agiria"
+
+#: resources.h:842
+msgid "&Replace invalid characters with:"
+msgstr "&Ordeztu baliogabeko hizkiak honekin:"
+
+#: resources.h:570
+msgid "&Report a bug..."
+msgstr "&Jakinarazi akats bat..."
+
+#: resources.h:640
+msgid "&Reset and requeue all"
+msgstr "&Berrezarri eta lerrokatu denak"
+
+#: resources.h:737
+msgid "&Restart Wizard"
+msgstr "&Berrekin Laguntzailea"
+
+#: resources.h:70
+msgid "&Resume"
+msgstr "&Berrekin"
+
+#: resources.h:623
+#, fuzzy
+msgid "&Run command..."
+msgstr "&Sartu norbere agindua..."
+
+#: resources.h:751
+msgid "&Run configuration wizard now..."
+msgstr "&Ekin itxurapen laguntzailea orain..."
+
+#: resources.h:976
+msgid "&Run update check now..."
+msgstr "&Ekin eguneraketa egiaztapena orain..."
+
+#: resources.h:791
+msgid "&SITE"
+msgstr "G&UNEA"
+
+#: resources.h:816
+msgid "&SOCKS 5"
+msgstr "SO&CKS 5"
+
+#: resources.h:209
+msgid "&Save as..."
+msgstr "&Gorde honela..."
+
+#: resources.h:441
+msgid "&Search"
+msgstr "&Bilatu"
+
+#: resources.h:556
+msgid "&Search remote files..."
+msgstr "Bilatu &hurreneko agiriak..."
+
+#: resources.h:79
+msgid "&Select Entry:"
+msgstr "&Hautatu Sarrera:"
+
+#: resources.h:951
+msgid "&Select language:"
+msgstr "&Hautatu hizkuntza:"
+
+#: resources.h:365
+msgid "&Select the columns that should be displayed:"
+msgstr "&Hautatu erakutsi behar diren zutabeak:"
+
+#: resources.h:379 resources.h:552
+msgid "&Server"
+msgstr "&Zerbitzaria"
+
+#: resources.h:309
+msgid "&Settings"
+msgstr "&Ezarpenak"
+
+#: resources.h:522
+msgid "&Settings..."
+msgstr "&Ezarpenak..."
+
+#: resources.h:990
+msgid "&Show debug menu"
+msgstr "&Erakutsi garbiketa menua"
+
+#: resources.h:624
+msgid "&Show message"
+msgstr "&Erakutsi mezua"
+
+#: resources.h:980
+msgid "&Show timestamps in message log"
+msgstr "&Erakuktsi denbora-irarketak mezu oharrean"
+
+#: resources.h:507
+msgid "&Site Manager..."
+msgstr "&Gune Kudeatzailea..."
+
+#: resources.h:407
+msgid "&Site-specific bookmark"
+msgstr "G&une-bereizi lastermarka"
+
+#: resources.h:72
+msgid "&Skip"
+msgstr "&Jauzi"
+
+#: resources.h:550
+msgid "&Speed limits"
+msgstr "&Abiadura mugak"
+
+#: resources.h:458
+msgid "&Start transfer immediately"
+msgstr "&Hasi eskualdaketa berehala"
+
+#: resources.h:885
+msgid "&Swap local and remote panes"
+msgstr "Elkarraldatu tokiko eta hurruneko panelak"
+
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "&TLS Zifraketak"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:228
+msgid "&Test"
+msgstr "&Aztertu"
+
+#: resources.h:899
+msgid "&Theme:"
+msgstr "&Azalgaia:"
+
+#: resources.h:540
+msgid "&Transfer"
+msgstr "Es&kualdatu"
+
+#: resources.h:107
+msgid "&Transfer mode:"
+msgstr "&Eskualdaketa modua:"
+
+#: resources.h:539
+msgid "&Transfer queue"
+msgstr "Esk&ualdaketa lerroa"
+
+#: resources.h:854
+msgid "&Treat dotfiles as ASCII files"
+msgstr "T&ratatu dotagiriak ASCII agiri bezala"
+
+#: resources.h:339
+msgid "&Unedit"
+msgstr "&Deseditatu"
+
+#: resources.h:204
+msgid "&Update cached key for this host"
+msgstr "&Eguneratu hostalari honentzat katxeaturiko giltza"
+
+#: resources.h:573 resources.h:667
+msgid "&Upload"
+msgstr "&Igo"
+
+#: resources.h:276 resources.h:866
+msgid "&Uploads:"
+msgstr "&Igoerak:"
+
+#: resources.h:434
+msgid "&Use custom program"
+msgstr "&Erabili norbere programa"
+
+#: resources.h:102
+msgid "&Use synchronized browsing"
+msgstr "Era&bili bilaketa aldiberetua"
+
+#: resources.h:955
+msgid "&Use system's default editor for text files"
+msgstr "E&rabili sistemaren idazki agirietarako berezko editatzailea"
+
+#: resources.h:777
+msgid "&Use the following IP address:"
+msgstr "&Erabili hurrengo IP helbidea:"
+
+#: resources.h:785
+msgid "&Use the server's external IP address instead"
+msgstr "&Erabili zerbitzariaren kanpoko IP helbidea ordez"
+
+#: resources.h:922
+msgid "&Use thousands separator"
+msgstr "Erabili &milako banantzailea"
+
+#: resources.h:92 resources.h:132 resources.h:391
+msgid "&User:"
+msgstr "Era&biltzailea:"
+
+#: resources.h:740
+msgid "&Username:"
+msgstr "E&rabiltzaile-izena:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1054
+#, c-format
+msgid "&Version %s"
+msgstr "&Bertsioa %s"
+
+#: resources.h:524
+msgid "&View"
+msgstr "&Ikusi"
+
+#: resources.h:596
+msgid "&View/Edit"
+msgstr "&Ikusi/Editatu"
+
+#: resources.h:961
+msgid "&Watch locally edited files and prompt to upload modifications"
+msgstr "&Ikusi tokian editaturiko agiriak eta galdetu aldaketak igotzeko"
+
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "Eguneraketak egiaztatzerakoan, egiaztatu hau:"
+
+#: resources.h:144
+msgid "&Write"
+msgstr "&Idatzi"
+
+#: resources.h:327
+msgid "&Yes"
+msgstr "&Bai"
+
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
+#, c-format
+msgid "'%s' does not exist or cannot be accessed."
+msgstr "'%s' ez dago edo ez dago sarbiderik."
+
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
+msgid "'%s' is not a directory."
+msgstr "'%s' ez da zuzenbide bat."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+msgid "'Account' logontype not supported by selected protocol"
+msgstr "'Kontua' saiohaste-mota ez dago eskuragarri hautaturiko protokolorako."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"'Arrunta' eta 'Kontua' saiohaste-motak ez daude eskuragarri. 'Galdetu "
+"sarhitza' erabiltzen ordez."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+"'Arrunta' eta 'Kontua' saiohaste-motak ez daude eskuragarri. Zure sarrera "
+"'Galdetu sarhitza'-ra aldatu da."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
+msgid ""
+"'quote' is usually a local command used by commandline clients to send the "
+"arguments following 'quote' to the server. You might want to enter the raw "
+"command without the leading 'quote'."
+msgstr ""
+"'aipamena' arrunt agindulerro bezeroek zerbitzariari argumentoak 'aipamea'-z "
+"jarraiturik bidaltzeko erabiltzen duten tokiko agindu bat da. Badaiteke zuk "
+"idazki agindua sartu nahi izatea 'aipamen' buru gabe."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:96
+#: ../../locales/../src/interface/filelist_statusbar.cpp:105
+#, c-format
+msgid "(%d object filtered)"
+msgid_plural "(%d objects filtered)"
+msgstr[0] "(%d objetu iragazita)"
+msgstr[1] "(%d objetu iragazita)"
+
+#: resources.h:826 resources.h:828
+msgid "(0 for no limit)"
+msgstr "(0 mugagabe)"
+
+#: resources.h:757
+msgid "(0-99)"
+msgstr "(0-99)"
+
+#: resources.h:759
+msgid "(0-999 seconds)"
+msgstr "(0-999 segundu)"
+
+#: resources.h:824
+msgid "(1-10)"
+msgstr "(1-10)"
+
+#: resources.h:753
+msgid "(5-9999, 0 to disable)"
+msgstr "(5-9999, 0 ezgaitzeko)"
+
+#: resources.h:915
+msgid "(example: %H:%M)"
+msgstr "(adibidea: %H:%M)"
+
+#: resources.h:909
+msgid "(example: %Y-%m-%d)"
+msgstr "(adibidea: %Y-%m-%d)"
+
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
+#, c-format
+msgid "(in %s/s)"
+msgstr "(honela %s/s)"
+
+#: ../../locales/../src/interface/updatewizard.cpp:910
+msgid ", %H:%M:%S left"
+msgstr ", %H:%M:%S gelditzen da"
+
+#: ../../locales/../src/interface/updatewizard.cpp:914
+msgid ", --:--:-- left"
+msgstr ", --:--:-- gelditzen da"
+
+#: resources.h:725
+msgid "-"
+msgstr "-"
+
+#: resources.h:257
+msgid "- Broken router and/or firewall"
+msgstr "- Bideratzailea eta/edo suhesia hautsita"
+
+#: resources.h:258
+msgid "- File corrupted on mirror"
+msgstr "- Agiri hondatua ispiluan"
+
+#: resources.h:256
+msgid "- Malware on your system"
+msgstr "- Malwarea zure sisteman"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
+msgid "--:--:-- left"
+msgstr "--:--:-- gelditzen da"
+
+#: ../../locales/../src/interface/cmdline.cpp:83
+msgid "-c cannot be used together with an FTP URL."
+msgstr "-c ezin da FTP URL batekin batera erabili."
+
+#: ../../locales/../src/interface/cmdline.cpp:92
+msgid "-l can only be used together with an FTP URL."
+msgstr "-l FTP URL batekin batera bakarrik erabili daiteke."
+
+#: ../../locales/../src/interface/cmdline.cpp:71
+msgid "-s and -c cannot be present at the same time."
+msgstr "-s eta -c ezin dira aldiberean egon"
+
+#: ../../locales/../src/interface/cmdline.cpp:77
+msgid "-s cannot be used together with an FTP URL."
+msgstr "-s ezin da FTP URL batekin batera erabili."
+
+#: resources.h:992
+msgid "0 - None"
+msgstr "0 - Ezer ez"
+
+#: resources.h:993
+msgid "1 - Warning"
+msgstr "1 - Oharrak"
+
+#: resources.h:994
+msgid "2 - Info"
+msgstr "2 - Argibideak"
+
+#: resources.h:995
+msgid "3 - Verbose"
+msgstr "3 - Berritsua"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:152
+msgid "32 bit system"
+msgstr "32 biteko sistema"
+
+#: resources.h:996
+msgid "4 - Debug"
+msgstr "4 - Garbiketa"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:150
+msgid "64 bit system"
+msgstr "64 biteko sistema"
+
+#: ../../locales/../src/interface/updatewizard.cpp:29
+msgid "< &Back"
+msgstr "< &Atzera"
+
+#: resources.h:564
+msgid "?"
+msgstr "?"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+msgid ""
+"A bookmark with the entered name already exists. Please enter an unused name."
+msgstr ""
+"Jadanik badago sartutako izena duen lastermarka bat. Mesedez sartu erabili "
+"gabeko izen bat"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
+msgid "A default editor needs to be set."
+msgstr "Berezko editatzaile bat ezerri beharra dago."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
+msgid "A directory cannot be dragged into one of its subdirectories."
+msgstr "Zuzenbide bat ezin da bere azpizuzenbideetako batera arrastatu."
+
+#: resources.h:697
+msgid ""
+"A few servers don't allow passive mode or are misconfigured. In such cases "
+"you would have to use active mode. In active mode, FileZilla opens a port "
+"and asks the server to connect to it."
+msgstr ""
+"Zerbitzari gutxi batzuek ez dute modu pasiboa ahalbidetzen edo desitxuratuta "
+"daude. Horrelakoetan modu aktiboa erabili behar duzu. Modu aktiboan, "
+"FileZillak ataka bat ireki eta zerbitzariari galdetzen dio berarekin "
+"elkarketatzeko."
+
+#: resources.h:315
+msgid "A file previously opened has been changed."
+msgstr "Aurretik irekitako agiri bat aldatua izan da."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#, c-format
+msgid ""
+"A file with that name is already being edited. Do you want to reopen '%s'?"
+msgstr ""
+"Jadanik badago izen horrekin editatzen ari den agiri bat. '%s' berrirekitzea "
+"nahi duzu?"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
+msgid "A file with that name is already being transferred."
+msgstr "Izen hori duen agiri batek jadanik hasita du eskualdaketa."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
+msgid ""
+"A file with that name is still being edited. Please close it and try again."
+msgstr ""
+"Oraindik izen horrekin editatzen ari den agiri bat dago. Mesedez itxi eta "
+"saiatu berriro."
+
+#: ../../locales/../src/interface/FileZilla.cpp:690
+msgid ""
+"A local filename could not be decoded.\n"
+"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
+"correctly.\n"
+"Unless you fix this problem, files might be missing in the file listings.\n"
+"No further warning will be displayed this session."
+msgstr ""
+"Tokiko agirizen bat ezin da dekodeatu.\n"
+"Mesedez zihurtatu LC_CTYPE (edo LC_ALL) inguru aldaera zuzen ezarrita "
+"dagoela.\n"
+"Arazo hau zuzentzen ez baduzu, agiriak galdu egin daitezke agiri "
+"zerrendapenetatik.\n"
+"Ez da ohar gehiago erakutsiko saio honetan."
+
+#: resources.h:246
+msgid "A newer version of FileZilla is available:"
+msgstr "FileZilla bertsio berri bat eskuragarri dago:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:681
+msgid ""
+"A proper server always shows all files, but some broken servers hide files "
+"from the user. Use this option to force the server to show all files."
+msgstr ""
+"Zerbitzari egoki batek betik erakusten ditu agiri guztiak, baina zenbait "
+"zerbitzari hautsik erabiltzaile agiriak ezkutatzen dituzte. Erabili aukera "
+"hau zerbitzaria agiri guztiak erakustera behartzeko."
+
+#: resources.h:769
+msgid ""
+"A proper server does not require this. Contact the server administrator if "
+"you need this."
+msgstr ""
+"Zerbitzari egoki batek ez du hau behar. Jarri harremanetan zerbitzari "
+"administratzailearekin hau behar baduzu."
+
+#: ../../locales/../src/interface/state.cpp:284
+msgid ""
+"A remote operation is in progress and synchronized browsing is enabled.\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+"Hurruneko eragiketa garatzen ari da eta bilaketa aldiberetua gaituta dago.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu tokiko zuzenbidea aldatzen?"
+
+#: resources.h:545 resources.h:681 resources.h:846
+msgid "A&SCII"
+msgstr "&ASCII"
+
+#: resources.h:850
+msgid "A&dd"
+msgstr "&Gehitu"
+
+#: resources.h:877
+msgid "A&llow resume of ASCII files"
+msgstr "&Ahalbidetu ASCII agirien berrekitea"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
+msgid "A&pply only to downloads"
+msgstr "Ezarri &jeisketei bakarrik"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
+msgid "A&pply only to uploads"
+msgstr "Ezarri &igoerei bakarrik"
+
+#: resources.h:157
+msgid "A&pply to all files and directories"
+msgstr "Ezarri &agiri eta zuzenbide guztiei."
+
+#: resources.h:647
+msgid "A&utomatically remove successful transfers"
+msgstr "&Berezgaitasunekz kendu ongi buruturiko eskualdaketak"
+
+#: resources.h:398
+msgid "ASCII"
+msgstr "ASCII"
+
+#: resources.h:488
+msgid "Abort previous connection and connect in current tab"
+msgstr "Utzi aurreko elkarketa eta elkarketatu oraingo hegatsean"
+
+#: resources.h:162
+msgid "About FileZilla"
+msgstr "FileZilla-ri buruz"
+
+#: resources.h:887
+msgid "Above the file lists"
+msgstr "Agiri zerrenden gainean"
+
+#: ../../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:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
+msgid "Account"
+msgstr "Kontua"
+
+#: resources.h:620
+msgid "Action after queue &completion"
+msgstr "&Lerroa osatu ondorengo ekintza"
+
+#: resources.h:338
+msgid "Action on selected file:"
+msgstr "Ekintza hautaturiko agirian:"
+
+#: resources.h:332
+msgid "Action to perform:"
+msgstr "Egiteko ekintza:"
+
+#: resources.h:65
+msgid "Action:"
+msgstr "Ekintza:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:118
+msgid "Active mode"
+msgstr "Modu aktiboa"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:605
+msgid ""
+"Active mode FTP test failed. FileZilla does not know the correct external IP "
+"address."
+msgstr ""
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak ez du kanpoko IP helbide "
+"zuzena ezagutzen."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:592
+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 ""
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak ez du kanpoko IP helbide "
+"zuzena ezagutzen. Gainera, zure bideratzaileak bidalitako helbidea aldatu du."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:580
+msgid ""
+"Active mode FTP test failed. FileZilla knows the correct external IP "
+"address, but your router or firewall has misleadingly modified the sent "
+"address."
+msgstr ""
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak kanpoko IP helbide zuzena "
+"ezagutzen du, baina zure bideratzaileak edo suhesiak bidalitako helbidea "
+"gaizkiulertuz aldatu du."
+
+#: resources.h:782
+msgid "Active mode IP"
+msgstr "Modu aktibo IP-a"
+
+#: resources.h:459
+msgid "Add files to &queue only"
+msgstr "&Gehitu agiriak lerrora bakarrik"
+
+#: resources.h:651 resources.h:670
+msgid "Add selected directory to the transfer queue"
+msgstr "Gehitu hautaturiko zuzenbidea eskualdaketa lerrora"
+
+#: resources.h:576 resources.h:593
+msgid "Add selected files and folders to the transfer queue"
+msgstr "Gehitu hautaturiko agiriak eta agiritegiak eskualdaketa lerrora"
+
+#: resources.h:942 resources.h:948
+msgid "Add to queue"
+msgstr "Gehitu lerrora"
+
+#: ../../locales/../src/engine/proxy.cpp:451
+msgid "Address type not supported"
+msgstr "Helbide mota ez dago sostengaturik"
+
+#: resources.h:96
+msgid "Advanced"
+msgstr "Aurreratua"
+
+#: resources.h:243
+msgid "Advanced options:"
+msgstr "Aukera aurreratuak:"
+
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Oharra: Ezaugarri berriak aztertzea nahi ez badituzu, mesedez jarraitu "
+"bertsio egonkorrak bakarrik erabiltzen. Beta bertsioak eta gau eraiketak "
+"azterketa asmoetarako garapen bertsioak dira. FileZilla-ren gau bertsioek "
+"badaiteke itxaron bezala lan egitea eta zure sistema kaltetu dezakete. "
+"Erabili beta bertsioak eta gau eraiketak zeure arriskupean."
+
+#: resources.h:347
+msgid "Algorithm:"
+msgstr "Algoritmoa:"
+
+#: ../../locales/../src/interface/QueueView.cpp:3143
+msgid "All files have been successfully transferred"
+msgstr "Agiri guztiak ongi eskualdatu dira"
+
+#: resources.h:726
+msgid "All ports in the given range have to be between 1024 and 65535."
+msgstr "Emaniko ataka guztiak 1024 eta 65535 arteko mailan egon behar dira."
+
+#: ../../locales/../src/interface/QueueView.cpp:3139
+#, c-format
+msgid "All transfers have finished. %d file could not be transferred."
+msgid_plural "All transfers have finished. %d files could not be transferred."
+msgstr[0] "Eskualdaketa denak amaitu dira. %d agiri ezin izan dira eskualdatu."
+msgstr[1] "Eskualdaketa denak amaitu dira. %d agiri ezin izan dira eskualdatu."
+
+#: resources.h:765
+msgid "Allow &fall back to other transfer mode on failure"
+msgstr "A&halbidetu beste eskualdaketa modu batera itzultzea hutsegitean"
+
+#: resources.h:701
+msgid "Allow fallback to other transfer mode on failure"
+msgstr "Ahalbidetu beste eskualdaketa modu batera itzultzea hutsegitean"
+
+#: resources.h:485
+msgid "Already connected"
+msgstr "Jadanik elkarketaturik"
+
+#: resources.h:810
+msgid ""
+"Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
+"FileZilla does recognize Pageant."
+msgstr ""
+"Aukeran Pageant tresna erabili dezakezu PuTTY-tik zure giltzak kudeatzeko, "
+"FileZillak ez du Pageant ezagutzen."
+
+#: resources.h:811
+msgid ""
+"Alternatively you can use your system's SSH agent. To do so, make sure the "
+"SSH_AUTH_SOCK environment variable is set."
+msgstr ""
+"Aukeran zure sistemaren SSH agentea erabili dezakezu. Hori egiteko, "
+"zihurtatu SSH_AUTH_SOCK inguru aldaera ezarrita dagoela."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1118
+msgid ""
+"Alternatively, visit http://filezilla-project.org to download the most "
+"recent version."
+msgstr "Aukeran, ikusi http://filezilla-project.org bertsio berriena jeisteko."
+
+#: ../../locales/../src/interface/QueueView.cpp:2055
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+"Akats bat gertatu da \"%s\"-tik eskualdaketa lerroa gertatzerakoan.\n"
+"Lerroko zenbait gai badaiteke ez leheneratzea."
+
+#: ../../locales/../src/interface/QueueView.cpp:1954
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"Akats bat gertatu da \"%s\"-tik eskualdaketa lerroa gordetzerakoan.\n"
+"Lerroko zenbait gai badaiteke ez gordetzea."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
+msgid ""
+"An item with the same name as the dragged item already exists at the target "
+"location."
+msgstr ""
+"Jadanik badago arrastaturiko gaiaren izen bera duen gai bat xede kokalekuan."
+
+#: ../../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:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
+msgid "Anonymous"
+msgstr "Izengabea"
+
+#: ../../locales/../src/interface/state.cpp:1095
+msgid ""
+"Another remote operation is already in progress, cannot change directory now."
+msgstr ""
+"Beste hurruneko eragiketa bat jadanik garatzen ari da, ezinezkoa zuzenbidea "
+"orain aldatzea."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
+msgid "Any changes made in the Site Manager could not be saved."
+msgstr "Gune Kudeatzailean egindako aldaketak ezin dira gorde."
+
+#: ../../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 ""
+"Gune Kudeatzailea egindako aldaketak ez dira gordeko agiria konpondu arte."
+
+#: ../../locales/../src/interface/filter.cpp:209
+msgid "Any changes made to the filters could not be saved."
+msgstr "Iragazkiek egindako aldaketak ezin dira gorde."
+
+#: ../../locales/../src/interface/filter.cpp:1033
+msgid "Any changes made to the filters will not be saved."
+msgstr "Iragazkiek egindako aldaketak ez dira gordeko."
+
+#: resources.h:159
+msgid "App&ly to directories only"
+msgstr "Ezarri &zuzenbideei bakarrik"
+
+#: resources.h:222
+msgid "Apply"
+msgstr "Ezarri"
+
+#: resources.h:74
+msgid "Apply to &current queue only"
+msgstr "Ezarri &oraingo lerroari bakarrik"
+
+#: resources.h:158
+msgid "Apply to &files only"
+msgstr "Ezarri a&giriei bakarrik"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
+msgid "Archive"
+msgstr "Agiritegia"
+
+#: resources.h:889
+msgid "As tab in the transfer queue pane"
+msgstr "Hegats bezala eskualdaketa lerro panelean"
+
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
+msgid "Ask for action"
+msgstr "Galdetu ekintza"
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:188
+msgid "Ask for password"
+msgstr "Galdetu sarhitza"
+
+#: resources.h:722
+msgid "Ask operating system for a port."
+msgstr "Galdetu sistema eragileari ataka."
+
+#: resources.h:712
+msgid "Ask your operating system for the external IP address"
+msgstr "Galdetu sistema eragileari kanpoko IP helbidea"
+
+#: resources.h:480
+msgid "Asking questions in the FileZilla forums"
+msgstr "Galderen erantzunak FileZilla eztabaidaguneetan"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
+msgid "Associated program not found:"
+msgstr "Elkarturiko programa ez da aurkitu:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
+msgid "At least one filter condition is incomplete"
+msgstr "Gutxinez iragazki baldintza bat osatugabea da"
+
+#: resources.h:731
+msgid "At this point, all required information has been gathered."
+msgstr "Puntu honetan, beharrezko argibide guztiak lortuak daude."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
+msgid "Attribute"
+msgstr "Ezaugarria"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
+msgid "Authentication failed."
+msgstr "Egiaztapen hutsegitea."
+
+#: resources.h:900
+msgid "Author:"
+msgstr "Egilea:"
+
+#: resources.h:395
+msgid "Auto"
+msgstr "Berez"
+
+#: resources.h:848
+msgid "Automatic file type classification"
+msgstr "Berezgaitasunezko agiri mota sailkapena"
+
+#: resources.h:904
+msgid "Available sizes"
+msgstr "Neurri eskuragarriak"
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
+msgid "B <Unit symbol for bytes. Only translate first letter>"
+msgstr "B <Byte unintate sinboloas. Itzuli lehen hizkia bakarrik>"
+
+#: resources.h:98
+msgid "B&ypass proxy"
+msgstr "Proxytik igarogabe"
+
+#: resources.h:476
+msgid "Basic usage instructions"
+msgstr "Ohinarrizko erabilpen jarraipideak"
+
+#: resources.h:891
+msgid "Behaviour"
+msgstr "Jokabidea"
+
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
+msgid "Being edited"
+msgstr "Editatzerakoan"
+
+#: resources.h:634
+msgid "Benchmark string coalescer"
+msgstr "Benchmark kate coalescer"
+
+#: ../../locales/../src/engine/tlssocket.cpp:951
+msgid "Beware! Certificate has been revoked"
+msgstr "Kontuz! Egiaztagiria ukatua izan da"
+
+#: resources.h:399
+msgid "Binary"
+msgstr "Binarioa"
+
+#: resources.h:884
+msgid "Blackboard"
+msgstr "Panelbeltza"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
+msgid "Bookmark"
+msgstr "Lastermarka"
+
+#: resources.h:422
+msgid "Bookmark:"
+msgstr "Lastermarka:"
+
+#: resources.h:421
+msgid "Bookmarks"
+msgstr "Lastermarkak"
+
+#: resources.h:170
+msgid "Build date:"
+msgstr "Eraiketa eguna:"
+
+#: resources.h:167
+msgid "Build information"
+msgstr "Eraiketa argibideak"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
+msgid "Business category:"
+msgstr "Negozio Kategoria:"
+
+#: resources.h:772
+msgid ""
+"By default uses any available local port to establish transfers in active "
+"mode. If you want to limit FileZilla to use only a small range of ports, "
+"please enter the port range below."
+msgstr ""
+"Berez tokiko edozein ataka eskuragarri erabiltzen du eskualdaketak modu "
+"aktiboan ezartzeko. FileZilla ataka maila txiki bat erabiltzera mugatzea "
+"nahi baduzu, mesedez sartu ataka maila behean."
+
+#: resources.h:553
+msgid "C&ancel current operation"
+msgstr "E&zeztatu oraingo eragiketa"
+
+#: resources.h:245
+msgid "C&heck for nightly builds of FileZilla"
+msgstr "Egiaztatu FileZilla &gau eraiketarik dagoen"
+
+#: resources.h:631
+msgid "C&lear all"
+msgstr "&Garbitu denak"
+
+#: resources.h:606 resources.h:658
+msgid "C&opy URL(s) to clipboard"
+msgstr "K&opiatu URL-a(k) gakora"
+
+#: resources.h:908
+msgid "C&ustom"
+msgstr "Egile&a"
+
+#: resources.h:963
+msgid "C&ustom filetype associations:"
+msgstr "&Norbere agirimota elkarketak:"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
+msgid "Calculating timezone offset of server..."
+msgstr "Zerbitzariaren ordu-eremu oreka kalkulatzen..."
+
+#: ../../locales/../src/engine/transfersocket.cpp:734
+msgid "Can't read from file"
+msgstr "Ezin da irakurri agiritik"
+
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
+msgid "Can't write data to file."
+msgstr "Ezin dira datuak agirira idatzi."
+
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
+#, c-format
+msgid "Can't write data to file: %s"
+msgstr "Ezinezkoa datuak agirira idaztea: %s"
+
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
+msgid "Cancel"
+msgstr "Ezeztatu"
+
+#: resources.h:1015
+msgid "Cancel current operation"
+msgstr "Ezeztatu oraingo eragiketa"
+
+#: resources.h:1016
+msgid "Cancels the current operation"
+msgstr "Oraingo eragiketa ezeztatzen du"
+
+#: ../../locales/../src/engine/local_path.cpp:471
+#, c-format
+msgid "Cannot access '%s', no media inserted or drive not ready."
+msgstr ""
+"Ez dago '%s'-rako sarbiderik , ez da multimediarik txertatu edo gidagailua "
+"ez dago gertu."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:568
+msgid "Cannot add server to Site Manager"
+msgstr "Ezinezkoa zerbitzaria Gune Kudeatzailera gehitzea"
+
+#: ../../locales/../src/interface/context_control.cpp:348
+msgid ""
+"Cannot close tab while busy.\n"
+"Cancel current operation and close tab?"
+msgstr ""
+"Ezinezkoa hegatsa istea lanpetuta dagoela.\n"
+"Ezeztatu oraingo eragiketa eta itxi hegatsa?"
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+msgid ""
+"Cannot compare directories, different filters for local and remote "
+"directories are enabled"
+msgstr ""
+"Ezinezkoa zuzenbideak alderatzea, tokiko eta hurruneko zuzenbide iragazki "
+"ezberdinak daude gaituta"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
+msgid "Cannot compare directories, not connected to a server."
+msgstr ""
+"Ezinezkoa zuzenbideak alderatzea, ez dago inongo zerbitzarira elkarketaturik"
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "Cannot create new filter"
+msgstr "Ezinezkoa iragazki berri bat sortzea"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
+msgid "Cannot edit file"
+msgstr "Ezin da agiria editatu"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+msgid "Cannot edit file, not connected to any server."
+msgstr "Ezinezkoa agiria editatzea, ez dago inongo zerbitzira elkarketaturik."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1967
+msgid "Cannot edit file, remote path unknown."
+msgstr "Ezinezkoa agiria editatzea, hurruneko helburu ezezaguna."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
+msgid ""
+"Cannot establish FTP connection to an SFTP server. Please select proper "
+"protocol."
+msgstr ""
+"Ezin da FTP elkarketa ezarri SFTP zerbitzari batera. Mesedez hautatu "
+"protokolo egokia."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
+msgid "Cannot load Quickconnect bar from resource file"
+msgstr "Ezinezkoa Elkarketa-azkarra barra gertatzea baliabide agiritik"
+
+#: ../../locales/../src/interface/import.cpp:38
+msgid "Cannot load file, not a valid XML file."
+msgstr "Ezinezkoa agiria gertatzea, ez da XML agiri baliozko bat."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Cannot load keyfile"
+msgstr "Ezinezkoa giltzagiria gertatzea"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
+msgid "Cannot load toolbar from resource file"
+msgstr "Ezinezkoa tresnabarra baliabide agiritik gertatzea"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Ezinezkoa sarhitza gogoratzea"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
+msgid "Cannot rename entry"
+msgstr "Ezinezkoa sarrera berrizendatzea"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
+msgid "Cannot rename file"
+msgstr "Ezinezkoa agiria berrizendatzea"
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "Cannot save filterset"
+msgstr "Ezinezkoa iragazki-ezarpena gordetzea"
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Cannot select filter"
+msgstr "Ezinezkoa iragazkia hautatzea"
+
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
+msgid "Cannot set file association"
+msgstr "Ezinezkoa agiri elkarketa ezartzea"
+
+#: ../../locales/../src/interface/edithandler.cpp:1227
+msgid "Cannot show dialog"
+msgstr "Ezinezkoa elkarrizketa erakustea"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
+msgid "Cannot view/edit selected file"
+msgstr "Ezinezkoa hautaturiko agiria ikustea/editatzea"
+
+#: resources.h:292
+msgid "Categories"
+msgstr "Kategoriak"
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Certificate and session data are not available yet."
+msgstr "Egiaztagiria eta saio datuak ez daude eskuragarri oraindik."
+
+#: resources.h:30
+msgid "Certificate details"
+msgstr "Egiaztagiri xehetasunak"
+
+#: resources.h:3 resources.h:31
+msgid "Certificate in chain:"
+msgstr "Egiaztagiria kateetan:"
+
+#: resources.h:13 resources.h:41
+msgid "Certificate issuer"
+msgstr "Egiaztagiri jaulkitzailea"
+
+#: resources.h:131
+msgid "Challenge:"
+msgstr "Erronka:"
+
+#: resources.h:140
+msgid "Change file attributes"
+msgstr "Aldatu agiri ezaugarriak"
+
+#: resources.h:609 resources.h:661
+msgid "Change the file permissions."
+msgstr "Aldatu agiri baimenak."
+
+#: resources.h:988
+msgid "Changing logfile settings requires restart of FileZilla."
+msgstr ""
+"Ohar-agiri ezarpenen aldaketak FileZillaren berrabiaraztea eskatzen du."
+
+#: ../../locales/../src/interface/FileZilla.cpp:690
+msgid "Character encoding issue"
+msgstr "Hizki-kode akatsa"
+
+#: resources.h:113
+msgid "Charset"
+msgstr "Hizkikodea"
+
+#: resources.h:566
+msgid "Check for &updates..."
+msgstr "&Egiaztatu eguneraketak..."
+
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Egiaztatu File&Zilla eguneraketa berezgaitasunez:"
+
+#: resources.h:567
+msgid "Check for newer versions of FileZilla"
+msgstr "Egiaztatu FileZilla bertsio berririk dagoen"
+
+#: ../../locales/../src/interface/updatewizard.cpp:171
+msgid "Check for updates"
+msgstr "Egiztatu eguneraketarik dagoen"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
+msgid "Check for updates failed"
+msgstr "Hutsegitea eguneraketarik dagoen egiaztatzean"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:765
+msgid "Checking for correct external IP address"
+msgstr "Egiaztatu kanpoko IP helbidea zuzena den"
+
+#: resources.h:241
+msgid "Checking for updates"
+msgstr "Eguneraketa egiaztapena"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1261
+msgid "Checksum mismatch of downloaded file."
+msgstr "Checksum ez dator bat jeitsitako agiriarekin."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
+msgid "Choose the default local directory"
+msgstr "Hautatu berezko tokiko zuzenbidea"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
+msgid "Choose the local directory"
+msgstr "Hautatu tokiko zuzenbidea"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+msgid "Chunk data improperly terminated"
+msgstr "Chunk datua ezegoki amaituta"
+
+#: resources.h:22 resources.h:50
+msgid "Cipher:"
+msgstr "Zifraketa:"
+
+#: resources.h:512 resources.h:686
+msgid "Cl&ose tab"
+msgstr "It&xi hegatsa"
+
+#: resources.h:881
+msgid "Classic"
+msgstr "Klasikoa"
+
+#: resources.h:295
+msgid "Clear &Site Manager entries"
+msgstr "Garbitu &Gune Kudeatzaile sarrerak"
+
+#: resources.h:632
+msgid "Clear &layout cache"
+msgstr "Garbitu &antolakuntza katxea"
+
+#: resources.h:293
+msgid "Clear &quickconnect history"
+msgstr "Garbitu elkarketa-azkarra &historia"
+
+#: resources.h:294
+msgid "Clear &reconnect information"
+msgstr "Garbitu &berrelkarketa argibideak"
+
+#: resources.h:296
+msgid "Clear &transfer queue"
+msgstr "Garbitu &eskualdaketa lerroa"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
+msgid "Clear history"
+msgstr "Garbitu historia"
+
+#: resources.h:290 ../../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 "Garbitu datu pribatuak"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
+msgid "Clear quickconnect bar"
+msgstr "Garbitu elkarketa-azkarra barra"
+
+#: resources.h:633
+msgid "Clear string coalescer"
+msgstr "Garbitu kate coalescer"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:571
+msgid "Click on Finish to save your configuration."
+msgstr "Klikatu Amaitu zure itxurapena gordetzeako."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1117
+msgid "Click on next to download the new version."
+msgstr "Klikatu hurrengoa bertsio berria jeisteko."
+
+#: resources.h:356
+msgid "Client to server MAC:"
+msgstr "Bezerotik zerbitzarira MAC-a:"
+
+#: resources.h:354
+msgid "Client to server cipher:"
+msgstr "Bezeroa zerbitzari zifraketara:"
+
+#: resources.h:687
+msgid "Close &all other tabs"
+msgstr "It&xi beste hegats guztiak"
+
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
+msgid "Close FileZilla"
+msgstr "Itxi FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:14
+msgid "Close all running instances of FileZilla"
+msgstr "Itxi ekinean dauden FileZilla eskabide guztiak"
+
+#: resources.h:513
+msgid "Closes current tab"
+msgstr "Oraingo hegatsa isten du"
+
+#: resources.h:95
+msgid "Co&mments:"
+msgstr "Ai&pamenak:"
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "Column properties"
+msgstr "Zutabe ezaugarriak"
+
+#: resources.h:363
+msgid "Column setup"
+msgstr "Zutabe ezarpena"
+
+#: resources.h:958
+msgid "Command and its arguments should be properly quoted."
+msgstr "Aginduak eta bere argumentoak egoki aipatuak izan behar dira."
+
+#: ../../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
+msgid "Command failed"
+msgstr "Agindu hutsegitea"
+
+#: ../../locales/../src/engine/proxy.cpp:448
+msgid "Command not supported"
+msgstr "Agindua ez dago sostengatua"
+
+#: ../../locales/../src/engine/engineprivate.cpp:183
+msgid "Command not supported by this protocol"
+msgstr "Agindua ez dago sostengaturik protokolo honetan"
+
+#: ../../locales/../src/engine/logging.cpp:214
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
+msgid "Command:"
+msgstr "Agindua:"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
+msgid "Comment"
+msgstr "Aipamena"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
+msgid "Common name:"
+msgstr "Izen arrunta:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:426
+#: ../../locales/../src/interface/netconfwizard.cpp:441
+msgid "Communication tainted by router or firewall"
+msgstr "Hartuemana bideratzaileak edo suhesiak kutsatuta"
+
+#: resources.h:530 resources.h:665
+msgid "Compare &modification time"
+msgstr "&Alderatu aldaketa eguna"
+
+#: resources.h:529 resources.h:664
+msgid "Compare file&size"
+msgstr "Alderatu agiri-&neurria"
+
+#: resources.h:938
+msgid "Comparison &threshold (in minutes):"
+msgstr "&Alderaketa muga (minututan)"
+
+#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
+msgid "Comparison threshold needs to be between 0 and 1440 minutes."
+msgstr "Alderaketa muga 0 eta 1440 minutu artean egon behar da."
+
+#: resources.h:168
+msgid "Compiled for:"
+msgstr "Biltzailea:"
+
+#: resources.h:169
+msgid "Compiled on:"
+msgstr "Bilduta:"
+
+#: resources.h:171
+msgid "Compiled with:"
+msgstr "Honekin bilduta:"
+
+#: resources.h:172
+msgid "Compiler flags:"
+msgstr "Biltzaile ikurrak:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+msgid "Compressed"
+msgstr "Konprimituta"
+
+#: resources.h:822
+msgid "Concurrent transfers"
+msgstr "Aldibereko eskualdaketak"
+
+#: resources.h:233 resources.h:447
+msgid "Conditions are c&ase sensitive"
+msgstr "Baldintzek hizki &xehe-larriak bereizten dituzte"
+
+#: resources.h:730
+msgid "Configuration test"
+msgstr "Itxurapen azterketa"
+
+#: resources.h:704
+msgid "Configure passive mode"
+msgstr "Itxuratu modu pasiboa"
+
+#: resources.h:720
+msgid "Configure port range"
+msgstr "Itxuratu ataka maila"
+
+#: resources.h:477
+msgid "Configuring FileZilla and your network"
+msgstr "FileZilla eta zure sarearen itxurapena"
+
+#: ../../locales/../src/interface/search.cpp:1034
+msgid "Confirm deletion"
+msgstr "Baieztatu ezabapena"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Confirmation needed"
+msgstr "Baieztapena beharrezkoa"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:567
+msgid "Congratulations, your configuration seems to be working."
+msgstr "Zorionak, zure itxurapenak ongi lan egiten duela dirudi."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
+msgid "Connect bypassing proxy settings"
+msgstr "Elkarketatu proxy ezarpenetatik igarogabe"
+
+#: ../../locales/../src/interface/cmdline.cpp:8
+msgid "Connect to specified Site Manager site"
+msgstr "Elkarketatu adierazitako Gune Kudeatzaile gunera"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
+msgid "Connected"
+msgstr "Elkarketaturik"
+
+#: ../../locales/../src/interface/QueueView.cpp:1458
+msgid "Connecting"
+msgstr "Elkarketatzen"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:207
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
+#, fuzzy, c-format
+msgid "Connecting to %s"
+msgstr "%s-ra elkarketatzen..."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
+#, c-format
+msgid "Connecting to %s through proxy"
+msgstr "%s-ra elkarketatzen proxyan zehar"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
+#: ../../locales/../src/engine/proxy.cpp:172
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
+#, c-format
+msgid "Connecting to %s..."
+msgstr "%s-ra elkarketatzen..."
+
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
+msgid "Connecting to server"
+msgstr "Zerbitzariarekin elkarketatzen"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:116
+msgid "Connection"
+msgstr "Elkarketa"
+
+#: ../../locales/../src/interface/QueueView.cpp:1074
+msgid "Connection attempt failed"
+msgstr "Elkarketa saiakera hutsegitea"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
+#: ../../locales/../src/engine/proxy.cpp:176
+#, c-format
+msgid "Connection attempt failed with \"%s\", trying next address."
+msgstr "Elkarketa saiakera hutsegitea \"%s\", hurrengo helbidearekin saiatzen."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
+#, c-format
+msgid "Connection attempt failed with \"%s\"."
+msgstr "Elkarketa saiakera hutsegitea \"%s\"."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:186
+#: ../../locales/../src/engine/engineprivate.cpp:320
+msgid "Connection attempt interrupted by user"
+msgstr "Erabiltzaileak elkarketa saiakera eten du"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:543
+msgid "Connection closed"
+msgstr "Elkarketa itxita"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
+msgid "Connection closed by server"
+msgstr "Zerbitzariak elkarketa itxi du"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:305
+msgid "Connection established, initializing TLS..."
+msgstr "Elkarketa ezarrita, TLS abiarazten..."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:340
+msgid "Connection established, sending HTTP request"
+msgstr "Elkarketa ezarrita, HTTP eskabidea bildatzen"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
+msgid "Connection established, waiting for welcome message..."
+msgstr "Elkarketa ezarrita, ongi etorri mezua itxaroten..."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:338
+msgid "Connection lost"
+msgstr "Elkarketa galduta"
+
+#: ../../locales/../src/engine/proxy.cpp:433
+msgid "Connection not allowed by ruleset"
+msgstr "Elkarketa ez dago ahalbideturik arau-ezarpenean"
+
+#: ../../locales/../src/engine/proxy.cpp:442
+msgid "Connection refused"
+msgstr "Elkarketa baztertuta"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:684
+msgid "Connection timed out"
+msgstr "Elkarketa denboraz kanpo"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
+msgid "Connection timed out."
+msgstr "Elkarketa denboraz kanpo."
+
+#: ../../locales/../src/interface/search.cpp:677
+msgid "Connection to server lost."
+msgstr "Zerbitzariarekiko elkarketa galduta."
+
+#: ../../locales/../src/engine/proxy.cpp:188
+msgid "Connection with proxy established, performing handshake..."
+msgstr "Ezarrita proxyarekiko elkarketa, eskuematea egiten..."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:561
+msgid "Connection with server got closed prematurely."
+msgstr "Zerbitzariarekiko elkarketa goizegi itxi da."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:552
+msgid "Connection with the test server failed."
+msgstr "Hutsegitea azterketa zerbitzariarekin elkarketatzerakoan."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
+msgid "Convert keyfile"
+msgstr "Bihutu giltza-agiria"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
+#, c-format
+msgid "Copy (%d) of %s"
+msgstr "Kopiatu (%d) -> %s-tik"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
+#, c-format
+msgid "Copy of %s"
+msgstr "Kopiatu -> %s"
+
+#: resources.h:607 resources.h:659
+msgid "Copy the URLs of the selected items to clipboard."
+msgstr "Kopiatu hautaturiko gaien URL-ak gakora."
+
+#: ../../locales/../src/engine/transfersocket.cpp:206
+#, c-format
+msgid "Could not accept connection: %s"
+msgstr "Ezin da elkarketa onartu: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+msgid "Could not add connection to Site Manager"
+msgstr "Ezin da Gune Kudeatzailerako elkarketa gehitu"
+
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Ezin da eragiketa osatu"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:188
+msgid "Could not connect to server"
+msgstr "Ezin da zerbitzariarekin elkarketatu"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr "Ezin da zerbitzarira elkarketatu: %s"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
+msgid "Could not convert command to server encoding"
+msgstr "Ezin da agindua zerbitzari kodeaketara bihurtu"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+msgid "Could not convert private key"
+msgstr "Ezin da giltza pribatua bihurtu"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+msgid "Could not copy URLs"
+msgstr "Ezin dira URL-ak kopiatu"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+msgid "Could not copy data"
+msgstr "Ezin dira datuak kopiatu"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
+msgid ""
+"Could not determine the target of the Drag&Drop operation.\n"
+"Either the shell extension is not installed properly or you didn't drop the "
+"files into an Explorer window."
+msgstr ""
+"Ezin da Arrastatu-eta-Askatu eragiketaren xedea zehaztu.\n"
+"Shell luzapena ez dago egoki ezarrita edo ezin dituzu agiriak askatu "
+"Explorer-en leiho batean."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
+msgid "Could not establish connection to server"
+msgstr "Ezin da elkarketarik ezarri zerbitzariarekin"
+
+#: ../../locales/../src/interface/FileZilla.cpp:493
+msgid ""
+"Could not find the resource files for FileZilla, closing FileZilla.\n"
+"You can set the data directory of FileZilla using the '--datadir "
+"<custompath>' commandline option or by setting the FZ_DATADIR environment "
+"variable."
+msgstr ""
+"Ezin dira FileZilla-rentzako baliabide agiriak aurkitu, FileZilla isten.\n"
+"FileZilla-ren datu zuzenbidea ezarri dezakezu '--datadir <norbere-helburua>' "
+"agindulerro aukera erabiliz edo FZ_DATADIR inguru aldakorra ezarriz."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
+msgid "Could not generate custom login sequence."
+msgstr "Ezin da norbere ohar sekuentziarik sortu."
+
+#: ../../locales/../src/engine/tlssocket.cpp:1081
+msgid ""
+"Could not get distinguished name of certificate issuer, "
+"gnutls_x509_get_issuer_dn failed"
+msgstr ""
+"Ezin da egiaztaturiko jaulkitzaile izena ezagutu, gnutls_x509_get_issuer_dn "
+"hutsegitea"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1056
+msgid ""
+"Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
+"failed"
+msgstr "Ezin da egiaztaturiko gai izena ezagutu, gnutls_x509_get_dn hutsegitea"
+
+#: ../../locales/../src/interface/state.cpp:1079
+msgid "Could not get full remote path."
+msgstr "Ezin da hurreneko helburu osoa lortu."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
+msgid "Could not get reply from fzputtygen."
+msgstr "Ezin da erantzunik lortu fzputtygen-tik."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+msgid "Could not get temporary directory to download file into."
+msgstr "Ezin da aldibaterako zuzenbidea lortu agiria bertara jeisteko."
+
+#: ../../locales/../src/engine/tlssocket.cpp:1009
+msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
+msgstr ""
+"Ezin dira hartzaile egiaztagiriak inportatu, gnutls_x509_crt_inportazio "
+"hutsegitea"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1002
+msgid ""
+"Could not initialize structure for peer certificates, gnutls_x509_crt_init "
+"failed"
+msgstr ""
+"Ezin da hartzaile egiaztagirientzako egitura abiarazi,, gnutls_x509_crt_init "
+"hutsegitea"
+
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
+#, c-format
+msgid ""
+"Could not load \"%s\", please make sure the file is valid and can be "
+"accessed.\n"
+"Any changes made in the Site Manager will not be saved."
+msgstr ""
+"Ezin da \"%s\" gertatu, mesedez zihuratu agiria baliozkoa dela eta sarbidea "
+"duela.\n"
+"Gune Kudeatzailean eginiko aldaketak ez dira gordeko."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
+msgid "Could not load keyfile"
+msgstr "Ezin da giltzagiria gertatu"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
+msgid "Could not load private key"
+msgstr "Ezin da giltza pribatua gertatu"
+
+#: ../../locales/../src/interface/state.cpp:1105
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+"Ezin da dagokion tokiko zuzenbidea lortu '%s' hurruneko zuzenbidearentzat .\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
+
+#: ../../locales/../src/interface/state.cpp:404
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"Ezin da dagokion tokiko zuzenbidea lortu '%s' hurruneko zuzenbidearentzat .\n"
+"Bilaketa aldiberetua ezgaitua izan da."
+
+#: ../../locales/../src/interface/state.cpp:295
+#, c-format
+msgid ""
+"Could not obtain corresponding remote directory for the local directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"Ezin da dagokion hurreneko zuzenbidea lortu '%s' tokiko zuzenbidearentzat .\n"
+"Bilaketa aldiberetua ezgaitua izan da."
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
+msgid "Could not open clipboard"
+msgstr "Ezin da gakoa ireki"
+
+#: ../../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 "Ezin da ohar agiria ireki: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+msgid "Could not parse remote path."
+msgstr "Ezin da hurreneko helburua aztertu."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
+msgid "Could not parse server address:"
+msgstr "Ezin da zerbitzari helbidea aztertu:"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#, c-format
+msgid "Could not read from socket: %s"
+msgstr "Ezin da hartunetik irakurri: %s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:487
+msgid "Could not read server item."
+msgstr "Ezin da zerbitzari gaia irakurri."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#, c-format
+msgid "Could not seek to offset %s within file"
+msgstr "Ezin da %s orekatzeko agiri gabe bilatu"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
+msgid "Could not seek to the end of the file"
+msgstr "Ezin da agiri amaiera arte bilatu"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
+msgid "Could not send command to fzputtygen."
+msgstr "Agirimota arriskutsua"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
+msgid "Could not spawn IO thread"
+msgstr "Ezin da SI haria sortu"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
+#, c-format
+msgid "Could not start proxy handshake: %s"
+msgstr "Ezin da proxy eskuematea hasi: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
+msgid "Could not start transfer"
+msgstr "Ezin da eskualdaketa hasi"
+
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
+#, c-format
+msgid ""
+"Could not write \"%s\", any changes to the Site Manager could not be saved: %"
+"s"
+msgstr "Ezin da idatzi \"%s\", Gune Kudeatzaile aldaketak ezin dira gorde: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
+#, c-format
+msgid "Could not write \"%s\", the bookmark could not be added: %s"
+msgstr "Ezin da idatzi \"%s\", lastermarka ezin da gehitu: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
+msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
+msgstr "Ezin da idatzi \"%s\", lastermarka orokorrak ezin dira gorde: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1989
+#, c-format
+msgid ""
+"Could not write \"%s\", the queue could not be saved.\n"
+"%s"
+msgstr ""
+"Ezin da idatzi \"%s\", lerroa ezin da gorde.\n"
+"%s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
+#, c-format
+msgid "Could not write \"%s\", the selected sites could not be exported: %s"
+msgstr "Ezin da idatzi \"%s\", hautaturiko guenak ezin dira esportatu: %s"
+
+#: ../../locales/../src/interface/wrapengine.cpp:1151
+#, c-format
+msgid "Could not write \"%s\": %s"
+msgstr "Ezin da idatzi \"%s\": %s"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+#, c-format
+msgid "Could not write keyfile: %s"
+msgstr "Ezin da giltzagiria idatzi: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1119
+msgid "Could not write to local file"
+msgstr "Ezin da tokiko agirira idatzi"
+
+#: ../../locales/../src/engine/logging.cpp:315
+#: ../../locales/../src/engine/logging.cpp:386
+#, c-format
+msgid "Could not write to log file: %s"
+msgstr "Ezin da ohar agirira idatzi: %s"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
+#, c-format
+msgid "Could not write to socket: %s"
+msgstr "Ezin da idatzi hartunera: %s"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
+msgid "Country:"
+msgstr "Herrialdea:"
+
+#: resources.h:636
+msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
+msgstr ""
+"FileZilla berehala matxuratzen du. Salbuespen kudeatzaile garbiketarako "
+"erabiltzen da bakarrik."
+
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "&Sortu agiri berria"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
+msgid "Create a new subdirectory in the current directory"
+msgstr "Sortu azpizuzenbide berri bat oraingo zuzenbidean"
+
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Sortu agiri huts berri bat oraingo zuzenbidean"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+msgid "Create directory"
+msgstr "Sortu zuzenbidea"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Sortu agiri hutsa"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
+msgid "Creating directory"
+msgstr "Zuzenbide sortzea"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
+#, c-format
+msgid "Creating directory '%s'..."
+msgstr "'%s' zuzenbidea sortzen..."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:174
+msgid "Critical error"
+msgstr "Akats larria"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:137
+msgid "Critical file transfer error"
+msgstr "Agiri eskualdaketa akats larria"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:120
+#, c-format
+msgid "Critical file transfer error after transferring %s in %s"
+msgstr "Agiri eskualdaketa akats larria %s -> %s eskualdatu ondoren"
+
+#: ../../locales/../src/interface/state.cpp:393
+#, c-format
+msgid ""
+"Current remote directory (%s) is not below the synchronization root (%s).\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+"Oraingo hurreneko zuzenbidea (%s) ez dago aldibereturiko erroaren (%s) "
+"azpian.\n"
+"Bilaketa aldiberetua ezgaitu egin da."
+
+#: ../../locales/../src/interface/statusbar.cpp:423
+msgid "Current transfer type is set to ASCII."
+msgstr "Oraingo eskualdaketa mota bezala ASCII ezarri da."
+
+#: ../../locales/../src/interface/statusbar.cpp:433
+msgid "Current transfer type is set to automatic detection."
+msgstr "Oraingo eskualdaketa mota berezgaitasunezko atzemate bezala ezarri da."
+
+#: ../../locales/../src/interface/statusbar.cpp:428
+msgid "Current transfer type is set to binary."
+msgstr "Oraingo eskualdaketa mota binariora ezarri da."
+
+#: resources.h:793 resources.h:914
+msgid "Cus&tom"
+msgstr "E&gilea"
+
+#: ../../locales/../src/interface/filter.cpp:98
+msgid "Custom filter set"
+msgstr "Norbere iragazki ezarpena"
+
+#: resources.h:385 resources.h:386
+msgid "Custom server"
+msgstr "Norbere zerbitzaria"
+
+#: resources.h:394
+msgid "D&ata type"
+msgstr "&Datu mota"
+
+#: resources.h:921
+msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
+msgstr "&Hamarren aurrizkiak NS sinboloak erabiliz (adib. 1 KB = 1000 bytes)"
+
+#: resources.h:108
+msgid "D&efault"
+msgstr "&Berezkoa"
+
+#: resources.h:602 resources.h:654 resources.h:684
+msgid "D&elete"
+msgstr "E&zabatu"
+
+#: resources.h:214
+msgid "D&isable all"
+msgstr "Ezgaitu &denak"
+
+#: resources.h:892
+msgid "D&o not save passwords"
+msgstr "&Ez gorde sarhitzak"
+
+#: resources.h:945
+msgid "D&ouble-click action on directories:"
+msgstr "&Klik-bikoitz ekintza zuzenbideetan:"
+
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr "&Bikoitza"
+
+#: ../../locales/../src/engine/server.cpp:34
+msgid "DOS-like with virtual paths"
+msgstr "DOS-bezala helburu birtualekin"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
+msgid "Dangerous filetype"
+msgstr "Agirimota arriskutsua"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
+msgid "Data"
+msgstr "Eguna"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
+msgid "Data socket closed too early."
+msgstr "Datu hartunea goizegi itxi da."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
+msgid "Date"
+msgstr "Eguna"
+
+#: resources.h:905
+msgid "Date formatting"
+msgstr "Egun heuskarria"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:128
+msgid "Date/time format"
+msgstr "Egun/ordu heuskarria"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
+msgid "Date/time unknown"
+msgstr "Egun/ordu ezezaguna"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:141
+msgid "Debug"
+msgstr "Garbiketa"
+
+#: resources.h:989
+msgid "Debugging settings"
+msgstr "Garbiketa ezarpenak"
+
+#: resources.h:99
+msgid "Default &local directory:"
+msgstr "Berezko &tokiko zuzenbidea:"
+
+#: ../../locales/../src/engine/server.cpp:26
+msgid "Default (Autodetect)"
+msgstr "Berez (Berez-atzeman)"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+msgid "Default editor not properly quoted."
+msgstr "Berezko editatzailea ez dago egoki aipatuta."
+
+#: resources.h:264 resources.h:286 resources.h:875
+msgid "Default file exists action"
+msgstr "Berezko ekintza dauden agirientzat"
+
+#: resources.h:101
+msgid "Default r&emote directory:"
+msgstr "Berezko h&urruneko zuzenbidea:"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
+msgid ""
+"Default remote path cannot be parsed. Make sure it is a valid absolute path "
+"for the selected server type."
+msgstr ""
+"Berezko hurruneko helburua ezin da aztertu. Zihurtatu baliozko helburu oso "
+"bat dela hautaturiko zerbitzari motarentzat."
+
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:78
+msgid "Default system language"
+msgstr "Berezko sistema hizkuntza"
+
+#: resources.h:698
+msgid "Default transfer mode:"
+msgstr "Berezko eskualdaketa modua:"
+
+#: resources.h:844
+msgid "Default transfer type:"
+msgstr "Berezko eskualdaketa mota:"
+
+#: resources.h:717 resources.h:780
+msgid "Default: http://ip.filezilla-project.org/ip.php"
+msgstr "Berezkoa: http://ip.filezilla-project.org/ip.php"
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
+msgid ""
+"Delay between failed connection attempts has to be between 1 and 999 seconds."
+msgstr ""
+"Huts egindako elkarketa arteko saiakera 1 eta 999 segundu artekoa izan behar "
+"da."
+
+#: ../../locales/../src/engine/engineprivate.cpp:630
+#, c-format
+msgid ""
+"Delaying connection for %d second due to previously failed connection "
+"attempt..."
+msgid_plural ""
+"Delaying connection for %d seconds due to previously failed connection "
+"attempt..."
+msgstr[0] ""
+"Elkarketa %d segunduz atzeratzen aurretik huts egindako elkarketa "
+"saiakeragaitik..."
+msgstr[1] ""
+"Elkarketa %d segunduz atzeratzen aurretik huts egindako elkarketa "
+"saiakeragaitik..."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
+msgid "Delete Site Manager entry"
+msgstr "Ezabatu Gune Kudeatzaile sarrera"
+
+#: resources.h:655 resources.h:676
+msgid "Delete selected directory"
+msgstr "Ezabatu hautaturiko zuzenbidea"
+
+#: resources.h:587 resources.h:603
+msgid "Delete selected files and directories"
+msgstr "Ezabatu hautaturiko agiriak eta zuzenbideak"
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting directories"
+msgstr "Zuzenbide ezabaketa"
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting multiple unrelated directories is not yet supported"
+msgstr ""
+"Loturagabeko zuzenbideen ezabaketa anitza oraindik ez dago sostengaturik"
+
+#: resources.h:462
+msgid "Deleting symbolic link"
+msgstr "Lotura sinbolikoaren ezabaketa"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
+msgid "Desktop"
+msgstr "Mahaigaina"
+
+#: resources.h:4 resources.h:32 resources.h:185
+msgid "Details"
+msgstr "Xehetasunak"
+
+#: resources.h:198
+msgid "Details for new key:"
+msgstr "Giltza berriarentzako xehetasunak:"
+
+#: resources.h:236
+msgid "Dire&ctories"
+msgstr "Z&uzenbideak"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Direction"
+msgstr "Helbidea"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:283
+msgid "Directory"
+msgstr "Zuzenbidea"
+
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
+msgid "Directory comparison"
+msgstr "Zuzenbide alderaketa"
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+#: ../../locales/../src/interface/listingcomparison.cpp:82
+#: ../../locales/../src/interface/listingcomparison.cpp:88
+msgid "Directory comparison failed"
+msgstr "Zuzenbide alderaketa hutsegitea"
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
+msgid "Directory containing the logfile does not exist or filename is invalid."
+msgstr "Ohar-agiria duen zuzenbidea ez dago edo agirizena baliogabea da."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:192
+msgid "Directory listing aborted by user"
+msgstr "Zuzenbide zerrendapena erabiltzileak utzita"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
+msgid "Directory listing failed"
+msgstr "Zuzenbide zerrendatze hutsegitea"
+
+#: resources.h:207
+msgid "Directory listing filters"
+msgstr "Zuzenbide zerrendatze iragazkiak"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:196
+msgid "Directory listing successful"
+msgstr "Zuzenbidea ongi zerrendatu da"
+
+#: resources.h:217
+msgid "Disa&ble all"
+msgstr "Ezgaitu de&nak"
+
+#: ../../locales/../src/interface/state.cpp:1113
+msgid ""
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:683
+msgid ""
+"Disable this option again if you will not be able to see the correct "
+"directory contents anymore."
+msgstr ""
+"Ezgaitu aukera hau berriro ez bazara zuzenbide zuzeneko edukiak ikusteko gai "
+"izango."
+
+#: resources.h:1017
+msgid "Disconnect from server"
+msgstr "Eten zerbitzaritik"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:82
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:936
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:938
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
+msgid "Disconnected from server"
+msgstr "Zerbitzaritik etenda"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:953
+#, c-format
+msgid "Disconnected from server: %s"
+msgstr "Zerbitzaritik etenda: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
+msgid "Disconnecting from previous server"
+msgstr "Aurreko zerbitzaritik etetzen"
+
+#: resources.h:1018
+msgid "Disconnects from the currently visible server"
+msgstr "Orain ikusgarri den zerbitzaritik eteten du"
+
+#: resources.h:572
+msgid "Display about dialog"
+msgstr "Erakutsi honi buruz elkarrizketa"
+
+#: resources.h:954
+msgid "Do &not use default editor"
+msgstr "&Ez erabili berezko editatzailea"
+
+#: resources.h:628
+msgid "Do &nothing"
+msgstr "Ez &egin ezer"
+
+#: ../../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 ""
+"Egitan nahi duzu beta bertsiorik dagoen egiaztatzea?\n"
+"Ez badituzu ezaugarri berriak aztertzea nahi, jarraitu bertsio egonkorrak "
+"erabiltzen."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
+msgid "Do you really want to close FileZilla?"
+msgstr "Egitan nahi duzu FileZilla istea?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
+msgid ""
+"Do you really want to delete all Site Manager entries and the transfer queue?"
+msgstr ""
+"Egitan nahi duzu Gune Kudeatzaile sarrera guztiak eta eskualdaketa lerroa "
+"ezabatzea?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+msgid "Do you really want to delete all Site Manager entries?"
+msgstr "Egitan nahi duzu Gune Kudeatzaile sarrera guztiak ezabatzea?"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
+msgid "Do you really want to delete selected entry?"
+msgstr "Egitan nahi duzu ezabatzea hautaturiko sarrera?"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+msgid "Do you really want to delete the transfer queue?"
+msgstr "Egitan nahi duzu eskualdaketa lerroa ezabatzea?"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:599
+#, c-format
+msgid "Do you really want to send '%s' to the server?"
+msgstr "Egitan nahi duzu '%s' zerbitzarira bildatzea?"
+
+#: resources.h:475
+msgid "Documentation"
+msgstr "Agiritza"
+
+#: resources.h:719
+msgid "Don't use external IP address on &local connections."
+msgstr "Ez erabili &kanpoko IP helbidea tokiko elkarketetan."
+
+#: resources.h:855
+msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
+msgstr "Puntu-agiriak puntuz hasten diren agirizenak dira, adib. .htaccess"
+
+#: resources.h:939
+msgid "Double-click action"
+msgstr "Klik-bikoitz ekintza"
+
+#: resources.h:371
+msgid "Download"
+msgstr "Jeitsi"
+
+#: resources.h:491 resources.h:831
+msgid "Download &limit:"
+msgstr "Jeisketa &muga:"
+
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
+msgid "Download limit: %s/s"
+msgstr "Jeisketa muga: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:606
+msgid "Download limit: none"
+msgstr "Jeisketa muga: ezer ez"
+
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
+msgid "Download search results"
+msgstr "Jeisketa bilaketa emaitzak"
+
+#: resources.h:649
+msgid "Download selected directory"
+msgstr "Jeitsi hautaturiko zuzenbidea"
+
+#: resources.h:591
+msgid "Download selected files and directories"
+msgstr "Jeitsi hautaturiko agiriak eta zuzenbideak"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Jeisketa abiadura: %s/s\n"
+"Igoera abiadura: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
+msgid "Downloading"
+msgstr "Jeisketa"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:358
+#: ../../locales/../src/interface/updatewizard.cpp:423
+#, c-format
+msgid "Downloading %s"
+msgstr "%s jeisten"
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading multiple unrelated directories is not yet supported"
+msgstr ""
+"Loturagabeko zuzenbideen jeisketa anitza oraindik ez dago sostengaturik"
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading search results"
+msgstr "Bilaketa emaitzak jeisten"
+
+#: ../../locales/../src/interface/LocalListView.cpp:104
+#: ../../locales/../src/interface/LocalTreeView.cpp:104
+#: ../../locales/../src/interface/QueueView.cpp:83
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
+msgid ""
+"Drag&drop between different instances of FileZilla has not been implemented "
+"yet."
+msgstr ""
+"&FileZilla eskabide ezberdinen arteko arrastatu-eta-askatu ez dago oraingik "
+"sostengatua."
+
+#: ../../locales/../src/interface/LocalListView.cpp:110
+#: ../../locales/../src/interface/LocalTreeView.cpp:110
+#: ../../locales/../src/interface/QueueView.cpp:96
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
+msgid "Drag&drop between different servers has not been implemented yet."
+msgstr ""
+"&Zerbitzari ezberdinen arteko arrastatu-eta-askatu ez dago oraingik "
+"sostengatua."
+
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr "Bik&oiztu"
+
+#: resources.h:213
+msgid "E&nable all"
+msgstr "Gait&u denak"
+
+#: resources.h:577 resources.h:594
+msgid "E&nter directory"
+msgstr "&Sartu zuzenbidea"
+
+#: resources.h:149
+msgid "E&xecute"
+msgstr "E&xekutatu"
+
+#: resources.h:517
+msgid "E&xit"
+msgstr "I&rten"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
+msgid "E-Mail:"
+msgstr "Post@:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
+msgid "Each filter needs at least one condition."
+msgstr "Iragazki bakoitzak gutxienez baldintza bat behar du."
+
+#: resources.h:239
+msgid "Edit filters"
+msgstr "Editatu iragazkiak"
+
+#: resources.h:582
+msgid ""
+"Edit the file with the configured editor and upload changes to the server."
+msgstr ""
+"Editatu agiria itxuraturiko editatzailearekin eta igo aldaketak zerbitzarira."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
+msgid "Editing failed"
+msgstr "Edizio hutsegitea"
+
+#: resources.h:902
+msgid "Email:"
+msgstr "Post@"
+
+#: ../../locales/../src/interface/QueueView.cpp:2301
+msgid "Empty command"
+msgstr "Agindua hustu"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
+msgid "Empty command."
+msgstr "Agindua hutsik."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
+msgid "Empty directory listing"
+msgstr "Zuzenbide zerrendapena hutsik"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:26
+msgid "Empty directory."
+msgstr "Zuzenbidea hustsik."
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
+msgid "Empty file extension."
+msgstr "Agiri luzapena hutsik."
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty filter names are not allowed."
+msgstr "Iragazki izena hutsik ez dago ahalbideturik."
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty name"
+msgstr "Izena hutsik"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
+msgid "Empty quoted string."
+msgstr "Aipamen katea hutsik."
+
+#: resources.h:216
+msgid "En&able all"
+msgstr "G&aitu denak"
+
+#: resources.h:840
+msgid "Enable invalid character &filtering"
+msgstr "G&aitu baliogabeko hizki iragazketa"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+msgid "Encrypted"
+msgstr "Enkriptatua"
+
+#: resources.h:353
+msgid "Encryption"
+msgstr "Enkriptaketa"
+
+#: resources.h:345
+msgid "Encryption details"
+msgstr "Enkriptaketa xehetasunak"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:451
+msgid "End comparison and change sorting order?"
+msgstr "Amaitu alderaketa eta aldatu antolaketa ordena?"
+
+#: resources.h:558
+msgid "Enter &custom command..."
+msgstr "&Sartu norbere agindua..."
+
+#: resources.h:495
+#, no-c-format
+msgid "Enter 0 for unlimited speed."
+msgstr "Sartu 0 mugagabeko abiadurarako."
+
+#: ../../locales/../src/interface/QueueView.cpp:2290
+msgid "Enter command"
+msgstr "Sartu agindua"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:580
+msgid "Enter custom command"
+msgstr "Sartu norbere agindua"
+
+#: resources.h:946
+msgid "Enter directory"
+msgstr "Sartu zuzenbidea"
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Enter filter name"
+msgstr "Sartu iragazki izena"
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Enter name for filterset"
+msgstr "Sartu izena iragazki-ezarpenarenerako"
+
+#: ../../locales/../src/interface/filter.cpp:405
+msgid "Enter new name for filterset"
+msgstr "Sartu izen berri bat iragazki-ezarpenerako"
+
+#: resources.h:124
+msgid "Enter password"
+msgstr "Idatzi sarhitza"
+
+#: resources.h:578 resources.h:595
+msgid "Enter selected directory"
+msgstr "Sartu hautaturiko zuzenbidea"
+
+#: resources.h:739
+msgid ""
+"Enter the address of the server.\n"
+"To specify the server protocol, prepend the host with the protocol "
+"identifier. If no protocol is specified, the default protocol (ftp://) will "
+"be used.\n"
+"You can also enter complete URLs in the form protocol://user:pass@host:port "
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
+msgstr ""
+"Sartu zerbitzariaren helbidea.\n"
+"Zerbitzari protokoloa adierazteko, ezarri aurretik hostalaria protokolo "
+"ezagutarazlearekin. Ez bada protokolorik adierazten, berezko protokoloa "
+"(ftp://) erabiliko da.\n"
+"URL osoak era sartu ditzakezu protokolo forma honetan://erabiltzailea:"
+"sarhitza@hostalaria:ataka hemen, beste eremuetako balioak gainidatzi egingo "
+"dira.\n"
+"\n"
+"Sostengaturiko protokoloak dira:\n"
+"- ftp:// FTP arrunterako\n"
+"- sftp:// SSH agiri eskualdaketa protokolorako\n"
+"- ftps:// FTP TLS (inplizitoa) gain-rako\n"
+"- ftpes:// FTP TLS (esplizitoa) gain-rako"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
+#, c-format
+msgid ""
+"Enter the password for the file '%s'.\n"
+"Please note that the converted file will not be password protected."
+msgstr ""
+"Sartu '%s' agiriarentzako sarhitza.\n"
+"Mesedez ohartu bihurtutako agiria ez dela sarhitzez babestua izango."
+
+#: resources.h:743
+msgid ""
+"Enter the port on which the server listens.\n"
+"The default for FTP is 21, the default for SFTP is 22."
+msgstr ""
+"Sartu zerbitzariek aditu behar duten ataka\n"
+"FTP-rako berezkoa 21, SFTP-rako berzkoa 22 da."
+
+#: ../../locales/../src/interface/loginmanager.cpp:63
+msgid "Enter username and password"
+msgstr "Sartu erabiltzaile-izena eta sarhitza"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "Error exporting settings"
+msgstr "Akatsa ezarpenak esportatzerakoan"
+
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
+msgid "Error importing"
+msgstr "Inportazio akatsa"
+
+#: ../../locales/../src/interface/QueueView.cpp:2056
+msgid "Error loading queue"
+msgstr "Akatsa lerroa gertatzerakoan"
+
+#: ../../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:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
+msgid "Error loading xml file"
+msgstr "Akatsa xml agiria gertatzerakoan"
+
+#: ../../locales/../src/interface/QueueView.cpp:1955
+msgid "Error saving queue"
+msgstr "Akatsa lerroa gordetzerakoan"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid "Error starting program"
+msgstr "Akatsa programa abiarazterakoan"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1990
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
+msgid "Error writing xml file"
+msgstr "Akatsa xml agiria idazterakoan"
+
+#: ../../locales/../src/interface/updatewizard.cpp:343
+msgid "Error, file name cannot be parsed."
+msgstr "Akatsa, agiri izena ezin da aztertu."
+
+#: ../../locales/../src/interface/updatewizard.cpp:359
+msgid "Error, local file exists but cannot be removed"
+msgstr "Akatsa, tokiko agiria badago baina ezin da kendu"
+
+#: ../../locales/../src/engine/logging.cpp:213
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
+msgid "Error:"
+msgstr "Akatsa:"
+
+#: resources.h:487
+msgid "Establish connection in a new tab"
+msgstr "Ezarri elkarketa hegats berri batean"
+
+#: resources.h:971
+msgid "Every month"
+msgstr "Hilero"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "Bi astetik behin"
+
+#: resources.h:965
+msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
+msgstr ""
+"Adibidea: png \"c:\\programa agiriak\\ikusgailua\\ikusgailua.exe\" -open"
+
+#: resources.h:924
+msgid "Examples"
+msgstr "Adibideak"
+
+#: resources.h:153
+msgid "Exe&cute"
+msgstr "E&xekutatu"
+
+#: ../../locales/../src/interface/updatewizard.cpp:328
+msgid "Executable"
+msgstr "Exekutagarria"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
+msgid "Executable contains no version info, cannot check for updates."
+msgstr ""
+"Exekutagarriak ez du bertsio argibiderik, ezin dira eguneraketak egiaztatu."
+
+#: resources.h:882
+msgid "Explorer"
+msgstr "Explorer"
+
+#: resources.h:303
+msgid "Export &Queue"
+msgstr "Esportatu &Lerroa"
+
+#: resources.h:302
+msgid "Export &Settings"
+msgstr "Esportatu &Ezarpenak"
+
+#: resources.h:299
+msgid "Export settings"
+msgstr "Esportatu Ezarpenak"
+
+#: resources.h:228
+msgid "F&ilter name:"
+msgstr "Iragazki iz&ena:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:117
+msgid "FTP"
+msgstr "FTP"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Agiri Eskualdaketa Protokoloa"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Agiri Eskualdaketa Protokoloa aukerazko enkripataketarekin"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Agiri Eskualdaketa Protokolo Segurtasungabea"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FTP Engine not initialized, can't connect"
+msgstr "FTP Gailua abiarazi gabe dago, ezin da elkarketatu"
+
+#: resources.h:767
+msgid "FTP Keep-alive"
+msgstr "FTP Heutsi-bizirik"
+
+#: resources.h:787
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:120
+msgid "FTP Proxy"
+msgstr "FTP Proxya"
+
+#: ../../locales/../src/interface/cmdline.cpp:20
+msgid "FTP URL"
+msgstr "FTP URL-a"
+
+#: resources.h:695
+msgid ""
+"FTP uses secondary connections for data transfers. These additional "
+"connections can be established in two ways."
+msgstr ""
+"FTP-ak bigarren elkarketak erabiltzen ditu datu eskualdaketarako. Elkarketa "
+"gehigarri hauek bi bidetan ezarri daitezke."
+
+#: ../../locales/../src/engine/server.cpp:20
+msgid "FTPES - FTP over explicit TLS/SSL"
+msgstr "FTPES - FTP gain TLS/SSL esplizitoa"
+
+#: ../../locales/../src/engine/server.cpp:19
+msgid "FTPS - FTP over implicit TLS/SSL"
+msgstr "FTPES - FTP gain TLS/SSL inplizitoa"
+
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
+#: ../../locales/../src/interface/viewheader.cpp:535
+msgid "Failed to change directory"
+msgstr "Hutsegitea zuzenbidea aldatzerakoan"
+
+#: ../../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
+msgid "Failed to change language"
+msgstr "Hutsegitea hizkuntza aldatzerakoan"
+
+#: ../../locales/../src/interface/updatewizard.cpp:464
+msgid "Failed to check for newer version of FileZilla."
+msgstr "Hutsegitea FileZilla bertsio berriago bat dagoen egiaztatzerakoan."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
+msgid "Failed to copy or move sites"
+msgstr "Hutsegitea guneak kopiatu edo mugitzerakoan"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
+msgid "Failed to create backup copy of xml file"
+msgstr "Hutsegitea xml agiriaren babeskopia sortzerakoan"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:797
+msgid "Failed to create listen socket, aborting"
+msgstr "Hutsegitea aditze hartunea sortzerakoan, uzten"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
+msgid "Failed to create listening socket for active mode transfer"
+msgstr ""
+"Hutsegitea modu aktiboko eskualdaketa zerrendapen hartunea sortzerakoan"
+
+#: ../../locales/../src/interface/updatewizard.cpp:466
+msgid "Failed to download the latest version of FileZilla."
+msgstr "Hutsegitea FileZilla-ren azken bertsioa jeisterakoan."
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
+msgid "Failed to get 'My Documents' path"
+msgstr "Hutsegitea 'Nire Agiriak' helburua lortzerakoan"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
+msgid "Failed to get desktop path"
+msgstr "Hutsegitea mahaigain helburua lortzerakoan"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:956
+msgid "Failed to get peer address of control connection, connection closed."
+msgstr ""
+"Hutsegitea aginte elkarketa hartzaile helbidea lortzerakoan, elkarketa "
+"itxita."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:964
+msgid "Failed to get peer address of data connection, connection closed."
+msgstr ""
+"Hutsegitea datu elkarketa hartzaile helbidea lortzerakoan, elkarketa itxita."
+
+#: ../../locales/../src/interface/context_control.cpp:79
+msgid "Failed to initialize FTP engine"
+msgstr "Hutsegitea FTP gailua abiarazterakoan"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:313
+msgid "Failed to initialize TLS."
+msgstr "Hutsegitea TLS abiarazterakoan"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:173
+msgid "Failed to load panels, invalid resource files?"
+msgstr "Hutsegitea panelak gertatzerakoan, baliabide agiri baliogabeak?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
+#, c-format
+msgid "Failed to load private key: %s"
+msgstr "Hutsegitea giltza pribatua gertatzerakoan: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
+#, c-format
+msgid "Failed to open \"%s\" for appending/writing"
+msgstr "Hutsegitea \"%s\" eransteko/idazteko irekitzarakoan"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
+#, c-format
+msgid "Failed to open \"%s\" for reading"
+msgstr "Hutsegitea \"%s\" irakurtzeko irekitzarakoan"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:391
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:448
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr "Hutsegitea \"%s\" idazteko irekitzarakoan"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:418
+msgid "Failed to parse returned path."
+msgstr "Hutsegitea itzulitako helburua aztertzerakoan."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:321
+msgid "Failed to parse trusted root cert."
+msgstr "Hutsegitea erro egiazt fidagarria aztertzerakoan."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
+msgid "Failed to receive data"
+msgstr "Hutsegitea datuak jasotzerakoan"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:194
+msgid "Failed to retrieve directory listing"
+msgstr "Hutsegitea zuzenbide zerrendapena berreskuratzerakoan"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:719
+msgid "Failed to retrieve external ip address, aborting"
+msgstr "Hutsegitea kanpoko ip helbidea berreskuratzerakoan, uzten."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
+msgid "Failed to retrieve external ip address, using local address"
+msgstr ""
+"Hutsegitea kanpoko ip helbidea berreskuratzerakoan, tokiko helbidea "
+"erabiltzen"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
+msgid "Failed to retrieve local ip address."
+msgstr "Hutsegitea tokiko ip helbidea berreskuratzerakoan."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:688
+msgid "Failed to retrieve local ip address. Aborting"
+msgstr "Hutsegitea tokiko ip helbidea berreskuratzerakoan. Uzten."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:616
+msgid "Failed to retrieve the external IP address."
+msgstr "Hutsegitea kanpoko ip helbidea berreskuratzerakoan."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:307
+msgid "Failed to send command."
+msgstr "Hutsegitea agindua bidaltzerakoan."
+
+#: ../../locales/../src/interface/FileZilla.cpp:271
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language"
+msgstr ""
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen"
+
+#: ../../locales/../src/interface/FileZilla.cpp:256
+#, c-format
+msgid ""
+"Failed to set language to %s (%s), using default system language (%s, %s)."
+msgstr ""
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen (%s, %s)."
+
+#: ../../locales/../src/interface/FileZilla.cpp:244
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language."
+msgstr ""
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen."
+
+#: ../../locales/../src/interface/FileZilla.cpp:273
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:53
+#, c-format
+msgid "Failed to set language to %s, using default system language"
+msgstr ""
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen"
+
+#: ../../locales/../src/interface/FileZilla.cpp:252
+#, c-format
+msgid "Failed to set language to %s, using default system language (%s, %s)."
+msgstr ""
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen (%s, %s)."
+
+#: ../../locales/../src/interface/FileZilla.cpp:241
+#, c-format
+msgid "Failed to set language to %s, using default system language."
+msgstr ""
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen."
+
+#: ../../locales/../src/interface/settings/optionspage.cpp:215
+msgid "Failed to validate settings"
+msgstr "Hutsegitea ezarpenak balioztatzerakoan"
+
+#: ../../locales/../src/engine/tlssocket.cpp:944
+msgid "Failed to verify peer certificate"
+msgstr "Hutsegitea hartzaile egiaztagiria egiaztatzerakoan"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:566
+#, c-format
+msgid "Failed to write to file %s"
+msgstr "Hutsegitea %s agirira idazterakoan"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
+msgid "Failed to write xml file"
+msgstr "Hutsegitea xml agirira idazterakoan"
+
+#: ../../locales/../src/interface/queueview_failed.cpp:16
+msgid "Failed transfers"
+msgstr "Huts egindako eskualdaketak"
+
+#: resources.h:710
+msgid "Fall back to active mode"
+msgstr "Itzuli modu aktibora"
+
+#: resources.h:378
+msgid "Fil&e:"
+msgstr "A&giria:"
+
+#: resources.h:235
+msgid "Fil&es"
+msgstr "&Agiriak"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:282
+msgid "File"
+msgstr "Agiria"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:124
+msgid "File Types"
+msgstr "Agiri Motak"
+
+#: ../../locales/../src/interface/import.cpp:108
+msgid "File does not contain any importable data."
+msgstr "Agirak ez dut inportagarria den daturik."
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:132
+msgid "File editing"
+msgstr "Agiri edizioa"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
+msgid "File exists"
+msgstr "Agiria badago"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:125
+msgid "File exists action"
+msgstr "Badagoen agirirako ekintza"
+
+#: resources.h:314
+msgid "File has changed"
+msgstr "Agiria aldatu egin da"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:130
+msgid "File lists"
+msgstr "Agiri zerrendak"
+
+#: ../../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
+msgid "File not found"
+msgstr "Agiria ez da aurkitu"
+
+#: resources.h:1028
+msgid "File search"
+msgstr "Agiri bilaketa"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:128
+msgid "File transfer aborted by user"
+msgstr "Agiri eskualdaketa erabiltzaileak utzita"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:118
+#, c-format
+msgid "File transfer aborted by user after transferring %s in %s"
+msgstr "Agiri eskualdaketa erabiltzaileak utzita %s -> %s eskualdatu ondoren"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:139
+msgid "File transfer failed"
+msgstr "Agiri eskualdaketa hutsegitea"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:122
+#, c-format
+msgid "File transfer failed after transferring %s in %s"
+msgstr "Agiri eskualdaketa hutsegitea %s -> %s eskualdatu ondoren"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:134
+msgid "File transfer skipped"
+msgstr "Agiri eskualdaketa jauzita"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:132
+msgid "File transfer successful"
+msgstr "Agiria ongi eskualdatu da"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:115
+#, c-format
+msgid "File transfer successful, transferred %s in %s"
+msgstr "Agiria ongi eskualdatu da, eskualdatuta %s %s-an"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
+msgid "File transfers still in progress."
+msgstr "Agiri eskualdaketa oraindik garatzen."
+
+#: resources.h:396
+msgid "File would transfer with ASCII data type."
+msgstr "Agiria ASCII datu motarekin eskualdatzen da."
+
+#: resources.h:397
+msgid "File would transfer with binary data type."
+msgstr "Agiria binario datu motarekin eskualdatzen da."
+
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FileZilla Error"
+msgstr "FileZilla Akatsa"
+
+#: resources.h:732
+msgid ""
+"FileZilla can now test your configuration to ensure everything is configured "
+"properly."
+msgstr ""
+"FileZillak orain zure itxurapena aztertu dezake dena egoki itxuratuta "
+"dagoela zihurtatzeko."
+
+#: resources.h:486
+msgid "FileZilla is already connected to a server."
+msgstr "FileZilla jadanik zerbitzari batera elkarketaturik dago."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
+msgid "FileZilla needs to be restarted for the language change to take effect."
+msgstr ""
+"FileZilla berrabiarazia izan behar da hizkuntza aldaketak eragina izan dezan."
+
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla eguneraketak"
+
+#: resources.h:533
+msgid "Filelist status &bars"
+msgstr "Agiri-zer&renda egoera barra"
+
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
+msgid "Filename"
+msgstr "Agirizena"
+
+#: resources.h:526
+msgid "Filename &filters..."
+msgstr "&Agirizen iragazkiak..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
+#, c-format
+msgid "Filename cannot be constructed for directory %s and filename %s"
+msgstr "Agirizena ezin da %s zuzenbiderako eta %s agirizenerako eraiki"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
+msgid "Filename invalid"
+msgstr "Agirizen baliogabea"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Agirizenak ezin du hurrengo hizkietako bat ere eduki: / \\ : * ? \" < > |"
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "Filename unchanged"
+msgstr "Agirizen aldatugabea"
+
+#: resources.h:316 resources.h:982
+msgid "Filename:"
+msgstr "Agirizena:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+msgid "Filenames may not contain any of the following characters: / * ? < > |"
+msgstr "Agirizenek ezin dute hurrengo hizkietako bat ere eduki: / * ? < > |"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+msgid ""
+"Filenames may not contain any of the following characters: / \\ : * ? \" < > "
+"|"
+msgstr ""
+"Agirizenek ezin dute hurrengo hizkietako bat ere eduki: / \\ : * ? \" < > |"
+
+#: resources.h:344
+msgid "Files currently being edited"
+msgstr "Orain editatzen ari diren agiriak"
+
+#: ../../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
+msgid "Filesize"
+msgstr "Agirineurria"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:129
+msgid "Filesize format"
+msgstr "Agirineurri heuskarria"
+
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:382
+msgid "Filetype"
+msgstr "Agirimota"
+
+#: resources.h:966
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:133
+msgid "Filetype associations"
+msgstr "Agirmota elkarketak"
+
+#: resources.h:234
+msgid "Filter applies to:"
+msgstr "Agiriak hemen ezarrita:"
+
+#: resources.h:839
+msgid "Filter invalid characters in filenames"
+msgstr "Iragazki hizki baliogabeak agirizenetan"
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter name already exists"
+msgstr "Agiri izena jadanik badago"
+
+#: resources.h:230
+msgid "Filter out items matching all of the following"
+msgstr "Iragazi hurrengo hauetako guztiekin bat datozen gaiak"
+
+#: resources.h:231
+msgid "Filter out items matching any of the following"
+msgstr "Iragazi hurrengo hauetako bakarren batekin bat datozen gaiak"
+
+#: resources.h:232
+msgid "Filter out items matching none of the following"
+msgstr "Iragazi hurrengo hauetako bat ere ezekin bat datozen gaiak"
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Filter set already exists"
+msgstr "Iragazki ezarpena jadanik badago"
+
+#: resources.h:1021
+msgid "Filter the directory listings"
+msgstr "Iragazi zuzenbide zerrendapenak"
+
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter validation failed"
+msgstr "Iragazki balioztapen hutsegitea"
+
+#: resources.h:9 resources.h:37
+msgid "Fingerprint (MD5):"
+msgstr "Hatzmarka (MD5):"
+
+#: resources.h:10 resources.h:38
+msgid "Fingerprint (SHA-1):"
+msgstr "Hatzmarka (SHA-1):"
+
+#: resources.h:188 resources.h:201
+msgid "Fingerprint:"
+msgstr "Hatzmarka:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:42
+msgid "Firewall and router configuration wizard"
+msgstr "Suhesi eta bideratzaile itxurapen laguntzailea"
+
+#: resources.h:750
+msgid ""
+"For more detailed information about what these options do, please run the "
+"network configuration wizard."
+msgstr ""
+"Aukera honek zer egiten duen argibide gehiagorako, mesedez ekin sare "
+"itxuratzaile laguntzailea."
+
+#: resources.h:727
+msgid "For reliability you should specify a range of at least 10 ports."
+msgstr ""
+"Fidagarritasun gehiagorako gutxinez 10 atakako maila bat eman behar duzu."
+
+#: ../../locales/../src/interface/Options.cpp:215
+msgid ""
+"For this session the default settings will be used. Any changes to the "
+"settings will not be saved."
+msgstr ""
+"Saio honetarako berezko ezarpenak erabiliko dira. Ezarpenen aldaketak ez "
+"dira gordeko."
+
+#: resources.h:117
+msgid "Force &UTF-8"
+msgstr "Behartu &UTF-8"
+
+#: resources.h:560
+msgid "Force showing &hidden files"
+msgstr "Beh&artu ezkutuko agiriak erakustea"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:678
+msgid "Force showing hidden files"
+msgstr "Behartu ezkutuko agiriak erakustea"
+
+#: resources.h:794
+msgid "Format specifications:"
+msgstr "Heuskarri ezaugarriak:"
+
+#: resources.h:964
+msgid "Format: Extension followed by properly quoted command and arguments."
+msgstr ""
+"Heuskarria: Luzapena egoki aipaturiko agindu eta argumentuz jarraiturik."
+
+#: resources.h:478
+msgid "Further documentation"
+msgstr "Agiritza gehigarria"
+
+#: resources.h:86
+msgid "General"
+msgstr "Orokorra"
+
+#: ../../locales/../src/engine/proxy.cpp:430
+msgid "General SOCKS server failure"
+msgstr "HARTUNE orokor zerbitzari hutsegitea"
+
+#: resources.h:812
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:122
+msgid "Generic proxy"
+msgstr "Proxy generikoa"
+
+#: resources.h:716
+msgid "Get external IP address from the following URL:"
+msgstr "Lortu kanpoko IP helbidea hurrengo URL-tik:"
+
+#: resources.h:479
+msgid "Getting help"
+msgstr "Lortu laguntza"
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Given filterset name already exists, overwrite filter set?"
+msgstr ""
+"Emandako iragaki-ezarpena jadanik badago, gainidatzi iragazki ezarpena?"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
+msgid "Global bookmarks"
+msgstr "Lastermarka orokorrak"
+
+#: resources.h:174
+msgid "GnuTLS:"
+msgstr "GnuTLS:"
+
+#: resources.h:146
+msgid "Group permissions"
+msgstr "Talde baimenak"
+
+#: resources.h:616
+msgid "H&igh"
+msgstr "&Handia"
+
+#: ../../locales/../src/engine/server.cpp:18
+msgid "HTTPS - HTTP over TLS"
+msgstr "HTTPS - HTTP TLS bidez"
+
+#: resources.h:349
+msgid "Hash:"
+msgstr "Hasha:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+msgid "Hidden"
+msgstr "Ezkutuan"
+
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
+msgid "High"
+msgstr "Handia"
+
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
+msgid "Highest"
+msgstr "Handiena"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
+msgid "Highest available port has to be a number between 1024 and 65535."
+msgstr ""
+"Ataka eskuragarri handiena 1024 eta 65535 arteko zenbaki bat izan behar da."
+
+#: resources.h:218
+msgid ""
+"Hold the shift key to toggle the filter state on both sides simultaneously."
+msgstr ""
+"Sakatu shift tekla iragazkiaren egoera bi aldeetan aldiberean aldatzeko."
+
+#: resources.h:165
+msgid "Homepage:"
+msgstr "Etxeko-orrialdea:"
+
+#: resources.h:351
+msgid "Host key fingerprint:"
+msgstr "Hostalari giltza hatzmarka:"
+
+#: resources.h:194
+msgid "Host key mismatch"
+msgstr "Hostalari giltza ez dator bat"
+
+#: ../../locales/../src/engine/server.cpp:168
+msgid "Host starts with '[' but no closing bracket found."
+msgstr "Hostalaria '['-rekin hasten da bana ez da amaiera kortxetea aurkitu."
+
+#: ../../locales/../src/engine/proxy.cpp:439
+msgid "Host unreachable"
+msgstr "Hostalari erdietsiezina"
+
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
+msgid "Host:"
+msgstr "Hostalaria:"
+
+#: resources.h:104
+msgid "Hours,"
+msgstr "Ordu"
+
+#: resources.h:913
+msgid "I&SO 8601 (example: 15:47)"
+msgstr "IS&O 8601 (adibidea: 15:47)"
+
+#: resources.h:754
+msgid ""
+"If no data is sent or received during an operation for longer than the "
+"specified time, the connection will be closed and FileZilla will try to "
+"reconnect."
+msgstr ""
+"Eragiketa batean ez bada daturik bidaltzen edo jasotzen adierazitako denbora-"
+"epean baino gehiagoan, elkarketa itxi egingo da eta FileZilla "
+"berrelkarketatzen saiatuko da."
+
+#: resources.h:998
+msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
+msgstr ""
+"Akatsak jakinaraziz gero, mesedez eman oharrak \"Berritsu\" oharketa "
+"mailarekin."
+
+#: resources.h:707
+msgid ""
+"If the automatic test at the end of this wizard succeeds, but you cannot "
+"transfer files to a particular server, the server might be misconfigured and "
+"you should try active mode. You can set the transfer mode on a per-server "
+"basis in the Site Manager."
+msgstr ""
+"Laguntzaile honen amaieran berezgaitasunezko azterketa ongi irtetzen bada, "
+"baina ezin baduzu agiririk eskualdatu zerbitzari jakin batera, badaiteke "
+"zerbitzaria desitxuratu izana eta modu aktiboarekin saiatu behar zara. "
+"Eskualdaketa modua Gune Kudeatzailean ezarri dezakezu."
+
+#: resources.h:702
+msgid ""
+"If the fallback option is enabled, you will be able to connect to "
+"misconfigured servers which reject the selected transfer mode."
+msgstr ""
+"Itzulera aukera gaituta badago, gai izango zara hautaturiko eskualdaketa "
+"modua baztertzen duten desitxuraturiko zerbitzarietara elkarketatzeko."
+
+#: resources.h:197
+msgid ""
+"If the host key change was not expected, please contact the server "
+"administrator."
+msgstr ""
+"Hostalari giltza ustekabean aldatzen bada, mesedez jarri harremanetan "
+"administratzailearekin."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:554
+msgid ""
+"If the problem persists, some router and/or firewall keeps blocking "
+"FileZilla."
+msgstr ""
+"Arazoak jarraitzen badu, bideratzaile eta/edo suhesiren batek FileZilla "
+"blokeatzen ari da."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:563
+msgid ""
+"If the problem persists, some router and/or firewall keeps interrupting the "
+"connection."
+msgstr ""
+"Arazaak jarraitzen badu, bideratzaile eta/edo suhesiren bat elkarketa eteten "
+"ari da."
+
+#: resources.h:987
+msgid ""
+"If the size of the logfile reaches the limit, it gets renamed by adding \".1"
+"\" to the end of the filename (possibly overwriting older logfiles) and a "
+"new file gets created."
+msgstr ""
+"Ohar-agiriaren neurriak muga erdiesten badu, berrizendatua da \".1\" gehituz "
+"agirizenaren amaieran (zihurrenik ohar-agiri zaharrak gainidatziz) eta agiri "
+"berri bat sortzen da."
+
+#: resources.h:464
+msgid ""
+"If the symlink points to a directory, FileZilla can either delete the "
+"symbolic link or remove the contents of the linked directory."
+msgstr ""
+"Sinlotura zuzenbide batera bada, FileZillak lotura sinbolikoa ezabatu edo "
+"loturaturiko zuzenbideko edukiak kendu ditzake."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:624
+msgid ""
+"If this problem persists, please contact your router or firewall "
+"manufacturer for a solution."
+msgstr ""
+"Arazoak jarraitzen badu, mesedez jarri harremanetan zure bideratzaile edo "
+"suhesiaren egilearekin konponbide bat bilatzeko."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:582
+msgid "If this problem stays, please contact your router manufacturer."
+msgstr ""
+"Arazoak jarraitzen badu, mesedez jarri harremanetan zure bideratzaile "
+"egilearekin."
+
+#: resources.h:287 resources.h:876
+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 ""
+"'gainidatzi berriagoa bada' erabiltzen bada, zure sistemaren ordua "
+"zerbitzariarekin aldiberetu behar da. Ordua ezberdina bada (adib. ordu-eremu "
+"ezberdinak), adierazi ordu-eremu oreka gune kudeatzailean."
+
+#: resources.h:937
+msgid ""
+"If using timestamp based comparison, consider two files equal if their "
+"timestamp difference does not exceed this threshold."
+msgstr ""
+"Denbora-irarkertan ohinarrituriko alderaketa erabiliz gero, hartu bi agiri "
+"berdintzat beren denbora-irarketa ezberdintasunak ez badu muga hau "
+"gainditzen."
+
+#: resources.h:952
+msgid "If you change the language, you should restart FileZilla."
+msgstr "Hizkuntza aldatzen baduzu, FileZilla berrabiarazi behar duzu."
+
+#: resources.h:733
+msgid ""
+"If you click on test, FileZilla will connect to probe.filezilla-project.org "
+"and will perform some simple tests."
+msgstr ""
+"Azterketa klikatzen baduzu, FileZilla probe.filezilla-project.org-ra "
+"elkarketatu eta zenbait azterketa arrunt egingo ditu."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
+msgid "If you close FileZilla, your changes will be lost."
+msgstr "FileZilla isten baduzu, zure aldaketak galdu egingo dira."
+
+#: resources.h:852
+msgid ""
+"If you enter the wrong filetypes, those files may get corrupted when "
+"transferred."
+msgstr ""
+"Agirimota okerrak sartzen badituzu, agiri hauek hondatu egin daitezke "
+"eskualdatzerakoan."
+
+#: resources.h:734
+msgid "If you get any errors, your configuration is not correct."
+msgstr "Akatsen bat agertzen bada, zure itxurapena ez da zuzena."
+
+#: resources.h:766
+msgid ""
+"If you have problems to retrieve directory listings or to transfer files, "
+"try to change the default transfer mode."
+msgstr ""
+"Arazoak badituzu zuzenbide zerrendapenak berreskuratzeko edo agiriak "
+"eskualdatzeko, saiatu berezko eskualdaketa modura aldatuz."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:569
+msgid ""
+"If you keep having problems with a specific server, the server itself or a "
+"remote router or firewall might be misconfigured. In this case try to toggle "
+"passive mode and contact the server administrator for help."
+msgstr ""
+"Zerbitzari jakin batekin arazoak izaten jarraitzen baduzu, badaiteke "
+"zerbitzaria bera edo hurreneko bideratzailea edo suhesia desitxuraturik "
+"egotea. Kasu honetan saiatu modu pasibora aldatzen eta jarri harremanetan "
+"zure zerbitzari administratzailearekin laguntza lortzeko."
+
+#: resources.h:693
+msgid ""
+"If you successfully complete the wizard and the final test succeeds, any "
+"firewalls and routers you have should be configured properly."
+msgstr ""
+"Laguntzailea ongi osatzen baduzu eta azken azterketa egiten bada, dituzun "
+"suhesi eta bideratzaile guztiak ongi itxuraturik egon behar dira."
+
+#: resources.h:729
+msgid ""
+"If you use a firewall, make sure FileZilla is allowed to accept connection "
+"on all given ports."
+msgstr ""
+"Suhesi bat erabiltzen baduzu, zihurtatu FileZilla ahalbideturik dagoela "
+"emaniko ataka guztietan elkarketak onartzeko."
+
+#: resources.h:728
+msgid ""
+"If you use a router, make sure all these ports are forwarded to the machine "
+"you're running FileZilla on."
+msgstr ""
+"Bideratzaile bat erabiltzen baduzu, zihurtatu ataka hauek FileZilla "
+"erabiltzen ari zaren gailura bidaltzen direla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:595
+msgid ""
+"If your router keeps changing the IP address, please contact your router "
+"manufacturer."
+msgstr ""
+"Zure bideratzaileak IP helbidea aldatzen jarraitzen du, mesedez jarri "
+"harremanetan zure bideratzaile egilearekin."
+
+#: ../../locales/../src/interface/import.cpp:96
+msgid "Import data from older version"
+msgstr "Inportatu datuak bertsio zaharragotik"
+
+#: resources.h:306
+msgid "Import settings"
+msgstr "Inportatu ezarpenak"
+
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
+msgid "Import successful"
+msgstr "Ongi inportatu da"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
+msgid "Improperly quoted association."
+msgstr "Ezegoki aipaturiko elkarketa"
+
+#: resources.h:721
+msgid ""
+"In active mode, FileZilla has to listen on a port for data transfers. You "
+"have to specify which ports FileZilla will use."
+msgstr ""
+"Modu aktiboan, FileZillak ataka batean aditu behar du datu eskualdaketarako. "
+"FileZillak erabiliko dituen atakak adierazi behar dituzu."
+
+#: resources.h:723
+msgid ""
+"In case you have a router, you will have to forward all available ports, as "
+"FileZilla has no influence on the ports your system chooses."
+msgstr ""
+"Bideratzaile bat baduzu, ataka eskuragarri guztiak bidali behar dituzu, "
+"honela FileZillak ez du eraginik zure sistemak hautatzen dituen atakatan."
+
+#: resources.h:263
+msgid ""
+"In case you prefer automatic updates, you can enable automatic update checks "
+"in the settings dialog."
+msgstr ""
+"Berezgaitasunezko eguneraketak nahiago badituzu, berezgaitasunezko "
+"eguneraketa egiaztapena gaitu dezkezu ezarpenen elkarrizketan."
+
+#: resources.h:711 resources.h:775
+msgid ""
+"In order to use active mode, FileZilla needs to know your external IP "
+"address."
+msgstr ""
+"Modu aktiboa erabiltzeko, FileZillak zure kanpoko IP helbidea jakin behar du."
+
+#: resources.h:696
+msgid ""
+"In passive mode, which is recommended for most users, FileZilla asks the "
+"server for a port and connects to the given port. Not much configuration has "
+"to be done for this."
+msgstr ""
+"Modu pasiboa, erabiltzaile gehienentzat hau da gomendarria, FileZillak "
+"zerbitzariari galdetzen dio ataka eta emaniko atakara elkarketatzen da. Ez "
+"da itxurapen gehiago egin behar honetarako."
+
+#: ../../locales/../src/engine/tlssocket.cpp:958
+msgid ""
+"Incomplete chain, top certificate is not self-signed certificate authority "
+"certificate"
+msgstr ""
+"Kate osatu gabea, goiko egiaztagiria ez da berak-sinaturiko egiaztagiri "
+"autoritate egiaztagiria"
+
+#: ../../locales/../src/interface/QueueView.cpp:1068
+msgid "Incorrect password"
+msgstr "Sarhitz okerrak"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
+msgid "Initializing TLS..."
+msgstr "TLS abiarazten..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "Segurtasun gabeko zerbitzaria, ez du FTP TLS gain sostengatzen."
+
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:191
+msgid "Interactive"
+msgstr "Elkarrekintza"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:126
+msgid "Interface"
+msgstr "Interfazea"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:219
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
+msgid "Interrupted by user"
+msgstr "Erabiltzaileak etenda"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+msgid "Invalid Content-Length"
+msgstr "Eduki-Luzera baliogabea"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:623
+msgid "Invalid HTTP Response"
+msgstr "HTTP erantzun baliogabea"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
+msgid ""
+"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
+"site manager to force UTF-8."
+msgstr ""
+"Hizki-kode sekuentzia baliogabea jaso da, UTF-8 ezgaitzen. Hautatu UTF-8 "
+"aukera gune kudeatzailean UTF-8 behartzeko."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+msgid "Invalid chunk size"
+msgstr "Chunk neurri baliogabea"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:353
+#: ../../locales/../src/interface/netconfwizard.cpp:363
+#: ../../locales/../src/interface/netconfwizard.cpp:372
+msgid "Invalid data received"
+msgstr "Datu baliogabeak jasota"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
+msgid "Invalid date"
+msgstr "Datu baliogabea"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid "Invalid filename"
+msgstr "Agirizen baliogabea"
+
+#: ../../locales/../src/engine/server.cpp:175
+msgid "Invalid host, after closing bracket only colon and port may follow."
+msgstr ""
+"Hostalari baliogabea, kortxetea itxi ondoren bi puntuk eta atakak bakarrik "
+"jarraitu dezakete."
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "Invalid input"
+msgstr "Sarrera baliogabea"
+
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
+msgid "Invalid port given. The port has to be a value from 1 to 65535."
+msgstr ""
+"Baliogabeko ataka eman da. Ataka 1 eta 65535 arteko balio bat izan behar da."
+
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+msgid ""
+"Invalid protocol specified. Valid protocols are:\n"
+"ftp:// for normal FTP,\n"
+"sftp:// for SSH file transfer protocol,\n"
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
+msgstr ""
+"Baliogabeko protokoloa adierazi da. Baliozko protokoloak dira:\n"
+"ftp:// FTP arrunterako,\n"
+"sftp:// SSH agiri eskualdaketa protokolorako,\n"
+"ftps:// FTP TLS (inplizitoa) gain eta\n"
+"ftpes:// FTP TLS (esplizitoa) gain."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Proxy hostalari baliogabea, kortxetea itxi ondoren bi puntuk eta atakak "
+"bakarrik jarraitu dezakete."
+
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Invalid regular expression in search conditions."
+msgstr "Adierazpen arrunt baliogabea bilaketa baldintzatan."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:633
+msgid "Invalid response code"
+msgstr "Erantzun kode baliogabea"
+
+#: ../../locales/../src/interface/search.cpp:693
+#, c-format
+msgid "Invalid search conditions: %s"
+msgstr "Bilaketa baldintza baliogabeak: %s"
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Invalid site path"
+msgstr "Gune helburu baliogabea"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
+msgid "Invalid size in condition"
+msgstr "Neurri baliogabea baldintzan"
+
+#: ../../locales/../src/engine/server.cpp:138
+msgid "Invalid username given."
+msgstr "Baliogabeko erabiltzaile-izena eman da."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
+msgid "Jurisdiction country:"
+msgstr "Auzibarruti nazioa:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
+msgid "Jurisdiction locality:"
+msgstr "Auzibarruti herria:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
+msgid "Jurisdiction state or province:"
+msgstr "Auzibarruti estatua edo herrialdea:"
+
+#: resources.h:934
+msgid "Keep directories on top"
+msgstr "Eduki zuzenbideak gainean"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:682
+msgid ""
+"Keep in mind that not all servers support this feature and may return "
+"incorrect listings if this option is enabled. Although FileZilla performs "
+"some tests to check if the server supports this feature, the test may fail."
+msgstr ""
+"Gogoan izan zerbitzari guztiek ez dutela ezaugarri hau sostengatzen eta "
+"badaiteke zerrendapen okerrak itzultzea aukera hau gaituta badago. "
+"FileZillak zenbait azterketa egiten ditu zerbitzariak ezaugarri hau "
+"sostengatzen duen jakiteko, baina aztarketak huts egin dezake."
+
+#: resources.h:346
+msgid "Key exchange"
+msgstr "Giltza aldaketa"
+
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Giltza aldaketa"
+
+#: resources.h:619
+msgid "L&owest"
+msgstr "A&palena"
+
+#: resources.h:950
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:131
+msgid "Language"
+msgstr "Hizkuntza"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
+msgid "Language changed"
+msgstr "Hizkuntza aldatuta"
+
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:383
+msgid "Last modified"
+msgstr "Azken aldaketa"
+
+#: resources.h:879
+msgid "Layout"
+msgstr "Antolakuntza"
+
+#: resources.h:825
+msgid "Limit for concurrent &downloads:"
+msgstr "Aldibereko &jeisketentzako muga:"
+
+#: resources.h:827
+msgid "Limit for concurrent &uploads:"
+msgstr "Aldibereko &igoerentzako muga:"
+
+#: resources.h:770
+msgid "Limit local ports"
+msgstr "Mugatu tokiko atakak"
+
+#: resources.h:984
+msgid "Limit size of logfile"
+msgstr "&Mugatu ohar-agiriaren neurria"
+
+#: resources.h:985
+msgid "Limit:"
+msgstr "Muga:"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+msgid "Line length exceeded"
+msgstr "Gehiegizko lerro luzera"
+
+#: resources.h:176
+msgid "Linked against"
+msgstr "Loturak"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:267
+msgid "Listen socket closed"
+msgstr "Aditze hartunea itxita"
+
+#: ../../locales/../src/engine/logging.cpp:220
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
+msgid "Listing:"
+msgstr "Zerrendapena:"
+
+#: resources.h:773
+msgid "Lo&west available port:"
+msgstr "Ataka eskuragarri t&xikiena:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
+msgid "Local"
+msgstr "Tokikoa"
+
+#: resources.h:373
+msgid "Local file"
+msgstr "Tokiko agiria"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:328
+msgid "Local file does not exist."
+msgstr "Tokiko agiria ez dago."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:323
+msgid "Local file is a directory instead of a regular file."
+msgstr "Tokiko agiria zuzenbide bat da agiri arrunt baten ordez."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr "Tokiko agiria ez da baliozko agirizena."
+
+#: resources.h:212
+msgid "Local filters:"
+msgstr "Tokiko iragazkiak:"
+
+#: ../../locales/../src/interface/viewheader.cpp:360
+msgid "Local site:"
+msgstr "Tokiko gunea:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
+msgid "Locality:"
+msgstr "Kokalekua:"
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
+msgid "Log file"
+msgstr "Ohar agiria"
+
+#: resources.h:260
+msgid "Log of update check:"
+msgstr "Eguneraketa egiaztapenaren oharra:"
+
+#: resources.h:979
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:140
+msgid "Logging"
+msgstr "Oharreratzea"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+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 ""
+"Saiohaste datuek ez-ASCII hizki-kodeak dituzte eta zerbitzaria badaiteke UTF-"
+"8 jakituen ez izatea. Ezinezkoa tokiko hizki-kodera itzultzea proxya "
+"erabiliz."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
+msgid ""
+"Login data contains non-ASCII characters and server might not be UTF-8 "
+"aware. Trying local charset."
+msgstr ""
+"Saiohaste datuek ez-ASCII hizki-kodeak dituzte eta zerbitzaria badaiteke UTF-"
+"8 jakituen ez izatea. Tokiko hizki-kodearekin saiatzen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
+msgid "Login sequence fully executed yet not logged in. Aborting."
+msgstr ""
+"Saio-haste sekuentzia osoa exekutaturik oraindik ez da egiaztatu. Uzten."
+
+#: ../../locales/../src/interface/cmdline.cpp:98
+msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
+msgstr ""
+"Saiohaste-mota, 'galdera' edo 'elkarrekintza' izan beahr da (aipamen gabe)"
+
+#: ../../locales/../src/interface/cmdline.cpp:10
+#, c-format
+msgid ""
+"Logontype, can only be used together with FTP URL. Argument has to be either "
+"'%s' or '%s'"
+msgstr ""
+"Saiohaste-mota, FTP URL-arekin batera bakarrik erabili daiteke. Argumenduta "
+"izan behar da '%s' edo '%s'"
+
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
+msgid "Low"
+msgstr "Apala"
+
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
+msgid "Lowest"
+msgstr "Apalena"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
+msgid "Lowest available port has to be a number between 1024 and 65535."
+msgstr ""
+"Ataka eskuragarri apalena 1024 eta 65535 arteko zenbaki bat izan behar da."
+
+#: resources.h:24 resources.h:52
+msgid "MAC:"
+msgstr "MAC:"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
+msgid "Make sure the file can be accessed and is a well-formed XML document."
+msgstr ""
+"Zihurtatu agiriak sarbidea duela eta ongi-osaturiko XML agiri bat dela."
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+#, c-format
+msgid "Malformed chunk data: %s"
+msgstr "Chunk datu gaizki osatua: %s"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+#, c-format
+msgid "Malformed header: %s"
+msgstr "Idazburu gaizki-osatua: %s"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:593
+msgid "Malformed reply, server not sending proper line endings"
+msgstr ""
+"Gaizki-osaturiko erantzuna, zerbitzariak ez ditu lerro amaiera egokiak "
+"bidaltzen"
+
+#: resources.h:403 ../../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
+msgid "Manual transfer"
+msgstr "Eskuzko eskualdaketa"
+
+#: resources.h:443
+msgid "Match all of the following"
+msgstr "Bat datoz hurrengo guztiak"
+
+#: resources.h:444
+msgid "Match any of the following"
+msgstr "Bat dator hurrengoetakoren bat"
+
+#: resources.h:445
+msgid "Match none of the following"
+msgstr "Ez dator bat hurrengoetako bat ere"
+
+#: resources.h:823
+msgid "Maximum simultaneous &transfers:"
+msgstr "Ge&hienezko eskualdaketa aldiberean:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
+msgid "Message log"
+msgstr "Mezu oharra"
+
+#: resources.h:890
+msgid "Message log position"
+msgstr "Mezu ohar kokapena"
+
+#: resources.h:986
+msgid "MiB"
+msgstr "MiB"
+
+#: resources.h:105
+msgid "Minutes"
+msgstr "Minutu"
+
+#: resources.h:367
+msgid "Move &down"
+msgstr "Mugitu &behera"
+
+#: resources.h:366
+msgid "Move &up"
+msgstr "Mugitu &gora"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+msgid "My Computer"
+msgstr "Nire Ordenagailua"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
+msgid "My Documents"
+msgstr "Nire Agiriak"
+
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
+msgid "My Sites"
+msgstr "Nire Guneak"
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
+msgid "N/a"
+msgstr "E/g"
+
+#: resources.h:408
+msgid "Name"
+msgstr "Izena"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
+msgid "Name already exists"
+msgstr "Izena jadanik badago"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+msgid "Name of bookmark already exists."
+msgstr "Lastermarkaren izena jadanik badago."
+
+#: resources.h:128 resources.h:177
+msgid "Name:"
+msgstr "Izena:"
+
+#: ../../locales/../src/interface/filteredit.cpp:349
+msgid "Need to enter filter name"
+msgstr "Iragazki izena sartu behar da"
+
+#: ../../locales/../src/interface/search.cpp:683
+msgid "Need to enter valid remote path"
+msgstr "Hurruneko helburu baliozkoa sartu behar da"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
+msgid "Need to specify a character encoding"
+msgstr "Hizki kodeaketa adierazi behar da"
+
+#: ../../locales/../src/engine/proxy.cpp:436
+msgid "Network unreachable"
+msgstr "Sare erdietsiezina"
+
+#: resources.h:968
+msgid "Never"
+msgstr "Inoiz ez"
+
+#: resources.h:81
+msgid "New &Folder"
+msgstr "&Agiritegi Berria"
+
+#: resources.h:510
+msgid "New &tab"
+msgstr "&Hegats berria"
+
+#: resources.h:82 resources.h:423
+msgid "New Book&mark"
+msgstr "&Lastermarka Berria"
+
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
+msgid "New bookmark"
+msgstr "Lastermarka berria"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
+msgid "New directory"
+msgstr "Zuzenbide berria"
+
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
+#, c-format
+msgid "New features and improvements in %s"
+msgstr "%s-ko ezaugarri berriak eta hobekuntzak"
+
+#: ../../locales/../src/interface/filteredit.cpp:131
+msgid "New filter"
+msgstr "Iragazki berria"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
+msgid "New folder"
+msgstr "Agiritegi berria"
+
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
+msgid "New site"
+msgstr "Gune berria"
+
+#: resources.h:888
+msgid "Next to the transfer queue"
+msgstr "Hurrengoa eskualdaketa lerroan"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+msgid "No"
+msgstr "Ez"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "No category to export selected"
+msgstr "Ez dago kategoriarik hautaturikoa esportazeko"
+
+#: ../../locales/../src/interface/QueueView.cpp:2301
+msgid "No command given, aborting."
+msgstr "Ez da agindurik eman, uzten."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
+msgid "No external IP address set, trying default."
+msgstr "Ez da kanpoko IP-rik ezarri, berezkoarekin saiatzen."
+
+#: ../../locales/../src/interface/edithandler.cpp:1227
+msgid "No files are currently being edited."
+msgstr "Ez dago agiririk orain editzatzen."
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "No filter name given"
+msgstr "Ez da iragazki izenik eman"
+
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
+msgid "No host given, please enter a host."
+msgstr "Ez da hostalaririk eman, mesedez sartu hostalari bat."
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
+msgid "No images available"
+msgstr "Ez dago irudirik eskuragarri"
+
+#: ../../locales/../src/interface/QueueView.cpp:3172
+msgid "No more files in the queue!"
+msgstr "Ez dago agiri gehiago lerroan!"
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "No name for the filterset given."
+msgstr "Ez da iragazki-ezarpenerako izenik eman."
+
+#: resources.h:439
+msgid "No program associated with filetype"
+msgstr "Ez dago programarik agirimotarekin elkarturik"
+
+#: resources.h:429
+#, c-format
+msgid "No program has been associated to edit files with the extension '%s'."
+msgstr "Ez da programarik elkartu '%s' luzapena duten agiriak editatzeko."
+
+#: ../../locales/../src/interface/search.cpp:541
+msgid "No search results"
+msgstr "Ez da emaitzik aurkitu"
+
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
+msgid "No sites available"
+msgstr "Ez dago gunerik eskuragarri"
+
+#: ../../locales/../src/engine/proxy.cpp:404
+msgid "No supported SOCKS5 auth method"
+msgstr "SOCKS5 egiaztapen metodo sostengatu gabea"
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "No username given."
+msgstr "Ez da erabiltzaile-izenik eman."
+
+#: resources.h:944 resources.h:949
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
+msgid "None"
+msgstr "Ezer ez"
+
+#: resources.h:383
+msgid "None selected yet"
+msgstr "Ez da ezer hautatu oraindik"
+
+#: resources.h:836 ../../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:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+msgid "Normal"
+msgstr "Arrunta"
+
+#: ../../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 "Gai guztiak ezin dira berlerrokatu ikus/editatzeko."
+
+#: ../../locales/../src/interface/state.cpp:199
+#: ../../locales/../src/interface/state.cpp:527
+msgid "Not connected"
+msgstr "Elkarketatu gabe"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
+msgid "Not connected to any server"
+msgstr "Zerbitzarira elkarketatu gabe"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:568
+msgid "Not connected to any server."
+msgstr "Zerbitzarira elkarketatu gabe."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:27
+msgid "Not connected."
+msgstr "Elkarketatu gabe"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:680
+msgid "Note that this feature is only supported using the FTP protocol."
+msgstr ""
+"Ohartu ezaugarri hau FTP protokoloa erabiliz bakarrik sostengatzen dela."
+
+#: resources.h:804
+msgid "Note: This only works with plain, unencrypted FTP connections."
+msgstr ""
+"Oharra: Honek FTP elkarketa lau enkriptatu gabeekin bakarrik egiten du lan."
+
+#: resources.h:821
+msgid "Note: Using a generic proxy forces passive mode on FTP connections."
+msgstr ""
+"Oharra: Proxy generikoa erabiltzeak modu pasiboa behartzen du FTP "
+"elkarketetan."
+
+#: resources.h:923
+msgid "Number of decimal places:"
+msgstr "Hamarren zenbatekoa:"
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
+msgid "Number of retries has to be between 0 and 99."
+msgstr "Bersaiatze zenbatekoa 0 eta 99 artekoa izan behar da."
+
+#: resources.h:342
+msgid "O&pen file"
+msgstr "&Ireki agiria"
+
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
+msgid "OK"
+msgstr "Ongi"
+
+#: resources.h:703
+msgid ""
+"On the following pages, the selected transfer mode will be configured, as "
+"well as the fallback mode if enabled."
+msgstr ""
+"Hurrengo orrialdeetan, hautaturiko eskualdakete modua itxuratuko da, baita "
+"itzulera modua gaituta badago."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+msgid "Once"
+msgstr "Behin"
+
+#: resources.h:969
+msgid "Once a week"
+msgstr "Astean behin"
+
+#: resources.h:672
+msgid "Open directory in system's file manager"
+msgstr "Ireki zuzenbidea sistemaren agiri kudeatzailean"
+
+#: resources.h:1000
+msgid "Open the Site Manager"
+msgstr "Ireki Gune Kudeatzailea"
+
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Ireki Gune Kudeatzailea."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Ireki Gune Kudeatzailea. Eskuin-klikatu guneen zerrendarako."
+
+#: resources.h:580
+msgid "Open the file."
+msgstr "Ireki agiria."
+
+#: resources.h:523
+msgid "Open the settings dialog of FileZilla"
+msgstr "Ireki FileZilla-ren ezarpen elkarrizketa"
+
+#: resources.h:318
+msgid "Opened as:"
+msgstr "Honela irekita:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
+msgid "Opening failed"
+msgstr "Irekitze hutsegitea"
+
+#: resources.h:511
+msgid "Opens a new tab"
+msgstr "Hegats berri bat irekitzen du"
+
+#: resources.h:508
+msgid "Opens the Site Manager"
+msgstr "Gune Kudeatzailea irekitzen du"
+
+#: resources.h:1022
+msgid ""
+"Opens the directory listing filter dialog. Right-click to toggle filters."
+msgstr ""
+"Iragazki elkarrizketa zerrenda zuzenbidea irekitzen du. Eskuin-klikatu "
+"iragazkiak aldatzeko."
+
+#: resources.h:180
+msgid "Operating system"
+msgstr "Sistema eragilea"
+
+#: ../../locales/../src/interface/FileZilla.cpp:310
+msgid "Operating system problem detected"
+msgstr "Sistema eragile arazoa atzeman da"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
+msgid "Organization:"
+msgstr "Erakundea:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
+msgid "Other:"
+msgstr "Bestelakoa:"
+
+#: resources.h:749
+msgid "Overview"
+msgstr "Gainbegirada"
+
+#: resources.h:67
+msgid "Overwrite &if source newer"
+msgstr "Gainidatzi iturburua &berriagoa bada"
+
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
+msgid "Overwrite file"
+msgstr "Gainidatzi agiria"
+
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
+msgid "Overwrite file if size differs"
+msgstr "Gainidatzi agiria neurriak ezberdinak badira"
+
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
+msgid "Overwrite file if size differs or source file is newer"
+msgstr "Gainidatzi agiria neurria ezberdina edo iturburua berriagoa bada"
+
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
+msgid "Overwrite file if source file newer"
+msgstr "Gainidatzi agiria iturburua berriagoa bada"
+
+#: resources.h:68
+msgid "Overwrite if &different size"
+msgstr "Gainidatzi &neurria ezberdina bada"
+
+#: resources.h:69
+msgid "Overwrite if different si&ze or source newer"
+msgstr "Gainidatzi neurria e&zberdina edo iturburua berriagoa bada"
+
+#: resources.h:142
+msgid "Owner permissions"
+msgstr "Jabe baimenak"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:377
+#: ../../locales/../src/interface/search.cpp:385
+msgid "Owner/Group"
+msgstr "Jabea/Taldea"
+
+#: resources.h:894
+msgid ""
+"P&revent system from entering idle sleep during transfers and other "
+"operations"
+msgstr ""
+"&Saihestu sistemaren lotaratze osoa eskualdaketa eta beste eragiketak "
+"burutzerakoan"
+
+#: resources.h:801 resources.h:817
+#, no-c-format
+msgid "P&roxy host:"
+msgstr "Proxy &hostalaria:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:488
+msgid "PORT command tainted by router or firewall."
+msgstr "ATAKA agindua bideratzaileak edo suhesiak kutsatuta."
+
+#: resources.h:763
+msgid "Pa&ssive (recommended)"
+msgstr "&Pasiboa (gomendatua)"
+
+#: ../../locales/../src/interface/updatewizard.cpp:332
+msgid "Package"
+msgstr "Paketea"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
+msgid "Parameter not a valid URL"
+msgstr "Paremetroa ez da baliozko URL bat"
+
+#: resources.h:93 resources.h:392 resources.h:741
+msgid "Pass&word:"
+msgstr "Sa&rhitza:"
+
+#: resources.h:699
+msgid "Passive (recommended)"
+msgstr "Pasiboa (gomendatua)"
+
+#: resources.h:783
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:119
+msgid "Passive mode"
+msgstr "Modu pasiboa"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:588
+#: ../../locales/../src/interface/netconfwizard.cpp:601
+#: ../../locales/../src/interface/netconfwizard.cpp:612
+msgid "Passive mode has been set as default transfer mode."
+msgstr "Modu pasiboa berezko eskualdaketa modu bezala ezarri da."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
+msgid "Password required"
+msgstr "Sarhitza beharrezkoa"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
+#: ../../locales/../src/interface/search.cpp:380
+msgid "Path"
+msgstr "Helburua"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
+#, c-format
+msgid "Path cannot be constructed for directory %s and subdir %s"
+msgstr "Ezin da helburua eraiki %s zuzenbidearentzat eta %s azpizuzenb-rentzat"
+
+#: resources.h:410
+msgid "Paths"
+msgstr "Helburuak"
+
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
+msgid "Pending removal"
+msgstr "Kentzeke"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
+msgid "Permission"
+msgstr "Baimena"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:376
+#: ../../locales/../src/interface/search.cpp:384
+msgid "Permissions"
+msgstr "Baimenak"
+
+#: resources.h:179
+msgid "Platform:"
+msgstr "Plataforma:"
+
+#: resources.h:259
+msgid ""
+"Please check http://filezilla-project.org for the most recent version of "
+"FileZilla."
+msgstr ""
+"Mesedez egiaztatu http://filezilla-project.org FileZilla-ren bertsio "
+"berrienerako."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:553
+msgid ""
+"Please check on http://filezilla-project.org/probe.php that the server is "
+"running and carefully check your settings again."
+msgstr ""
+"Mesedez egiaztatu hemen: http://filezilla-project.org/probe.php zerbitzaria "
+"ekinean dagoela eta zure ezarpenak berriro egiaztatzeko."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1091
+msgid ""
+"Please check the package manager of your system for an updated package or "
+"visit http://filezilla-project.org to download the source code of FileZilla."
+msgstr ""
+"Mesedez egiaztatu zure sistemako pakete kudeatzailea pakete eguneratu "
+"baterako edo ikusi http://filezilla-project.org FileZilla-ren iturburu kodea "
+"jeisteko."
+
+#: resources.h:705
+msgid ""
+"Please configure any firewalls and routers so that FileZilla can establish "
+"outgoing connection to arbitrary ports."
+msgstr ""
+"Mesedez itxuratu suhesi eta bideratzaile guztiak FileZillak kanporako "
+"elkarketa gogarako atakatan ezarri ahal izateko."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:623
+msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
+msgstr ""
+"Mesedez ezgaitu 'GDM modua' edo 'Jolas modua' bezalako ezarpenak zure "
+"bideratzailean."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:562
+msgid ""
+"Please ensure you have a stable internet connection and carefully check your "
+"settings again."
+msgstr ""
+"Mesedez zihurtatu internet elkarketa egonkorra duzula eta egiaztatu berriro "
+"kontu handiz zure ezarpenak."
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
+msgid "Please enter a custom date format."
+msgstr "Mesedez sartu norbere egun heuskarria"
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
+msgid "Please enter a custom time format."
+msgstr "Mesedez sartu norbere ordu heuskarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr "Mesedez sartu egun bat UUUU-HH-EE heuskarrian, adibidez 2010-07-18."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#, c-format
+msgid "Please enter a download speed limit greater or equal to 0 %s/s."
+msgstr "Mesedez sartu jeisketa abiadura handiagoa edo berdina: 0 %s/s."
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+msgid "Please enter a name for the new filter."
+msgstr "Mesedez sartu izen bat iragazki berriarentzat."
+
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Please enter a new name for the copied filter."
+msgstr "Mesedez sartu izen bat berri bat kopiatutako iragazkiarentzat."
+
+#: ../../locales/../src/interface/filter.cpp:403
+#, c-format
+msgid "Please enter a new name for the filter set \"%s\""
+msgstr "Mesedez sartu izen berri bat \"%s\" iragazki ezarpenarentzat"
+
+#: ../../locales/../src/interface/filteredit.cpp:196
+msgid "Please enter a new name for the filter."
+msgstr "Mesedez sartu izen berri bat iragazkiarentzat."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent "
+"downloads."
+msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko jeisketa zenbatekorako."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent uploads."
+msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko igoera zenbatekorako."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
+msgid ""
+"Please enter a number between 1 and 10 for the number of concurrent "
+"transfers."
+msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko eskualdaketa "
+"zenbatekorako."
+
+#: resources.h:125
+msgid "Please enter a password for this server:"
+msgstr "Mesedez sartu sarhitz bat zerbitzari honentzat:"
+
+#: ../../locales/../src/interface/QueueView.cpp:2290
+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 ""
+"Mesedez sartu helburu bat eta ekiteko exekutagarria.\n"
+"Adib. c:\\Helbururen bat\\agiria.exe MS Windows-en edo /Helbururen bat/"
+"agiria Unix-en.\n"
+"Aukeran programa argumentuak ere adierazi ditzakezu."
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
+msgid ""
+"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
+msgstr ""
+"Mesedez sartu 5 eta 9999 segundu arteko denbora-epe bat edo 0 denbora-epeak "
+"ezgaitzeko."
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Please enter a unique name for this filter set"
+msgstr "Mesedez sartu izen bakar bat iragazki ezarpen honentzat"
+
+#: resources.h:126
+msgid "Please enter a username for this server:"
+msgstr "Mesedez sartu erabiltzaile-izen bat zerbitzari honentzat:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:182
+msgid "Please enter a valid portrange."
+msgstr "Mesedez sartu ataka-maila baliozko bat."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:161
+msgid "Please enter an URL where to get your external address from"
+msgstr "Mesedez sartu URL bat non zure kanpoko helbidea lortzeko"
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+#, c-format
+msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
+msgstr "Mesedez sartu igoera abiadura handiagoa edo berdina: 0 %s/s."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:580
+msgid ""
+"Please enter raw FTP command.\n"
+"Using raw ftp commands will clear the directory cache."
+msgstr ""
+"Mesedez sartu idazki FTP agindua.\n"
+"Idazki ftp aginduak erabiltzeak zuzenbide katxea garbituko du."
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
+msgid "Please enter the name of the directory which should be created:"
+msgstr "Mesedez sartu sortu behar den zuzenbide izena:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Mesedez sartu sortu behar den agiriaren izena:"
+
+#: resources.h:127
+msgid "Please enter username and password for this server:"
+msgstr "Mesedez sartu erabiltzaile-izena eta sarhitza zerbitzari honentzat:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:142
+msgid "Please enter your external IP address"
+msgstr "Mesedez sartu zure kanpoko IP helbidea"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:593
+#: ../../locales/../src/interface/netconfwizard.cpp:606
+msgid ""
+"Please enter your external IP address on the active mode page of this "
+"wizard. In case you have a dynamic address or don't know your external "
+"address, use the external resolver option."
+msgstr ""
+"Mesedez sartu zure kanpoko IP helbidea laguntzaile honen modu aktiboko "
+"orrialdean. Helbide aldakor bat baduzu edo ez baduzu zure kanpoko helbidea "
+"ezagutzen, erabili kanpoko konponbidea aukera."
+
+#: resources.h:692
+msgid ""
+"Please follow the instructions carefully, as wrong configuration will "
+"prevent successful FTP connections."
+msgstr ""
+"Mesedez jarraitu jarraipideak kontu handiz , itxurapen oker batek FTP "
+"elkarketak ongi egitea saihestuko du."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:617
+msgid ""
+"Please make sure FileZilla is allowed to establish outgoing connections and "
+"make sure you typed the address of the address resolver correctly."
+msgstr ""
+"Mesedez zihurtatu FileZilla ahalbideturik dagoela kanporako elkarketak "
+"ezartzeko eta zihurtatu zuzen idatzi duzula erabaki helbidearen helbidea."
+
+#: ../../locales/../src/interface/FileZilla.cpp:262
+msgid "Please make sure the requested locale is installed on your system."
+msgstr "Mesedez zihurtatu eskaturiko tokikoa zure sisteman ezarrita dagoela."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:594
+msgid ""
+"Please make sure your router is using the latest available firmware. "
+"Furthermore, your router has to be configured properly. You will have to use "
+"manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
+"'game mode'."
+msgstr ""
+"Mesedez zihurtatu zure bideratzailea azken firmware eskuragarria erabiltzen "
+"ari dela. Gainera, zure bideratzailea egoki itxuraturik egon behar da. "
+"Eskuzko ataka bidalketa erabili beharko duzu. Ez ekin zure bideratzailea "
+"'GDM modua' edo 'jolas modua' deiturikoetan."
+
+#: resources.h:706
+msgid ""
+"Please note that FileZilla has no influence on the port the server chooses. "
+"So the server might choose a port which your firewall thinks is only used by "
+"trojans or other malware. This might raise a false alarm you can safely "
+"discard."
+msgstr ""
+"Mesedez ohartu FileZillak ez duela eraginik zerbitzariak hautatzen dituen "
+"atakatan. Hortaz zerbitzariak zure suhesiak trojarrak edo beste malware "
+"batzuek bakarrik erabiltzen dutela uste duen ataka bat hautatu dezake. Honek "
+"segurtasunez baztertu dezakezun alarma faltsu bat sortu dezake."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:730
+msgid ""
+"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
+"servers only works if they support the MFMT command."
+msgstr ""
+"Mesedez ohartu igoeratan denbora-irarketei heusteak FTP, FTPS eta FTPES "
+"zerbitzarietan lan egiten duela bakarrik MFMT agindua sostengatzen badute."
+
+#: resources.h:760
+msgid ""
+"Please note that some servers might ban you if you try to reconnect too "
+"often or in too short intervals."
+msgstr ""
+"Mesedez ohartu zerbitzari batzuk baztertu egin zaitzaketela sarriegi edo "
+"tarte txikiegitan berrelkarketatzen saiatzen bazara."
+
+#: resources.h:910 resources.h:916
+#, no-c-format
+msgid ""
+"Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
+"details"
+msgstr ""
+"Mesedez irakurri http://wiki.filezilla-project.org/Date_and_Time_formatting "
+"xehetasunetarako"
+
+#: resources.h:255
+msgid ""
+"Please retry downloading the update. Possible reasons if the problem "
+"persists (listed in order of decreasing probability):"
+msgstr ""
+"Mesedez saiatu eguneraketa jeisten. Arazoak jarraitzen badu ahalezko "
+"zergaitiak (beheranzko ahalezkotasunez zerrendatuta):"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:570
+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 ""
+"Mesedez ekin laguntzaile hau berriro zure sare ingurua aldatzen baduzu edo "
+"arazoak aurkitzen badituzu ongi lan egiten zuten zerbitzariekin."
+
+#: resources.h:465
+msgid "Please select an action:"
+msgstr "Mesedez hautatu ekintza bat:"
+
+#: resources.h:311
+msgid "Please select the categories you would like to import."
+msgstr "Mesedez hautatu inportatzea nahi dituzun kategoriak."
+
+#: resources.h:694
+msgid "Please select the default transfer mode you would like to use."
+msgstr "Mesedez hautatu erabiltzea nahi duzun berezko eskualdaketa modua."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:51
+#, c-format
+msgid "Please select the new attributes for the directory \"%s\"."
+msgstr "Mesedez hautatu ezaugarri berriak \"%s\" zuzenbidearentzat."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:40
+#, c-format
+msgid "Please select the new attributes for the file \"%s\"."
+msgstr "Mesedez hautatu ezaugarri berriak \"%s\" agiriarentzat."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:54
+msgid "Please select the new attributes for the selected directories."
+msgstr "Mesedez hautatu ezaugarri berriak hautaturiko zuzenbideentzat."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:57
+msgid ""
+"Please select the new attributes for the selected files and directories."
+msgstr ""
+"Mesedez hautatu ezaugarri berriak hautaturiko agiri eta zuzenbideentzat."
+
+#: ../../locales/../src/interface/chmoddialog.cpp:43
+msgid "Please select the new attributes for the selected files."
+msgstr "Mesedez hautatu ezaugarri berriak hautaturiko agirientzat."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:581
+msgid ""
+"Please update your firewall and make sure your router is using the latest "
+"available firmware. Furthermore, your router has to be configured properly. "
+"You will have to use manual port forwarding. Don't run your router in the so "
+"called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
+"protocol specific 'fixups' have to be disabled"
+msgstr ""
+"Mesedez eguneratu zure suhesia eta zihurtatu zure bideratzailea azken "
+"firmware eskuragarria erabiltzen ari dela. Gainera, zure bideratzailea egoki "
+"itxuraturik egon behar da. Eskuzko ataka bidalketa erabili beharko duzu. Ez "
+"ekin zure bideratzailea 'GDM modua' edo 'jolas modua' deiturikoetan. "
+"Protokolo ikerketa edo protokolo 'fixups' bereizia bezalako gauzak ezgaituak "
+"egon behar dira."
+
+#: resources.h:262
+msgid ""
+"Please visit http://filezilla-project.org for more information about "
+"FileZilla."
+msgstr ""
+"Mesedez ikusi http://filezilla-project.org FileZillari buruzko argibide "
+"gehiagorako."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
+msgid ""
+"Please visit http://filezilla-project.org to download the most recent "
+"version."
+msgstr "Mesedez ikusi http://filezilla-project.org bertsio berriena jeisteko."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+msgid "Postal code:"
+msgstr "Posta kodea:"
+
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
+msgid "Predefined Sites"
+msgstr "Aurrezehazturiko Guneak"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:729
+msgid "Preserving file timestamps"
+msgstr "Agiri denbora-irarketak iraunarazten"
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
+msgid "Preview:"
+msgstr "Aurreikuspena:"
+
+#: ../../locales/../src/engine/tlssocket.cpp:984
+msgid "Primary connection and data connection certificates don't match."
+msgstr "Lehen elkarketa eta datu elkarketa egiaztagiriak ez datoz bat."
+
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Irarkitu FileZilla-ren abiatzeari buruzko igarpen argibideak"
+
+#: ../../locales/../src/interface/cmdline.cpp:17
+msgid "Print version information to stdout and exit"
+msgstr "Irarkitu bertsio argibideak irteera-estandarrera eta irten"
+
+#: resources.h:933
+msgid "Prioritize directories (default)"
+msgstr "Lehentasuna zuzenbideek (berezkoa)"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Priority"
+msgstr "Lehentasuna"
+
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Pribatutasun araudia: Zure FileZilla bertsioa, zure sistema eragilea eta "
+"zure CPU eraikintza bakarrik aurkeztuko dira zerbitzarian."
+
+#: resources.h:807
+msgid "Private &keys:"
+msgstr "Giltza &pribatuak:"
+
+#: resources.h:89
+msgid "Pro&tocol:"
+msgstr "Proto&koloa:"
+
+#: resources.h:803 resources.h:820
+msgid "Pro&xy password:"
+msgstr "Proxy &sarhitza:"
+
+#: resources.h:541 resources.h:610
+msgid "Process &Queue"
+msgstr "&Prozesatu Lerroa"
+
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "Proto&koloa:"
+
+#: resources.h:818
+msgid "Proxy &port:"
+msgstr "Prox&y ataka:"
+
+#: resources.h:802 resources.h:819
+msgid "Proxy &user:"
+msgstr "Pro&xy erabiltzailea:"
+
+#: ../../locales/../src/engine/proxy.cpp:415
+msgid "Proxy authentication failed"
+msgstr "Proxy egiaztapen hutsegitea"
+
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
+#, c-format
+msgid "Proxy handshake failed: %s"
+msgstr "Proxy eskuemate hutsegitea: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"Proxy hostalaria '['-rekin hasten da baina ez da itxiera kortxeterik aurkitu."
+
+#: ../../locales/../src/engine/proxy.cpp:309
+#, c-format
+msgid "Proxy reply: %s"
+msgstr "Proxy erantzuna: %s"
+
+#: ../../locales/../src/engine/proxy.cpp:458
+#, c-format
+msgid "Proxy request failed: %s"
+msgstr "Proxy eskaera hutsegitea: %s"
+
+#: ../../locales/../src/engine/proxy.cpp:480
+msgid "Proxy request failed: Unknown address type in CONNECT reply"
+msgstr ""
+"Proxy eskabide hutsegitea: Helbide mota ezezaguna ELKARKETA erantzunean"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
+msgid "Proxy set but proxy host or port invalid"
+msgstr "Proxya ezarrita baina proxy hostalaria edo ataka baliogabea"
+
+#: resources.h:805
+msgid "Public Key Authentication"
+msgstr "Giltza Publiko Egiaztapena"
+
+#: resources.h:8 resources.h:36
+msgid "Public key algorithm:"
+msgstr "Giltza publiko algoritmoa:"
+
+#: resources.h:150
+msgid "Public permissions"
+msgstr "Baimen publikoak"
+
+#: ../../locales/../src/interface/QueueView.cpp:3228
+msgid "Queue has been fully processed"
+msgstr "Lerroa osoa prozesatu da"
+
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
+msgid "Queue: %s MiB"
+msgstr "Lerroa: %s MiB"
+
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
+msgid "Queue: %s%s"
+msgstr "Lerroa: %s%s"
+
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
+msgid "Queue: empty"
+msgstr "Lerroa: hutsik"
+
+#: ../../locales/../src/interface/QueueView.cpp:455
+msgid "Queued files"
+msgstr "Lerrokaturiko agiriak"
+
+#: resources.h:457
+msgid "Queueing:"
+msgstr "Lerrokapena:"
+
+#: resources.h:626
+msgid "R&eboot system"
+msgstr "&Berrabiarazi sistema"
+
+#: resources.h:538
+msgid "R&emote directory tree"
+msgstr "&Hurruneko zuzenbide zuhaitza"
+
+#: resources.h:642 resources.h:646
+msgid "R&eset and requeue selected files"
+msgstr "&Berrezarri eta berlerrokatu hautaturiko agiriak"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
+msgid "Raw FTP command"
+msgstr "Raw FTP agindua"
+
+#: resources.h:147
+msgid "Re&ad"
+msgstr "&Irakurri"
+
+#: resources.h:585 resources.h:601
+msgid "Re&fresh"
+msgstr "&Berritu"
+
+#: resources.h:71
+msgid "Re&name"
+msgstr "B&errizendatu"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:576
+msgid ""
+"Re-run the wizard and carefully check your settings and configure all "
+"routers and firewalls accordingly."
+msgstr ""
+"Berrekin laguntzailea eta egiaztatu kontu handiz zure ezarpenak eta itxuratu "
+"bideratzaile eta suhesi guztiak."
+
+#: resources.h:151
+msgid "Rea&d"
+msgstr "&Irakurri"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+msgid "Read-only"
+msgstr "Irakurtzeko-bakarrik"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
+msgid "Really cancel current operation?"
+msgstr "Egitan ezeztatu oraingo eragiketa?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] "Egitan ezabatu %d zuzenbide bere edukiekin zerbitzaritik?"
+msgstr[1] "Egitan ezabatu %d zuzenbide bere edukiekin zerbitzaritik?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Egitan ezabatu %d agiria zerbitzaritik?"
+msgstr[1] "Egitan ezabatu %d agiriak zerbitzaritik?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Egitan ezabatu %s eta %s zerbitzaritik?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Egitan ezabatu hautaturiko agiri edo/eta zuzenbide denak zerbitzaritik?"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Egitan ezabatu hautaturiko agiri edo/eta zuzenbide denak zure ordenagailutik?"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Reason"
+msgstr "Zergaitia"
+
+#: ../../locales/../src/interface/QueueView.cpp:3235
+msgid "Reboot now"
+msgstr "Berrabiarazi orain"
+
+#: resources.h:156
+msgid "Rec&urse into subdirectories"
+msgstr "&Jarraian azpizuzenbideen barnean"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"EBCDIC-an kodeaturik dagoela dirudien zuzenbide zerrendapen bat jaso da."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "Jasotako lerroak 10000 hizki baino gehiago ditu, uzten."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
+msgid "Received data tainted"
+msgstr "Jasotako datuak kutsatuta daude"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+msgid ""
+"Reconnect information cannot be cleared while connected to a server.\n"
+"If you continue, your connection will be disconnected."
+msgstr ""
+"Berrelkarketa argibideak ezin dira argitu zerbitzari batera "
+"elkarketatzerakoan.\n"
+"Jarraitzen baduzu, zure elkarketa eten egingo da."
+
+#: resources.h:761
+msgid "Reconnection settings"
+msgstr "Berrelkarketa ezarpenak"
+
+#: resources.h:1019 resources.h:1020
+msgid "Reconnects to the last used server"
+msgstr "Erabilitako azken zerbitzarira elkarketatzen du"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:715
+msgid "Redirection to invalid address"
+msgstr "Helbide baliogabera berzuzenduta"
+
+#: resources.h:1011 resources.h:1012
+msgid "Refresh the file and folder lists"
+msgstr "Berritu agiri eta agiritegi zerrendak"
+
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Gogoratu sarhitzak?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
+msgid "Remote"
+msgstr "Hurrunekoa"
+
+#: ../../locales/../src/engine/tlssocket.cpp:907
+msgid "Remote certificate not trusted."
+msgstr "Hurreneko egiaztagira ez da fidagarria."
+
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
+msgid "Remote file"
+msgstr "Hurruneko agiria"
+
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Remote file search"
+msgstr "Hurreneko agiri bilaketa"
+
+#: resources.h:215
+msgid "Remote filters:"
+msgstr "Hurruneko iragazkiak:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1240
+msgid "Remote path"
+msgstr "Hurruneko helburua"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
+#, 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 ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu helburu oso baliozkoa dela eta "
+"sostengatzen duela oraingo gunearen zerbitzari-motak (%s)."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
+#, 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 ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu helburu oso baliozkoa dela eta "
+"sostengatzen duela hautaturiko gaineko gunearen zerbitzari-motak (%s)."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
+msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
+msgstr ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu baliozko helburu osoa dela."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:350
+msgid "Remote path could not be parsed."
+msgstr "Hurruneko helburua ezin da aztertu."
+
+#: resources.h:454
+msgid "Remote path handling:"
+msgstr "Hurruneko helburu kudeakea:"
+
+#: resources.h:322
+msgid "Remote path:"
+msgstr "Hurruneko helburua:"
+
+#: ../../locales/../src/interface/viewheader.cpp:560
+msgid "Remote site:"
+msgstr "Hurruneko gunea:"
+
+#: resources.h:639 resources.h:643
+msgid "Remove &all"
+msgstr "Kendu &denak"
+
+#: resources.h:641 resources.h:645
+msgid "Remove &selected"
+msgstr "Kendu &hautaturikoa"
+
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:256
+msgid "Rename file"
+msgstr "Berreizendatu agiria"
+
+#: resources.h:657 resources.h:678
+msgid "Rename selected directory"
+msgstr "Berrizendatu hautaturiko zuzenbidea"
+
+#: resources.h:589 resources.h:605
+msgid "Rename selected files and directories"
+msgstr "Berrizendatu hautaturiko agiri eta zuzenbideak"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
+#, c-format
+msgid "Renaming '%s' to '%s'"
+msgstr "Gelditzen da '%s' -> '%s'"
+
+#: resources.h:481
+msgid "Reporting bugs and feature requests"
+msgstr "Akats jakinarazpena eta ezaugarri eskaerak"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "FTP esplizitoa TLS gain behar du"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "FTP inplizitoa TLS gain behar du"
+
+#: resources.h:644
+msgid "Reset and requeue &all"
+msgstr "&Berrezarri eta berlerrokatu denak"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:497
+#, c-format
+msgid "Resolving address of %s"
+msgstr "%s-ren helbidea eskuratzen"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1179
+msgid "Resolving hostname"
+msgstr "Hostalari-izena erabakitzen"
+
+#: ../../locales/../src/engine/logging.cpp:215
+#: ../../locales/../src/interface/netconfwizard.cpp:395
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
+msgid "Response:"
+msgstr "Erantzuna:"
+
+#: resources.h:448
+msgid "Results:"
+msgstr "Emaitzak?"
+
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
+msgid "Resume file transfer"
+msgstr "Berrekin agiri eskualdaketa"
+
+#: resources.h:878
+msgid ""
+"Resuming ASCII files can cause problems if server uses a different line "
+"ending format than the client."
+msgstr ""
+"ASCII agiriak berrekiteak arazoak eragin ditzake zerbitzariak bezeroak "
+"erabiltzen duenaren lerro amaiera heuskarri ezberdin bat erabiltzen badu."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
+msgid "Retrieving directory listing..."
+msgstr "Zuzenbide zerrendapena berreskuratzen..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
+#: ../../locales/../src/interface/netconfwizard.cpp:707
+#, c-format
+msgid "Retrieving external IP address from %s"
+msgstr "Kanpoko IP helbidea berreskuratzen %s-tik"
+
+#: ../../locales/../src/engine/tlssocket.cpp:965
+msgid "Root certificate is not trusted"
+msgstr "Erro egiaztagiria ez da fidagarria"
+
+#: resources.h:516
+msgid "S&how files currently being edited..."
+msgstr "&Erakutsi orain editatzen ari diren agiriak..."
+
+#: resources.h:895
+msgid "S&how the Site Manager on startup"
+msgstr "E&rakutsi Gune Kudeatzailea hasterakoan"
+
+#: resources.h:627
+msgid "S&hutdown system"
+msgstr "&Itzali sistema"
+
+#: resources.h:446
+msgid "S&top"
+msgstr "&Gelditu"
+
+#: resources.h:532
+msgid "S&ynchronized browsing"
+msgstr "Al&dibereturiko bilaketa"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:121
+msgid "SFTP"
+msgstr "SFTP"
+
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "Save settings?"
+msgstr "Gorde ezarpenak?"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Sarhitzak gordetzea zure sistema administratzaileak ezgatitua dago."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Sarhitzak gordetzea zeuk ezgatitua dago."
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
+msgid "Scanning for files to add to queue"
+msgstr "Lerrora gehitzeko agiri mihaketa"
+
+#: ../../locales/../src/interface/QueueView.cpp:1837
+msgid "Scanning for files to upload"
+msgstr "Igotzeko agiri mihaketa"
+
+#: resources.h:442
+msgid "Search &conditions:"
+msgstr "Bilatu b&aldintzak:"
+
+#: resources.h:440
+msgid "Search &directory:"
+msgstr "Bilatu z&uzenbidea:"
+
+#: resources.h:1027
+msgid "Search for files recursively."
+msgstr "Bilatu agiriak jarraian."
+
+#: resources.h:557
+msgid "Search server for files"
+msgstr "Bilatu zerbitzaria agirientzat"
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Security information"
+msgstr "Segurtasun argibideak"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:564
+#: ../../locales/../src/interface/netconfwizard.cpp:577
+msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
+msgstr "Ikusi ere: http://wiki.filezilla-project.org/Network_Configuration"
+
+#: resources.h:384
+msgid "Sele&ct server"
+msgstr "Hautatu &zerbitzaria"
+
+#: resources.h:746
+msgid "Select &page:"
+msgstr "Hautatu &orrialdea:"
+
+#: resources.h:898
+msgid "Select Theme"
+msgstr "Hautatu Azalgaia"
+
+#: resources.h:856
+msgid ""
+"Select default action to perform if target file of a transfer already exists."
+msgstr ""
+"Hautatu egiteko berezko ekintza eskualdaketa baten xede agiria jadanik "
+"badago."
+
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
+msgid "Select default editor"
+msgstr "Hautatu berezko editatzailea"
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
+msgid ""
+"Select default file exists action if the target file already exists. This "
+"selection is valid only for the current session."
+msgstr ""
+"Hautatu badagoen agiriarentzako berezko ekintza xede agiria jadanik badago. "
+"Hautapen hau oraingo saiorako bakarrik da baliozkoa."
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
+msgid ""
+"Select default file exists action only for the currently selected files in "
+"the queue."
+msgstr ""
+"Hautatu badagoen agiriarentzako berezko ekintza orain lerroan hautaturiko "
+"agirientzat."
+
+#: ../../locales/../src/interface/updatewizard.cpp:336
+msgid "Select download location for package"
+msgstr "Hautatu paketearentzako jeisketa kokalekua"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
+msgid "Select file containing private key"
+msgstr "Hautatu giltza pribatua duen agiria"
+
+#: ../../locales/../src/interface/export.cpp:38
+msgid "Select file for exported data"
+msgstr "Hautatu esportaturiko datuentzako agiria"
+
+#: ../../locales/../src/interface/export.cpp:34
+msgid "Select file for exported queue"
+msgstr "Hautatu esportaturiko lerroarentzako agiria"
+
+#: ../../locales/../src/interface/export.cpp:36
+msgid "Select file for exported settings"
+msgstr "Hautatu esportaturiko ezarpenentzako agiria"
+
+#: ../../locales/../src/interface/export.cpp:32
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
+msgid "Select file for exported sites"
+msgstr "Hautatu esporaturiko guneentzako agiria"
+
+#: ../../locales/../src/interface/import.cpp:15
+msgid "Select file to import settings from"
+msgstr "Hautatu ezarpenak inportatzeko agiria"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:250
+msgid "Select file to upload"
+msgstr "Hautatu igotzeko agiria"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
+msgid "Select filename for converted keyfile"
+msgstr "Hatutatu bihurturiko giltza-agiriarentzako agirizena"
+
+#: resources.h:430
+#, no-c-format
+msgid "Select how these files should be opened."
+msgstr "Hautatu nola ireki behar diren agiri hauek."
+
+#: ../../locales/../src/interface/search.cpp:806
+msgid "Select target download directory"
+msgstr "Hautatu xede jeisketa zuzenbidea"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:245
+msgid "Select target filename"
+msgstr "Hautatu xede agirizena"
+
+#: resources.h:300
+msgid "Select the categories to export:"
+msgstr "Hautatu esportatzeko kategoriak:"
+
+#: resources.h:291
+msgid "Select the private data you would like to delete."
+msgstr "Hautatu ezabatzea nahi dituzun datu pribatuak."
+
+#: ../../locales/../src/interface/search.cpp:773
+#, c-format
+msgid "Selected %d directory with its contents for transfer."
+msgid_plural "Selected %d directories with their contents for transfer."
+msgstr[0] "Hautaturik eskualdatzeko %d zuzenbide bere edukiekin."
+msgstr[1] "Hautaturik eskualdatzeko %d zuzenbide bere edukiekin."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:51
+#, c-format
+msgid "Selected %d directory."
+msgid_plural "Selected %d directories."
+msgstr[0] "Hautaturik %d zuzenbide"
+msgstr[1] "Hautaturik %d zuzenbide"
+
+#: ../../locales/../src/interface/search.cpp:771
+#, c-format
+msgid "Selected %d file for transfer."
+msgid_plural "Selected %d files for transfer."
+msgstr[0] "%d agiri hautaturik eskualdatzeko."
+msgstr[1] "%d agiri hautaturik eskualdatzeko."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:58
+#, c-format
+msgid "Selected %d file. Total size: %s"
+msgid_plural "Selected %d files. Total size: %s"
+msgstr[0] "%d agiri hautaturik. Neurria guztira: %s"
+msgstr[1] "%d agiri hautaturik. Neurria guztira: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:56
+#, c-format
+msgid "Selected %d file. Total size: At least %s"
+msgid_plural "Selected %d files. Total size: At least %s"
+msgstr[0] "%d agiri hautaturik. Neurria guztira: Gutxienez %s"
+msgstr[1] "%d agiri hautaturik. Neurria guztira: Gutxienez %s"
+
+#: ../../locales/../src/interface/search.cpp:778
+#, c-format
+msgid "Selected %s and %s for transfer."
+msgstr "%s eta %s hautaturik eskualdaketzeko."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:68
+#, c-format
+msgid "Selected %s and %s. Total size: %s"
+msgstr "%s eta %s hautaturik. Neurria guztira: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:66
+#, c-format
+msgid "Selected %s and %s. Total size: At least %s"
+msgstr "%s eta %s hautaturik. Neurria guztira: Gutxienez %s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
+msgid "Selected editor does not exist."
+msgstr "Hautaturiko editatzailea ez dago."
+
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
+msgid "Selected file already being edited"
+msgstr "Hautaturiko agiria jadanik editatzen"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Selected file is already loaded"
+msgstr "Hautaturiko agiria jadanik gertaturik dago"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
+msgid "Selected file is already opened"
+msgstr "Hautaturiko agiria jadanik irekita dago"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
+msgid "Selected file is still being edited"
+msgstr "Hautaturiko agiria oraindik editatzen"
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Selected filter only works for local files."
+msgstr "Hautaturiko iragazkiak tokiko agirietan bakarrik egiten du lan."
+
+#: ../../locales/../src/interface/menu_bar.cpp:313
+msgid ""
+"Selected global bookmark and current server use a different server type.\n"
+"Use site-specific bookmarks for this server."
+msgstr ""
+"Hautaturiko lastermarka orokorrak eta oraingo zerbitzariak zerbitzari mota "
+"ezberdina erabiltzen dute.\n"
+"Erabili gune-bereizi lastermarkak zerbitzari honentzat."
+
+#: ../../locales/../src/engine/engineprivate.cpp:281
+msgid "Selected port usually in use by a different protocol."
+msgstr "Hautaturiko ataka arrunt beste protokolo batek erabiltzen du."
+
+#: resources.h:768
+msgid "Send FTP &keep-alive commands"
+msgstr "&Bidali FTP heutsi-bizirik aginduak"
+
+#: resources.h:559
+msgid "Send custom command to the server otherwise not available"
+msgstr "Bidali norbere agindua zerbitzariari bestela ez badago eskuragarri"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
+msgid "Sending keep-alive command"
+msgstr "Heutsi-bizirik agindu bidalketa"
+
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
+msgid "Serial number:"
+msgstr "Serie zenbakia:"
+
+#: resources.h:97
+msgid "Server &Type:"
+msgstr "Zerbitzari &Mota"
+
+#: ../../locales/../src/engine/tlssocket.cpp:787
+msgid "Server did not properly shut down TLS connection"
+msgstr "Zerbitzariak ez du egoki itzali TLS elkarketa"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Zerbitzariak ez du ez-ASCII hizki-koderik sostengatzen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
+#, c-format
+msgid "Server does not support resume of files > %d GB."
+msgstr "Zerbitzariak ez du > %d GB agirien berrekitea sostengatzen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
+#, c-format
+msgid ""
+"Server does not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"Zerbitzariak ez du > %d GB agirien berrekitea. Amaitu eskualdaketa agiri "
+"neurria berdindutakoan."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
+msgid "Server does not support resume of files > 2GB."
+msgstr "Zerbitzariak ez du > 2GB agirien berrekitea sostengatzen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
+msgid "Server does not support resume of files > 4GB."
+msgstr "Zerbitzariak ez du > 4GB agirien berrekitea sostengatzen."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
+#, c-format
+msgid ""
+"Server may not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"Zerbitzariak badaiteke > %d GB agirien berrekitea ez sostengatzea. Amaitu "
+"eskualdaketa agiri neurriak berdintzerakoan."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
+msgid ""
+"Server might require an account. Try specifying an account using the Site "
+"Manager"
+msgstr ""
+"Zerbitzariak kontu bat behar izan dezake. Saiatu kontu bat adierazten Gune "
+"Kudeatzailea erabiliz."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:420
+msgid "Server returned empty path."
+msgstr "Zerbitzariak helburu hutsa itzuli du."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
+msgid ""
+"Server sent an additional login prompt. You need to use the interactive "
+"login type."
+msgstr ""
+"Zerbitzariak saio-haste galdera gehigarria bidali du. Elkarrekintza saio-"
+"haste mota erabili behar duzu."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
+msgid "Server sent passive reply with unroutable address. Passive mode failed."
+msgstr ""
+"Zerbitzariak erantzun pasiboa bideraezinezko helbidearekin bidali du. Modu "
+"pasibo hutsegitea."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
+msgid ""
+"Server sent passive reply with unroutable address. Using server address "
+"instead."
+msgstr ""
+"Zerbitzariak erantzun pasiboa bideraezinezko helbidearekin bidali du. "
+"Zerbitzariaren helbidea erabiltzen ordez."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:403
+#: ../../locales/../src/interface/netconfwizard.cpp:410
+#: ../../locales/../src/interface/netconfwizard.cpp:449
+#: ../../locales/../src/interface/netconfwizard.cpp:458
+#: ../../locales/../src/interface/netconfwizard.cpp:470
+#: ../../locales/../src/interface/netconfwizard.cpp:494
+#: ../../locales/../src/interface/netconfwizard.cpp:501
+#: ../../locales/../src/interface/netconfwizard.cpp:510
+#: ../../locales/../src/interface/netconfwizard.cpp:521
+msgid "Server sent unexpected reply."
+msgstr "Zerbitzariak ustekabeko erantzuna bidali du."
+
+#: resources.h:360
+msgid "Server to client MAC:"
+msgstr "Zerbitzaria bezero MAC-ra:"
+
+#: resources.h:358
+msgid "Server to client cipher:"
+msgstr "Zerbitzaria bezero zifraketara:"
+
+#: resources.h:389
+msgid "Server&type:"
+msgstr "Zerbitzari-&mota:"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Server/Local file"
+msgstr "Zerbitzaria/Tokiko agiria"
+
+#: resources.h:320 resources.h:382
+msgid "Server:"
+msgstr "Zerbitzaria:"
+
+#: resources.h:15 resources.h:43
+msgid "Session details"
+msgstr "Saio xehetasunak"
+
+#: resources.h:614
+msgid "Set &Priority"
+msgstr "&Ezarri Lehentasuna"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
+#, c-format
+msgid "Set permissions of '%s' to '%s'"
+msgstr "Ezarri '%s' baimenak '%s'-ra"
+
+#: ../../locales/../src/engine/transfersocket.cpp:861
+msgid "SetSocketBufferSize called without socket"
+msgstr "Ezarri-Hartune-Oroimen-Neurria deituta hartune gabe"
+
+#: resources.h:745
+msgid "Settings"
+msgstr "Ezarpenak"
+
+#: resources.h:999
+msgid "Show &raw directory listing"
+msgstr "E&rakutsi zuzenbide zerrendapen irekia"
+
+#: resources.h:568
+msgid "Show &welcome dialog..."
+msgstr "E&rakutsi ongi etorri elkarrizketa..."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
+msgid "Show both directory trees and continue comparing?"
+msgstr "Erakutsi zuzenbide zuhaitz biak eta jarraitu alderaketa?"
+
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "TLS zifraketa eskuragarriak erakusten ditu"
+
+#: ../../locales/../src/interface/cmdline.cpp:6
+msgid "Shows this help dialog"
+msgstr "Laguntza elkarrizketa hau erakusten du"
+
+#: ../../locales/../src/interface/QueueView.cpp:3237
+msgid "Shutdown now"
+msgstr "Itzali orain"
+
+#: resources.h:308
+msgid "Site &Manager entries"
+msgstr "Gune &Kudeatzaile sarrerak"
+
+#: resources.h:78
+msgid "Site Manager"
+msgstr "Gune Kudeatzailea"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gune Kudeatzailea - Ezinezkoa sarhitza gogoratzea"
+
+#: ../../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
+msgid "Site Manager - Invalid data"
+msgstr "Gune Kudeatzailea - Datu baliogabea"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
+msgid "Site Manager already open"
+msgstr "Gune Kudeatzailea jadanik irekita"
+
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Site does not exist."
+msgstr "Gunea ez dago."
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+msgid "Site path has to begin with 0 or 1."
+msgstr "Gune helburua 0 edo 1-ekin hasi behar da."
+
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
+msgid "Site path is malformed."
+msgstr "Gune helburua gaizkiosatua da."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
+msgid "Site-specific bookmarks"
+msgstr "Gune-bereizi lastermarkak"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+msgid ""
+"Site-specific bookmarks require the server to be stored in the Site "
+"Manager.\n"
+"Add current connection to the site manager?"
+msgstr ""
+"Gune-bereizi lastermarkek zerbitzaria Gune Kudeatzailean biltegiratua izatea "
+"behar du.\n"
+"Gehitu oraingo elkarketa gune kudeatzailera?"
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Size"
+msgstr "Neurria"
+
+#: resources.h:917
+msgid "Size formatting"
+msgstr "Neurriz heuskarritzea"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
+msgid "Size unknown"
+msgstr "Neurri ezezaguna"
+
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
+msgid "Skip file"
+msgstr "Jauzi agiria"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
+#, c-format
+msgid "Skipping download of %s"
+msgstr "%s-ren jeisketa jauzten"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
+#, c-format
+msgid "Skipping upload of %s"
+msgstr "%s-ren igoera jauzten"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
+msgid "Some files are still being edited or need to be uploaded."
+msgstr "Agiri batzuk oraindik editatzen daude edo eguneratu beharra dute."
+
+#: resources.h:708 resources.h:784
+msgid ""
+"Some misconfigured remote servers which are behind a router, may reply with "
+"their local IP address."
+msgstr ""
+"Bideratzaile baten atzean dauden desitxuraturiko hurruneko zenbait "
+"zerbitzarik, badaiteke beren tokiko IP helbidearekin erantzutea."
+
+#: resources.h:935
+msgid "Sort directories inline"
+msgstr "Antolatu zuzenbideak linean"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:450
+msgid "Sort order cannot be changed if comparing directories."
+msgstr "Antolaketa ordena ezin da aldatu zuzenbide alderaketan."
+
+#: resources.h:931
+msgid "Sorting"
+msgstr "Antolaketa"
+
+#: resources.h:932
+msgid "Sorting &mode:"
+msgstr "Antolaketa &modua:"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
+msgid "Source and path of the drop operation are identical"
+msgstr "Kokapen eragiketako iturbura eta helburua berdinak dira"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+msgid "Source and target file may not be the same"
+msgstr "Iturburu eta xede agiria ezin dira berdinak izan"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:141
+msgid "Source and target of the drop operation are identical"
+msgstr "Kokapen eragiketako iturbura eta xedea berdinak dira"
+
+#: resources.h:57
+msgid "Source file:"
+msgstr "Iturburu agiria:"
+
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+msgid "Speed Limits"
+msgstr "Abiadura Mugak"
+
+#: resources.h:829
+msgid "Speed limits"
+msgstr "Abiadura mugak"
+
+#: ../../locales/../src/interface/statusbar.cpp:597
+msgid "Speed limits are disabled, click to change."
+msgstr "Abiadura mugak ezgaituta daude, klikatu aldatzeko."
+
+#: ../../locales/../src/interface/statusbar.cpp:601
+msgid "Speed limits are enabled, click to change."
+msgstr "Abiadura mugak gaituta daude, klikatu aldatzeko."
+
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Bertsio egonkorrak eta betak"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Bertsio egonkorrak bakarrik"
+
+#: resources.h:400
+msgid "Start transfer &immediately"
+msgstr "&Hasi eskualdaketak berehala"
+
+#: ../../locales/../src/interface/cmdline.cpp:7
+msgid "Start with opened Site Manager"
+msgstr "Hasi irekitako Gune Kudeatzailearekin"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
+#, c-format
+msgid "Starting download of %s"
+msgstr "%s-ren jeisketa hasiera"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
+#, c-format
+msgid "Starting upload of %s"
+msgstr "%s-ren igoera hasiera"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+msgid "State or province:"
+msgstr "Estatua edo herrialdea:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Status"
+msgstr "Egoera"
+
+#: ../../locales/../src/engine/logging.cpp:212
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
+msgid "Status:"
+msgstr "Egoera:"
+
+#: resources.h:611
+msgid "Stop and remove &all"
+msgstr "&Gelditu eta ezabatu denak"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
+msgid "Street:"
+msgstr "Kalea:"
+
+#: resources.h:11 resources.h:39
+msgid "Subject of certificate"
+msgstr "Egiaztagiri gaia"
+
+#: ../../locales/../src/interface/queueview_successful.cpp:12
+msgid "Successful transfers"
+msgstr "Ongi eskualdaturik"
+
+#: resources.h:736
+msgid "Summary of test results:"
+msgstr "Azterketa emaitzen laburpena:"
+
+#: resources.h:468
+msgid ""
+"Symlinks to files are not affected by this choice, such symlinks are always "
+"deleted."
+msgstr ""
+"Agirietarako sinloturek ez dute eraginik hautapen honekin, simloturak betik "
+"ezabatzen dira."
+
+#: resources.h:1026 ../../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
+msgid "Synchronized browsing"
+msgstr "Bilaketa aldiberetua"
+
+#: ../../locales/../src/interface/state.cpp:414
+msgid "Synchronized browsing has been disabled."
+msgstr "Bilaketa aldiberetua ezgaitua izan da."
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
+msgid "Syntax error"
+msgstr "Joskera akatsa"
+
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
+msgid "Syntax error in command line"
+msgstr "Joskera akatsa agindu lerroan"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+msgid "System"
+msgstr "Sistema"
+
+#: resources.h:534
+msgid "T&oolbar"
+msgstr "&Tresnabarra"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:332
+msgid "TLS/SSL connection established, sending HTTP request"
+msgstr "TLS/SSL elkarketa ezarrita, HTTP eskabidea bidaltzen"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
+msgid "TLS/SSL connection established, waiting for welcome message..."
+msgstr "TLS/SSL elkarketa ezarrita, ongi etorri mezua itxaroten..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
+msgid "TLS/SSL connection established."
+msgstr "TLS/SSL elkarketa ezarrita"
+
+#: ../../locales/../src/engine/proxy.cpp:445
+msgid "TTL expired"
+msgstr "TTL agortuta"
+
+#: resources.h:55
+msgid "Target file already exists"
+msgstr "Xedea agiria jadanik badago"
+
+#: resources.h:61
+msgid "Target file:"
+msgstr "Xede agiria:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Xedea agiria jadanik badago!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
+msgid "Target filename already exists, really continue?"
+msgstr "Xedea agiria jadanik badago, egitan jarraitu?"
+
+#: resources.h:735
+msgid "Test results"
+msgstr "Azterketa emaitzak"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
+msgid "Testing resume capabilities of server"
+msgstr "Aztertu zerbitzariaren berrekite gaitasunak"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Do you want to continue? Any changes made in the Site Manager won't be saved "
+"then."
+msgstr ""
+"Gune Kudeatzailea FileZilla 3-ren beste eskabide batean irekita dago.\n"
+"Jarraitzea nahi duzu? Gune Kudeatzailean eginiko aldaketak ez dira gordeko."
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Please close it or the data cannot be deleted."
+msgstr ""
+"Gune Kudeatzailea FileZilla 3-ren beste eskabide batean irekita dago.\n"
+"Mesedez itxi hura edo datuak ezin izango dira ezabatu."
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
+#, c-format
+msgid "The XML document is not well-formed: %s"
+msgstr "XML agiria ez dago ongi-osatua: %s"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:618
+#, c-format
+msgid "The address you entered was: %s"
+msgstr "Sartu duzun helbidea zen: %s"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
+msgid "The bookmark could not be added."
+msgstr "Ezin da lastermarka gehitu."
+
+#: ../../locales/../src/interface/sitemanager.cpp:805
+msgid "The bookmarks could not be cleared."
+msgstr "Ezin dira lastermarkak garbitu."
+
+#: ../../locales/../src/interface/statusbar.cpp:490
+msgid "The connection is encrypted. Click icon for details."
+msgstr "Elkarketa enkriptaturik dago. Klikatu ikurra xehetasunetarako."
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
+msgid "The custom login sequence cannot be empty."
+msgstr "Norbere saio-haste sekuentzia ezin da hutsik egon."
+
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
+#, no-c-format
+msgid "The default editor for text files could not be found."
+msgstr "Idazki agirientzako berezko editatzailea ezin da aurkitu."
+
+#: resources.h:432
+#, c-format
+msgid "The default editor for text files is '%s'."
+msgstr "Idazki agirientzako berezko editatzailea '%s' da."
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr ""
+"Sartutako iragazki izena jadanik badago, mesedez hautatu beste izen bat."
+
+#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
+#, c-format
+msgid "The extension '%s' does already exist in the list"
+msgstr "'%s' luzapena jadanik badago zerrendan"
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:246
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:253
+#, c-format
+msgid ""
+"The file %s already exists.\n"
+"Please enter a new name:"
+msgstr ""
+"%s agiria jadanik badago.\n"
+"Mesedez sartu izen berri bat:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
+#, c-format
+msgid ""
+"The file '%s' cannot be opened:\n"
+"The associated program (%s) could not be found.\n"
+"Please check your filetype associations."
+msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Elkarturiko programa (%s) ezin izan da aurkitu.\n"
+"Mesedez egiaztatu zure agirimota elkarketak."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
+#, c-format
+msgid "The file '%s' could not be loaded or does not contain a private key."
+msgstr "'%s' agiria ezin da gertatu edo ez du giltza pribatu bat."
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#, c-format
+msgid "The file '%s' could not be loaded."
+msgstr "'%s' agiria ezin da gertatu."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"No program has been associated on your system with this file type."
+msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Ez da programarik elkartu zure sisteman agiri mota honentzat."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"The associated command failed"
+msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Elkarturiko agindu hutsegitea"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
+#, 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' agiria ez da FileZillak sostengatzen duen heuskarri batekoa.\n"
+"Agiri hau sarhitzez babestua ere badago. Sarhitzez babesturiko giltzagiriak "
+"oraindik ez daude sostengaturik FileZillan.\n"
+"Nahi duzu heuskarri sostengatu, babesgabe batera bihurtzea?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
+#, c-format
+msgid ""
+"The file '%s' is not in a format supported by FileZilla.\n"
+"Would you like to convert it into a supported format?"
+msgstr ""
+"'%s' agiria ez da FileZillak sostengatzen duen heuskarri batekoa.\n"
+"Heuskarri sostengatu batera bihurtzea nahi duzu?"
+
+#: ../../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' sarhitzez babestua dago. Sarhitzez babesturiko giltza-agiriak ez daude "
+"sostengaturik FileZillan.\n"
+"Nahi duzu babestu gabeko agiri batera bihurtzea?"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
+msgid "The file selected as default editor does not exist."
+msgstr "Berezko editatzaile bezala hautaturiko agiria ez dago."
+
+#: ../../locales/../src/interface/import.cpp:95
+msgid ""
+"The file you have selected contains site manager data from a previous "
+"version of FileZilla.\n"
+"Due to differences in the storage format, only host, port, username and "
+"password will be imported.\n"
+"Continue with the import?"
+msgstr ""
+"Hautatu duzun agiriak FileZillaren aurreko bertsio baten gune kudeatzaile "
+"datuak ditu.\n"
+"Biltegiratze heuskarrian dagoen ezberdintasunagaitik, hostalaria, ataka, "
+"erabiltzaile-izena eta sarhitza bakarrik inportatuko dira.\n"
+"Jarraitu inportazioarekin?"
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "The filename column can neither be hidden nor moved."
+msgstr "Agirizen zutabea ezin da ez ezkutatu ez mugitu."
+
+#: ../../locales/../src/interface/listctrlex.cpp:811
+msgid "The filename column cannot be hidden."
+msgstr "Agirizen zutabea ezin da ezkutatu."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
+#, c-format
+msgid "The following character will be replaced: %s"
+msgstr "Hurrengo hizkiak ordeztuko dira: %s"
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
+#, c-format
+msgid "The following characters will be replaced: %s"
+msgstr "Hurrengo hizkiak ordeztu egingo dira: %s"
+
+#: resources.h:337
+msgid "The following files are currently being edited:"
+msgstr "Hurrengo agiriak orain editatzen ari dira:"
+
+#: resources.h:472
+msgid "The free open source FTP solution"
+msgstr "Iturburu irekiko FTP konponbide askea"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
+msgid "The global bookmarks could not be saved."
+msgstr "Lastermarka orokorrak ezin dira gorde."
+
+#: resources.h:997
+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 ""
+"Garbiketa maila handiena, argibide gehiago erakutsiko da mezu oharrean. "
+"Garbiketa argibideak ezgaitzeak eragin kaltegarria du egintzan."
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
+msgid "The limit needs to be between 1 and 2000 MiB"
+msgstr "Muga 1 eta 2000 MiB artekoa izan behar da"
+
+#: ../../locales/../src/interface/state.cpp:275
+#, c-format
+msgid ""
+"The local directory '%s' is not below the synchronization root (%s).\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+"'%s' tokiko zuzenbidea ez dago aldiberetze erroaren (%s) azpian.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu tokiko zuzenbidea aldatzen?"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
+msgid ""
+"The lowest available port has to be less or equal than the highest available "
+"port."
+msgstr ""
+"Ataka eskuragarri apalena ataka eskuragarri handienaren berdina edo "
+"txikiagoa izan behar da."
+
+#: ../../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 ""
+"Bertsio berriena jeitsi da. Klikatu Amaitu FileZilla isteko eta ezarpena "
+"hasteko."
+
+#: ../../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 ""
+"Bertsio berriena jeitsi da. Mesedez ezarri bertsio hau ezarri zenuen modu "
+"berean."
+
+#: ../../locales/../src/interface/QueueView.cpp:1968
+msgid "The queue will not be saved."
+msgstr "Lerroa ez da gordeko."
+
+#: ../../locales/../src/interface/state.cpp:1086
+#, 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' hurruneko zuzenbidea ez dago aldiberetze erroaren (%s) azpian.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
+
+#: ../../locales/../src/interface/import.cpp:84
+msgid "The selected categories have been imported."
+msgstr "Hatutaturiko kategoriak inportatuak izan dira."
+
+#: resources.h:307
+msgid ""
+"The selected file contains importable data for the following categories:"
+msgstr "Hatutaturiko agiriak datu inportagarriak ditu hurrengo kategorientzat:"
+
+#: resources.h:330
+msgid "The selected file is already being edited:"
+msgstr "Hautaturiko agiria jadanik editatzen hasita dago:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
+msgid ""
+"The selected file is still opened in some other program, please close it."
+msgstr ""
+"Hatutaturiko agiria oraindik beste programaren batean irekita dago, mesedez "
+"itxi hura."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
+msgid ""
+"The selected file would be executed directly.\n"
+"This can be dangerous and damage your system.\n"
+"Do you really want to continue?"
+msgstr ""
+"Hautaturiko agiria zuzenean exekutatu daiteke.\n"
+"Hau arriskutsua izan daiteke eta zure sistema kaltetu dezake.\n"
+"Egitan nahi duzu jarraitzea?"
+
+#: ../../locales/../src/interface/sitemanager.cpp:602
+msgid "The server could not be added."
+msgstr "Zerbitzaria ezin da gehitu."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:574
+msgid "The server sent an unexpected or unrecognized reply."
+msgstr "Zerbitzariak ustekabeko edo ezagungabeko erantzun bat bidali du."
+
+#: resources.h:114
+msgid "The server uses following charset encoding for filenames:"
+msgstr "Zerbitzariak hurrengo hizki-kodeaketa erabiltzen du agirizenentzat:"
+
+#: resources.h:2
+msgid ""
+"The server's certificate is unknown. Please carefully examine the "
+"certificate to make sure the server can be trusted."
+msgstr ""
+"Zerbitzariaren egiaztagiria ezezaguna da. Mesedez aztertu kontu handiz "
+"egiaztagiria zerbitzaria fidagarria izan daitekeelaz zihurtatzeko."
+
+#: resources.h:196
+msgid ""
+"The server's host key does not match the key that has been cached. This "
+"means that either the administrator has changed the host key, or you are "
+"actually trying to connect to another computer pretending to be the server."
+msgstr ""
+"Zerbitzariaren hostalari giltza ez dator bat katxeatu den giltzarekin. Honek "
+"esanahi du administratzaileak hostalari giltza aldatu duela, edo beste "
+"ordenagailu batera elkarketatzen saiatzen ari zarela zerbitzaria izateko "
+"asmoekin."
+
+#: resources.h:184
+msgid ""
+"The server's host key is unknown. You have no guarantee that the server is "
+"the computer you think it is."
+msgstr ""
+"Zerbitzariaren hostalari giltza ezezaguna da. Ez duzu zerbitzaria uste duzun "
+"ordenagailua delaren bermerik."
+
+#: ../../locales/../src/interface/import.cpp:81
+msgid ""
+"The settings have been imported. You have to restart FileZilla for all "
+"settings to have effect."
+msgstr ""
+"Ezarpenak inportatu dira. FileZilla berrabiarazi behar duzu ezarpen guztiek "
+"eragina izan dezaten."
+
+#: ../../locales/../src/interface/QueueView.cpp:3226
+msgid "The system will soon reboot unless you click Cancel."
+msgstr "Sistema laister berrabiaraziko da Ezeztatu klikatzen ez baduzu."
+
+#: ../../locales/../src/interface/QueueView.cpp:3224
+msgid "The system will soon shut down unless you click Cancel."
+msgstr "Sistema laister itzaliko da Ezeztatu klikatzen ez baduzu."
+
+#: resources.h:56
+msgid ""
+"The target file already exists.\n"
+"Please choose an action."
+msgstr ""
+"Xede agiria jadanik badago.\n"
+"Mesedez hautatu ekintza bat."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "The test did not succeed. Do you really want to save the settings?"
+msgstr "Azterketa ez da burutu. Egitan nahi duzu ezarpenak gordetzea?"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:127
+msgid "Themes"
+msgstr "Azalgaiak"
+
+#: ../../locales/../src/interface/filter.cpp:462
+msgid "This filter set cannot be removed."
+msgstr "Iragazki ezarpen hau ezin da kendu."
+
+#: ../../locales/../src/interface/filter.cpp:397
+msgid "This filter set cannot be renamed."
+msgstr "Iragazki ezarpen hau ezin da berrizendatu."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:575
+msgid ""
+"This means that some router and/or firewall is still interfering with "
+"FileZilla."
+msgstr ""
+"Honek esanahi du bideratzaile eta/edo suhesiren bat oraindik FileZilla "
+"eragozten ari dela."
+
+#: resources.h:713
+msgid ""
+"This only works if you are not behind a router, else your system would just "
+"return your internal address."
+msgstr ""
+"Honek bideratzaile baten atzean bazaude bakarrik egiten du lan, zure "
+"sistemak ere zure barneko helbidea itzuli dezake."
+
+#: resources.h:691
+msgid ""
+"This wizard will help you to properly configure any routers and firewalls "
+"you have and tests your configuration."
+msgstr ""
+"Laguntzaile honek dituzun bideratzaile eta suhesiak egoki itxuratzen eta "
+"zure itxurapena aztertzen lagunduko dizu."
+
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Ordua"
+
+#: resources.h:911
+msgid "Time formatting"
+msgstr "Ordu heuskarria"
+
+#: resources.h:752
+msgid "Time&out in seconds:"
+msgstr "&Denbora-epea segundutan:"
+
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
+msgid "Timeout"
+msgstr "Denbora-epea"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
+#, c-format
+msgid ""
+"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
+"seconds."
+msgstr ""
+"Ordueremu orekak: Zerbitzaria: %d segundu. Tokikoa: %d segundu. Aldea: %d "
+"segundu."
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
+msgid "Title:"
+msgstr "Izenburua"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
+msgid "To compare directories, both file lists have to be aligned."
+msgstr ""
+"Zuzenbideak alderatzeko, bi agiri zerrendak lerrokaturik egon behar dira."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
+msgid "To do this, the directory trees need to be both shown or both hidden."
+msgstr ""
+"Hau egiteko, zuzenbide zuhaitzak bietan agerian edo bietan ezkutuan egon "
+"behar dira."
+
+#: resources.h:806
+msgid ""
+"To support public key authentication, FileZilla needs to know the private "
+"keys to use."
+msgstr ""
+"Giltza publiko egiaztapena sostengatzeko, FileZillak erabiltzeko giltza "
+"pribatuak jakin behar ditu."
+
+#: resources.h:1023
+msgid ""
+"Toggle directory comparison. Right-click to change comparison mode.\n"
+"\n"
+"Colors:\n"
+"Yellow: File only exists on one side\n"
+"Green: File is newer than the unmarked file on other side\n"
+"Red: File sizes different"
+msgstr ""
+"Aldatu zuzenbide alderaketa. Eskuin-klikatu alderaketa modua aldatzeko.\n"
+"\n"
+"Margoak:\n"
+"Oria: Agiria alde bakarrean dago\n"
+"Orlegia: Agiria beste aldeko markatu gabeko agiria baino berriagoa da\n"
+"Gorria: Agiri neurri ezberdinak"
+
+#: resources.h:1025
+msgid ""
+"Toggle synchronized browsing.\n"
+"If enabled, navigating the local directory hierarchy will also change the "
+"directory on the server accordingly and vice versa."
+msgstr ""
+"Aldatu bilaketa aldiberetua.\n"
+"Gaituta badago, tokiko zuzenbide hierarkian nabigatzeak zerbitzariko "
+"zuzenbidea ere ondorioz aldatzen du eta alderantziz."
+
+#: resources.h:1013 resources.h:1014
+msgid "Toggles processing of the transfer queue"
+msgstr "Eskualdaketa lerroaren prozesapena aldatzen du"
+
+#: resources.h:1005 resources.h:1006
+msgid "Toggles the display of the local directory tree"
+msgstr "Tokiko zuzenbide zuhaitz erakuspena aldatzen du"
+
+#: resources.h:1003 resources.h:1004
+msgid "Toggles the display of the message log"
+msgstr "Mezu oharraren erakuspena aldatzen du"
+
+#: resources.h:1007 resources.h:1008
+msgid "Toggles the display of the remote directory tree"
+msgstr "Hurruneko zuzenbide zuhaitz erakuspena aldatzen du"
+
+#: resources.h:1009 resources.h:1010
+msgid "Toggles the display of the transfer queue"
+msgstr "Eskualdaketa lerroaren erakuspena aldatzen du"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:605
+msgid "Too long header line"
+msgstr "Idazburu lerro luzeegia"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:666
+msgid "Too many redirects"
+msgstr "Berbideratze gehiegi"
+
+#: ../../locales/../src/engine/logging.cpp:216
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
+msgid "Trace:"
+msgstr "Aztarna:"
+
+#: resources.h:941 resources.h:947
+msgid "Transfer"
+msgstr "Eskualdaketa"
+
+#: resources.h:370
+msgid "Transfer &direction"
+msgstr "Eskualdaketa &norabidea"
+
+#: resources.h:543
+msgid "Transfer &type"
+msgstr "Eskualdaketa &mota"
+
+#: resources.h:762
+msgid "Transfer Mode"
+msgstr "Eskualdaketa Modua"
+
+#: resources.h:897
+msgid "Transfer Queue"
+msgstr "Eskualdaketa Lerroa"
+
+#: resources.h:106
+msgid "Transfer Settings"
+msgstr "Eskualdaketa Ezarpenak"
+
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
+#, c-format
+msgid "Transfer connection interrupted: %s"
+msgstr "Eskualdaketa elkarketa etenda: %s"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:621
+msgid "Transferred data got tainted."
+msgstr "Eskualdaturiko datuak kutsatua."
+
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
+msgid "Transferring"
+msgstr "Eskualdatzen"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:123
+msgid "Transfers"
+msgstr "Eskualdaketak"
+
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
+msgid "Transfers finished"
+msgstr "Eskualdaketak amaituta"
+
+#: resources.h:853
+msgid "Treat files &without extension as ASCII file"
+msgstr "&Tratatu luzapen gabeko agiriak ASCII agiri bezala"
+
+#: resources.h:849
+msgid "Treat the &following filetypes as ASCII files:"
+msgstr "Tratatu &hurrengo agirimotak ASCII agiri bezala:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
+msgid "Trust changed Hostkey:"
+msgstr "Sinetsi aldaturiko Hostalari-giltza:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
+msgid "Trust new Hostkey:"
+msgstr "Sinetsi Hostalari-giltza berria:"
+
+#: resources.h:203
+msgid "Trust the new key and carry on connecting?"
+msgstr "Sinetsi hostalari-giltza berria eta elkarketa burutu?"
+
+#: resources.h:26
+msgid "Trust this certificate and carry on connecting?"
+msgstr "Sinetsi egiaztagiri hau eta elkarketa burutu?"
+
+#: resources.h:190
+msgid "Trust this host and carry on connecting?"
+msgstr "Sinetsi hostalari hau eta elkarketa burutu?"
+
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
+msgid "Type"
+msgstr "Mota"
+
+#: resources.h:788
+msgid "Type of FTP Proxy:"
+msgstr "FTP Proxy mota:"
+
+#: resources.h:813
+msgid "Type of generic proxy:"
+msgstr "Proxy generiko mota:"
+
+#: resources.h:340
+msgid "U&pload"
+msgstr "&Igo"
+
+#: resources.h:493 resources.h:833
+#, no-c-format
+msgid "U&pload limit:"
+msgstr "Igoera m&uga:"
+
+#: resources.h:959
+msgid "U&se filetype associations if available"
+msgstr "Erabili agiri&mota elkarketak eskuragarri badaude"
+
+#: resources.h:912
+msgid "U&se system defaults"
+msgstr "E&rabili sistemaren berezkoak"
+
+#: resources.h:790
+msgid "USER@&HOST"
+msgstr "E&RABILTZAILEA@HOSTALARIA"
+
+#: ../../locales/../src/engine/proxy.cpp:454
+#, c-format
+msgid "Unassigned error code %d"
+msgstr "Esleitu gabeko akats kodea %d"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
+msgid "Unit:"
+msgstr "Unitatea:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
+msgid "Unknown"
+msgstr "Ezezaguna"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
+msgid "Unknown FTP proxy type, cannot generate login sequence."
+msgstr "FTP proxy mota ezezaguna, ezinezkoa saio-haste sekuentzia sortzea."
+
+#: ../../locales/../src/engine/proxy.cpp:368
+#, c-format
+msgid "Unknown SOCKS protocol version: %d"
+msgstr "SOCKS protokolo bertsio ezezaguna: %d"
+
+#: resources.h:1
+msgid "Unknown certificate"
+msgstr "Egiaztagiri ezezaguna"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
+msgid ""
+"Unknown error opening the file. Make sure the file can be accessed and is a "
+"well-formed XML document."
+msgstr ""
+"Akats ezezaguna agiria irekitzerakoan. Zihurtatu agiriak sarbidea duela eta "
+"ongi-osaturiko XML agiria dela."
+
+#: resources.h:183
+msgid "Unknown host key"
+msgstr "Hostalari giltza ezezaguna"
+
+#: ../../locales/../src/engine/proxy.cpp:378
+#, c-format
+msgid ""
+"Unknown protocol version of SOCKS Username/Password Authentication "
+"subnegotiation: %d"
+msgstr ""
+"SOCKS Erabiltzaile-izen/Sarhitz Egiaztapen azpinegoziaketa protokolo bertsio "
+"ezezaguna: %d"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
+msgid ""
+"Unknown root element, the file does not appear to be generated by FileZilla."
+msgstr "Erro elementu ezezaguna, agiriak ez dirudi FileZillak sortua denik."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:596
+#: ../../locales/../src/interface/netconfwizard.cpp:607
+msgid ""
+"Unless these problems get fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"Arazo hauek zuzendu arte, FTP modu aktiboak ez du lanik egingo eta modu "
+"pasiboa erabiliko da."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:583
+msgid ""
+"Unless this problem gets fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"Arazo hau zuzendu arte, FTP modu aktiboak ez du lanik egingo eta modu "
+"pasiboa erabiliko da."
+
+#: ../../locales/../src/engine/tlssocket.cpp:936
+msgid "Unsupported certificate type"
+msgstr "Egiaztagiri mota sostengatu gabea"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:650
+msgid "Unsupported redirect"
+msgstr "Sostengatu gabeko berzuzentzea"
+
+#: resources.h:341
+msgid "Up&load and unedit"
+msgstr "&Igo eta deseditatu"
+
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
+msgid "Update wizard"
+msgstr "Eguneraketa laguntzailea"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Eguneraketak"
+
+#: resources.h:372
+msgid "Upload"
+msgstr "Igo"
+
+#: ../../locales/../src/interface/edithandler.cpp:1262
+msgid "Upload failed"
+msgstr "Igoera hutsegitea"
+
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
+msgid "Upload limit: %s/s"
+msgstr "Igoera muga: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:611
+msgid "Upload limit: none"
+msgstr "Igoera muga: ezer ez"
+
+#: resources.h:668
+msgid "Upload selected directory"
+msgstr "Igo hautaturiko zuzenbidea"
+
+#: resources.h:574
+msgid "Upload selected files and directories"
+msgstr "Igo hautaturiko agiriak eta zuzenbideak"
+
+#: resources.h:325
+msgid "Upload this file back to the server?"
+msgstr "Igo agiri hau atzera zerbitzarira?"
+
+#: resources.h:324
+msgid "Upload this file to the server?"
+msgstr "Igo agiri hau zerbitzarira?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
+msgid "Uploading"
+msgstr "Eguneraketa"
+
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
+msgid "Uploading and pending removal"
+msgstr "Igotzen eta kentzeko zain"
+
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
+msgid "Uploading and unediting"
+msgstr "Igotzen eta deseditatzen"
+
+#: resources.h:118
+msgid "Use &custom charset"
+msgstr "Erabili &norbere hizki-kodea"
+
+#: resources.h:956
+msgid "Use &custom editor:"
+msgstr "Erabili &norbere editatzailea:"
+
+#: resources.h:431
+msgid "Use &default editor for text files"
+msgstr "Erabili &idazki agirientzako berezko editatzailea"
+
+#: resources.h:414 resources.h:420
+msgid "Use &synchronized browsing"
+msgstr "&Erabili aldibereturiko bilaketa"
+
+#: resources.h:116
+msgid "Use UTF-8 if the server supports it, else use local charset."
+msgstr ""
+"Erabili UTF-8 zerbitzariak sostengatzen badu, erabili ere tokiko hizki-kodea."
+
+#: resources.h:267 resources.h:277
+msgid "Use default action"
+msgstr "Erabili berezko ekintza"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Erabili FTP laua"
+
+#: resources.h:380
+msgid "Use server currently connected to"
+msgstr "Erabili orain elkarketaturik dagoen zerbitzaria"
+
+#: resources.h:381
+msgid "Use server from site manager"
+msgstr "Erabili gune kudeatziletiko zerbitzaria"
+
+#: resources.h:906
+msgid "Use system &defaults"
+msgstr "Erabili &sistemaren berezkoak"
+
+#: resources.h:714
+msgid "Use the following IP address:"
+msgstr "Erabili hurrengo IP helbideak:"
+
+#: resources.h:724
+msgid "Use the following port range:"
+msgstr "Erabili hurrengo ataka maila:"
+
+#: resources.h:709
+msgid "Use the server's external IP address instead"
+msgstr "Erabili zerbitzariaren kanpoko IP helbidea ordez"
+
+#: resources.h:715 resources.h:778
+msgid ""
+"Use this if you're behind a router and have a static external IP address."
+msgstr ""
+"Erabili hau bideratzaile baten atzean bazaude eta kanpoko IP helbide "
+"aldagaitz bat baduzu."
+
+#: resources.h:718
+msgid ""
+"Use this option if you have a dynamic IP address. FileZilla will contact the "
+"above server once each session as soon as you use active mode for the first "
+"time. Only the version of FileZilla you're using is submitted to the server."
+msgstr ""
+"Erabili aukera hau IP helbide aldakor bat baduzu. FileZilla gaineko "
+"zerbitzariarekin harremanduko da saio bakoitzean modu aktiboa lehen aldiz "
+"erabiltzen duzun bezain laister. Zu erabiltzen ari zaren FileZilla bertsioa "
+"bakarrik aurkezten da zerbitzarira."
+
+#: resources.h:130
+msgid "User:"
+msgstr "Erabiltzailea:"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+msgid "Username cannot be a series of spaces"
+msgstr "Erabiltzaile-izena ezin da hutsarte jarraiak izan"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
+#, c-format
+msgid "Using proxy %s"
+msgstr "%s proxya erabiltzen"
+
+#: resources.h:120
+msgid ""
+"Using the wrong charset can result in filenames not displaying properly."
+msgstr ""
+"Hizki-kode okerra erabiltzeak agirizenak egoki ez erakustea eragin dezake."
+
+#: resources.h:240
+msgid "Using this wizard you can check for available updates to FileZilla."
+msgstr ""
+"Laguntzaile hau erabiliz FileZilla-rentzat eguneraketa eskuragarririk dagoen "
+"egiaztatu dezakezu."
+
+#: resources.h:5 resources.h:33
+msgid "Valid from:"
+msgstr "Baliogarria hemendik:"
+
+#: resources.h:6 resources.h:34
+msgid "Valid to:"
+msgstr "Baliagarria hona:"
+
+#: ../../locales/../src/interface/cmdline.cpp:16
+msgid "Verbose log messages from wxWidgets"
+msgstr "Ohar mezu berritsuak wxWidgets-tik"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1128
+msgid "Verifying certificate..."
+msgstr "Egiaztagiria egiaztatzen..."
+
+#: resources.h:178
+msgid "Version:"
+msgstr "Bertsioa:"
+
+#: resources.h:838
+msgid "Very high"
+msgstr "Oso handia"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
+msgid "View hidden option set, but unsupported by server"
+msgstr ""
+"Ikusi ezkutuko aukera ezarpena, baina sostengatu gabea zerbitzariaren aldetik"
+
+#: resources.h:943
+msgid "View/Edit"
+msgstr "Ikusi/Editatu"
+
+#: resources.h:364
+msgid "Visible columns"
+msgstr "Zutabe ikusgarriak"
+
+#: resources.h:148
+msgid "W&rite"
+msgstr "&Idatzi"
+
+#: ../../locales/../src/interface/QueueView.cpp:1794
+msgid "Waiting"
+msgstr "Itxaroten"
+
+#: ../../locales/../src/interface/QueueView.cpp:1402
+msgid "Waiting for browsing connection"
+msgstr "Bilatzaile elkarketari itxaroten"
+
+#: ../../locales/../src/interface/QueueView.cpp:1445
+msgid "Waiting for password"
+msgstr "Sarhitza itxaroten"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
+msgid "Waiting for transfer to be cancelled"
+msgstr "Eskualdaketari itxaroten ezeztatzeko"
+
+#: ../../locales/../src/engine/engineprivate.cpp:203
+msgid "Waiting to retry..."
+msgstr "Bersaiatzeko itxaroten..."
+
+#: ../../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 ""
+"Kontuz!\n"
+"\n"
+"Windows-eko akats batek arazoak sortzen ditu FileZilla-rekin\n"
+"\n"
+"Akatsa gertatzen da baduzu\n"
+"- Windows Server 2003 edo XP 64\n"
+"- Windows Suhesia gaituta\n"
+"- Aplikazio Geruza Atebidea zerbitzua gaituta\n"
+"Ikusi http://support.microsoft.com/kb/931130 aurreko argibideetarako.\n"
+"\n"
+"Windows Suhesia edo Aplikazio Geruza Atebide zerbitzua ezgaitzen ez baduzu,\n"
+"FileZilla denboraz kanpo geldituko da eskualdaketa handietan."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:972
+msgid "Warning, ignoring data connection from wrong IP."
+msgstr "Kontuz, IP okerretiko datu elkarketa ezikusten."
+
+#: ../../locales/../src/interface/updatewizard.cpp:272
+msgid ""
+"Warning, use nightly builds at your own risk.\n"
+"No support is given for nightly builds.\n"
+"Nightly builds may not work as expected and might even damage your system.\n"
+"\n"
+"Do you really want to check for nightly builds?"
+msgstr ""
+"Kontuz, erabili gau eraiketak zeure arriskupean.\n"
+"Ez da sostengurik ematen gau eraiketentzat.\n"
+"Gau eraiketek baditeke ez lan egitea itxaroten den bezala eta zure sistema "
+"kaltetu dezakete.\n"
+"\n"
+"Egitan nahi duzu gau eraiketarik dagoen egiaztatzea?"
+
+#: resources.h:195
+msgid "Warning: Potential security breach!"
+msgstr "Kontuz: Ahalezko segurtasun haustura!"
+
+#: resources.h:484
+msgid "Welcome to FileZilla"
+msgstr "Ongi etorri FileZillara"
+
+#: resources.h:473
+msgid "What's new"
+msgstr "Zer berri"
+
+#: resources.h:250
+msgid "What's new:"
+msgstr "Zer berri:"
+
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"FileZillari sarhitzak gogoratzea ahalbidetutakoan, FileZilla berrabiarazi "
+"ondoren sarhitza ber-sartu behar izan gabe elkarketatu zaitezke."
+
+#: resources.h:841
+msgid ""
+"When enabled, characters that are not supported by the local operating "
+"system in filenames are replaced if downloading such a file."
+msgstr ""
+"Gaituta dagoenean, tokiko sistema eragileak agirizenean sostengatzen ez "
+"dituen hizkiak ordeztu egiten dira agiri bat bezala jeisten bada."
+
+#: resources.h:883
+msgid "Widescreen"
+msgstr "Ikusleiho-zabala"
+
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "FileZillak sarhitzak gogoratzea nahi duzu?"
+
+#: resources.h:152
+msgid "Wr&ite"
+msgstr "&Idatzi"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:433
+#: ../../locales/../src/interface/netconfwizard.cpp:440
+msgid "Wrong external IP address"
+msgstr "Kanpoko IP helbide okerra"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+msgid "Wrong line endings"
+msgstr "Lerro amaiera okerrak"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+msgid "Yes"
+msgstr "Bai"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Ematen dut IPv6-bakarrik hostalaria erabiltzen ari zarela. Laguntzaile honek "
+"ez du inguru hau sostengatzen."
+
+#: resources.h:261
+msgid ""
+"You are already using the most recent version of FileZilla. Please check "
+"again in future."
+msgstr ""
+"Jadanik FileZilla bertsio berriena erabiltzen ari zara. Mesedez egiaztatu "
+"berriro etorkitzunean."
+
+#: resources.h:482
+msgid "You can always open this dialog again through the help menu."
+msgstr "Betik ireki dezakezu elkarrizketa hau berriro laguntza menutik"
+
+#: ../../locales/../src/engine/server.cpp:65
+msgid "You can leave the port field empty to use the default port."
+msgstr "Ataka eremua hutsik utzi behar duzu berezko ataka erabiltzeko."
+
+#: resources.h:155
+msgid ""
+"You can use an x at any position to keep the permission the original files "
+"have."
+msgstr ""
+"x bat erabili dezakezu edozein tokitan jatorrizko agiriek duten baimenei "
+"heusteko."
+
+#: ../../locales/../src/interface/import.cpp:28
+msgid "You cannot import settings from FileZilla's own settings directory."
+msgstr ""
+"Ezin dituzu FileZilla-ren jabetzako ezarpenen zuzenbidetik ezarpenak "
+"inportatu."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
+msgid ""
+"You cannot replace an invalid character with another invalid character. "
+"Please enter a character that is allowed in filenames."
+msgstr ""
+"Ezin duzu hizki baliogabe bat beste hizki baliogabe batekin ordeztu. Mesedez "
+"sartu agirizenetan ahalbideturik dagoen hizki bat."
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "You did not enter a new name for the file. Overwrite the file instead?"
+msgstr "Ez duzu izen berri bat sartu agiriarentzat. Gainidatzi agiria ordez?"
+
+#: resources.h:463
+msgid "You have selected at least one symbolic link."
+msgstr "Gutxienez lotura sinboliko bat duzu hautaturik."
+
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
+msgid ""
+"You have selected more than 10 files for editing, do you really want to "
+"continue?"
+msgstr ""
+"10 agiri baino gehiago dituzu hautaturik editatzeko, egitan nahi duzu "
+"jarraitzea?"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2132
+msgid ""
+"You have selected more than 10 files or directories to open, do you really "
+"want to continue?"
+msgstr ""
+"10 agiri edo zuzenbide baino gehiago dituzu hautaturik irekitzeko, egitan "
+"nahi duzu jarraitzea?"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+msgid "You have to enter a hostname."
+msgstr "Hostalari-izen bat sartu behar duzu."
+
+#: ../../locales/../src/interface/search.cpp:818
+msgid "You have to enter a local directory."
+msgstr "Tokiko zuzenbidea bat sartu behar duzu."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:149
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
+msgid "You have to enter a valid IP address."
+msgstr "Baliozko IP helbide bat sartu behar duzu."
+
+#: ../../locales/../src/interface/search.cpp:824
+msgid "You have to enter a writable local directory."
+msgstr "You have to enter a writable local directory."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
+msgid "You have to enter an account name"
+msgstr "Kontu izen bat sartu behar duzu"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
+msgid "You have to specify a user name"
+msgstr "Erabiltzaile izen bat adierazi behar duzu"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:622
+msgid ""
+"You likely have a router or firewall which erroneously modified the "
+"transferred data."
+msgstr ""
+"Eskualdaturiko datuak erruz aldatzen dituen bideratzaile edo suhesi bat "
+"duzula dirudi."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
+msgid "You need to enter a name for the bookmark."
+msgstr "Izen bat sartu behar duzu lastermarkarentzat."
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
+msgid "You need to enter a name for the log file."
+msgstr "Izen bat sartu behar duzu ohar agiriarentzat."
+
+#: ../../locales/../src/interface/edithandler.cpp:1646
+msgid "You need to enter a properly quoted command."
+msgstr "Ongi aipaturiko agindua sartu behar duzu."
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
+msgid "You need to enter a proxy host."
+msgstr "Proxy hostalari bat sartu behar duzu."
+
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
+msgid "You need to enter a proxy port in the range from 1 to 65535"
+msgstr "Proxy ataka bat sartu behar duzu 1 eta 65535 arteko mailan"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+msgid "You need to enter at least one path, empty bookmarks are not supported."
+msgstr ""
+"Gutxienez helburu bat sartu behar duzu, lastermarka hutsak ez daude "
+"sostengaturik."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this bookmark."
+msgstr ""
+"Biak sartu behar dituzu Tokiko eta hurruneko helburua lastermarka honentzako "
+"bilaketa aldiberetua gaitzeko."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this site."
+msgstr ""
+"Biak tokiko eta hurruneko helburua sartu behar dituzu gune honetarako "
+"bilaketa aldiberetua gaitzeko."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:316
+msgid "You need to specify a local file."
+msgstr "Tokiko agiri bat adierazi behar duzu."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:336
+msgid "You need to specify a remote file."
+msgstr "Hurruneko agiri bat adierazi behar duzu."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:343
+msgid "You need to specify a remote path."
+msgstr "Hurruneko helburu bat adierazi behar duzu."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:309
+msgid "You need to specify a server."
+msgstr "Zerbitzari bat adierazi behar duzu."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:568
+msgid ""
+"You should have no problems connecting to other servers, file transfers "
+"should work properly."
+msgstr ""
+"Ez duzu arazorik izan behar beste zerbitzari batzuetara elkarketatzeko, "
+"agiri eskualdaketak ongi lan egin behar du."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
+msgid "after"
+msgstr "ondoren"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "before"
+msgstr "aurretik"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+msgid "begins with"
+msgstr "honekin hasten da"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+msgid "contains"
+msgstr "du"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+msgid "does not contain"
+msgstr "ez du"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
+msgid "does not equal"
+msgstr "ez da berdina"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+msgid "ends with"
+msgstr "honekin amaitzen da"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
+msgid "equals"
+msgstr "berdinak"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
+msgid "file"
+msgstr "agiria"
+
+#: ../../locales/../src/interface/edithandler.cpp:88
+msgid "fz3temp-lockfile"
+msgstr "fz3temp-agiri-blokeatzea"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid ""
+"fzputtygen could not be started.\n"
+"Please make sure this executable exists in the same directory as the main "
+"FileZilla executable."
+msgstr ""
+"fzputtygen ezin da abiarazi.\n"
+"Mesedez zihurtatu exekutagarri hau FileZilla exekutagarri nagusia dagoen "
+"zuzenbide berean dagoela."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
+msgid "fzsftp could not be started"
+msgstr "fzsftp ezin da abiarazi"
+
+#: ../../locales/../src/engine/tlssocket.cpp:974
+msgid "gnutls_certificate_get_peers returned no certificates"
+msgstr "gnutls_certificate_get_peers ez du egiaztagiririk itzuli"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+msgid "greater than"
+msgstr "hau baino gehiago"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+msgid "group executable"
+msgstr "taldeak exekutagarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+msgid "group readable"
+msgstr "taldeak irakurgarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+msgid "group writeable"
+msgstr "taldeak idazgarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+msgid "is equal to"
+msgstr "honen berdina"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+msgid "is set"
+msgstr "ezarrita"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+msgid "is unset"
+msgstr "ezarrigabe"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+msgid "less than"
+msgstr "hau baino gutxiago"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+msgid "matches regex"
+msgstr "bat dator adi-arrunt"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+msgid "owner executable"
+msgstr "jabeak exekutagarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+msgid "owner readable"
+msgstr "jabeak irakurgarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+msgid "owner writeable"
+msgstr "jabeak idazgarria"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
+#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
+msgid "unknown"
+msgstr "ezezaguna"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+msgid "world executable"
+msgstr "denek exekutagarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+msgid "world readable"
+msgstr "denek irakurgarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "world writeable"
+msgstr "denek idazgarria"
+
+#: resources.h:173
+msgid "wxWidgets:"
+msgstr "wxWidgets:"
diff -Nru filezilla-3.5.3/locales/eu_ES.po filezilla-3.7.3~precise/locales/eu_ES.po
--- filezilla-3.5.3/locales/eu_ES.po	2010-06-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/locales/eu_ES.po	2013-04-29 03:30:05.000000000 +0000
@@ -5,172 +5,156 @@
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: Filezilla 3\n"
+"Project-Id-Version: Filezilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
-"PO-Revision-Date: 2005-10-18 09:10+0200\n"
-"Last-Translator: xOneca <xoneca+fz@gmail.com>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2013-02-24 13:28+0100\n"
+"Last-Translator: Xabier Aramendi (Azpidatziak) <azpidatziak@gmail.com>\n"
+"Language-Team: EUS_Xabier Aramendi <azpidatziak@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Previous-Translator: Oskar Angulo <oangulo@kaixo.com>\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.5\n"
+"Language: Euskara (Basque)\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
-msgstr "%H:%M:%S igarotakoa"
+msgstr "%H:%M:%S igarota"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
-msgstr "%H:%M:%S falta"
+msgstr "%H:%M:%S gelditzen da"
 
-#: resources.h:772
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
 msgstr ""
+"%a - Kontua (Hau duten lerroak ezikusi egingo dira Kontu saiohaste-mota "
+"erabiltzen ez bada)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
 #: ../../locales/../src/interface/filelist_statusbar.cpp:86
-#, fuzzy, c-format
+#, c-format
 msgid "%d directory"
 msgid_plural "%d directories"
-msgstr[0] "Sortu direktorioa"
-msgstr[1] "Sortu direktorioa"
+msgstr[0] "%d zuzenbide"
+msgstr[1] "%d zuzenbide"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d zuzenbide bere edukiekin"
+msgstr[1] "%d zuzenbide beren edukiekin"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
-#, fuzzy, c-format
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
+#, c-format
 msgid "%d file"
 msgid_plural "%d files"
-msgstr[0] "fitxategia"
-msgstr[1] "fitxategia"
+msgstr[0] "%d agiri"
+msgstr[1] "%d agiri"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d agiri. Neurria guztira: %s"
+msgstr[1] "%d agiri. Neurria guztira: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d agiri. Neurria guztira: Gutxienez %s"
+msgstr[1] "%d agiri. Neurria guztira: Gutxienez %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
-msgstr "%d fitxategi ilarara gehituak"
+msgstr "%d agiri lerrora gehituta"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:104
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d segundu"
+msgstr[1] "%d segundu"
 
-#: resources.h:769
+#: resources.h:795
 msgid "%h - Host"
-msgstr ""
+msgstr "%h - Hostalaria"
 
-#: resources.h:771
-#, fuzzy, no-c-format
+#: resources.h:797
+#, no-c-format
 msgid "%p - Password"
-msgstr "Pasa&hitza"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, fuzzy, c-format
-msgid "%s (%d B/s)"
-msgstr "%s byte (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
-#, fuzzy, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s byte (%d.%d KB/s)"
+msgstr "%p - Sarhitza"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
-#, fuzzy, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s byte (%d.%d MB/s)"
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, c-format
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
+#, c-format
 msgid "%s (? B/s)"
-msgstr "%s byte (? B/s)"
+msgstr "%s (? B/s)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
-msgstr ""
+msgstr "%s - Egiaztagiria iraungituta!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
-msgstr "Ez da egokia: %s"
+msgstr "%s - Ez da baliozkoa oraindik!"
 
-#: resources.h:773
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
-msgstr ""
+msgstr "%s - Proxy erabiltzailea"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
-msgstr ""
+msgstr "%s eta %s. Neurria guztira: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
-msgstr ""
+msgstr "%s eta %s. Neurria guztira: Gutxienez %s"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:31
-#, fuzzy, c-format
+#, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
 msgstr[0] "%s byte"
 msgstr[1] "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s byte (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s byte (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s byte (%d.%d MB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s byte (%s/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -179,8 +163,13 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
+"%s ezin da aurkitu. FileZilla-ren osagai hau gabe, SFTP-ak ez du lan "
+"egingo.\n"
+"\n"
+"Mesedez jeitsi FileZilla berriro. Arazo honek jarraitzen badu, mesedez "
+"aurkeztu akats jakinarazpen bat."
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -190,1068 +179,1043 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"Ezin izan da %s aurkitu. Filezilla-ren konponente hau gabe, SFTP-ak ez du "
-"funtzionatuko.\n"
+"%s ezin da aurkitu. FileZilla-ren osagai hau gabe, SFTP-ak ez du lan "
+"egingo.\n"
 "\n"
-"Konponbide posibleak:\n"
-"- Baieztatu %s direktorioa zure PATH ingurugiro aldagaian zerrendatua "
-"dagoela.\n"
-"- Ezarri bide osoa %s aurkitzeko FZ_FZSFTP ingurugiro aldagaian."
+"Ahalezko konponbideak:\n"
+"- Zihurtatu %s zure HELBURU inguru aldakorrean zerrendaturiko zuzenbide "
+"batean dagoela.\n"
+"- Ezarri helburu osoa %s-ra FZ_FZSFTP inguru aldakorrean."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
-msgstr "%s %d bit-ekin"
+msgstr "%s %d bit-rekin"
 
-#: resources.h:770
-#, fuzzy, no-c-format
+#: resources.h:796
+#, no-c-format
 msgid "%u - Username"
-msgstr "&Erabiltzaile-izena:"
+msgstr "%u - Erabiltzaile-izena"
 
-#: resources.h:774
-#, fuzzy, no-c-format
+#: resources.h:800
+#, no-c-format
 msgid "%w - Proxy password"
-msgstr "Eskatu pasahitza"
+msgstr "%w - Proxy sarhitza"
 
-#: resources.h:553
+#: resources.h:571
 msgid "&About..."
-msgstr "&FileZillari buruz..."
+msgstr "&Honi buruz..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:94 resources.h:393
 msgid "&Account:"
-msgstr "&Kontua:"
+msgstr "Kont&ua:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
-msgstr "&Aktiboa"
+msgstr "A&ktiboa"
 
-#: resources.h:544
+#: resources.h:562
 msgid "&Add bookmark..."
-msgstr ""
+msgstr "&Gehitu lastermarka..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
-msgstr "&Fitxategiak ilarara sartu"
+msgstr "Gehitu &agiriak lerrora"
 
-#: resources.h:782
-#, fuzzy
+#: resources.h:808
 msgid "&Add keyfile..."
-msgstr "Iragazkiak editatu..."
+msgstr "&Gehitu Giltza-agiria..."
 
-#: resources.h:624 resources.h:643
-#, fuzzy
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
-msgstr "&Fitxategiak ilarara sartu"
+msgstr "Gehitu &Lerrora"
 
-#: resources.h:94
-#, fuzzy
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
-msgstr "Doitu zerbitzariaren ordu-zonaren konpentsazioa:"
+msgstr "Zehaztu zerbitzariaren orduere&mu oreka:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
-msgstr "Fidatu ziurtagiriaz &betirako."
+msgstr "&Betik fidatu egiaztagiriaz etorkizuneko saioetan."
 
-#: resources.h:181
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
-msgstr "&Fidatu beti gune honetaz, gehitu gako hau erregistrora"
+msgstr "&Betik fidatu hostalari honetaz, gehitu giiltza hau katxera"
 
-#: resources.h:932
+#: resources.h:960
 msgid "&Always use default editor"
-msgstr "&Beti editore aurreaukeratua erabili"
+msgstr "Beti&k erabili berezko editatzailea"
 
-#: resources.h:426
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
-msgstr ""
+msgstr "&Betik erabili hautapena elkartugabeko agirientzat"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
-msgstr "&Beti ekintza hau erabili"
+msgstr "&Betik erabili ekintza hau"
 
-#: resources.h:750
-#, fuzzy
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
-msgstr "Eskatu sistema eraginkorrari kanpoko IP helbidea"
+msgstr "&Galdetu zure sistema eragileari kanpoko IP helbidea"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
-msgstr "&Automatikoa"
+msgstr "&Berez"
 
-#: resources.h:106
+#: resources.h:115
 msgid "&Autodetect"
-msgstr "&Autodetektatu"
+msgstr "Berez&-atzeman"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "Automatikoki ongi ateratako transferentziak kendu"
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
-msgstr "&Bitarra"
+msgstr "Bi&narioa"
 
-#: resources.h:892
-#, fuzzy
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
-msgstr "Bitar aurrizkiak SI sinboloak erabiliz (adibidez, 1KB = 1024 byte)."
+msgstr ""
+"&SI sinboloak erabiltzen dituzten aurrizki binarioak. (adib. 1 KB = 1024 "
+"bytes)"
 
-#: resources.h:543
+#: resources.h:561
 msgid "&Bookmarks"
-msgstr ""
+msgstr "Laster&markak"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
-msgstr "&Bilatu..."
+msgstr ""
 
-#: resources.h:809
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
-msgstr "&Burrunba tolerantzia:"
+msgstr "Ja&sangarritasun leherketa"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
-msgstr "&Utzi"
+msgstr "E&zeztatu"
 
-#: resources.h:234
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
-msgstr "&Bilatu FileZilla beta bertsio berriak"
+msgstr "Egiaztatu FileZilla &beta bertsiorik dagoen"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Clear private data..."
-msgstr "Datu pribatuak garbitu..."
+msgstr "&Garbitu datu pribatuak..."
 
-#: resources.h:601
+#: resources.h:621
 msgid "&Close FileZilla"
-msgstr "FileZilla &Itxi"
+msgstr "It&xi FileZilla"
 
-#: resources.h:664
+#: resources.h:690
 msgid "&Configure speed limits..."
-msgstr ""
+msgstr "&Itxuratu abiadura mugak..."
 
-#: resources.h:531
+#: resources.h:549
+#, fuzzy
 msgid "&Configure..."
-msgstr ""
+msgstr "&Itxuratu abiadura mugak..."
 
-#: resources.h:112
+#: resources.h:121
 msgid "&Connect"
-msgstr "&Konektatu"
+msgstr "&Elkarketatu"
 
-#: resources.h:217
-msgid "&Copy"
-msgstr "&Kopiatu"
-
-#: resources.h:492
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
-msgstr ""
+msgstr "&Kopiatu oraingo elkarketa Gune Kudeatzailera..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
-msgstr "&Kopiatu arbelean"
+msgstr "&Kopiatu gakora"
 
-#: resources.h:613
+#: resources.h:635
 msgid "&Crash"
-msgstr "&Arazketa-kraskadura"
+msgstr "&Matxura"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
-msgstr "&Sortu direktorioa"
+msgstr "Sortu &zuzenbidea"
 
-#: resources.h:659
-#, fuzzy
+#: resources.h:685
 msgid "&Create new tab"
-msgstr "&Sortu direktorioa"
+msgstr "Sortu &hegats berria"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
-msgstr "&Depuratu"
+msgstr "&Garbiketa"
 
-#: resources.h:959
+#: resources.h:991
 msgid "&Debug information in message log:"
-msgstr "Erregistroan dagoen &Depurazio informazioa:"
+msgstr "&Garbiketa argibideak mezu oharrean:"
 
-#: resources.h:925
+#: resources.h:953
 msgid "&Default editor:"
-msgstr "Editore aurre-aukeratua:"
+msgstr "&Berezko editatzailea:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
-msgstr "Fitxeroa existitzen deneko ekintza..."
+msgstr "&Berezko ekintza badagoen agiriarentzat..."
 
-#: resources.h:732
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
-msgstr ""
+msgstr "&Atzerapena huts egindakosasio haste saiakera artean:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
-msgstr "&Ezabatu"
+msgstr "E&zabatu"
 
-#: resources.h:456
-#, fuzzy
+#: resources.h:466
 msgid "&Delete symlink"
-msgstr "&Ezabatu"
+msgstr "Ezabatu &Symlotura"
 
-#: resources.h:510
-#, fuzzy
+#: resources.h:527
 msgid "&Directory comparison"
-msgstr "Dire&ktorioak"
+msgstr "&Zuzenbide alderaketa"
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
-msgstr ""
+msgstr "&Baztertu tokiko agiria ondoren jeitsi eta editatu agiria berriro"
 
-#: resources.h:537
+#: resources.h:555
 msgid "&Disconnect"
-msgstr "&Deskonektatu"
+msgstr "&Eten"
 
-#: resources.h:602
+#: resources.h:622
 msgid "&Disconnect from server"
-msgstr "Zerbitzariatik &deskonektatu"
+msgstr "Eten elkarketa &zerbitzaritik"
 
-#: resources.h:868
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr ""
+msgstr "Erakutsi &uneko eskualdaketa abiadura bataz-besteko abiaduraren ordez"
 
-#: resources.h:890
+#: resources.h:918
 msgid "&Display size in bytes"
-msgstr "Tamainia byte-etan erakutsi"
+msgstr "&Erakutsi neurria byte-tan"
+
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "E&z gogoratu sarhitzak"
 
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
-msgstr "&Ez erakutsi leiho hau berriz."
+msgstr "&Ez erakutsi elkarrizketa hau berriro."
 
-#: resources.h:755
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
-msgstr ""
+msgstr "Ez e&rabili kanpoko IP helbiderik tokiko elkarketetan."
 
-#: resources.h:912
+#: resources.h:940
 msgid "&Double-click action on files:"
-msgstr ""
+msgstr "Klik-&bikoitz ekintza agirietan:"
 
-#: resources.h:572 resources.h:622
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Jeitsi"
 
-#: resources.h:442
-#, fuzzy
+#: resources.h:452
 msgid "&Download to:"
-msgstr "&Jeitsi"
+msgstr "Jeitsi &hona:"
 
-#: resources.h:657
-#, fuzzy
+#: resources.h:683
 msgid "&Download..."
-msgstr "&Jeitsi"
+msgstr "&Jeitsi..."
 
-#: resources.h:256 resources.h:831
-#, fuzzy
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
-msgstr "&Behera kargatu"
+msgstr "&Jeisketak:"
 
-#: resources.h:502 resources.h:563
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "&Editatu"
 
-#: resources.h:209
-#, fuzzy
+#: resources.h:219
 msgid "&Edit filter rules..."
-msgstr "Iragazkiak editatu..."
+msgstr "&Editatu iragazki arauak..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
-#, fuzzy
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
-msgstr "Gaitu dena"
+msgstr "&Gaitu"
 
-#: resources.h:940
-msgid "&Enable automatic update check"
-msgstr "&Egunerapenak automatikoki bilatu"
-
-#: resources.h:480 resources.h:804
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
-msgstr ""
+msgstr "&Gaitu abiadura mugak"
 
-#: resources.h:110
+#: resources.h:119
 msgid "&Encoding:"
-msgstr "&Kodeketa:"
+msgstr "&Kodeaketa:"
 
-#: resources.h:609
+#: resources.h:90
+msgid "&Encryption:"
+msgstr "Enk&riptaketa:"
+
+#: resources.h:629
 msgid "&Enter custom command..."
-msgstr "&Sartu komando pertsonalizatua..."
+msgstr "&Sartu norbere agindua..."
 
-#: resources.h:136
+#: resources.h:145
 msgid "&Execute"
 msgstr "&Exekutatu"
 
-#: resources.h:291
+#: resources.h:301
 msgid "&Export Site Manager entries"
-msgstr "&Esportatu Gune-kudeatzaileko zerrenda"
+msgstr "Esportatu &Gune Kudeaketa sarrerak"
 
-#: resources.h:497 resources.h:653
+#: resources.h:514 resources.h:679
+#, fuzzy
 msgid "&Export..."
-msgstr "&Esportatu..."
+msgstr "&Inportatu..."
 
-#: resources.h:760
+#: resources.h:786
 msgid "&Fall back to active mode"
-msgstr "&Bueltatu aktibatu modura"
+msgstr "&Itzuli modu aktibora"
 
-#: resources.h:489
+#: resources.h:506
 msgid "&File"
-msgstr "&Fitxategia"
+msgstr "&Agiria"
 
-#: resources.h:634
+#: resources.h:660
 msgid "&File Attributes..."
-msgstr "&Fitxategi-atributuak..."
+msgstr "&Agiri Ezaugarriak..."
 
-#: resources.h:588
+#: resources.h:608
 #, fuzzy
 msgid "&File permissions..."
-msgstr "Jabearen baimenak"
+msgstr "Jabe baimenak"
 
-#: resources.h:364
-#, fuzzy
+#: resources.h:374
 msgid "&File:"
-msgstr "&Fitxategia"
+msgstr "&Agiria:"
 
-#: resources.h:219
-#, fuzzy
+#: resources.h:229
 msgid "&Filter conditions:"
-msgstr "Iragazki-multzoak:"
+msgstr "Iragazki baldi&ntzak:"
 
-#: resources.h:198
+#: resources.h:208
 msgid "&Filter sets:"
-msgstr "Iragazki-multzoak:"
+msgstr "&Iragazki ezarpenak:"
 
-#: resources.h:213
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Iragazkiak:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
-msgstr ""
+msgstr "&Amaitu"
 
-#: resources.h:316
+#: resources.h:326
 msgid "&Finish editing and delete local file"
-msgstr "Bukatu editatzen eta kendu bertako artxibo"
+msgstr "&Amaitu edizioa eta ezabatu tokiko agiria"
 
-#: resources.h:446
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
+"&Lautu hurruneko helburuak, jeitsi agiri guztiak zuzenean xede zuzenbide "
+"barnera"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
-msgstr ""
+msgstr "&Hurrengo sinlotura, ezabatu xede zuzenbideko edukiak"
 
-#: resources.h:753
-#, fuzzy
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
-msgstr "&Kanpoko IP helbidea:"
+msgstr "&Lortu kanpoko IP helbidea hurrengo URL-tik:"
 
-#: resources.h:551
-#, fuzzy
+#: resources.h:569
 msgid "&Getting help..."
-msgstr "&Konfigurazioa"
+msgstr "&Lortu laguntza..."
 
-#: resources.h:396
+#: resources.h:406
 msgid "&Global bookmark"
-msgstr ""
+msgstr "&Lastermarka orokorra"
 
-#: resources.h:789
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
-msgstr ""
+msgstr "H&TTP/1.1 ELKARKETA metodoa erabiliz"
 
-#: resources.h:547
+#: resources.h:565
 msgid "&Help"
 msgstr "&Laguntza"
 
-#: resources.h:514 resources.h:640
-#, fuzzy
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
-msgstr "Zerbitzaria / Fitxategi lokala"
+msgstr "&Ezkutatu agiri berdinak"
 
-#: resources.h:595
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Handiena"
 
-#: resources.h:748
+#: resources.h:774
 msgid "&Highest available port:"
-msgstr "&Ataka erabilgarri handiena:"
+msgstr "Ataka eskuragarri &handiena:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
-msgstr "&Gunea:"
+msgstr "Hostalaria&:"
 
-#: resources.h:891
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
-msgstr "&IEC Aurrizki bitarrak (adibidez, 1KiB = 1024 byte)."
+msgstr "&IEC binario aurrizkiak (adib. 1 KiB = 1024 byte)"
 
-#: resources.h:879
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
-msgstr "&ISO 8601 (adibidez: 2007-09-15)"
+msgstr "&ISO 8601 (adibidea: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Inportatu..."
 
-#: resources.h:934
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
-msgstr "&Sistemako fitxategi-mota elkartasunak erabili"
+msgstr "Ondorengotu sistemaren agirimota elkarketak"
 
-#: resources.h:445
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
-msgstr ""
+msgstr "&Heutsi hurruneko helburu egitura erlatiboari erroa bilatzeko"
 
-#: resources.h:854
-#, fuzzy
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
-msgstr "Direktorio eta fitxategi guztiei ezarri"
+msgstr "&Agiri eta zuzenbide panelen antolakuntza:"
 
-#: resources.h:745
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
-msgstr "&Mugatu FileZillak erabilitako bertako atakak"
+msgstr "&Mugatu FileZillak erabiltzeko tokiko atakak"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
-msgstr "&Mugatu aldibereko konexio kopurua"
+msgstr "&Mugatu aldibereko elkarketa zenbatekoa"
 
-#: resources.h:519
-#, fuzzy
+#: resources.h:537
 msgid "&Local directory tree"
-msgstr "Direktorio &lokal lehenetsia"
+msgstr "&Tokiko zuzenbide zuhaitza"
 
-#: resources.h:401 resources.h:407
-#, fuzzy
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
-msgstr "Direktorio &lokal lehenetsia"
+msgstr "&Tokiko zuzenbidea:"
 
-#: resources.h:949
-#, fuzzy
+#: resources.h:981
 msgid "&Log to file"
-msgstr "Urruneko fitxategia"
+msgstr "&Oharreratu agirira"
 
-#: resources.h:82
-#, fuzzy
+#: resources.h:91
 msgid "&Logon Type:"
-msgstr "&Saio-hasiera mota:"
+msgstr "Saiohaste &Mota:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "&Logontype:"
-msgstr "&Saio-hasiera mota:"
+msgstr "&Saiohaste-mota:"
 
-#: resources.h:598
+#: resources.h:618
 msgid "&Low"
-msgstr "&Txikia"
+msgstr "&Apala"
 
-#: resources.h:545
-#, fuzzy
+#: resources.h:563
 msgid "&Manage bookmarks..."
-msgstr "Gune-kudeatzailea..."
+msgstr "&Kudeatu lastermarkak..."
 
-#: resources.h:533
-#, fuzzy
+#: resources.h:551
 msgid "&Manual transfer..."
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "&Eskuzko eskualdaketa..."
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Maximum number of connections:"
-msgstr "&Gehienezko konexkio kopurua:"
+msgstr "Gehi&nezko elkarketa zenbatekoa:"
 
-#: resources.h:730
-#, fuzzy
+#: resources.h:756
 msgid "&Maximum number of retries:"
-msgstr "&Gehienezko konexkio kopurua:"
+msgstr "&Gehinezko sarrera zenbatekoa:"
 
-#: resources.h:518
+#: resources.h:536
 msgid "&Message log"
-msgstr ""
+msgstr "&Mezu oharra"
 
-#: resources.h:866
+#: resources.h:893
 msgid "&Minimize to tray"
-msgstr ""
+msgstr "&Ikurtu erretilura"
 
-#: resources.h:399
-#, fuzzy
+#: resources.h:409
 msgid "&Name:"
-msgstr "Izena:"
+msgstr "&Izena:"
 
-#: resources.h:503
+#: resources.h:520
 msgid "&Network configuration wizard..."
-msgstr "&Sareko konfiguraziorako laguntzailea..."
+msgstr "&Sare itxurapen laguntzailea..."
 
-#: resources.h:214
+#: resources.h:224
 msgid "&New"
 msgstr "&Berria"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
-msgstr "&Gune berria"
+msgstr "&Gune Berria"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
-msgstr "&Badago Bertsio berri bat!"
+msgstr "&Bertsio berri bat eskuragarri!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
-#, fuzzy
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
-msgstr "&Berria"
+msgstr "&Hurrengoa >"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&No"
 msgstr "&Ez"
 
-#: resources.h:763 resources.h:788
-#, fuzzy
+#: resources.h:789 resources.h:814
 msgid "&None"
-msgstr "&Ez"
+msgstr "&Ezer ez"
 
-#: resources.h:597
+#: resources.h:617
 msgid "&Normal"
-msgstr "&Normala"
-
-#: resources.h:941
-msgid "&Number of days between update checks:"
-msgstr ""
+msgstr "&Arrunta"
 
-#: resources.h:145
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Zenbakizko balioa:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
-msgstr "&Ados"
+msgstr "&Ongi"
 
-#: resources.h:766
+#: resources.h:792
 msgid "&OPEN"
-msgstr ""
+msgstr "&IREKI"
 
-#: resources.h:561 resources.h:645
+#: resources.h:579 resources.h:671
 msgid "&Open"
-msgstr ""
+msgstr "&Ireki"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
-msgstr "&Gainean idatzi"
+msgstr "&Gainidatzi"
 
-#: resources.h:101
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Pasiboa"
 
-#: resources.h:124
+#: resources.h:133
 msgid "&Password:"
-msgstr "&Pasahitza:"
+msgstr "&Sarhitza"
 
-#: resources.h:605
+#: resources.h:625
 msgid "&Play sound"
-msgstr "&Soinua entzun"
+msgstr "&Irakurri soinua"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
-msgstr "&Ataka:"
+msgstr "A&taka:"
 
-#: resources.h:860
-#, fuzzy
+#: resources.h:886
 msgid "&Position of the message log:"
-msgstr "Mezu-logaren bistaratzea aktibatu/desaktibatu"
+msgstr "&Mezu oharraren kokapena:"
 
-#: resources.h:529
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr ""
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Queue"
-msgstr "&Ilara"
+msgstr "&Lerroa"
 
-#: resources.h:718
+#: resources.h:744
 msgid "&Quickconnect"
-msgstr "&Konexio bizkorra"
+msgstr "Elkarketa&-azkarra"
 
-#: resources.h:517
-#, fuzzy
+#: resources.h:535
 msgid "&Quickconnect bar"
-msgstr "&Konexio bizkorra"
+msgstr "&Elkarketa-azkarra barra"
 
-#: resources.h:134
+#: resources.h:143
 msgid "&Read"
 msgstr "&Irakurri"
 
-#: resources.h:536
+#: resources.h:554
 msgid "&Reconnect"
-msgstr "&Birkonektatu"
+msgstr "&Berrelkarketatu"
 
-#: resources.h:508 resources.h:662
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
-msgstr ""
+msgstr "&Berritu"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Remember password for this session"
-msgstr "&Gogoratu pasahitza saio honetarako"
+msgstr "&Gogoratu sarhitzak saio honentzat"
 
-#: resources.h:403 resources.h:409
-#, fuzzy
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Gogoratu sarhitzak"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
-msgstr "&Sortu direktorioa"
+msgstr "&Hurruneko zuzenbidea:"
 
-#: resources.h:367
-#, fuzzy
+#: resources.h:377
 msgid "&Remote path:"
-msgstr "Urruneko gunea:"
+msgstr "H&urruneko helburua:"
 
-#: resources.h:825
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Kendu"
 
-#: resources.h:783
-#, fuzzy
+#: resources.h:809
 msgid "&Remove key"
-msgstr "&Kendu"
+msgstr "&Kendu giltza"
 
-#: resources.h:592
+#: resources.h:612
 msgid "&Remove selected"
-msgstr "Kendu hautatutakoa"
+msgstr "&Kendu hautaturikoa(k)"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
-msgstr "&Izena aldatu"
+msgstr "Be&rrizendatu"
 
-#: resources.h:200
-#, fuzzy
+#: resources.h:210
 msgid "&Rename..."
-msgstr "&Izena aldatu"
+msgstr "&Berrizendatu..."
 
-#: resources.h:323
-#, fuzzy
+#: resources.h:333
 msgid "&Reopen local file"
-msgstr "Zerbitzaria / Fitxategi lokala"
+msgstr "&Berrireki tokiko agiria"
 
-#: resources.h:816
+#: resources.h:842
 msgid "&Replace invalid characters with:"
-msgstr ""
+msgstr "&Ordeztu baliogabeko hizkiak honekin:"
 
-#: resources.h:552
-#, fuzzy
+#: resources.h:570
 msgid "&Report a bug..."
-msgstr "&Esportatu..."
+msgstr "&Jakinarazi akats bat..."
+
+#: resources.h:640
+msgid "&Reset and requeue all"
+msgstr "&Berrezarri eta lerrokatu denak"
 
-#: resources.h:711
+#: resources.h:737
 msgid "&Restart Wizard"
-msgstr "&Hasi berriro laguntzailea"
+msgstr "&Berrekin Laguntzailea"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
-msgstr "&Jarraitu"
+msgstr "&Berrekin"
 
-#: resources.h:603
+#: resources.h:623
+#, fuzzy
 msgid "&Run command..."
-msgstr "&Exekutatu komandoa..."
+msgstr "&Sartu norbere agindua..."
 
-#: resources.h:725
+#: resources.h:751
 msgid "&Run configuration wizard now..."
-msgstr "&Ireki konfiguraziorako laguntzailea orain..."
+msgstr "&Ekin itxurapen laguntzailea orain..."
 
-#: resources.h:943
+#: resources.h:976
 msgid "&Run update check now..."
-msgstr "&Bilatu bertsio berria orain..."
+msgstr "&Ekin eguneraketa egiaztapena orain..."
 
-#: resources.h:765
+#: resources.h:791
 msgid "&SITE"
-msgstr ""
+msgstr "G&UNEA"
 
-#: resources.h:790
+#: resources.h:816
 msgid "&SOCKS 5"
-msgstr ""
+msgstr "SO&CKS 5"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Save as..."
-msgstr "Gorde honela..."
+msgstr "&Gorde honela..."
 
-#: resources.h:431
+#: resources.h:441
 msgid "&Search"
-msgstr ""
+msgstr "&Bilatu"
 
-#: resources.h:538
-#, fuzzy
+#: resources.h:556
 msgid "&Search remote files..."
-msgstr "Iragazi honako fitxategiak:"
+msgstr "Bilatu &hurreneko agiriak..."
 
-#: resources.h:71
-#, fuzzy
+#: resources.h:79
 msgid "&Select Entry:"
-msgstr "Hautatu Sarrera:"
+msgstr "&Hautatu Sarrera:"
 
-#: resources.h:923
+#: resources.h:951
 msgid "&Select language:"
 msgstr "&Hautatu hizkuntza:"
 
-#: resources.h:355
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
-msgstr ""
+msgstr "&Hautatu erakutsi behar diren zutabeak:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Zerbitzaria"
 
-#: resources.h:299
+#: resources.h:309
 msgid "&Settings"
-msgstr "&Konfigurazioa"
+msgstr "&Ezarpenak"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Settings..."
-msgstr "&Konfigurazioa"
+msgstr "&Ezarpenak..."
 
-#: resources.h:958
+#: resources.h:990
 msgid "&Show debug menu"
-msgstr "&Debug-menua erakutsi"
+msgstr "&Erakutsi garbiketa menua"
 
-#: resources.h:604
+#: resources.h:624
 msgid "&Show message"
-msgstr "&Mezua erakutsi"
+msgstr "&Erakutsi mezua"
 
-#: resources.h:948
-#, fuzzy
+#: resources.h:980
 msgid "&Show timestamps in message log"
-msgstr "Erregistroan dagoen &Depurazio informazioa:"
+msgstr "&Erakuktsi denbora-irarketak mezu oharrean"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&Site Manager..."
-msgstr "Gune-kudeatzailea..."
+msgstr "&Gune Kudeatzailea..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Site-specific bookmark"
-msgstr ""
+msgstr "G&une-bereizi lastermarka"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
-msgstr "&Saltatu"
+msgstr "&Jauzi"
 
-#: resources.h:532
+#: resources.h:550
 msgid "&Speed limits"
-msgstr ""
+msgstr "&Abiadura mugak"
 
-#: resources.h:448
-#, fuzzy
+#: resources.h:458
 msgid "&Start transfer immediately"
-msgstr "Transferentzia-mota lehenetsia:"
+msgstr "&Hasi eskualdaketa berehala"
 
-#: resources.h:859
+#: resources.h:885
 msgid "&Swap local and remote panes"
-msgstr "&Trukatu bertako eta urrutiko panelak"
+msgstr "Elkarraldatu tokiko eta hurruneko panelak"
+
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "&TLS Zifraketak"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
-msgstr "&Probatu"
+msgstr "&Aztertu"
 
-#: resources.h:871
+#: resources.h:899
 msgid "&Theme:"
-msgstr "&Diseinua:"
+msgstr "&Azalgaia:"
 
-#: resources.h:522
+#: resources.h:540
 msgid "&Transfer"
-msgstr "&Transferitu"
+msgstr "Es&kualdatu"
 
-#: resources.h:98
+#: resources.h:107
 msgid "&Transfer mode:"
-msgstr "&Transferentzia-modua:"
+msgstr "&Eskualdaketa modua:"
 
-#: resources.h:521
-#, fuzzy
+#: resources.h:539
 msgid "&Transfer queue"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Esk&ualdaketa lerroa"
 
-#: resources.h:828
-#, fuzzy
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
-msgstr "Honako fitxategi-motak Ascii fitxategien eran erabili:"
+msgstr "T&ratatu dotagiriak ASCII agiri bezala"
 
-#: resources.h:329
+#: resources.h:339
 msgid "&Unedit"
-msgstr "&Des-editatu"
+msgstr "&Deseditatu"
 
-#: resources.h:194
+#: resources.h:204
 msgid "&Update cached key for this host"
-msgstr "&Eguneratu erregistratutako gakoa gune honetarako"
+msgstr "&Eguneratu hostalari honentzat katxeaturiko giltza"
 
-#: resources.h:555 resources.h:641
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Igo"
 
-#: resources.h:266 resources.h:840
-#, fuzzy
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
-msgstr "&Gora kargatu"
+msgstr "&Igoerak:"
 
-#: resources.h:424
-#, fuzzy
+#: resources.h:434
 msgid "&Use custom program"
-msgstr "Erabili karaktere-multzo &pertsonalizatua"
+msgstr "&Erabili norbere programa"
 
-#: resources.h:93
+#: resources.h:102
 msgid "&Use synchronized browsing"
-msgstr ""
+msgstr "Era&bili bilaketa aldiberetua"
 
-#: resources.h:927
+#: resources.h:955
 msgid "&Use system's default editor for text files"
-msgstr ""
+msgstr "E&rabili sistemaren idazki agirietarako berezko editatzailea"
 
-#: resources.h:751
-#, fuzzy
+#: resources.h:777
 msgid "&Use the following IP address:"
-msgstr "honako fitxategiarekin?"
+msgstr "&Erabili hurrengo IP helbidea:"
 
-#: resources.h:759
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
-msgstr "&Ordez, Zerbitzariaren kanpoko IP helbidea erabili"
+msgstr "&Erabili zerbitzariaren kanpoko IP helbidea ordez"
 
-#: resources.h:894
+#: resources.h:922
 msgid "&Use thousands separator"
-msgstr "&Milako bereizlea erabili"
+msgstr "Erabili &milako banantzailea"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
-msgstr "&Erabiltzailea:"
+msgstr "Era&biltzailea:"
 
-#: resources.h:714
+#: resources.h:740
 msgid "&Username:"
-msgstr "&Erabiltzaile-izena:"
+msgstr "E&rabiltzaile-izena:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
-msgstr "%s &bertsioa"
+msgstr "&Bertsioa %s"
 
-#: resources.h:507
-#, fuzzy
+#: resources.h:524
 msgid "&View"
-msgstr "&Berria"
+msgstr "&Ikusi"
 
-#: resources.h:578
-#, fuzzy
+#: resources.h:596
 msgid "&View/Edit"
-msgstr "&Ikusi / Editatu"
+msgstr "&Ikusi/Editatu"
 
-#: resources.h:933
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr ""
+msgstr "&Ikusi tokian editaturiko agiriak eta galdetu aldaketak igotzeko"
+
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "Eguneraketak egiaztatzerakoan, egiaztatu hau:"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Write"
 msgstr "&Idatzi"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Bai"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "'%s' ez da existitzen edo ezin da hara iritsi."
+msgstr "'%s' ez dago edo ez dago sarbiderik."
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
-#, fuzzy, c-format
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
 msgid "'%s' is not a directory."
-msgstr "Sortu direktorioa"
+msgstr "'%s' ez da zuzenbide bat."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "Aukeratutako protokoloak ez du 'Kontua' sesio-hasiera modua jasaten"
+msgstr "'Kontua' saiohaste-mota ez dago eskuragarri hautaturiko protokolorako."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"'Arrunta' eta 'Kontua' saiohaste-motak ez daude eskuragarri. 'Galdetu "
+"sarhitza' erabiltzen ordez."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+"'Arrunta' eta 'Kontua' saiohaste-motak ez daude eskuragarri. Zure sarrera "
+"'Galdetu sarhitza'-ra aldatu da."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'quote' normalean komando-lerroko klienteek erabilitako bertako komando bat "
-"da, 'quote' ondoren dagoena zerbitzariari bidaltzeko balio duela. Agian "
-"nahiago duzu komando osoa eskuz idaztea 'quote' gabe."
+"'aipamena' arrunt agindulerro bezeroek zerbitzariari argumentoak 'aipamea'-z "
+"jarraiturik bidaltzeko erabiltzen duten tokiko agindu bat da. Badaiteke zuk "
+"idazki agindua sartu nahi izatea 'aipamen' buru gabe."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
 #, c-format
 msgid "(%d object filtered)"
 msgid_plural "(%d objects filtered)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%d objetu iragazita)"
+msgstr[1] "(%d objetu iragazita)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
-msgstr "(0 ez mugatzeko)"
+msgstr "(0 mugagabe)"
 
-#: resources.h:731
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 segundu)"
 
-#: resources.h:798
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
-msgstr "(5-9999, 0 ez erabiltzeko)"
-
-#: resources.h:942
-msgid "(At least 7 days)"
-msgstr "(Gutxienez 7 egun)"
+msgstr "(5-9999, 0 ezgaitzeko)"
 
-#: resources.h:887
+#: resources.h:915
 msgid "(example: %H:%M)"
-msgstr "(adibidez: %H:%M)"
+msgstr "(adibidea: %H:%M)"
 
-#: resources.h:881
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
-msgstr "(adibidez: %Y-%m-%d)"
+msgstr "(adibidea: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
-#, fuzzy, c-format
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
+#, c-format
 msgid "(in %s/s)"
-msgstr "(sartutako KB/s)"
+msgstr "(honela %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
-msgstr "%H:%M:%S faltan"
+msgstr ", %H:%M:%S gelditzen da"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
-msgstr "--:--:-- faltan"
+msgstr ", --:--:-- gelditzen da"
 
-#: resources.h:699
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Broken router and/or firewall"
-msgstr ""
+msgstr "- Bideratzailea eta/edo suhesia hautsita"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- File corrupted on mirror"
-msgstr ""
+msgstr "- Agiri hondatua ispiluan"
 
-#: resources.h:246
+#: resources.h:256
 msgid "- Malware on your system"
-msgstr ""
+msgstr "- Malwarea zure sisteman"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
-msgstr "--:--:-- faltan"
+msgstr "--:--:-- gelditzen da"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-c ezin da FTP URL batekin batera erabili."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
-msgstr ""
+msgstr "-l FTP URL batekin batera bakarrik erabili daiteke."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
-msgstr ""
+msgstr "-s eta -c ezin dira aldiberean egon"
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-s ezin da FTP URL batekin batera erabili."
 
-#: resources.h:960
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Ezer ez"
 
-#: resources.h:961
+#: resources.h:993
 msgid "1 - Warning"
-msgstr "1 - Adi!"
+msgstr "1 - Oharrak"
 
-#: resources.h:962
+#: resources.h:994
 msgid "2 - Info"
-msgstr "2 - Informazioa"
+msgstr "2 - Argibideak"
 
-#: resources.h:963
+#: resources.h:995
 msgid "3 - Verbose"
-msgstr "3 - Informazio asko"
+msgstr "3 - Berritsua"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
-msgstr "Urruneko gunea:"
+msgstr "32 biteko sistema"
 
-#: resources.h:964
+#: resources.h:996
 msgid "4 - Debug"
-msgstr "4 - Debug"
+msgstr "4 - Garbiketa"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
-msgstr "Urruneko gunea:"
+msgstr "64 biteko sistema"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
-msgstr ""
+msgstr "< &Atzera"
 
-#: resources.h:546
+#: resources.h:564
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
-"%s fitxategia lehendik dago.\n"
-"Sartu izen berri bat:"
+"Jadanik badago sartutako izena duen lastermarka bat. Mesedez sartu erabili "
+"gabeko izen bat"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
-msgstr "Nahiagoko editorea ezarri behar da."
+msgstr "Berezko editatzaile bat ezerri beharra dago."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
-msgstr "Direktorio bat ezin da bere subdirektorio betean sartu."
+msgstr "Zuzenbide bat ezin da bere azpizuzenbideetako batera arrastatu."
 
-#: resources.h:671
+#: resources.h:697
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
-"Zerbitzari gutxi batzuk ez dute uzten modu pasiboa edo ez daude "
-"konfiguratuak. Kasu honetan modu aktiboa erabili behar duzu. Modu aktiboan "
-"FileZillak ataba bat irekitzen du eta zerbitzariari hara konektatzea "
-"eskatzen dio."
+"Zerbitzari gutxi batzuek ez dute modu pasiboa ahalbidetzen edo desitxuratuta "
+"daude. Horrelakoetan modu aktiboa erabili behar duzu. Modu aktiboan, "
+"FileZillak ataka bat ireki eta zerbitzariari galdetzen dio berarekin "
+"elkarketatzeko."
 
-#: resources.h:305
-#, fuzzy
+#: resources.h:315
 msgid "A file previously opened has been changed."
-msgstr "Aurretik irekita zegoen fitxategi bat aldatu da:"
+msgstr "Aurretik irekitako agiri bat aldatua izan da."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
-#, fuzzy, c-format
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
-"Izen bera duen beste fitxategi bat editatzen ari da. Baztertu zaharra eta "
-"jaitsi berria?"
+"Jadanik badago izen horrekin editatzen ari den agiri bat. '%s' berrirekitzea "
+"nahi duzu?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
-msgstr "Izen bera duen beste fitxategi bat transferitzen ari da."
+msgstr "Izen hori duen agiri batek jadanik hasita du eskualdaketa."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
-"Izen hori duen beste fitxategi bat oraindik editatzen ari da. Mesedez, itxi "
-"eta ahalegindu berriro."
+"Oraindik izen horrekin editatzen ari den agiri bat dago. Mesedez itxi eta "
+"saiatu berriro."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1259,104 +1223,113 @@
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
-"Bertako fitxategi-izen bat ezin izan da deskodetu.\n"
-"Ziurtatu LC_CTYPE (edo LC_ALL) ingurune-aldagaia zuzen ezarri dela.\n"
-"Arazo hau konpondu ezean, fitxategirik ez da ikusiko fitxategien "
-"zerrendetan.\n"
-"Ez da abisu gehiagorik izango saio honetan."
+"Tokiko agirizen bat ezin da dekodeatu.\n"
+"Mesedez zihurtatu LC_CTYPE (edo LC_ALL) inguru aldaera zuzen ezarrita "
+"dagoela.\n"
+"Arazo hau zuzentzen ez baduzu, agiriak galdu egin daitezke agiri "
+"zerrendapenetatik.\n"
+"Ez da ohar gehiago erakutsiko saio honetan."
 
-#: resources.h:236
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
-msgstr "FileZilla bertsio berri bat eskura dago:"
+msgstr "FileZilla bertsio berri bat eskuragarri dago:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
+"Zerbitzari egoki batek betik erakusten ditu agiri guztiak, baina zenbait "
+"zerbitzari hautsik erabiltzaile agiriak ezkutatzen dituzte. Erabili aukera "
+"hau zerbitzaria agiri guztiak erakustera behartzeko."
 
-#: resources.h:743
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
 msgstr ""
+"Zerbitzari egoki batek ez du hau behar. Jarri harremanetan zerbitzari "
+"administratzailearekin hau behar baduzu."
 
 #: ../../locales/../src/interface/state.cpp:284
 msgid ""
 "A remote operation is in progress and synchronized browsing is enabled.\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
+"Hurruneko eragiketa garatzen ari da eta bilaketa aldiberetua gaituta dago.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu tokiko zuzenbidea aldatzen?"
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
-msgstr ""
+msgstr "&ASCII"
 
-#: resources.h:824
+#: resources.h:850
 msgid "A&dd"
-msgstr "G&ehitu"
+msgstr "&Gehitu"
 
-#: resources.h:851
-#, fuzzy
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
-msgstr "ASCII fitxategiak jarraitu daitezke"
+msgstr "&Ahalbidetu ASCII agirien berrekitea"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
-msgstr "A&plikatu jaisteko soilik"
+msgstr "Ezarri &jeisketei bakarrik"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "A&plikatu igotzeko soilik"
+msgstr "Ezarri &igoerei bakarrik"
 
-#: resources.h:148
+#: resources.h:157
 msgid "A&pply to all files and directories"
-msgstr "Direktorio eta fitxategi guztiei ezarri"
+msgstr "Ezarri &agiri eta zuzenbide guztiei."
 
-#: resources.h:388
+#: resources.h:647
+msgid "A&utomatically remove successful transfers"
+msgstr "&Berezgaitasunekz kendu ongi buruturiko eskualdaketak"
+
+#: resources.h:398
 msgid "ASCII"
-msgstr ""
+msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
-msgstr ""
+msgstr "Utzi aurreko elkarketa eta elkarketatu oraingo hegatsean"
 
-#: resources.h:153
+#: resources.h:162
 msgid "About FileZilla"
-msgstr "FileZillari buruz"
+msgstr "FileZilla-ri buruz"
 
-#: resources.h:861
-#, fuzzy
+#: resources.h:887
 msgid "Above the file lists"
-msgstr "Freskatu fitxategi eta karpeten zerrendak"
+msgstr "Agiri zerrenden gainean"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../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:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Kontua"
 
-#: resources.h:600
+#: resources.h:620
 msgid "Action after queue &completion"
-msgstr "Ilara bukatzerako ekintza"
+msgstr "&Lerroa osatu ondorengo ekintza"
 
-#: resources.h:328
+#: resources.h:338
 msgid "Action on selected file:"
-msgstr "Ekintza hautatutako fitxategian"
+msgstr "Ekintza hautaturiko agirian:"
 
-#: resources.h:322
+#: resources.h:332
 msgid "Action to perform:"
-msgstr ""
+msgstr "Egiteko ekintza:"
 
-#: resources.h:57
-#, fuzzy
+#: resources.h:65
 msgid "Action:"
-msgstr "&Kontua:"
+msgstr "Ekintza:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
@@ -1367,1130 +1340,1112 @@
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
 msgstr ""
-"FTP testa modu aktiboan huts egin du. FileZillak ez du ezagutzen kanpoko IP "
-"helbidea."
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak ez du kanpoko IP helbide "
+"zuzena ezagutzen."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:592
 msgid ""
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address. In addition to that, your router has modified the sent address."
 msgstr ""
-"FTP testa modu aktiboan huts egin du. FileZillak ez du ezagutzen kanpoko IP "
-"helbidea. Gainera, zure router-ak igorle-helbidea aldatu egin du."
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak ez du kanpoko IP helbide "
+"zuzena ezagutzen. Gainera, zure bideratzaileak bidalitako helbidea aldatu du."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:580
-#, fuzzy
 msgid ""
 "Active mode FTP test failed. FileZilla knows the correct external IP "
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
-"FTP testa modu aktiboan huts egin du. FileZillak ez du ezagutzen kanpoko IP "
-"helbidea, baina zure routerak engainatuta igorle-helbidea aldatu egin du."
+"Modu aktiboko FTP azterketa hutsegitea. FileZillak kanpoko IP helbide zuzena "
+"ezagutzen du, baina zure bideratzaileak edo suhesiak bidalitako helbidea "
+"gaizkiulertuz aldatu du."
 
-#: resources.h:756
-#, fuzzy
+#: resources.h:782
 msgid "Active mode IP"
-msgstr "Aktibatu IP modua"
+msgstr "Modu aktibo IP-a"
 
-#: resources.h:449
-#, fuzzy
+#: resources.h:459
 msgid "Add files to &queue only"
-msgstr "&Fitxategiak ilarara sartu"
+msgstr "&Gehitu agiriak lerrora bakarrik"
 
-#: resources.h:625 resources.h:644
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
-msgstr "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
+msgstr "Gehitu hautaturiko zuzenbidea eskualdaketa lerrora"
 
-#: resources.h:558 resources.h:575
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
-msgstr "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
+msgstr "Gehitu hautaturiko agiriak eta agiritegiak eskualdaketa lerrora"
 
-#: resources.h:914 resources.h:920
-#, fuzzy
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
-msgstr "&Fitxategiak ilarara sartu"
+msgstr "Gehitu lerrora"
 
 #: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
-msgstr ""
+msgstr "Helbide mota ez dago sostengaturik"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Advanced"
 msgstr "Aurreratua"
 
-#: resources.h:233
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Aukera aurreratuak:"
 
-#: resources.h:337
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Oharra: Ezaugarri berriak aztertzea nahi ez badituzu, mesedez jarraitu "
+"bertsio egonkorrak bakarrik erabiltzen. Beta bertsioak eta gau eraiketak "
+"azterketa asmoetarako garapen bertsioak dira. FileZilla-ren gau bertsioek "
+"badaiteke itxaron bezala lan egitea eta zure sistema kaltetu dezakete. "
+"Erabili beta bertsioak eta gau eraiketak zeure arriskupean."
+
+#: resources.h:347
 msgid "Algorithm:"
-msgstr ""
+msgstr "Algoritmoa:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
-msgstr "Automatikoki ongi ateratako transferentziak kendu"
+msgstr "Agiri guztiak ongi eskualdatu dira"
 
-#: resources.h:700
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr ""
-"Ataka erabilgarri txikienak 1024 eta 65535 bitarteko zenbaki bat izan behar "
-"du."
+msgstr "Emaniko ataka guztiak 1024 eta 65535 arteko mailan egon behar dira."
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
-#, fuzzy, c-format
+#: ../../locales/../src/interface/QueueView.cpp:3139
+#, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
-msgstr[0] ""
-"Ezin da \"%s\" idatzi, Gune-kudeatzailean egindako aldaketak ezin dira "
-"gorde: %s"
-msgstr[1] ""
-"Ezin da \"%s\" idatzi, Gune-kudeatzailean egindako aldaketak ezin dira "
-"gorde: %s"
+msgstr[0] "Eskualdaketa denak amaitu dira. %d agiri ezin izan dira eskualdatu."
+msgstr[1] "Eskualdaketa denak amaitu dira. %d agiri ezin izan dira eskualdatu."
 
-#: resources.h:739
-#, fuzzy
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr "Beste transferentzia modu batean jarri huts egitean"
+msgstr "A&halbidetu beste eskualdaketa modu batera itzultzea hutsegitean"
 
-#: resources.h:675
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
-msgstr "Beste transferentzia modu batean jarri huts egitean"
+msgstr "Ahalbidetu beste eskualdaketa modu batera itzultzea hutsegitean"
 
-#: resources.h:475
-#, fuzzy
+#: resources.h:485
 msgid "Already connected"
-msgstr "Konektatua"
+msgstr "Jadanik elkarketaturik"
 
-#: resources.h:784
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
+"Aukeran Pageant tresna erabili dezakezu PuTTY-tik zure giltzak kudeatzeko, "
+"FileZillak ez du Pageant ezagutzen."
 
-#: resources.h:785
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
 msgstr ""
+"Aukeran zure sistemaren SSH agentea erabili dezakezu. Hori egiteko, "
+"zihurtatu SSH_AUTH_SOCK inguru aldaera ezarrita dagoela."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
+msgstr "Aukeran, ikusi http://filezilla-project.org bertsio berriena jeisteko."
+
+#: ../../locales/../src/interface/QueueView.cpp:2055
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
 msgstr ""
-"Hautabide gisa, http://filezilla-project.org/ helbidean sartu zaitezke "
-"eguneratuen bertsioa jaisteko."
+"Akats bat gertatu da \"%s\"-tik eskualdaketa lerroa gertatzerakoan.\n"
+"Lerroko zenbait gai badaiteke ez leheneratzea."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1954
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"Akats bat gertatu da \"%s\"-tik eskualdaketa lerroa gordetzerakoan.\n"
+"Lerroko zenbait gai badaiteke ez gordetzea."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
-"Izen hori duen beste fitxategi bat oraindik editatzen ari da. Mesedez, itxi "
-"eta ahalegindu berriro."
+"Jadanik badago arrastaturiko gaiaren izen bera duen gai bat xede kokalekuan."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../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:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
-msgstr "Anonimoa"
+msgstr "Izengabea"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
+"Beste hurruneko eragiketa bat jadanik garatzen ari da, ezinezkoa zuzenbidea "
+"orain aldatzea."
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
-msgstr ""
-"Ezin da \"%s\" idatzi, Gune-kudeatzailean egindako aldaketak ezin dira "
-"gorde: %s"
+msgstr "Gune Kudeatzailean egindako aldaketak ezin dira gorde."
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../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 ""
+"Gune Kudeatzailea egindako aldaketak ez dira gordeko agiria konpondu arte."
 
-#: ../../locales/../src/interface/filter.cpp:194
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
-msgstr ""
-"Ezin da \"%s\" idatzi, Gune-kudeatzailean egindako aldaketak ezin dira "
-"gorde: %s"
+msgstr "Iragazkiek egindako aldaketak ezin dira gorde."
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
-msgstr ""
+msgstr "Iragazkiek egindako aldaketak ez dira gordeko."
 
-#: resources.h:150
+#: resources.h:159
 msgid "App&ly to directories only"
-msgstr "Ap&likatu direktorioei soilik"
+msgstr "Ezarri &zuzenbideei bakarrik"
 
-#: resources.h:212
+#: resources.h:222
 msgid "Apply"
-msgstr "Aplikatu"
+msgstr "Ezarri"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
-msgstr "Aplikatu &uneko ilarari soilik"
+msgstr "Ezarri &oraingo lerroari bakarrik"
 
-#: resources.h:149
+#: resources.h:158
 msgid "Apply to &files only"
-msgstr "Aplikatu &fitxategiei soilik"
+msgstr "Ezarri a&giriei bakarrik"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
-msgstr "Fitxategia"
+msgstr "Agiritegia"
 
-#: resources.h:863
-#, fuzzy
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
-msgstr "Transferentzia-ilararen bistaratzea aktibatu/desaktibatu"
+msgstr "Hegats bezala eskualdaketa lerro panelean"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
-#, fuzzy
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
-msgstr "Galdetu zer egin"
+msgstr "Galdetu ekintza"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
-msgstr "Eskatu pasahitza"
+msgstr "Galdetu sarhitza"
 
-#: resources.h:696
+#: resources.h:722
 msgid "Ask operating system for a port."
-msgstr "Eskatu sistema eraginkorrari ataka bat."
+msgstr "Galdetu sistema eragileari ataka."
 
-#: resources.h:686
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
-msgstr "Eskatu sistema eraginkorrari kanpoko IP helbidea"
+msgstr "Galdetu sistema eragileari kanpoko IP helbidea"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
-msgstr ""
+msgstr "Galderen erantzunak FileZilla eztabaidaguneetan"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
 msgid "Associated program not found:"
-msgstr "Ez da aurkitu loturiko programa:"
+msgstr "Elkarturiko programa ez da aurkitu:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
-msgstr "Gutxienez iragazki-baldintza bat ez da osatu"
+msgstr "Gutxinez iragazki baldintza bat osatugabea da"
 
-#: resources.h:705
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
-msgstr "Puntu honetan, behar den informazio guztia eskuratu da."
+msgstr "Puntu honetan, beharrezko argibide guztiak lortuak daude."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
-msgstr "&Fitxategi-atributuak..."
+msgstr "Ezaugarria"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
-#, fuzzy
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Egiaztapen hutsegitea."
 
-#: resources.h:872
+#: resources.h:900
 msgid "Author:"
 msgstr "Egilea:"
 
-#: resources.h:385
-#, fuzzy
+#: resources.h:395
 msgid "Auto"
-msgstr "&Automatikoa"
+msgstr "Berez"
 
-#: resources.h:822
+#: resources.h:848
 msgid "Automatic file type classification"
-msgstr "Fitxategi-moten sailkapen automatikoa"
-
-#: resources.h:939
-msgid "Automatic update check"
-msgstr "Bilatu bertsio berria automatikoki"
+msgstr "Berezgaitasunezko agiri mota sailkapena"
 
-#: resources.h:876
-#, fuzzy
+#: resources.h:904
 msgid "Available sizes"
-msgstr "Tamaina"
+msgstr "Neurri eskuragarriak"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
-msgstr ""
+msgstr "B <Byte unintate sinboloas. Itzuli lehen hizkia bakarrik>"
 
-#: resources.h:89
+#: resources.h:98
 msgid "B&ypass proxy"
-msgstr ""
+msgstr "Proxytik igarogabe"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Basic usage instructions"
-msgstr ""
+msgstr "Ohinarrizko erabilpen jarraipideak"
 
-#: resources.h:865
+#: resources.h:891
 msgid "Behaviour"
-msgstr ""
+msgstr "Jokabidea"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
-msgstr "Editatzen dago"
+msgstr "Editatzerakoan"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:634
+msgid "Benchmark string coalescer"
+msgstr "Benchmark kate coalescer"
+
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
-msgstr ""
+msgstr "Kontuz! Egiaztagiria ukatua izan da"
 
-#: resources.h:389
-#, fuzzy
+#: resources.h:399
 msgid "Binary"
-msgstr "&Bitarra"
+msgstr "Binarioa"
 
-#: resources.h:858
+#: resources.h:884
 msgid "Blackboard"
-msgstr "Arbela"
+msgstr "Panelbeltza"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
-msgstr ""
+msgstr "Lastermarka"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmark:"
-msgstr ""
+msgstr "Lastermarka:"
 
-#: resources.h:411
+#: resources.h:421
 msgid "Bookmarks"
-msgstr ""
+msgstr "Lastermarkak"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Build date:"
-msgstr "Eraikitze-data:"
+msgstr "Eraiketa eguna:"
 
-#: resources.h:158
+#: resources.h:167
 msgid "Build information"
-msgstr "Eraikitze-informazioa"
+msgstr "Eraiketa argibideak"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
-msgstr ""
+msgstr "Negozio Kategoria:"
 
-#: resources.h:746
-#, fuzzy
+#: resources.h:772
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"Besterik ezean, edozein ataka lokal erabilgarri baliatuko du "
-"transferentzia \n"
-"modu aktiboan ezartzeko. Ataka barrutia mugatu nahi baduzu,\n"
-"hautatu bitartea honen azpian."
+"Berez tokiko edozein ataka eskuragarri erabiltzen du eskualdaketak modu "
+"aktiboan ezartzeko. FileZilla ataka maila txiki bat erabiltzera mugatzea "
+"nahi baduzu, mesedez sartu ataka maila behean."
 
-#: resources.h:535
-#, fuzzy
+#: resources.h:553
 msgid "C&ancel current operation"
-msgstr "Utzi uneko eragiketa"
+msgstr "E&zeztatu oraingo eragiketa"
 
-#: resources.h:235
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
-msgstr ""
+msgstr "Egiaztatu FileZilla &gau eraiketarik dagoen"
 
-#: resources.h:611
+#: resources.h:631
 msgid "C&lear all"
-msgstr "G&arbitu dena"
+msgstr "&Garbitu denak"
 
-#: resources.h:586 resources.h:632
-#, fuzzy
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
-msgstr "&Kopiatu arbelean"
+msgstr "K&opiatu URL-a(k) gakora"
 
-#: resources.h:880
-#, fuzzy
+#: resources.h:908
 msgid "C&ustom"
-msgstr "&Automatikoa"
+msgstr "Egile&a"
 
-#: resources.h:935
-#, fuzzy
+#: resources.h:963
 msgid "C&ustom filetype associations:"
-msgstr "Fitxategi-moten sailkapen automatikoa"
+msgstr "&Norbere agirimota elkarketak:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
-msgstr ""
+msgstr "Zerbitzariaren ordu-eremu oreka kalkulatzen..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
-msgstr "Ezin fitxategitik irakurri"
+msgstr "Ezin da irakurri agiritik"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
-msgstr "Ezin fitxategian idatzi."
+msgstr "Ezin dira datuak agirira idatzi."
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
+#, c-format
 msgid "Can't write data to file: %s"
-msgstr "Ezin fitxategian idatzi."
+msgstr "Ezinezkoa datuak agirira idaztea: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
-msgstr "Utzi"
+msgstr "Ezeztatu"
 
-#: resources.h:982
+#: resources.h:1015
 msgid "Cancel current operation"
-msgstr "Utzi uneko eragiketa"
+msgstr "Ezeztatu oraingo eragiketa"
 
-#: resources.h:983
+#: resources.h:1016
 msgid "Cancels the current operation"
-msgstr "Bertan behera uzten du uneko eragiketa"
+msgstr "Oraingo eragiketa ezeztatzen du"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
+"Ez dago '%s'-rako sarbiderik , ez da multimediarik txertatu edo gidagailua "
+"ez dago gertu."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
-msgstr "Gune-kudeatzailea irekitzen du"
+msgstr "Ezinezkoa zerbitzaria Gune Kudeatzailera gehitzea"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
 msgstr ""
+"Ezinezkoa hegatsa istea lanpetuta dagoela.\n"
+"Ezeztatu oraingo eragiketa eta itxi hegatsa?"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
+"Ezinezkoa zuzenbideak alderatzea, tokiko eta hurruneko zuzenbide iragazki "
+"ezberdinak daude gaituta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr ""
+"Ezinezkoa zuzenbideak alderatzea, ez dago inongo zerbitzarira elkarketaturik"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa iragazki berri bat sortzea"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezin da agiria editatu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezinezkoa agiria editatzea, ez dago inongo zerbitzira elkarketaturik."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
-msgstr ""
+msgstr "Ezinezkoa agiria editatzea, hurruneko helburu ezezaguna."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
+"Ezin da FTP elkarketa ezarri SFTP zerbitzari batera. Mesedez hautatu "
+"protokolo egokia."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr "Ezin da konexio bizkorraren barra baliabide-fitxategitik kargatu"
+msgstr "Ezinezkoa Elkarketa-azkarra barra gertatzea baliabide agiritik"
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr ""
+msgstr "Ezinezkoa agiria gertatzea, ez da XML agiri baliozko bat."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
-#, fuzzy
 msgid "Cannot load keyfile"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa giltzagiria gertatzea"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
-msgstr "Ezin da tresna-barra baliabide-fitxategitik kargatu"
+msgstr "Ezinezkoa tresnabarra baliabide agiritik gertatzea"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Ezinezkoa sarhitza gogoratzea"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa sarrera berrizendatzea"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa agiria berrizendatzea"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa iragazki-ezarpena gordetzea"
 
-#: ../../locales/../src/interface/filter.cpp:295
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa iragazkia hautatzea"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
-msgstr "Fitxategi-moten sailkapen automatikoa"
+msgstr "Ezinezkoa agiri elkarketa ezartzea"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
-msgstr ""
+msgstr "Ezinezkoa elkarrizketa erakustea"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
-msgstr "Ezin da fitxategiaren izena aldatu"
+msgstr "Ezinezkoa hautaturiko agiria ikustea/editatzea"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Categories"
-msgstr ""
+msgstr "Kategoriak"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
-msgstr ""
+msgstr "Egiaztagiria eta saio datuak ez daude eskuragarri oraindik."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
-msgstr ""
+msgstr "Egiaztagiri xehetasunak"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
-msgstr ""
+msgstr "Egiaztagiria kateetan:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
-msgstr ""
+msgstr "Egiaztagiri jaulkitzailea"
 
-#: resources.h:122
+#: resources.h:131
 msgid "Challenge:"
-msgstr "Lehia:"
+msgstr "Erronka:"
 
-#: resources.h:131
+#: resources.h:140
 msgid "Change file attributes"
-msgstr "Aldatu fitxategi-atributuak"
+msgstr "Aldatu agiri ezaugarriak"
 
-#: resources.h:589 resources.h:635
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
-msgstr "Aldatu fitxategi-baimenak"
+msgstr "Aldatu agiri baimenak."
 
-#: resources.h:956
-#, fuzzy
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "FileZillaren ezarpenak ireki"
+msgstr ""
+"Ohar-agiri ezarpenen aldaketak FileZillaren berrabiaraztea eskatzen du."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
-msgstr "Karaktere-kodeketa gaia"
+msgstr "Hizki-kode akatsa"
 
-#: resources.h:104
+#: resources.h:113
 msgid "Charset"
-msgstr "Karaktere-multzoa"
-
-#: resources.h:944
-#, fuzzy
-msgid "Check for &beta versions and release candidates"
-msgstr "&Bilatu FileZilla beta bertsio berriak"
+msgstr "Hizkikodea"
 
-#: resources.h:548
+#: resources.h:566
 msgid "Check for &updates..."
-msgstr ""
+msgstr "&Egiaztatu eguneraketak..."
 
-#: resources.h:549
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Egiaztatu File&Zilla eguneraketa berezgaitasunez:"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
-msgstr ""
+msgstr "Egiaztatu FileZilla bertsio berririk dagoen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
-msgstr ""
+msgstr "Egiztatu eguneraketarik dagoen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Hutsegitea eguneraketarik dagoen egiaztatzean"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
-msgstr ""
+msgstr "Egiaztatu kanpoko IP helbidea zuzena den"
 
-#: resources.h:231
+#: resources.h:241
 msgid "Checking for updates"
-msgstr ""
+msgstr "Eguneraketa egiaztapena"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
-msgstr ""
+msgstr "Checksum ez dator bat jeitsitako agiriarekin."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
-msgstr "Aukeratu direktorio lokal lehenetsia"
+msgstr "Hautatu berezko tokiko zuzenbidea"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
-msgstr "Aukeratu direktorio lokal lehenetsia"
+msgstr "Hautatu tokiko zuzenbidea"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
-msgstr ""
+msgstr "Chunk datua ezegoki amaituta"
 
-#: resources.h:18 resources.h:42
-#, fuzzy
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
-msgstr "Egilea:"
+msgstr "Zifraketa:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
-msgstr ""
+msgstr "It&xi hegatsa"
 
-#: resources.h:855
+#: resources.h:881
 msgid "Classic"
-msgstr ""
+msgstr "Klasikoa"
 
-#: resources.h:285
-#, fuzzy
+#: resources.h:295
 msgid "Clear &Site Manager entries"
-msgstr "Gune-kudeatzailea"
+msgstr "Garbitu &Gune Kudeatzaile sarrerak"
 
-#: resources.h:612
+#: resources.h:632
 msgid "Clear &layout cache"
-msgstr ""
+msgstr "Garbitu &antolakuntza katxea"
 
-#: resources.h:283
-#, fuzzy
+#: resources.h:293
 msgid "Clear &quickconnect history"
-msgstr "&Konexio bizkorra"
+msgstr "Garbitu elkarketa-azkarra &historia"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &reconnect information"
-msgstr ""
+msgstr "Garbitu &berrelkarketa argibideak"
 
-#: resources.h:286
-#, fuzzy
+#: resources.h:296
 msgid "Clear &transfer queue"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Garbitu &eskualdaketa lerroa"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
-#, fuzzy
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
-msgstr "Sortu direktorioa"
+msgstr "Garbitu historia"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:290 ../../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 ""
+msgstr "Garbitu datu pribatuak"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
-#, fuzzy
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
-msgstr "&Konexio bizkorra"
+msgstr "Garbitu elkarketa-azkarra barra"
+
+#: resources.h:633
+msgid "Clear string coalescer"
+msgstr "Garbitu kate coalescer"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr ""
+msgstr "Klikatu Amaitu zure itxurapena gordetzeako."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
-msgstr ""
+msgstr "Klikatu hurrengoa bertsio berria jeisteko."
 
-#: resources.h:346
-#, fuzzy
+#: resources.h:356
 msgid "Client to server MAC:"
-msgstr "%s(e)ra konektatzen"
+msgstr "Bezerotik zerbitzarira MAC-a:"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Client to server cipher:"
-msgstr ""
+msgstr "Bezeroa zerbitzari zifraketara:"
 
-#: resources.h:661
+#: resources.h:687
 msgid "Close &all other tabs"
-msgstr ""
+msgstr "It&xi beste hegats guztiak"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Itxi FileZilla"
 
 #: ../../locales/../src/interface/cmdline.cpp:14
 msgid "Close all running instances of FileZilla"
-msgstr ""
+msgstr "Itxi ekinean dauden FileZilla eskabide guztiak"
 
-#: resources.h:496
+#: resources.h:513
 msgid "Closes current tab"
-msgstr ""
+msgstr "Oraingo hegatsa isten du"
 
-#: resources.h:86
+#: resources.h:95
 msgid "Co&mments:"
-msgstr "Oha&rrak:"
+msgstr "Ai&pamenak:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
-msgstr ""
+msgstr "Zutabe ezaugarriak"
 
-#: resources.h:353
+#: resources.h:363
 msgid "Column setup"
-msgstr ""
+msgstr "Zutabe ezarpena"
 
-#: resources.h:930
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
-msgstr ""
+msgstr "Aginduak eta bere argumentoak egoki aipatuak izan behar dira."
 
 #: ../../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
-#, fuzzy
 msgid "Command failed"
-msgstr "Komandoa:"
+msgstr "Agindu hutsegitea"
 
 #: ../../locales/../src/engine/proxy.cpp:448
 msgid "Command not supported"
-msgstr ""
+msgstr "Agindua ez dago sostengatua"
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr ""
+msgstr "Agindua ez dago sostengaturik protokolo honetan"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
-msgstr "Komandoa:"
+msgstr "Agindua:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
-#, fuzzy
 msgid "Comment"
-msgstr "Oha&rrak:"
+msgstr "Aipamena"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
-msgstr "Komandoa:"
+msgstr "Izen arrunta:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:426
 #: ../../locales/../src/interface/netconfwizard.cpp:441
-#, fuzzy
 msgid "Communication tainted by router or firewall"
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Hartuemana bideratzaileak edo suhesiak kutsatuta"
 
-#: resources.h:513 resources.h:639
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
-msgstr ""
+msgstr "&Alderatu aldaketa eguna"
 
-#: resources.h:512 resources.h:638
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
-msgstr ""
+msgstr "Alderatu agiri-&neurria"
 
-#: resources.h:910
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
-msgstr ""
+msgstr "&Alderaketa muga (minututan)"
 
 #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
-msgstr ""
+msgstr "Alderaketa muga 0 eta 1440 minutu artean egon behar da."
 
-#: resources.h:159
-#, fuzzy
+#: resources.h:168
 msgid "Compiled for:"
-msgstr "Konpiladorea:"
+msgstr "Biltzailea:"
 
-#: resources.h:160
-#, fuzzy
+#: resources.h:169
 msgid "Compiled on:"
-msgstr "Konpiladorea:"
+msgstr "Bilduta:"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Compiled with:"
-msgstr "Konpiladorea:"
+msgstr "Honekin bilduta:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiler flags:"
-msgstr "Konpiladorearen banderak:"
+msgstr "Biltzaile ikurrak:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
-msgstr ""
+msgstr "Konprimituta"
 
-#: resources.h:796
+#: resources.h:822
 msgid "Concurrent transfers"
-msgstr ""
+msgstr "Aldibereko eskualdaketak"
 
-#: resources.h:223 resources.h:437
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
-msgstr "Maiuskula/minuskula bereiztu"
+msgstr "Baldintzek hizki &xehe-larriak bereizten dituzte"
 
-#: resources.h:704
-#, fuzzy
+#: resources.h:730
 msgid "Configuration test"
-msgstr "Berrespena behar du"
+msgstr "Itxurapen azterketa"
 
-#: resources.h:678
-#, fuzzy
+#: resources.h:704
 msgid "Configure passive mode"
-msgstr "&Erabili modu pasiboa"
+msgstr "Itxuratu modu pasiboa"
 
-#: resources.h:694
+#: resources.h:720
 msgid "Configure port range"
-msgstr ""
+msgstr "Itxuratu ataka maila"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
-msgstr ""
+msgstr "FileZilla eta zure sarearen itxurapena"
 
-#: ../../locales/../src/interface/search.cpp:1054
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
-msgstr "Berrespena behar du"
+msgstr "Baieztatu ezabapena"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
-msgstr "Berrespena behar du"
+msgstr "Baieztapena beharrezkoa"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:567
 msgid "Congratulations, your configuration seems to be working."
-msgstr ""
+msgstr "Zorionak, zure itxurapenak ongi lan egiten duela dirudi."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr ""
+msgstr "Elkarketatu proxy ezarpenetatik igarogabe"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr ""
+msgstr "Elkarketatu adierazitako Gune Kudeatzaile gunera"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
-msgstr "Konektatua"
+msgstr "Elkarketaturik"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
-msgstr "Konektatzen"
+msgstr "Elkarketatzen"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
-#, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
+#, fuzzy, c-format
 msgid "Connecting to %s"
-msgstr "%s(e)ra konektatzen"
+msgstr "%s-ra elkarketatzen..."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
+#, c-format
 msgid "Connecting to %s through proxy"
-msgstr "%s(e)ra konektatzen"
+msgstr "%s-ra elkarketatzen proxyan zehar"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s..."
-msgstr "%s(e)ra konektatzen:%d..."
+msgstr "%s-ra elkarketatzen..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
-#, fuzzy
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
-msgstr "%s(e)ra konektatzen"
+msgstr "Zerbitzariarekin elkarketatzen"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:116
-#, fuzzy
 msgid "Connection"
-msgstr "Konektatzen"
+msgstr "Elkarketa"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Elkarketa saiakera hutsegitea"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Elkarketa saiakera hutsegitea \"%s\", hurrengo helbidearekin saiatzen."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
+#, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Elkarketa saiakera hutsegitea \"%s\"."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Erabiltzaileak elkarketa saiakera eten du"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:543
-#, fuzzy
 msgid "Connection closed"
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa itxita"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
-msgstr "%s(e)ra konektatzen"
+msgstr "Zerbitzariak elkarketa itxi du"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
-#, fuzzy
 msgid "Connection established, initializing TLS..."
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "Elkarketa ezarrita, TLS abiarazten..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
-#, fuzzy
 msgid "Connection established, sending HTTP request"
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "Elkarketa ezarrita, HTTP eskabidea bildatzen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "Elkarketa ezarrita, ongi etorri mezua itxaroten..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
-#, fuzzy
 msgid "Connection lost"
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa galduta"
 
 #: ../../locales/../src/engine/proxy.cpp:433
-#, fuzzy
 msgid "Connection not allowed by ruleset"
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa ez dago ahalbideturik arau-ezarpenean"
 
 #: ../../locales/../src/engine/proxy.cpp:442
-#, fuzzy
 msgid "Connection refused"
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa baztertuta"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa denboraz kanpo"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
-#, fuzzy
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
-msgstr "%s(e)ra konektatzen"
+msgstr "Elkarketa denboraz kanpo."
 
-#: ../../locales/../src/interface/search.cpp:702
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
-msgstr "%s(e)ra konektatzen"
+msgstr "Zerbitzariarekiko elkarketa galduta."
 
 #: ../../locales/../src/engine/proxy.cpp:188
-#, fuzzy
 msgid "Connection with proxy established, performing handshake..."
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "Ezarrita proxyarekiko elkarketa, eskuematea egiten..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
-msgstr ""
+msgstr "Zerbitzariarekiko elkarketa goizegi itxi da."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:552
-#, fuzzy
 msgid "Connection with the test server failed."
-msgstr "Erabilitako azken zerbitzarira birkonektatzen du"
+msgstr "Hutsegitea azterketa zerbitzariarekin elkarketatzerakoan."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
-msgstr ""
+msgstr "Bihutu giltza-agiria"
 
-#: resources.h:77 resources.h:416
-msgid "Cop&y"
-msgstr "Kop&iatu"
-
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
-msgstr ""
+msgstr "Kopiatu (%d) -> %s-tik"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
-msgstr ""
+msgstr "Kopiatu -> %s"
 
-#: resources.h:587 resources.h:633
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr ""
+msgstr "Kopiatu hautaturiko gaien URL-ak gakora."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:206
+#, c-format
 msgid "Could not accept connection: %s"
-msgstr "Ezin da zerbitzariarekin konexioa ezarri"
+msgstr "Ezin da elkarketa onartu: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "Ezin da zerbitzariarekin konexioa ezarri"
+msgstr "Ezin da Gune Kudeatzailerako elkarketa gehitu"
+
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Ezin da eragiketa osatu"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da zerbitzariarekin elkarketatu"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
+#, c-format
 msgid "Could not connect to server: %s"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da zerbitzarira elkarketatu: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
-#, fuzzy
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da agindua zerbitzari kodeaketara bihurtu"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy
 msgid "Could not convert private key"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da giltza pribatua bihurtu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin dira URL-ak kopiatu"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
-msgstr "Ezin da zerbitzariaren helbidea lortu:"
+msgstr "Ezin dira datuak kopiatu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
+"Ezin da Arrastatu-eta-Askatu eragiketaren xedea zehaztu.\n"
+"Shell luzapena ez dago egoki ezarrita edo ezin dituzu agiriak askatu "
+"Explorer-en leiho batean."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
-msgstr "Ezin da zerbitzariarekin konexioa ezarri"
+msgstr "Ezin da elkarketarik ezarri zerbitzariarekin"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"Ezin fileZillaren baliabide-fitxategia aurkitu, FileZilla ixten.\n"
-"FileZillaren datu-direktorioa ezarri dezakezu '--datadir <custompath>' "
-"komando-lerro aukera baliatuz edo FZ_DATADIR ingurune-aldagaia ezarriz."
+"Ezin dira FileZilla-rentzako baliabide agiriak aurkitu, FileZilla isten.\n"
+"FileZilla-ren datu zuzenbidea ezarri dezakezu '--datadir <norbere-helburua>' "
+"agindulerro aukera erabiliz edo FZ_DATADIR inguru aldakorra ezarriz."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
-msgstr ""
+msgstr "Ezin da norbere ohar sekuentziarik sortu."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
+"Ezin da egiaztaturiko jaulkitzaile izena ezagutu, gnutls_x509_get_issuer_dn "
+"hutsegitea"
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
-msgstr ""
+msgstr "Ezin da egiaztaturiko gai izena ezagutu, gnutls_x509_get_dn hutsegitea"
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
-msgstr ""
+msgstr "Ezin da hurreneko helburu osoa lortu."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
 msgid "Could not get reply from fzputtygen."
-msgstr ""
+msgstr "Ezin da erantzunik lortu fzputtygen-tik."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
-msgstr ""
+msgstr "Ezin da aldibaterako zuzenbidea lortu agiria bertara jeisteko."
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
+"Ezin dira hartzaile egiaztagiriak inportatu, gnutls_x509_crt_inportazio "
+"hutsegitea"
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
+"Ezin da hartzaile egiaztagirientzako egitura abiarazi,, gnutls_x509_crt_init "
+"hutsegitea"
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Ezin da \"%s\" kargatu, fitxategia balekoa dela eta atzitu daitekeela "
-"ziurtatu.\n"
-"Gune-kudeatzailean egindako aldaketak ez dira gordeko."
+"Ezin da \"%s\" gertatu, mesedez zihuratu agiria baliozkoa dela eta sarbidea "
+"duela.\n"
+"Gune Kudeatzailean eginiko aldaketak ez dira gordeko."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
-#, fuzzy
 msgid "Could not load keyfile"
-msgstr "Ezin da fitxategiaren amaieran kokatu"
+msgstr "Ezin da giltzagiria gertatu"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
-#, fuzzy
 msgid "Could not load private key"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da giltza pribatua gertatu"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
+"Ezin da dagokion tokiko zuzenbidea lortu '%s' hurruneko zuzenbidearentzat .\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"Ezin da dagokion tokiko zuzenbidea lortu '%s' hurruneko zuzenbidearentzat .\n"
+"Bilaketa aldiberetua ezgaitua izan da."
 
 #: ../../locales/../src/interface/state.cpp:295
 #, c-format
@@ -2499,330 +2454,345 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"Ezin da dagokion hurreneko zuzenbidea lortu '%s' tokiko zuzenbidearentzat .\n"
+"Bilaketa aldiberetua ezgaitua izan da."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
-msgstr "&Kopiatu arbelean"
+msgstr "Ezin da gakoa ireki"
 
 #: ../../locales/../src/engine/logging.cpp:208
 #: ../../locales/../src/engine/logging.cpp:276
 #: ../../locales/../src/engine/logging.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open log file: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da ohar agiria ireki: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
-msgstr "Ezin da zerbitzariaren helbidea lortu:"
+msgstr "Ezin da hurreneko helburua aztertu."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
-msgstr "Ezin da zerbitzariaren helbidea lortu:"
+msgstr "Ezin da zerbitzari helbidea aztertu:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#, c-format
 msgid "Could not read from socket: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da hartunetik irakurri: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
-msgstr "Ezin da zerbitzariaren helbidea lortu:"
+msgstr "Ezin da zerbitzari gaia irakurri."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
-msgstr "Ezin da fitxategiaren %s posizioan kokatu"
+msgstr "Ezin da %s orekatzeko agiri gabe bilatu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
-msgstr "Ezin da fitxategiaren amaieran kokatu"
+msgstr "Ezin da agiri amaiera arte bilatu"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
-#, fuzzy
 msgid "Could not send command to fzputtygen."
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Agirimota arriskutsua"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
-msgstr "Ezin da zerbitzariaren helbidea lortu:"
+msgstr "Ezin da SI haria sortu"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
+#, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da proxy eskuematea hasi: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Ezin da eskualdaketa hasi"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
-msgstr ""
-"Ezin da \"%s\" idatzi, Gune-kudeatzailean egindako aldaketak ezin dira "
-"gorde: %s"
+msgstr "Ezin da idatzi \"%s\", Gune Kudeatzaile aldaketak ezin dira gorde: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
+#, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "Ezin da \"%s\" idatzi, ilara ezin da gorde"
+msgstr "Ezin da idatzi \"%s\", lastermarka ezin da gehitu: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr "Ezin da \"%s\" idatzi, ilara ezin da gorde"
+msgstr "Ezin da idatzi \"%s\", lastermarka orokorrak ezin dira gorde: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
-#, fuzzy, c-format
+#: ../../locales/../src/interface/QueueView.cpp:1989
+#, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
-msgstr "Ezin da \"%s\" idatzi, ilara ezin da gorde"
+msgstr ""
+"Ezin da idatzi \"%s\", lerroa ezin da gorde.\n"
+"%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
-#, fuzzy, c-format
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
+#, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr "Ezin da \"%s\" idatzi, ilara ezin da gorde"
+msgstr "Ezin da idatzi \"%s\", hautaturiko guenak ezin dira esportatu: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr ""
+msgstr "Ezin da idatzi \"%s\": %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write keyfile: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da giltzagiria idatzi: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da tokiko agirira idatzi"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write to log file: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da ohar agirira idatzi: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
+#, c-format
 msgid "Could not write to socket: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Ezin da idatzi hartunera: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
-msgstr ""
+msgstr "Herrialdea:"
 
-#: resources.h:614
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
-msgstr "Berehala gelditzen du FileZilla. Arazteko erabiltzen da soilik "
+msgstr ""
+"FileZilla berehala matxuratzen du. Salbuespen kudeatzaile garbiketarako "
+"erabiltzen da bakarrik."
+
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "&Sortu agiri berria"
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
-msgstr "Sortu azpidirektorio berri bat uneko direktorioan"
+msgstr "Sortu azpizuzenbide berri bat oraingo zuzenbidean"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Sortu agiri huts berri bat oraingo zuzenbidean"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
-msgstr "Sortu direktorioa"
+msgstr "Sortu zuzenbidea"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Sortu agiri hutsa"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
-msgstr "Sortu direktorioa"
+msgstr "Zuzenbide sortzea"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "'%s' direktorioa sortzen..."
+msgstr "'%s' zuzenbidea sortzen..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
-msgstr "Errore kritikoa"
+msgstr "Akats larria"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:137
-#, fuzzy
 msgid "Critical file transfer error"
-msgstr "Errore kritikoa"
+msgstr "Agiri eskualdaketa akats larria"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "Critical file transfer error after transferring %s in %s"
-msgstr "Errore kritikoa"
+msgstr "Agiri eskualdaketa akats larria %s -> %s eskualdatu ondoren"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"Oraingo hurreneko zuzenbidea (%s) ez dago aldibereturiko erroaren (%s) "
+"azpian.\n"
+"Bilaketa aldiberetua ezgaitu egin da."
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
-msgstr ""
+msgstr "Oraingo eskualdaketa mota bezala ASCII ezarri da."
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
-msgstr ""
+msgstr "Oraingo eskualdaketa mota berezgaitasunezko atzemate bezala ezarri da."
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
-msgstr ""
+msgstr "Oraingo eskualdaketa mota binariora ezarri da."
 
-#: resources.h:767 resources.h:886
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
-msgstr ""
+msgstr "E&gilea"
 
 #: ../../locales/../src/interface/filter.cpp:98
-#, fuzzy
 msgid "Custom filter set"
-msgstr "Iragazkiak editatu"
+msgstr "Norbere iragazki ezarpena"
 
-#: resources.h:375 resources.h:376
-#, fuzzy
+#: resources.h:385 resources.h:386
 msgid "Custom server"
-msgstr "Iragazkiak editatu"
+msgstr "Norbere zerbitzaria"
 
-#: resources.h:384
+#: resources.h:394
 msgid "D&ata type"
-msgstr ""
+msgstr "&Datu mota"
 
-#: resources.h:893
-#, fuzzy
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
-msgstr "Dezimal atzizkiak SI sinboloak erabiliz (adibidez, 1KB = 1000 byte)."
+msgstr "&Hamarren aurrizkiak NS sinboloak erabiliz (adib. 1 KB = 1000 bytes)"
 
-#: resources.h:99
+#: resources.h:108
 msgid "D&efault"
-msgstr "L&ehenetsia"
+msgstr "&Berezkoa"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "E&zabatu"
 
-#: resources.h:204
-#, fuzzy
+#: resources.h:214
 msgid "D&isable all"
-msgstr "Desgaitu dena"
+msgstr "Ezgaitu &denak"
 
-#: resources.h:917
+#: resources.h:892
+msgid "D&o not save passwords"
+msgstr "&Ez gorde sarhitzak"
+
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
-msgstr ""
+msgstr "&Klik-bikoitz ekintza zuzenbideetan:"
+
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr "&Bikoitza"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr ""
+msgstr "DOS-bezala helburu birtualekin"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
-msgstr ""
+msgstr "Agirimota arriskutsua"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
-#, fuzzy
 msgid "Data"
-msgstr "Data"
+msgstr "Eguna"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
-msgstr ""
+msgstr "Datu hartunea goizegi itxi da."
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
+msgid "Date"
+msgstr "Eguna"
+
+#: resources.h:905
 msgid "Date formatting"
-msgstr ""
+msgstr "Egun heuskarria"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:128
-#, fuzzy
 msgid "Date/time format"
-msgstr "Data/ordu ezezaguna"
+msgstr "Egun/ordu heuskarria"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
-msgstr "Data/ordu ezezaguna"
+msgstr "Egun/ordu ezezaguna"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:141
 msgid "Debug"
-msgstr ""
+msgstr "Garbiketa"
 
-#: resources.h:957
+#: resources.h:989
 msgid "Debugging settings"
-msgstr ""
+msgstr "Garbiketa ezarpenak"
 
-#: resources.h:90
+#: resources.h:99
 msgid "Default &local directory:"
-msgstr "Direktorio &lokal lehenetsia"
+msgstr "Berezko &tokiko zuzenbidea:"
 
-#: ../../locales/../src/engine/server.cpp:23
-#, fuzzy
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
-msgstr "&Autodetektatu"
+msgstr "Berez (Berez-atzeman)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
-msgstr ""
+msgstr "Berezko editatzailea ez dago egoki aipatuta."
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
-msgstr ""
+msgstr "Berezko ekintza dauden agirientzat"
 
-#: resources.h:92
+#: resources.h:101
 msgid "Default r&emote directory:"
-msgstr "Urrun&eko direktorio lehenetsia"
+msgstr "Berezko h&urruneko zuzenbidea:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
 msgstr ""
+"Berezko hurruneko helburua ezin da aztertu. Zihurtatu baliozko helburu oso "
+"bat dela hautaturiko zerbitzari motarentzat."
 
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:78
-#, fuzzy
 msgid "Default system language"
-msgstr "&Hautatu hizkuntza:"
+msgstr "Berezko sistema hizkuntza"
 
-#: resources.h:672
-#, fuzzy
+#: resources.h:698
 msgid "Default transfer mode:"
-msgstr "Transferentzia-mota lehenetsia:"
+msgstr "Berezko eskualdaketa modua:"
 
-#: resources.h:818
+#: resources.h:844
 msgid "Default transfer type:"
-msgstr "Transferentzia-mota lehenetsia:"
+msgstr "Berezko eskualdaketa mota:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
-msgstr ""
+msgstr "Berezkoa: http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
 msgstr ""
+"Huts egindako elkarketa arteko saiakera 1 eta 999 segundu artekoa izan behar "
+"da."
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2831,462 +2801,463 @@
 "Delaying connection for %d seconds due to previously failed connection "
 "attempt..."
 msgstr[0] ""
+"Elkarketa %d segunduz atzeratzen aurretik huts egindako elkarketa "
+"saiakeragaitik..."
 msgstr[1] ""
+"Elkarketa %d segunduz atzeratzen aurretik huts egindako elkarketa "
+"saiakeragaitik..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
-msgstr "Gune-kudeatzailea ireki"
+msgstr "Ezabatu Gune Kudeatzaile sarrera"
 
-#: resources.h:629 resources.h:650
-#, fuzzy
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
-msgstr "Urrun&eko direktorio lehenetsia"
+msgstr "Ezabatu hautaturiko zuzenbidea"
 
-#: resources.h:569 resources.h:583
-#, fuzzy
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
-msgstr "Ezabatu hautatutako fitxategiak eta karpetak"
+msgstr "Ezabatu hautaturiko agiriak eta zuzenbideak"
 
-#: ../../locales/../src/interface/search.cpp:1038
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
-msgstr "Sortu direktorioa"
+msgstr "Zuzenbide ezabaketa"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
+"Loturagabeko zuzenbideen ezabaketa anitza oraindik ez dago sostengaturik"
 
-#: resources.h:452
+#: resources.h:462
 msgid "Deleting symbolic link"
-msgstr ""
+msgstr "Lotura sinbolikoaren ezabaketa"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
-msgstr ""
+msgstr "Mahaigaina"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Xehetasunak"
 
-#: resources.h:188
+#: resources.h:198
 msgid "Details for new key:"
-msgstr "Gako berriaren xehetasunak:"
+msgstr "Giltza berriarentzako xehetasunak:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Dire&ctories"
-msgstr "Dire&ktorioak"
+msgstr "Z&uzenbideak"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
-msgstr "Norabidea"
+msgstr "Helbidea"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
-#, fuzzy
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
-msgstr "Norabidea"
+msgstr "Zuzenbidea"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
-#, fuzzy
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
-msgstr "Dire&ktorioak"
+msgstr "Zuzenbide alderaketa"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 #: ../../locales/../src/interface/listingcomparison.cpp:82
 #: ../../locales/../src/interface/listingcomparison.cpp:88
-#, fuzzy
 msgid "Directory comparison failed"
-msgstr "Direktorioa bistaratzeko iragazkiak"
+msgstr "Zuzenbide alderaketa hutsegitea"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr ""
+msgstr "Ohar-agiria duen zuzenbidea ez dago edo agirizena baliogabea da."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "Direktorioaren zerrendatzea eten du erabiltzaileak"
+msgstr "Zuzenbide zerrendapena erabiltzileak utzita"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
-msgstr "Direktorioa bistaratzeko iragazkiak"
+msgstr "Zuzenbide zerrendatze hutsegitea"
 
-#: resources.h:197
+#: resources.h:207
 msgid "Directory listing filters"
-msgstr "Direktorioa bistaratzeko iragazkiak"
+msgstr "Zuzenbide zerrendatze iragazkiak"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "Direktorioa ongi bistaratu da"
+msgstr "Zuzenbidea ongi zerrendatu da"
 
-#: resources.h:207
-#, fuzzy
+#: resources.h:217
 msgid "Disa&ble all"
-msgstr "Desgaitu dena"
+msgstr "Ezgaitu de&nak"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
+"Ezgaitu aukera hau berriro ez bazara zuzenbide zuzeneko edukiak ikusteko gai "
+"izango."
 
-#: resources.h:984
+#: resources.h:1017
 msgid "Disconnect from server"
-msgstr "Deskonektatu zerbitzaritik"
+msgstr "Eten zerbitzaritik"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
-msgstr "Deskonektatua zerbitzaritik"
+msgstr "Zerbitzaritik etenda"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
-#, fuzzy, c-format
+#, c-format
 msgid "Disconnected from server: %s"
-msgstr "Deskonektatua zerbitzaritik"
+msgstr "Zerbitzaritik etenda: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
-msgstr "Deskonektatzen aurreko zerbitzaritik"
+msgstr "Aurreko zerbitzaritik etetzen"
 
-#: resources.h:985
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
-msgstr "Ikusten den uneko zerbitzaritik deskonektatzen du"
+msgstr "Orain ikusgarri den zerbitzaritik eteten du"
 
-#: resources.h:554
+#: resources.h:572
 msgid "Display about dialog"
-msgstr "Bistaratu FileZillari buruzko pantaila"
+msgstr "Erakutsi honi buruz elkarrizketa"
 
-#: resources.h:926
-#, fuzzy
+#: resources.h:954
 msgid "Do &not use default editor"
-msgstr "&Beti editore aurreaukeratua erabili"
+msgstr "&Ez erabili berezko editatzailea"
 
-#: resources.h:608
+#: resources.h:628
 msgid "Do &nothing"
-msgstr ""
+msgstr "Ez &egin ezer"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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 ""
+"Egitan nahi duzu beta bertsiorik dagoen egiaztatzea?\n"
+"Ez badituzu ezaugarri berriak aztertzea nahi, jarraitu bertsio egonkorrak "
+"erabiltzen."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
-msgstr ""
+msgstr "Egitan nahi duzu FileZilla istea?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
+"Egitan nahi duzu Gune Kudeatzaile sarrera guztiak eta eskualdaketa lerroa "
+"ezabatzea?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
-msgstr ""
+msgstr "Egitan nahi duzu Gune Kudeatzaile sarrera guztiak ezabatzea?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
-msgstr ""
+msgstr "Egitan nahi duzu ezabatzea hautaturiko sarrera?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#, fuzzy
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
-msgstr "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
+msgstr "Egitan nahi duzu eskualdaketa lerroa ezabatzea?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr ""
+msgstr "Egitan nahi duzu '%s' zerbitzarira bildatzea?"
 
-#: resources.h:465
+#: resources.h:475
 msgid "Documentation"
-msgstr ""
+msgstr "Agiritza"
 
-#: resources.h:693
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
-msgstr ""
+msgstr "Ez erabili &kanpoko IP helbidea tokiko elkarketetan."
 
-#: resources.h:829
-#, fuzzy
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr "Erabili puntu batekin hasten diren fitxategiak ASCII eran"
+msgstr "Puntu-agiriak puntuz hasten diren agirizenak dira, adib. .htaccess"
 
-#: resources.h:911
+#: resources.h:939
 msgid "Double-click action"
-msgstr ""
+msgstr "Klik-bikoitz ekintza"
 
-#: resources.h:361
-#, fuzzy
+#: resources.h:371
 msgid "Download"
-msgstr "&Jeitsi"
+msgstr "Jeitsi"
 
-#: resources.h:481 resources.h:805
-#, fuzzy
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
-msgstr "&Behera kargatu"
+msgstr "Jeisketa &muga:"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
 msgid "Download limit: %s/s"
-msgstr "&Behera kargatu"
+msgstr "Jeisketa muga: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:606
 msgid "Download limit: none"
-msgstr "&Behera kargatu"
+msgstr "Jeisketa muga: ezer ez"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Jeisketa bilaketa emaitzak"
 
-#: resources.h:623
-#, fuzzy
+#: resources.h:649
 msgid "Download selected directory"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Jeitsi hautaturiko zuzenbidea"
 
-#: resources.h:573
-#, fuzzy
+#: resources.h:591
 msgid "Download selected files and directories"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Jeitsi hautaturiko agiriak eta zuzenbideak"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Jeisketa abiadura: %s/s\n"
+"Igoera abiadura: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
-msgstr "&Behera kargatu"
+msgstr "Jeisketa"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
-#, fuzzy, c-format
+#: ../../locales/../src/interface/updatewizard.cpp:423
+#, c-format
 msgid "Downloading %s"
-msgstr "&Behera kargatu"
+msgstr "%s jeisten"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
+"Loturagabeko zuzenbideen jeisketa anitza oraindik ez dago sostengaturik"
 
-#: ../../locales/../src/interface/search.cpp:952
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
-msgstr "&Behera kargatu"
+msgstr "Bilaketa emaitzak jeisten"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
+"&FileZilla eskabide ezberdinen arteko arrastatu-eta-askatu ez dago oraingik "
+"sostengatua."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
+"&Zerbitzari ezberdinen arteko arrastatu-eta-askatu ez dago oraingik "
+"sostengatua."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#, fuzzy
-msgid "Duplicate filter name"
-msgstr "Iragazkiaren izena sartu behar da"
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr "Bik&oiztu"
 
-#: resources.h:203
-#, fuzzy
+#: resources.h:213
 msgid "E&nable all"
-msgstr "Gaitu dena"
+msgstr "Gait&u denak"
 
-#: resources.h:559 resources.h:576
-#, fuzzy
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
-msgstr "&Sortu direktorioa"
+msgstr "&Sartu zuzenbidea"
 
-#: resources.h:140
+#: resources.h:149
 msgid "E&xecute"
 msgstr "E&xekutatu"
 
-#: resources.h:500
+#: resources.h:517
 msgid "E&xit"
 msgstr "I&rten"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
-msgstr "Posta elektronikoa:"
+msgstr "Post@:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
-msgstr "Iragazki bakoitzak baldintza bat behar du gutxienez"
+msgstr "Iragazki bakoitzak gutxienez baldintza bat behar du."
 
-#: resources.h:229
+#: resources.h:239
 msgid "Edit filters"
-msgstr "Iragazkiak editatu"
+msgstr "Editatu iragazkiak"
 
-#: resources.h:564
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
+"Editatu agiria itxuraturiko editatzailearekin eta igo aldaketak zerbitzarira."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Edizio hutsegitea"
 
-#: resources.h:874
+#: resources.h:902
 msgid "Email:"
-msgstr "Posta elektronikoa:"
+msgstr "Post@"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
-msgstr "Sartu komando pertsonalizatua"
+msgstr "Agindua hustu"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
 msgid "Empty command."
-msgstr ""
+msgstr "Agindua hutsik."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
-msgstr "Iragazi direktorioen zerrendatzeak"
+msgstr "Zuzenbide zerrendapena hutsik"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:26
-#, fuzzy
 msgid "Empty directory."
-msgstr "Iragazi direktorioen zerrendatzeak"
+msgstr "Zuzenbidea hustsik."
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
-msgstr ""
+msgstr "Agiri luzapena hutsik."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
-msgstr ""
+msgstr "Iragazki izena hutsik ez dago ahalbideturik."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
-msgstr ""
+msgstr "Izena hutsik"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
-msgstr ""
+msgstr "Aipamen katea hutsik."
 
-#: resources.h:206
-#, fuzzy
+#: resources.h:216
 msgid "En&able all"
-msgstr "Gaitu dena"
+msgstr "G&aitu denak"
 
-#: resources.h:814
+#: resources.h:840
 msgid "Enable invalid character &filtering"
-msgstr ""
+msgstr "G&aitu baliogabeko hizki iragazketa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
-msgstr ""
+msgstr "Enkriptatua"
 
-#: resources.h:343
-#, fuzzy
+#: resources.h:353
 msgid "Encryption"
-msgstr "Konektatzen"
+msgstr "Enkriptaketa"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Encryption details"
-msgstr ""
+msgstr "Enkriptaketa xehetasunak"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
-msgstr ""
+msgstr "Amaitu alderaketa eta aldatu antolaketa ordena?"
 
-#: resources.h:540
+#: resources.h:558
 msgid "Enter &custom command..."
-msgstr "Sartu &komando pertsonalizatua..."
+msgstr "&Sartu norbere agindua..."
 
-#: resources.h:485
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
-msgstr ""
+msgstr "Sartu 0 mugagabeko abiadurarako."
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
-msgstr "Sartu komando pertsonalizatua"
+msgstr "Sartu agindua"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
-msgstr "Sartu komando pertsonalizatua"
+msgstr "Sartu norbere agindua"
 
-#: resources.h:918
-#, fuzzy
+#: resources.h:946
 msgid "Enter directory"
-msgstr "Sortu direktorioa"
+msgstr "Sartu zuzenbidea"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Sartu iragazki izena"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
-msgstr ""
+msgstr "Sartu izena iragazki-ezarpenarenerako"
 
-#: ../../locales/../src/interface/filter.cpp:390
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
-msgstr "Hautatu \"%s\" fitxategiaren atributu berriak."
+msgstr "Sartu izen berri bat iragazki-ezarpenerako"
 
-#: resources.h:115
+#: resources.h:124
 msgid "Enter password"
-msgstr "Sartu pasahitza"
+msgstr "Idatzi sarhitza"
 
-#: resources.h:560 resources.h:577
-#, fuzzy
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
-msgstr "Urrun&eko direktorio lehenetsia"
+msgstr "Sartu hautaturiko zuzenbidea"
 
-#: resources.h:713
-#, fuzzy
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Sartu zerbitzariaren helbidea.\n"
-"Zerbitzari-protokoloa adierazteko, protokoloaren kodea gunearen aurretik "
-"ezarri. Protokoloa ez bada adierazten, (ftp://) protokolo lehenetsia "
-"erabiliko da.\n"
-"URL helbide osoa ere sartu dezakezu,  protocol://user:pass@host:port eran, "
-"beste eremuen balioak ordezkatuz."
+"Zerbitzari protokoloa adierazteko, ezarri aurretik hostalaria protokolo "
+"ezagutarazlearekin. Ez bada protokolorik adierazten, berezko protokoloa "
+"(ftp://) erabiliko da.\n"
+"URL osoak era sartu ditzakezu protokolo forma honetan://erabiltzailea:"
+"sarhitza@hostalaria:ataka hemen, beste eremuetako balioak gainidatzi egingo "
+"dira.\n"
+"\n"
+"Sostengaturiko protokoloak dira:\n"
+"- ftp:// FTP arrunterako\n"
+"- sftp:// SSH agiri eskualdaketa protokolorako\n"
+"- ftps:// FTP TLS (inplizitoa) gain-rako\n"
+"- ftpes:// FTP TLS (esplizitoa) gain-rako"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3294,933 +3265,965 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
+"Sartu '%s' agiriarentzako sarhitza.\n"
+"Mesedez ohartu bihurtutako agiria ez dela sarhitzez babestua izango."
 
-#: resources.h:717
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
 msgstr ""
-"Sartu zerbitzariak entzungo duen ataka.\n"
-"Ataka lehenetsiak: FTP -> 21 eta SFTP -> 22."
+"Sartu zerbitzariek aditu behar duten ataka\n"
+"FTP-rako berezkoa 21, SFTP-rako berzkoa 22 da."
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
-#, fuzzy
 msgid "Enter username and password"
-msgstr "Sartu pasahitza"
+msgstr "Sartu erabiltzaile-izena eta sarhitza"
 
 #: ../../locales/../src/interface/export.cpp:26
-#, fuzzy
 msgid "Error exporting settings"
-msgstr "%d errorea socketa idaztean"
+msgstr "Akatsa ezarpenak esportatzerakoan"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
-msgstr ""
+msgstr "Inportazio akatsa"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
-#: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/QueueView.cpp:2056
+msgid "Error loading queue"
+msgstr "Akatsa lerroa gertatzerakoan"
+
+#: ../../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:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
-msgstr "Errorea xml fitxategia kargatzean"
+msgstr "Akatsa xml agiria gertatzerakoan"
+
+#: ../../locales/../src/interface/QueueView.cpp:1955
+msgid "Error saving queue"
+msgstr "Akatsa lerroa gordetzerakoan"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
-msgstr ""
+msgstr "Akatsa programa abiarazterakoan"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1990
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
-msgstr "Errorea xml fitxategia idaztean"
+msgstr "Akatsa xml agiria idazterakoan"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
-#, fuzzy
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "Akatsa, agiri izena ezin da aztertu."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
-msgstr ""
+msgstr "Akatsa, tokiko agiria badago baina ezin da kendu"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
-msgstr "Errorea:"
+msgstr "Akatsa:"
 
-#: resources.h:477
-#, fuzzy
+#: resources.h:487
 msgid "Establish connection in a new tab"
-msgstr "Ezin da zerbitzariarekin konexioa ezarri"
+msgstr "Ezarri elkarketa hegats berri batean"
 
-#: resources.h:937
+#: resources.h:971
+msgid "Every month"
+msgstr "Hilero"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "Bi astetik behin"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr ""
+"Adibidea: png \"c:\\programa agiriak\\ikusgailua\\ikusgailua.exe\" -open"
 
-#: resources.h:896
-#, fuzzy
+#: resources.h:924
 msgid "Examples"
-msgstr "Izena:"
+msgstr "Adibideak"
 
-#: resources.h:144
+#: resources.h:153
 msgid "Exe&cute"
-msgstr "Exe&kutatu"
+msgstr "E&xekutatu"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
-#, fuzzy
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
-msgstr "&Exekutatu"
+msgstr "Exekutagarria"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
+"Exekutagarriak ez du bertsio argibiderik, ezin dira eguneraketak egiaztatu."
 
-#: resources.h:856
+#: resources.h:882
 msgid "Explorer"
-msgstr ""
+msgstr "Explorer"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Queue"
-msgstr ""
+msgstr "Esportatu &Lerroa"
 
-#: resources.h:292
-#, fuzzy
+#: resources.h:302
 msgid "Export &Settings"
-msgstr "&Ezarpenak"
+msgstr "Esportatu &Ezarpenak"
 
-#: resources.h:289
-#, fuzzy
+#: resources.h:299
 msgid "Export settings"
-msgstr "Transferentzia-ezarpenak"
+msgstr "Esportatu Ezarpenak"
 
-#: resources.h:218
+#: resources.h:228
 msgid "F&ilter name:"
-msgstr "I&ragazki izena:"
+msgstr "Iragazki iz&ena:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Agiri Eskualdaketa Protokoloa"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Agiri Eskualdaketa Protokoloa aukerazko enkripataketarekin"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Agiri Eskualdaketa Protokolo Segurtasungabea"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
-msgstr ""
+msgstr "FTP Gailua abiarazi gabe dago, ezin da elkarketatu"
 
-#: resources.h:741
+#: resources.h:767
 msgid "FTP Keep-alive"
-msgstr ""
+msgstr "FTP Heutsi-bizirik"
 
-#: resources.h:761
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
-msgstr ""
+msgstr "FTP Proxya"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
-#, fuzzy
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
-msgstr "FTP"
+msgstr "FTP URL-a"
 
-#: resources.h:669
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
+"FTP-ak bigarren elkarketak erabiltzen ditu datu eskualdaketarako. Elkarketa "
+"gehigarri hauek bi bidetan ezarri daitezke."
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
-msgstr ""
+msgstr "FTPES - FTP gain TLS/SSL esplizitoa"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr ""
+msgstr "FTPES - FTP gain TLS/SSL inplizitoa"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
-msgstr "Ezin da hizkuntza aldatu"
+msgstr "Hutsegitea zuzenbidea aldatzerakoan"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../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
 msgid "Failed to change language"
-msgstr "Ezin da hizkuntza aldatu"
+msgstr "Hutsegitea hizkuntza aldatzerakoan"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
-msgstr ""
+msgstr "Hutsegitea FileZilla bertsio berriago bat dagoen egiaztatzerakoan."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Hutsegitea guneak kopiatu edo mugitzerakoan"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
-msgstr "Ezin da xml fitxategiaren segurtasun-kopia sortu"
+msgstr "Hutsegitea xml agiriaren babeskopia sortzerakoan"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
-#, fuzzy
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
-msgstr "Ezin dira ezarpenak balidatu"
+msgstr "Hutsegitea aditze hartunea sortzerakoan, uzten"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
-"Ezin da transferentzia-modu aktiboan socketa sortu, modu pasiboa probatzen"
+"Hutsegitea modu aktiboko eskualdaketa zerrendapen hartunea sortzerakoan"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
-msgstr ""
+msgstr "Hutsegitea FileZilla-ren azken bertsioa jeisterakoan."
 
 #: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
-msgstr ""
+msgstr "Hutsegitea 'Nire Agiriak' helburua lortzerakoan"
 
 #: ../../locales/../src/interface/LocalTreeView.cpp:651
-#, fuzzy
 msgid "Failed to get desktop path"
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea mahaigain helburua lortzerakoan"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
+"Hutsegitea aginte elkarketa hartzaile helbidea lortzerakoan, elkarketa "
+"itxita."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
+"Hutsegitea datu elkarketa hartzaile helbidea lortzerakoan, elkarketa itxita."
 
-#: ../../locales/../src/interface/context_control.cpp:77
-#, fuzzy
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
-msgstr "Ezin dira ezarpenak balidatu"
+msgstr "Hutsegitea FTP gailua abiarazterakoan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
-#, fuzzy
 msgid "Failed to initialize TLS."
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Hutsegitea TLS abiarazterakoan"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
-#, fuzzy
 msgid "Failed to load panels, invalid resource files?"
-msgstr "Ezin da menu nagusia baliabide-fitxategitik kargatu"
+msgstr "Hutsegitea panelak gertatzerakoan, baliabide agiri baliogabeak?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load private key: %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Hutsegitea giltza pribatua gertatzerakoan: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
+#, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr "Ezin da \"%s\" ireki eransteko / idazteko"
+msgstr "Hutsegitea \"%s\" eransteko/idazteko irekitzarakoan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "Ezin da \"%s\" ireki irakurtzeko"
+msgstr "Hutsegitea \"%s\" irakurtzeko irekitzarakoan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "Ezin da \"%s\" ireki idazteko"
+msgstr "Hutsegitea \"%s\" idazteko irekitzarakoan"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:418
+msgid "Failed to parse returned path."
+msgstr "Hutsegitea itzulitako helburua aztertzerakoan."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
-msgstr ""
+msgstr "Hutsegitea erro egiazt fidagarria aztertzerakoan."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
-#, fuzzy
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
-msgstr "Ezin da hizkuntza aldatu"
+msgstr "Hutsegitea datuak jasotzerakoan"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea zuzenbide zerrendapena berreskuratzerakoan"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
-#, fuzzy
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea kanpoko ip helbidea berreskuratzerakoan, uzten."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr ""
+"Hutsegitea kanpoko ip helbidea berreskuratzerakoan, tokiko helbidea "
+"erabiltzen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea tokiko ip helbidea berreskuratzerakoan."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
-#, fuzzy
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea tokiko ip helbidea berreskuratzerakoan. Uzten."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
-#, fuzzy
 msgid "Failed to retrieve the external IP address."
-msgstr "Ezin da direktorioaren zerrendatzea berreskuratu"
+msgstr "Hutsegitea kanpoko ip helbidea berreskuratzerakoan."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
-msgstr ""
+msgstr "Hutsegitea agindua bidaltzerakoan."
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:271
+#, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen"
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:256
+#, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:244
+#, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s (%s) hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen."
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:252
+#, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:241
+#, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
-"Ezin da %s hizkuntza ezarri, sistemaren hizkuntza lehenetsia erabiliko da"
+"Hutsegitea %s hizkuntza ezartzerakoan, sistemaren berezko hizkuntza "
+"erabiltzen."
 
 #: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
-msgstr "Ezin dira ezarpenak balidatu"
+msgstr "Hutsegitea ezarpenak balioztatzerakoan"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
-msgstr "Ezin da hizkuntza aldatu"
+msgstr "Hutsegitea hartzaile egiaztagiria egiaztatzerakoan"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to write to file %s"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Hutsegitea %s agirira idazterakoan"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
-msgstr "Ezin da xml fitxategia idatzi"
+msgstr "Hutsegitea xml agirira idazterakoan"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
-#, fuzzy
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Huts egindako eskualdaketak"
 
-#: resources.h:684
+#: resources.h:710
 msgid "Fall back to active mode"
-msgstr ""
+msgstr "Itzuli modu aktibora"
 
-#: resources.h:368
-#, fuzzy
+#: resources.h:378
 msgid "Fil&e:"
-msgstr "Fit&xategiak"
+msgstr "A&giria:"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Fil&es"
-msgstr "Fit&xategiak"
+msgstr "&Agiriak"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
-msgstr "Fitxategia"
+msgstr "Agiria"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:124
 msgid "File Types"
-msgstr "Fitxategi-motak"
+msgstr "Agiri Motak"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr ""
+msgstr "Agirak ez dut inportagarria den daturik."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
-#, fuzzy
 msgid "File editing"
-msgstr "Urruneko fitxategia"
+msgstr "Agiri edizioa"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
-msgstr "Fitxategia badago"
+msgstr "Agiria badago"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:125
-#, fuzzy
 msgid "File exists action"
-msgstr "Fitxategia badago"
+msgstr "Badagoen agirirako ekintza"
 
-#: resources.h:304
-#, fuzzy
+#: resources.h:314
 msgid "File has changed"
-msgstr "Fitxategi-izena ez da aldatu"
+msgstr "Agiria aldatu egin da"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
-#, fuzzy
 msgid "File lists"
-msgstr "Fitxategia badago"
+msgstr "Agiri zerrendak"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../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
 msgid "File not found"
-msgstr ""
+msgstr "Agiria ez da aurkitu"
 
-#: resources.h:995
-#, fuzzy
+#: resources.h:1028
 msgid "File search"
-msgstr "Tamaina"
+msgstr "Agiri bilaketa"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
-#, fuzzy
 msgid "File transfer aborted by user"
-msgstr "Erabiltzaileak eten du"
+msgstr "Agiri eskualdaketa erabiltzaileak utzita"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
-msgstr ""
+msgstr "Agiri eskualdaketa erabiltzaileak utzita %s -> %s eskualdatu ondoren"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
-#, fuzzy
 msgid "File transfer failed"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Agiri eskualdaketa hutsegitea"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
-msgstr ""
+msgstr "Agiri eskualdaketa hutsegitea %s -> %s eskualdatu ondoren"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
-#, fuzzy
 msgid "File transfer skipped"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Agiri eskualdaketa jauzita"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Agiria ongi eskualdatu da"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer successful, transferred %s in %s"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Agiria ongi eskualdatu da, eskualdatuta %s %s-an"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Agiri eskualdaketa oraindik garatzen."
 
-#: resources.h:386
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
-msgstr ""
+msgstr "Agiria ASCII datu motarekin eskualdatzen da."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with binary data type."
-msgstr ""
+msgstr "Agiria binario datu motarekin eskualdatzen da."
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
-msgstr "FileZilla Errorea"
+msgstr "FileZilla Akatsa"
 
-#: resources.h:706
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
+"FileZillak orain zure itxurapena aztertu dezake dena egoki itxuratuta "
+"dagoela zihurtatzeko."
 
-#: resources.h:476
-#, fuzzy
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
-msgstr "Ezin da zerbitzariarekin konektatu"
-
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
+msgstr "FileZilla jadanik zerbitzari batera elkarketaturik dago."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
+"FileZilla berrabiarazia izan behar da hizkuntza aldaketak eragina izan dezan."
 
-#: resources.h:516
-#, fuzzy
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla eguneraketak"
+
+#: resources.h:533
 msgid "Filelist status &bars"
-msgstr "Fitxategia badago"
+msgstr "Agiri-zer&renda egoera barra"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
-msgstr "Izena"
+msgstr "Agirizena"
 
-#: resources.h:509
-#, fuzzy
+#: resources.h:526
 msgid "Filename &filters..."
-msgstr "Iragazkiak editatu..."
+msgstr "&Agirizen iragazkiak..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
-msgstr ""
+msgstr "Agirizena ezin da %s zuzenbiderako eta %s agirizenerako eraiki"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
-msgstr "Fitxategi-izen baliogabea"
+msgstr "Agirizen baliogabea"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Agirizenak ezin du hurrengo hizkietako bat ere eduki: / \\ : * ? \" < > |"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
-msgstr "Fitxategi-izena ez da aldatu"
+msgstr "Agirizen aldatugabea"
 
-#: resources.h:306 resources.h:950
-#, fuzzy
+#: resources.h:316 resources.h:982
 msgid "Filename:"
-msgstr "Izena"
+msgstr "Agirizena:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
-msgstr "Fitxategi-izenak ez ditu honako karaktereak onartzen: / * ? < > |"
+msgstr "Agirizenek ezin dute hurrengo hizkietako bat ere eduki: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
-"Fitxategi-izenak ez ditu honako karaktereak onartzen: / \\ : * ? \" < > |"
+"Agirizenek ezin dute hurrengo hizkietako bat ere eduki: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:344
 msgid "Files currently being edited"
-msgstr ""
+msgstr "Orain editatzen ari diren agiriak"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../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
 msgid "Filesize"
-msgstr "Tamaina"
+msgstr "Agirineurria"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
-#, fuzzy
 msgid "Filesize format"
-msgstr "Tamaina"
+msgstr "Agirineurri heuskarria"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
-msgstr "Mota"
+msgstr "Agirimota"
 
-#: resources.h:938
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
-#, fuzzy
 msgid "Filetype associations"
-msgstr "Fitxategi-moten sailkapen automatikoa"
+msgstr "Agirmota elkarketak"
 
-#: resources.h:224
+#: resources.h:234
 msgid "Filter applies to:"
-msgstr "Iragazkia hauei aplikatua:"
+msgstr "Agiriak hemen ezarrita:"
 
-#: resources.h:813
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
-msgstr ""
+msgstr "Iragazki hizki baliogabeak agirizenetan"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
-msgstr "Iragazki-izena lehendik badago"
+msgstr "Agiri izena jadanik badago"
 
-#: resources.h:220
-#, fuzzy
+#: resources.h:230
 msgid "Filter out items matching all of the following"
-msgstr "Honakoa bete"
+msgstr "Iragazi hurrengo hauetako guztiekin bat datozen gaiak"
 
-#: resources.h:221
-#, fuzzy
+#: resources.h:231
 msgid "Filter out items matching any of the following"
-msgstr "Honakoa bete"
+msgstr "Iragazi hurrengo hauetako bakarren batekin bat datozen gaiak"
 
-#: resources.h:222
-#, fuzzy
+#: resources.h:232
 msgid "Filter out items matching none of the following"
-msgstr "Honakoa bete"
+msgstr "Iragazi hurrengo hauetako bat ere ezekin bat datozen gaiak"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
-msgstr "Iragazki-izena lehendik badago"
+msgstr "Iragazki ezarpena jadanik badago"
 
-#: resources.h:988
+#: resources.h:1021
 msgid "Filter the directory listings"
-msgstr "Iragazi direktorioen zerrendatzeak"
+msgstr "Iragazi zuzenbide zerrendapenak"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
-msgstr ""
+msgstr "Iragazki balioztapen hutsegitea"
 
-#: resources.h:9 resources.h:33
-#, fuzzy
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
-msgstr "Hatz-marka"
+msgstr "Hatzmarka (MD5):"
 
-#: resources.h:10 resources.h:34
-#, fuzzy
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
-msgstr "Hatz-marka"
+msgstr "Hatzmarka (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
-msgstr "Hatz-marka"
+msgstr "Hatzmarka:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
-msgstr ""
+msgstr "Suhesi eta bideratzaile itxurapen laguntzailea"
 
-#: resources.h:724
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
+"Aukera honek zer egiten duen argibide gehiagorako, mesedez ekin sare "
+"itxuratzaile laguntzailea."
 
-#: resources.h:701
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
+"Fidagarritasun gehiagorako gutxinez 10 atakako maila bat eman behar duzu."
 
-#: ../../locales/../src/interface/Options.cpp:194
-#, fuzzy
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr ""
-"Ezin da \"%s\" kargatu, fitxategia balekoa dela ziurtatu.\n"
-" Saio honetan, ezarpen lehenetsiak erabiliko dira eta egingo diren aldaketak "
-"ez dira iraunkorrak izango."
+"Saio honetarako berezko ezarpenak erabiliko dira. Ezarpenen aldaketak ez "
+"dira gordeko."
 
-#: resources.h:108
+#: resources.h:117
 msgid "Force &UTF-8"
-msgstr "&UTF-8 behartu"
+msgstr "Behartu &UTF-8"
 
-#: resources.h:542
+#: resources.h:560
 msgid "Force showing &hidden files"
-msgstr ""
+msgstr "Beh&artu ezkutuko agiriak erakustea"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
-msgstr ""
+msgstr "Behartu ezkutuko agiriak erakustea"
 
-#: resources.h:768
-#, fuzzy
+#: resources.h:794
 msgid "Format specifications:"
-msgstr "Fitxategi-moten sailkapen automatikoa"
+msgstr "Heuskarri ezaugarriak:"
 
-#: resources.h:936
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
+"Heuskarria: Luzapena egoki aipaturiko agindu eta argumentuz jarraiturik."
 
-#: resources.h:468
+#: resources.h:478
 msgid "Further documentation"
-msgstr ""
+msgstr "Agiritza gehigarria"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Orokorra"
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
-msgstr ""
+msgstr "HARTUNE orokor zerbitzari hutsegitea"
 
-#: resources.h:786
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr ""
+msgstr "Proxy generikoa"
 
-#: resources.h:690
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
-msgstr ""
+msgstr "Lortu kanpoko IP helbidea hurrengo URL-tik:"
 
-#: resources.h:469
-#, fuzzy
+#: resources.h:479
 msgid "Getting help"
-msgstr "&Konfigurazioa"
+msgstr "Lortu laguntza"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
-msgstr "Helburuko fitxategi-izena lehendik badago, jarraitu?"
+msgstr ""
+"Emandako iragaki-ezarpena jadanik badago, gainidatzi iragazki ezarpena?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
-msgstr ""
+msgstr "Lastermarka orokorrak"
 
-#: resources.h:165
+#: resources.h:174
 msgid "GnuTLS:"
-msgstr ""
+msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:146
 msgid "Group permissions"
-msgstr "Talde-baimenak"
+msgstr "Talde baimenak"
 
-#: resources.h:596
+#: resources.h:616
 msgid "H&igh"
-msgstr "H&andia"
+msgstr "&Handia"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
-msgstr ""
+msgstr "HTTPS - HTTP TLS bidez"
 
-#: resources.h:339
-#, fuzzy
+#: resources.h:349
 msgid "Hash:"
-msgstr "Gunea:"
+msgstr "Hasha:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
-msgstr ""
+msgstr "Ezkutuan"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Handia"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Handiena"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
-#, fuzzy
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr ""
-"Ataka erabilgarri altuenak 1 eta 65535 bitarteko zenbaki bat izan behar du."
+"Ataka eskuragarri handiena 1024 eta 65535 arteko zenbaki bat izan behar da."
 
-#: resources.h:208
-#, fuzzy
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
-"Sakatu maiuskula tekla iragazkiaren egoera bi guneetan aldi berean "
-"aktibatzeko/desaktibatzeko."
+"Sakatu shift tekla iragazkiaren egoera bi aldeetan aldiberean aldatzeko."
 
-#: resources.h:156
+#: resources.h:165
 msgid "Homepage:"
-msgstr "Orri nagusia"
+msgstr "Etxeko-orrialdea:"
 
-#: resources.h:341
-#, fuzzy
+#: resources.h:351
 msgid "Host key fingerprint:"
-msgstr "Hatz-marka"
+msgstr "Hostalari giltza hatzmarka:"
 
-#: resources.h:184
+#: resources.h:194
 msgid "Host key mismatch"
-msgstr "Gunearen gakoa ez dator bat"
+msgstr "Hostalari giltza ez dator bat"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
-msgstr ""
+msgstr "Hostalaria '['-rekin hasten da bana ez da amaiera kortxetea aurkitu."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr ""
+msgstr "Hostalari erdietsiezina"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
-msgstr "Gunea:"
+msgstr "Hostalaria:"
 
-#: resources.h:95
+#: resources.h:104
 msgid "Hours,"
-msgstr "Ordu,"
+msgstr "Ordu"
 
-#: resources.h:885
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
-msgstr ""
+msgstr "IS&O 8601 (adibidea: 15:47)"
 
-#: resources.h:728
+#: resources.h:754
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
+"Eragiketa batean ez bada daturik bidaltzen edo jasotzen adierazitako denbora-"
+"epean baino gehiagoan, elkarketa itxi egingo da eta FileZilla "
+"berrelkarketatzen saiatuko da."
 
-#: resources.h:966
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
+"Akatsak jakinaraziz gero, mesedez eman oharrak \"Berritsu\" oharketa "
+"mailarekin."
 
-#: resources.h:681
+#: resources.h:707
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
 "you should try active mode. You can set the transfer mode on a per-server "
 "basis in the Site Manager."
 msgstr ""
+"Laguntzaile honen amaieran berezgaitasunezko azterketa ongi irtetzen bada, "
+"baina ezin baduzu agiririk eskualdatu zerbitzari jakin batera, badaiteke "
+"zerbitzaria desitxuratu izana eta modu aktiboarekin saiatu behar zara. "
+"Eskualdaketa modua Gune Kudeatzailean ezarri dezakezu."
 
-#: resources.h:676
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
+"Itzulera aukera gaituta badago, gai izango zara hautaturiko eskualdaketa "
+"modua baztertzen duten desitxuraturiko zerbitzarietara elkarketatzeko."
 
-#: resources.h:187
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
 msgstr ""
+"Hostalari giltza ustekabean aldatzen bada, mesedez jarri harremanetan "
+"administratzailearekin."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:554
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
+"Arazoak jarraitzen badu, bideratzaile eta/edo suhesiren batek FileZilla "
+"blokeatzen ari da."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
+"Arazaak jarraitzen badu, bideratzaile eta/edo suhesiren bat elkarketa eteten "
+"ari da."
 
-#: resources.h:955
+#: resources.h:987
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
+"Ohar-agiriaren neurriak muga erdiesten badu, berrizendatua da \".1\" gehituz "
+"agirizenaren amaieran (zihurrenik ohar-agiri zaharrak gainidatziz) eta agiri "
+"berri bat sortzen da."
 
-#: resources.h:454
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
+"Sinlotura zuzenbide batera bada, FileZillak lotura sinbolikoa ezabatu edo "
+"loturaturiko zuzenbideko edukiak kendu ditzake."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:624
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
 msgstr ""
+"Arazoak jarraitzen badu, mesedez jarri harremanetan zure bideratzaile edo "
+"suhesiaren egilearekin konponbide bat bilatzeko."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
+"Arazoak jarraitzen badu, mesedez jarri harremanetan zure bideratzaile "
+"egilearekin."
 
-#: resources.h:277 resources.h:850
+#: resources.h:287 resources.h:876
 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 ""
+"'gainidatzi berriagoa bada' erabiltzen bada, zure sistemaren ordua "
+"zerbitzariarekin aldiberetu behar da. Ordua ezberdina bada (adib. ordu-eremu "
+"ezberdinak), adierazi ordu-eremu oreka gune kudeatzailean."
 
-#: resources.h:909
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
+"Denbora-irarkertan ohinarrituriko alderaketa erabiliz gero, hartu bi agiri "
+"berdintzat beren denbora-irarketa ezberdintasunak ez badu muga hau "
+"gainditzen."
 
-#: resources.h:924
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
-msgstr "Hizkuntza aldatzen baduzu, FileZilla berrabiarazi."
+msgstr "Hizkuntza aldatzen baduzu, FileZilla berrabiarazi behar duzu."
 
-#: resources.h:707
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
+"Azterketa klikatzen baduzu, FileZilla probe.filezilla-project.org-ra "
+"elkarketatu eta zenbait azterketa arrunt egingo ditu."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
-msgstr ""
+msgstr "FileZilla isten baduzu, zure aldaketak galdu egingo dira."
 
-#: resources.h:826
-#, fuzzy
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
-"Fitxategi-mota okerrak sartzen badituzu,\n"
-"fitxategiak hondaturik agertu daitezke\n"
-"transferitu eta gero."
+"Agirimota okerrak sartzen badituzu, agiri hauek hondatu egin daitezke "
+"eskualdatzerakoan."
 
-#: resources.h:708
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
-msgstr ""
+msgstr "Akatsen bat agertzen bada, zure itxurapena ez da zuzena."
 
-#: resources.h:740
-#, fuzzy
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"Direktorioaren zerrendatzea berreskuratzeko edo fitxategiak transferitzeko "
-"arazoak badituzu,\n"
-"saiatu modu pasiboaren ezarpena aktibatzen/desaktibatzen."
+"Arazoak badituzu zuzenbide zerrendapenak berreskuratzeko edo agiriak "
+"eskualdatzeko, saiatu berezko eskualdaketa modura aldatuz."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:569
 msgid ""
@@ -4228,380 +4231,423 @@
 "remote router or firewall might be misconfigured. In this case try to toggle "
 "passive mode and contact the server administrator for help."
 msgstr ""
+"Zerbitzari jakin batekin arazoak izaten jarraitzen baduzu, badaiteke "
+"zerbitzaria bera edo hurreneko bideratzailea edo suhesia desitxuraturik "
+"egotea. Kasu honetan saiatu modu pasibora aldatzen eta jarri harremanetan "
+"zure zerbitzari administratzailearekin laguntza lortzeko."
 
-#: resources.h:667
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
+"Laguntzailea ongi osatzen baduzu eta azken azterketa egiten bada, dituzun "
+"suhesi eta bideratzaile guztiak ongi itxuraturik egon behar dira."
 
-#: resources.h:703
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
+"Suhesi bat erabiltzen baduzu, zihurtatu FileZilla ahalbideturik dagoela "
+"emaniko ataka guztietan elkarketak onartzeko."
 
-#: resources.h:702
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
+"Bideratzaile bat erabiltzen baduzu, zihurtatu ataka hauek FileZilla "
+"erabiltzen ari zaren gailura bidaltzen direla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
 msgstr ""
+"Zure bideratzaileak IP helbidea aldatzen jarraitzen du, mesedez jarri "
+"harremanetan zure bideratzaile egilearekin."
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
-msgstr ""
+msgstr "Inportatu datuak bertsio zaharragotik"
 
-#: resources.h:296
-#, fuzzy
+#: resources.h:306
 msgid "Import settings"
-msgstr "Transferentzia-ezarpenak"
+msgstr "Inportatu ezarpenak"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
-#, fuzzy
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
-msgstr "Direktorioa ongi bistaratu da"
+msgstr "Ongi inportatu da"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
 msgid "Improperly quoted association."
-msgstr ""
+msgstr "Ezegoki aipaturiko elkarketa"
 
-#: resources.h:695
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
+"Modu aktiboan, FileZillak ataka batean aditu behar du datu eskualdaketarako. "
+"FileZillak erabiliko dituen atakak adierazi behar dituzu."
 
-#: resources.h:697
+#: resources.h:723
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
+"Bideratzaile bat baduzu, ataka eskuragarri guztiak bidali behar dituzu, "
+"honela FileZillak ez du eraginik zure sistemak hautatzen dituen atakatan."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
+"Berezgaitasunezko eguneraketak nahiago badituzu, berezgaitasunezko "
+"eguneraketa egiaztapena gaitu dezkezu ezarpenen elkarrizketan."
 
-#: resources.h:685 resources.h:749
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
+"Modu aktiboa erabiltzeko, FileZillak zure kanpoko IP helbidea jakin behar du."
 
-#: resources.h:670
+#: resources.h:696
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
+"Modu pasiboa, erabiltzaile gehienentzat hau da gomendarria, FileZillak "
+"zerbitzariari galdetzen dio ataka eta emaniko atakara elkarketatzen da. Ez "
+"da itxurapen gehiago egin behar honetarako."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
+"Kate osatu gabea, goiko egiaztagiria ez da berak-sinaturiko egiaztagiri "
+"autoritate egiaztagiria"
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
-msgstr "Sartu pasahitza"
+msgstr "Sarhitz okerrak"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
-msgstr ""
+msgstr "TLS abiarazten..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "Segurtasun gabeko zerbitzaria, ez du FTP TLS gain sostengatzen."
+
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
-msgstr "Elkarreragilea"
+msgstr "Elkarrekintza"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:126
-#, fuzzy
 msgid "Interface"
-msgstr "Elkarreragilea"
+msgstr "Interfazea"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
-msgstr "Erabiltzaileak eten du"
+msgstr "Erabiltzaileak etenda"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
-msgstr ""
+msgstr "Eduki-Luzera baliogabea"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:623
 msgid "Invalid HTTP Response"
-msgstr ""
+msgstr "HTTP erantzun baliogabea"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
+"Hizki-kode sekuentzia baliogabea jaso da, UTF-8 ezgaitzen. Hautatu UTF-8 "
+"aukera gune kudeatzailean UTF-8 behartzeko."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
-#, fuzzy
 msgid "Invalid chunk size"
-msgstr "Baliogabeko erabiltzaile-izena."
+msgstr "Chunk neurri baliogabea"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:353
 #: ../../locales/../src/interface/netconfwizard.cpp:363
 #: ../../locales/../src/interface/netconfwizard.cpp:372
 msgid "Invalid data received"
-msgstr ""
+msgstr "Datu baliogabeak jasota"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
-msgstr "Baliogabeko Fitxategi-izena"
+msgstr "Datu baliogabea"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
-msgstr "Baliogabeko Fitxategi-izena"
+msgstr "Agirizen baliogabea"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
+"Hostalari baliogabea, kortxetea itxi ondoren bi puntuk eta atakak bakarrik "
+"jarraitu dezakete."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
-#, fuzzy
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
-msgstr "Baliogabeko Fitxategi-izena"
+msgstr "Sarrera baliogabea"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
-"Baliogabeko ataka. Atakak 1 eta 65535 bitarteko zenbaki bat izan behar du."
+"Baliogabeko ataka eman da. Ataka 1 eta 65535 arteko balio bat izan behar da."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
+"Baliogabeko protokoloa adierazi da. Baliozko protokoloak dira:\n"
+"ftp:// FTP arrunterako,\n"
+"sftp:// SSH agiri eskualdaketa protokolorako,\n"
+"ftps:// FTP TLS (inplizitoa) gain eta\n"
+"ftpes:// FTP TLS (esplizitoa) gain."
 
-#: ../../locales/../src/interface/search.cpp:724
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Proxy hostalari baliogabea, kortxetea itxi ondoren bi puntuk eta atakak "
+"bakarrik jarraitu dezakete."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
-msgstr "Baliogabeko tamaina baldintzan"
+msgstr "Adierazpen arrunt baliogabea bilaketa baldintzatan."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
-#, fuzzy
 msgid "Invalid response code"
-msgstr "Baliogabeko tamaina baldintzan"
+msgstr "Erantzun kode baliogabea"
 
-#: ../../locales/../src/interface/search.cpp:718
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:693
+#, c-format
 msgid "Invalid search conditions: %s"
-msgstr "Baliogabeko tamaina baldintzan"
+msgstr "Bilaketa baldintza baliogabeak: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
-msgstr "Baliogabeko Fitxategi-izena"
+msgstr "Gune helburu baliogabea"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
-msgstr "Baliogabeko tamaina baldintzan"
+msgstr "Neurri baliogabea baldintzan"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
-msgstr "Baliogabeko erabiltzaile-izena."
+msgstr "Baliogabeko erabiltzaile-izena eman da."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
-msgstr ""
+msgstr "Auzibarruti nazioa:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
-msgstr ""
+msgstr "Auzibarruti herria:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
-msgstr ""
+msgstr "Auzibarruti estatua edo herrialdea:"
 
-#: resources.h:906
+#: resources.h:934
 msgid "Keep directories on top"
-msgstr ""
+msgstr "Eduki zuzenbideak gainean"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"Halaber, zerbitzari guztiek ez dute funtzio hau jasaten eta zerrenda "
-"desegokia bueltatu dezakete 'Ikusi fitxategi ezkutuak' aktibatuta badago. "
-"FileZilla test batzuk egiten dituen arren, testa huts egin dezake."
+"Gogoan izan zerbitzari guztiek ez dutela ezaugarri hau sostengatzen eta "
+"badaiteke zerrendapen okerrak itzultzea aukera hau gaituta badago. "
+"FileZillak zenbait azterketa egiten ditu zerbitzariak ezaugarri hau "
+"sostengatzen duen jakiteko, baina aztarketak huts egin dezake."
 
-#: resources.h:336
+#: resources.h:346
 msgid "Key exchange"
-msgstr ""
+msgstr "Giltza aldaketa"
 
-#: resources.h:599
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Giltza aldaketa"
+
+#: resources.h:619
 msgid "L&owest"
-msgstr "T&xikiena"
+msgstr "A&palena"
 
-#: resources.h:922
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Hizkuntza"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
-msgstr "Hizkuntza"
+msgstr "Hizkuntza aldatuta"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Azken aldaketa"
 
-#: resources.h:853
+#: resources.h:879
 msgid "Layout"
-msgstr ""
+msgstr "Antolakuntza"
 
-#: resources.h:799
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
-msgstr ""
+msgstr "Aldibereko &jeisketentzako muga:"
 
-#: resources.h:801
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
-msgstr ""
+msgstr "Aldibereko &igoerentzako muga:"
 
-#: resources.h:744
+#: resources.h:770
 msgid "Limit local ports"
-msgstr "Mugatu ataka lokalak"
+msgstr "Mugatu tokiko atakak"
 
-#: resources.h:952
+#: resources.h:984
 msgid "Limit size of logfile"
-msgstr ""
+msgstr "&Mugatu ohar-agiriaren neurria"
 
-#: resources.h:953
+#: resources.h:985
 msgid "Limit:"
-msgstr ""
+msgstr "Muga:"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
-msgstr ""
+msgstr "Gehiegizko lerro luzera"
 
-#: resources.h:166
+#: resources.h:176
 msgid "Linked against"
-msgstr ""
+msgstr "Loturak"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:267
 msgid "Listen socket closed"
-msgstr ""
+msgstr "Aditze hartunea itxita"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
-msgstr "Zerrendatua:"
+msgstr "Zerrendapena:"
 
-#: resources.h:747
-#, fuzzy
+#: resources.h:773
 msgid "Lo&west available port:"
-msgstr "Ataka erabilgarri t&xikiena:"
+msgstr "Ataka eskuragarri t&xikiena:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
-msgstr "Gune lokala:"
+msgstr "Tokikoa"
 
-#: resources.h:363
-#, fuzzy
+#: resources.h:373
 msgid "Local file"
-msgstr "Iragazki lokalak:"
+msgstr "Tokiko agiria"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
-msgstr "Iragazki lokalak:"
+msgstr "Tokiko agiria ez dago."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
-msgstr ""
+msgstr "Tokiko agiria zuzenbide bat da agiri arrunt baten ordez."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr "Tokiko agiria ez da baliozko agirizena."
 
-#: resources.h:202
+#: resources.h:212
 msgid "Local filters:"
-msgstr "Iragazki lokalak:"
+msgstr "Tokiko iragazkiak:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
-msgstr "Gune lokala:"
+msgstr "Tokiko gunea:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
-msgstr "Gune lokala:"
+msgstr "Kokalekua:"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
-#, fuzzy
 msgid "Log file"
-msgstr "fitxategia"
+msgstr "Ohar agiria"
 
-#: resources.h:250
-#, fuzzy
+#: resources.h:260
 msgid "Log of update check:"
-msgstr "Bilatu bertsio berria automatikoki"
+msgstr "Eguneraketa egiaztapenaren oharra:"
 
-#: resources.h:947
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
-msgstr ""
+msgstr "Oharreratzea"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 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 ""
+"Saiohaste datuek ez-ASCII hizki-kodeak dituzte eta zerbitzaria badaiteke UTF-"
+"8 jakituen ez izatea. Ezinezkoa tokiko hizki-kodera itzultzea proxya "
+"erabiliz."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
+"Saiohaste datuek ez-ASCII hizki-kodeak dituzte eta zerbitzaria badaiteke UTF-"
+"8 jakituen ez izatea. Tokiko hizki-kodearekin saiatzen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
+"Saio-haste sekuentzia osoa exekutaturik oraindik ez da egiaztatu. Uzten."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
+"Saiohaste-mota, 'galdera' edo 'elkarrekintza' izan beahr da (aipamen gabe)"
 
 #: ../../locales/../src/interface/cmdline.cpp:10
 #, c-format
@@ -4609,30 +4655,32 @@
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
+"Saiohaste-mota, FTP URL-arekin batera bakarrik erabili daiteke. Argumenduta "
+"izan behar da '%s' edo '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
-msgstr "Txikia"
+msgstr "Apala"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
-msgstr "Txikiena"
+msgstr "Apalena"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
-#, fuzzy
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr ""
-"Ataka erabilgarri txikienak 1 eta 65535 bitarteko zenbaki bat izan behar du."
+"Ataka eskuragarri apalena 1024 eta 65535 arteko zenbaki bat izan behar da."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
-msgstr ""
+msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
+"Zihurtatu agiriak sarbidea duela eta ongi-osaturiko XML agiri bat dela."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
@@ -4640,516 +4688,500 @@
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 #, c-format
 msgid "Malformed chunk data: %s"
-msgstr ""
+msgstr "Chunk datu gaizki osatua: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 #, c-format
 msgid "Malformed header: %s"
-msgstr ""
+msgstr "Idazburu gaizki-osatua: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:593
 msgid "Malformed reply, server not sending proper line endings"
 msgstr ""
+"Gaizki-osaturiko erantzuna, zerbitzariak ez ditu lerro amaiera egokiak "
+"bidaltzen"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: resources.h:403 ../../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
 msgid "Manual transfer"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Eskuzko eskualdaketa"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Match all of the following"
-msgstr "Honakoa bete"
+msgstr "Bat datoz hurrengo guztiak"
 
-#: resources.h:434
-#, fuzzy
+#: resources.h:444
 msgid "Match any of the following"
-msgstr "Honakoa bete"
+msgstr "Bat dator hurrengoetakoren bat"
 
-#: resources.h:435
-#, fuzzy
+#: resources.h:445
 msgid "Match none of the following"
-msgstr "Honakoa bete"
+msgstr "Ez dator bat hurrengoetako bat ere"
 
-#: resources.h:797
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
-msgstr ""
+msgstr "Ge&hienezko eskualdaketa aldiberean:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
-msgstr ""
+msgstr "Mezu oharra"
 
-#: resources.h:864
+#: resources.h:890
 msgid "Message log position"
-msgstr ""
+msgstr "Mezu ohar kokapena"
 
-#: resources.h:954
+#: resources.h:986
 msgid "MiB"
-msgstr ""
+msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Minutes"
 msgstr "Minutu"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &down"
-msgstr ""
+msgstr "Mugitu &behera"
 
-#: resources.h:356
+#: resources.h:366
 msgid "Move &up"
-msgstr ""
+msgstr "Mugitu &gora"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
-msgstr ""
+msgstr "Nire Ordenagailua"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
-msgstr ""
+msgstr "Nire Agiriak"
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Nire Guneak"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
 msgid "N/a"
-msgstr "N/a"
+msgstr "E/g"
 
-#: resources.h:398
-#, fuzzy
+#: resources.h:408
 msgid "Name"
-msgstr "Izena:"
+msgstr "Izena"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
-msgstr "Iragazki-izena lehendik badago"
+msgstr "Izena jadanik badago"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
-msgstr "Iragazki-izena lehendik badago"
+msgstr "Lastermarkaren izena jadanik badago."
 
-#: resources.h:119 resources.h:167
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Izena:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Iragazki izena sartu behar da"
 
-#: ../../locales/../src/interface/search.cpp:708
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Hurruneko helburu baliozkoa sartu behar da"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
-msgstr "Karaktere-kodeketa bat zehaztu behar da"
+msgstr "Hizki kodeaketa adierazi behar da"
 
 #: ../../locales/../src/engine/proxy.cpp:436
 msgid "Network unreachable"
-msgstr ""
+msgstr "Sare erdietsiezina"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "Inoiz ez"
+
+#: resources.h:81
 msgid "New &Folder"
-msgstr "&Karpeta berria"
+msgstr "&Agiritegi Berria"
 
-#: resources.h:493
-#, fuzzy
+#: resources.h:510
 msgid "New &tab"
-msgstr "Gune berria"
+msgstr "&Hegats berria"
 
-#: resources.h:74 resources.h:413
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
-msgstr ""
+msgstr "&Lastermarka Berria"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
-msgstr ""
+msgstr "Lastermarka berria"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
-#, fuzzy
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
-msgstr "Sortu direktorioa"
+msgstr "Zuzenbide berria"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
-msgstr ""
+msgstr "%s-ko ezaugarri berriak eta hobekuntzak"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Iragazki berria"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
-msgstr "Karpeta berria"
+msgstr "Agiritegi berria"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Gune berria"
 
-#: resources.h:862
-#, fuzzy
+#: resources.h:888
 msgid "Next to the transfer queue"
-msgstr "Transferentzia-ilararen bistaratzea aktibatu/desaktibatu"
+msgstr "Hurrengoa eskualdaketa lerroan"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
-msgstr ""
+msgstr "Ez"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "No category to export selected"
-msgstr ""
+msgstr "Ez dago kategoriarik hautaturikoa esportazeko"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
-msgstr ""
+msgstr "Ez da agindurik eman, uzten."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
-msgstr ""
+msgstr "Ez da kanpoko IP-rik ezarri, berezkoarekin saiatzen."
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
-msgstr "Honako fitxategi-motak Ascii fitxategien eran erabili:"
+msgstr "Ez dago agiririk orain editzatzen."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Ez da iragazki izenik eman"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Ez da hostalaririk eman, mesedez sartu hostalari bat."
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
-msgstr "Irudirik ez"
+msgstr "Ez dago irudirik eskuragarri"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
-msgstr "&Fitxategiak ilarara sartu"
+msgstr "Ez dago agiri gehiago lerroan!"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
-msgstr ""
+msgstr "Ez da iragazki-ezarpenerako izenik eman."
 
-#: resources.h:429
+#: resources.h:439
 msgid "No program associated with filetype"
-msgstr ""
+msgstr "Ez dago programarik agirimotarekin elkarturik"
 
-#: resources.h:419
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
-msgstr ""
+msgstr "Ez da programarik elkartu '%s' luzapena duten agiriak editatzeko."
 
-#: ../../locales/../src/interface/search.cpp:566
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Ez da emaitzik aurkitu"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
-msgstr "Irudirik ez"
+msgstr "Ez dago gunerik eskuragarri"
 
 #: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
-msgstr ""
+msgstr "SOCKS5 egiaztapen metodo sostengatu gabea"
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
-#, fuzzy
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Ez da erabiltzaile-izenik eman."
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:944 resources.h:949
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
-msgstr ""
+msgstr "Ezer ez"
 
-#: resources.h:373
-#, fuzzy
+#: resources.h:383
 msgid "None selected yet"
-msgstr "Kendu hautatutakoa"
+msgstr "Ez da ezer hautatu oraindik"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:836 ../../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:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
-msgstr "Normala"
+msgstr "Arrunta"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../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 ""
+msgstr "Gai guztiak ezin dira berlerrokatu ikus/editatzeko."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
-#, fuzzy
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
-msgstr "Konektatua"
+msgstr "Elkarketatu gabe"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Zerbitzarira elkarketatu gabe"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Zerbitzarira elkarketatu gabe."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:27
-#, fuzzy
 msgid "Not connected."
-msgstr "Konektatua"
+msgstr "Elkarketatu gabe"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
+"Ohartu ezaugarri hau FTP protokoloa erabiliz bakarrik sostengatzen dela."
 
-#: resources.h:778
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
+"Oharra: Honek FTP elkarketa lau enkriptatu gabeekin bakarrik egiten du lan."
 
-#: resources.h:795
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
+"Oharra: Proxy generikoa erabiltzeak modu pasiboa behartzen du FTP "
+"elkarketetan."
 
-#: resources.h:895
+#: resources.h:923
 msgid "Number of decimal places:"
-msgstr ""
+msgstr "Hamarren zenbatekoa:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
-msgstr ""
+msgstr "Bersaiatze zenbatekoa 0 eta 99 artekoa izan behar da."
 
-#: resources.h:332
-#, fuzzy
+#: resources.h:342
 msgid "O&pen file"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "&Ireki agiria"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
-msgstr "Ados"
+msgstr "Ongi"
 
-#: resources.h:677
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
+"Hurrengo orrialdeetan, hautaturiko eskualdakete modua itxuratuko da, baita "
+"itzulera modua gaituta badago."
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
-#, fuzzy
 msgid "Once"
-msgstr "Utzi"
+msgstr "Behin"
 
-#: resources.h:946
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
+#: resources.h:969
+msgid "Once a week"
+msgstr "Astean behin"
 
-#: resources.h:646
+#: resources.h:672
 msgid "Open directory in system's file manager"
-msgstr ""
+msgstr "Ireki zuzenbidea sistemaren agiri kudeatzailean"
 
-#: resources.h:968 resources.h:969
+#: resources.h:1000
 msgid "Open the Site Manager"
-msgstr "Gune-kudeatzailea ireki"
+msgstr "Ireki Gune Kudeatzailea"
 
-#: resources.h:562
-#, fuzzy
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Ireki Gune Kudeatzailea."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Ireki Gune Kudeatzailea. Eskuin-klikatu guneen zerrendarako."
+
+#: resources.h:580
 msgid "Open the file."
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Ireki agiria."
 
-#: resources.h:506
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
-msgstr "FileZillaren ezarpenak ireki"
+msgstr "Ireki FileZilla-ren ezarpen elkarrizketa"
 
-#: resources.h:308
+#: resources.h:318
 msgid "Opened as:"
-msgstr ""
+msgstr "Honela irekita:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Irekitze hutsegitea"
 
-#: resources.h:494
+#: resources.h:511
 msgid "Opens a new tab"
-msgstr ""
+msgstr "Hegats berri bat irekitzen du"
 
-#: resources.h:491
+#: resources.h:508
 msgid "Opens the Site Manager"
-msgstr "Gune-kudeatzailea irekitzen du"
+msgstr "Gune Kudeatzailea irekitzen du"
 
-#: resources.h:989
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
+"Iragazki elkarrizketa zerrenda zuzenbidea irekitzen du. Eskuin-klikatu "
+"iragazkiak aldatzeko."
 
-#: resources.h:170
-#, fuzzy
+#: resources.h:180
 msgid "Operating system"
-msgstr "Eskatu sistema eraginkorrari ataka bat."
+msgstr "Sistema eragilea"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
-msgstr ""
+msgstr "Sistema eragile arazoa atzeman da"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
-msgstr ""
+msgstr "Erakundea:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
-msgstr "Egilea:"
+msgstr "Bestelakoa:"
 
-#: resources.h:723
-#, fuzzy
+#: resources.h:749
 msgid "Overview"
-msgstr "&Gainean idatzi"
+msgstr "Gainbegirada"
 
-#: resources.h:59
-#, fuzzy
+#: resources.h:67
 msgid "Overwrite &if source newer"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi iturburua &berriagoa bada"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
-#, fuzzy
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
-msgstr "&Gainean idatzi"
+msgstr "Gainidatzi agiria"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
-#, fuzzy
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi agiria neurriak ezberdinak badira"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
-#, fuzzy
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi agiria neurria ezberdina edo iturburua berriagoa bada"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
-#, fuzzy
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi agiria iturburua berriagoa bada"
 
-#: resources.h:60
-#, fuzzy
+#: resources.h:68
 msgid "Overwrite if &different size"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi &neurria ezberdina bada"
 
-#: resources.h:61
-#, fuzzy
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
-msgstr "Gainean idatzi &berriagoa bada"
+msgstr "Gainidatzi neurria e&zberdina edo iturburua berriagoa bada"
 
-#: resources.h:133
+#: resources.h:142
 msgid "Owner permissions"
-msgstr "Jabearen baimenak"
+msgstr "Jabe baimenak"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:377
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
-msgstr "Jabea / Taldea"
+msgstr "Jabea/Taldea"
 
-#: resources.h:867
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
+"&Saihestu sistemaren lotaratze osoa eskualdaketa eta beste eragiketak "
+"burutzerakoan"
 
-#: resources.h:775 resources.h:791
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
-msgstr ""
+msgstr "Proxy &hostalaria:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
-#, fuzzy
 msgid "PORT command tainted by router or firewall."
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "ATAKA agindua bideratzaileak edo suhesiak kutsatuta."
 
-#: resources.h:737
-#, fuzzy
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
-msgstr "Modu pasiboa"
+msgstr "&Pasiboa (gomendatua)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
-msgstr ""
+msgstr "Paketea"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
-msgstr ""
+msgstr "Paremetroa ez da baliozko URL bat"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
-msgstr "Pasa&hitza"
+msgstr "Sa&rhitza:"
 
-#: resources.h:673
-#, fuzzy
+#: resources.h:699
 msgid "Passive (recommended)"
-msgstr "Modu pasiboa"
+msgstr "Pasiboa (gomendatua)"
 
-#: resources.h:757
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
-#, fuzzy
 msgid "Passive mode"
 msgstr "Modu pasiboa"
 
@@ -5157,203 +5189,221 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:601
 #: ../../locales/../src/interface/netconfwizard.cpp:612
 msgid "Passive mode has been set as default transfer mode."
-msgstr ""
+msgstr "Modu pasiboa berezko eskualdaketa modu bezala ezarri da."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
-msgstr ""
+msgstr "Sarhitza beharrezkoa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
-msgstr ""
+msgstr "Helburua"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
-msgstr ""
+msgstr "Ezin da helburua eraiki %s zuzenbidearentzat eta %s azpizuzenb-rentzat"
 
-#: resources.h:400
+#: resources.h:410
 msgid "Paths"
-msgstr ""
+msgstr "Helburuak"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
-msgstr ""
+msgstr "Kentzeke"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
-msgstr "Baimenak"
+msgstr "Baimena"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:376
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Baimenak"
 
-#: resources.h:169
+#: resources.h:179
 msgid "Platform:"
-msgstr ""
+msgstr "Plataforma:"
 
-#: resources.h:249
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
 msgstr ""
+"Mesedez egiaztatu http://filezilla-project.org FileZilla-ren bertsio "
+"berrienerako."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
 "Please check on http://filezilla-project.org/probe.php that the server is "
 "running and carefully check your settings again."
 msgstr ""
+"Mesedez egiaztatu hemen: http://filezilla-project.org/probe.php zerbitzaria "
+"ekinean dagoela eta zure ezarpenak berriro egiaztatzeko."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
+"Mesedez egiaztatu zure sistemako pakete kudeatzailea pakete eguneratu "
+"baterako edo ikusi http://filezilla-project.org FileZilla-ren iturburu kodea "
+"jeisteko."
 
-#: resources.h:679
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
+"Mesedez itxuratu suhesi eta bideratzaile guztiak FileZillak kanporako "
+"elkarketa gogarako atakatan ezarri ahal izateko."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
 msgstr ""
+"Mesedez ezgaitu 'GDM modua' edo 'Jolas modua' bezalako ezarpenak zure "
+"bideratzailean."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
 msgid ""
 "Please ensure you have a stable internet connection and carefully check your "
 "settings again."
 msgstr ""
+"Mesedez zihurtatu internet elkarketa egonkorra duzula eta egiaztatu berriro "
+"kontu handiz zure ezarpenak."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
-#, fuzzy
 msgid "Please enter a custom date format."
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu norbere egun heuskarria"
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
-msgstr ""
+msgstr "Mesedez sartu norbere ordu heuskarria"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr "Mesedez sartu egun bat UUUU-HH-EE heuskarrian, adibidez 2010-07-18."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
-msgstr ""
+msgstr "Mesedez sartu jeisketa abiadura handiagoa edo berdina: 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu izen bat iragazki berriarentzat."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
-msgstr "Hautatu hautatutako fitxategien atributu berriak."
+msgstr "Mesedez sartu izen bat berri bat kopiatutako iragazkiarentzat."
 
-#: ../../locales/../src/interface/filter.cpp:388
-#, fuzzy, c-format
+#: ../../locales/../src/interface/filter.cpp:403
+#, c-format
 msgid "Please enter a new name for the filter set \"%s\""
-msgstr "Hautatu \"%s\" fitxategiaren atributu berriak."
+msgstr "Mesedez sartu izen berri bat \"%s\" iragazki ezarpenarentzat"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
-msgstr "Hautatu \"%s\" fitxategiaren atributu berriak."
+msgstr "Mesedez sartu izen berri bat iragazkiarentzat."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent "
 "downloads."
 msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko jeisketa zenbatekorako."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent uploads."
 msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko igoera zenbatekorako."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
 msgid ""
 "Please enter a number between 1 and 10 for the number of concurrent "
 "transfers."
 msgstr ""
+"Mesedez sartu 0 eta 10 arteko zenbaki bat aldibereko eskualdaketa "
+"zenbatekorako."
 
-#: resources.h:116
+#: resources.h:125
 msgid "Please enter a password for this server:"
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu sarhitz bat zerbitzari honentzat:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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 ""
+"Mesedez sartu helburu bat eta ekiteko exekutagarria.\n"
+"Adib. c:\\Helbururen bat\\agiria.exe MS Windows-en edo /Helbururen bat/"
+"agiria Unix-en.\n"
+"Aukeran programa argumentuak ere adierazi ditzakezu."
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
+"Mesedez sartu 5 eta 9999 segundu arteko denbora-epe bat edo 0 denbora-epeak "
+"ezgaitzeko."
 
-#: ../../locales/../src/interface/filter.cpp:328
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu izen bakar bat iragazki ezarpen honentzat"
 
-#: resources.h:117
-#, fuzzy
+#: resources.h:126
 msgid "Please enter a username for this server:"
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu erabiltzaile-izen bat zerbitzari honentzat:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
-#, fuzzy
 msgid "Please enter a valid portrange."
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu ataka-maila baliozko bat."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr ""
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr ""
+msgstr "Mesedez sartu URL bat non zure kanpoko helbidea lortzeko"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
-msgstr ""
+msgstr "Mesedez sartu igoera abiadura handiagoa edo berdina: 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
-"FTP komandoa sartu.\n"
-"FTP komandoak erabiltzerakoan direktorioaren cachea garbituko da."
+"Mesedez sartu idazki FTP agindua.\n"
+"Idazki ftp aginduak erabiltzeak zuzenbide katxea garbituko du."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
-msgstr "Sartu sortuko den direktorioaren izena"
+msgstr "Mesedez sartu sortu behar den zuzenbide izena:"
 
-#: resources.h:118
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Mesedez sartu sortu behar den agiriaren izena:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Mesedez sartu erabiltzaile-izena eta sarhitza zerbitzari honentzat:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
-#, fuzzy
 msgid "Please enter your external IP address"
-msgstr "&Kanpoko IP helbidea:"
+msgstr "Mesedez sartu zure kanpoko IP helbidea"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:593
 #: ../../locales/../src/interface/netconfwizard.cpp:606
@@ -5362,22 +5412,29 @@
 "wizard. In case you have a dynamic address or don't know your external "
 "address, use the external resolver option."
 msgstr ""
+"Mesedez sartu zure kanpoko IP helbidea laguntzaile honen modu aktiboko "
+"orrialdean. Helbide aldakor bat baduzu edo ez baduzu zure kanpoko helbidea "
+"ezagutzen, erabili kanpoko konponbidea aukera."
 
-#: resources.h:666
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
 msgstr ""
+"Mesedez jarraitu jarraipideak kontu handiz , itxurapen oker batek FTP "
+"elkarketak ongi egitea saihestuko du."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:617
 msgid ""
 "Please make sure FileZilla is allowed to establish outgoing connections and "
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
+"Mesedez zihurtatu FileZilla ahalbideturik dagoela kanporako elkarketak "
+"ezartzeko eta zihurtatu zuzen idatzi duzula erabaki helbidearen helbidea."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
-msgstr ""
+msgstr "Mesedez zihurtatu eskaturiko tokikoa zure sisteman ezarrita dagoela."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:594
 msgid ""
@@ -5386,39 +5443,55 @@
 "manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
 "'game mode'."
 msgstr ""
+"Mesedez zihurtatu zure bideratzailea azken firmware eskuragarria erabiltzen "
+"ari dela. Gainera, zure bideratzailea egoki itxuraturik egon behar da. "
+"Eskuzko ataka bidalketa erabili beharko duzu. Ez ekin zure bideratzailea "
+"'GDM modua' edo 'jolas modua' deiturikoetan."
 
-#: resources.h:680
+#: resources.h:706
 msgid ""
 "Please note that FileZilla has no influence on the port the server chooses. "
 "So the server might choose a port which your firewall thinks is only used by "
 "trojans or other malware. This might raise a false alarm you can safely "
 "discard."
 msgstr ""
+"Mesedez ohartu FileZillak ez duela eraginik zerbitzariak hautatzen dituen "
+"atakatan. Hortaz zerbitzariak zure suhesiak trojarrak edo beste malware "
+"batzuek bakarrik erabiltzen dutela uste duen ataka bat hautatu dezake. Honek "
+"segurtasunez baztertu dezakezun alarma faltsu bat sortu dezake."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
+"Mesedez ohartu igoeratan denbora-irarketei heusteak FTP, FTPS eta FTPES "
+"zerbitzarietan lan egiten duela bakarrik MFMT agindua sostengatzen badute."
 
-#: resources.h:734
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
+"Mesedez ohartu zerbitzari batzuk baztertu egin zaitzaketela sarriegi edo "
+"tarte txikiegitan berrelkarketatzen saiatzen bazara."
 
-#: resources.h:882 resources.h:888
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
+"Mesedez irakurri http://wiki.filezilla-project.org/Date_and_Time_formatting "
+"xehetasunetarako"
 
-#: resources.h:245
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
+"Mesedez saiatu eguneraketa jeisten. Arazoak jarraitzen badu ahalezko "
+"zergaitiak (beheranzko ahalezkotasunez zerrendatuta):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5426,44 +5499,44 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
+"Mesedez ekin laguntzaile hau berriro zure sare ingurua aldatzen baduzu edo "
+"arazoak aurkitzen badituzu ongi lan egiten zuten zerbitzariekin."
 
-#: resources.h:455
-#, fuzzy
+#: resources.h:465
 msgid "Please select an action:"
-msgstr "Ekintza bat hautatu:"
+msgstr "Mesedez hautatu ekintza bat:"
 
-#: resources.h:301
-#, fuzzy
+#: resources.h:311
 msgid "Please select the categories you would like to import."
-msgstr "Hautatu hautatutako direktorioen atributu berriak."
+msgstr "Mesedez hautatu inportatzea nahi dituzun kategoriak."
 
-#: resources.h:668
-#, fuzzy
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
-msgstr "Hautatu \"%s\" direktorioaren atributu berriak."
+msgstr "Mesedez hautatu erabiltzea nahi duzun berezko eskualdaketa modua."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr "Hautatu \"%s\" direktorioaren atributu berriak."
+msgstr "Mesedez hautatu ezaugarri berriak \"%s\" zuzenbidearentzat."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr "Hautatu \"%s\" fitxategiaren atributu berriak."
+msgstr "Mesedez hautatu ezaugarri berriak \"%s\" agiriarentzat."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
-msgstr "Hautatu hautatutako direktorioen atributu berriak."
+msgstr "Mesedez hautatu ezaugarri berriak hautaturiko zuzenbideentzat."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
-msgstr "Hautatu hautatutako fitxategi eta direktorioen atributu berriak."
+msgstr ""
+"Mesedez hautatu ezaugarri berriak hautaturiko agiri eta zuzenbideentzat."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
-msgstr "Hautatu hautatutako fitxategien atributu berriak."
+msgstr "Mesedez hautatu ezaugarri berriak hautaturiko agirientzat."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:581
 msgid ""
@@ -5473,743 +5546,830 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
+"Mesedez eguneratu zure suhesia eta zihurtatu zure bideratzailea azken "
+"firmware eskuragarria erabiltzen ari dela. Gainera, zure bideratzailea egoki "
+"itxuraturik egon behar da. Eskuzko ataka bidalketa erabili beharko duzu. Ez "
+"ekin zure bideratzailea 'GDM modua' edo 'jolas modua' deiturikoetan. "
+"Protokolo ikerketa edo protokolo 'fixups' bereizia bezalako gauzak ezgaituak "
+"egon behar dira."
 
-#: resources.h:252
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
+"Mesedez ikusi http://filezilla-project.org FileZillari buruzko argibide "
+"gehiagorako."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
-msgstr ""
+msgstr "Mesedez ikusi http://filezilla-project.org bertsio berriena jeisteko."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
-msgstr ""
+msgstr "Posta kodea:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
-msgstr ""
+msgstr "Aurrezehazturiko Guneak"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
-msgstr ""
+msgstr "Agiri denbora-irarketak iraunarazten"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
-#, fuzzy
 msgid "Preview:"
-msgstr "Aurrebista"
+msgstr "Aurreikuspena:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
-msgstr ""
+msgstr "Lehen elkarketa eta datu elkarketa egiaztagiriak ez datoz bat."
+
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Irarkitu FileZilla-ren abiatzeari buruzko igarpen argibideak"
 
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
-msgstr ""
+msgstr "Irarkitu bertsio argibideak irteera-estandarrera eta irten"
 
-#: resources.h:905
+#: resources.h:933
 msgid "Prioritize directories (default)"
-msgstr ""
+msgstr "Lehentasuna zuzenbideek (berezkoa)"
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Lehentasuna"
 
-#: resources.h:945
-msgid "Privacy policy:"
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
 msgstr ""
+"Pribatutasun araudia: Zure FileZilla bertsioa, zure sistema eragilea eta "
+"zure CPU eraikintza bakarrik aurkeztuko dira zerbitzarian."
 
-#: resources.h:781
+#: resources.h:807
 msgid "Private &keys:"
-msgstr ""
+msgstr "Giltza &pribatuak:"
 
-#: resources.h:777 resources.h:794
-#, fuzzy
+#: resources.h:89
+msgid "Pro&tocol:"
+msgstr "Proto&koloa:"
+
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
-msgstr "&Pasahitza:"
+msgstr "Proxy &sarhitza:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
-msgstr "Prozesatu &Ilara"
+msgstr "&Prozesatu Lerroa"
 
-#: resources.h:792
+#: resources.h:18 resources.h:46
 #, fuzzy
+msgid "Protocol:"
+msgstr "Proto&koloa:"
+
+#: resources.h:818
 msgid "Proxy &port:"
-msgstr "&Pasahitza:"
+msgstr "Prox&y ataka:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
-msgstr ""
+msgstr "Pro&xy erabiltzailea:"
 
 #: ../../locales/../src/engine/proxy.cpp:415
-#, fuzzy
 msgid "Proxy authentication failed"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Proxy egiaztapen hutsegitea"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
+msgstr "Proxy eskuemate hutsegitea: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
 msgstr ""
+"Proxy hostalaria '['-rekin hasten da baina ez da itxiera kortxeterik aurkitu."
 
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr ""
+msgstr "Proxy erantzuna: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr ""
+msgstr "Proxy eskaera hutsegitea: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
+"Proxy eskabide hutsegitea: Helbide mota ezezaguna ELKARKETA erantzunean"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
-msgstr ""
+msgstr "Proxya ezarrita baina proxy hostalaria edo ataka baliogabea"
 
-#: resources.h:779
+#: resources.h:805
 msgid "Public Key Authentication"
-msgstr ""
+msgstr "Giltza Publiko Egiaztapena"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
-msgstr ""
+msgstr "Giltza publiko algoritmoa:"
 
-#: resources.h:141
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Baimen publikoak"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
-msgstr ""
+msgstr "Lerroa osoa prozesatu da"
 
-#: ../../locales/../src/interface/statusbar.cpp:458
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
 msgid "Queue: %s MiB"
-msgstr "Ilara: %s%d MB"
+msgstr "Lerroa: %s MiB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
 msgid "Queue: %s%s"
-msgstr "Ilara: %s%d MB"
+msgstr "Lerroa: %s%s"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
-msgstr "Ilara: hutsik"
+msgstr "Lerroa: hutsik"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
-msgstr "Ilara: %s%d bytes"
+msgstr "Lerrokaturiko agiriak"
 
-#: resources.h:447
-#, fuzzy
+#: resources.h:457
 msgid "Queueing:"
-msgstr "&Ilara"
+msgstr "Lerrokapena:"
 
-#: resources.h:606
-#, fuzzy
+#: resources.h:626
 msgid "R&eboot system"
-msgstr "Urruneko gunea:"
+msgstr "&Berrabiarazi sistema"
 
-#: resources.h:520
-#, fuzzy
+#: resources.h:538
 msgid "R&emote directory tree"
-msgstr "&Sortu direktorioa"
+msgstr "&Hurruneko zuzenbide zuhaitza"
+
+#: resources.h:642 resources.h:646
+msgid "R&eset and requeue selected files"
+msgstr "&Berrezarri eta berlerrokatu hautaturiko agiriak"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
-msgstr ""
+msgstr "Raw FTP agindua"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Re&ad"
-msgstr "Ir&akurri"
+msgstr "&Irakurri"
 
-#: resources.h:567 resources.h:581
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
-msgstr ""
+msgstr "&Berritu"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
-msgstr "Ize&na aldatu"
+msgstr "B&errizendatu"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:576
 msgid ""
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
+"Berrekin laguntzailea eta egiaztatu kontu handiz zure ezarpenak eta itxuratu "
+"bideratzaile eta suhesi guztiak."
 
-#: resources.h:142
+#: resources.h:151
 msgid "Rea&d"
-msgstr "Ira&kurri"
+msgstr "&Irakurri"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
-msgstr "Erantzuna:"
+msgstr "Irakurtzeko-bakarrik"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
-msgstr "Benetan bertan behera utzi uneko eragiketa?"
+msgstr "Egitan ezeztatu oraingo eragiketa?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] ""
-msgstr[1] ""
+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] "Egitan ezabatu %d zuzenbide bere edukiekin zerbitzaritik?"
+msgstr[1] "Egitan ezabatu %d zuzenbide bere edukiekin zerbitzaritik?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] ""
-msgstr[1] ""
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Egitan ezabatu %d agiria zerbitzaritik?"
+msgstr[1] "Egitan ezabatu %d agiriak zerbitzaritik?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Egitan ezabatu %s eta %s zerbitzaritik?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
 msgstr ""
+"Egitan ezabatu hautaturiko agiri edo/eta zuzenbide denak zerbitzaritik?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
-msgid "Really delete all selected files and/or directories?"
-msgstr "Benetan hautatutako fitxategiak eta/edo direktorioak ezabatu?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Egitan ezabatu hautaturiko agiri edo/eta zuzenbide denak zure ordenagailutik?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
-msgstr "Erantzuna:"
+msgstr "Zergaitia"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
-msgstr ""
+msgstr "Berrabiarazi orain"
 
-#: resources.h:147
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
-msgstr "Azpidirektorioetan eragiten du"
+msgstr "&Jarraian azpizuzenbideen barnean"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
-msgid "Received data tainted"
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
 msgstr ""
+"EBCDIC-an kodeaturik dagoela dirudien zuzenbide zerrendapen bat jaso da."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "Jasotako lerroak 10000 hizki baino gehiago ditu, uzten."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
+msgid "Received data tainted"
+msgstr "Jasotako datuak kutsatuta daude"
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
+"Berrelkarketa argibideak ezin dira argitu zerbitzari batera "
+"elkarketatzerakoan.\n"
+"Jarraitzen baduzu, zure elkarketa eten egingo da."
 
-#: resources.h:735
+#: resources.h:761
 msgid "Reconnection settings"
-msgstr ""
+msgstr "Berrelkarketa ezarpenak"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
-msgstr "Erabilitako azken zerbitzarira birkonektatzen du"
+msgstr "Erabilitako azken zerbitzarira elkarketatzen du"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:715
 msgid "Redirection to invalid address"
-msgstr ""
+msgstr "Helbide baliogabera berzuzenduta"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
-msgstr "Freskatu fitxategi eta karpeten zerrendak"
+msgstr "Berritu agiri eta agiritegi zerrendak"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
-#, fuzzy
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Gogoratu sarhitzak?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
-msgstr "&Kendu"
+msgstr "Hurrunekoa"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
-msgstr ""
+msgstr "Hurreneko egiaztagira ez da fidagarria."
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
-msgstr "Urruneko fitxategia"
+msgstr "Hurruneko agiria"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
-#, fuzzy
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
-msgstr "Urruneko fitxategia"
+msgstr "Hurreneko agiri bilaketa"
 
-#: resources.h:205
+#: resources.h:215
 msgid "Remote filters:"
-msgstr "Urruneko iragazkiak:"
+msgstr "Hurruneko iragazkiak:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
-msgstr "&Kendu"
+msgstr "Hurruneko helburua"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, 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 ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu helburu oso baliozkoa dela eta "
+"sostengatzen duela oraingo gunearen zerbitzari-motak (%s)."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, 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 ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu helburu oso baliozkoa dela eta "
+"sostengatzen duela hautaturiko gaineko gunearen zerbitzari-motak (%s)."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
+"Hurruneko helburua ezin da aztertu. Zihurtatu baliozko helburu osoa dela."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "Hurruneko helburua ezin da aztertu."
 
-#: resources.h:444
-#, fuzzy
+#: resources.h:454
 msgid "Remote path handling:"
-msgstr "Urruneko gunea:"
+msgstr "Hurruneko helburu kudeakea:"
 
-#: resources.h:312
-#, fuzzy
+#: resources.h:322
 msgid "Remote path:"
-msgstr "Urruneko gunea:"
+msgstr "Hurruneko helburua:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
-msgstr "Urruneko gunea:"
+msgstr "Hurruneko gunea:"
 
-#: resources.h:615 resources.h:618
-#, fuzzy
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
-msgstr "&Kendu"
+msgstr "Kendu &denak"
 
-#: resources.h:616 resources.h:619
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
-msgstr "Kendu hautatutakoa"
+msgstr "Kendu &hautaturikoa"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Berreizendatu agiria"
 
-#: resources.h:631 resources.h:652
-#, fuzzy
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
-msgstr "Aldatu hautatutako fitxategi eta karpeten izenak"
+msgstr "Berrizendatu hautaturiko zuzenbidea"
 
-#: resources.h:571 resources.h:585
-#, fuzzy
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
-msgstr "Aldatu hautatutako fitxategi eta karpeten izenak"
+msgstr "Berrizendatu hautaturiko agiri eta zuzenbideak"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
-msgstr "'%s' izena '%s' izenagatik aldatu"
+msgstr "Gelditzen da '%s' -> '%s'"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
-msgstr ""
+msgstr "Akats jakinarazpena eta ezaugarri eskaerak"
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
-msgstr ""
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "FTP esplizitoa TLS gain behar du"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "FTP inplizitoa TLS gain behar du"
+
+#: resources.h:644
+msgid "Reset and requeue &all"
+msgstr "&Berrezarri eta berlerrokatu denak"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
-#, fuzzy, c-format
+#, c-format
 msgid "Resolving address of %s"
-msgstr "&Kanpoko IP helbidea:"
+msgstr "%s-ren helbidea eskuratzen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
-msgstr ""
+msgstr "Hostalari-izena erabakitzen"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Erantzuna:"
 
-#: resources.h:438
+#: resources.h:448
 msgid "Results:"
-msgstr ""
+msgstr "Emaitzak?"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
-#, fuzzy
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
-msgstr "Urruneko fitxategia"
+msgstr "Berrekin agiri eskualdaketa"
 
-#: resources.h:852
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
+"ASCII agiriak berrekiteak arazoak eragin ditzake zerbitzariak bezeroak "
+"erabiltzen duenaren lerro amaiera heuskarri ezberdin bat erabiltzen badu."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
-msgstr "Direktorioaren zerrendatzea berreskuratzen..."
+msgstr "Zuzenbide zerrendapena berreskuratzen..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
-#, fuzzy, c-format
+#, c-format
 msgid "Retrieving external IP address from %s"
-msgstr "&Kanpoko IP helbidea:"
+msgstr "Kanpoko IP helbidea berreskuratzen %s-tik"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
-msgstr ""
+msgstr "Erro egiaztagiria ez da fidagarria"
 
-#: resources.h:499
+#: resources.h:516
 msgid "S&how files currently being edited..."
-msgstr ""
+msgstr "&Erakutsi orain editatzen ari diren agiriak..."
+
+#: resources.h:895
+msgid "S&how the Site Manager on startup"
+msgstr "E&rakutsi Gune Kudeatzailea hasterakoan"
 
-#: resources.h:607
+#: resources.h:627
 msgid "S&hutdown system"
-msgstr ""
+msgstr "&Itzali sistema"
 
-#: resources.h:436
-#, fuzzy
+#: resources.h:446
 msgid "S&top"
-msgstr "&Automatikoa"
+msgstr "&Gelditu"
 
-#: resources.h:515
+#: resources.h:532
 msgid "S&ynchronized browsing"
-msgstr ""
+msgstr "Al&dibereturiko bilaketa"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:121
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
-#, fuzzy
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
-msgstr "Ezarpenak"
+msgstr "Gorde ezarpenak?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Sarhitzak gordetzea zure sistema administratzaileak ezgatitua dago."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Sarhitzak gordetzea zeuk ezgatitua dago."
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
-msgstr "Fitxategiak arakatzen ilarara gehitzeko"
+msgstr "Lerrora gehitzeko agiri mihaketa"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
-msgstr "Fitxategiak arakatzen gora kargatzeko"
+msgstr "Igotzeko agiri mihaketa"
 
-#: resources.h:432
-#, fuzzy
+#: resources.h:442
 msgid "Search &conditions:"
-msgstr "Baliogabeko tamaina baldintzan"
+msgstr "Bilatu b&aldintzak:"
 
-#: resources.h:430
-#, fuzzy
+#: resources.h:440
 msgid "Search &directory:"
-msgstr "Sortu direktorioa"
+msgstr "Bilatu z&uzenbidea:"
 
-#: resources.h:994
+#: resources.h:1027
 msgid "Search for files recursively."
-msgstr ""
+msgstr "Bilatu agiriak jarraian."
 
-#: resources.h:539
-#, fuzzy
+#: resources.h:557
 msgid "Search server for files"
-msgstr "Iragazi honako fitxategiak:"
+msgstr "Bilatu zerbitzaria agirientzat"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
-msgstr "Eraikitze-informazioa"
+msgstr "Segurtasun argibideak"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:564
 #: ../../locales/../src/interface/netconfwizard.cpp:577
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
-msgstr ""
+msgstr "Ikusi ere: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
-#, fuzzy
+#: resources.h:384
 msgid "Sele&ct server"
-msgstr "Hautatu Diseinua"
+msgstr "Hautatu &zerbitzaria"
 
-#: resources.h:720
+#: resources.h:746
 msgid "Select &page:"
-msgstr "Hautatu &orria:"
+msgstr "Hautatu &orrialdea:"
 
-#: resources.h:870
+#: resources.h:898
 msgid "Select Theme"
-msgstr "Hautatu Diseinua"
+msgstr "Hautatu Azalgaia"
 
-#: resources.h:830
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
+"Hautatu egiteko berezko ekintza eskualdaketa baten xede agiria jadanik "
+"badago."
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
-msgstr ""
+msgstr "Hautatu berezko editatzailea"
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
 msgid ""
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
+"Hautatu badagoen agiriarentzako berezko ekintza xede agiria jadanik badago. "
+"Hautapen hau oraingo saiorako bakarrik da baliozkoa."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
 msgid ""
 "Select default file exists action only for the currently selected files in "
 "the queue."
 msgstr ""
+"Hautatu badagoen agiriarentzako berezko ekintza orain lerroan hautaturiko "
+"agirientzat."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
-msgstr ""
+msgstr "Hautatu paketearentzako jeisketa kokalekua"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
-msgstr ""
+msgstr "Hautatu giltza pribatua duen agiria"
 
 #: ../../locales/../src/interface/export.cpp:38
-#, fuzzy
 msgid "Select file for exported data"
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Hautatu esportaturiko datuentzako agiria"
 
 #: ../../locales/../src/interface/export.cpp:34
-#, fuzzy
 msgid "Select file for exported queue"
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Hautatu esportaturiko lerroarentzako agiria"
 
 #: ../../locales/../src/interface/export.cpp:36
 msgid "Select file for exported settings"
-msgstr ""
+msgstr "Hautatu esportaturiko ezarpenentzako agiria"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2673
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
-msgstr "Helburuko fitxategia lehendik badago"
+msgstr "Hautatu esporaturiko guneentzako agiria"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
-msgstr ""
+msgstr "Hautatu ezarpenak inportatzeko agiria"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "Fitxategiak arakatzen gora kargatzeko"
+msgstr "Hautatu igotzeko agiria"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
-msgstr ""
+msgstr "Hatutatu bihurturiko giltza-agiriarentzako agirizena"
 
-#: resources.h:420
-#, fuzzy, no-c-format
+#: resources.h:430
+#, no-c-format
 msgid "Select how these files should be opened."
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Hautatu nola ireki behar diren agiri hauek."
 
-#: ../../locales/../src/interface/search.cpp:831
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Hautatu xede jeisketa zuzenbidea"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
-msgstr "Iragazkiaren izena sartu behar da"
+msgstr "Hautatu xede agirizena"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Select the categories to export:"
-msgstr ""
+msgstr "Hautatu esportatzeko kategoriak:"
 
-#: resources.h:281
+#: resources.h:291
 msgid "Select the private data you would like to delete."
-msgstr ""
+msgstr "Hautatu ezabatzea nahi dituzun datu pribatuak."
 
-#: ../../locales/../src/interface/search.cpp:798
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:773
+#, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
-msgstr[0] "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
-msgstr[1] "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
+msgstr[0] "Hautaturik eskualdatzeko %d zuzenbide bere edukiekin."
+msgstr[1] "Hautaturik eskualdatzeko %d zuzenbide bere edukiekin."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:51
-#, fuzzy, c-format
+#, c-format
 msgid "Selected %d directory."
 msgid_plural "Selected %d directories."
-msgstr[0] "Behera kargatu hautatutako fitxategiak eta karpetak"
-msgstr[1] "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr[0] "Hautaturik %d zuzenbide"
+msgstr[1] "Hautaturik %d zuzenbide"
 
-#: ../../locales/../src/interface/search.cpp:796
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:771
+#, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
-msgstr[0] "Behera kargatu hautatutako fitxategiak eta karpetak"
-msgstr[1] "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr[0] "%d agiri hautaturik eskualdatzeko."
+msgstr[1] "%d agiri hautaturik eskualdatzeko."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:58
 #, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d agiri hautaturik. Neurria guztira: %s"
+msgstr[1] "%d agiri hautaturik. Neurria guztira: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:56
 #, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d agiri hautaturik. Neurria guztira: Gutxienez %s"
+msgstr[1] "%d agiri hautaturik. Neurria guztira: Gutxienez %s"
 
-#: ../../locales/../src/interface/search.cpp:803
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:778
+#, c-format
 msgid "Selected %s and %s for transfer."
-msgstr "Gehitu hautatutako fitxategiak eta karpetak transferentzia-ilarara"
+msgstr "%s eta %s hautaturik eskualdaketzeko."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
 msgid "Selected %s and %s. Total size: %s"
-msgstr ""
+msgstr "%s eta %s hautaturik. Neurria guztira: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:66
 #, c-format
 msgid "Selected %s and %s. Total size: At least %s"
-msgstr ""
+msgstr "%s eta %s hautaturik. Neurria guztira: Gutxienez %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
-msgstr "Nahiagoko editorea ezarri behar da."
+msgstr "Hautaturiko editatzailea ez dago."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
-#, fuzzy
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
-msgstr "Helburuko fitxategia lehendik badago"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-#, fuzzy
-msgid "Selected file already opened."
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Hautaturiko agiria jadanik editatzen"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
-#, fuzzy
 msgid "Selected file is already loaded"
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Hautaturiko agiria jadanik gertaturik dago"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
-msgstr ""
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
+msgid "Selected file is already opened"
+msgstr "Hautaturiko agiria jadanik irekita dago"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
+msgid "Selected file is still being edited"
+msgstr "Hautaturiko agiria oraindik editatzen"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr ""
+msgstr "Hautaturiko iragazkiak tokiko agirietan bakarrik egiten du lan."
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
+"Hautaturiko lastermarka orokorrak eta oraingo zerbitzariak zerbitzari mota "
+"ezberdina erabiltzen dute.\n"
+"Erabili gune-bereizi lastermarkak zerbitzari honentzat."
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr ""
+msgstr "Hautaturiko ataka arrunt beste protokolo batek erabiltzen du."
 
-#: resources.h:742
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
-msgstr ""
+msgstr "&Bidali FTP heutsi-bizirik aginduak"
 
-#: resources.h:541
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
-msgstr "Komando pertsonalizatuak zerbitzarira bidali"
+msgstr "Bidali norbere agindua zerbitzariari bestela ez badago eskuragarri"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
-msgstr ""
+msgstr "Heutsi-bizirik agindu bidalketa"
 
-#: resources.h:7 resources.h:31
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
-msgstr ""
+msgstr "Serie zenbakia:"
 
-#: resources.h:81 resources.h:88
-#, fuzzy
+#: resources.h:97
 msgid "Server &Type:"
-msgstr "Zerbitzari-&mota"
+msgstr "Zerbitzari &Mota"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
-msgstr ""
+msgstr "Zerbitzariak ez du egoki itzali TLS elkarketa"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Zerbitzariak ez du ez-ASCII hizki-koderik sostengatzen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr ""
+msgstr "Zerbitzariak ez du > %d GB agirien berrekitea sostengatzen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
+"Zerbitzariak ez du > %d GB agirien berrekitea. Amaitu eskualdaketa agiri "
+"neurria berdindutakoan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
-msgstr ""
+msgstr "Zerbitzariak ez du > 2GB agirien berrekitea sostengatzen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
-msgstr ""
+msgstr "Zerbitzariak ez du > 4GB agirien berrekitea sostengatzen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
+"Zerbitzariak badaiteke > %d GB agirien berrekitea ez sostengatzea. Amaitu "
+"eskualdaketa agiri neurriak berdintzerakoan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
+"Zerbitzariak kontu bat behar izan dezake. Saiatu kontu bat adierazten Gune "
+"Kudeatzailea erabiliz."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:420
+msgid "Server returned empty path."
+msgstr "Zerbitzariak helburu hutsa itzuli du."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
+"Zerbitzariak saio-haste galdera gehigarria bidali du. Elkarrekintza saio-"
+"haste mota erabili behar duzu."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
+"Zerbitzariak erantzun pasiboa bideraezinezko helbidearekin bidali du. Modu "
+"pasibo hutsegitea."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
 msgstr ""
+"Zerbitzariak erantzun pasiboa bideraezinezko helbidearekin bidali du. "
+"Zerbitzariaren helbidea erabiltzen ordez."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:403
 #: ../../locales/../src/interface/netconfwizard.cpp:410
@@ -6221,443 +6381,451 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:510
 #: ../../locales/../src/interface/netconfwizard.cpp:521
 msgid "Server sent unexpected reply."
-msgstr ""
+msgstr "Zerbitzariak ustekabeko erantzuna bidali du."
 
-#: resources.h:350
-#, fuzzy
+#: resources.h:360
 msgid "Server to client MAC:"
-msgstr "Zerbitzaria / Fitxategi lokala"
+msgstr "Zerbitzaria bezero MAC-ra:"
 
-#: resources.h:348
-#, fuzzy
+#: resources.h:358
 msgid "Server to client cipher:"
-msgstr "Zerbitzaria / Fitxategi lokala"
+msgstr "Zerbitzaria bezero zifraketara:"
 
-#: resources.h:379
+#: resources.h:389
 msgid "Server&type:"
-msgstr "Zerbitzari-&mota"
+msgstr "Zerbitzari-&mota:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
-msgstr "Zerbitzaria / Fitxategi lokala"
+msgstr "Zerbitzaria/Tokiko agiria"
 
-#: resources.h:310 resources.h:372
-#, fuzzy
+#: resources.h:320 resources.h:382
 msgid "Server:"
-msgstr "&Zerbitzaria"
+msgstr "Zerbitzaria:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
-msgstr ""
+msgstr "Saio xehetasunak"
 
-#: resources.h:594
+#: resources.h:614
 msgid "Set &Priority"
-msgstr "Ezarri &Lehentasuna"
+msgstr "&Ezarri Lehentasuna"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
-msgstr "Ezarri '%s'-(r)en baimenak '%s'-(r)i"
+msgstr "Ezarri '%s' baimenak '%s'-ra"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
-msgstr ""
+msgstr "Ezarri-Hartune-Oroimen-Neurria deituta hartune gabe"
 
-#: resources.h:719
+#: resources.h:745
 msgid "Settings"
 msgstr "Ezarpenak"
 
-#: resources.h:967
-#, fuzzy
+#: resources.h:999
 msgid "Show &raw directory listing"
-msgstr "Iragazi direktorioen zerrendatzeak"
+msgstr "E&rakutsi zuzenbide zerrendapen irekia"
 
-#: resources.h:550
+#: resources.h:568
 msgid "Show &welcome dialog..."
-msgstr ""
+msgstr "E&rakutsi ongi etorri elkarrizketa..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
-msgstr ""
+msgstr "Erakutsi zuzenbide zuhaitz biak eta jarraitu alderaketa?"
+
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "TLS zifraketa eskuragarriak erakusten ditu"
 
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
-msgstr ""
+msgstr "Laguntza elkarrizketa hau erakusten du"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
-msgstr ""
+msgstr "Itzali orain"
 
-#: resources.h:298
-#, fuzzy
+#: resources.h:308
 msgid "Site &Manager entries"
-msgstr "Gune-kudeatzailea"
+msgstr "Gune &Kudeatzaile sarrerak"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
-msgstr "Gune-kudeatzailea"
+msgstr "Gune Kudeatzailea"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gune Kudeatzailea - Ezinezkoa sarhitza gogoratzea"
+
+#: ../../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
 msgid "Site Manager - Invalid data"
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Gune Kudeatzailea - Datu baliogabea"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
-msgstr "Gune-kudeatzailea lehendik irekia"
+msgstr "Gune Kudeatzailea jadanik irekita"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
-msgstr ""
+msgstr "Gunea ez dago."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
-msgstr ""
+msgstr "Gune helburua 0 edo 1-ekin hasi behar da."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
-msgstr ""
+msgstr "Gune helburua gaizkiosatua da."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
-msgstr ""
+msgstr "Gune-bereizi lastermarkak"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
+"Gune-bereizi lastermarkek zerbitzaria Gune Kudeatzailean biltegiratua izatea "
+"behar du.\n"
+"Gehitu oraingo elkarketa gune kudeatzailera?"
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
-msgstr "Tamaina"
+msgstr "Neurria"
 
-#: resources.h:889
-#, fuzzy
+#: resources.h:917
 msgid "Size formatting"
-msgstr "Eraikitze-informazioa"
+msgstr "Neurriz heuskarritzea"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
-msgstr "Tamaina ezezaguna"
+msgstr "Neurri ezezaguna"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
-#, fuzzy
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
-msgstr "Aldatu fitxategi honen izena"
+msgstr "Jauzi agiria"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
-msgstr "%s behera kargatzea saltatzen"
+msgstr "%s-ren jeisketa jauzten"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
-msgstr "%s gora kargatzea saltatzen"
+msgstr "%s-ren igoera jauzten"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
-msgstr ""
+msgstr "Agiri batzuk oraindik editatzen daude edo eguneratu beharra dute."
 
-#: resources.h:682 resources.h:758
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
+"Bideratzaile baten atzean dauden desitxuraturiko hurruneko zenbait "
+"zerbitzarik, badaiteke beren tokiko IP helbidearekin erantzutea."
 
-#: resources.h:907
+#: resources.h:935
 msgid "Sort directories inline"
-msgstr ""
+msgstr "Antolatu zuzenbideak linean"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
-#, fuzzy
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
-msgstr "Direktorio bat ezin da bere subdirektorio betean sartu."
+msgstr "Antolaketa ordena ezin da aldatu zuzenbide alderaketan."
 
-#: resources.h:903
-#, fuzzy
+#: resources.h:931
 msgid "Sorting"
-msgstr "Ezarpenak"
+msgstr "Antolaketa"
 
-#: resources.h:904
+#: resources.h:932
 msgid "Sorting &mode:"
-msgstr ""
+msgstr "Antolaketa &modua:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
-msgstr ""
+msgstr "Kokapen eragiketako iturbura eta helburua berdinak dira"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 msgid "Source and target file may not be the same"
-msgstr ""
+msgstr "Iturburu eta xede agiria ezin dira berdinak izan"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
-msgstr ""
+msgstr "Kokapen eragiketako iturbura eta xedea berdinak dira"
 
-#: resources.h:49
-#, fuzzy
+#: resources.h:57
 msgid "Source file:"
-msgstr "Iragazki lokalak:"
+msgstr "Iturburu agiria:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
-msgstr ""
+msgstr "Abiadura Mugak"
 
-#: resources.h:803
+#: resources.h:829
 msgid "Speed limits"
-msgstr ""
+msgstr "Abiadura mugak"
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr ""
+msgstr "Abiadura mugak ezgaituta daude, klikatu aldatzeko."
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr ""
+msgstr "Abiadura mugak gaituta daude, klikatu aldatzeko."
 
-#: resources.h:390
-#, fuzzy
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Bertsio egonkorrak eta betak"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Bertsio egonkorrak bakarrik"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
-msgstr "Transferentzia-mota lehenetsia:"
+msgstr "&Hasi eskualdaketak berehala"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
-#, fuzzy
 msgid "Start with opened Site Manager"
-msgstr "Gune-kudeatzailea ireki"
+msgstr "Hasi irekitako Gune Kudeatzailearekin"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
-msgstr "%s behera kargatzen hasten"
+msgstr "%s-ren jeisketa hasiera"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
-msgstr "%s gora kargatzen hasten"
+msgstr "%s-ren igoera hasiera"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
-msgstr ""
+msgstr "Estatua edo herrialdea:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Egoera"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Egoera:"
 
-#: resources.h:591
+#: resources.h:611
 msgid "Stop and remove &all"
-msgstr ""
+msgstr "&Gelditu eta ezabatu denak"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
-msgstr ""
+msgstr "Kalea:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
-msgstr ""
+msgstr "Egiaztagiri gaia"
 
 #: ../../locales/../src/interface/queueview_successful.cpp:12
-#, fuzzy
 msgid "Successful transfers"
-msgstr "Transferentzia-mota lehenetsia:"
+msgstr "Ongi eskualdaturik"
 
-#: resources.h:710
+#: resources.h:736
 msgid "Summary of test results:"
-msgstr ""
+msgstr "Azterketa emaitzen laburpena:"
 
-#: resources.h:458
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
+"Agirietarako sinloturek ez dute eraginik hautapen honekin, simloturak betik "
+"ezabatzen dira."
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../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
 msgid "Synchronized browsing"
-msgstr ""
+msgstr "Bilaketa aldiberetua"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
-msgstr ""
+msgstr "Bilaketa aldiberetua ezgaitua izan da."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
-#, fuzzy
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
-msgstr "Errore kritikoa"
+msgstr "Joskera akatsa"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
-#, fuzzy
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
-msgstr "Errore kritikoa"
+msgstr "Joskera akatsa agindu lerroan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
-msgstr ""
+msgstr "Sistema"
+
+#: resources.h:534
+msgid "T&oolbar"
+msgstr "&Tresnabarra"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
-#, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "TLS/SSL elkarketa ezarrita, HTTP eskabidea bidaltzen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr "Konexioa ezarri da, ongietorri-mezuaren zain..."
+msgstr "TLS/SSL elkarketa ezarrita, ongi etorri mezua itxaroten..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
-msgstr ""
+msgstr "TLS/SSL elkarketa ezarrita"
 
 #: ../../locales/../src/engine/proxy.cpp:445
 msgid "TTL expired"
-msgstr ""
+msgstr "TTL agortuta"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
-msgstr "Helburuko fitxategia lehendik badago"
+msgstr "Xedea agiria jadanik badago"
 
-#: resources.h:53
-#, fuzzy
+#: resources.h:61
 msgid "Target file:"
-msgstr "Urruneko fitxategia"
+msgstr "Xede agiria:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Xedea agiria jadanik badago!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
-msgstr "Helburuko fitxategi-izena lehendik badago, jarraitu?"
+msgstr "Xedea agiria jadanik badago, egitan jarraitu?"
 
-#: resources.h:709
+#: resources.h:735
 msgid "Test results"
-msgstr ""
+msgstr "Azterketa emaitzak"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
-msgstr ""
+msgstr "Aztertu zerbitzariaren berrekite gaitasunak"
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"Gune-kudeatzailea lehendik dago irekita.\n"
-"Jarraitu nahi duzu? Egindako aldaketak ez dira gordeko."
+"Gune Kudeatzailea FileZilla 3-ren beste eskabide batean irekita dago.\n"
+"Jarraitzea nahi duzu? Gune Kudeatzailean eginiko aldaketak ez dira gordeko."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
-#, fuzzy
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
-"Gune-kudeatzailea lehendik dago irekita.\n"
-"Jarraitu nahi duzu? Egindako aldaketak ez dira gordeko."
+"Gune Kudeatzailea FileZilla 3-ren beste eskabide batean irekita dago.\n"
+"Mesedez itxi hura edo datuak ezin izango dira ezabatu."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
-msgstr ""
+msgstr "XML agiria ez dago ongi-osatua: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:618
 #, c-format
 msgid "The address you entered was: %s"
-msgstr ""
+msgstr "Sartu duzun helbidea zen: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
-msgstr ""
+msgstr "Ezin da lastermarka gehitu."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "Ezin dira lastermarkak garbitu."
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr ""
+msgstr "Elkarketa enkriptaturik dago. Klikatu ikurra xehetasunetarako."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
-msgstr ""
+msgstr "Norbere saio-haste sekuentzia ezin da hutsik egon."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
-#, fuzzy, no-c-format
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
+#, no-c-format
 msgid "The default editor for text files could not be found."
-msgstr "Nahiagoko editorea ezarri behar da."
+msgstr "Idazki agirientzako berezko editatzailea ezin da aurkitu."
 
-#: resources.h:422
-#, fuzzy, c-format
+#: resources.h:432
+#, c-format
 msgid "The default editor for text files is '%s'."
-msgstr "Nahiagoko editorea ezarri behar da."
+msgstr "Idazki agirientzako berezko editatzailea '%s' da."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#, fuzzy
-msgid "The entered filter name already exists."
-msgstr "Iragazki-izena lehendik badago"
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr ""
+"Sartutako iragazki izena jadanik badago, mesedez hautatu beste izen bat."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
-msgstr "'%s' luzapena lehendik dago zerrendan"
+msgstr "'%s' luzapena jadanik badago zerrendan"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:246
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:253
@@ -6666,45 +6834,52 @@
 "The file %s already exists.\n"
 "Please enter a new name:"
 msgstr ""
-"%s fitxategia lehendik dago.\n"
-"Sartu izen berri bat:"
+"%s agiria jadanik badago.\n"
+"Mesedez sartu izen berri bat:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Elkarturiko programa (%s) ezin izan da aurkitu.\n"
+"Mesedez egiaztatu zure agirimota elkarketak."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr ""
+msgstr "'%s' agiria ezin da gertatu edo ez du giltza pribatu bat."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
-#, fuzzy, c-format
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#, c-format
 msgid "The file '%s' could not be loaded."
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "'%s' agiria ezin da gertatu."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Ez da programarik elkartu zure sisteman agiri mota honentzat."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
+"'%s' agiria ezin da ireki:\n"
+"Elkarturiko agindu hutsegitea"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
 #, c-format
@@ -6714,6 +6889,10 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
+"'%s' agiria ez da FileZillak sostengatzen duen heuskarri batekoa.\n"
+"Agiri hau sarhitzez babestua ere badago. Sarhitzez babesturiko giltzagiriak "
+"oraindik ez daude sostengaturik FileZillan.\n"
+"Nahi duzu heuskarri sostengatu, babesgabe batera bihurtzea?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
 #, c-format
@@ -6721,6 +6900,8 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
+"'%s' agiria ez da FileZillak sostengatzen duen heuskarri batekoa.\n"
+"Heuskarri sostengatu batera bihurtzea nahi duzu?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
 #, c-format
@@ -6729,12 +6910,15 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
+"'%s' sarhitzez babestua dago. Sarhitzez babesturiko giltza-agiriak ez daude "
+"sostengaturik FileZillan.\n"
+"Nahi duzu babestu gabeko agiri batera bihurtzea?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
-msgstr ""
+msgstr "Berezko editatzaile bezala hautaturiko agiria ez dago."
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6742,48 +6926,54 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
+"Hautatu duzun agiriak FileZillaren aurreko bertsio baten gune kudeatzaile "
+"datuak ditu.\n"
+"Biltegiratze heuskarrian dagoen ezberdintasunagaitik, hostalaria, ataka, "
+"erabiltzaile-izena eta sarhitza bakarrik inportatuko dira.\n"
+"Jarraitu inportazioarekin?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr ""
+msgstr "Agirizen zutabea ezin da ez ezkutatu ez mugitu."
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
-msgstr ""
+msgstr "Agirizen zutabea ezin da ezkutatu."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
-msgstr ""
+msgstr "Hurrengo hizkiak ordeztuko dira: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
-msgstr ""
+msgstr "Hurrengo hizkiak ordeztu egingo dira: %s"
 
-#: resources.h:327
-#, fuzzy
+#: resources.h:337
 msgid "The following files are currently being edited:"
-msgstr "Honako fitxategi-motak Ascii fitxategien eran erabili:"
+msgstr "Hurrengo agiriak orain editatzen ari dira:"
 
-#: resources.h:462
+#: resources.h:472
 msgid "The free open source FTP solution"
-msgstr ""
+msgstr "Iturburu irekiko FTP konponbide askea"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
-msgstr ""
+msgstr "Lastermarka orokorrak ezin dira gorde."
 
-#: resources.h:965
+#: resources.h:997
 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 ""
+"Garbiketa maila handiena, argibide gehiago erakutsiko da mezu oharrean. "
+"Garbiketa argibideak ezgaitzeak eragin kaltegarria du egintzan."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr ""
+msgstr "Muga 1 eta 2000 MiB artekoa izan behar da"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6791,208 +6981,231 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
+"'%s' tokiko zuzenbidea ez dago aldiberetze erroaren (%s) azpian.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu tokiko zuzenbidea aldatzen?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
 msgid ""
 "The lowest available port has to be less or equal than the highest available "
 "port."
-msgstr "Ataka erabilgarri txikienak ezin du handiena gainditu."
+msgstr ""
+"Ataka eskuragarri apalena ataka eskuragarri handienaren berdina edo "
+"txikiagoa izan behar da."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 ""
+"Bertsio berriena jeitsi da. Klikatu Amaitu FileZilla isteko eta ezarpena "
+"hasteko."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 ""
+"Bertsio berriena jeitsi da. Mesedez ezarri bertsio hau ezarri zenuen modu "
+"berean."
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
-msgstr "Ezin da \"%s\" idatzi, ilara ezin da gorde"
+msgstr "Lerroa ez da gordeko."
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1086
 #, 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' hurruneko zuzenbidea ez dago aldiberetze erroaren (%s) azpian.\n"
+"Ezgaitu bilaketa aldiberetua eta jarraitu hurruneko zuzenbidea aldatzen?"
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
-msgstr ""
+msgstr "Hatutaturiko kategoriak inportatuak izan dira."
 
-#: resources.h:297
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
-msgstr ""
+msgstr "Hatutaturiko agiriak datu inportagarriak ditu hurrengo kategorientzat:"
 
-#: resources.h:320
-#, fuzzy
+#: resources.h:330
 msgid "The selected file is already being edited:"
-msgstr "Helburuko fitxategia lehendik badago"
+msgstr "Hautaturiko agiria jadanik editatzen hasita dago:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
+"Hatutaturiko agiria oraindik beste programaren batean irekita dago, mesedez "
+"itxi hura."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
+"Hautaturiko agiria zuzenean exekutatu daiteke.\n"
+"Hau arriskutsua izan daiteke eta zure sistema kaltetu dezake.\n"
+"Egitan nahi duzu jarraitzea?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "Zerbitzaria ezin da gehitu."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
 msgid "The server sent an unexpected or unrecognized reply."
-msgstr ""
+msgstr "Zerbitzariak ustekabeko edo ezagungabeko erantzun bat bidali du."
 
-#: resources.h:105
-#, fuzzy
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
-msgstr ""
-"Zerbitzariak honako karaktere-multzo kodeketa \n"
-"erabiltzen du fitxategi-izenentzat:"
+msgstr "Zerbitzariak hurrengo hizki-kodeaketa erabiltzen du agirizenentzat:"
 
 #: resources.h:2
 msgid ""
 "The server's certificate is unknown. Please carefully examine the "
 "certificate to make sure the server can be trusted."
 msgstr ""
+"Zerbitzariaren egiaztagiria ezezaguna da. Mesedez aztertu kontu handiz "
+"egiaztagiria zerbitzaria fidagarria izan daitekeelaz zihurtatzeko."
 
-#: resources.h:186
-#, fuzzy
+#: resources.h:196
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
-"Zerbitzariaren gakoa eta erregistratutakoa ez datoz bat. Administratzaileak "
-"gakoa aldatu du, edo zerbitzariz nahasi zara agian. \n"
-"Ez badu gakoa onartzen, zerbitzariaren administratzailearekin harremanetan "
-"jarri zaitez."
+"Zerbitzariaren hostalari giltza ez dator bat katxeatu den giltzarekin. Honek "
+"esanahi du administratzaileak hostalari giltza aldatu duela, edo beste "
+"ordenagailu batera elkarketatzen saiatzen ari zarela zerbitzaria izateko "
+"asmoekin."
 
-#: resources.h:174
-#, fuzzy
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
-"Zerbitzariaren gakoa ez dago erregistraturik. Zerbitzari hau zuk uste duzuna "
-"denik ezin bermatu."
+"Zerbitzariaren hostalari giltza ezezaguna da. Ez duzu zerbitzaria uste duzun "
+"ordenagailua delaren bermerik."
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
+"Ezarpenak inportatu dira. FileZilla berrabiarazi behar duzu ezarpen guztiek "
+"eragina izan dezaten."
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
-msgstr ""
+msgstr "Sistema laister berrabiaraziko da Ezeztatu klikatzen ez baduzu."
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
-msgstr ""
+msgstr "Sistema laister itzaliko da Ezeztatu klikatzen ez baduzu."
 
-#: resources.h:48
-#, fuzzy
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
-"%s fitxategia lehendik dago.\n"
-"Sartu izen berri bat:"
+"Xede agiria jadanik badago.\n"
+"Mesedez hautatu ekintza bat."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
-msgstr ""
+msgstr "Azterketa ez da burutu. Egitan nahi duzu ezarpenak gordetzea?"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
-msgstr "Diseinua"
+msgstr "Azalgaiak"
 
-#: ../../locales/../src/interface/filter.cpp:447
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
-msgstr ""
+msgstr "Iragazki ezarpen hau ezin da kendu."
 
-#: ../../locales/../src/interface/filter.cpp:382
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
-msgstr ""
+msgstr "Iragazki ezarpen hau ezin da berrizendatu."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:575
 msgid ""
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
 msgstr ""
+"Honek esanahi du bideratzaile eta/edo suhesiren bat oraindik FileZilla "
+"eragozten ari dela."
 
-#: resources.h:687
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
+"Honek bideratzaile baten atzean bazaude bakarrik egiten du lan, zure "
+"sistemak ere zure barneko helbidea itzuli dezake."
 
-#: resources.h:665
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
+"Laguntzaile honek dituzun bideratzaile eta suhesiak egoki itxuratzen eta "
+"zure itxurapena aztertzen lagunduko dizu."
 
-#: resources.h:883
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Ordua"
+
+#: resources.h:911
 msgid "Time formatting"
-msgstr "Eraikitze-informazioa"
+msgstr "Ordu heuskarria"
 
-#: resources.h:726
+#: resources.h:752
 msgid "Time&out in seconds:"
-msgstr ""
+msgstr "&Denbora-epea segundutan:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
-#, fuzzy
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
-msgstr "Ordua"
+msgstr "Denbora-epea"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr ""
+"Ordueremu orekak: Zerbitzaria: %d segundu. Tokikoa: %d segundu. Aldea: %d "
+"segundu."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
-msgstr "Fitxategia"
+msgstr "Izenburua"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
+"Zuzenbideak alderatzeko, bi agiri zerrendak lerrokaturik egon behar dira."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
+"Hau egiteko, zuzenbide zuhaitzak bietan agerian edo bietan ezkutuan egon "
+"behar dira."
 
-#: resources.h:780
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
+"Giltza publiko egiaztapena sostengatzeko, FileZillak erabiltzeko giltza "
+"pribatuak jakin behar ditu."
 
-#: resources.h:990
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7001,208 +7214,204 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
+"Aldatu zuzenbide alderaketa. Eskuin-klikatu alderaketa modua aldatzeko.\n"
+"\n"
+"Margoak:\n"
+"Oria: Agiria alde bakarrean dago\n"
+"Orlegia: Agiria beste aldeko markatu gabeko agiria baino berriagoa da\n"
+"Gorria: Agiri neurri ezberdinak"
 
-#: resources.h:992
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
+"Aldatu bilaketa aldiberetua.\n"
+"Gaituta badago, tokiko zuzenbide hierarkian nabigatzeak zerbitzariko "
+"zuzenbidea ere ondorioz aldatzen du eta alderantziz."
 
-#: resources.h:980 resources.h:981
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
-msgstr "Transferentzia-ilararen prozesaketa aktibatu/desaktibatu"
+msgstr "Eskualdaketa lerroaren prozesapena aldatzen du"
 
-#: resources.h:972 resources.h:973
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
-msgstr "Direktorio-zuhaitz lokalaren bistaratzea aktibatu/desaktibatu"
+msgstr "Tokiko zuzenbide zuhaitz erakuspena aldatzen du"
 
-#: resources.h:970 resources.h:971
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
-msgstr "Mezu-logaren bistaratzea aktibatu/desaktibatu"
+msgstr "Mezu oharraren erakuspena aldatzen du"
 
-#: resources.h:974 resources.h:975
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
-msgstr "Urruneko direktorio-zuhaitzaren bistaratzea aktibatu/desaktibatu"
+msgstr "Hurruneko zuzenbide zuhaitz erakuspena aldatzen du"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
-msgstr "Transferentzia-ilararen bistaratzea aktibatu/desaktibatu"
+msgstr "Eskualdaketa lerroaren erakuspena aldatzen du"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:605
 msgid "Too long header line"
-msgstr ""
+msgstr "Idazburu lerro luzeegia"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:666
 msgid "Too many redirects"
-msgstr ""
+msgstr "Berbideratze gehiegi"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Aztarna:"
 
-#: resources.h:913 resources.h:919
-#, fuzzy
+#: resources.h:941 resources.h:947
 msgid "Transfer"
-msgstr "&Transferitu"
+msgstr "Eskualdaketa"
 
-#: resources.h:360
-#, fuzzy
+#: resources.h:370
 msgid "Transfer &direction"
-msgstr "Transferentzia-ezarpenak"
+msgstr "Eskualdaketa &norabidea"
 
-#: resources.h:525
-#, fuzzy
+#: resources.h:543
 msgid "Transfer &type"
-msgstr "Transferentzia-modua"
+msgstr "Eskualdaketa &mota"
 
-#: resources.h:736
+#: resources.h:762
 msgid "Transfer Mode"
-msgstr "Transferentzia-modua"
+msgstr "Eskualdaketa Modua"
 
-#: resources.h:869
-#, fuzzy
+#: resources.h:897
 msgid "Transfer Queue"
-msgstr "Fitxategi-trasnferentzia arrakastatsua"
+msgstr "Eskualdaketa Lerroa"
 
-#: resources.h:97
-#, fuzzy
+#: resources.h:106
 msgid "Transfer Settings"
-msgstr "Transferentzia-ezarpenak"
+msgstr "Eskualdaketa Ezarpenak"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
+#, c-format
 msgid "Transfer connection interrupted: %s"
-msgstr "Konexio-saioa eten du erabiltzaileak"
+msgstr "Eskualdaketa elkarketa etenda: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
-msgstr ""
+msgstr "Eskualdaturiko datuak kutsatua."
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
-msgstr "Transferitzen"
+msgstr "Eskualdatzen"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:123
-#, fuzzy
 msgid "Transfers"
-msgstr "Transferitzen"
+msgstr "Eskualdaketak"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
-msgstr "Transferentzia-ezarpenak"
+msgstr "Eskualdaketak amaituta"
 
-#: resources.h:827
-#, fuzzy
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
-msgstr "Erabili luzapenik &gabeko fitxategiak Ascii fitxategien eran"
+msgstr "&Tratatu luzapen gabeko agiriak ASCII agiri bezala"
 
-#: resources.h:823
-#, fuzzy
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "Honako fitxategi-motak Ascii fitxategien eran erabili:"
-
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
-msgstr ""
+msgstr "Tratatu &hurrengo agirimotak ASCII agiri bezala:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
-msgstr ""
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
+msgid "Trust changed Hostkey:"
+msgstr "Sinetsi aldaturiko Hostalari-giltza:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
+msgid "Trust new Hostkey:"
+msgstr "Sinetsi Hostalari-giltza berria:"
 
-#: resources.h:193
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
-msgstr "Gako berriari fidagarritasuna eman eta konexioarekin jarraitu?"
+msgstr "Sinetsi hostalari-giltza berria eta elkarketa burutu?"
 
-#: resources.h:22
-#, fuzzy
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
-msgstr ""
-"Ostalari edo gune honi fidagarritasuna eman eta konexioarekin jarraitu?"
+msgstr "Sinetsi egiaztagiri hau eta elkarketa burutu?"
 
-#: resources.h:180
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
-msgstr ""
-"Ostalari edo gune honi fidagarritasuna eman eta konexioarekin jarraitu?"
+msgstr "Sinetsi hostalari hau eta elkarketa burutu?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
-msgstr ""
+msgstr "Mota"
 
-#: resources.h:762
+#: resources.h:788
 msgid "Type of FTP Proxy:"
-msgstr ""
+msgstr "FTP Proxy mota:"
 
-#: resources.h:787
+#: resources.h:813
 msgid "Type of generic proxy:"
-msgstr ""
+msgstr "Proxy generiko mota:"
 
-#: resources.h:330
-#, fuzzy
+#: resources.h:340
 msgid "U&pload"
-msgstr "&Gora kargatu"
+msgstr "&Igo"
 
-#: resources.h:483 resources.h:807
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
-msgstr ""
+msgstr "Igoera m&uga:"
 
-#: resources.h:931
+#: resources.h:959
 msgid "U&se filetype associations if available"
-msgstr ""
+msgstr "Erabili agiri&mota elkarketak eskuragarri badaude"
 
-#: resources.h:884
+#: resources.h:912
 msgid "U&se system defaults"
-msgstr ""
+msgstr "E&rabili sistemaren berezkoak"
 
-#: resources.h:764
+#: resources.h:790
 msgid "USER@&HOST"
-msgstr ""
+msgstr "E&RABILTZAILEA@HOSTALARIA"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
-msgstr ""
+msgstr "Esleitu gabeko akats kodea %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
-#, fuzzy
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
-msgstr "Unix"
+msgstr "Unitatea:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
-msgstr "Tamaina ezezaguna"
+msgstr "Ezezaguna"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
-msgstr ""
+msgstr "FTP proxy mota ezezaguna, ezinezkoa saio-haste sekuentzia sortzea."
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr ""
+msgstr "SOCKS protokolo bertsio ezezaguna: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
-msgstr ""
+msgstr "Egiaztagiri ezezaguna"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
+"Akats ezezaguna agiria irekitzerakoan. Zihurtatu agiriak sarbidea duela eta "
+"ongi-osaturiko XML agiria dela."
 
-#: resources.h:173
+#: resources.h:183
 msgid "Unknown host key"
-msgstr "Ostalari edo gunearen gako ezezaguna"
+msgstr "Hostalari giltza ezezaguna"
 
 #: ../../locales/../src/engine/proxy.cpp:378
 #, c-format
@@ -7210,11 +7419,13 @@
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
 msgstr ""
+"SOCKS Erabiltzaile-izen/Sarhitz Egiaztapen azpinegoziaketa protokolo bertsio "
+"ezezaguna: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
-msgstr ""
+msgstr "Erro elementu ezezaguna, agiriak ez dirudi FileZillak sortua denik."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:596
 #: ../../locales/../src/interface/netconfwizard.cpp:607
@@ -7222,252 +7433,246 @@
 "Unless these problems get fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
+"Arazo hauek zuzendu arte, FTP modu aktiboak ez du lanik egingo eta modu "
+"pasiboa erabiliko da."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:583
 msgid ""
 "Unless this problem gets fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
+"Arazo hau zuzendu arte, FTP modu aktiboak ez du lanik egingo eta modu "
+"pasiboa erabiliko da."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
-msgstr ""
+msgstr "Egiaztagiri mota sostengatu gabea"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:650
 msgid "Unsupported redirect"
-msgstr ""
+msgstr "Sostengatu gabeko berzuzentzea"
 
-#: resources.h:331
+#: resources.h:341
 msgid "Up&load and unedit"
-msgstr ""
-
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr ""
+msgstr "&Igo eta deseditatu"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
-msgstr ""
+msgstr "Eguneraketa laguntzailea"
 
-#: resources.h:362
-#, fuzzy
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Eguneraketak"
+
+#: resources.h:372
 msgid "Upload"
-msgstr "&Igo"
+msgstr "Igo"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
-msgstr "&Gora kargatu"
+msgstr "Igoera hutsegitea"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
 msgid "Upload limit: %s/s"
-msgstr "&Behera kargatu"
+msgstr "Igoera muga: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
-msgstr "&Behera kargatu"
+msgstr "Igoera muga: ezer ez"
 
-#: resources.h:642
-#, fuzzy
+#: resources.h:668
 msgid "Upload selected directory"
-msgstr "Behera kargatu hautatutako fitxategiak eta karpetak"
+msgstr "Igo hautaturiko zuzenbidea"
 
-#: resources.h:556
-#, fuzzy
+#: resources.h:574
 msgid "Upload selected files and directories"
-msgstr "Gora kargatu hautatutako fitxategi eta karpetak"
+msgstr "Igo hautaturiko agiriak eta zuzenbideak"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file back to the server?"
-msgstr ""
+msgstr "Igo agiri hau atzera zerbitzarira?"
 
-#: resources.h:314
+#: resources.h:324
 msgid "Upload this file to the server?"
-msgstr ""
+msgstr "Igo agiri hau zerbitzarira?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
-msgstr "&Gora kargatu"
+msgstr "Eguneraketa"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
-msgstr ""
+msgstr "Igotzen eta kentzeko zain"
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
-msgstr ""
+msgstr "Igotzen eta deseditatzen"
 
-#: resources.h:109
+#: resources.h:118
 msgid "Use &custom charset"
-msgstr "Erabili karaktere-multzo &pertsonalizatua"
+msgstr "Erabili &norbere hizki-kodea"
 
-#: resources.h:928
-#, fuzzy
+#: resources.h:956
 msgid "Use &custom editor:"
-msgstr "Erabili karaktere-multzo &pertsonalizatua"
+msgstr "Erabili &norbere editatzailea:"
 
-#: resources.h:421
-#, fuzzy
+#: resources.h:431
 msgid "Use &default editor for text files"
-msgstr "Nahiagoko editorea ezarri behar da."
+msgstr "Erabili &idazki agirientzako berezko editatzailea"
 
-#: resources.h:404 resources.h:410
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
-msgstr ""
+msgstr "&Erabili aldibereturiko bilaketa"
 
-#: resources.h:107
-#, fuzzy
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
-"UTF-8 erabiltzen du zerbitzariak onartzen badu,\n"
-"karaktere-multzo lokala bestela."
+"Erabili UTF-8 zerbitzariak sostengatzen badu, erabili ere tokiko hizki-kodea."
 
-#: resources.h:257 resources.h:267
-#, fuzzy
+#: resources.h:267 resources.h:277
 msgid "Use default action"
-msgstr "L&ehenetsia"
+msgstr "Erabili berezko ekintza"
 
-#: resources.h:370
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Erabili FTP laua"
+
+#: resources.h:380
 msgid "Use server currently connected to"
-msgstr "Uneko konexioa eten?"
+msgstr "Erabili orain elkarketaturik dagoen zerbitzaria"
 
-#: resources.h:371
-#, fuzzy
+#: resources.h:381
 msgid "Use server from site manager"
-msgstr "Gune-kudeatzailea irekitzen du"
+msgstr "Erabili gune kudeatziletiko zerbitzaria"
 
-#: resources.h:878
+#: resources.h:906
 msgid "Use system &defaults"
-msgstr ""
+msgstr "Erabili &sistemaren berezkoak"
 
-#: resources.h:688
-#, fuzzy
+#: resources.h:714
 msgid "Use the following IP address:"
-msgstr "honako fitxategiarekin?"
+msgstr "Erabili hurrengo IP helbideak:"
 
-#: resources.h:698
-#, fuzzy
+#: resources.h:724
 msgid "Use the following port range:"
-msgstr "honako fitxategiarekin?"
+msgstr "Erabili hurrengo ataka maila:"
 
-#: resources.h:683
+#: resources.h:709
 msgid "Use the server's external IP address instead"
-msgstr ""
+msgstr "Erabili zerbitzariaren kanpoko IP helbidea ordez"
 
-#: resources.h:689 resources.h:752
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
+"Erabili hau bideratzaile baten atzean bazaude eta kanpoko IP helbide "
+"aldagaitz bat baduzu."
 
-#: resources.h:692
+#: resources.h:718
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
+"Erabili aukera hau IP helbide aldakor bat baduzu. FileZilla gaineko "
+"zerbitzariarekin harremanduko da saio bakoitzean modu aktiboa lehen aldiz "
+"erabiltzen duzun bezain laister. Zu erabiltzen ari zaren FileZilla bertsioa "
+"bakarrik aurkezten da zerbitzarira."
 
-#: resources.h:121
+#: resources.h:130
 msgid "User:"
 msgstr "Erabiltzailea:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
-msgstr ""
+msgstr "Erabiltzaile-izena ezin da hutsarte jarraiak izan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
-msgstr ""
+msgstr "%s proxya erabiltzen"
 
-#: resources.h:111
-#, fuzzy
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
-"Karaktere-multzo okerra erabiliz gero fitxategi-izenak\n"
-"ez dira ongi bistaratuko."
+"Hizki-kode okerra erabiltzeak agirizenak egoki ez erakustea eragin dezake."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
+"Laguntzaile hau erabiliz FileZilla-rentzat eguneraketa eskuragarririk dagoen "
+"egiaztatu dezakezu."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
-msgstr ""
+msgstr "Baliogarria hemendik:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
-msgstr ""
+msgstr "Baliagarria hona:"
 
 #: ../../locales/../src/interface/cmdline.cpp:16
 msgid "Verbose log messages from wxWidgets"
-msgstr ""
+msgstr "Ohar mezu berritsuak wxWidgets-tik"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
-msgstr ""
+msgstr "Egiaztagiria egiaztatzen..."
 
-#: resources.h:168
-#, fuzzy
+#: resources.h:178
 msgid "Version:"
-msgstr "%s &bertsioa"
+msgstr "Bertsioa:"
 
-#: resources.h:812
+#: resources.h:838
 msgid "Very high"
-msgstr ""
+msgstr "Oso handia"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
+"Ikusi ezkutuko aukera ezarpena, baina sostengatu gabea zerbitzariaren aldetik"
 
-#: resources.h:915
-#, fuzzy
+#: resources.h:943
 msgid "View/Edit"
-msgstr "&Ikusi / Editatu"
+msgstr "Ikusi/Editatu"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Visible columns"
-msgstr ""
+msgstr "Zutabe ikusgarriak"
 
-#: resources.h:139
+#: resources.h:148
 msgid "W&rite"
-msgstr "I&datzi"
+msgstr "&Idatzi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Itxaroten"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
-msgstr ""
+msgstr "Bilatzaile elkarketari itxaroten"
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
-msgstr "Eskatu pasahitza"
+msgstr "Sarhitza itxaroten"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
-#, fuzzy
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
-msgstr "Transferentzia bertan behera uzteko zain"
+msgstr "Eskualdaketari itxaroten ezeztatzeko"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
-#, fuzzy
 msgid "Waiting to retry..."
-msgstr "'%s' direktorioa sortzen..."
+msgstr "Bersaiatzeko itxaroten..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7483,12 +7688,24 @@
 "service,\n"
 "FileZilla will timeout on big transfers."
 msgstr ""
+"Kontuz!\n"
+"\n"
+"Windows-eko akats batek arazoak sortzen ditu FileZilla-rekin\n"
+"\n"
+"Akatsa gertatzen da baduzu\n"
+"- Windows Server 2003 edo XP 64\n"
+"- Windows Suhesia gaituta\n"
+"- Aplikazio Geruza Atebidea zerbitzua gaituta\n"
+"Ikusi http://support.microsoft.com/kb/931130 aurreko argibideetarako.\n"
+"\n"
+"Windows Suhesia edo Aplikazio Geruza Atebide zerbitzua ezgaitzen ez baduzu,\n"
+"FileZilla denboraz kanpo geldituko da eskualdaketa handietan."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr ""
+msgstr "Kontuz, IP okerretiko datu elkarketa ezikusten."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7496,246 +7713,297 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
+"Kontuz, erabili gau eraiketak zeure arriskupean.\n"
+"Ez da sostengurik ematen gau eraiketentzat.\n"
+"Gau eraiketek baditeke ez lan egitea itxaroten den bezala eta zure sistema "
+"kaltetu dezakete.\n"
+"\n"
+"Egitan nahi duzu gau eraiketarik dagoen egiaztatzea?"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Warning: Potential security breach!"
-msgstr "Abisua: Segurtasun-arazo posiblea!"
+msgstr "Kontuz: Ahalezko segurtasun haustura!"
 
-#: resources.h:474
-#, fuzzy
+#: resources.h:484
 msgid "Welcome to FileZilla"
-msgstr "Itxi FileZilla"
+msgstr "Ongi etorri FileZillara"
 
-#: resources.h:463
+#: resources.h:473
 msgid "What's new"
-msgstr ""
+msgstr "Zer berri"
 
-#: resources.h:240
+#: resources.h:250
 msgid "What's new:"
+msgstr "Zer berri:"
+
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
 msgstr ""
+"FileZillari sarhitzak gogoratzea ahalbidetutakoan, FileZilla berrabiarazi "
+"ondoren sarhitza ber-sartu behar izan gabe elkarketatu zaitezke."
 
-#: resources.h:815
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
+"Gaituta dagoenean, tokiko sistema eragileak agirizenean sostengatzen ez "
+"dituen hizkiak ordeztu egiten dira agiri bat bezala jeisten bada."
 
-#: resources.h:857
+#: resources.h:883
 msgid "Widescreen"
-msgstr ""
+msgstr "Ikusleiho-zabala"
 
-#: resources.h:143
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "FileZillak sarhitzak gogoratzea nahi duzu?"
+
+#: resources.h:152
 msgid "Wr&ite"
-msgstr "Id&atzi"
+msgstr "&Idatzi"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:433
 #: ../../locales/../src/interface/netconfwizard.cpp:440
-#, fuzzy
 msgid "Wrong external IP address"
-msgstr "&Kanpoko IP helbidea:"
+msgstr "Kanpoko IP helbide okerra"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 msgid "Wrong line endings"
-msgstr ""
+msgstr "Lerro amaiera okerrak"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
+msgstr "Bai"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
 msgstr ""
+"Ematen dut IPv6-bakarrik hostalaria erabiltzen ari zarela. Laguntzaile honek "
+"ez du inguru hau sostengatzen."
 
-#: resources.h:251
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
+"Jadanik FileZilla bertsio berriena erabiltzen ari zara. Mesedez egiaztatu "
+"berriro etorkitzunean."
 
-#: resources.h:472
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
-msgstr ""
+msgstr "Betik ireki dezakezu elkarrizketa hau berriro laguntza menutik"
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
-msgstr ""
+msgstr "Ataka eremua hutsik utzi behar duzu berezko ataka erabiltzeko."
 
-#: resources.h:146
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
 msgstr ""
-"Jatorrizko fitxategien baimenak ezartzeko x hizkia erabili, nahi duzun "
-"posizioan kokatuz."
+"x bat erabili dezakezu edozein tokitan jatorrizko agiriek duten baimenei "
+"heusteko."
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr ""
+"Ezin dituzu FileZilla-ren jabetzako ezarpenen zuzenbidetik ezarpenak "
+"inportatu."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
 msgid ""
 "You cannot replace an invalid character with another invalid character. "
 "Please enter a character that is allowed in filenames."
 msgstr ""
+"Ezin duzu hizki baliogabe bat beste hizki baliogabe batekin ordeztu. Mesedez "
+"sartu agirizenetan ahalbideturik dagoen hizki bat."
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
-msgstr ""
-"Ez duzu fitxategiarentzat izen berririk sartu. Fitxategia gainean idatzi?"
+msgstr "Ez duzu izen berri bat sartu agiriarentzat. Gainidatzi agiria ordez?"
 
-#: resources.h:453
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
-msgstr ""
+msgstr "Gutxienez lotura sinboliko bat duzu hautaturik."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
+"10 agiri baino gehiago dituzu hautaturik editatzeko, egitan nahi duzu "
+"jarraitzea?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
+"10 agiri edo zuzenbide baino gehiago dituzu hautaturik irekitzeko, egitan "
+"nahi duzu jarraitzea?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Hostalari-izen bat sartu behar duzu."
 
-#: ../../locales/../src/interface/search.cpp:843
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Tokiko zuzenbidea bat sartu behar duzu."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:149
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
-msgstr ""
+msgstr "Baliozko IP helbide bat sartu behar duzu."
 
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "You have to enter a writable local directory."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
-msgstr ""
+msgstr "Kontu izen bat sartu behar duzu"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
-msgstr ""
+msgstr "Erabiltzaile izen bat adierazi behar duzu"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
 msgid ""
 "You likely have a router or firewall which erroneously modified the "
 "transferred data."
 msgstr ""
+"Eskualdaturiko datuak erruz aldatzen dituen bideratzaile edo suhesi bat "
+"duzula dirudi."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Izen bat sartu behar duzu lastermarkarentzat."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
-#, fuzzy
 msgid "You need to enter a name for the log file."
-msgstr "Sartu pasahitz bat zerbitzari honetarako:"
+msgstr "Izen bat sartu behar duzu ohar agiriarentzat."
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Ongi aipaturiko agindua sartu behar duzu."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
-#, fuzzy
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Proxy hostalari bat sartu behar duzu."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
-#, fuzzy
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Proxy ataka bat sartu behar duzu 1 eta 65535 arteko mailan"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
+"Gutxienez helburu bat sartu behar duzu, lastermarka hutsak ez daude "
+"sostengaturik."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
+"Biak sartu behar dituzu Tokiko eta hurruneko helburua lastermarka honentzako "
+"bilaketa aldiberetua gaitzeko."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
 msgstr ""
+"Biak tokiko eta hurruneko helburua sartu behar dituzu gune honetarako "
+"bilaketa aldiberetua gaitzeko."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
-msgstr "Karaktere-kodeketa bat zehaztu behar da"
+msgstr "Tokiko agiri bat adierazi behar duzu."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
-msgstr "Karaktere-kodeketa bat zehaztu behar da"
+msgstr "Hurruneko agiri bat adierazi behar duzu."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
-msgstr "Ostalaria edo gunea sartu mesedez."
+msgstr "Hurruneko helburu bat adierazi behar duzu."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
-msgstr "Ezin da zerbitzariarekin konektatu"
+msgstr "Zerbitzari bat adierazi behar duzu."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:568
 msgid ""
 "You should have no problems connecting to other servers, file transfers "
 "should work properly."
 msgstr ""
+"Ez duzu arazorik izan behar beste zerbitzari batzuetara elkarketatzeko, "
+"agiri eskualdaketak ongi lan egin behar du."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
+msgid "after"
+msgstr "ondoren"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "before"
+msgstr "aurretik"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
-msgstr ""
+msgstr "honekin hasten da"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
-msgstr "badago"
+msgstr "du"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
-msgstr ""
+msgstr "ez du"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
+msgid "does not equal"
+msgstr "ez da berdina"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
-msgstr "Konpiladorea:"
+msgstr "honekin amaitzen da"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
-msgstr "da"
+msgstr "berdinak"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
-msgstr "fitxategia"
+msgstr "agiria"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
-msgstr ""
+msgstr "fz3temp-agiri-blokeatzea"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
@@ -7744,83 +8012,85 @@
 "Please make sure this executable exists in the same directory as the main "
 "FileZilla executable."
 msgstr ""
+"fzputtygen ezin da abiarazi.\n"
+"Mesedez zihurtatu exekutagarri hau FileZilla exekutagarri nagusia dagoen "
+"zuzenbide berean dagoela."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
-msgstr "Ezin da fzsftp prozesua abiarazi"
+msgstr "fzsftp ezin da abiarazi"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
-msgstr ""
+msgstr "gnutls_certificate_get_peers ez du egiaztagiririk itzuli"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
-msgstr "handiago"
+msgstr "hau baino gehiago"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
-msgstr "&Exekutatu"
+msgstr "taldeak exekutagarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
-msgstr ""
+msgstr "taldeak irakurgarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
-msgstr ""
+msgstr "taldeak idazgarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
-msgstr "berdin"
+msgstr "honen berdina"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
-msgstr ""
+msgstr "ezarrita"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
-msgstr ""
+msgstr "ezarrigabe"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
-msgstr "txikiago"
+msgstr "hau baino gutxiago"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
-msgstr "adierazpen erregularrarekin bat dator"
+msgstr "bat dator adi-arrunt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
-msgstr "&Exekutatu"
+msgstr "jabeak exekutagarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
-msgstr ""
+msgstr "jabeak irakurgarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
-msgstr ""
+msgstr "jabeak idazgarria"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
-#, fuzzy
 msgid "unknown"
-msgstr "Tamaina ezezaguna"
+msgstr "ezezaguna"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
-msgstr "&Exekutatu"
+msgstr "denek exekutagarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
-msgstr ""
+msgstr "denek irakurgarria"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
-msgstr ""
+msgstr "denek idazgarria"
 
-#: resources.h:164
+#: resources.h:173
 msgid "wxWidgets:"
-msgstr ""
+msgstr "wxWidgets:"
diff -Nru filezilla-3.5.3/locales/fi_FI.po filezilla-3.7.3~precise/locales/fi_FI.po
--- filezilla-3.5.3/locales/fi_FI.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/fi_FI.po	2013-05-26 15:45:23.000000000 +0000
@@ -1,10 +1,10 @@
 # Kari Saariniemi, 2011.
 msgid ""
 msgstr ""
-"Project-Id-Version: FileZilla Client 3.5.1\n"
+"Project-Id-Version: FileZilla Client 3.7.0.1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-09-18 17:45+0200\n"
+"POT-Creation-Date: 2013-05-26 17:32+0200\n"
+"PO-Revision-Date: 2013-05-24 10:12+0200\n"
 "Last-Translator: Kari Saariniemi <kari.saariniemi@pp.inet.fi>\n"
 "Language-Team: Kari Saariniemi <kari.saariniemi@pp.inet.fi>\n"
 "MIME-Version: 1.0\n"
@@ -16,16 +16,16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S kulunut"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S jäljellä"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -43,9 +43,9 @@
 msgstr[0] "%d hakemisto"
 msgstr[1] "%d hakemistoa"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -77,7 +77,7 @@
 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:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d tiedostoa lisätty jonoon"
@@ -89,31 +89,21 @@
 msgstr[0] "%d sekunti"
 msgstr[1] "%d sekuntia"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Isäntä"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Salasana"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d kt/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d Mt/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -128,7 +118,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ei vielä kelvollinen!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Välityspalvelimen käyttäjä"
@@ -150,27 +140,17 @@
 msgstr[0] "%s tavu"
 msgstr[1] "%s tavua"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s tavua"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s tavua (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s tavua (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s tavua (%d.%d kt/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s tavua (%d.%d Mt/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -183,7 +163,7 @@
 "\n"
 "Lataa FileZilla uudestaan. Jos tämä ongelma toistuu, lähetä virheraportti."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -205,153 +185,149 @@
 msgid "%s with %d bits"
 msgstr "%s, jossa %d bittiä"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Käyttäjänimi"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Välityspalvelimen salasana"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Tietoja..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "Ti&li:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Aktiivinen"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Lisää kirjanmerkki..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "Lisää tiedostot j&onoon"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Lisää avaintiedosto..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Lisää jonoon"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Säädä palvelimen aikavyöhykkeen siirtymää:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Luota aina serifikaattiin tulevissa istunnoissa."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Luota aina tähän isäntään, lisää tämä avain välimuistiin"
 
-#: resources.h:939
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Käytä &aina oletusmuokkainta"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Käytä aina valintaa tiedostoille, joilla ei ole sidosta"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Käytä aina tätä toimintoa"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Kysy ulkoista IP-osoitetta käyttöjärjestelmältäsi"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Havaitse automaattisesti"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binääri"
 
-#: resources.h:899
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 "&Binääriset etuliitteet käytettäessä SI-symboleja. (esim. 1 kt = 1024 tavua)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Kirjanmerkit"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "Se&laa..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "P&urskesieto:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Peruuta"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Tarkista FileZillan betaversiot"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Tyhjennä yksityisyystiedot..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Sulje FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Määritä nopeusrajoitukset..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Määritä..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Yhdistä"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopioi"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopioi nykyinen yhteys Sivustonhallintaan..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Kopioi leikepöydälle"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Kaatuminen"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "L&uo hakemisto"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "L&uo uusi välilehti"
 
@@ -359,168 +335,168 @@
 msgid "&Debug"
 msgstr "&Debuggaus"
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "Debuggaa tieto &sanomalokiin:"
 
-#: resources.h:932
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "Oletusm&uokkain:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Tiedosto on jo olemassa -oletustoiminto..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Viive epäonnistuneiden kirjautumisyritysten välillä:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "Po&ista"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "Po&ista 'symlink'"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Hakemistojen vertailu"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Hylkää paikallinen tiedosto ja lataa ja muokkaa uutena"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Katkaise yhteys"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Katkaise yhteys palvelimelta"
 
-#: resources.h:875
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Näytä tämänhetkinen siirtonopeus keskimääräisen siirtonopeuden sijaan"
 
-#: resources.h:897
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Näytä koko tavuina"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Ä&lä muista salasanoja"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Älä näytä tätä sanomaa jatkossa"
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Älä käytä ulkoisia IP-osoitteita paikallisissa yhteyksissä."
 
-#: resources.h:919
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "&Tiedostojen kaksoisklikkauksen toiminta:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Lataa palvelimelta"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Lataa kohteeseen:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Lataa..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Lataukset:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Muokkaa"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Muokkaa suodatinsääntöjä..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Ota käyttöön"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "Ota &automaattinen päivitystarkistus käyttöön"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Ota nopeusrajoitukset käyttöön"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "Kood&aus:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Salaus:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Anna oma komento..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Suorita"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "Vie &Sivustonhallinnan kohteet"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Vie..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Vaihda takaisin aktiivitilaan"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Tiedosto"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Tiedostomääritteet..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Tiedosto-oikeudet..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Tiedosto:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Suodatintilat:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Suodatinjoukot:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Suodattimet:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Lopeta"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Lopeta muokkaus ja poista paikallinen tiedosto"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -528,479 +504,487 @@
 "&Tiivistä palvelimen polut, lataa kaikki niihin sisältyvät tiedostot samaan "
 "kohdehakemistoon"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Seuraa 'symlinkkiä', poista kohdehakemiston sisältö"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Hae ulkoinen IP-osoite seuraavasta URL:stä:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Ohjeet..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Globaalinen kirjanmerkki"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 käyttäen CONNECT-metodia"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Ohje"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Piilota samannimiset tiedostot"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Suurin"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Suurin käytettävissä oleva portti:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Isäntä:"
 
-#: resources.h:898
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC -binääriset etuliitteet (esim. 1 KiB = 1024 tavua)"
 
-#: resources.h:886
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (esimerkki: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Tuo..."
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "Pe&ri järjestelmän tiedostosidokset"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Säilytä etäpolun rakenne suhteessa hakujuureen"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Tiedoston ja hakemistopaneelien ulkoasu:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Rajoita FileZillan käyttämät paikallisportit"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Rajoita samanaikaisten yhteyksien määrää"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Paikallinen hak&emistopuu"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Paikallinen hakemisto:"
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Kirjoita loki tiedostoon"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "Kir&jautumistyyppi:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "Kir&jautumistyyppi:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Pieni"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Hallitse kirjanmerkkejä..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Manuaalinen siirto..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Y&hteyksien enimmäismäärä:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Uudelleenyritysten enimmäismäärä:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Sanoma&loki"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Pienennä tehtäväpalkkiin"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nimi:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Verkon määritysvelho..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Uusi"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Uusi sivusto"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Lataa uusin versio!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Seuraava >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Ei"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Ei mitään"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normaali"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Päiviä päivitystarkistusten välillä:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Numeerinen arvo:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&AVAA"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Avaa"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "K&orvaa"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passiivinen"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Salasana:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "So&ita ääni"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "Po&rtti:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Sanomalokin sijainti:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "Sisällytä &aikaleima siirrettyihin tiedostoihin"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Jono"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "Pikay&hdistä"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "P&ikayhdistämisen paneeli"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Lue"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Yhdistä uudestaan"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Päivitä"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Muista tämän istunnon salasana"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Muista salasanat"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "P&alvelimen hakemisto:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Palvelimen polku:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Poista"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Poista avain"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "Poista &valitut"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "Nimeä uu&delleen"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "Nimeä &uudelleen..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Avaa paikallinen tiedosto uudestaan"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Korvaa epäkelvot merkit seuraavilla:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Ilmoita virheestä..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Resetoi ja laita valitut tiedostot jonoon uudestaan"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Käynnistä velho uudestaan"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Jatka"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "S&uorita komento..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "Suorita määritys&velho nyt..."
 
-#: resources.h:950
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Suorita päivitystarkistus nyt..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SIVUSTO"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "Tallenna &nimellä..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Etsi"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Etsi palvelimen tiedostoja..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Valitse kohde:"
 
-#: resources.h:930
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Valitse kieli:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Valitse näytettävät sarakkeet:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Palvelin"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Asetukset"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Asetukset..."
 
-#: resources.h:965
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "Näytä &debuggausvalikko"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Näytä sanoma"
 
-#: resources.h:955
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Näytä aikaleimat sanomalokissa"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Sivustonhallinta..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Sivustokohtainen kirjanmerkki"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Ohita"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Nopeusrajoitukset"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Aloita siirto &heti"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Vaihda paikallisen ja palvelimen paneelien paikkaa"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS -salaukset"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testaa"
 
-#: resources.h:878
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Teema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Siirto"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "S&iirtotapa:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Siirt&ojono"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Käsittele pistetiedostoja ASCII-tiedostoina"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Peru muokkaus"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Päivitä välimuistissa oleva avain tälle isännälle"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Lataa palvelimelle"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Lataukset palvelimelle:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Käytä erillistä ohjelmaa"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Käytä &synkronoitua selausta"
 
-#: resources.h:934
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Käytä järjestelmän oletusmuokkainta tekstitiedostoille"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Käytä seuraavaa IP-osoitetta:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "Käytä palvelimen &ulkoista IP-osoitetta"
 
-#: resources.h:901
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "Käytä &tuhaterotinta"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "K&äyttäjänimi:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Kä&yttäjänimi:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versio %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Näytä"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Näytä/Muokkaa"
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Seuraa paikallisesti muokattuja tiedostoja ja kehoita lataamaan muutokset "
 "palvelimelle"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Kun tarkistetaan päivityksiä, tarkista:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Kirjoita"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Kyllä"
 
@@ -1018,11 +1002,27 @@
 msgstr "'%s' ei ole hakemisto."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "'Tili' -kirjautumistyyppiä ei tueta valitussa protokollassa"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"'Normaali' ja 'Tili' -kirjautumistyypit eivät ole saatavilla. Käytetään "
+"'Kysy salasanaa' sen sijaan."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"'Normaali' ja 'Tili' -kirjautumistyypit eivät ole enää saatavilla. Syöte on "
+"muutettu muotoon 'Kysy salasanaa'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1040,120 +1040,116 @@
 msgstr[0] "(%d objekti suodatettu)"
 msgstr[1] "(%d objektit suodatettu)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 - ei rajoitusta)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekuntia)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 - pois käytöstä)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(Vähintään 7 päivää)"
-
-#: resources.h:894
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(esimerkki: %H:%M)"
 
-#: resources.h:888
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(esimerkki: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S jäljellä"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- jäljellä"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Reitittimen ja/tai palomuurin yhteys poikki"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Peilipalvelimen tiedosto vahingoittunut"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Haittaohjelma järjestelmässäsi"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- jäljellä"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c ei kelpaa käytettäessä FTP URL:ää"
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l voidaan käyttää ainoastaan FTP URL:n kanssa."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s ja -c eivät voi esiintyä samanaikaisesti"
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s ei kelpaa käytettäessä FTP URL:ää"
 
-#: resources.h:967
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Ei mitään"
 
-#: resources.h:968
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Varoitus"
 
-#: resources.h:969
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Tiedot"
 
-#: resources.h:970
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Laajasanainen"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-bittinen järjestelmä"
 
-#: resources.h:971
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debuggaus"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-bittinen järjestelmä"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Edellinen"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1162,16 +1158,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Annettu kirjanmerkki on jo käytössä. Anna toinen nimi."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Oletusmuokkain pitää valita."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Hakemistoa ei voi vetää sen alikansioihin."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1181,30 +1178,30 @@
 "Sellaisissa tilanteissa pitää käyttää aktiivitilaa. Aktiivitilassa FileZilla "
 "avaa portin ja kysyy palvelimelta yhteyden muodostamista."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Aikaisemmin avattu tiedosto on muuttunut."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
 "Samalla nimellä olevaa tiedostoa on jo muokattu. Avataanko '%s' uudestaan?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Tällä nimellä oleva tiedosto on jo siirretty."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Tällä nimellä oleva tiedosto on vielä muokattavana. Sulje se ja yritä "
 "uudestaan."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1217,11 +1214,11 @@
 "Ellet korjaa tätä ongelmaa, tiedostoja voi puuttua tiedostolistauksesta.\n"
 "Muita varoituksia ei näytetä tässä istunnossa."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "FileZillasta on uudempi versio saatavilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1230,7 +1227,7 @@
 "olevat palvelimet piilottavat tiedostot käyttäjältä. Käytä tätä valintaa "
 "pakottaaksesi palvelimen näyttämään kaikki tiedostot."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1247,15 +1244,15 @@
 "Poistetaanko synkronoitu toiminta käytöstä ja jatketaan paikallisen "
 "hakemiston vaihtamista?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "L&isää"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "&Salli ASCII-tiedostojen uudelleenkäynnistys"
 
@@ -1267,55 +1264,55 @@
 msgid "A&pply only to uploads"
 msgstr "Käy&tä vain ladattaessa palvelimelle"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "Käytä kaikkiin tiedostoihin ja hakemistoihin"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Poista onnistuneet siirrot a&utomaattisesti"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Keskeytä edellinen yhteys ja yhdistä nykyisessä välilehdessä"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Tietoja FileZillasta"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Tiedostolistauksien yläpuolella"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Tili"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Toiminto jonon kä&sittelyn jälkeen"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Toiminto valitulle tiedostolle:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Suoritettava toiminto:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Toiminto:"
 
@@ -1349,23 +1346,23 @@
 "osoiteen, mutta reititin tai palvelin on muokannut erehdyksessä lähetetyn "
 "osoitteen."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Aktiivitilan IP"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "Lisää tiedostot vain j&onoon"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Lisää valittu hakemisto siirtojonoon"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Lisää valitut tiedostot ja kansiot siirtojonoon"
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Lisää jonoon"
 
@@ -1373,47 +1370,61 @@
 msgid "Address type not supported"
 msgstr "Osoitetyyppiä ei tueta"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Edistyneet"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Edistyneet valinnat:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Neuvo: Jollet halua kokeilla uusia ominaisuukisa, käytä ainoastaan vakaita "
+"versioita. Beta- ja yölliset versiot ovat kehitysversioita "
+"testaustarkoituksiin. FileZillan yölliset versiot eivät ehkä toimi "
+"oddotetulla tavalla ja voivat jopa vahingoittaa järjestelmäsi. Käytä beta- "
+"ja yöllisiä versioita omalla vastuullasi."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritmi:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Kaikki tiedostot siirretty onnistuneesti"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Kaikki annetulla alueella olevien porttien tulee olla välillä 1024 ja 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Kaikki siirrot tehty. %d tiedostoa ei voitu siirtää."
 msgstr[1] "Kaikki siirrot tehty. %d tiedostoa ei voitu siirtää."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Salli &vaihto toiseen siirtotapaan virheen sattuessa"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Salli vaihto toiseen siirtotapaan virheen sattuessa"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Jo yhdistetty"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1421,7 +1432,7 @@
 "Voit käyttää vaihtoehtoisesti Pageant-työkalua PuTTY:ltä avainten "
 "hallintaan, FileZilla tunnistaa Pageantin."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1429,7 +1440,7 @@
 "Voit käyttää vaihtoehtoisesti järjestelmän SSH-agenttia. Varmista, että "
 "SSH_AUTO_SOCK-ympäristömuuttuja on asetettu."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1437,7 +1448,7 @@
 "Käy vaihtoehtoisesti osoitteessa: http://filezilla-project.org ladataksesi "
 "uusimman ajan tasalla olevan version."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1446,7 +1457,7 @@
 "Tapahtui virhe ladattaessa siirtojonoa kohteesta \"%s\".\n"
 "Joitakin jonon kohteita ei ehkä ole palautettu."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1455,33 +1466,33 @@
 "Tapahtui virhe tallennettaessa siirtojonoa kohteesta \"%s\".\n"
 "Joitakin jonon kohteita ei ehkä ole tallennettu."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 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:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonyymi"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Toinen palvelintoiminto on jo käynnissä, hakemistoa ei voi vaihtaa nyt."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Sivustonhallintaan tehtyjä muutoksia ei voitu tallentaa."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1489,58 +1500,58 @@
 "Mitään Sivustonhallintaan tehtyjä muutoksia ei tallenneta, ellei tiedostoa "
 "korjata."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Suodattimiin tehtyjä muutoksia ei voitu tallentaa."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Mitään suodattimien muutoksia ei tallenneta."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Käy&tä vain hakemistoissa"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Käytä"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Käytä vain &tässä jonossa"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Käytä vain &tiedostoissa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arkisto"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Välilehtenä siirtojonon paneelissa"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Kysy toimintoa"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Kysy salasanaa"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Kysy porttia käyttöjärjestelmältä."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Kysy ulkoista IP-osoitetta käyttöjärjestelmältäsi"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Kysymysten teko FileZillan foorumeissa"
 
@@ -1548,39 +1559,35 @@
 msgid "Associated program not found:"
 msgstr "Sidottua ohjelmaa ei löytynyt:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Ainakin yhden suodattimen tila on puutteellinen"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Kaikki tarvittava tieto on kerätty."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Määrite"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Todennus epäonnistui."
 
-#: resources.h:879
+#: resources.h:901
 msgid "Author:"
 msgstr "Tekijä:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Automaattinen tiedostotyypin luokitus"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Automaattinen päivitystarkistus"
-
-#: resources.h:883
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Käytettävät koot"
 
@@ -1589,66 +1596,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Yksikkö tavuille. Käännä vain ensimmäinen kirjain>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Ohita välityspalvelin"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Peruskäytön ohjeet"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Käyttäytyminen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Muokattavana"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Testaa merkkijonon yhteenliittyminen"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:960
 msgid "Beware! Certificate has been revoked"
 msgstr "Varoitus! Sertifikaatti mitätöity"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binääri"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Blackboard"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Kirjanmerkki"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Kirjanmerkki:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Kirjanmerkit"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Valmistuspäivä:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Valmistustiedot"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Liikealan luokka:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1658,63 +1665,63 @@
 "aktiivitilassa. Jos haluat, että FileZilla käyttää vain muutamaa porttia, "
 "anna porttialue alle."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "Keskeytä &nykyinen toiminto"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Tarkista yölliset FileZillan sovellukset"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "Ty&hjennä kaikki"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Kopioi URL:t leikepöydälle"
 
-#: resources.h:887
+#: resources.h:909
 msgid "C&ustom"
 msgstr "M&uokattu"
 
-#: resources.h:942
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "&Muokatut tiedostosidokset:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Lasketaan palvelimen aikavyöhykkeen siirtymää..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Tiedostosta ei voi lukea"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Dataa ei voi kirjoittaa tiedostoon."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Ei voi kirjoittaa tiedostoon: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Peruuta"
 
-#: resources.h:989
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Peruuta toiminto"
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Peruuta toiminto"
 
@@ -1724,11 +1731,11 @@
 msgstr ""
 "Ei saada yhteyttä kohteeseen '%s', mediaa ei annettu tai asema ei valmis."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Palvelinta ei voi lisätä Sivustonhallintaan"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1744,30 +1751,30 @@
 "Hakemistoja ei voi vertailla, paikallisen ja palvelimen hakemistoissa on "
 "käytössä eri suodattimet."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Hakemistoja ei voi vertailla, yhteyttä ei luotu palvelimeen."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Uuden suodattimen luonti ei onnistu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Tiedostoa ei voi muokata"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Tiedostoa ei voi muokata, ei yhdistetty mihinkään palvelimeen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Tiedostoa ei voi muokata, palvelimen polku tuntematon."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1775,8 +1782,8 @@
 "FTP-yhteyttä ei voi muodostaa SFTP-palvelimelle. Valitse kelvollinen "
 "protokolla."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Pikayhdistämis-palkkia ei voitu ladata resurssitiedostosta."
 
@@ -1788,44 +1795,48 @@
 msgid "Cannot load keyfile"
 msgstr "Avaintiedostoa ei voi avata"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Ei voitu ladata työkaluriviä resurssitiedostosta"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Salasanaa ei muisteta"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Kohdetta ei voitu nimetä uudelleen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Tiedostoa ei voitu nimetä uudelleen"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Suodatinjoukkoa ei voi tallentaa"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Suodattimen valinta ei onnistu"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "&Ei voi asettaa tiedostosidosta"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Ikkunaa ei voi näyttää"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Ei voi näyttää/muokata valittua tiedostoa"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Luokat"
 
@@ -1833,60 +1844,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Sertifikaatin ja istunnon data eivät ole tällä hetkellä saatavissa."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Sertifikaatin yksityiskohdat"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Ketjussa oleva sertifikaatti:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Sertifikaatin selvittäjä"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Haaste:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Muuta tiedostomääritteet"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Muuta tiedosto-oikeudet."
 
-#: resources.h:963
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "FileZilla pitää käynnistää uudelleen, kun muutetaan lokitiedoston asetuksia."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Merkin koodausselvitys"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Merkistö"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "&Tarkista FileZillan &betaversiot ja julkaisuehdokkaat"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Tarkista &päivitykset..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Tarkista FileZillan &päivitykset automaattisesti:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Tarkista, onko FileZillasta uudempia versioita"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Päivityksien tarkistus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Päivitystarkistus epäonnistui"
 
@@ -1894,21 +1905,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Etsitään kelvollista ulkoista IP-osoitetta"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Etsitään päivityksiä"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Ladatun tiedoston tarkistussumma ei täsmää."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Valitse paikallinen oletushakemisto"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Valitse paikallinen hakemisto"
 
@@ -1916,43 +1927,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Paladata lopetettu virheellisesti"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Salaus:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Sulj&e välilehti"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Klassinen"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Tyhjennä &Sivustonhallinnan kohteet"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Tyhjennä &ulkoasun välimuisti"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Tyhjennä &pikayhdistämisen historia"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Tyhjennä &uudelleenyhdistämistiedot"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Tyhjennä s&iirtojono"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Tyhjennä historia"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1960,11 +1971,11 @@
 msgid "Clear private data"
 msgstr "Tyhjennä yksityisyystiedot"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Tyhjennä pikayhdistämispalkki"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Tyhjennä merkkijonon yhteenliittäjä"
 
@@ -1972,24 +1983,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klikkaa Lopeta tallentaaksesi määrityksen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klikkaa Seuraava ladataksesi uuden version."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC-palvelimen asiakas:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Asiakas-palvelimelle salaus:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Sulje &kaikki muut välilehdet"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Sulje FileZilla"
 
@@ -1997,11 +2008,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Sulje kaikki käynnissäolevat FileZilla-ohjelmat"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Sulkee nykyisen välilehden"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Ko&mmentit:"
 
@@ -2009,11 +2020,11 @@
 msgid "Column properties"
 msgstr "Sarakkeen ominaisuudet"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Sarakkeen asetus"
 
-#: resources.h:937
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Komento ja sen argumentit pitää antaa oikeaoppisesti."
 
@@ -2032,9 +2043,9 @@
 msgstr "Tämä protokolla ei tue komentoa"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Komento:"
 
@@ -2042,7 +2053,7 @@
 msgid "Comment"
 msgstr "Kommentti"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Yhteinen nimi:"
 
@@ -2051,15 +2062,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Reititin tai palomuuri hylkäsi yhteyden"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Vertailun &muokkausaika"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Vertailun &tiedostokoko"
 
-#: resources.h:917
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "&Vertailuraja (minuuteissa):"
 
@@ -2067,60 +2078,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Vertailurajan pitää olla väliltä 0 ja 1440 minuuttia"
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Käännetty kohteelle:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Kääntämiskone:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Kääntäjä:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Kääntäjän liput:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Pakattu"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Samanaikaiset siirrot"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "&Merkkiherkät ehdot"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Määritystesti"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Määritä passiivitila"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Määritä porttialue"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "FileZillan ja verkon määritys"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Vahvista poisto"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Tarvitaan vahvistus"
 
@@ -2128,7 +2139,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Onnittelut, määritys näyttää toimivan."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Yhdistä ohittaen palvelimen asetukset"
 
@@ -2136,34 +2147,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Yhdistä määritettyyn Sivustonhallinnan sivustoon"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Yhdistetty"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Yhdistetään"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Yhdistetään kohteeseen %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Yhdistetään kohteeseen %s välityspalvelimen kautta"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Yhdistetään kohteeseen %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Yhdistetään palvelimelle"
 
@@ -2171,18 +2182,18 @@
 msgid "Connection"
 msgstr "Yhteys"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Yhteysyritys epäonnistui"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Yhteysyritys epäonnistui osoitteeseen \"%s\"."
@@ -2196,12 +2207,12 @@
 msgid "Connection closed"
 msgstr "Yhteys suljettu"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Palvelin sulki yhteyden"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Yhteys muodostettu, alustetaan TLS..."
@@ -2210,7 +2221,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Yhteys muodostettu, lähetetään HTTP-pyyntö"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Yhteys muodostettu, odotetaan tervetulosanomaa..."
 
@@ -2226,15 +2237,15 @@
 msgid "Connection refused"
 msgstr "Yhteys evättiin"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Yhteyden aikakatkaisu"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Yhteys aikakatkaistu."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Yhteys palvelimelle katkesi."
 
@@ -2254,27 +2265,23 @@
 msgid "Convert keyfile"
 msgstr "Muunna avaintiedosto"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Kopioi"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopio (%d) kohteesta %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopio kohteesta %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Kopioi valittujen kohteiden URL:t leikepöydälle."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Yhteyttä ei voitu hyväksyä: %s"
@@ -2284,16 +2291,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Ei voitu lisätä yhteyttä Sivustonhallintaan"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Toiminnon suorittaminen epäonnistui"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Yhteys palvelimeen epäonnistui"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Yhteyttä ei voitu muodostaa palvelimeen: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Ei voitu muuntaa komentoa palvelimen koodaukselle"
 
@@ -2302,17 +2313,17 @@
 msgid "Could not convert private key"
 msgstr "Salattua avainta ei voitu muuntaa"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "URL:ien kopiointi epäonnistui"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Datan kopiointi epäonnistui"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2322,11 +2333,11 @@
 "Joko valikon laajennusta ei ole asennettu oikein tai et pudottanut "
 "tiedostoja Resurssienhallinnan ikkunaan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Palvelimeen ei saatu yhteyttä"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2337,11 +2348,11 @@
 "Voit asettaa FileZillan datahakemiston käyttäen '--datadir <custompath>' "
 "komentorivin valintaa tai asettamalla FZ_DATADIR -ympäristömuuttujan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Muokattua kirjautumisaluetta ei voitu luoda."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2349,7 +2360,7 @@
 "Ei saatu kuvaavaa nimeä sertifikaatin julkaisijalta, "
 "gnutls_x509_get_issuer_dn epäonnistui"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1076
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2357,7 +2368,7 @@
 "Ei saatu kuvaavaa nimeä sertifikaatin aiheesta, gnutls_x509_get_dn "
 "epäonnistui"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Ei saatu palvelimen koko polkua."
 
@@ -2366,16 +2377,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "fzputtygen:iltä ei saatu vastausta."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr "Latauksien väliaikaishakemistoa ei löytynyt."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1018
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:1011
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2403,7 +2414,7 @@
 msgid "Could not load private key"
 msgstr "Salattua avainta ei voitu avata"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2415,7 +2426,7 @@
 "Poistetaanko synkronoitu selaus käytöstä ja jatketaan palvelinhakemiston "
 "vaihtamista?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2437,9 +2448,9 @@
 "'%s'.\n"
 "Synkronoitu selaus poistettu käytöstä."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Leikepöydän avaaminen epäonnistui"
 
@@ -2454,11 +2465,11 @@
 msgid "Could not parse remote path."
 msgstr "Palvelimen polkua ei voitu jäsentää."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Ei voitu jäsentää palvelimen osoitetta:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Ei voitu lukea socket-rajapinnasta: %s"
@@ -2467,12 +2478,12 @@
 msgid "Could not read server item."
 msgstr "Palvelinosiota ei voitu lukea."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Ei voitu etsiä tiedoston loppuun"
 
@@ -2480,22 +2491,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Komennon lähettäminen fzputtygen:ille epäonnistui."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "IO-solmua ei voitu muodostaa"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Ei voitu aloittaa välityspalvelimen kättelyä: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Siirtoa ei voitu aloittaa"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2515,7 +2526,7 @@
 msgstr ""
 "Ei voitu kirjoittaa \"%s\", globaaleja kirjanmerkkejä ei voitu tallentaa: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2524,14 +2535,14 @@
 "Ei voitu kirjoittaa \"%s\", jonoa ei voitu tallentaa.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Ei voitu kirjoittaa \"%s\", valittuja sivustoja ei voitu viedä: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Ei voitu kirjoittaa \"%s\": %s"
@@ -2541,7 +2552,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Ei voitu kirjoittaa avaintiedostoa: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Ei voitu kirjoittaa paikalliseen tiedostoon"
 
@@ -2551,38 +2562,50 @@
 msgid "Could not write to log file: %s"
 msgstr "Ei voitu kirjoittaa lokitiedostoon: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Ei voitu kirjoittaa socket-rajapintaan: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Maa:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Kaataa FileZillan heti. Käytetään vain poikkeuskäsittelijän debuggauksessa."
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "&Luo uusi tiedosto"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Luo uusi alihakemisto tähän hakemistoon"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Luo uusi, tyhjä tiedosto nykyiseen hakemistoon"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Luo hakemisto"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Luo tyhjä tiedosto"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Luodaan hakemisto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Luodaan hakemisto '%s'..."
@@ -2600,7 +2623,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Kriittinen tiedostosiirron virhe siirrettäessä %s %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2621,53 +2644,57 @@
 msgid "Current transfer type is set to binary."
 msgstr "Nykyinen siirtotapa asetettu binääriseksi."
 
-#: resources.h:773 resources.h:893
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "&Muokattu"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Muokattu suodatinjoukko"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Muu palvelin"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "D&atatyyppi"
 
-#: resources.h:900
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 "&Desimaaliset etuliitteet käytettäessä SI-symboleja (esim. 1 kt = 1000 tavua)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "O&letus"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "Po&ista"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Poista k&aikki käytöstä"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Ä&lä tallenna salasanoja"
 
-#: resources.h:924
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Hakemistojen &kaksoisklikkauksen toiminta:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplikaatti"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOSin kaltaiset virtuaalipolut"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Vaarallinen tiedostotyyppi"
 
@@ -2675,16 +2702,16 @@
 msgid "Data"
 msgstr "Tiedot"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Datan socket-rajapinta suljettu liian aikaisin."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Päivämäärä"
 
-#: resources.h:884
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Päivämäärän muoto"
 
@@ -2703,11 +2730,11 @@
 msgid "Debug"
 msgstr "Debuggaus"
 
-#: resources.h:964
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Debuggauksen asetukset"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Paikallinen oletus&hakemisto:"
 
@@ -2715,19 +2742,19 @@
 msgid "Default (Autodetect)"
 msgstr "Oletus (Havaitse automaattisesti)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Oletusmuokkainta ei määritelty oikein."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Tiedosto on jo olemassa -oletustoiminto"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Palveli&men oletushakemisto:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2739,15 +2766,15 @@
 msgid "Default system language"
 msgstr "Järjestelmän oletuskieli"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Siirron &oletustapa:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Siirron ol&etustyyppi"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Oletus: http://ip.filezilla-project.org/ip.php"
 
@@ -2773,57 +2800,57 @@
 "Yhteysyritys yhteyden viiivellä %d sekuntia edelliseen verrattuna "
 "epäonnistui..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Poista kohde"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Poista valittu hakemisto"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Poista valitut tiedostot ja hakemistot"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Poistetaan hakemistoja"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Usean kuulumattoman hakemiston poistaminen ei ole vielä tuettu"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Poistetaan symbolinen linkki"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Työpöytä"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Yksityiskohdat"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Uuden avaimen yksityiskohdat:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "&Hakemistot"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Suunta"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Hakemisto"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Hakemistojen vertailu"
 
@@ -2841,11 +2868,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Hakemistolistaus käyttäjän keskeyttämä"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Hakemistolistaus epäonnistui"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Tiedostonimen suodattimet"
 
@@ -2853,67 +2880,66 @@
 msgid "Directory listing successful"
 msgstr "Hakemistolistaus onnistui"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "P&oista kaikki käytöstä"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "Poista tämä valinta, jos oikeat tiedostojen sisällöt eivät näy enää."
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Katkaise yhteys palvelimeen"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Yhteys palvelimeen katkaistu"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Yhteys katkaistu palvelimeen: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Katkaistaan yhteys edelliseltä palvelimelta"
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Katkaise yhteys palvelimeen"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Näytä Tietoja-ikkuna"
 
-#: resources.h:933
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Älä käytä oletusmuokkainta"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Älä tee mitään"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2921,8 +2947,8 @@
 "Haluatko varmasti tarkistaa betaversiot?\n"
 "Jos et halua testata uusia ominaisuuksia, käytä vakaita versioita."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Suljetaanko FileZilla?"
 
@@ -2935,7 +2961,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Poistetaanko kaikki Sivustonhallinnan kohteet?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Poistetaanko valittu kohde?"
 
@@ -2943,33 +2969,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Poistetaanko siirtojono?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Lähetetäänkö '%s' palvelimelle?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Dokumentaatio"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Älä käytä ulkoisia IP-osoitteita p&aikallisissa yhteyksissä."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Pistetiedostot ovat tiedostonimiä, jotka alkavat pisteellä, esim. .htaccess"
 
-#: resources.h:918
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Kaksoisklikkauksen toiminta"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Lataa palvelimelta"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Lataus&rajoitus palvelimelta:"
 
@@ -2982,41 +3008,50 @@
 msgid "Download limit: none"
 msgstr "Latausrajoitus: Ei mitään"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Lataa hakutulokset"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Lataa valittu hakemisto"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Lataa valitut tiedostot ja hakemistot"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Latausnopeus: %s/s\n"
+"Siirtonopeus: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Ladataan"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Ladataan %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Usean kuulumattoman hakemiston lataaminen ei ole vielä tuettu"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Ladataan hakutulokset"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3025,59 +3060,63 @@
 "Vedä&Pudota -toimintoa ei ole vielä otettu käyttöön FileZillan eri "
 "instanssien välillä."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Vedä&Pudota -toimintoa ei ole vielä otettu käyttöön eri palvelimien välillä."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&ikaatti"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "O&ta kaikki käyttöön"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "&Anna hakemisto"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "Su&orita"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Lopeta"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "Sähköposti:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Jokaisella suodattimella pitää olla ainakin yksi tila."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Muokkaa suodattimia"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Muokkaa tiedostoa määritetyllä muokkaimella ja lataa muutokset palvelimelle."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Muokkaus epäonnistui"
 
-#: resources.h:881
+#: resources.h:903
 msgid "Email:"
 msgstr "Sähköposti:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Tyhjä komento."
 
@@ -3085,7 +3124,7 @@
 msgid "Empty command."
 msgstr "Tyhjä komento."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Tyhjä hakemistolistaus"
 
@@ -3097,102 +3136,114 @@
 msgid "Empty file extension."
 msgstr "Tyhjä tiedostotarkennin."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Tyhjiä suodatinnimiä ei sallita."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Tyhjä nimi"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Tyhjä lainausmerkeissä oleva merkkijono."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Ota &kaikki käyttöön"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Ota epäkelvon merkin &suodatus käyttöön"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Salattu"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Salaus"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Salauksen tiedot"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Lopetetaanko vertailu ja muutetaan lajittelujärjestystä?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Anna oma komento..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Anna 0 rajattomalle nopeudelle."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Anna komento"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Anna oma komento"
 
-#: resources.h:925
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Anna hakemisto"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Anna suodattimen nimi"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Suodatinjoukon nimi"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Anna uusi nimi suodatinjoukolle"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Anna salasana"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Siirry valittuun hakemistoon"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Anna palvelimen osoite.\n"
-"Määrittääksesi palvelimen protokollan, kokeile palvelinta protokollan "
+"Määrittääksesi palvelimen protokollan, kokeile isäntää protokollan "
 "tunnuksella. Jos mitään protokollaa ei ole määritetty, käytetään oletuksena "
 "(ftp://).\n"
-"Voit myös antaa täydellisen URL:in muodossa://käyttäjä:salasana@palvelin:"
-"portti tässä, tällöin korvataan muiden kenttien asetukset näillä."
+"Voit myös antaa täydellisen URL:in muodossa://käyttäjä:salasana@isäntä:"
+"portti tässä, tällöin korvataan muiden kenttien asetukset näillä.\n"
+"\n"
+"Tuetut protokollat:\n"
+"-ftp:// normaalille FTP:lle\n"
+"-sftp:// SSH tiedostonsiirtoprotokollalle\n"
+"-ftps:// FTP yli TLS (implisiittinen)\n"
+"-ftpes:// FTP yli TLS (eksplisiittinen)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3203,7 +3254,7 @@
 "Anna salasana tiedostolle '%s'.\n"
 "Huomaa, että muunnettu tiedosto ei ole suojattu salasanalla."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3225,7 +3276,7 @@
 msgid "Error importing"
 msgstr "Tuonti epäonnistui"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Virhe ladattaessa jonoa"
 
@@ -3234,27 +3285,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "XML-tiedoston lataus epäonnistui"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Virhe tallennettaessa jonoa"
 
@@ -3265,72 +3316,80 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "XML-tiedoston kirjoitus epäonnistui"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Virhe, tiedostonimeä ei voitu jäsentää."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Virhe, paikallinen tiedosto on olemassa, mutta sitä ei voi poistaa"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Virhe:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Muodosta yhteys uuteen välilehteen"
 
-#: resources.h:944
+#: resources.h:972
+msgid "Every month"
+msgstr "Joka kuukausi"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Joka toinen viikko"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Esimerkki: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:925
 msgid "Examples"
 msgstr "Esimerkit:"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Suori&ta"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Suoritettava"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr "Sovelluksesta puuttuu versiotiedot, päivityksiä ei voi tarkistaa."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Resurssienhallinta"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Vie j&ono"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Vie &asetukset"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Vie asetukset"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Suodatin&nimi:"
 
@@ -3338,7 +3397,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Tiedostonsiirtoprotokolla"
 
@@ -3350,25 +3409,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Turvaton tiedostonsiirtoprotokolla"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-moottoria ei alustettu, ei voi yhdistää"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-Alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-välityspalvelin"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3384,26 +3443,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP yli implicit TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Hakemiston vaihtaminen ei onnistunut"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Kielen vaihtaminen ei onnistunut"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "FileZillan uudempien versioiden tarkistus epäonnistui."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Sivustojen kopiointi tai siirto epäonnistui"
 
@@ -3411,41 +3470,41 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "XML-tiedoston varmuuskopion luonti epäonnistui"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui, keskeytetään"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Kuuntelun socket-rajapinnan luonti epäonnistui aktiivitilan siirrolle"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "FileZillan viimeisimmän version lataus epäonnistui."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "'Omat tiedostot' -polkua ei löytynyt"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Työpöydän polkua ei löytynyt"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "Datayhteyden 'peer'-osoitteen haku epäonnistui, yhteys suljettu."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "FTP-koneiston alustus epäonnistui"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "TLS:n alustus epäonnistui."
@@ -3459,24 +3518,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Salatun avaimen lataaminen epäonnistui: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, 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:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Ei voitu avata kohdetta \"%s\" lukemista varten"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Ei voitu avata kohdetta \"%s\" kirjoittamista varten"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Palautettua polkua ei voitu jäsentää."
 
@@ -3484,7 +3543,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Luotetun juurisertifikaatin jäsennys epäonnistui."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Datan vastaanotto epäonnistui"
 
@@ -3496,12 +3555,12 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Ulkoisen IP-osoitteen haku epäonnistui, keskeytetään"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Paikallisen IP-osoitteen haku epäonnistui."
 
@@ -3517,14 +3576,14 @@
 msgid "Failed to send command."
 msgstr "Komennon lähetys epäonnistui."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3532,28 +3591,28 @@
 "Kielen asetus kielelle %s (%s) epäonnistui, käytetään järjestelmän "
 "oletuskieltä (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, 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:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3563,7 +3622,7 @@
 msgid "Failed to validate settings"
 msgstr "Asetuksien varmennus epäonnistui"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:953
 msgid "Failed to verify peer certificate"
 msgstr "'Peer'-sertifikaatin todennus epäonnistui"
 
@@ -3580,21 +3639,19 @@
 msgid "Failed transfers"
 msgstr "Epäonnistuneet siirrot"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Palaa aktiivitilaan"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Tie&dosto:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "&Tiedostot"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Tiedosto"
 
@@ -3610,7 +3667,7 @@
 msgid "File editing"
 msgstr "Tiedoston muokkaus"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Tiedosto on jo olemassa"
 
@@ -3618,7 +3675,7 @@
 msgid "File exists action"
 msgstr "Tiedosto on jo olemassa -toiminto"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Tiedosto on muuttunut"
 
@@ -3626,14 +3683,14 @@
 msgid "File lists"
 msgstr "Tiedostolistaukset"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Tiedostoa ei löydy"
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "File search"
 msgstr "Tiedoston haku"
 
@@ -3668,25 +3725,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Tiedostonsiirto onnistui, siirretty %s/%s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Tiedostosiirrot vielä käynnissä."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Tiedosto siirrettäisiin ASCII-tietotyyppinä."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Tiedosto siirrettäisiin binääritietotyyppinä."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-virhe"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3694,65 +3751,67 @@
 "FileZilla voi nyt testata määrityksen varmistaakseen, että kaikki on "
 "määritetty oikein."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla on jo yhdistetty palvelimeen."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla on kiosk-tilassa.\n"
-"Kirjautumistyypit 'Normaali' ja 'Tili' eivät ole saatavissa tässä tilassa."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla pitää käynnistää uudelleen, jotta kieliasetukset tulevat voimaan."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "FileZillan päivitykset"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Tiedostolistauksen &tilapaneelit"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nimi"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "Tiedostonimen &suodattimet..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Epäkelpo tiedostonimi"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Tiedostonimissä ei saa esiintyä mitään seuraavista merkeistä: / \\ : * ?\" < "
+"> |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Tiedostonimeä ei muutettu"
 
-#: resources.h:307 resources.h:957
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nimi:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Tiedostonimissä ei saa esiintyä mitään seuraavista merkeistä: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3760,13 +3819,13 @@
 "Tiedostonimissä ei saa esiintyä mitään seuraavista merkeistä: / \\ : * ? < > "
 "|"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Tiedostot, joita parhaillaan muokataan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Koko"
@@ -3775,68 +3834,68 @@
 msgid "Filesize format"
 msgstr "Tiedostokoon muoto"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tyyppi"
 
-#: resources.h:945
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Tiedostotyypin sidokset"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Suodattimen kohde:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Suodata epäkelvot merkit tiedostonimissä"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Suodatinnimi on jo olemassa"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Suodata pois kohteet, jotka täsmäävät kaikkien seuraavien kanssa"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Suodata pois kohteet, jotka täsmäävät kaikkien seuraavien kanssa"
 
-#: resources.h:223
+#: resources.h:233
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Suodatinjoukko on jo olemassa"
 
-#: resources.h:995
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Suodata hakemistolistaukset"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Suodattimen varmennus epäonnistui"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Sormenjälki (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Sormenjälki (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Sormenjälki:"
 
@@ -3844,7 +3903,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Palomuurin ja reitittimen määritysvelho"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3852,11 +3911,11 @@
 "Saat tarkempia tietoja näistä valinnoista suorittamalla verkon "
 "määritysvelhon."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Luotettavuuden kannalta pitäisi määrittää ainakin 10 portin alue."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3864,33 +3923,33 @@
 "Tässä istunnossa käytetään oletusasetuksia. Asetuksiin tehtyjä muutoksia ei "
 "tallenneta."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Pakota UT&F-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "&Pakota piilotettujen tiedostojen näyttäminen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Pakota piilotettujen tiedostojen näyttäminen"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Muodon määrittelyt:"
 
-#: resources.h:943
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Muoto: Tarkenne, jota seuraa oikeinmääritelty lainausmerkeissä oleva komento "
 "ja argumentit."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Lisädokumentit"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Yleiset"
 
@@ -3898,21 +3957,21 @@
 msgid "General SOCKS server failure"
 msgstr "Yleinen SOCKS-palvelimen vika"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Yleinen välityspalvelin"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Hae ulkoinen IP-osoite seuraavasta URL:stä:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Ohjeet"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Annetun suodatinjoukon nimi on jo olemassa, korvataanko suodatinjoukko?"
@@ -3921,15 +3980,15 @@
 msgid "Global bookmarks"
 msgstr "Globaalit kirjanmerkit"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Ryhmän oikeudet"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "S&uuri"
 
@@ -3937,21 +3996,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP yli TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hajautus:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Piilotettu"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Suuri"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Suurin"
 
@@ -3960,26 +4019,26 @@
 msgstr ""
 "Suurin käytettävissä olevan portin numero pitää olla väliltä 1024 ja 65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Pidä Vaihto-näppäin alhaalla vaihtaaksesi suodattimen tilaa samanaikaisesti "
 "molemmilla puolilla."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Kotisivu:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Isännän avaimen sormenjälki:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Isäntäavain ei täsmää"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Isäntä alkaa [-merkillä, mutta lopettavaa sulkua ei löydy."
 
@@ -3987,20 +4046,20 @@
 msgid "Host unreachable"
 msgstr "Isäntään ei saatu yhteyttä"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Isäntä:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "tuntia,"
 
-#: resources.h:892
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (esimerkki: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4010,11 +4069,11 @@
 "kauemmin kuin valitun ajan kuluessa, yhteys suljetaan ja FileZilla yrittää "
 "yhdistää uudestaan."
 
-#: resources.h:973
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "Jos raportoit virheistä, käytä lokeja \"Laajasanainen\" -lokitasolla."
 
-#: resources.h:687
+#: resources.h:708
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
@@ -4026,7 +4085,7 @@
 "sinun pitäisi kokeilla aktiivitilaa. Siirtotilan voi asettaa "
 "palvelinkohtaisesti Sivustonhallinnassa."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4034,7 +4093,7 @@
 "Jos palautusvalinta on käytössä, voit yhdistää väärin määritettyyn "
 "palvelimeen, joka hylkää valitun siirtotavan."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4057,7 +4116,7 @@
 "Jos tämä ongelma jatkuu, jokin reititin ja/tai palomuuri jatkaa yhteyden "
 "häiritsemistä."
 
-#: resources.h:962
+#: resources.h:988
 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 "
@@ -4067,7 +4126,7 @@
 "\" tiedostonimen loppuun (korvaten mahdollisesti vanhemmat lokitiedostot) ja "
 "uusi tiedosto luodaan."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4087,7 +4146,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Jos tämä ongelma ei poistu, ota yhteyttä reitittimesi valmistajaan."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4097,7 +4156,7 @@
 "palvelimen kanssa. Jos aika eroaa (esim. eri aikavyöhyke), määritä "
 "aikavyöhykkeen siirtymä Sivustonhallinnassa."
 
-#: resources.h:916
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4105,11 +4164,11 @@
 "Jos käytetään vertailuun perustuvaa aikaleimaa, kaksi tiedostoa ovat "
 "samanarvoisia, jos niiden aikaleiman poikkeama ei ylitä tätä rajaa."
 
-#: resources.h:931
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Jos vaihdat kielen, FileZilla täytyy käynnistää uudestaan."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4117,11 +4176,11 @@
 "Jos klikkaat Testaa, FileZilla yhdistää osoitteeseen: probe.filezilla-"
 "project.org ja suorittaa muutaman yksinkertaisen testin."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Jos suljet FileZillan, muutoksesi menetetään."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4129,11 +4188,11 @@
 "Jos annat väärät tiedostotyypit, nämä tiedostot saattavat vioittua siirron "
 "aikana."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Jos näyttöön tulee virheilmoituksia, määritys on tehty väärin."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4152,7 +4211,7 @@
 "tapauksessa passiivitilaan ja ota yhteyttä palvelimen ylläpitäjään "
 "saadaksesi ohjeita."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4160,7 +4219,7 @@
 "Jos onnistut tekemään velhon asetukset oikein ja lopputesti onnistuu, kaikki "
 "palomuurit ja reitittimet pitäisi määrittää oikein."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4168,7 +4227,7 @@
 "Jos käytät palomuuria varmista, että FileZillalla on oikeus yhdistää "
 "kaikkiin annettuihin portteihin."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4188,7 +4247,7 @@
 msgid "Import data from older version"
 msgstr "Tuo data vanhemmasta versiosta"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Tuontiasetukset"
 
@@ -4202,7 +4261,7 @@
 msgid "Improperly quoted association."
 msgstr "Väärin merkitty sidos."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4210,7 +4269,7 @@
 "FileZillan täytyy kuunnella porttia aktiivitilassa datasiirtojen varalta. "
 "FileZillalle täytyy määrittää mitä portteja sen tulee käyttää."
 
-#: resources.h:703
+#: resources.h:724
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
@@ -4219,19 +4278,19 @@
 "eteenpäin, koska FileZillalla ei ole vaikutusta järjestelmäsi valitsemiin "
 "portteihin."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr "Automaattisen päivitystarkistuksen saat käyttöön Asetukset -ikkunassa."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "FileZillan pitää tietää ulkoinen IP-osoite käytettäessä aktiivitilaa."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4241,7 +4300,7 @@
 "palvelimelta porttia ja yhdistää annettuun porttiin. Tätä ei tarvitse "
 "paljonkaan määrittää."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:967
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4249,20 +4308,20 @@
 "Puutteellinen ketju, pääsertifikaatti ei ole itse allekirjoitettu "
 "valtuutetun sertifikaatti"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Salasana ei kelpaa"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Alustetaan TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Turvaton palvelin, ei tue FTP yli TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiivinen"
@@ -4272,8 +4331,8 @@
 msgstr "Käyttöliittymä"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Käyttäjän keskeytys"
 
@@ -4285,8 +4344,8 @@
 msgid "Invalid HTTP Response"
 msgstr "HTTP-vastaus ei kelpaa"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4309,12 +4368,13 @@
 msgid "Invalid date"
 msgstr "Päivämäärä ei kelpaa"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Epäkelpo tiedostonimi"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Kelvoton isäntä, lopettavan sulkumerkin jälkeen voi olla vain kaksoispiste "
@@ -4324,29 +4384,36 @@
 msgid "Invalid input"
 msgstr "Virheellinen syöte"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Portti ei kelpaa. Portin arvo täytyy olla väliltä 1 - 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Määritetty protokolla ei kelpaa. Kelvolliset portit:\n"
+"Määritetty protokolla ei kelpaa. Kelvolliset protokollat:\n"
 "ftp:// normaalille FTP:lle,\n"
 "sftp:// SSH tiedostonsiirtoprotokollalle,\n"
-"ftps:// FTP yli SSL (implisiittinen) ja\n"
-"ftpes:// FTP yli SSL (eksplisiittinen)."
+"ftps:// FTP yli TLS (implisiittinen) ja\n"
+"ftpes:// FTP yli TLS (eksplisiittinen)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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."
 
 # Searh conditions may be something else than 'hakuehdot'.
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Epäkelpo säännöllinen lauseke hakuehdoissa."
 
@@ -4355,7 +4422,7 @@
 msgstr "Vastauskoodi ei kelpaa"
 
 # Searh conditions may be something else than 'hakuehdot'.
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Epäkelvot hakuehdot: %s"
@@ -4367,39 +4434,39 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Sivuston polku ei kelpaa"
 
 # "Condition size" may be another than "Ehdon koko".
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ehdon koko ei kelpaa"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Käyttäjänimi ei kelpaa."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Oikeusvaltio:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Oikeuden paikkakunta:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Oikeuden maa tai lääni:"
 
-#: resources.h:913
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Pidä hakemistot päällimmäisinä"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4410,50 +4477,54 @@
 "testin kokeillakseen tukeeko palvelin tätä toimintoa, testi saattaa "
 "epäonnistua."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Avaimen vaihto"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Avaimen vaihto:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "P&ienin"
 
-#: resources.h:929
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Kieli"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Kieli vaihdettu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Muokattu"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Ulkoasu"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Samanaikaisten &latauksien raja palvelimelta:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Samanaikaisten la&tauksien raja palvelimelle:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Rajoita paikallisportit"
 
-#: resources.h:959
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Rajaa lokitiedoston koko"
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit:"
 msgstr "Raja:"
 
@@ -4461,7 +4532,7 @@
 msgid "Line length exceeded"
 msgstr "Rivin pituus ylitetty"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Linkitetty vastaan"
 
@@ -4470,21 +4541,21 @@
 msgstr "Kuuntelun socket-rajapinta suljettu"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listaus:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "&Pienin käytettävissä oleva portti:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Paikallinen kansio"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Paikallinen tiedosto"
 
@@ -4500,7 +4571,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Paikallinen tiedosto ei ole kelvollinen tiedostonimi."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Paikalliset suodattimet:"
 
@@ -4508,7 +4579,7 @@
 msgid "Local site:"
 msgstr "Paikallinen sivusto:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Sijainti:"
 
@@ -4516,16 +4587,16 @@
 msgid "Log file"
 msgstr "Lokitiedosto"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Päivitystarkistuksen loki:"
 
-#: resources.h:954
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Kirjautuminen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4534,7 +4605,7 @@
 "8:aa. Ei voi palata paikalliseen merkistöön, koska käytetään "
 "välityspalvelinta."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4542,11 +4613,11 @@
 "Kirjautumistiedot eivät sisällä ASCII-merkkejä, palvelin ei ehkä ymmärrä UTF-"
 "8:aa. Kokeillaan paikallista merkistöä."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "Kirjautuminen suoritettiin, mutta ei vielä kirjauduttu. Keskeytetään."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Kirjautumistyypin on oltava joko 'ask' tai 'interactive' (ilman "
@@ -4561,13 +4632,13 @@
 "Kirjautumistyyppiä voidaan käyttää ainoastaan FTP URL:n kanssa. Argumentin "
 "on oltava joko '%s' tai '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Pieni"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Pienin"
 
@@ -4575,11 +4646,11 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Varmista, että tiedoston voi avata ja että se on oikein muotoiltu XML-"
@@ -4604,7 +4675,7 @@
 "Virheellisesti muotoiltu vastaus, palvelin ei lähetä kelvollisia "
 "rivinlopetuksia"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4615,58 +4686,58 @@
 msgid "Manual transfer"
 msgstr "Manuaalinen siirto"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Täsmää kaikkiin seuraaviin"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Täsmää kaikkiin seuraaviin"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Älä täsmää seuraaviin"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Samanaikaisten s&iirtojen enimmäismäärä:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Sanomaloki"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Sanomalokin sijainti"
 
-#: resources.h:961
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "minuuttia"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Siirrä &alaspäin"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Siirrä &ylöspäin"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Oma tietokone"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Omat tiedostot"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Omat sivustot"
 
@@ -4675,33 +4746,33 @@
 msgid "N/a"
 msgstr "N/A"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nimi"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Nimi on jo olemassa."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Kirjanmerkki on jo käytössä."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nimi:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Suodatinnimi tarvitaan"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Kelvollinen polku tarvitaan"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Merkistökoodaus tarvitaan"
 
@@ -4709,19 +4780,23 @@
 msgid "Network unreachable"
 msgstr "Verkkoon ei saatu yhteyttä"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Ei koskaan"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Uusi ka&nsio"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "&Uusi välilehti"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Uusi kirjan&merkki"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4734,41 +4809,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Uusi kirjanmerkki"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Uusi hakemisto"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "%s:n uudet ominaisuudet ja parannukset"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Uusi suodatin"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Uusi kansio"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Uusi sivusto"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Seuraavana siirtojonossa"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Ei"
 
@@ -4776,25 +4851,25 @@
 msgid "No category to export selected"
 msgstr "Luokkaa ei ole valittu vientiin."
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Komentoa ei annettu, keskeytetään."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Ulkoista IP-osoitetta ei asetettu, kokeillaan oletusta."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Mitään tiedostoa ei ole tällä hetkellä muokkauksessa."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Suodatinnimeä ei annettu"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Isäntää ei annettu, anna isäntä."
 
@@ -4802,27 +4877,27 @@
 msgid "No images available"
 msgstr "Kuvia ei ole saatavilla."
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Jonossa ei ole enempää tiedostoja!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Suodatinjoukolle ei ole annettu nimeä."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Mitään ohjelmaa ei ole sidottu tietostotyyppiin"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Ei hakutuloksia"
 
@@ -4840,23 +4915,23 @@
 msgid "No username given."
 msgstr "Käyttäjänimeä ei annettu."
 
-#: resources.h:923 resources.h:928
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ei mitään"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Mitään ei ole vielä valittu"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normaali"
 
@@ -4867,15 +4942,15 @@
 "Kaikkia tiedostoja ei voitu lisätä jonoon näyttämistä/muokkausta varten."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Ei yhdistetty"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Ei yhdistetty mihinkään palvelimeen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Ei yhdistetty mihinkään palvelimeen."
 
@@ -4883,23 +4958,23 @@
 msgid "Not connected."
 msgstr "Ei yhdistetty."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 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."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Huomautus: Tämä toimii vain tavallisilla, salaamattomilla FTP-yhteyksillä."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Huom: FTP-yhteydet pakotetaan passiivitilaan käytettäessä yleistä "
 "välityspalvelinta."
 
-#: resources.h:902
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Desimaalipaikkojen määrä:"
 
@@ -4907,21 +4982,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Uudelleenyritysten määrän pitää olla välillä 0 ja 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Avaa &tiedosto"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4929,119 +5004,125 @@
 "Seuraavilla sivuilla määritetään valittu siirtotapa, kuten palautustila, jos "
 "käytössä."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Kerran"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Vain FileZillan versiot ja käyttämäsi käyttöjärjestelmä lähetetään "
-"palvelimelle."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Joka viikko"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Avaa hakemisto järjestelmän tiedostohallinnassa"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Avaa Sivustonhallinta"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Avaa Sivustonhallinta."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Avaa Sivustonhallinta. Klikkaa hiiren oikealla saadaksesi luettelon "
+"sivustoista."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Avaa tiedosto."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Avaa FileZillan asetusikkuna"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Avattu nimellä:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Avaus epäonnistui"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Avaa uuden välilehden"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Avaa Sivustonhallinnan"
 
-#: resources.h:996
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Avaa hakemistolistauksen suodatinikkunan. Klikkaa hiiren oikealla "
 "vaihtaaksesi suodattimia."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Käyttöjärjestelmä"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Käyttöjärjestelmän ongelma havaittu."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Järjestö:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Muu:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Yleiset"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Korvaa, &jos lähde uudempi"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Korvaa tiedosto"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Korvaa tiedosto, jos erikokoisia"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Korvaa tiedosto, jos erikokoisia tai lähdetiedosto on uudempi"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Korvaa tiedosto, jos lähdetiedosto on uudempi"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Korvaa, jos &erikokoisia"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Korvaa, jos eri&kokoisia tai lähde on uudempi"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Omistajan oikeudet"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Omistaja/Ryhmä"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5049,7 +5130,7 @@
 "E&stä järjestelmää menemästä lepotilaan siirtojen ja muiden toimintojen "
 "aikana"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Välityspalvelimen &isäntä:"
@@ -5058,27 +5139,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-komento reitittimen tai palomuurin hylkäämä."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssiivinen (suositus)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pakkaus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Parametri ei ole oikea URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "S&alasana:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passiivinen (suositus)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passiivitila"
@@ -5093,42 +5174,42 @@
 msgid "Password required"
 msgstr "Tarvitaan salasana"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Polku"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Polkua ei voi muodostaa hakemistoon %s ja alihakemistoon %s"
 
-#: resources.h:401
+#: resources.h:411
 msgid "Paths"
 msgstr "Polut"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Odottaa poistoa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Lupa"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Oikeudet"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Käyttötaso:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5144,7 +5225,7 @@
 "Tarkista osoitteessa: http://filezilla-project.org/probe.php, että palvelin "
 "on käynnissä ja tarkista asetuksesi huolella uudestaan."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5152,7 +5233,7 @@
 "Tarkista järjestelmäsi pakkauksenhallinnasta päivitetty pakkaus tai käy "
 "osoitteessa: http://filezilla-project.org ladataksesi FileZillan lähdekoodin."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5180,7 +5261,7 @@
 msgid "Please enter a custom time format."
 msgstr "Anna oma aikamuoto."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Anna lomakkeen päivämäärä muodossa VVVV-KK-PP, esimerkiksi 2010-07-18."
@@ -5192,20 +5273,20 @@
 msgstr ""
 "Anna latausnopeus palvelimelta, joka on suurempi tai yhtäsuuri kuin 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Anna nimi uudelle suodattimelle."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Anna uusi nimi kopioidulle suodattimelle."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Anna uusi nimi suodatinjoukolle \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Anna uusi nimi suodattimelle."
 
@@ -5226,11 +5307,11 @@
 "transfers."
 msgstr "Anna numero samanaikaisten siirtojen määrälle väliltä 1-10."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Anna salasana tälle palvelimelle:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5248,11 +5329,11 @@
 "Anna aikakatkaisu väliltä 5-9999 sekuntia tai 0 ottaaksesi aikakatkaisun "
 "pois käytöstä."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Anna nimi tälle suodatinjoukolle"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Anna käyttäjänimi tälle palvelimelle:"
 
@@ -5264,10 +5345,6 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Anna URL, josta ulkoinen osoite haetaan."
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Anna päivitysväli vähintään 7 päivälle."
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5275,7 +5352,7 @@
 msgstr ""
 "Anna latausnopeus palvelimelle, joka on suurempi tai yhtäsuuri kuin 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5283,14 +5360,18 @@
 "Anna FTP-komento.\n"
 "Käytettäessä FTP-komentoja, välimuistin hakemisto tyhjennetään."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Anna hakemiston nimi:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Anna luotavan tiedoston nimi:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Anna käyttäjänimi ja salasana tälle palvelimelle:"
 
@@ -5309,7 +5390,7 @@
 "on dynaaminen osoite tai et tiedä ulkoista osoitettasi, käytä ulkoisen "
 "ratkaisimen valintaa."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5324,7 +5405,7 @@
 "Varmista, että FileZillalla on oikeus muodostaa ulosmeneviä yhteyksiä ja "
 "että annoit osoitteen oikeassa muodossa."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Varmista, että pyydetty lokaali on asennettu järjestelmääsi."
 
@@ -5339,7 +5420,7 @@
 "tehdä asetukset manuaalisesti. Sinun pitää tehdä manuaalinen portin "
 "edelleenlähetys. Älä aja reititintä n.s. 'DMZ-tilassa' tai 'Pelitilassa'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5351,7 +5432,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:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5359,7 +5440,7 @@
 "Huomioi, että aikaleimojen sisällytys palvelimelle siirrettäessä FTP-, FTPS- "
 "ja FTPES-palvelimilla toimivat ainoastaan, jos ne tukevat MFMT-komentoa."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5367,7 +5448,7 @@
 "Huomioi, että jotkut palvelimet saattavat torjua sinut, jos yrität yhdistää "
 "uudelleen liian useasti tai yhdistät liian lyhyillä aikaväleillä."
 
-#: resources.h:889 resources.h:895
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5376,7 +5457,7 @@
 "Saat tarkempia tietoja osoitteesta: http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting."
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5393,38 +5474,38 @@
 "Jos muutat verkon asetuksia, aja tämä velho uudestaan tai jos kohtaat "
 "ongelmia palvelimien kanssa, jotka toimivat aikaisemmin."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Valitse toiminto:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Valitse tuotavat luokat."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Valitse käytettävän siirron oletustapa."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Valitse uudet määritteet hakemistolle \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Valitse uudet määritteet tiedostolle \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Valitse uudet määriteet valituille hakemistoille."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Valitse uudet määritteet valituille tiedostoille ja hakemistoille."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Valitse uudet määritteet valituille tiedostoille."
 
@@ -5442,7 +5523,7 @@
 "Protokollan tarkistukset tai erikoiset 'korjaukset' pitää ottaa pois "
 "käytöstä."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5450,8 +5531,8 @@
 "Käy osoitteessa: http://filezilla-project.org saadaksesi tarkempia tietoja "
 "FileZillasta."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5459,17 +5540,17 @@
 "Käy osoitteessa: http://filezilla-project.org ladataksesi viimeisimmän "
 "version."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Postinumero:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Esimääritetyt sivustot"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Sisällytetään aikaleimoja"
 
@@ -5477,47 +5558,59 @@
 msgid "Preview:"
 msgstr "Esikatselu:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:993
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Ensisijaisen yhteyden ja datayhteyden sertifikaatit eivät täsmää."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Tulosta FileZillan käynnistymiseen liittyvä diagnostiikka"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Tulosta versiotiedot stdout:iin ja lopeta"
 
-#: resources.h:912
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Aseta hakemistot tärkeysjärjestykseen (oletus)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioriteetti"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Yksityisyyskäytäntö:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Yksityiskäytäntö. Vain sinun FileZilla-versio, sinun käyttämäsi "
+"käyttöjärjestelmä ja CPU-arkkitehtuuri lähetetään palvelimelle."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Salaiset &avaimet:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tokolla:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Välityspalvelimen s&alasana:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Käsittele jo&no"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protokolla:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Välityspalvelimen &portti:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Välityspalvelimen &käyttäjä:"
 
@@ -5525,12 +5618,16 @@
 msgid "Proxy authentication failed"
 msgstr "Välityspalvelimen todennus epäonnistui"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Välityspalvelimen kättely epäonnistui: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5547,23 +5644,23 @@
 "Välityspalvelimen pyyntö epäonnistui: Tuntematon osoitteen tyyppi CONNECT-"
 "vastauksessa"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Välityspalvelin asetettu, mutta isäntä tai portti epäkelpo"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Julkisen avaimen todennus"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Julkisen avaimen algoritmi:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Julkiset oikeudet"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Jono käsitelty onnistuneesti"
 
@@ -5582,39 +5679,39 @@
 msgid "Queue: empty"
 msgstr "Jono: tyhjä"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Jonossa olevat tiedostot"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Jono:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "K&äynnistä tietokone uudestaan"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Palvelimen hake&mistopuu"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "R&esetoi ja laita valitut tiedostot jonoon uudestaan"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "FTP-komento"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "L&ue"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "&Virkistä"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Nimeä &uudelleen"
 
@@ -5626,65 +5723,74 @@
 "Suorita velho uudestaan, tarkista huolellisesti asetuksesi ja määritä kaikki "
 "reitittimet ja palomuurit."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Lu&e"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Vain luku"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Perutetaanko toiminto?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Poistetaanko %d hakemisto sisältöineen?"
-msgstr[1] "Poistetaanko %d hakemistot sisältöineen?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Poistetaanko %d tiedosto?"
-msgstr[1] "Poistetaanko %d tiedostoa?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
-#, c-format
-msgid "Really delete %s and %s?"
-msgstr "Poistetaanko %s ja %s?"
+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] "Poistetaanko %d hakemisto sisältöineen palvelimelta?"
+msgstr[1] "Poistetaanko %d hakemistot sisältöineen palvelimelta?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Poistetaanko %s ja %s palvelimelta?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Poistetaanko kaikki valitut tiedostot ja/tai hakemistot?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Syy"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Käynnistä tietokone uudellen nyt"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Rek&ursoi alihakemistoihin"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Vastaanotettiin EBCDIC-koodattu hakemistolistaus."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Vastaanotettiin yli 10000 merkin rivi, keskeytetään."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Vastaanotettu data hylättiin"
 
@@ -5696,11 +5802,11 @@
 "Uudelleenyhdistämisen tietoja ei voi tyhjentää, kun palvelimeen on yhteys.\n"
 "Jos jatkat, yhteydesi katkaistaan."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Uudelleenyhdistämisen asetukset"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Yhdistä uudelleen viimeisimpään käytettyyn palvelimeen"
 
@@ -5708,34 +5814,38 @@
 msgid "Redirection to invalid address"
 msgstr "Uudelleenohjaus epäkelpoon osoitteeseen"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Päivitä tiedosto- ja kansiolistaukset"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "&Muistetaanko salasanat?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Palvelin"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Palvelimen sertifikaatti ei ole luotettava."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Palvelimen tiedosto"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Palvelimen tiedostohaku"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Palvelimen suodattimet:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Palvelimen polku"
 
@@ -5748,7 +5858,7 @@
 "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen, "
 "absoluuttinen polku ja nykyisen sivuston palvelintyypin (%s) tukema."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5760,7 +5870,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Palvelimen oletuspolkua ei voi jäsentää. Varmista, että se on kelvollinen, "
@@ -5770,11 +5880,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Palvelimen polkua ei voitu jäsentää."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Palvelimen polkumääritys:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Palvelimen polku:"
 
@@ -5782,76 +5892,76 @@
 msgid "Remote site:"
 msgstr "Palvelimen sivusto:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Poista &kaikki"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Poista &valittu"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Nimeä tiedosto uudelleen"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Nimeä valittu hakemisto uudelleen"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Nimeä uudelleen tiedostot ja hakemistot"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Nimetään uudelleen '%s' '%s':ksi"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Bugien ja ominaisuuspyyntöjen raportointi"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Vaadi eksplisiittinen FTP yli TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Vaadi implisiittinen FTP yli TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Resetoi ja laita &kaikki tiedostot jonoon uudestaan"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Selvitetään osoitetta kohteelle %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Selvitetään isäntänimeä"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Vastaus:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Tulokset:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Jatka tiedostonsiirtoa"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5859,34 +5969,38 @@
 "Palautettaessa ASCII-tiedostoja ne voivat aiheuttaa ongelmia, jos palvelin "
 "käyttää erilaista rivinlopetuksen muotoa kuin asiakas."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Haetaan hakemistolistausta..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Haetaan ulkoista IP-osoitetta kohteesta %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "Root certificate is not trusted"
 msgstr "Juurisertifikaatti ei ole luotettava"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "&Näytä muokkauksessa olevat tiedostot..."
 
-#: resources.h:609
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "&Näytä Sivustonhallinta käynnistyksen yhteydessä"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Sa&mmuta tietokone"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Pysäytä"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "S&ynkronoitu selaus"
 
@@ -5894,32 +6008,47 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Tallennetaanko asetukset?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Salasanan tallentaminen on poistettu käytöstä sinun toimesta."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Skannataan tiedostoja jonoon lisättäväksi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Skannataan tiedostoja ladattavaksi palvelimelle"
 
 # "Condition size" may be another than "Ehdon koko".
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Haku&ehdot:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Etsi &hakemistosta:"
 
-#: resources.h:1001
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Etsi tiedostoja rekursiivisesti."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Etsi tiedostoja palvelimelta"
 
@@ -5932,25 +6061,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Katso myös: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "&Valitse palvelin"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Valitse &sivu:"
 
-#: resources.h:877
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Valitse teema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Valitse oletustoiminto, jos siirron kohdetiedosto on jo olemassa."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Valitse oletusmuokkain"
 
@@ -5970,7 +6099,7 @@
 "Valitse oletustiedosto on jo olemassa -oletustoiminto vain jonossa "
 "valituille tiedostoille."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Valitse pakkauksen latauskohde"
 
@@ -5991,7 +6120,7 @@
 msgstr "Valitse vientiasetusten tiedosto"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Valitse tiedosto viedyille sivustoille"
 
@@ -6007,12 +6136,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Valitse tiedostonimi muunnetulle avaintiedostolle"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Valitse, miten nämä tiedostot tulisi avata."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Valitse latauksen kohdehakemisto"
 
@@ -6020,15 +6149,15 @@
 msgid "Select target filename"
 msgstr "Valitse kohteen tiedostonimi"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Valitse vietävät luokat:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Valitse tyhjennettävät yksityisyystiedot."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6042,7 +6171,7 @@
 msgstr[0] "Valittu %d hakemisto."
 msgstr[1] "Valittu %d hakemistoa."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6063,7 +6192,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Valittu %s ja %s siirtoa varten."
@@ -6078,13 +6207,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Valittu %s ja %s. Koko yhteensä: vähintään %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Valittua muokkainta ei löydy."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Valittu tiedosto on jo muokattavana"
 
@@ -6092,15 +6221,15 @@
 msgid "Selected file is already loaded"
 msgstr "Valittu tiedosto on jo avattu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Valittu tiedosto on jo avoinna"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Valittu tiedosto on vielä muokattavana"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Valittu suodatin toimii ainoastaan paikallisisten tiedostojen kanssa."
 
@@ -6117,37 +6246,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Valittu portti on yleensä toisen protokollan käytössä."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Lähetä FTP:n &Keep-Alive komentoja"
 
-#: resources.h:543
+#: resources.h:560
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Lähetetään Keep-Alive komento"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Sarjanumero:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Palvelime&n tyyppi:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Palvelin ei lopettanut kunnolla TLS-yhteyttä"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Palvelin ei tue merkkejä, jotka eivät ole ASCII-muodossa."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6156,15 +6290,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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Palvelin ei tue tiedostoja, jotka ovat > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Palvelin ei tue tiedostoja, jotka ovat > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6173,17 +6307,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 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:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Palvelin lähetti tyhjän polun."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6191,13 +6325,13 @@
 "Palvelin lähetti kirjautumisen lisäkyselyn. Sinun pitää käyttää "
 "interaktiivista kirjautumistapaa."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6217,101 +6351,113 @@
 msgid "Server sent unexpected reply."
 msgstr "Palvelin lähetti odottamattoman vastauksen."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Palvelin -> Asiakas-MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Palvelin -> Asiakkaan salaus:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Palveli&ntyyppi:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Palvelin/Paikallinen tiedosto"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Palvelin:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Yhteyskerran tiedot"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Aseta &prioriteetti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Aseta oikeudet '%s':sta '%s':een"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize-kutsu ilman socket-rajapintaa"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Asetukset"
 
-#: resources.h:974
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "&Näytä pelkistetty hakemistolistaus"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "&Näytä tervetuloikkuna..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Näytetäänkö molemmat hakemistopuut ja jatketaan vertailua?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Näyttää olemassa olevat TLS -salaukset"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Näyttää tämän apuikkunan"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Sammutetaan nyt"
 
-#: resources.h:299
+#: resources.h:9
+#, fuzzy
+msgid "Signature algorithm:"
+msgstr "Julkisen avaimen algoritmi:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Sivustonhallinnan kohteet"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Sivustonhallinta"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Sivustonhallinta - Ei muista salasanaa"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Sivustonhallinta - Virheellinen data"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Sivustonhallinta on jo avoinna"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Sivustoa ei ole olemassa."
 
@@ -6321,8 +6467,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Sivuston polku väärin muodostettu."
 
@@ -6341,11 +6487,11 @@
 "Sivustonhallintaan.\n"
 "Lisätäänkö nykyinen yhteys Sivustonhallintaan?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Koko"
 
-#: resources.h:896
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Tiedostokoon muoto"
 
@@ -6354,33 +6500,33 @@
 msgid "Size unknown"
 msgstr "Koko tuntematon"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Hylkää tiedosto"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Ohitetaan %s:n lataus palvelimelta"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Ohitetaan %s:n lataus palvelimelle"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 "Jotkut tiedostot ovat vielä muokattavana tai tarvitsevat latausta "
 "palvelimelle."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6388,19 +6534,19 @@
 "Jotkut väärin määritety palvelimet, jotka ovat reitittimen takana, voivat "
 "vastata niiden paikallisella IP-osoitteella."
 
-#: resources.h:914
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Lajittele linjalla olevat hakemistot"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Lajittelujärjestystä ei voi muuttaa, jos vertaillaan hakemistoja."
 
-#: resources.h:910
+#: resources.h:932
 msgid "Sorting"
 msgstr "Lajittelu"
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Lajittelu&peruste:"
 
@@ -6412,20 +6558,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Lähde- ja kohdetiedosto eivät ehkä ole samat"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Pudotus-toiminnon lähde ja kohde ovat samanlaiset"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Lähdetiedosto:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Nopeusrajoitukset"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Nopeusrajoitukset"
 
@@ -6437,7 +6583,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Nopeusrajoitukset käytössä, klikkaa vaihtaaksesi."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Vakaat ja betaversiot"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Ainoastaan vakaat versiot"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Aloita siirto &heti"
 
@@ -6445,43 +6599,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Avaa Sivustonhallinta avattuna"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Aloitetaan %s:n lataus palvelimelta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Aloitetaan %s:n lataus palvelimelle"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Maa tai lääni:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Tila"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Tila:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Pysäytä ja poista &kaikki"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Katu:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Sertifikaatin aihe"
 
@@ -6489,11 +6643,11 @@
 msgid "Successful transfers"
 msgstr "Onnistuneet siirrot"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Testituloksien yhteenveto:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6501,44 +6655,44 @@
 "Tämä valinta ei vaikuta tiedostojen 'symlinkkeihin', sellaiset 'symlinkit' "
 "poistetaan aina."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synkronoitu selaus"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synkronoitu selaus poistettu käytöstä."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaksivirhe"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Syntaksivirhe komentorivillä"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Järjestelmä"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "T&yökalurivi"
 
@@ -6546,11 +6700,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL-yhteys muodostettu, lähetetään HTTP-pyyntö"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL -yhteys muodostettu, odotetaan tervetulosanomaa..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL -yhteys muodostettu."
 
@@ -6558,27 +6712,31 @@
 msgid "TTL expired"
 msgstr "TTL umpeutunut"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Kohdetiedosto on jo olemassa"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Kohdetiedosto:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Kohdetiedosto on jo olemassa!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Kohdetiedosto on jo olemassa, jatketaanko?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Testitulokset"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testataan palvelimen kykyjä jatkaa"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6595,7 +6753,7 @@
 "Sivustonhallinta on avoinna toisessa FileZilla 3:n instanssissa.\n"
 "Sulje se tai dataa ei voi poistaa."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-asiakirja on väärin muodostettu: %s"
@@ -6606,11 +6764,11 @@
 msgstr "Antamasi osoite oli: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Kirjanmerkkiä ei voitu lisätä."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Kirjanmerkkejä ei voitu tyhjentää."
 
@@ -6622,19 +6780,19 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Muokattu kirjautumisalue ei voi olla tyhjä."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Tekstitiedostojen oletusmuokkainta ei löytynyt."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Tekstitiedostojen oletusmuokkain on '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Annettu suodatinnimi on jo olemassa, valitse toinen nimi."
 
@@ -6653,9 +6811,9 @@
 "Tiedosto %s on jo olemassa.\n"
 "Anna uusi nimi:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6671,14 +6829,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Tiedostoa '%s' ei voitu avata tai se ei sisällä salattua avainta."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Tiedostoa '%s' ei voitu ladata."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6687,8 +6845,8 @@
 "Tiedostoa '%s' ei voitu avata:\n"
 "Mitään järjestelmän ohjelmaa ei ole sidottu tähän tiedostotyyppiin."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6730,7 +6888,7 @@
 "suojattuja avaintiedostoja.\n"
 "Muunnetaanko se suojaamattomaksi tiedostoksi?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Valittua oletusmuokkaintiedostoa ei ole olemassa."
 
@@ -6766,11 +6924,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Seuraavat merkit korvataan merkeillä: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Seuraavat tiedostot ovat tällä hetkellä muokattavana:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Ilmainen avoimen lähdekoodin FTP-ratkaisu"
 
@@ -6778,7 +6936,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Globaaleja kirjanmerkkejä ei voitu tallentaa."
 
-#: resources.h:972
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6809,7 +6967,7 @@
 "Pienin käytettävissä olevan portin pitää olla pienempi tai yhtäsuuri kuin "
 "korkein käytettävissä oleva portti."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6817,17 +6975,17 @@
 "Viimeisin versio on ladattu. Klikkaa Lopeta sulkeaksesi FileZillan ja "
 "aloittaaksesi asennuksen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 "Viimeisin versio on ladattu. Asenna se kuten asensit tämänkin version."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Jonoa ei tallenneta."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6841,23 +6999,23 @@
 msgid "The selected categories have been imported."
 msgstr "Valitut luokat on tuotu."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Valittu tiedosto sisältää tuotavaa dataa seuraaville luokille:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Valittu tiedosto on jo muokattavana:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Valittu tiedosto on yhä avoinna jossakin toisessa ohjelmassa, sulje se."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6875,7 +7033,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Palvelin lähetti odottamattoman tai tuntemattoman vastauksen."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Palvelin käyttää seuraavaa merkistökoodausta tiedostonimille:"
 
@@ -6887,7 +7045,7 @@
 "Tuntematon palvelimen sertifikaatti. Tutki sertifikaattia huolella "
 "varmistaaksesi, että palvelimeen voi luottaa."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6897,7 +7055,7 @@
 "tarkoittaa, että ylläpitäjä on vaihtanut isäntäavaimen tai yrität yhdistää "
 "toiseen tietokoneeseen olettaen, että se on palvelin."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6913,15 +7071,15 @@
 "Asetukset on tuotu. FileZilla pitää käynnistää uudelleen, jotta kaikki "
 "asetukset tulevat voimaan."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 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:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Järjestelmä sammutetaan kohta, jollet paina Peruuta."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6929,7 +7087,7 @@
 "Kohdetiedosto on jo olemassa.\n"
 "Valitse toiminto."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testi epäonnistui. Tallennetaanko asetukset?"
 
@@ -6937,11 +7095,11 @@
 msgid "Themes"
 msgstr "Teemat"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Ei voi poistaa tätä suodatinjoukkoa."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Tätä suodatinjoukkoa ei voi nimetä uudelleen."
 
@@ -6953,7 +7111,7 @@
 "Tämä tarkoittaa, että joku reititin ja/tai palomuuri haittaa yhä FileZillan "
 "toimintaa."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6961,7 +7119,7 @@
 "Tämä toimii vain, jos et ole palomuurin takana, muutoin järjestelmäsi "
 "palauttaa sisäisen osoitteesi."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6969,25 +7127,25 @@
 "Tämä velho auttaa sinua määrittämään minkä tahansa reitittimen ja palomuurin "
 "asianmukaisesti ja testaa määrityksen."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Aika"
 
-#: resources.h:890
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Ajan muoto"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "&Aikakatkaisu sekunneissa:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Aikakatkaisu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6996,23 +7154,23 @@
 "Aikavyöhykkeen siirtymät: Palvelin: %d sekuntia. Paikallinen: %d sekuntia. "
 "Erotus: %d sekuntia."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Otsikko:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Jotta tämän voi tehdä, molemmat hakemistopuut pitää olla näkyvissä tai "
 "piilotettuna."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7020,7 +7178,7 @@
 "FileZillan pitää tietää mitä salattuja avaimia käytetään julkisen avaimen "
 "todentamiseksi."
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7036,7 +7194,7 @@
 "Vihreä: Tiedosto on uudempi kuin merkitsemätön tiedosto toisella puolella\n"
 "Punainen: Tiedostokoot eivät täsmää"
 
-#: resources.h:999
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7046,23 +7204,23 @@
 "Jos käytössä, paikallisen hakemistorakenteen selaus vaihtaa samalla myös "
 "palvelinhakemistoa ja päinvastoin."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Käsittele siirtojono"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Paikallinen hakemistopuu"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Sanomaloki"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Palvelimen hakemistopuu"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Siirtojono"
 
@@ -7075,37 +7233,37 @@
 msgstr "Liian monta uudelleenohjausta"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Jäljitä:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Siirto"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Siirron &suunta"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Siirtotyyppi"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Siirtotapa"
 
-#: resources.h:876
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Siirtojono"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Siirtoasetukset"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Siirtoyhteys keskeytetty: %s"
@@ -7114,8 +7272,8 @@
 msgid "Transferred data got tainted."
 msgstr "Siirretty data vahingoittui."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Siirretään"
 
@@ -7123,69 +7281,69 @@
 msgid "Transfers"
 msgstr "Siirrot"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Siirto valmis"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Käsittele tiedostoja il&man tarkenninta ASCII-tiedostona"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Käsittele se&uraavia tiedostotyyppejä ASCII-tiedostoina:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Luota vaihdettuun isäntäavaimeen:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Luota uuteen isäntäavaimeen:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Luotetaanko uuteen avaimeen ja jatketaan yhdistämistä?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Luotetaanko tähän sertifikaattiin ja jatketaan yhdistämistä?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Luotetaanko tähän isäntään ja jatketaan yhdistämistä?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tyyppi"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "FTP-välityspalvelimen tyyppi:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Yleisen välityspalvelimen tyyppi:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "L&ataa palvelimelle"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Latausrajoitus pal&velimelle:"
 
-#: resources.h:938
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Kä&ytä tiedostotyypin sidoksia, jos saatavilla"
 
-#: resources.h:891
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Kä&ytä järjestelmän oletuksia"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7194,16 +7352,16 @@
 msgid "Unassigned error code %d"
 msgstr "Määrittelemätön virhekoodi %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Yksikkö:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Tuntematon"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Tuntematon FTP-välityspalvelimen tyyppi, ei voi luoda kirjautumisaluetta."
@@ -7217,7 +7375,7 @@
 msgid "Unknown certificate"
 msgstr "Tuntematon sertifikaatti"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7225,7 +7383,7 @@
 "Tuntematon virhe avattaessa tiedostoa. Varmista, että tiedoston voi avata ja "
 "että se on oikein muodostettu XML-asiakirja."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Tuntematon isäntäavain"
 
@@ -7238,7 +7396,7 @@
 "Tuntematon protokollan versio SOCKS käyttäjänimi/salasana todentamis-"
 "alineuvottelusta: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7261,7 +7419,7 @@
 "Siihen asti kunnes tämä ongelma korjataan, aktiivitilan FTP ei toimi ja "
 "passiivitilaa täytyy käyttää."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:945
 msgid "Unsupported certificate type"
 msgstr "Sertifikaatin tyyppi ei tuettu"
 
@@ -7269,25 +7427,24 @@
 msgid "Unsupported redirect"
 msgstr "Uudellenohjaus ei tuettu"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "&Lataa palvelimelle ja poistu muokkauksesta"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Päivitystarkistus"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Päivitysvelho"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Päivitykset"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Lataa palvelimelle"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Lataus palvelimelle epäonnistui"
 
@@ -7300,99 +7457,99 @@
 msgid "Upload limit: none"
 msgstr "Latauksen rajoitus palvelimelle: Ei mitään"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Lataa valittu hakemisto palvelimelle"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Lataa valitut tiedostot ja hakemistot palvelimelle"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Ladataanko tämä tiedosto takaisin palvelimelle?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Ladataanko tämä tiedosto palvelimelle?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Ladataan palvelimelle"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Ladataan palvelimelle ja odotetaan poistoa"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Ladataan palvelimelle ja perutaan muokkaus"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Käytä o&maa merkistöä"
 
-#: resources.h:935
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Käytä &erillistä muokkainta:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Käytä &oletusmuokkainta tekstitiedostoille"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Käytä &synkronoitua selausta"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Käytä UTF-8:aa, jos palvelin tukee sitä, käytä muutoin paikallista merkistöä."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Käytä oletustoimintoa"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Käytä pelkkää FTP:tä"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Käytä palvelinta, joka on yhteydessä kohteeseen"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Käytä Sivustonhallinnan palvelinta"
 
-#: resources.h:885
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Käytä järjestelmän o&letuksia"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Käytä seuraavaa IP-osoitetta:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Käytä seuraavaa porttialuetta:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Käytä palvelimen ulkoista IP-osoitetta"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Käytä tätä, jos olet reitittimen takana ja sinulla on staattinen ulkoinen IP-"
 "osoite."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7403,36 +7560,36 @@
 "käytät aktiivitilaa ensimmäisen kerran. Vain käyttämäsi FileZillan versio "
 "lähetetään palvelimelle."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Käyttäjä:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Käyttäjänimi ei voi olla sarja välilyöntejä"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Käytetään välityspalvelinta %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "Jos käytetään väärää merkistöä, tiedostonimet eivät ehkä näy oikein."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Tätä velhoa käytettäessä voit tarkistaa saatavilla olevat FileZillan "
 "päivitykset."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Voimassa alkaen:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Voimassa loppuen:"
 
@@ -7440,47 +7597,47 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Monisanaisia lokisanomia vxWidgets'istä"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1149
 msgid "Verifying certificate..."
 msgstr "Varmennetaan sertifikaattia..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versio:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Erittäin suuri"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Näyttää piilotetut valinnat, joita palvelin ei tue"
 
-#: resources.h:922
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Näytä/Muokkaa"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Näkyvät sarakkeet"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "K&irjoita"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Odotetaan"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Odotetaan selauksen yhdistämistä"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Odotetaan salasanaa"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Odotetaan, siirron peruuttamista"
 
@@ -7488,7 +7645,7 @@
 msgid "Waiting to retry..."
 msgstr "Odotetaan uudelleenyritystä..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7519,11 +7676,11 @@
 "palvelua,\n"
 "FileZilla aikakatkaisee yhteyden isoissa siirroissa."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Varoitus, ohitetaan datayhteys väärästä IP:stä."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7538,23 +7695,31 @@
 "\n"
 "Haluatko varmasti tarkistaa yölliset sovellukset?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Varoitus: Mahdollinen turva-aukko!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Tervetuloa FileZillaan"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Mitä uutta"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Uudet asiat:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Kun sallitaan FileZillan muistavan salasanat, salasanaa ei tarvitse "
+"kirjoittaa uudelleen yhdistettäessä FileZillan käynnistyksen jälkeen."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7562,11 +7727,15 @@
 "Kun käytössä, merkit, joita paikallinen järjestelmä ei tunnista "
 "tiedostonimissä, korvataan, jos sellainen tiedosto ladataan."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Kokoruutu"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Annetaanko FileZillan muistaa salasanat?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Ki&rjoita"
 
@@ -7579,26 +7748,32 @@
 msgid "Wrong line endings"
 msgstr "Väärät rivin lopetukset"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Kyllä"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "Käytät IPv6-only -isäntää. Tämä velho ei tue tätä ympäristöä."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 "Käytät jo viimeisintä FileZillan versiota. Tarkista uudelleen myöhemmin."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Voit aina avata tämän ikkunan uudestaan ohjevalikosta."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Voit jättää porttikentän tyhjäksi, jolloin käytetään oletusporttia."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7622,30 +7797,30 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Et antanut uutta nimeä tiedostolle. Korvataanko tiedosto?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Olet valinnut vähintään yhden symbolisen linkin."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 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:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 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:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Anna isäntänimi."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Anna paikallinen hakemisto."
 
@@ -7654,17 +7829,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Anna kelvollinen IP-osoite."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Anna paikallinen hakemisto, johon voi kirjoittaa."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Anna tilinimi."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Anna käyttäjänimi."
 
@@ -7684,28 +7859,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Anna nimi lokitiedostolle."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Anna lainausmerkeissä oleva komento."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Välityspalvelimen isäntä pitää antaa."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Välityspalvelimen portti pitää antaa väliltä 1 ja 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Ainakin yksi polku pitää antaa, tyhjiä kirjanmerkkejä ei tueta."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7713,7 +7888,7 @@
 "Sinun täytyy antaa paikallisen ja palvelimen polut ottaaksesi tämän "
 "kirjanmerkin synkronoidun selauksen käyttöön."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7745,44 +7920,49 @@
 "Sinulla ei pitäisi olla ongelmia yhdistettäessä toisille palvelimille, "
 "tiedostonsiirtojen pitäisi toimia oikein."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "jälkeen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "ennen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "alkaa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "tavua"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "sisältää"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "ei sisällä"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "ei ole yhtä kuin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "loppuu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "yhtäsuuri kuin"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "tiedosto"
 
@@ -7801,91 +7981,130 @@
 "Varmista, että tämä käynnistystiedosto sijaitsee samassa hakemistossa kuin "
 "FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp ei käynnistynyt"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:983
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers ei palauttanut sertifikaatteja"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "suurempi kuin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "ryhmän käynnistettävä"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "ryhmän luettava"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "ryhmän kirjoittava"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "yhtäsuuri kuin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "on asetettu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "asetus poistettu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "pienempi kuin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "täsmää regex:iin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "omistajan käynnistettävä"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "omistajan luettava"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "omistajan kirjoittava"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1160
+#: ../../locales/../src/engine/tlssocket.cpp:1171
+#: ../../locales/../src/engine/tlssocket.cpp:1186
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "tuntematon"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "maailman käynnistettävä"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "maailma luettavissa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "maailma kirjoitettavissa"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Kopioi"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "Ota &automaattinen päivitystarkistus käyttöön"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Päiviä päivitystarkistusten välillä:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Vähintään 7 päivää)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automaattinen päivitystarkistus"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "&Tarkista FileZillan &betaversiot ja julkaisuehdokkaat"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Kopioi"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Anna päivitysväli vähintään 7 päivälle."
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Yksityisyyskäytäntö:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d kt/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d Mt/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s tavua (%d.%d kt/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s tavua (%d.%d Mt/s)"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Tiedostonimen duplikaatti"
 
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Ei voitu ladata päävalikkoa resurssitiedostosta"
 
-#~ msgid "bytes"
-#~ msgstr "tavua"
-
 #~ msgid "Break current connection?"
 #~ msgstr "Katkaistaanko yhteys?"
 
diff -Nru filezilla-3.5.3/locales/filezilla.pot filezilla-3.7.3~precise/locales/filezilla.pot
--- filezilla-3.5.3/locales/filezilla.pot	2012-01-08 13:29:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/filezilla.pot	2013-08-07 19:17:25.000000000 +0000
@@ -8,7 +8,7 @@
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-08 14:29+0100\n"
+"POT-Creation-Date: 2013-08-07 21:17+0200\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -19,16 +19,16 @@
 "Plural-Forms: nplurals=INTEGER; plural=EXPRESSION;\n"
 
 #: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:65
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:225
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:69
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:233
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr ""
 
-#: resources.h:778
+#: resources.h:800
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -44,20 +44,20 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1696
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:776
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1029
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:777
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1030
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1721
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
 msgstr[0] ""
 msgstr[1] ""
 
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:776
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1029
 #: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1695
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:775
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1028
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1720
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -78,7 +78,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2937
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr ""
@@ -90,31 +90,21 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:775
+#: resources.h:797
 msgid "%h - Host"
 msgstr ""
 
-#: resources.h:777
+#: resources.h:799
 #, no-c-format
 msgid "%p - Password"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr ""
-
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:179
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d KB/s)"
+msgid "%s (%s/s)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr ""
-
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:184
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr ""
@@ -129,7 +119,7 @@
 msgid "%s - Not yet valid!"
 msgstr ""
 
-#: resources.h:779
+#: resources.h:801
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr ""
@@ -151,27 +141,17 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:904
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr ""
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr ""
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:884
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
+msgid "%s bytes (%s/s)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:701
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -181,7 +161,7 @@
 "bug report."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:795
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -197,152 +177,148 @@
 msgid "%s with %d bits"
 msgstr ""
 
-#: resources.h:776
+#: resources.h:798
 #, no-c-format
 msgid "%u - Username"
 msgstr ""
 
-#: resources.h:780
+#: resources.h:802
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr ""
 
-#: resources.h:555
+#: resources.h:573
 msgid "&About..."
 msgstr ""
 
-#: resources.h:86 resources.h:384
+#: resources.h:96 resources.h:395
 msgid "&Account:"
 msgstr ""
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:111 resources.h:702 resources.h:766
 msgid "&Active"
 msgstr ""
 
-#: resources.h:546
+#: resources.h:564
 msgid "&Add bookmark..."
 msgstr ""
 
-#: resources.h:559 resources.h:576
+#: resources.h:577 resources.h:594
 msgid "&Add files to queue"
 msgstr ""
 
-#: resources.h:788
+#: resources.h:810
 msgid "&Add keyfile..."
 msgstr ""
 
-#: resources.h:630 resources.h:649
+#: resources.h:652 resources.h:671
 msgid "&Add to queue"
 msgstr ""
 
-#: resources.h:95
+#: resources.h:105
 msgid "&Adjust server timezone offset:"
 msgstr ""
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr ""
 
-#: resources.h:182
+#: resources.h:193
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Always use default editor"
 msgstr ""
 
-#: resources.h:427
+#: resources.h:438
 msgid "&Always use selection for unassociated files"
 msgstr ""
 
-#: resources.h:65
+#: resources.h:75
 msgid "&Always use this action"
 msgstr ""
 
-#: resources.h:756
+#: resources.h:778
 msgid "&Ask your operating system for the external IP address"
 msgstr ""
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Auto"
 msgstr ""
 
-#: resources.h:107
+#: resources.h:117
 msgid "&Autodetect"
 msgstr ""
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:548 resources.h:684 resources.h:849
 msgid "&Binary"
 msgstr ""
 
-#: resources.h:900
+#: resources.h:922
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:545
+#: resources.h:563
 msgid "&Bookmarks"
 msgstr ""
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:102 resources.h:377 resources.h:414 resources.h:420
+#: resources.h:437 resources.h:455 resources.h:959 resources.h:985
 msgid "&Browse..."
 msgstr ""
 
-#: resources.h:815
+#: resources.h:837
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr ""
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:138 resources.h:141 resources.h:208 resources.h:499
+#: resources.h:506 resources.h:750
 msgid "&Cancel"
 msgstr ""
 
-#: resources.h:235
+#: resources.h:246
 msgid "&Check for beta versions of FileZilla"
 msgstr ""
 
-#: resources.h:505
+#: resources.h:523
 msgid "&Clear private data..."
 msgstr ""
 
-#: resources.h:603
+#: resources.h:623
 msgid "&Close FileZilla"
 msgstr ""
 
-#: resources.h:670
+#: resources.h:692
 msgid "&Configure speed limits..."
 msgstr ""
 
-#: resources.h:533
+#: resources.h:551
 msgid "&Configure..."
 msgstr ""
 
-#: resources.h:113
+#: resources.h:123
 msgid "&Connect"
 msgstr ""
 
-#: resources.h:218
-msgid "&Copy"
-msgstr ""
-
-#: resources.h:493
+#: resources.h:511
 msgid "&Copy current connection to Site Manager..."
 msgstr ""
 
-#: resources.h:172 resources.h:612
+#: resources.h:183 resources.h:632
 msgid "&Copy to clipboard"
 msgstr ""
 
-#: resources.h:617
+#: resources.h:637
 msgid "&Crash"
 msgstr ""
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "&Create directory"
 msgstr ""
 
-#: resources.h:665
+#: resources.h:687
 msgid "&Create new tab"
 msgstr ""
 
@@ -350,644 +326,652 @@
 msgid "&Debug"
 msgstr ""
 
-#: resources.h:967
+#: resources.h:993
 msgid "&Debug information in message log:"
 msgstr ""
 
-#: resources.h:933
+#: resources.h:955
 msgid "&Default editor:"
 msgstr ""
 
-#: resources.h:526 resources.h:595
+#: resources.h:544 resources.h:615
 msgid "&Default file exists action..."
 msgstr ""
 
-#: resources.h:738
+#: resources.h:760
 msgid "&Delay between failed login attempts:"
 msgstr ""
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:86 resources.h:213 resources.h:227 resources.h:427
+#: resources.h:588 resources.h:677
 msgid "&Delete"
 msgstr ""
 
-#: resources.h:457
+#: resources.h:468
 msgid "&Delete symlink"
 msgstr ""
 
-#: resources.h:511
+#: resources.h:529
 msgid "&Directory comparison"
 msgstr ""
 
-#: resources.h:325
+#: resources.h:336
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
 
-#: resources.h:539
+#: resources.h:557
 msgid "&Disconnect"
 msgstr ""
 
-#: resources.h:604
+#: resources.h:624
 msgid "&Disconnect from server"
 msgstr ""
 
-#: resources.h:876
+#: resources.h:898
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 
-#: resources.h:898
+#: resources.h:920
 msgid "&Display size in bytes"
 msgstr ""
 
+#: resources.h:504
+msgid "&Do not remember passwords"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr ""
 
-#: resources.h:761
+#: resources.h:783
 msgid "&Don't use external IP address on local connections."
 msgstr ""
 
-#: resources.h:920
+#: resources.h:942
 msgid "&Double-click action on files:"
 msgstr ""
 
-#: resources.h:574 resources.h:628
+#: resources.h:592 resources.h:650
 msgid "&Download"
 msgstr ""
 
-#: resources.h:443
+#: resources.h:454
 msgid "&Download to:"
 msgstr ""
 
-#: resources.h:663
+#: resources.h:685
 msgid "&Download..."
 msgstr ""
 
-#: resources.h:257 resources.h:837
+#: resources.h:268 resources.h:859
 msgid "&Downloads:"
 msgstr ""
 
-#: resources.h:503 resources.h:565
+#: resources.h:521 resources.h:583
 msgid "&Edit"
 msgstr ""
 
-#: resources.h:210
+#: resources.h:221
 msgid "&Edit filter rules..."
 msgstr ""
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:530 resources.h:550 resources.h:665 resources.h:691
 msgid "&Enable"
 msgstr ""
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr ""
-
-#: resources.h:481 resources.h:810
+#: resources.h:492 resources.h:832
 msgid "&Enable speed limits"
 msgstr ""
 
-#: resources.h:111
+#: resources.h:121
 msgid "&Encoding:"
 msgstr ""
 
-#: resources.h:82
+#: resources.h:92
 msgid "&Encryption:"
 msgstr ""
 
-#: resources.h:611
+#: resources.h:631
 msgid "&Enter custom command..."
 msgstr ""
 
-#: resources.h:137
+#: resources.h:147
 msgid "&Execute"
 msgstr ""
 
-#: resources.h:292
+#: resources.h:303
 msgid "&Export Site Manager entries"
 msgstr ""
 
-#: resources.h:498 resources.h:659
+#: resources.h:516 resources.h:681
 msgid "&Export..."
 msgstr ""
 
-#: resources.h:766
+#: resources.h:788
 msgid "&Fall back to active mode"
 msgstr ""
 
-#: resources.h:490
+#: resources.h:508
 msgid "&File"
 msgstr ""
 
-#: resources.h:640
+#: resources.h:662
 msgid "&File Attributes..."
 msgstr ""
 
-#: resources.h:590
+#: resources.h:610
 msgid "&File permissions..."
 msgstr ""
 
-#: resources.h:365
+#: resources.h:376
 msgid "&File:"
 msgstr ""
 
-#: resources.h:220
+#: resources.h:231
 msgid "&Filter conditions:"
 msgstr ""
 
-#: resources.h:199
+#: resources.h:210
 msgid "&Filter sets:"
 msgstr ""
 
-#: resources.h:214
+#: resources.h:225
 msgid "&Filters:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:29
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr ""
 
-#: resources.h:317
+#: resources.h:328
 msgid "&Finish editing and delete local file"
 msgstr ""
 
-#: resources.h:447
+#: resources.h:458
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 
-#: resources.h:458
+#: resources.h:469
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 
-#: resources.h:759
+#: resources.h:781
 msgid "&Get external IP address from the following URL:"
 msgstr ""
 
-#: resources.h:553
+#: resources.h:571
 msgid "&Getting help..."
 msgstr ""
 
-#: resources.h:397
+#: resources.h:408
 msgid "&Global bookmark"
 msgstr ""
 
-#: resources.h:795
+#: resources.h:817
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr ""
 
-#: resources.h:549
+#: resources.h:567
 msgid "&Help"
 msgstr ""
 
-#: resources.h:515 resources.h:646
+#: resources.h:533 resources.h:668
 msgid "&Hide identical files"
 msgstr ""
 
-#: resources.h:597
+#: resources.h:617
 msgid "&Highest"
 msgstr ""
 
-#: resources.h:754
+#: resources.h:776
 msgid "&Highest available port:"
 msgstr ""
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:89 resources.h:389 resources.h:740
 msgid "&Host:"
 msgstr ""
 
-#: resources.h:899
+#: resources.h:921
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:887
+#: resources.h:909
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr ""
 
-#: resources.h:499
+#: resources.h:517
 msgid "&Import..."
 msgstr ""
 
-#: resources.h:942
+#: resources.h:964
 msgid "&Inherit system's filetype associations"
 msgstr ""
 
-#: resources.h:446
+#: resources.h:457
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 
-#: resources.h:860
+#: resources.h:882
 msgid "&Layout of file and directory panes:"
 msgstr ""
 
-#: resources.h:751
+#: resources.h:773
 msgid "&Limit local ports used by FileZilla"
 msgstr ""
 
-#: resources.h:103
+#: resources.h:113
 msgid "&Limit number of simultaneous connections"
 msgstr ""
 
-#: resources.h:521
+#: resources.h:539
 msgid "&Local directory tree"
 msgstr ""
 
-#: resources.h:402 resources.h:408
+#: resources.h:413 resources.h:419
 msgid "&Local directory:"
 msgstr ""
 
-#: resources.h:957
+#: resources.h:983
 msgid "&Log to file"
 msgstr ""
 
-#: resources.h:83
+#: resources.h:93
 msgid "&Logon Type:"
 msgstr ""
 
-#: resources.h:381
+#: resources.h:392
 msgid "&Logontype:"
 msgstr ""
 
-#: resources.h:600
+#: resources.h:620
 msgid "&Low"
 msgstr ""
 
-#: resources.h:547
+#: resources.h:565
 msgid "&Manage bookmarks..."
 msgstr ""
 
-#: resources.h:535
+#: resources.h:553
 msgid "&Manual transfer..."
 msgstr ""
 
-#: resources.h:104
+#: resources.h:114
 msgid "&Maximum number of connections:"
 msgstr ""
 
-#: resources.h:736
+#: resources.h:758
 msgid "&Maximum number of retries:"
 msgstr ""
 
-#: resources.h:520
+#: resources.h:538
 msgid "&Message log"
 msgstr ""
 
-#: resources.h:873
+#: resources.h:895
 msgid "&Minimize to tray"
 msgstr ""
 
-#: resources.h:400
+#: resources.h:411
 msgid "&Name:"
 msgstr ""
 
-#: resources.h:504
+#: resources.h:522
 msgid "&Network configuration wizard..."
 msgstr ""
 
-#: resources.h:215
+#: resources.h:226
 msgid "&New"
 msgstr ""
 
-#: resources.h:72
+#: resources.h:82
 msgid "&New Site"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1043
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:27
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr ""
 
-#: resources.h:319
+#: resources.h:330
 msgid "&No"
 msgstr ""
 
-#: resources.h:769 resources.h:794
+#: resources.h:791 resources.h:816
 msgid "&None"
 msgstr ""
 
-#: resources.h:599
+#: resources.h:619
 msgid "&Normal"
 msgstr ""
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr ""
-
-#: resources.h:146
+#: resources.h:156
 msgid "&Numeric value:"
 msgstr ""
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:124 resources.h:137 resources.h:429
 msgid "&OK"
 msgstr ""
 
-#: resources.h:772
+#: resources.h:794
 msgid "&OPEN"
 msgstr ""
 
-#: resources.h:563 resources.h:651
+#: resources.h:581 resources.h:673
 msgid "&Open"
 msgstr ""
 
-#: resources.h:58
+#: resources.h:68
 msgid "&Overwrite"
 msgstr ""
 
-#: resources.h:102
+#: resources.h:112
 msgid "&Passive"
 msgstr ""
 
-#: resources.h:125
+#: resources.h:135
 msgid "&Password:"
 msgstr ""
 
-#: resources.h:607
+#: resources.h:627
 msgid "&Play sound"
 msgstr ""
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:90 resources.h:390 resources.h:744
 msgid "&Port:"
 msgstr ""
 
-#: resources.h:866
+#: resources.h:888
 msgid "&Position of the message log:"
 msgstr ""
 
-#: resources.h:531
+#: resources.h:549
 msgid "&Preserve timestamps of transferred files"
 msgstr ""
 
-#: resources.h:301
+#: resources.h:312
 msgid "&Queue"
 msgstr ""
 
-#: resources.h:724
+#: resources.h:746
 msgid "&Quickconnect"
 msgstr ""
 
-#: resources.h:519
+#: resources.h:537
 msgid "&Quickconnect bar"
 msgstr ""
 
-#: resources.h:135
+#: resources.h:145
 msgid "&Read"
 msgstr ""
 
-#: resources.h:538
+#: resources.h:556
 msgid "&Reconnect"
 msgstr ""
 
-#: resources.h:509 resources.h:668
+#: resources.h:527 resources.h:690
 msgid "&Refresh"
 msgstr ""
 
-#: resources.h:126
+#: resources.h:136
 msgid "&Remember password for this session"
 msgstr ""
 
-#: resources.h:404 resources.h:410
+#: resources.h:503
+msgid "&Remember passwords"
+msgstr ""
+
+#: resources.h:415 resources.h:421
 msgid "&Remote directory:"
 msgstr ""
 
-#: resources.h:368
+#: resources.h:379
 msgid "&Remote path:"
 msgstr ""
 
-#: resources.h:831
+#: resources.h:853
 msgid "&Remove"
 msgstr ""
 
-#: resources.h:789
+#: resources.h:811
 msgid "&Remove key"
 msgstr ""
 
-#: resources.h:594
+#: resources.h:614
 msgid "&Remove selected"
 msgstr ""
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:85 resources.h:228 resources.h:426 resources.h:590
+#: resources.h:606 resources.h:658 resources.h:679
 msgid "&Rename"
 msgstr ""
 
-#: resources.h:201
+#: resources.h:212
 msgid "&Rename..."
 msgstr ""
 
-#: resources.h:324
+#: resources.h:335
 msgid "&Reopen local file"
 msgstr ""
 
-#: resources.h:822
+#: resources.h:844
 msgid "&Replace invalid characters with:"
 msgstr ""
 
-#: resources.h:554
+#: resources.h:572
 msgid "&Report a bug..."
 msgstr ""
 
-#: resources.h:620
+#: resources.h:642
 msgid "&Reset and requeue all"
 msgstr ""
 
-#: resources.h:717
+#: resources.h:739
 msgid "&Restart Wizard"
 msgstr ""
 
-#: resources.h:62
+#: resources.h:72
 msgid "&Resume"
 msgstr ""
 
-#: resources.h:605
+#: resources.h:625
 msgid "&Run command..."
 msgstr ""
 
-#: resources.h:731
+#: resources.h:753
 msgid "&Run configuration wizard now..."
 msgstr ""
 
-#: resources.h:951
+#: resources.h:978
 msgid "&Run update check now..."
 msgstr ""
 
-#: resources.h:771
+#: resources.h:793
 msgid "&SITE"
 msgstr ""
 
-#: resources.h:796
+#: resources.h:818
 msgid "&SOCKS 5"
 msgstr ""
 
-#: resources.h:200
+#: resources.h:211
 msgid "&Save as..."
 msgstr ""
 
-#: resources.h:432
+#: resources.h:443
 msgid "&Search"
 msgstr ""
 
-#: resources.h:540
+#: resources.h:558
 msgid "&Search remote files..."
 msgstr ""
 
-#: resources.h:71
+#: resources.h:81
 msgid "&Select Entry:"
 msgstr ""
 
-#: resources.h:931
+#: resources.h:953
 msgid "&Select language:"
 msgstr ""
 
-#: resources.h:356
+#: resources.h:367
 msgid "&Select the columns that should be displayed:"
 msgstr ""
 
-#: resources.h:370 resources.h:536
+#: resources.h:381 resources.h:554
 msgid "&Server"
 msgstr ""
 
-#: resources.h:300
+#: resources.h:311
 msgid "&Settings"
 msgstr ""
 
-#: resources.h:506
+#: resources.h:524
 msgid "&Settings..."
 msgstr ""
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Show debug menu"
 msgstr ""
 
-#: resources.h:606
+#: resources.h:626
 msgid "&Show message"
 msgstr ""
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Show timestamps in message log"
 msgstr ""
 
-#: resources.h:491
+#: resources.h:509
 msgid "&Site Manager..."
 msgstr ""
 
-#: resources.h:398
+#: resources.h:409
 msgid "&Site-specific bookmark"
 msgstr ""
 
-#: resources.h:64
+#: resources.h:74
 msgid "&Skip"
 msgstr ""
 
-#: resources.h:534
+#: resources.h:552
 msgid "&Speed limits"
 msgstr ""
 
-#: resources.h:449
+#: resources.h:460
 msgid "&Start transfer immediately"
 msgstr ""
 
-#: resources.h:865
+#: resources.h:887
 msgid "&Swap local and remote panes"
 msgstr ""
 
+#: resources.h:639
+msgid "&TLS Ciphers"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr ""
 
-#: resources.h:879
+#: resources.h:901
 msgid "&Theme:"
 msgstr ""
 
-#: resources.h:524
+#: resources.h:542
 msgid "&Transfer"
 msgstr ""
 
-#: resources.h:99
+#: resources.h:109
 msgid "&Transfer mode:"
 msgstr ""
 
-#: resources.h:523
+#: resources.h:541
 msgid "&Transfer queue"
 msgstr ""
 
-#: resources.h:834
+#: resources.h:856
 msgid "&Treat dotfiles as ASCII files"
 msgstr ""
 
-#: resources.h:330
+#: resources.h:341
 msgid "&Unedit"
 msgstr ""
 
-#: resources.h:195
+#: resources.h:206
 msgid "&Update cached key for this host"
 msgstr ""
 
-#: resources.h:557 resources.h:647
+#: resources.h:575 resources.h:669
 msgid "&Upload"
 msgstr ""
 
-#: resources.h:267 resources.h:846
+#: resources.h:278 resources.h:868
 msgid "&Uploads:"
 msgstr ""
 
-#: resources.h:425
+#: resources.h:436
 msgid "&Use custom program"
 msgstr ""
 
-#: resources.h:94
+#: resources.h:104
 msgid "&Use synchronized browsing"
 msgstr ""
 
-#: resources.h:935
+#: resources.h:957
 msgid "&Use system's default editor for text files"
 msgstr ""
 
-#: resources.h:757
+#: resources.h:779
 msgid "&Use the following IP address:"
 msgstr ""
 
-#: resources.h:765
+#: resources.h:787
 msgid "&Use the server's external IP address instead"
 msgstr ""
 
-#: resources.h:902
+#: resources.h:924
 msgid "&Use thousands separator"
 msgstr ""
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:94 resources.h:134 resources.h:393
 msgid "&User:"
 msgstr ""
 
-#: resources.h:720
+#: resources.h:742
 msgid "&Username:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1039
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr ""
 
-#: resources.h:508
+#: resources.h:526
 msgid "&View"
 msgstr ""
 
-#: resources.h:580
+#: resources.h:598
 msgid "&View/Edit"
 msgstr ""
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 
-#: resources.h:136
+#: resources.h:974
+msgid "&When checking for updates, check for:"
+msgstr ""
+
+#: resources.h:146
 msgid "&Write"
 msgstr ""
 
-#: resources.h:318
+#: resources.h:329
 msgid "&Yes"
 msgstr ""
 
@@ -1004,12 +988,24 @@
 msgid "'%s' is not a directory."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:445
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:445
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:594
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1024,120 +1020,116 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:806 resources.h:808
+#: resources.h:828 resources.h:830
 msgid "(0 for no limit)"
 msgstr ""
 
-#: resources.h:737
+#: resources.h:759
 msgid "(0-99)"
 msgstr ""
 
-#: resources.h:739
+#: resources.h:761
 msgid "(0-999 seconds)"
 msgstr ""
 
-#: resources.h:804
+#: resources.h:826
 msgid "(1-10)"
 msgstr ""
 
-#: resources.h:733
+#: resources.h:755
 msgid "(5-9999, 0 to disable)"
 msgstr ""
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr ""
-
-#: resources.h:895
+#: resources.h:917
 msgid "(example: %H:%M)"
 msgstr ""
 
-#: resources.h:889
+#: resources.h:911
 msgid "(example: %Y-%m-%d)"
 msgstr ""
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:494 resources.h:496 resources.h:834 resources.h:836
 #, c-format
 msgid "(in %s/s)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:896
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:900
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ""
 
-#: resources.h:705
+#: resources.h:727
 msgid "-"
 msgstr ""
 
-#: resources.h:248
+#: resources.h:259
 msgid "- Broken router and/or firewall"
 msgstr ""
 
-#: resources.h:249
+#: resources.h:260
 msgid "- File corrupted on mirror"
 msgstr ""
 
-#: resources.h:247
+#: resources.h:258
 msgid "- Malware on your system"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:236
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:80
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:89
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:68
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:74
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr ""
 
-#: resources.h:968
+#: resources.h:994
 msgid "0 - None"
 msgstr ""
 
-#: resources.h:969
+#: resources.h:995
 msgid "1 - Warning"
 msgstr ""
 
-#: resources.h:970
+#: resources.h:996
 msgid "2 - Info"
 msgstr ""
 
-#: resources.h:971
+#: resources.h:997
 msgid "3 - Verbose"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:148
+#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr ""
 
-#: resources.h:972
+#: resources.h:998
 msgid "4 - Debug"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:146
+#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:28
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr ""
 
-#: resources.h:548
+#: resources.h:566
 msgid "?"
 msgstr ""
 
@@ -1146,43 +1138,44 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:154
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:157
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:827
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:117
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr ""
 
-#: resources.h:677
+#: resources.h:699
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
 
-#: resources.h:306
+#: resources.h:317
 msgid "A file previously opened has been changed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2058
+#: ../../source/FileZilla3/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 ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2674
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2054
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2705
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2062
 msgid "A file with that name is already being transferred."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2679
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:681
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1191,17 +1184,17 @@
 "No further warning will be displayed this session."
 msgstr ""
 
-#: resources.h:237
+#: resources.h:248
 msgid "A newer version of FileZilla is available:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:669
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:679
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
 
-#: resources.h:749
+#: resources.h:771
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1213,15 +1206,15 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "A&SCII"
 msgstr ""
 
-#: resources.h:830
+#: resources.h:852
 msgid "A&dd"
 msgstr ""
 
-#: resources.h:857
+#: resources.h:879
 msgid "A&llow resume of ASCII files"
 msgstr ""
 
@@ -1233,55 +1226,55 @@
 msgid "A&pply only to uploads"
 msgstr ""
 
-#: resources.h:149
+#: resources.h:159
 msgid "A&pply to all files and directories"
 msgstr ""
 
-#: resources.h:627
+#: resources.h:649
 msgid "A&utomatically remove successful transfers"
 msgstr ""
 
-#: resources.h:389
+#: resources.h:400
 msgid "ASCII"
 msgstr ""
 
-#: resources.h:479
+#: resources.h:490
 msgid "Abort previous connection and connect in current tab"
 msgstr ""
 
-#: resources.h:154
+#: resources.h:164
 msgid "About FileZilla"
 msgstr ""
 
-#: resources.h:867
+#: resources.h:889
 msgid "Above the file lists"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:858
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:877
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:860
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:879
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1298
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:160
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:161
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:194
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:560
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:561
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1288
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1289
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:569
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:570
 msgid "Account"
 msgstr ""
 
-#: resources.h:602
+#: resources.h:622
 msgid "Action after queue &completion"
 msgstr ""
 
-#: resources.h:329
+#: resources.h:340
 msgid "Action on selected file:"
 msgstr ""
 
-#: resources.h:323
+#: resources.h:334
 msgid "Action to perform:"
 msgstr ""
 
-#: resources.h:57
+#: resources.h:67
 msgid "Action:"
 msgstr ""
 
@@ -1308,23 +1301,23 @@
 "address."
 msgstr ""
 
-#: resources.h:762
+#: resources.h:784
 msgid "Active mode IP"
 msgstr ""
 
-#: resources.h:450
+#: resources.h:461
 msgid "Add files to &queue only"
 msgstr ""
 
-#: resources.h:631 resources.h:650
+#: resources.h:653 resources.h:672
 msgid "Add selected directory to the transfer queue"
 msgstr ""
 
-#: resources.h:560 resources.h:577
+#: resources.h:578 resources.h:595
 msgid "Add selected files and folders to the transfer queue"
 msgstr ""
 
-#: resources.h:922 resources.h:928
+#: resources.h:944 resources.h:950
 msgid "Add to queue"
 msgstr ""
 
@@ -1332,94 +1325,103 @@
 msgid "Address type not supported"
 msgstr ""
 
-#: resources.h:88
+#: resources.h:98
 msgid "Advanced"
 msgstr ""
 
-#: resources.h:234
+#: resources.h:245
 msgid "Advanced options:"
 msgstr ""
 
-#: resources.h:338
+#: resources.h:977
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+
+#: resources.h:349
 msgid "Algorithm:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3139
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr ""
 
-#: resources.h:706
+#: resources.h:728
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3135
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:745
+#: resources.h:767
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr ""
 
-#: resources.h:681
+#: resources.h:703
 msgid "Allow fallback to other transfer mode on failure"
 msgstr ""
 
-#: resources.h:476
+#: resources.h:487
 msgid "Already connected"
 msgstr ""
 
-#: resources.h:790
+#: resources.h:812
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
 
-#: resources.h:791
+#: resources.h:813
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1097
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2051
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2042
 #, 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:1950
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1941
 #, 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:1951
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1960
 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:879
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:881
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1538
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:159
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:197
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:213
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:559
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1529
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:568
 msgid "Anonymous"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1031
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
@@ -1434,58 +1436,58 @@
 "file."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:210
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1045
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr ""
 
-#: resources.h:151
+#: resources.h:161
 msgid "App&ly to directories only"
 msgstr ""
 
-#: resources.h:213
+#: resources.h:224
 msgid "Apply"
 msgstr ""
 
-#: resources.h:66
+#: resources.h:76
 msgid "Apply to &current queue only"
 msgstr ""
 
-#: resources.h:150
+#: resources.h:160
 msgid "Apply to &files only"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:322
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:330
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Archive"
 msgstr ""
 
-#: resources.h:869
+#: resources.h:891
 msgid "As tab in the transfer queue pane"
 msgstr ""
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Ask for action"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:854
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:873
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:856
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:875
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr ""
 
-#: resources.h:702
+#: resources.h:724
 msgid "Ask operating system for a port."
 msgstr ""
 
-#: resources.h:692
+#: resources.h:714
 msgid "Ask your operating system for the external IP address"
 msgstr ""
 
-#: resources.h:471
+#: resources.h:482
 msgid "Asking questions in the FileZilla forums"
 msgstr ""
 
@@ -1493,39 +1495,35 @@
 msgid "Associated program not found:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr ""
 
-#: resources.h:711
+#: resources.h:733
 msgid "At this point, all required information has been gathered."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr ""
 
-#: resources.h:880
+#: resources.h:902
 msgid "Author:"
 msgstr ""
 
-#: resources.h:386
+#: resources.h:397
 msgid "Auto"
 msgstr ""
 
-#: resources.h:828
+#: resources.h:850
 msgid "Automatic file type classification"
 msgstr ""
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr ""
-
-#: resources.h:884
+#: resources.h:906
 msgid "Available sizes"
 msgstr ""
 
@@ -1534,129 +1532,129 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:90
+#: resources.h:100
 msgid "B&ypass proxy"
 msgstr ""
 
-#: resources.h:467
+#: resources.h:478
 msgid "Basic usage instructions"
 msgstr ""
 
-#: resources.h:871
+#: resources.h:893
 msgid "Behaviour"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1260
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1288
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1268
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr ""
 
-#: resources.h:616
+#: resources.h:636
 msgid "Benchmark string coalescer"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:881
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr ""
 
-#: resources.h:390
+#: resources.h:401
 msgid "Binary"
 msgstr ""
 
-#: resources.h:864
+#: resources.h:886
 msgid "Blackboard"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:313
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:395
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:272
 msgid "Bookmark"
 msgstr ""
 
-#: resources.h:413
+#: resources.h:424
 msgid "Bookmark:"
 msgstr ""
 
-#: resources.h:412
+#: resources.h:423
 msgid "Bookmarks"
 msgstr ""
 
-#: resources.h:162
+#: resources.h:172
 msgid "Build date:"
 msgstr ""
 
-#: resources.h:159
+#: resources.h:169
 msgid "Build information"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:178
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr ""
 
-#: resources.h:752
+#: resources.h:774
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
 
-#: resources.h:537
+#: resources.h:555
 msgid "C&ancel current operation"
 msgstr ""
 
-#: resources.h:236
+#: resources.h:247
 msgid "C&heck for nightly builds of FileZilla"
 msgstr ""
 
-#: resources.h:613
+#: resources.h:633
 msgid "C&lear all"
 msgstr ""
 
-#: resources.h:588 resources.h:638
+#: resources.h:608 resources.h:660
 msgid "C&opy URL(s) to clipboard"
 msgstr ""
 
-#: resources.h:888
+#: resources.h:910
 msgid "C&ustom"
 msgstr ""
 
-#: resources.h:943
+#: resources.h:965
 msgid "C&ustom filetype associations:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1270
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1623
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:733
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:712
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:786
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:722
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:710
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:784
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:720
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr ""
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: 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
 msgid "Cancel"
 msgstr ""
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancel current operation"
 msgstr ""
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Cancels the current operation"
 msgstr ""
 
@@ -1665,11 +1663,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:564
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:345
+#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1681,37 +1679,37 @@
 "directories are enabled"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2778
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:141
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2608
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2654
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2036
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2167
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2639
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2685
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2044
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2175
 msgid "Cannot edit file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1952
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1963
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:36
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:54
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:37
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr ""
 
@@ -1723,44 +1721,48 @@
 msgid "Cannot load keyfile"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1066
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1190
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1894
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:351
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:420
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:350
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:311
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1643
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1682
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1646
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1651
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1219
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2674
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2054
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2705
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2062
 msgid "Cannot view/edit selected file"
 msgstr ""
 
-#: resources.h:283
+#: resources.h:294
 msgid "Categories"
 msgstr ""
 
@@ -1768,59 +1770,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr ""
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr ""
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr ""
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:43
 msgid "Certificate issuer"
 msgstr ""
 
-#: resources.h:123
+#: resources.h:133
 msgid "Challenge:"
 msgstr ""
 
-#: resources.h:132
+#: resources.h:142
 msgid "Change file attributes"
 msgstr ""
 
-#: resources.h:591 resources.h:641
+#: resources.h:611 resources.h:663
 msgid "Change the file permissions."
 msgstr ""
 
-#: resources.h:964
+#: resources.h:990
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:681
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr ""
 
-#: resources.h:105
+#: resources.h:115
 msgid "Charset"
 msgstr ""
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
+#: resources.h:568
+msgid "Check for &updates..."
 msgstr ""
 
-#: resources.h:550
-msgid "Check for &updates..."
+#: resources.h:969
+msgid "Check for FileZilla &updates automatically:"
 msgstr ""
 
-#: resources.h:551
+#: resources.h:569
 msgid "Check for newer versions of FileZilla"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:163
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1778
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr ""
 
@@ -1828,21 +1830,21 @@
 msgid "Checking for correct external IP address"
 msgstr ""
 
-#: resources.h:232
+#: resources.h:243
 msgid "Checking for updates"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1241
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1459
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2215
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
 msgstr ""
 
@@ -1850,43 +1852,43 @@
 msgid "Chunk data improperly terminated"
 msgstr ""
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:52
 msgid "Cipher:"
 msgstr ""
 
-#: resources.h:496 resources.h:666
+#: resources.h:514 resources.h:688
 msgid "Cl&ose tab"
 msgstr ""
 
-#: resources.h:861
+#: resources.h:883
 msgid "Classic"
 msgstr ""
 
-#: resources.h:286
+#: resources.h:297
 msgid "Clear &Site Manager entries"
 msgstr ""
 
-#: resources.h:614
+#: resources.h:634
 msgid "Clear &layout cache"
 msgstr ""
 
-#: resources.h:284
+#: resources.h:295
 msgid "Clear &quickconnect history"
 msgstr ""
 
-#: resources.h:285
+#: resources.h:296
 msgid "Clear &reconnect information"
 msgstr ""
 
-#: resources.h:287
+#: resources.h:298
 msgid "Clear &transfer queue"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:146
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr ""
 
-#: resources.h:281
+#: resources.h:292
 #: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:34
 #: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:40
 #: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:46
@@ -1895,11 +1897,11 @@
 msgid "Clear private data"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:145
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr ""
 
-#: resources.h:615
+#: resources.h:635
 msgid "Clear string coalescer"
 msgstr ""
 
@@ -1907,37 +1909,37 @@
 msgid "Click on Finish to save your configuration."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1096
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr ""
 
-#: resources.h:347
+#: resources.h:358
 msgid "Client to server MAC:"
 msgstr ""
 
-#: resources.h:345
+#: resources.h:356
 msgid "Client to server cipher:"
 msgstr ""
 
-#: resources.h:667
+#: resources.h:689
 msgid "Close &all other tabs"
 msgstr ""
 
-#: resources.h:502
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1138
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1161
+#: resources.h:520
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1245
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:14
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr ""
 
-#: resources.h:497
+#: resources.h:515
 msgid "Closes current tab"
 msgstr ""
 
-#: resources.h:87
+#: resources.h:97
 msgid "Co&mments:"
 msgstr ""
 
@@ -1945,11 +1947,11 @@
 msgid "Column properties"
 msgstr ""
 
-#: resources.h:354
+#: resources.h:365
 msgid "Column setup"
 msgstr ""
 
-#: resources.h:938
+#: resources.h:960
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 
@@ -1968,9 +1970,9 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:214
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:541
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:287
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:337
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:552
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:285
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:335
 msgid "Command:"
 msgstr ""
 
@@ -1978,7 +1980,7 @@
 msgid "Comment"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:176
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr ""
 
@@ -1987,15 +1989,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr ""
 
-#: resources.h:514 resources.h:645
+#: resources.h:532 resources.h:667
 msgid "Compare &modification time"
 msgstr ""
 
-#: resources.h:513 resources.h:644
+#: resources.h:531 resources.h:666
 msgid "Compare file&size"
 msgstr ""
 
-#: resources.h:918
+#: resources.h:940
 msgid "Comparison &threshold (in minutes):"
 msgstr ""
 
@@ -2003,60 +2005,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr ""
 
-#: resources.h:160
+#: resources.h:170
 msgid "Compiled for:"
 msgstr ""
 
-#: resources.h:161
+#: resources.h:171
 msgid "Compiled on:"
 msgstr ""
 
-#: resources.h:163
+#: resources.h:173
 msgid "Compiled with:"
 msgstr ""
 
-#: resources.h:164
+#: resources.h:174
 msgid "Compiler flags:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr ""
 
-#: resources.h:802
+#: resources.h:824
 msgid "Concurrent transfers"
 msgstr ""
 
-#: resources.h:224 resources.h:438
+#: resources.h:235 resources.h:449
 msgid "Conditions are c&ase sensitive"
 msgstr ""
 
-#: resources.h:710
+#: resources.h:732
 msgid "Configuration test"
 msgstr ""
 
-#: resources.h:684
+#: resources.h:706
 msgid "Configure passive mode"
 msgstr ""
 
-#: resources.h:700
+#: resources.h:722
 msgid "Configure port range"
 msgstr ""
 
-#: resources.h:468
+#: resources.h:479
 msgid "Configuring FileZilla and your network"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1033
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:136
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1700
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2625
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2007
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2127
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1725
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2656
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2015
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2135
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr ""
 
@@ -2064,7 +2066,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:144
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr ""
 
@@ -2072,34 +2074,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1454
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:280
 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:207
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1163
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1034
 #: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:172
 #: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:394
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1037
 #, c-format
 msgid "Connecting to %s..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:424
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:998
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:435
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr ""
 
@@ -2107,23 +2109,23 @@
 msgid "Connection"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1070
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1039
 #: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:176
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1042
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1044
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:186
 #: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:320
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:186
 msgid "Connection attempt interrupted by user"
 msgstr ""
 
@@ -2131,13 +2133,13 @@
 msgid "Connection closed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1132
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:241
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1135
 msgid "Connection closed by server"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:305
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:386
 msgid "Connection established, initializing TLS..."
 msgstr ""
 
@@ -2145,7 +2147,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr ""
 
@@ -2161,15 +2163,15 @@
 msgid "Connection refused"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:681
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1070
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:676
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr ""
 
@@ -2189,27 +2191,23 @@
 msgid "Convert keyfile"
 msgstr ""
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr ""
-
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1771
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1748
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: resources.h:589 resources.h:639
+#: resources.h:609 resources.h:661
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:207
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr ""
@@ -2219,16 +2217,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1205
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr ""
 
@@ -2237,28 +2239,28 @@
 msgid "Could not convert private key"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3059
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3090
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:219
+#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2547
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2578
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:899
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:486
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2266,23 +2268,23 @@
 "variable."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1011
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:986
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1015
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr ""
 
@@ -2291,15 +2293,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2608
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:939
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:932
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2322,7 +2324,7 @@
 msgid "Could not load private key"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1041
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory "
@@ -2330,7 +2332,7 @@
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:381
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory "
@@ -2346,9 +2348,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3059
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:219
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3090
+#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:227
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr ""
 
@@ -2363,11 +2365,11 @@
 msgid "Could not parse remote path."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:84
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr ""
@@ -2376,12 +2378,12 @@
 msgid "Could not read server item."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr ""
 
@@ -2389,17 +2391,17 @@
 msgid "Could not send command to fzputtygen."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1178
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1121
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1126
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1104
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr ""
 
@@ -2421,21 +2423,21 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1985
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:784
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:846
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2187
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:782
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:842
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1134
+#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr ""
@@ -2445,7 +2447,7 @@
 msgid "Could not write keyfile: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1115
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr ""
 
@@ -2455,37 +2457,49 @@
 msgid "Could not write to log file: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:999
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1097
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1002
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:181
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr ""
 
-#: resources.h:618
+#: resources.h:638
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:601
+msgid "Crea&te new file"
+msgstr ""
+
+#: resources.h:586 resources.h:600 resources.h:655 resources.h:676
 msgid "Create a new subdirectory in the current directory"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1604
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1183
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:602
+msgid "Create a new, empty file in the current directory"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1627
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1187
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1527
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2047
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3300
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr ""
@@ -2503,7 +2517,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:370
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2522,52 +2536,56 @@
 msgid "Current transfer type is set to binary."
 msgstr ""
 
-#: resources.h:773 resources.h:894
+#: resources.h:795 resources.h:916
 msgid "Cus&tom"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:99
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr ""
 
-#: resources.h:376 resources.h:377
+#: resources.h:387 resources.h:388
 msgid "Custom server"
 msgstr ""
 
-#: resources.h:385
+#: resources.h:396
 msgid "D&ata type"
 msgstr ""
 
-#: resources.h:901
+#: resources.h:923
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 
-#: resources.h:100
+#: resources.h:110
 msgid "D&efault"
 msgstr ""
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:604 resources.h:656 resources.h:686
 msgid "D&elete"
 msgstr ""
 
-#: resources.h:205
+#: resources.h:216
 msgid "D&isable all"
 msgstr ""
 
-#: resources.h:872
+#: resources.h:894
 msgid "D&o not save passwords"
 msgstr ""
 
-#: resources.h:925
+#: resources.h:947
 msgid "D&ouble-click action on directories:"
 msgstr ""
 
+#: resources.h:229 resources.h:428
+msgid "D&uplicate"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2659
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2041
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2690
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2049
 msgid "Dangerous filetype"
 msgstr ""
 
@@ -2575,16 +2593,16 @@
 msgid "Data"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:985
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1051
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:991
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr ""
 
-#: resources.h:885
+#: resources.h:907
 msgid "Date formatting"
 msgstr ""
 
@@ -2603,11 +2621,11 @@
 msgid "Debug"
 msgstr ""
 
-#: resources.h:965
+#: resources.h:991
 msgid "Debugging settings"
 msgstr ""
 
-#: resources.h:91
+#: resources.h:101
 msgid "Default &local directory:"
 msgstr ""
 
@@ -2615,19 +2633,19 @@
 msgid "Default (Autodetect)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr ""
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:266 resources.h:288 resources.h:877
 msgid "Default file exists action"
 msgstr ""
 
-#: resources.h:93
+#: resources.h:103
 msgid "Default r&emote directory:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2637,15 +2655,15 @@
 msgid "Default system language"
 msgstr ""
 
-#: resources.h:678
+#: resources.h:700
 msgid "Default transfer mode:"
 msgstr ""
 
-#: resources.h:824
+#: resources.h:846
 msgid "Default transfer type:"
 msgstr ""
 
-#: resources.h:697 resources.h:760
+#: resources.h:719 resources.h:782
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr ""
 
@@ -2665,57 +2683,57 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1214
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr ""
 
-#: resources.h:635 resources.h:656
+#: resources.h:657 resources.h:678
 msgid "Delete selected directory"
 msgstr ""
 
-#: resources.h:571 resources.h:585
+#: resources.h:589 resources.h:605
 msgid "Delete selected files and directories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1017
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1017
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:453
+#: resources.h:464
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr ""
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:187
 msgid "Details"
 msgstr ""
 
-#: resources.h:189
+#: resources.h:200
 msgid "Details for new key:"
 msgstr ""
 
-#: resources.h:227
+#: resources.h:238
 msgid "Dire&ctories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:523
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr ""
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2338
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:445
+#: resources.h:664 resources.h:938 resources.h:1026
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2396
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:449
 msgid "Directory comparison"
 msgstr ""
 
@@ -2733,11 +2751,11 @@
 msgid "Directory listing aborted by user"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2349
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr ""
 
-#: resources.h:198
+#: resources.h:209
 msgid "Directory listing filters"
 msgstr ""
 
@@ -2745,72 +2763,71 @@
 msgid "Directory listing successful"
 msgstr ""
 
-#: resources.h:208
+#: resources.h:219
 msgid "Disa&ble all"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1049
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:671
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnect from server"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:82
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1000
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1099
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:227
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1068
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1112
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:82
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1003
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1102
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1051
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1134
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:953
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1137
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1429
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:269
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1412
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr ""
 
-#: resources.h:993
+#: resources.h:1020
 msgid "Disconnects from the currently visible server"
 msgstr ""
 
-#: resources.h:556
+#: resources.h:574
 msgid "Display about dialog"
 msgstr ""
 
-#: resources.h:934
+#: resources.h:956
 msgid "Do &not use default editor"
 msgstr ""
 
-#: resources.h:610
+#: resources.h:630
 msgid "Do &nothing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:251
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:61
+#: ../../source/FileZilla3/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 ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1141
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1165
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1248
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr ""
 
@@ -2823,7 +2840,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1216
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr ""
 
@@ -2831,32 +2848,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:595
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr ""
 
-#: resources.h:466
+#: resources.h:477
 msgid "Documentation"
 msgstr ""
 
-#: resources.h:699
+#: resources.h:721
 msgid "Don't use external IP address on &local connections."
 msgstr ""
 
-#: resources.h:835
+#: resources.h:857
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 
-#: resources.h:919
+#: resources.h:941
 msgid "Double-click action"
 msgstr ""
 
-#: resources.h:362
+#: resources.h:373
 msgid "Download"
 msgstr ""
 
-#: resources.h:482 resources.h:811
+#: resources.h:493 resources.h:833
 msgid "Download &limit:"
 msgstr ""
 
@@ -2869,41 +2886,48 @@
 msgid "Download limit: none"
 msgstr ""
 
-#: resources.h:441
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:817
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:823
+#: resources.h:452
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:818
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr ""
 
-#: resources.h:629
+#: resources.h:651
 msgid "Download selected directory"
 msgstr ""
 
-#: resources.h:575
+#: resources.h:593
 msgid "Download selected files and directories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1245
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:415
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:926
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:926
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:83
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:101
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:103
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:102
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:104
 #: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:104
 #: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
@@ -2912,56 +2936,60 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:96
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:107
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:109
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:108
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:110
 #: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:110
 #: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 
-#: resources.h:204
+#: resources.h:87
+msgid "Dupl&icate"
+msgstr ""
+
+#: resources.h:215
 msgid "E&nable all"
 msgstr ""
 
-#: resources.h:561 resources.h:578
+#: resources.h:579 resources.h:596
 msgid "E&nter directory"
 msgstr ""
 
-#: resources.h:141
+#: resources.h:151
 msgid "E&xecute"
 msgstr ""
 
-#: resources.h:501
+#: resources.h:519
 msgid "E&xit"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:187
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr ""
 
-#: resources.h:230
+#: resources.h:241
 msgid "Edit filters"
 msgstr ""
 
-#: resources.h:566
+#: resources.h:584
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1952
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1963
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1960
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr ""
 
-#: resources.h:882
+#: resources.h:904
 msgid "Email:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2297
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr ""
 
@@ -2969,7 +2997,7 @@
 msgid "Empty command."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2351
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr ""
 
@@ -2981,95 +3009,101 @@
 msgid "Empty file extension."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:206
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:248
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:208
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:206
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:248
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:208
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr ""
 
-#: resources.h:207
+#: resources.h:218
 msgid "En&able all"
 msgstr ""
 
-#: resources.h:820
+#: resources.h:842
 msgid "Enable invalid character &filtering"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr ""
 
-#: resources.h:344
+#: resources.h:355
 msgid "Encryption"
 msgstr ""
 
-#: resources.h:336
+#: resources.h:347
 msgid "Encryption details"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:447
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr ""
 
-#: resources.h:542
+#: resources.h:560
 msgid "Enter &custom command..."
 msgstr ""
 
-#: resources.h:486
+#: resources.h:497
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:576
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr ""
 
-#: resources.h:926
+#: resources.h:948
 msgid "Enter directory"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:134
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:194
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:241
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:136
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:196
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:344
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:406
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr ""
 
-#: resources.h:116
+#: resources.h:126
 msgid "Enter password"
 msgstr ""
 
-#: resources.h:562 resources.h:579
+#: resources.h:580 resources.h:597
 msgid "Enter selected directory"
 msgstr ""
 
-#: resources.h:719
+#: resources.h:741
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
@@ -3079,7 +3113,7 @@
 "Please note that the converted file will not be password protected."
 msgstr ""
 
-#: resources.h:723
+#: resources.h:745
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3099,36 +3133,36 @@
 msgid "Error importing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2052
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1965
-#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:172
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:299
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:731
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:772
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1094
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1115
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:976
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1956
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1095
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1116
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:250
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:448
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:544
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:603
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:723
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:810
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:721
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:806
 #: ../../source/FileZilla3/locales/../src/interface/import.cpp:120
 #: ../../source/FileZilla3/locales/../src/interface/import.cpp:311
+#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:216
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:731
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:786
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:211
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1046
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:993
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:210
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1034
 msgid "Error loading xml file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1951
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr ""
 
@@ -3137,74 +3171,82 @@
 msgid "Error starting program"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1986
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:331
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1135
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1977
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:658
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:785
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:847
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:783
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:843
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:810
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:335
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:351
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:213
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:535
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:285
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:333
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:546
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:283
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:331
 msgid "Error:"
 msgstr ""
 
-#: resources.h:478
+#: resources.h:489
 msgid "Establish connection in a new tab"
 msgstr ""
 
-#: resources.h:945
+#: resources.h:973
+msgid "Every month"
+msgstr ""
+
+#: resources.h:972
+msgid "Every two weeks"
+msgstr ""
+
+#: resources.h:967
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr ""
 
-#: resources.h:904
+#: resources.h:926
 msgid "Examples"
 msgstr ""
 
-#: resources.h:145
+#: resources.h:155
 msgid "Exe&cute"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:320
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1778
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 
-#: resources.h:862
+#: resources.h:884
 msgid "Explorer"
 msgstr ""
 
-#: resources.h:294
+#: resources.h:305
 msgid "Export &Queue"
 msgstr ""
 
-#: resources.h:293
+#: resources.h:304
 msgid "Export &Settings"
 msgstr ""
 
-#: resources.h:290
+#: resources.h:301
 msgid "Export settings"
 msgstr ""
 
-#: resources.h:219
+#: resources.h:230
 msgid "F&ilter name:"
 msgstr ""
 
@@ -3224,25 +3266,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:201
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:69
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr ""
 
-#: resources.h:747
+#: resources.h:769
 msgid "FTP Keep-alive"
 msgstr ""
 
-#: resources.h:767
+#: resources.h:789
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:19
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr ""
 
-#: resources.h:675
+#: resources.h:697
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3256,69 +3298,69 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:534
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:614
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2248
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:906
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:550
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:630
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2256
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:900
 #: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:53
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:259
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:267
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:269
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:263
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:271
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:273
 msgid "Failed to change language"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:453
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:524
+#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:791
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:455
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:660
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:646
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:950
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:958
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:77
+#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:313
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:775
 msgid "Failed to initialize TLS."
 msgstr ""
 
@@ -3331,24 +3373,24 @@
 msgid "Failed to load private key: %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:448
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2658
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:415
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr ""
 
@@ -3356,7 +3398,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1014
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr ""
 
@@ -3368,11 +3410,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr ""
 
@@ -3388,34 +3430,34 @@
 msgid "Failed to send command."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:267
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:252
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:240
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:53
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:269
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:273
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:248
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:237
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3424,7 +3466,7 @@
 msgid "Failed to validate settings"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:874
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr ""
 
@@ -3433,7 +3475,7 @@
 msgid "Failed to write to file %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:542
+#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
 msgstr ""
 
@@ -3441,21 +3483,19 @@
 msgid "Failed transfers"
 msgstr ""
 
-#: resources.h:690
+#: resources.h:712
 msgid "Fall back to active mode"
 msgstr ""
 
-#: resources.h:369
+#: resources.h:380
 msgid "Fil&e:"
 msgstr ""
 
-#: resources.h:226
+#: resources.h:237
 msgid "Fil&es"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:500
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:518
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:527
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr ""
 
@@ -3471,7 +3511,7 @@
 msgid "File editing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1908
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr ""
 
@@ -3479,7 +3519,7 @@
 msgid "File exists action"
 msgstr ""
 
-#: resources.h:305
+#: resources.h:316
 msgid "File has changed"
 msgstr ""
 
@@ -3487,14 +3527,14 @@
 msgid "File lists"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:182
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1722
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:702
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:796
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:188
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1730
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:712
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:806
 msgid "File not found"
 msgstr ""
 
-#: resources.h:1003
+#: resources.h:1030
 msgid "File search"
 msgstr ""
 
@@ -3529,98 +3569,100 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1140
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr ""
 
-#: resources.h:387
+#: resources.h:398
 msgid "File would transfer with ASCII data type."
 msgstr ""
 
-#: resources.h:388
+#: resources.h:399
 msgid "File would transfer with binary data type."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:201
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:487
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:69
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:205
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:494
 msgid "FileZilla Error"
 msgstr ""
 
-#: resources.h:712
+#: resources.h:734
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 
-#: resources.h:477
+#: resources.h:488
 msgid "FileZilla is already connected to a server."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:453
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:965
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1582
+msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1527
-msgid "FileZilla needs to be restarted for the language change to take effect."
+#: resources.h:980
+msgid "FileZilla updates"
 msgstr ""
 
-#: resources.h:517
+#: resources.h:535
 msgid "Filelist status &bars"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:358
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:379
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:265
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:372
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:277
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1230
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1238
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:130
 msgid "Filename"
 msgstr ""
 
-#: resources.h:510
+#: resources.h:528
 msgid "Filename &filters..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2310
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3097
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1894
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr ""
 
-#: resources.h:307 resources.h:958
+#: resources.h:318 resources.h:984
 msgid "Filename:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1362
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1337
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 
-#: resources.h:335
+#: resources.h:346
 msgid "Files currently being edited"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:359
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:381
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:266
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:373
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:278
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:135
 msgid "Filesize"
 msgstr ""
 
@@ -3628,68 +3670,68 @@
 msgid "Filesize format"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:360
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:382
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:267
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:374
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:279
 msgid "Filetype"
 msgstr ""
 
-#: resources.h:946
+#: resources.h:968
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr ""
 
-#: resources.h:225
+#: resources.h:236
 msgid "Filter applies to:"
 msgstr ""
 
-#: resources.h:819
+#: resources.h:841
 msgid "Filter invalid characters in filenames"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:147
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:254
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:356
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:149
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:217
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:256
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr ""
 
-#: resources.h:221
+#: resources.h:232
 msgid "Filter out items matching all of the following"
 msgstr ""
 
-#: resources.h:222
+#: resources.h:233
 msgid "Filter out items matching any of the following"
 msgstr ""
 
-#: resources.h:223
+#: resources.h:234
 msgid "Filter out items matching none of the following"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:366
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:427
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:365
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr ""
 
-#: resources.h:996
+#: resources.h:1023
 msgid "Filter the directory listings"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:338
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:347
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:356
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:340
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:349
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr ""
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:39
 msgid "Fingerprint (MD5):"
 msgstr ""
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:40
 msgid "Fingerprint (SHA-1):"
 msgstr ""
 
-#: resources.h:179 resources.h:192
+#: resources.h:190 resources.h:203
 msgid "Fingerprint:"
 msgstr ""
 
@@ -3697,47 +3739,47 @@
 msgid "Firewall and router configuration wizard"
 msgstr ""
 
-#: resources.h:730
+#: resources.h:752
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
 
-#: resources.h:707
+#: resources.h:729
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:214
+#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr ""
 
-#: resources.h:109
+#: resources.h:119
 msgid "Force &UTF-8"
 msgstr ""
 
-#: resources.h:544
+#: resources.h:562
 msgid "Force showing &hidden files"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:666
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr ""
 
-#: resources.h:774
+#: resources.h:796
 msgid "Format specifications:"
 msgstr ""
 
-#: resources.h:944
+#: resources.h:966
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 
-#: resources.h:469
+#: resources.h:480
 msgid "Further documentation"
 msgstr ""
 
-#: resources.h:78
+#: resources.h:88
 msgid "General"
 msgstr ""
 
@@ -3745,21 +3787,21 @@
 msgid "General SOCKS server failure"
 msgstr ""
 
-#: resources.h:792
+#: resources.h:814
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr ""
 
-#: resources.h:696
+#: resources.h:718
 msgid "Get external IP address from the following URL:"
 msgstr ""
 
-#: resources.h:470
+#: resources.h:481
 msgid "Getting help"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:366
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:427
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:365
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 
@@ -3767,15 +3809,15 @@
 msgid "Global bookmarks"
 msgstr ""
 
-#: resources.h:166
+#: resources.h:176
 msgid "GnuTLS:"
 msgstr ""
 
-#: resources.h:138
+#: resources.h:148
 msgid "Group permissions"
 msgstr ""
 
-#: resources.h:598
+#: resources.h:618
 msgid "H&igh"
 msgstr ""
 
@@ -3783,22 +3825,22 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr ""
 
-#: resources.h:340
+#: resources.h:351
 msgid "Hash:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr ""
 
-#: resources.h:817
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:922
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1009
+#: resources.h:839
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:924
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:924
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1011
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:926
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr ""
 
@@ -3806,24 +3848,24 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr ""
 
-#: resources.h:209
+#: resources.h:220
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 
-#: resources.h:157
+#: resources.h:167
 msgid "Homepage:"
 msgstr ""
 
-#: resources.h:342
+#: resources.h:353
 msgid "Host key fingerprint:"
 msgstr ""
 
-#: resources.h:185
+#: resources.h:196
 msgid "Host key mismatch"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:166
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 
@@ -3831,31 +3873,31 @@
 msgid "Host unreachable"
 msgstr ""
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:46 resources.h:131 resources.h:188
+#: resources.h:201
 msgid "Host:"
 msgstr ""
 
-#: resources.h:96
+#: resources.h:106
 msgid "Hours,"
 msgstr ""
 
-#: resources.h:893
+#: resources.h:915
 msgid "I&SO 8601 (example: 15:47)"
 msgstr ""
 
-#: resources.h:734
+#: resources.h:756
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
 
-#: resources.h:974
+#: resources.h:1000
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 
-#: resources.h:687
+#: resources.h:709
 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 "
@@ -3863,13 +3905,13 @@
 "basis in the Site Manager."
 msgstr ""
 
-#: resources.h:682
+#: resources.h:704
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
 
-#: resources.h:188
+#: resources.h:199
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3887,14 +3929,14 @@
 "connection."
 msgstr ""
 
-#: resources.h:963
+#: resources.h:989
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding "
 "\".1\" to the end of the filename (possibly overwriting older logfiles) and "
 "a new file gets created."
 msgstr ""
 
-#: resources.h:455
+#: resources.h:466
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3910,44 +3952,44 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
 
-#: resources.h:278 resources.h:856
+#: resources.h:289 resources.h:878
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
 
-#: resources.h:917
+#: resources.h:939
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
 
-#: resources.h:932
+#: resources.h:954
 msgid "If you change the language, you should restart FileZilla."
 msgstr ""
 
-#: resources.h:713
+#: resources.h:735
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1164
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr ""
 
-#: resources.h:832
+#: resources.h:854
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
 
-#: resources.h:714
+#: resources.h:736
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 
-#: resources.h:746
+#: resources.h:768
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -3960,19 +4002,19 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 
-#: resources.h:673
+#: resources.h:695
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
 
-#: resources.h:709
+#: resources.h:731
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
 
-#: resources.h:708
+#: resources.h:730
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -3988,7 +4030,7 @@
 msgid "Import data from older version"
 msgstr ""
 
-#: resources.h:297
+#: resources.h:308
 msgid "Import settings"
 msgstr ""
 
@@ -4002,57 +4044,57 @@
 msgid "Improperly quoted association."
 msgstr ""
 
-#: resources.h:701
+#: resources.h:723
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
 
-#: resources.h:703
+#: resources.h:725
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
 
-#: resources.h:254
+#: resources.h:265
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
 
-#: resources.h:691 resources.h:755
+#: resources.h:713 resources.h:777
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 
-#: resources.h:676
+#: resources.h:698
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:888
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1064
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:856
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:875
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:858
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:877
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr ""
@@ -4062,8 +4104,8 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:219
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1021
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1597
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1004
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr ""
 
@@ -4075,8 +4117,8 @@
 msgid "Invalid HTTP Response"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:544
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:604
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:547
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4097,12 +4139,13 @@
 msgid "Invalid date"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1337
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1362
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3206
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1341
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1366
 msgid "Invalid filename"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:173
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 
@@ -4110,23 +4153,28 @@
 msgid "Invalid input"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:61
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:194
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:206
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:63
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:196
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:91
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:124
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:93
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:698
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr ""
 
@@ -4134,7 +4182,7 @@
 msgid "Invalid response code"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:692
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr ""
@@ -4146,88 +4194,92 @@
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:470
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:487
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:556
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:735
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:742
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:822
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:829
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:733
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:740
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:818
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:136
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:189
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:191
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:190
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr ""
 
-#: resources.h:914
+#: resources.h:936
 msgid "Keep directories on top"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:670
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
 
-#: resources.h:337
+#: resources.h:348
 msgid "Key exchange"
 msgstr ""
 
-#: resources.h:601
+#: resources.h:21 resources.h:50
+msgid "Key exchange:"
+msgstr ""
+
+#: resources.h:621
 msgid "L&owest"
 msgstr ""
 
-#: resources.h:930
+#: resources.h:952
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1527
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:361
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:383
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:268
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:375
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:280
 msgid "Last modified"
 msgstr ""
 
-#: resources.h:859
+#: resources.h:881
 msgid "Layout"
 msgstr ""
 
-#: resources.h:805
+#: resources.h:827
 msgid "Limit for concurrent &downloads:"
 msgstr ""
 
-#: resources.h:807
+#: resources.h:829
 msgid "Limit for concurrent &uploads:"
 msgstr ""
 
-#: resources.h:750
+#: resources.h:772
 msgid "Limit local ports"
 msgstr ""
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit size of logfile"
 msgstr ""
 
-#: resources.h:961
+#: resources.h:987
 msgid "Limit:"
 msgstr ""
 
@@ -4235,7 +4287,7 @@
 msgid "Line length exceeded"
 msgstr ""
 
-#: resources.h:167
+#: resources.h:178
 msgid "Linked against"
 msgstr ""
 
@@ -4244,21 +4296,21 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:220
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:296
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:361
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:294
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr ""
 
-#: resources.h:753
+#: resources.h:775
 msgid "Lo&west available port:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1278
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1532
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1286
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr ""
 
-#: resources.h:364
+#: resources.h:375
 msgid "Local file"
 msgstr ""
 
@@ -4274,7 +4326,7 @@
 msgid "Local file is not a valid filename."
 msgstr ""
 
-#: resources.h:203
+#: resources.h:214
 msgid "Local filters:"
 msgstr ""
 
@@ -4282,7 +4334,7 @@
 msgid "Local site:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:183
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr ""
 
@@ -4290,49 +4342,49 @@
 msgid "Log file"
 msgstr ""
 
-#: resources.h:251
+#: resources.h:262
 msgid "Log of update check:"
 msgstr ""
 
-#: resources.h:955
+#: resources.h:981
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:825
 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:825
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:832
 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:854
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:95
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:10
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:917
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1004
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:919
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:915
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1002
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:917
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr ""
 
@@ -4340,7 +4392,7 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr ""
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:54
 msgid "MAC:"
 msgstr ""
 
@@ -4365,7 +4417,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr ""
 
-#: resources.h:394
+#: resources.h:405
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:316
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:323
@@ -4377,52 +4429,52 @@
 msgid "Manual transfer"
 msgstr ""
 
-#: resources.h:434
+#: resources.h:445
 msgid "Match all of the following"
 msgstr ""
 
-#: resources.h:435
+#: resources.h:446
 msgid "Match any of the following"
 msgstr ""
 
-#: resources.h:436
+#: resources.h:447
 msgid "Match none of the following"
 msgstr ""
 
-#: resources.h:803
+#: resources.h:825
 msgid "Maximum simultaneous &transfers:"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:378
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1855
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr ""
 
-#: resources.h:870
+#: resources.h:892
 msgid "Message log position"
 msgstr ""
 
-#: resources.h:962
+#: resources.h:988
 msgid "MiB"
 msgstr ""
 
-#: resources.h:97
+#: resources.h:107
 msgid "Minutes"
 msgstr ""
 
-#: resources.h:358
+#: resources.h:369
 msgid "Move &down"
 msgstr ""
 
-#: resources.h:357
+#: resources.h:368
 msgid "Move &up"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr ""
 
@@ -4437,33 +4489,33 @@
 msgid "N/a"
 msgstr ""
 
-#: resources.h:399
+#: resources.h:410
 msgid "Name"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1190
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:757
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759
 msgid "Name of bookmark already exists."
 msgstr ""
 
-#: resources.h:120 resources.h:168
+#: resources.h:130 resources.h:179
 msgid "Name:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:347
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:682
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr ""
 
@@ -4471,19 +4523,25 @@
 msgid "Network unreachable"
 msgstr ""
 
-#: resources.h:73
+#: resources.h:970
+msgid "Never"
+msgstr ""
+
+#: resources.h:83
 msgid "New &Folder"
 msgstr ""
 
-#: resources.h:494
+#: resources.h:512
 msgid "New &tab"
 msgstr ""
 
-#: resources.h:74 resources.h:414
+#: resources.h:84 resources.h:425
 msgid "New Book&mark"
 msgstr ""
 
-#: resources.h:395
+#: resources.h:406
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:757
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2125
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:76
@@ -4497,23 +4555,21 @@
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1618
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1641
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/welcome_dialog.cpp:50
+#: ../../source/FileZilla3/locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:129
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr ""
 
@@ -4523,15 +4579,15 @@
 
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:622
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:636
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2092
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr ""
 
-#: resources.h:868
+#: resources.h:890
 msgid "Next to the transfer queue"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr ""
 
@@ -4539,25 +4595,25 @@
 msgid "No category to export selected"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2297
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1219
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:141
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:76
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:187
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:216
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:78
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:189
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr ""
 
@@ -4565,25 +4621,25 @@
 msgid "No images available"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3168
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:351
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:420
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:350
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr ""
 
-#: resources.h:430
+#: resources.h:441
 msgid "No program associated with filetype"
 msgstr ""
 
-#: resources.h:420
+#: resources.h:431
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:540
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr ""
 
@@ -4601,24 +4657,24 @@
 msgid "No username given."
 msgstr ""
 
-#: resources.h:924 resources.h:929
+#: resources.h:946 resources.h:951
 #: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr ""
 
-#: resources.h:374
+#: resources.h:385
 msgid "None selected yet"
 msgstr ""
 
-#: resources.h:816
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:852
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:871
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:920
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1007
+#: resources.h:838
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:854
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:873
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:922
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1009
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1297
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:160
 #: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:185
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:560
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:569
 msgid "Normal"
 msgstr ""
 
@@ -4628,15 +4684,15 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/state.cpp:199
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:504
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2347
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:564
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr ""
 
@@ -4644,19 +4700,19 @@
 msgid "Not connected."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:668
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 
-#: resources.h:784
+#: resources.h:806
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 
-#: resources.h:801
+#: resources.h:823
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 
-#: resources.h:903
+#: resources.h:925
 msgid "Number of decimal places:"
 msgstr ""
 
@@ -4664,141 +4720,147 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr ""
 
-#: resources.h:333
+#: resources.h:344
 msgid "O&pen file"
 msgstr ""
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: 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
 msgid "OK"
 msgstr ""
 
-#: resources.h:683
+#: resources.h:705
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr ""
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
+#: resources.h:971
+msgid "Once a week"
 msgstr ""
 
-#: resources.h:652
+#: resources.h:674
 msgid "Open directory in system's file manager"
 msgstr ""
 
-#: resources.h:976 resources.h:977
+#: resources.h:1002
 msgid "Open the Site Manager"
 msgstr ""
 
-#: resources.h:564
+#: resources.h:1003
+msgid "Open the Site Manager."
+msgstr ""
+
+#: resources.h:1004
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+
+#: resources.h:582
 msgid "Open the file."
 msgstr ""
 
-#: resources.h:507
+#: resources.h:525
 msgid "Open the settings dialog of FileZilla"
 msgstr ""
 
-#: resources.h:309
+#: resources.h:320
 msgid "Opened as:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2647
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2029
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2074
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2161
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2174
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2678
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2037
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2082
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2169
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2182
 msgid "Opening failed"
 msgstr ""
 
-#: resources.h:495
+#: resources.h:513
 msgid "Opens a new tab"
 msgstr ""
 
-#: resources.h:492
+#: resources.h:510
 msgid "Opens the Site Manager"
 msgstr ""
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 
-#: resources.h:171
+#: resources.h:182
 msgid "Operating system"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:306
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:177
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:199
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr ""
 
-#: resources.h:729
+#: resources.h:751
 msgid "Overview"
 msgstr ""
 
-#: resources.h:59
+#: resources.h:69
 msgid "Overwrite &if source newer"
 msgstr ""
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file"
 msgstr ""
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs"
 msgstr ""
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if source file newer"
 msgstr ""
 
-#: resources.h:60
+#: resources.h:70
 msgid "Overwrite if &different size"
 msgstr ""
 
-#: resources.h:61
+#: resources.h:71
 msgid "Overwrite if different si&ze or source newer"
 msgstr ""
 
-#: resources.h:134
+#: resources.h:144
 msgid "Owner permissions"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:363
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:385
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:377
 msgid "Owner/Group"
 msgstr ""
 
-#: resources.h:874
+#: resources.h:896
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 
-#: resources.h:781 resources.h:797
+#: resources.h:803 resources.h:819
 #, no-c-format
 msgid "P&roxy host:"
 msgstr ""
@@ -4807,27 +4869,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr ""
 
-#: resources.h:743
+#: resources.h:765
 msgid "Pa&ssive (recommended)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:324
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2489
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr ""
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:95 resources.h:394 resources.h:743
 msgid "Pass&word:"
 msgstr ""
 
-#: resources.h:679
+#: resources.h:701
 msgid "Passive (recommended)"
 msgstr ""
 
-#: resources.h:763
+#: resources.h:785
 #: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr ""
@@ -4843,41 +4905,45 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:380
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:150
 msgid "Path"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2355
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3185
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr ""
 
-#: resources.h:401
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr ""
+
+#: resources.h:412
 msgid "Paths"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1257
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1400
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1499
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1512
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1265
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1408
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1507
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:362
 #: ../../source/FileZilla3/locales/../src/interface/search.cpp:384
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:376
 msgid "Permissions"
 msgstr ""
 
-#: resources.h:170
+#: resources.h:181
 msgid "Platform:"
 msgstr ""
 
-#: resources.h:250
+#: resources.h:261
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -4889,13 +4955,13 @@
 "running and carefully check your settings again."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1076
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 
-#: resources.h:685
+#: resources.h:707
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -4919,31 +4985,31 @@
 msgid "Please enter a custom time format."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:134
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:241
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:194
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr ""
 
@@ -4964,11 +5030,11 @@
 "transfers."
 msgstr ""
 
-#: resources.h:117
+#: resources.h:127
 msgid "Please enter a password for this server:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2275
 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"
@@ -4980,11 +5046,11 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:344
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr ""
 
-#: resources.h:118
+#: resources.h:128
 msgid "Please enter a username for this server:"
 msgstr ""
 
@@ -4996,30 +5062,30 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr ""
-
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:576
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1604
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1183
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1627
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1187
+#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr ""
 
-#: resources.h:119
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr ""
+
+#: resources.h:129
 msgid "Please enter username and password for this server:"
 msgstr ""
 
@@ -5035,7 +5101,7 @@
 "address, use the external resolver option."
 msgstr ""
 
-#: resources.h:672
+#: resources.h:694
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5047,7 +5113,7 @@
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:258
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 
@@ -5059,7 +5125,7 @@
 "'game mode'."
 msgstr ""
 
-#: resources.h:686
+#: resources.h:708
 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 "
@@ -5067,26 +5133,26 @@
 "discard."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:718
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
 
-#: resources.h:740
+#: resources.h:762
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
 
-#: resources.h:890 resources.h:896
+#: resources.h:912 resources.h:918
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
 
-#: resources.h:246
+#: resources.h:257
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5099,38 +5165,38 @@
 "previously."
 msgstr ""
 
-#: resources.h:456
+#: resources.h:467
 msgid "Please select an action:"
 msgstr ""
 
-#: resources.h:302
+#: resources.h:313
 msgid "Please select the categories you would like to import."
 msgstr ""
 
-#: resources.h:674
+#: resources.h:696
 msgid "Please select the default transfer mode you would like to use."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:38
+#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:27
+#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:41
+#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:44
+#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:30
+#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr ""
 
@@ -5143,30 +5209,30 @@
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
 
-#: resources.h:253
+#: resources.h:264
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1074
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1090
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1089
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:184
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:185
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:187
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:289
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1817
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:717
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr ""
 
@@ -5174,47 +5240,57 @@
 msgid "Preview:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:914
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:17
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:913
+#: resources.h:935
 msgid "Prioritize directories (default)"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr ""
 
-#: resources.h:953
-msgid "Privacy policy:"
+#: resources.h:979
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
 msgstr ""
 
-#: resources.h:787
+#: resources.h:809
 msgid "Private &keys:"
 msgstr ""
 
-#: resources.h:81
+#: resources.h:91
 msgid "Pro&tocol:"
 msgstr ""
 
-#: resources.h:783 resources.h:800
+#: resources.h:805 resources.h:822
 msgid "Pro&xy password:"
 msgstr ""
 
-#: resources.h:525 resources.h:592
+#: resources.h:543 resources.h:612
 msgid "Process &Queue"
 msgstr ""
 
-#: resources.h:798
+#: resources.h:19 resources.h:48
+msgid "Protocol:"
+msgstr ""
+
+#: resources.h:820
 msgid "Proxy &port:"
 msgstr ""
 
-#: resources.h:782 resources.h:799
+#: resources.h:804 resources.h:821
 msgid "Proxy &user:"
 msgstr ""
 
@@ -5222,12 +5298,16 @@
 msgid "Proxy authentication failed"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:132
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:146
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:131
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5242,23 +5322,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
 
-#: resources.h:785
+#: resources.h:807
 msgid "Public Key Authentication"
 msgstr ""
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr ""
 
-#: resources.h:142
+#: resources.h:152
 msgid "Public permissions"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3224
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr ""
 
@@ -5277,39 +5357,39 @@
 msgid "Queue: empty"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:453
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr ""
 
-#: resources.h:448
+#: resources.h:459
 msgid "Queueing:"
 msgstr ""
 
-#: resources.h:608
+#: resources.h:628
 msgid "R&eboot system"
 msgstr ""
 
-#: resources.h:522
+#: resources.h:540
 msgid "R&emote directory tree"
 msgstr ""
 
-#: resources.h:622 resources.h:626
+#: resources.h:644 resources.h:648
 msgid "R&eset and requeue selected files"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:592
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr ""
 
-#: resources.h:139
+#: resources.h:149
 msgid "Re&ad"
 msgstr ""
 
-#: resources.h:569 resources.h:583
+#: resources.h:587 resources.h:603
 msgid "Re&fresh"
 msgstr ""
 
-#: resources.h:63
+#: resources.h:73
 msgid "Re&name"
 msgstr ""
 
@@ -5319,65 +5399,73 @@
 "routers and firewalls accordingly."
 msgstr ""
 
-#: resources.h:143
+#: resources.h:153
 msgid "Rea&d"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1095
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1692
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1025
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1026
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1717
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
+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] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1690
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1023
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1024
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1715
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
+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:1697
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1030
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1031
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1722
 #, c-format
-msgid "Really delete %s and %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:136
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3231
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr ""
 
-#: resources.h:148
+#: resources.h:158
 msgid "Rec&urse into subdirectories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:998
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1007
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1031
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1004
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1013
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr ""
 
@@ -5387,11 +5475,11 @@
 "If you continue, your connection will be disconnected."
 msgstr ""
 
-#: resources.h:741
+#: resources.h:763
 msgid "Reconnection settings"
 msgstr ""
 
-#: resources.h:994 resources.h:995
+#: resources.h:1021 resources.h:1022
 msgid "Reconnects to the last used server"
 msgstr ""
 
@@ -5399,36 +5487,40 @@
 msgid "Redirection to invalid address"
 msgstr ""
 
-#: resources.h:986 resources.h:987
+#: resources.h:1013 resources.h:1014
 msgid "Refresh the file and folder lists"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1241
+#: resources.h:507
+msgid "Remember passwords?"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:837
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr ""
 
-#: resources.h:367
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: resources.h:378
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr ""
 
-#: resources.h:440
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:676
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:682
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:692
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:698
+#: resources.h:451
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:677
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:683
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:693
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr ""
 
-#: resources.h:206
+#: resources.h:217
 msgid "Remote filters:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1232
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr ""
 
@@ -5439,16 +5531,16 @@
 "supported by the current site's servertype (%s)."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1085
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the servertype (%s) selected on the parent site."
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1096
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 
@@ -5456,11 +5548,11 @@
 msgid "Remote path could not be parsed."
 msgstr ""
 
-#: resources.h:445
+#: resources.h:456
 msgid "Remote path handling:"
 msgstr ""
 
-#: resources.h:313
+#: resources.h:324
 msgid "Remote path:"
 msgstr ""
 
@@ -5468,34 +5560,34 @@
 msgid "Remote site:"
 msgstr ""
 
-#: resources.h:619 resources.h:623
+#: resources.h:641 resources.h:645
 msgid "Remove &all"
 msgstr ""
 
-#: resources.h:621 resources.h:625
+#: resources.h:643 resources.h:647
 msgid "Remove &selected"
 msgstr ""
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 #: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr ""
 
-#: resources.h:637 resources.h:658
+#: resources.h:659 resources.h:680
 msgid "Rename selected directory"
 msgstr ""
 
-#: resources.h:573 resources.h:587
+#: resources.h:591 resources.h:607
 msgid "Rename selected files and directories"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2557
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3531
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr ""
 
-#: resources.h:472
+#: resources.h:483
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
@@ -5507,106 +5599,120 @@
 msgid "Require implicit FTP over TLS"
 msgstr ""
 
-#: resources.h:624
+#: resources.h:646
 msgid "Reset and requeue &all"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1198
 #: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:497
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1204
 #, c-format
 msgid "Resolving address of %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1159
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:544
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:555
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:288
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:342
 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:395
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:290
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:344
 msgid "Response:"
 msgstr ""
 
-#: resources.h:439
+#: resources.h:450
 msgid "Results:"
 msgstr ""
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Resume file transfer"
 msgstr ""
 
-#: resources.h:858
+#: resources.h:880
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:955
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1292
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:895
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr ""
 
-#: resources.h:500
+#: resources.h:518
 msgid "S&how files currently being edited..."
 msgstr ""
 
-#: resources.h:875
+#: resources.h:897
 msgid "S&how the Site Manager on startup"
 msgstr ""
 
-#: resources.h:609
+#: resources.h:629
 msgid "S&hutdown system"
 msgstr ""
 
-#: resources.h:437
+#: resources.h:448
 msgid "S&top"
 msgstr ""
 
-#: resources.h:516
+#: resources.h:534
 msgid "S&ynchronized browsing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:121
-msgid "SFTP"
+#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:121
+msgid "SFTP"
+msgstr ""
+
+#: resources.h:177
+msgid "SQLite:"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:852
+msgid "Save settings?"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:967
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:455
+msgid "Saving of password has been disabled by your system administrator."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846
-msgid "Save settings?"
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:969
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:457
+msgid "Saving of passwords has been disabled by you."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1831
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1833
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr ""
 
-#: resources.h:433
+#: resources.h:444
 msgid "Search &conditions:"
 msgstr ""
 
-#: resources.h:431
+#: resources.h:442
 msgid "Search &directory:"
 msgstr ""
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "Search for files recursively."
 msgstr ""
 
-#: resources.h:541
+#: resources.h:559
 msgid "Search server for files"
 msgstr ""
 
@@ -5619,25 +5725,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr ""
 
-#: resources.h:375
+#: resources.h:386
 msgid "Sele&ct server"
 msgstr ""
 
-#: resources.h:726
+#: resources.h:748
 msgid "Select &page:"
 msgstr ""
 
-#: resources.h:878
+#: resources.h:900
 msgid "Select Theme"
 msgstr ""
 
-#: resources.h:836
+#: resources.h:858
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:162
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1702
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:168
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1710
 msgid "Select default editor"
 msgstr ""
 
@@ -5653,7 +5759,7 @@
 "the queue."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:328
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr ""
 
@@ -5674,7 +5780,7 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/interface/export.cpp:32
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2169
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr ""
 
@@ -5690,12 +5796,12 @@
 msgid "Select filename for converted keyfile"
 msgstr ""
 
-#: resources.h:421
+#: resources.h:432
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:805
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr ""
 
@@ -5703,15 +5809,15 @@
 msgid "Select target filename"
 msgstr ""
 
-#: resources.h:291
+#: resources.h:302
 msgid "Select the categories to export:"
 msgstr ""
 
-#: resources.h:282
+#: resources.h:293
 msgid "Select the private data you would like to delete."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:772
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5725,7 +5831,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:770
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5746,7 +5852,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:777
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr ""
@@ -5761,14 +5867,14 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:182
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1643
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1722
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:188
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1651
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1730
 msgid "Selected editor does not exist."
 msgstr ""
 
-#: resources.h:320
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:331
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr ""
 
@@ -5776,15 +5882,15 @@
 msgid "Selected file is already loaded"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2679
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2707
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:311
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr ""
 
@@ -5798,79 +5904,84 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr ""
 
-#: resources.h:748
+#: resources.h:770
 msgid "Send FTP &keep-alive commands"
 msgstr ""
 
-#: resources.h:543
+#: resources.h:561
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr ""
 
-#: resources.h:7 resources.h:31
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:99
 msgid "Server &Type:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:721
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, 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:2546
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, 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:856
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:417
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -5888,89 +5999,100 @@
 msgid "Server sent unexpected reply."
 msgstr ""
 
-#: resources.h:351
+#: resources.h:362
 msgid "Server to client MAC:"
 msgstr ""
 
-#: resources.h:349
+#: resources.h:360
 msgid "Server to client cipher:"
 msgstr ""
 
-#: resources.h:380
+#: resources.h:391
 msgid "Server&type:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr ""
 
-#: resources.h:311 resources.h:373
+#: resources.h:322 resources.h:384
 msgid "Server:"
 msgstr ""
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:45
 msgid "Session details"
 msgstr ""
 
-#: resources.h:596
+#: resources.h:616
 msgid "Set &Priority"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2435
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3683
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:860
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr ""
 
-#: resources.h:725
+#: resources.h:747
 msgid "Settings"
 msgstr ""
 
-#: resources.h:975
+#: resources.h:1001
 msgid "Show &raw directory listing"
 msgstr ""
 
-#: resources.h:552
+#: resources.h:570
 msgid "Show &welcome dialog..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2341
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 
+#: resources.h:640
+msgid "Shows available TLS ciphers"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3233
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr ""
 
-#: resources.h:299
+#: resources.h:9 resources.h:38
+msgid "Signature algorithm:"
+msgstr ""
+
+#: resources.h:310
 msgid "Site &Manager entries"
 msgstr ""
 
-#: resources.h:70
+#: resources.h:80
 msgid "Site Manager"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr ""
+
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:945
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:956
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:965
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:982
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:996
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1009
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1028
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1038
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1052
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1063
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1088
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:991
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1005
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1018
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1047
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1061
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1072
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1097
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr ""
 
@@ -5981,8 +6103,8 @@
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:439
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:456
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:470
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:742
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:829
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:740
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr ""
 
@@ -5992,8 +6114,8 @@
 
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:463
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:556
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:735
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:822
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:733
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr ""
 
@@ -6009,11 +6131,11 @@
 "Add current connection to the site manager?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr ""
 
-#: resources.h:897
+#: resources.h:919
 msgid "Size formatting"
 msgstr ""
 
@@ -6022,49 +6144,49 @@
 msgid "Size unknown"
 msgstr ""
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:277 resources.h:287 resources.h:867 resources.h:876
 msgid "Skip file"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1270
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1289
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1314
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1380
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1276
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1295
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1320
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1274
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1293
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1318
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1384
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1280
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1299
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1324
+#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1163
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 
-#: resources.h:688 resources.h:764
+#: resources.h:710 resources.h:786
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
 
-#: resources.h:915
+#: resources.h:937
 msgid "Sort directories inline"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:446
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting"
 msgstr ""
 
-#: resources.h:912
+#: resources.h:934
 msgid "Sorting &mode:"
 msgstr ""
 
@@ -6076,21 +6198,21 @@
 msgid "Source and target file may not be the same"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:140
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr ""
 
-#: resources.h:49
+#: resources.h:59
 msgid "Source file:"
 msgstr ""
 
-#: resources.h:489
+#: resources.h:500
 #: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr ""
 
-#: resources.h:809
+#: resources.h:831
 msgid "Speed limits"
 msgstr ""
 
@@ -6102,7 +6224,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr ""
 
-#: resources.h:391
+#: resources.h:976
+msgid "Stable and beta versions"
+msgstr ""
+
+#: resources.h:975
+msgid "Stable versions only"
+msgstr ""
+
+#: resources.h:402
 msgid "Start transfer &immediately"
 msgstr ""
 
@@ -6110,43 +6240,47 @@
 msgid "Start with opened Site Manager"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1633
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2225
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1637
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2229
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:182
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1233
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1241
 msgid "Status"
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:212
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:538
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:299
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:368
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:549
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:297
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:366
 msgid "Status:"
 msgstr ""
 
-#: resources.h:593
+#: resources.h:613
 msgid "Stop and remove &all"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:186
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr ""
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:41
 msgid "Subject of certificate"
 msgstr ""
 
@@ -6154,55 +6288,56 @@
 msgid "Successful transfers"
 msgstr ""
 
-#: resources.h:716
+#: resources.h:738
 msgid "Summary of test results:"
 msgstr ""
 
-#: resources.h:459
+#: resources.h:470
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:1001
+#: resources.h:1028
 #: ../../source/FileZilla3/locales/../src/interface/state.cpp:249
 #: ../../source/FileZilla3/locales/../src/interface/state.cpp:278
 #: ../../source/FileZilla3/locales/../src/interface/state.cpp:285
 #: ../../source/FileZilla3/locales/../src/interface/state.cpp:297
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:373
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:383
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:392
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1016
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1025
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1032
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1043
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1050
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:396
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:406
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:415
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1080
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1089
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1096
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1107
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1114
 msgid "Synchronized browsing"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:391
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:87
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:125
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:88
+#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:74
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:80
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:89
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:95
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2491
+#: ../../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:2514
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr ""
 
-#: resources.h:518
+#: resources.h:536
 msgid "T&oolbar"
 msgstr ""
 
@@ -6210,11 +6345,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr ""
 
@@ -6222,23 +6357,27 @@
 msgid "TTL expired"
 msgstr ""
 
-#: resources.h:47
+#: resources.h:57
 msgid "Target file already exists"
 msgstr ""
 
-#: resources.h:53
+#: resources.h:63
 msgid "Target file:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1908
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr ""
 
-#: resources.h:715
+#: resources.h:737
 msgid "Test results"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr ""
 
@@ -6265,12 +6404,12 @@
 msgid "The address you entered was: %s"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:720
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:722
 msgid "The bookmark could not be added."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:809
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr ""
 
@@ -6282,20 +6421,25 @@
 msgid "The custom login sequence cannot be empty."
 msgstr ""
 
-#: resources.h:424
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1682
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr ""
+
+#: resources.h:435
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr ""
 
-#: resources.h:423
+#: resources.h:434
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:147
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:254
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:149
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:217
+#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
 
@@ -6312,9 +6456,9 @@
 "Please enter a new name:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2653
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2035
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2166
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2684
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2043
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2174
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6332,17 +6476,17 @@
 msgid "The file '%s' could not be loaded."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2647
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2029
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2161
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2678
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2037
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2169
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2074
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2174
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2082
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6373,7 +6517,7 @@
 "Would you like to convert it into an unprotected file?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr ""
 
@@ -6404,11 +6548,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr ""
 
-#: resources.h:328
+#: resources.h:339
 msgid "The following files are currently being edited:"
 msgstr ""
 
-#: resources.h:463
+#: resources.h:474
 msgid "The free open source FTP solution"
 msgstr ""
 
@@ -6416,7 +6560,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr ""
 
-#: resources.h:973
+#: resources.h:999
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6440,23 +6584,23 @@
 "port."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:607
+#: ../../source/FileZilla3/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 ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:609
+#: ../../source/FileZilla3/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 ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1964
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1022
+#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6467,22 +6611,22 @@
 msgid "The selected categories have been imported."
 msgstr ""
 
-#: resources.h:298
+#: resources.h:309
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 
-#: resources.h:321
+#: resources.h:332
 msgid "The selected file is already being edited:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2707
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2659
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2041
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2690
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2049
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6497,7 +6641,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr ""
 
-#: resources.h:106
+#: resources.h:116
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 
@@ -6507,14 +6651,14 @@
 "certificate to make sure the server can be trusted."
 msgstr ""
 
-#: resources.h:187
+#: resources.h:198
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
 
-#: resources.h:175
+#: resources.h:186
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6526,21 +6670,21 @@
 "settings to have effect."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3222
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3220
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 
-#: resources.h:48
+#: resources.h:58
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr ""
 
@@ -6548,11 +6692,11 @@
 msgid "Themes"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:463
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:398
+#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr ""
 
@@ -6562,63 +6706,63 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:693
+#: resources.h:715
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 
-#: resources.h:671
+#: resources.h:693
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr ""
 
-#: resources.h:891
+#: resources.h:913
 msgid "Time formatting"
 msgstr ""
 
-#: resources.h:732
+#: resources.h:754
 msgid "Time&out in seconds:"
 msgstr ""
 
-#: resources.h:735
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1066
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1110
+#: resources.h:757
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1049
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1079
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1684
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:180
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2339
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2340
+#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 
-#: resources.h:786
+#: resources.h:808
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
 
-#: resources.h:998
+#: resources.h:1025
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6628,30 +6772,30 @@
 "Red: File sizes different"
 msgstr ""
 
-#: resources.h:1000
+#: resources.h:1027
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
 
-#: resources.h:988 resources.h:989
+#: resources.h:1015 resources.h:1016
 msgid "Toggles processing of the transfer queue"
 msgstr ""
 
-#: resources.h:980 resources.h:981
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the local directory tree"
 msgstr ""
 
-#: resources.h:978 resources.h:979
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the message log"
 msgstr ""
 
-#: resources.h:982 resources.h:983
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the remote directory tree"
 msgstr ""
 
-#: resources.h:984 resources.h:985
+#: resources.h:1011 resources.h:1012
 msgid "Toggles the display of the transfer queue"
 msgstr ""
 
@@ -6664,37 +6808,37 @@
 msgstr ""
 
 #: ../../source/FileZilla3/locales/../src/engine/logging.cpp:216
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:293
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:354
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:291
+#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr ""
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Transfer"
 msgstr ""
 
-#: resources.h:361
+#: resources.h:372
 msgid "Transfer &direction"
 msgstr ""
 
-#: resources.h:527
+#: resources.h:545
 msgid "Transfer &type"
 msgstr ""
 
-#: resources.h:742
+#: resources.h:764
 msgid "Transfer Mode"
 msgstr ""
 
-#: resources.h:877
+#: resources.h:899
 msgid "Transfer Queue"
 msgstr ""
 
-#: resources.h:98
+#: resources.h:108
 msgid "Transfer Settings"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:498
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:522
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:509
+#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr ""
@@ -6703,8 +6847,8 @@
 msgid "Transferred data got tainted."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1491
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:278
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1474
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr ""
 
@@ -6712,70 +6856,70 @@
 msgid "Transfers"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3136
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3139
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3120
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr ""
 
-#: resources.h:833
+#: resources.h:855
 msgid "Treat files &without extension as ASCII file"
 msgstr ""
 
-#: resources.h:829
+#: resources.h:851
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr ""
 
-#: resources.h:194
+#: resources.h:205
 msgid "Trust the new key and carry on connecting?"
 msgstr ""
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr ""
 
-#: resources.h:181
+#: resources.h:192
 msgid "Trust this host and carry on connecting?"
 msgstr ""
 
-#: resources.h:396
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1231
+#: resources.h:407
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr ""
 
-#: resources.h:768
+#: resources.h:790
 msgid "Type of FTP Proxy:"
 msgstr ""
 
-#: resources.h:793
+#: resources.h:815
 msgid "Type of generic proxy:"
 msgstr ""
 
-#: resources.h:331
+#: resources.h:342
 msgid "U&pload"
 msgstr ""
 
-#: resources.h:484 resources.h:813
+#: resources.h:495 resources.h:835
 #, no-c-format
 msgid "U&pload limit:"
 msgstr ""
 
-#: resources.h:939
+#: resources.h:961
 msgid "U&se filetype associations if available"
 msgstr ""
 
-#: resources.h:892
+#: resources.h:914
 msgid "U&se system defaults"
 msgstr ""
 
-#: resources.h:770
+#: resources.h:792
 msgid "USER@&HOST"
 msgstr ""
 
@@ -6784,16 +6928,16 @@
 msgid "Unassigned error code %d"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:179
+#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1263
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1291
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1271
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 
@@ -6812,7 +6956,7 @@
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:174
+#: resources.h:185
 msgid "Unknown host key"
 msgstr ""
 
@@ -6841,7 +6985,7 @@
 "mode has to be used."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:866
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr ""
 
@@ -6849,25 +6993,24 @@
 msgid "Unsupported redirect"
 msgstr ""
 
-#: resources.h:332
+#: resources.h:343
 msgid "Up&load and unedit"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:259
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:272
+msgid "Update wizard"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:251
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:264
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-msgid "Update wizard"
+#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
 msgstr ""
 
-#: resources.h:363
+#: resources.h:374
 msgid "Upload"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1254
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr ""
 
@@ -6880,59 +7023,59 @@
 msgid "Upload limit: none"
 msgstr ""
 
-#: resources.h:648
+#: resources.h:670
 msgid "Upload selected directory"
 msgstr ""
 
-#: resources.h:558
+#: resources.h:576
 msgid "Upload selected files and directories"
 msgstr ""
 
-#: resources.h:316
+#: resources.h:327
 msgid "Upload this file back to the server?"
 msgstr ""
 
-#: resources.h:315
+#: resources.h:326
 msgid "Upload this file to the server?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1248
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1282
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1447
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1256
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1290
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1251
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1449
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1259
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1285
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1451
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1293
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr ""
 
-#: resources.h:110
+#: resources.h:120
 msgid "Use &custom charset"
 msgstr ""
 
-#: resources.h:936
+#: resources.h:958
 msgid "Use &custom editor:"
 msgstr ""
 
-#: resources.h:422
+#: resources.h:433
 msgid "Use &default editor for text files"
 msgstr ""
 
-#: resources.h:405 resources.h:411
+#: resources.h:416 resources.h:422
 msgid "Use &synchronized browsing"
 msgstr ""
 
-#: resources.h:108
+#: resources.h:118
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 
-#: resources.h:258 resources.h:268
+#: resources.h:269 resources.h:279
 msgid "Use default action"
 msgstr ""
 
@@ -6940,118 +7083,118 @@
 msgid "Use plain FTP"
 msgstr ""
 
-#: resources.h:371
+#: resources.h:382
 msgid "Use server currently connected to"
 msgstr ""
 
-#: resources.h:372
+#: resources.h:383
 msgid "Use server from site manager"
 msgstr ""
 
-#: resources.h:886
+#: resources.h:908
 msgid "Use system &defaults"
 msgstr ""
 
-#: resources.h:694
+#: resources.h:716
 msgid "Use the following IP address:"
 msgstr ""
 
-#: resources.h:704
+#: resources.h:726
 msgid "Use the following port range:"
 msgstr ""
 
-#: resources.h:689
+#: resources.h:711
 msgid "Use the server's external IP address instead"
 msgstr ""
 
-#: resources.h:695 resources.h:758
+#: resources.h:717 resources.h:780
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 
-#: resources.h:698
+#: resources.h:720
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
 
-#: resources.h:122
+#: resources.h:132
 msgid "User:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:509
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:518
 msgid "Username cannot be a series of spaces"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr ""
 
-#: resources.h:112
+#: resources.h:122
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 
-#: resources.h:231
+#: resources.h:242
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr ""
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:16
+#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1056
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr ""
 
-#: resources.h:169
+#: resources.h:180
 msgid "Version:"
 msgstr ""
 
-#: resources.h:818
+#: resources.h:840
 msgid "Very high"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 
-#: resources.h:923
+#: resources.h:945
 msgid "View/Edit"
 msgstr ""
 
-#: resources.h:355
+#: resources.h:366
 msgid "Visible columns"
 msgstr ""
 
-#: resources.h:140
+#: resources.h:150
 msgid "W&rite"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1790
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1398
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1441
+#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:272
+#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr ""
 
@@ -7059,7 +7202,7 @@
 msgid "Waiting to retry..."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:297
+#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7076,11 +7219,11 @@
 "FileZilla will timeout on big transfers."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:966
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:264
+#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7089,33 +7232,43 @@
 "Do you really want to check for nightly builds?"
 msgstr ""
 
-#: resources.h:186
+#: resources.h:197
 msgid "Warning: Potential security breach!"
 msgstr ""
 
-#: resources.h:475
+#: resources.h:486
 msgid "Welcome to FileZilla"
 msgstr ""
 
-#: resources.h:464
+#: resources.h:475
 msgid "What's new"
 msgstr ""
 
-#: resources.h:241
+#: resources.h:252
 msgid "What's new:"
 msgstr ""
 
-#: resources.h:821
+#: resources.h:502
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:843
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 
-#: resources.h:863
+#: resources.h:885
 msgid "Widescreen"
 msgstr ""
 
-#: resources.h:144
+#: resources.h:501
+msgid "Would you like FileZilla to remember passwords?"
+msgstr ""
+
+#: resources.h:154
 msgid "Wr&ite"
 msgstr ""
 
@@ -7128,25 +7281,31 @@
 msgid "Wrong line endings"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr ""
 
-#: resources.h:252
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+
+#: resources.h:263
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 
-#: resources.h:473
+#: resources.h:484
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:63
+#: ../../source/FileZilla3/locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 
-#: resources.h:147
+#: resources.h:157
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7166,48 +7325,48 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr ""
 
-#: resources.h:454
+#: resources.h:465
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2626
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2008
+#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2657
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2016
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2128
+#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2136
 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:433
 #: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:433
 msgid "You have to enter a hostname."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:817
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:149
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:89
+#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:149
 msgid "You have to enter a valid IP address."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:823
+#: ../../source/FileZilla3/locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:520
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1047
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:529
 msgid "You have to enter an account name"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:490
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1018
+#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:499
 msgid "You have to specify a user name"
 msgstr ""
 
@@ -7225,34 +7384,34 @@
 msgid "You need to enter a name for the log file."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638
+#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:70
 #: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1107
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1116
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7280,44 +7439,49 @@
 "should work properly."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr ""
+
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:497
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:515
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:540
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:556
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:511
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:530
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:555
+#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr ""
 
@@ -7333,78 +7497,81 @@
 "FileZilla executable."
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:904
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr ""
 
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1176
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1187
+#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1202
 #: ../../source/FileZilla3/locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr ""
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr ""
 
-#: resources.h:165
+#: resources.h:175
 msgid "wxWidgets:"
 msgstr ""
diff -Nru filezilla-3.5.3/locales/fr.po filezilla-3.7.3~precise/locales/fr.po
--- filezilla-3.5.3/locales/fr.po	2011-11-05 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/locales/fr.po	2013-06-18 20:02:24.000000000 +0000
@@ -2,1729 +2,1774 @@
 msgstr ""
 "Project-Id-Version: fr\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-04 05:31+0100\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
 "PO-Revision-Date: \n"
-"Last-Translator: William Gathoye <william@gathoye.be>\n"
-"Language-Team: Frédéric DUARTE, William GATHOYE <pgase.filezilla@free.fr, william@gathoye.be>\n"
+"Last-Translator: Pgase <pgase.filezilla@free.fr>\n"
+"Language-Team: Pgase, William GATHOYE <pgase.filezilla@free.fr, "
+"william@gathoye.be>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: French, Français (fr-FR)\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
+"X-Generator: Poedit 1.5.5\n"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:65
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:65
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S écoulée(s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:69
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:69
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S restante(s)"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
-msgid "%a - Account (Lines containing this will be omitted if not using Account logontype)"
-msgstr "%a - Compte (les lignes comprenant ce paramètre seront ignorées si le type d'authentification Compte n'est pas utilisé)"
+msgid ""
+"%a - Account (Lines containing this will be omitted if not using Account "
+"logontype)"
+msgstr ""
+"%a - Compte (les lignes comprenant ce paramètre seront ignorées si le type "
+"d'authentification Compte n'est pas utilisé)"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:63
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:74
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:86
+#: ../../locales/../src/interface/filelist_statusbar.cpp:63
+#: ../../locales/../src/interface/filelist_statusbar.cpp:74
+#: ../../locales/../src/interface/filelist_statusbar.cpp:86
 #, c-format
 msgid "%d directory"
 msgid_plural "%d directories"
 msgstr[0] "%d dossier"
 msgstr[1] "%d dossiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1696
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:776
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
 msgstr[0] "%d dossier avec son contenu"
 msgstr[1] "%d dossiers avec leurs contenus"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:62
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1695
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:775
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1028
+#: ../../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
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
 msgstr[0] "%d fichier"
 msgstr[1] "%d fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:81
+#: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
 msgstr[0] "%d fichier. Taille totale : %s"
 msgstr[1] "%d fichiers. Taille totale : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:79
+#: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
 msgstr[0] "%d fichier. Taille totale : Au moins %s"
 msgstr[1] "%d fichiers. Taille totale : Au moins %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d fichiers ajoutés à la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:104
+#: ../../locales/../src/engine/ControlSocket.cpp:104
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
 msgstr[0] "%d seconde"
 msgstr[1] "%d secondes"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Hôte"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Mot de passe"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d o/s)"
-
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d Ko/s)"
-
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d Mo/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? o/s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:39
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
 msgstr "%s - Certificat expiré !"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:23
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - Pas encore valide !"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Identifiant Proxy"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:91
+#: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
 msgstr "%s et %s. Taille totale : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:89
+#: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
 msgstr "%s et %s. Taille totale : au moins %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:31
+#: ../../locales/../src/engine/sizeformatting_base.cpp:31
 #, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
 msgstr[0] "%s octet"
 msgstr[1] "%s octets"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s octets"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s octets (%d o/s)"
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:886
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s octets (%d.%d Ko/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s octets (%s/s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s octets (%d.%d Mo/s)"
-
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
-"%s could not be found. Without this component of FileZilla, SFTP will not work.\n"
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
 "\n"
-"Please download FileZilla again. If this problem persists, please submit a bug report."
+"Please download FileZilla again. If this problem persists, please submit a "
+"bug report."
 msgstr ""
-"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera pas.\n"
+"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera "
+"pas.\n"
 "\n"
-"Veuillez télécharger Filezilla à nouveau. Si le problème persiste, merci de soumettre un rapport d'erreur."
+"Veuillez télécharger Filezilla à nouveau. Si le problème persiste, merci de "
+"soumettre un rapport d'erreur."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
-"%s could not be found. Without this component of FileZilla, SFTP will not work.\n"
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
 "\n"
 "Possible solutions:\n"
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera pas.\n"
+"%s est introuvable. Sans ce composant de FileZilla, le SFTP ne fonctionnera "
+"pas.\n"
 "\n"
 "Solutions possibles :\n"
-"- Vérifiez que %s est présent comme dossier listé dans votre variable d'environnement PATH.\n"
-"- Spécifiez le chemin complet de %s dans la variable d'environnement FZ_FZSFTP."
+"- Vérifiez que %s est présent comme dossier listé dans votre variable "
+"d'environnement PATH.\n"
+"- Spécifiez le chemin complet de %s dans la variable d'environnement "
+"FZ_FZSFTP."
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:56
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s avec %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Identifiant"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Mot de passe Proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "À &propos de..."
 
-#: resources.h:86
-#: resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "C&ompte :"
 
-#: resources.h:101
-#: resources.h:680
-#: resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Actif"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Ajouter un favori..."
 
-#: resources.h:559
-#: resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Ajouter les fichiers à la file d'attente"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Ajouter une clé privée..."
 
-#: resources.h:630
-#: resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Ajouter à la file d'attente"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Ajuster le décalage horaire du serveur :"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
-msgstr "Toujours f&aire confiance à ce certificat lors des prochaines sessions."
+msgstr ""
+"Toujours f&aire confiance à ce certificat lors des prochaines sessions."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Toujours f&aire confiance à cet hôte, ajouter cette clé au cache"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Toujours utiliser l'éditeur p&ar défaut"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
-msgstr "Toujours utiliser l&a sélection pour les types de fichiers qui ne sont pas encore associés"
+msgstr ""
+"Toujours utiliser l&a sélection pour les types de fichiers qui ne sont pas "
+"encore associés"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "Toujours effectuer cette &action"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "L&aisser le système d'exploitation identifier l'adresse IP externe"
 
-#: resources.h:528
-#: resources.h:660
-#: resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automatique"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "Détection &automatique"
 
-#: resources.h:530
-#: resources.h:662
-#: resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binaire"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
-msgstr "Préfixes &binaires du Système International (SI) (ex. 1 Ko = 1024 octets)"
+msgstr ""
+"Préfixes &binaires du Système International (SI) (ex. 1 Ko = 1024 octets)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "Fa&voris"
 
-#: resources.h:92
-#: resources.h:366
-#: resources.h:403
-#: resources.h:409
-#: resources.h:426
-#: resources.h:444
-#: resources.h:937
-#: resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "P&arcourir..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Tolérance de dépassement :"
 
-#: resources.h:128
-#: resources.h:131
-#: resources.h:197
-#: resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "Ann&uler"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Rechercher d'éventuelles versions Bêta de FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Supprimer les données personnelles..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Quitter FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configurer la limitation des taux de transfert..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "Pa&ramètres..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Connexion"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Copier"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "Ajouter la &connexion actuelle dans le Gestionnaire de Sites..."
 
-#: resources.h:172
-#: resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copier dans le presse-papier"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Crash test"
 
-#: resources.h:567
-#: resources.h:581
-#: resources.h:632
-#: resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Créer un dossier"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "Ouvrir un nouvel ongle&t"
 
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:72
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Débogage"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "Niveau de &débogage du journal des événements :"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "Éditeur par &défaut :"
 
-#: resources.h:526
-#: resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "Action par &défaut sur les fichiers existants..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Délai entre chaque tentative :"
 
-#: resources.h:76
-#: resources.h:202
-#: resources.h:216
-#: resources.h:416
-#: resources.h:570
-#: resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Supprimer"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Supprimer un lien symbolique"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "Comparaison de &dossier"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
-msgstr "Supprimer le fichier local puis télécharger et é&diter le fichier à nouveau"
+msgstr ""
+"Supprimer le fichier local puis télécharger et é&diter le fichier à nouveau"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Déconnexion"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Déconnecter du serveur"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Afficher temporairement le taux de transfert à la place du taux moyen"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Afficher la taille en octets"
 
-#: ../../source/FileZilla3/locales/../src/interface/conditionaldialog.cpp:25
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Ne pas se souvenir &des mots de passe"
+
+#: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "Ne plus afficher ce &dialogue."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Ne pas utiliser l'a&dresse IP externe pour les connexions locales."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Action du &double-clic sur les fichiers :"
 
-#: resources.h:574
-#: resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Télécharger"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Télécharger vers :"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Télécharger..."
 
-#: resources.h:257
-#: resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Téléchargements :"
 
-#: resources.h:503
-#: resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Édition"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "Éditer l&es règles de filtrage..."
 
-#: resources.h:512
-#: resources.h:532
-#: resources.h:643
-#: resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "Activ&er"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "Activer la recherche automatiqu&e des mises à jour"
-
-#: resources.h:481
-#: resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Activer la limitation des taux de transfert"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Encodage :"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Chiffrement :"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "Saisir une command&e personnalisée..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Exécuter"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Exporter les entrées du Gestionnaire de Sites"
 
-#: resources.h:498
-#: resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exporter les paramètres..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "Retour en mode acti&f"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Fichier"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "Attributs du &fichier..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Droits d'accès au &fichier..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Fichier :"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Conditions du &filtre :"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "Jeux de &filtres :"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtres :"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Terminer"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Terminer l'édition et supprimer le fichier local"
 
-#: resources.h:447
-msgid "&Flatten remote paths, download all contained files directly into target directory"
-msgstr "Écraser le chemin distant, télécharger tous les &fichiers qui y sont contenus directement dans le dossier cible"
+#: resources.h:457
+msgid ""
+"&Flatten remote paths, download all contained files directly into target "
+"directory"
+msgstr ""
+"Écraser le chemin distant, télécharger tous les &fichiers qui y sont "
+"contenus directement dans le dossier cible"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "Sui&vre le lien symbolique, supprimer le contenu du dossier cible"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "Obtenir l'adresse IP e&xterne à partir de l'URL suivante :"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Obtenir de l'aide..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Favori &global"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 utilisant la méthode CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&?"
 
-#: resources.h:515
-#: resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "Masquer les fic&hiers identiques"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&La plus élevée"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Port le plus élevé disponible :"
 
-#: resources.h:79
-#: resources.h:378
-#: resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Hôte :"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
-msgstr "Préfixes binaires de la Commission Electrotechnique &Internationale (IEC) (ex. 1 Kio = 1024 octets)"
+msgstr ""
+"Préfixes binaires de la Commission Electrotechnique &Internationale (IEC) "
+"(ex. 1 Kio = 1024 octets)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exemple : 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importer les paramètres..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
-msgstr "Ut&iliser les préférences d'associations par type de fichier du système"
+msgstr ""
+"Ut&iliser les préférences d'associations par type de fichier du système"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
-msgstr "Conser&ver la structure du chemin distant relative à la recherche d'origine"
+msgstr ""
+"Conser&ver la structure du chemin distant relative à la recherche d'origine"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Disposition des arborescences des fichiers et dossiers :"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limiter les ports locaux utilisés par FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limiter le nombre de connexions simultanées"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Arborescence des dossiers &locaux"
 
-#: resources.h:402
-#: resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Dossier &local :"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "Sauvegarder &le journal des événements dans un fichier"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "T&ype d'authentification :"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "T&ype d'authentification :"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Basse"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Organiser les favoris..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transfert &manuel..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Nombre &maximum de connexions :"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Nombre &maximum d'essais :"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Journal des événe&ments"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimiser dans la zone de notification"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nom :"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "Assista&nt de configuration réseau..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Nouveau"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Nouveau Site"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Nouvelle version disponible !"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Suivant >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Non"
 
-#: resources.h:769
-#: resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "Aucu&n"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normale"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Délai entre chaque recherche de mise à jour :"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "Valeur &numérique :"
 
-#: resources.h:114
-#: resources.h:127
-#: resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "O&K"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "OU&VERT"
 
-#: resources.h:563
-#: resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Ouvrir"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Remplacer"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passif"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "Mot de &passe :"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Jouer un son"
 
-#: resources.h:80
-#: resources.h:379
-#: resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port :"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Position du journal des événements :"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Préserver l'horodatage des fichiers transférés"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&File d'attente"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "Connexion &rapide"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Barre de connexion &rapide"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Lire"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Reconnexion"
 
-#: resources.h:509
-#: resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "Actualise&r"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "Mémorise&r le mot de passe pour cette session"
 
-#: resources.h:404
-#: resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "Se souveni&r des mots de passe"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Dossier dis&tant :"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Chemin distant :"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Retirer"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Retirer la clé"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Retirer la sélection"
 
-#: resources.h:75
-#: resources.h:217
-#: resources.h:415
-#: resources.h:572
-#: resources.h:586
-#: resources.h:636
-#: resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Renommer"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Renommer..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "Ouvri&r à nouveau le fichier local"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "Rempla&cer les caractères invalides par :"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "Soumettre un &rapport d'erreur..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Réinitialiser et replacer tous les fichiers dans la file d'attente"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Relancer l'assistant"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Reprendre"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "Exécute&r une commande..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "Utilise&r l'assistant de configuration..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Rechercher des mises à jour..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "Enregi&strer sous..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "Rec&hercher"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "Recherche de fichiers di&stants..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Sélectionnez une entrée :"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Sélectionnez une langue :"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Sélectionnez les colonnes qui seront affichées :"
 
-#: resources.h:370
-#: resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Serveur"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "Paramètre&s"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "Paramètre&s..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Afficher le menu de débogage"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "Afficher un averti&ssement"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Afficher l'horodatage dan&s le journal des événements"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "Gestio&nnaire de Sites..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Favori spécifique au &site"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Ignorer"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "Limitation des taux de tran&sfert"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Démarrer le tran&sfert immédiatement"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "Permuter le&s volets des arborescences locale et distante"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:228
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Chiffrement &TLS"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Tester"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Thème :"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transfert"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Mode de &transfert :"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "File d'a&ttente"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
-msgstr "&Traiter les fichiers dont le nom commence par un point comme des fichiers ASCII"
+msgstr ""
+"&Traiter les fichiers dont le nom commence par un point comme des fichiers "
+"ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "Ann&uler l'édition"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "Mettre à jo&ur la clé placée en cache pour cet hôte"
 
-#: resources.h:557
-#: resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Envoyer"
 
-#: resources.h:267
-#: resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Envois :"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Utiliser un programme personnalisé"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Utiliser la navi&gation synchronisée"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Utiliser l'éditeur par défaut du système pour les fichiers texte"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Utiliser l'adresse IP suivante :"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Utiliser l'adresse IP externe des serveurs à la place"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Utiliser un séparateur pour distinguer les milliers"
 
-#: resources.h:84
-#: resources.h:124
-#: resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Identifiant :"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Identifiant :"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Version %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Affichage"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
-msgstr "&Afficher / Éditer"
+msgstr "A&fficher / Éditer"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr "&Afficher les fichiers édités localement et inviter à envoyer les modifications"
+msgstr ""
+"&Afficher les fichiers édités localement et inviter à envoyer les "
+"modifications"
+
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "Lors de la vérification des mises à jour, vérifier les :"
 
-#: resources.h:136
+#: resources.h:145
 msgid "&Write"
 msgstr "É&crire"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Oui"
 
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:461
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:511
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "'%s' n'existe pas ou ne peut pas être accédé."
 
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:477
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:498
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:505
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' n'est pas un dossier."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:445
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "Le type d'authentification 'Compte' n'est pas supporté par le protocole sélectionné"
+msgstr ""
+"Le type d'authentification 'Compte' n'est pas supporté par le protocole "
+"sélectionné"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:592
-msgid "'quote' is usually a local command used by commandline clients to send the arguments following 'quote' to the server. You might want to enter the raw command without the leading 'quote'."
-msgstr "'quote' est en général un argument de commande utilisé par les consoles pour transmettre directement des instructions inscrites après l'argument 'quote' au serveur. Vous devriez essayer de transmettre la commande en brut, en omettant 'quote' au début."
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Les types d'authentification 'Normal' et 'Compte' ne sont pas disponibles, "
+"utilisation du type 'Demander le mot de passe' à la place."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"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'."
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:96
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:105
+#: ../../locales/../src/interface/Mainfrm.cpp:596
+msgid ""
+"'quote' is usually a local command used by commandline clients to send the "
+"arguments following 'quote' to the server. You might want to enter the raw "
+"command without the leading 'quote'."
+msgstr ""
+"'quote' est en général un argument de commande utilisé par les consoles pour "
+"transmettre directement des instructions inscrites après l'argument 'quote' "
+"au serveur. Vous devriez essayer de transmettre la commande en brut, en "
+"omettant 'quote' au début."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:96
+#: ../../locales/../src/interface/filelist_statusbar.cpp:105
 #, c-format
 msgid "(%d object filtered)"
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d objet filtré)"
 msgstr[1] "(%d objets filtrés)"
 
-#: resources.h:806
-#: resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 pour aucune limite)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 secondes)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 pour désactiver)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(7 jours au minimum)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(exemple : %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(exemple : %Y-%m-%d)"
 
-#: resources.h:483
-#: resources.h:485
-#: resources.h:812
-#: resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(en %s/s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S restante(s)"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- restant"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Routeur et/ou pare-feu déficient(s)"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Fichier corrompu sur le miroir"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Logiciel malveillant sur votre système"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- restant"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c ne peut pas être utilisé conjointement avec une URL FTP."
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l ne peut être utilisé conjointement qu'avec une URL FTP."
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s et -c ne peuvent pas être présents en même temps."
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s ne peut pas être utilisé conjointement avec une URL FTP."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Aucun"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Alarmer"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Informer"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Détailler"
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "Système 32 bits"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Déboguer"
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "Système 64 bits"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Précédent"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:108
-msgid "A bookmark with the entered name already exists. Please enter an unused name."
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+msgid ""
+"A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Un favori portant ce nom existe déjà. Saisissez un autre nom."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Vous devez définir un éditeur par défaut."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:154
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 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."
 
-#: resources.h:677
-msgid "A few servers don't allow passive mode or are misconfigured. In such cases you would have to use active mode. In active mode, FileZilla opens a port and asks the server to connect to it."
-msgstr "Certains serveurs refusent la connexion en mode passif ou sont mal configurés. Dans pareils cas, vous devrez utiliser le mode actif. En mode actif, FileZilla ouvre un port et demande au serveur de s'y connecter."
+#: resources.h:698
+msgid ""
+"A few servers don't allow passive mode or are misconfigured. In such cases "
+"you would have to use active mode. In active mode, FileZilla opens a port "
+"and asks the server to connect to it."
+msgstr ""
+"Certains serveurs refusent la connexion en mode passif ou sont mal "
+"configurés. Dans pareils cas, vous devrez utiliser le mode actif. En mode "
+"actif, FileZilla ouvre un port et demande au serveur de s'y connecter."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Un fichier précédemment ouvert a été modifié."
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "Un fichier portant ce nom a déjà été édité. Souhaitez-vous ouvrir à nouveau '%s' ?"
+msgid ""
+"A file with that name is already being edited. Do you want to reopen '%s'?"
+msgstr ""
+"Un fichier portant ce nom a déjà été édité. Souhaitez-vous ouvrir à nouveau "
+"'%s' ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2674
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Un fichier portant ce nom est déjà en cours de transfert."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2679
-msgid "A file with that name is still being edited. Please close it and try again."
-msgstr "Un fichier portant ce nom est encore en cours d'édition. Veuillez le fermer et réessayez."
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
+msgid ""
+"A file with that name is still being edited. Please close it and try again."
+msgstr ""
+"Un fichier portant ce nom est encore en cours d'édition. Veuillez le fermer "
+"et réessayez."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
-"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set correctly.\n"
+"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
+"correctly.\n"
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
 "Un nom de fichier local ne peut être décodé.\n"
-"Vérifiez que la variable d'environnement LC_CTYPE (ou LC_ALL) est correctement paramétrée.\n"
-"Tant que le problème ne sera pas corrigé, des fichiers pourraient ne pas apparaître dans les contenus.\n"
+"Vérifiez que la variable d'environnement LC_CTYPE (ou LC_ALL) est "
+"correctement paramétrée.\n"
+"Tant que le problème ne sera pas corrigé, des fichiers pourraient ne pas "
+"apparaître dans les contenus.\n"
 "Aucun avertissement ne sera affiché durant cette session."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Une nouvelle version de FileZilla est disponible :"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:667
-msgid "A proper server always shows all files, but some broken servers hide files from the user. Use this option to force the server to show all files."
-msgstr "Un serveur correctement configuré affichera toujours tous les fichiers, mais certains serveurs cachent des fichiers à l'utilisateur. Utilisez cette option pour forcer le serveur à afficher tous les fichiers."
-
-#: resources.h:749
-msgid "A proper server does not require this. Contact the server administrator if you need this."
-msgstr "Ceci n'est pas requis pour un serveur correctement configuré. Contactez l'administrateur du serveur si nécessaire."
+#: ../../locales/../src/interface/Mainfrm.cpp:679
+msgid ""
+"A proper server always shows all files, but some broken servers hide files "
+"from the user. Use this option to force the server to show all files."
+msgstr ""
+"Un serveur correctement configuré affichera toujours tous les fichiers, mais "
+"certains serveurs cachent des fichiers à l'utilisateur. Utilisez cette "
+"option pour forcer le serveur à afficher tous les fichiers."
+
+#: resources.h:770
+msgid ""
+"A proper server does not require this. Contact the server administrator if "
+"you need this."
+msgstr ""
+"Ceci n'est pas requis pour un serveur correctement configuré. Contactez "
+"l'administrateur du serveur si nécessaire."
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:284
+#: ../../locales/../src/interface/state.cpp:284
 msgid ""
 "A remote operation is in progress and synchronized browsing is enabled.\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"Une opération à distance est en cours de progression et la navigation synchronisée est activée.\n"
+"Une opération à distance est en cours de progression et la navigation "
+"synchronisée est activée.\n"
 "Désactiver la navigation synchronisée et continuer le changement de dossier ?"
 
-#: resources.h:529
-#: resources.h:661
-#: resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Ajouter"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "Autoriser &la reprise du transfert des fichiers ASCII"
 
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:114
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "A&ppliquer uniquement aux téléchargements"
 
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:160
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "A&ppliquer uniquement aux envois"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "A&ppliquer à tous les fichiers et dossiers"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Retirer a&utomatiquement les transferts réussis"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
-msgstr "Interrompre la connexion précédente et se connecter dans l'onglet actuel"
+msgstr ""
+"Interrompre la connexion précédente et se connecter dans l'onglet actuel"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "À propos de FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Au-dessus de la liste des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:853
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:872
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:160
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:161
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:194
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:560
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:561
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../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:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Compte"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "A&ction après &traitement de la file d'attente"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Action sur le fichier sélectionné :"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Action à exécuter :"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Action :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:118
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
 msgstr "Mode actif"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:605
-msgid "Active mode FTP test failed. FileZilla does not know the correct external IP address."
-msgstr "Le test du mode FTP actif a échoué. FileZilla ne connaît pas l'adresse IP externe correcte."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:592
-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 "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."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:580
-msgid "Active mode FTP test failed. FileZilla knows the correct external IP address, but your router or firewall has misleadingly modified the sent address."
-msgstr "Le test du mode FTP actif a échoué. FileZilla connaît l'adresse IP externe correcte, mais votre routeur ou pare-feu a modifié de manière erronée l'adresse envoyée."
+#: ../../locales/../src/interface/netconfwizard.cpp:605
+msgid ""
+"Active mode FTP test failed. FileZilla does not know the correct external IP "
+"address."
+msgstr ""
+"Le test du mode FTP actif a échoué. FileZilla ne connaît pas l'adresse IP "
+"externe correcte."
 
-#: resources.h:762
+#: ../../locales/../src/interface/netconfwizard.cpp:592
+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 ""
+"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:580
+msgid ""
+"Active mode FTP test failed. FileZilla knows the correct external IP "
+"address, but your router or firewall has misleadingly modified the sent "
+"address."
+msgstr ""
+"Le test du mode FTP actif a échoué. FileZilla connaît l'adresse IP externe "
+"correcte, mais votre routeur ou pare-feu a modifié de manière erronée "
+"l'adresse envoyée."
+
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Mode IP actif"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "A&jouter les fichiers à la file d'attente uniquement"
 
-#: resources.h:631
-#: resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Ajouter le dossier sélectionné à la file d'attente"
 
-#: resources.h:560
-#: resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Ajouter les fichiers et dossiers sélectionnés à la file d'attente"
 
-#: resources.h:922
-#: resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Ajouter à la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:451
+#: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
 msgstr "Type d'adresse non supportée"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avancé"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Options avancées :"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Conseils : Sauf si vous voulez tester les nouvelles fonctionnalités, "
+"continuez à utiliser les versions stables uniquement. Les versions bêtas et "
+"les versions nightly builds sont censés être développées à des fins de test. "
+"Les versions nightly builds de FileZilla peuvent ne pas fonctionner "
+"correctement et même corrompre votre système. Vous utiliserez les versions "
+"bêtas et nightly builds à vos propres risques."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algorithme :"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Tous les fichiers ont été transférés avec succès"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "Tous les ports de la plage spécifiée doivent être compris entre 1024 et 65535."
+msgstr ""
+"Tous les ports de la plage spécifiée doivent être compris entre 1024 et "
+"65535."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
-msgstr[0] "Tous les transferts sont terminés. %d fichier n'a pas pu être transféré."
-msgstr[1] "Tous les transferts sont terminés. %d fichiers n'ont pas pu être transférés."
+msgstr[0] ""
+"Tous les transferts sont terminés. %d fichier n'a pas pu être transféré."
+msgstr[1] ""
+"Tous les transferts sont terminés. %d fichiers n'ont pas pu être transférés."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Autoriser un retour sur un autre mode de trans&fert en cas d'échec"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Autoriser un retour sur un autre mode de transfert en cas d'échec"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Déjà connecté"
 
-#: resources.h:790
-msgid "Alternatively you can use the Pageant tool from PuTTY to manage your keys, FileZilla does recognize Pageant."
-msgstr "Vous pouvez aussi utiliser l'outil Pageant de PuTTY pour gérer vos clés, FileZilla supporte cet outil."
+#: resources.h:811
+msgid ""
+"Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
+"FileZilla does recognize Pageant."
+msgstr ""
+"Vous pouvez aussi utiliser l'outil Pageant de PuTTY pour gérer vos clés, "
+"FileZilla supporte cet outil."
 
-#: resources.h:791
-msgid "Alternatively you can use your system's SSH agent. To do so, make sure the SSH_AUTH_SOCK environment variable is set."
-msgstr "Vous pouvez aussi utiliser votre agent SSH. Pour ce faire, vérifiez que la variable d'environnement SSH_AUTH_SOCK est définie."
+#: resources.h:812
+msgid ""
+"Alternatively you can use your system's SSH agent. To do so, make sure the "
+"SSH_AUTH_SOCK environment variable is set."
+msgstr ""
+"Vous pouvez aussi utiliser votre agent SSH. Pour ce faire, vérifiez que la "
+"variable d'environnement SSH_AUTH_SOCK est définie."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1097
-msgid "Alternatively, visit http://filezilla-project.org to download the most recent version."
-msgstr "Vous pouvez également visiter http://filezilla-project.org pour télécharger la dernière version."
+#: ../../locales/../src/interface/updatewizard.cpp:1118
+msgid ""
+"Alternatively, visit http://filezilla-project.org to download the most "
+"recent version."
+msgstr ""
+"Vous pouvez également visiter http://filezilla-project.org pour télécharger "
+"la dernière version."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
 "Some queue items might not have been restored."
 msgstr ""
-"Une erreur s'est produite durant le chargement de la file d'attente à partir de \"%s\".\n"
+"Une erreur s'est produite durant le chargement de la file d'attente à partir "
+"de \"%s\".\n"
 "Certains éléments placés en file d'attente n'ont peut-être pas été restaurés."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
 "Some queue items might not have been saved."
 msgstr ""
-"Une erreur s'est produite durant l'enregistrement de la file d'attente dans \"%s\".\n"
+"Une erreur s'est produite durant l'enregistrement de la file d'attente dans "
+"\"%s\".\n"
 "Certains éléments placés en file d'attente ont peut-être été perdus."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1950
-msgid "An item with the same name as the dragged item already exists at the target location."
-msgstr "Un objet portant un nom identique à celui glissé existe déjà dans le dossier de destination."
-
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:874
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:159
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:197
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:213
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:559
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
+msgid ""
+"An item with the same name as the dragged item already exists at the target "
+"location."
+msgstr ""
+"Un objet portant un nom identique à celui glissé existe déjà dans le dossier "
+"de destination."
+
+#: ../../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:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonyme"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1031
-msgid "Another remote operation is already in progress, cannot change directory now."
-msgstr "Une autre opération distante est actuellement en cours d'exécution, impossible de changer de dossier maintenant."
+#: ../../locales/../src/interface/state.cpp:1095
+msgid ""
+"Another remote operation is already in progress, cannot change directory now."
+msgstr ""
+"Une autre opération distante est actuellement en cours d'exécution, "
+"impossible de changer de dossier maintenant."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
-msgstr "Les modifications apportées au Gestionnaire de Sites ne peuvent pas être sauvegardées."
+msgstr ""
+"Les modifications apportées au Gestionnaire de Sites ne peuvent pas être "
+"sauvegardées."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:729
-msgid "Any changes made in the Site Manager will not be saved unless you repair the file."
-msgstr "Les modifications apportées au Gestionnaire de Sites ne peuvent pas être sauvegardées à moins que vous ne répariez le fichier."
+#: ../../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 ""
+"Les modifications apportées au Gestionnaire de Sites ne peuvent pas être "
+"sauvegardées à moins que vous ne répariez le fichier."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
-msgstr "Les modifications apportées aux filtres ne peuvent pas être sauvegardées."
+msgstr ""
+"Les modifications apportées aux filtres ne peuvent pas être sauvegardées."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Les modifications apportées aux filtres ne seront pas sauvegardées."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "App&liquer uniquement aux dossiers"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Appliquer"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Appliquer uniquement à la file d'attente a&ctuelle"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Appliquer uniquement aux &fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:322
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archive"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Comme onglet dans le volet de la file d'attente"
 
-#: resources.h:259
-#: resources.h:269
-#: resources.h:838
-#: resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Demander l'action à effectuer"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:849
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:868
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:188
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Demander le mot de passe"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Demander un port au système d'exploitation."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Demander l'adresse IP externe au système d'exploitation"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Poser vos questions sur les forums de FileZilla"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit_associations.cpp:64
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
 msgid "Associated program not found:"
 msgstr "Programme associé introuvable :"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Au moins une condition du filtre est incomplète"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "À ce stade, toutes les informations requises ont été collectées."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Échec de l'authentification."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Auteur :"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Automatique"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Classement automatique par type de fichier"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Recherche automatique des mises à jour"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Tailles disponibles"
 
-#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:129
-#: ../../source/FileZilla3/locales/../src/engine/sizeformatting_base.cpp:188
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
-msgstr "o <Symbole unitaire pour octets. Traduire uniquement la première lettre>"
+msgstr ""
+"o <Symbole unitaire pour octets. Traduire uniquement la première lettre>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Ignorer le Prox&y"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instructions pour une première utilisation"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Comportement"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1260
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "En cours d'édition"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Evaluer les performances du string coalescer"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Attention ! Le certificat a été révoqué"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binaire"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Tableau noir"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:272
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:313
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Favori"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Favori :"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Favoris"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Date de compilation :"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Informations de compilation"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Catégorie d'entreprise :"
 
-#: resources.h:752
-msgid "By default uses any available local port to establish transfers in active mode. If you want to limit FileZilla to use only a small range of ports, please enter the port range below."
-msgstr "Par défaut, n'importe quel port disponible est utilisé pour établir des transferts en mode actif. Si vous souhaitez limiter l'utilisation de FileZilla uniquement à un nombre restreint de ports, saisissez la plage de ceux-ci ci-dessous."
+#: resources.h:773
+msgid ""
+"By default uses any available local port to establish transfers in active "
+"mode. If you want to limit FileZilla to use only a small range of ports, "
+"please enter the port range below."
+msgstr ""
+"Par défaut, n'importe quel port disponible est utilisé pour établir des "
+"transferts en mode actif. Si vous souhaitez limiter l'utilisation de "
+"FileZilla uniquement à un nombre restreint de ports, saisissez la plage de "
+"ceux-ci ci-dessous."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "Annuler l'&opération en cours"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "Rechercher d'éventuelles versions journalières (nig&htly builds) de FileZilla"
+msgstr ""
+"Rechercher d'éventuelles versions journalières (nig&htly builds) de FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "Tout s&upprimer"
 
-#: resources.h:588
-#: resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opier l'(es) adresse(s) dans le presse-papier"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "P&ersonnaliser"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Associations par t&ype de fichier personnalisées :"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1270
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1623
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Calcul du décalage horaire du serveur..."
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Impossible de lire à partir du fichier"
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:712
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Impossible d'écrire les données dans un fichier."
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:710
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Impossible d'écrire les données dans un fichier : %s"
 
-#: resources.h:25
-#: resources.h:69
-#: resources.h:115
-#: resources.h:153
-#: resources.h:184
-#: resources.h:212
-#: resources.h:229
-#: resources.h:280
-#: resources.h:289
-#: resources.h:296
-#: resources.h:304
-#: resources.h:327
-#: resources.h:360
-#: resources.h:393
-#: resources.h:407
-#: resources.h:419
-#: resources.h:429
-#: resources.h:452
-#: resources.h:461
-#: resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Annuler"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Annuler l'opération en cours"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Annuler l'opération en cours"
 
-#: ../../source/FileZilla3/locales/../src/engine/local_path.cpp:471
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Impossible d'accéder à '%s', aucun média inséré ou lecteur non prêt."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Impossible d'ajouter le serveur au Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1732,756 +1777,801 @@
 "Impossible de fermer l'onglet, car il est en cours d'utilisation.\n"
 "Voulez-vous annuler l'opération en cours et le fermer tout de même ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:74
-msgid "Cannot compare directories, different filters for local and remote directories are enabled"
-msgstr "Impossible de comparer les dossiers, des filtres différents pour les dossiers locaux et distants sont activés"
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+msgid ""
+"Cannot compare directories, different filters for local and remote "
+"directories are enabled"
+msgstr ""
+"Impossible de comparer les dossiers, des filtres différents pour les "
+"dossiers locaux et distants sont activés"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
-msgstr "Impossible de comparer les dossiers, absence de connexion à un serveur."
+msgstr ""
+"Impossible de comparer les dossiers, absence de connexion à un serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Impossible de créer un nouveau filtre"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2608
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2654
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2036
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2167
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Impossible d'éditer le fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Impossible d'éditer le fichier, absence de connexion à un serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Impossible d'éditer le fichier, le chemin distant est inconnu."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:335
-msgid "Cannot establish FTP connection to an SFTP server. Please select proper protocol."
-msgstr "Impossible d'établir une connexion FTP à un serveur SFTP. Sélectionnez le protocole approprié."
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
+msgid ""
+"Cannot establish FTP connection to an SFTP server. Please select proper "
+"protocol."
+msgstr ""
+"Impossible d'établir une connexion FTP à un serveur SFTP. Sélectionnez le "
+"protocole approprié."
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:36
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr "Impossible de charger la barre de Connexion rapide depuis le fichier de ressources"
+msgstr ""
+"Impossible de charger la barre de Connexion rapide depuis le fichier de "
+"ressources"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
 msgstr "Impossible de charger le fichier, fichier XML invalide."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Cannot load keyfile"
 msgstr "Impossible de charger la clé privée"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
-msgstr "Impossible de charger la barre d'outils depuis le fichier de ressources"
+msgstr ""
+"Impossible de charger la barre d'outils depuis le fichier de ressources"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Impossible de se souvenir du mot de passe"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Impossible de renommer l'entrée"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Impossible de renommer le fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:351
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Impossible de sauvegarder le jeu de filtres"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Impossible de sélectionner le filtre"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1643
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Impossible de définir l'association de fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Impossible d'afficher le dialogue"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2674
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Impossible d'afficher/éditer le fichier sélectionné"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Catégories"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:531
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
-msgstr "Le certificat et les données de session ne sont pas encore disponibles."
+msgstr ""
+"Le certificat et les données de session ne sont pas encore disponibles."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Détails du certificat"
 
-#: resources.h:3
-#: resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Chaîne de certificats :"
 
-#: resources.h:13
-#: resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Émetteur du certificat"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Demande d'accès :"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Modification des attributs du fichier"
 
-#: resources.h:591
-#: resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Modifier les droits d'accès au fichier."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "Toutes modifications de paramètres du fichier journal nécessitent un redémarrage de FileZilla."
+msgstr ""
+"Toutes modifications de paramètres du fichier journal nécessitent un "
+"redémarrage de FileZilla."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problème d'encodage de caractères"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Jeu de caractères"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Rechercher d'éventuelles versions &Bêta ou RC (Release candidate)"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Rechercher des mises à jo&ur..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Vérifier les mises à jour de FileZilla automatiquement :"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Vérifie les nouvelles versions de FileZilla"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Mise à jour du logiciel"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Échec de la recherche des mises à jour"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:765
+#: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
 msgstr "Vérification de l'adresse IP externe correcte"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Recherche de mises à jour"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "La somme de contrôle ne correspond pas à celle du fichier téléchargé."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Sélectionnez le dossier local par défaut"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:130
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Sélectionnez le dossier local"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
 msgstr "Paquet de données interrompu incorrectement"
 
-#: resources.h:18
-#: resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Chiffrement :"
 
-#: resources.h:496
-#: resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Fermer l'&onglet"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Classique"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Supprimer les entrées du Gestionnaire de &Sites"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Purger &le cache d'agencement"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Supprimer l'histori&que de connexion rapide"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Supprimer les informations de &reconnexion"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Supprimer la file d'a&ttente"
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Supprimer l'historique"
 
-#: resources.h:281
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:34
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:40
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:46
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:77
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:103
+#: resources.h:291 ../../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 "Suppression des données personnelles"
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Vider la barre de connexion rapide"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Vider le string coalescer"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:571
+#: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Cliquez sur Terminer pour sauvegarder vos paramètres."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Cliquez sur Suivant pour télécharger cette nouvelle version."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Client vers serveur MAC :"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Client vers serveur de chiffrement :"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Fermer tous les &autres onglets"
 
-#: resources.h:502
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1123
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Quitter FileZilla"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Fermer tous les processus en cours de FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Fermer l'onglet actif"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mmentaires :"
 
-#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:761
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr "Propriétés des colonnes"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Configuration des colonnes"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "La commande et ses arguments doivent être correctement saisis."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
+#: ../../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
 msgid "Command failed"
 msgstr "Échec de la commande"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:448
+#: ../../locales/../src/engine/proxy.cpp:448
 msgid "Command not supported"
 msgstr "Commande non supportée"
 
-#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:183
+#: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
 msgstr "Commande non supportée par ce protocole"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:214
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:541
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:287
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/engine/logging.cpp:214
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Commande :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
 msgid "Comment"
 msgstr "Commentaire"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nom commun :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:426
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:441
+#: ../../locales/../src/interface/netconfwizard.cpp:426
+#: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
 msgstr "La communication est corrompue par un routeur ou un pare-feu."
 
-#: resources.h:514
-#: resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Co&mparer l'horodatage"
 
-#: resources.h:513
-#: resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Comparer la taille de&s fichiers"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Écar&t de comparaison (en minutes) :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filelists.cpp:39
+#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "L'écart de comparaison doit être compris entre 0 et 1440 minutes."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilé pour :"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilé sur :"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilé avec :"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Options de compilation :"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Compressé"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transferts simultanés"
 
-#: resources.h:224
-#: resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Les conditions respectent la c&asse"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Test de la configuration"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Paramètres du mode passif"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Paramètres de la plage des ports"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Configuration de FileZilla et de votre réseau"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Confirmer la suppression"
 
-#: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:136
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1700
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2625
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2007
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2127
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/engine/local_filesys.cpp:136
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Confirmation requise"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:567
+#: ../../locales/../src/interface/netconfwizard.cpp:567
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Félicitations, votre configuration semble fonctionnelle."
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Connecter en ignorant les paramètres du Proxy"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:8
+#: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
 msgstr "Connexion au site spécifié dans le Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Connecté"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Connexion en cours"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:207
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/netconfwizard.cpp:207
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connexion à %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Connexion à %s via le Proxy"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1034
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:172
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:394
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
+#: ../../locales/../src/engine/proxy.cpp:172
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Connexion à %s..."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:424
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Connexion au serveur"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:116
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:116
 msgid "Connection"
 msgstr "Connexion"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Échec de la tentative de connexion"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1039
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:176
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
+#: ../../locales/../src/engine/proxy.cpp:176
 #, 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."
+msgstr ""
+"Échec de la tentative de connexion avec \"%s\", essai de l'adresse suivante."
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Échec de la tentative de connexion avec \"%s\"."
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:186
-#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:320
+#: ../../locales/../src/engine/ControlSocket.cpp:186
+#: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
 msgstr "Tentative de connexion interrompue par l'utilisateur"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:543
+#: ../../locales/../src/interface/netconfwizard.cpp:543
 msgid "Connection closed"
 msgstr "Connexion interrompue"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1132
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Connexion interrompue par le serveur"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:305
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Connexion établie, initialisation TLS..."
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:340
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
 msgstr "Connexion établie, envoi d'une requête HTTP"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Connexion établie, attente du message d'accueil..."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:338
+#: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
 msgstr "Connexion perdue"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:433
+#: ../../locales/../src/engine/proxy.cpp:433
 msgid "Connection not allowed by ruleset"
 msgstr "Connexion non permise par les règles en vigueur"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:442
+#: ../../locales/../src/engine/proxy.cpp:442
 msgid "Connection refused"
 msgstr "Connexion refusée"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Délai d'attente expiré"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Délai d'attente expiré."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Connexion au serveur perdue"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:188
+#: ../../locales/../src/engine/proxy.cpp:188
 msgid "Connection with proxy established, performing handshake..."
 msgstr "Connexion établie avec le Proxy, établissement d'une liaison..."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:561
+#: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
 msgstr "La connexion avec le serveur a été interrompue prématurément."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:552
+#: ../../locales/../src/interface/netconfwizard.cpp:552
 msgid "Connection with the test server failed."
 msgstr "La connexion au serveur de test a échoué."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
 msgstr "Convertir la clé privée"
 
-#: resources.h:77
-#: resources.h:417
-msgid "Cop&y"
-msgstr "Cop&ier"
-
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Copie de (%d) sur %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie de %s"
 
-#: resources.h:589
-#: resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Copier les adresses des objets sélectionnés dans le presse-papier."
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Impossible d'accepter la connexion : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:99
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
 msgstr "Impossible d'ajouter une connexion au Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:188
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Impossible de terminer l'opération"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Impossible d'établir une connexion au serveur"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Impossible d'établir une connexion au serveur : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Impossible de convertir la commande selon l'encodage du serveur"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 msgid "Could not convert private key"
 msgstr "Impossible de convertir la clé privée"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3059
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Impossible de copier les adresses"
 
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Impossible de copier les données"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2547
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
-"Either the shell extension is not installed properly or you didn't drop the files into an Explorer window."
+"Either the shell extension is not installed properly or you didn't drop the "
+"files into an Explorer window."
 msgstr ""
 "Impossible de déterminer la cible pour l'opération de glisser-déposer.\n"
-"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."
+"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."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Impossible d'établir une connexion au serveur"
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
-"You can set the data directory of FileZilla using the '--datadir <custompath>' commandline option or by setting the FZ_DATADIR environment variable."
-msgstr ""
-"Impossible de trouver les fichiers de ressources pour FileZilla, fermeture de FileZilla.\n"
-"Vous pouvez définir le dossier contenant les données de FileZilla en utilisant l'option de la ligne de commande '--datadir <custompath>' ou en paramétrant la variable d'environnement FZ_DATADIR."
+"You can set the data directory of FileZilla using the '--datadir "
+"<custompath>' commandline option or by setting the FZ_DATADIR environment "
+"variable."
+msgstr ""
+"Impossible de trouver les fichiers de ressources pour FileZilla, fermeture "
+"de FileZilla.\n"
+"Vous pouvez définir le dossier contenant les données de FileZilla en "
+"utilisant l'option de la ligne de commande '--datadir <custompath>' ou en "
+"paramétrant la variable d'environnement FZ_DATADIR."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Impossible de générer une séquence d'identification personnalisée."
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1007
-msgid "Could not get distinguished name of certificate issuer, gnutls_x509_get_issuer_dn failed"
-msgstr "Impossible d'obtenir le nom de l'émetteur du certificat, gnutls_x509_get_issuer_dn a échoué"
-
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:982
-msgid "Could not get distinguished name of certificate subject, gnutls_x509_get_dn failed"
-msgstr "Impossible d'obtenir le nom d'objet du certificat, gnutls_x509_get_dn a échoué"
+#: ../../locales/../src/engine/tlssocket.cpp:1029
+msgid ""
+"Could not get distinguished name of certificate issuer, "
+"gnutls_x509_get_issuer_dn failed"
+msgstr ""
+"Impossible d'obtenir le nom de l'émetteur du certificat, "
+"gnutls_x509_get_issuer_dn a échoué"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1005
+msgid ""
+"Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
+"failed"
+msgstr ""
+"Impossible d'obtenir le nom d'objet du certificat, gnutls_x509_get_dn a "
+"échoué"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Impossible d'obtenir le chemin complet distant."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
 msgid "Could not get reply from fzputtygen."
 msgstr "Impossible d'obtenir une réponse de fzputtygen."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
-msgstr "Impossible d'obtenir un dossier temporaire pour y télécharger le fichier."
+msgstr ""
+"Impossible d'obtenir un dossier temporaire pour y télécharger le fichier."
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
-msgstr "Impossible d'importer les certificats clients, gnutls_x509_crt_import a échoué"
+msgstr ""
+"Impossible d'importer les certificats clients, gnutls_x509_crt_import a "
+"échoué"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:928
-msgid "Could not initialize structure for peer certificates, gnutls_x509_crt_init failed"
-msgstr "Impossible d'initialiser la structure pour les certificats clients, gnutls_x509_crt_init a échoué"
+#: ../../locales/../src/engine/tlssocket.cpp:941
+msgid ""
+"Could not initialize structure for peer certificates, gnutls_x509_crt_init "
+"failed"
+msgstr ""
+"Impossible d'initialiser la structure pour les certificats clients, "
+"gnutls_x509_crt_init a échoué"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:119
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:310
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
-"Could not load \"%s\", please make sure the file is valid and can be accessed.\n"
+"Could not load \"%s\", please make sure the file is valid and can be "
+"accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Impossible de charger \"%s\", vérifiez que le fichier est valide et accessible.\n"
+"Impossible de charger \"%s\", vérifiez que le fichier est valide et "
+"accessible.\n"
 "Toutes modifications effectuées dans le Gestionnaire de Sites seront perdues."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
 msgstr "Impossible de charger la clé"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
 msgid "Could not load private key"
 msgstr "Impossible de charger la clé privée"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, 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 ""
-"Impossible d'obtenir une correspondance entre le dossier local et le dossier distant '%s'.\n"
-"Désactiver la navigation synchronisée et continuer le changement de dossier distant ?"
+"Impossible d'obtenir une correspondance entre le dossier local et le dossier "
+"distant '%s'.\n"
+"Désactiver la navigation synchronisée et continuer le changement de dossier "
+"distant ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, 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 ""
-"Impossible d'obtenir une correspondance entre le dossier local et le dossier distant '%s'.\n"
+"Impossible d'obtenir une correspondance entre le dossier local et le dossier "
+"distant '%s'.\n"
 "La navigation synchronisée est désactivée."
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:295
+#: ../../locales/../src/interface/state.cpp:295
 #, 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 ""
-"Impossible d'obtenir une correspondance entre le dossier distant et le dossier local '%s'.\n"
+"Impossible d'obtenir une correspondance entre le dossier distant et le "
+"dossier local '%s'.\n"
 "La navigation synchronisée est désactivée."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:3059
-#: ../../source/FileZilla3/locales/../src/interface/aboutdialog.cpp:219
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Impossible d'ouvrir le presse-papier"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:208
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:276
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:307
+#: ../../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 "Impossible d'ouvrir le journal d'événements : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
 msgstr "Impossible d'analyser le chemin distant."
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Impossible d'analyser l'adresse du serveur :"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Impossible de lire depuis le socket : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
 msgstr "Impossible de lire l'étiquette du serveur."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Impossible de se rendre à l'emplacement de %s dans le fichier"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Impossible d'atteindre la fin du fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
 msgstr "Impossible d'envoyer la commande à fzputtygen."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Impossible de générer un processus d'entrée/sortie"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Impossible d'établir une liaison avec le serveur Proxy : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1121
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Impossible de démarrer le transfert"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:657
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
-msgid "Could not write \"%s\", any changes to the Site Manager could not be saved: %s"
-msgstr "Impossible d'écrire \"%s\", toutes les modifications effectuées dans le Gestionnaire de Sites ne seront pas sauvegardées : %s"
+msgid ""
+"Could not write \"%s\", any changes to the Site Manager could not be saved: %"
+"s"
+msgstr ""
+"Impossible d'écrire \"%s\", toutes les modifications effectuées dans le "
+"Gestionnaire de Sites ne seront pas sauvegardées : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
 msgstr "Impossible d'écrire \"%s\", le favori ne peut pas être ajouté : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:330
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr "Impossible d'écrire \"%s\", les favoris globaux ne peuvent pas être sauvegardés : %s"
+msgstr ""
+"Impossible d'écrire \"%s\", les favoris globaux ne peuvent pas être "
+"sauvegardés : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2490,85 +2580,99 @@
 "Impossible d'écrire \"%s\", la file d'attente ne sera pas sauvegardée.\n"
 "%s"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:784
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:846
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr "Impossible d'écrire \"%s\", les sites sélectionnés ne peuvent pas être exportés : %s"
+msgstr ""
+"Impossible d'écrire \"%s\", les sites sélectionnés ne peuvent pas être "
+"exportés : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Impossible d'écrire \"%s\" : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
 msgstr "Impossible d'écrire la clé privée : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Impossible d'écrire vers le fichier local"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:315
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:386
+#: ../../locales/../src/engine/logging.cpp:315
+#: ../../locales/../src/engine/logging.cpp:386
 #, c-format
 msgid "Could not write to log file: %s"
 msgstr "Impossible d'écrire dans le fichier journal : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:999
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Impossible d'écrire vers le socket : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Pays :"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
-msgstr "Provoque un plantage de FileZilla instantanément. A utiliser uniquement pour déboguer le gestionnaire d'exceptions."
+msgstr ""
+"Provoque un plantage de FileZilla instantanément. A utiliser uniquement pour "
+"déboguer le gestionnaire d'exceptions."
 
-#: resources.h:568
-#: resources.h:582
-#: resources.h:633
-#: resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Créer un &nouveau fichier"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Créer un nouveau sous-dossier dans le dossier actuel"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1604
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1183
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Créer un nouveau fichier vide dans le dossier actuel"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Créer un dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Créer un fichier vide"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Création d'un dossier"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2047
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3300
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Création du dossier '%s'..."
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:174
+#: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
 msgstr "Erreur critique"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:137
+#: ../../locales/../src/engine/ControlSocket.cpp:137
 msgid "Critical file transfer error"
 msgstr "Erreur critique lors du transfert du fichier"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:120
+#: ../../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"
+msgstr ""
+"Erreur critique lors du transfert du fichier après avoir transféré %s en %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2577,573 +2681,630 @@
 "Le dossier distant (%s) actuel n'est pas synchronisé avec la racine (%s).\n"
 "La navigation synchronisée a été désactivée."
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:423
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
 msgstr "Le type de transfert actuel est défini sur ASCII."
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:433
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr "Le type de transfert actuel est défini sur détection automatique."
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:428
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr "Le type de transfert actuel est défini sur Binaire."
 
-#: resources.h:773
-#: resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Pers&onnaliser"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Jeu de filtres personnalisé"
 
-#: resources.h:376
-#: resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Serveur personnalisé"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Type de d&onnées"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
-msgstr "Préfix&es décimaux du Système International (SI) (ex. 1 Ko = 1000 octets)"
+msgstr ""
+"Préfix&es décimaux du Système International (SI) (ex. 1 Ko = 1000 octets)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Par d&éfaut"
 
-#: resources.h:584
-#: resources.h:634
-#: resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "Supprim&er"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Tout désact&iver"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Ne pas sauvegarder les m&ots de passe"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Action du d&ouble-clic sur les dossiers :"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:34
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&upliquer"
+
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Accéder aux chemins virtuels à la façon de DOS"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2659
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2041
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Type de fichier dangereux"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
 msgid "Data"
 msgstr "Données"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:985
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Fermeture prématurée du socket de données."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Date"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Format des dates"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:128
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:128
 msgid "Date/time format"
 msgstr "Format de Date et Heure"
 
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:88
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:107
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:134
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:153
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Date et heure inconnues"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:141
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:141
 msgid "Debug"
 msgstr "Débogage"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Paramètres de débogage"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Dossier &local par défaut :"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:26
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
 msgstr "Par défaut (Détection automatique)"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Éditeur par défaut incorrectement saisi."
 
-#: resources.h:255
-#: resources.h:277
-#: resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Action par défaut sur les fichiers existants"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Dossi&er distant par défaut :"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1051
-msgid "Default remote path cannot be parsed. Make sure it is a valid absolute path for the selected server type."
-msgstr "Le chemin distant par défaut ne peut pas être analysé. Assurez-vous qu'il est valide et reconnu par le type de serveur sélectionné."
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
+msgid ""
+"Default remote path cannot be parsed. Make sure it is a valid absolute path "
+"for the selected server type."
+msgstr ""
+"Le chemin distant par défaut ne peut pas être analysé. Assurez-vous qu'il "
+"est valide et reconnu par le type de serveur sélectionné."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:78
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:78
 msgid "Default system language"
 msgstr "Langue par défaut du système"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Mode de transfert par défaut :"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Type de transfert par défaut :"
 
-#: resources.h:697
-#: resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Par défaut : http://ip.filezilla-project.org/ip.php"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection.cpp:41
-msgid "Delay between failed connection attempts has to be between 1 and 999 seconds."
-msgstr "Le délai entre chaque échec de connexion doit être compris entre 1 et 999 secondes."
-
-#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:630
-#, c-format
-msgid "Delaying connection for %d second due to previously failed connection attempt..."
-msgid_plural "Delaying connection for %d seconds due to previously failed connection attempt..."
-msgstr[0] "Délai d'attente de %d seconde suite à l'échec de la précédente tentative de connexion..."
-msgstr[1] "Délai d'attente de %d secondes suite à l'échec de la précédente tentative de connexion..."
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
+msgid ""
+"Delay between failed connection attempts has to be between 1 and 999 seconds."
+msgstr ""
+"Le délai entre chaque échec de connexion doit être compris entre 1 et 999 "
+"secondes."
+
+#: ../../locales/../src/engine/engineprivate.cpp:630
+#, c-format
+msgid ""
+"Delaying connection for %d second due to previously failed connection "
+"attempt..."
+msgid_plural ""
+"Delaying connection for %d seconds due to previously failed connection "
+"attempt..."
+msgstr[0] ""
+"Délai d'attente de %d seconde suite à l'échec de la précédente tentative de "
+"connexion..."
+msgstr[1] ""
+"Délai d'attente de %d secondes suite à l'échec de la précédente tentative de "
+"connexion..."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Supprimer l'entrée du Gestionnaire de Sites"
 
-#: resources.h:635
-#: resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Supprimer le dossier sélectionné"
 
-#: resources.h:571
-#: resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Supprimer les fichiers et dossiers sélectionnés"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Suppression des dossiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
-msgstr "La suppression de plusieurs dossiers indépendants n'est pas encore supportée"
+msgstr ""
+"La suppression de plusieurs dossiers indépendants n'est pas encore supportée"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Suppression de lien symbolique"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Bureau"
 
-#: resources.h:4
-#: resources.h:28
-#: resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Détails"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Détails pour la nouvelle clé :"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "&Dossiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Direction"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Dossier"
 
-#: resources.h:642
-#: resources.h:916
-#: resources.h:999
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2323
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:445
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Comparaison de dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:74
-#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:82
-#: ../../source/FileZilla3/locales/../src/interface/listingcomparison.cpp:88
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+#: ../../locales/../src/interface/listingcomparison.cpp:82
+#: ../../locales/../src/interface/listingcomparison.cpp:88
 msgid "Directory comparison failed"
 msgstr "Échec de la comparaison de dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_logging.cpp:71
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr "Le dossier contenant le fichier journal n'existe pas ou le nom du fichier est incorrect."
+msgstr ""
+"Le dossier contenant le fichier journal n'existe pas ou le nom du fichier "
+"est incorrect."
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:192
+#: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
 msgstr "Affichage du contenu du dossier annulée par l'utilisateur"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Échec de l'affichage du contenu du dossier"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtres d'affichage du contenu du dossier"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:196
+#: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
 msgstr "Contenu du dossier affiché avec succès"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Tout &désactiver"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1049
-msgid "Disable synchronized browsing and continue changing the remote directory?"
-msgstr "Désactiver la navigation synchronisée et continuer le changement de dossier distant ?"
-
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:669
-msgid "Disable this option again if you will not be able to see the correct directory contents anymore."
-msgstr "Désactivez cette option s'il vous est impossible de voir correctement le contenu des dossiers."
+#: ../../locales/../src/interface/state.cpp:1113
+msgid ""
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+"Désactiver la navigation synchronisée et continuer le changement de dossier "
+"distant ?"
 
-#: resources.h:992
+#: ../../locales/../src/interface/Mainfrm.cpp:681
+msgid ""
+"Disable this option again if you will not be able to see the correct "
+"directory contents anymore."
+msgstr ""
+"Désactivez cette option s'il vous est impossible de voir correctement le "
+"contenu des dossiers."
+
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Déconnecter du serveur actuel"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:82
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1000
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1099
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:936
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:227
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1068
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/engine/ControlSocket.cpp:82
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../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
 msgid "Disconnected from server"
 msgstr "Déconnecté du serveur"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1134
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:953
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Déconnecté du serveur : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1429
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Déconnexion du précédent serveur"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Déconnecter du serveur actuellement visible"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Affiche le dialogue À propos de FileZilla"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Ne pas utiliser l'éditeur par défaut"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Ne rie&n faire"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:251
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:61
+#: ../../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 ""
 "Souhaitez-vous vraiment rechercher des versions Bêta ?\n"
-"A moins de vouloir tester de nouvelles fonctionnalités, il est préférable d'utiliser les versions stables."
+"A moins de vouloir tester de nouvelles fonctionnalités, il est préférable "
+"d'utiliser les versions stables."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1126
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Souhaitez-vous vraiment quitter FileZilla ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:34
-msgid "Do you really want to delete all Site Manager entries and the transfer queue?"
-msgstr "Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de Sites et de la file d'attente ?"
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
+msgid ""
+"Do you really want to delete all Site Manager entries and the transfer queue?"
+msgstr ""
+"Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de "
+"Sites et de la file d'attente ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
-msgstr "Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de Sites ?"
+msgstr ""
+"Souhaitez-vous vraiment supprimer toutes les entrées du Gestionnaire de "
+"Sites ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Souhaitez-vous vraiment supprimer l'entrée sélectionnée ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Souhaitez-vous vraiment supprimer la file d'attente ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Souhaitez-vous vraiment envoyer '%s' au serveur ?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentation"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Ne pas utiliser l'adresse IP externe pour les connexions &locales."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr "Les fichiers dont le nom commence par un point, sont, sous les systèmes de type Unix, des fichiers généralement cachés et/ou de configuration, ex. .htaccess"
+msgstr ""
+"Les fichiers dont le nom commence par un point, sont, sous les systèmes de "
+"type Unix, des fichiers généralement cachés et/ou de configuration, ex. ."
+"htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Action du double-clic"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Télécharger"
 
-#: resources.h:482
-#: resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Limite de téléchargement :"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:604
+#: ../../locales/../src/interface/statusbar.cpp:604
 #, c-format
 msgid "Download limit: %s/s"
 msgstr "Limite de téléchargement : %s/s"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:606
+#: ../../locales/../src/interface/statusbar.cpp:606
 msgid "Download limit: none"
 msgstr "Limite de téléchargement : aucune"
 
-#: resources.h:441
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:817
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Téléchargement des résultats de la recherche"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Télécharger le dossier sélectionné"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Télécharger les fichiers et dossiers sélectionnés"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Vitesse de téléchargement : %s/s\n"
+"Vitesse d'envoi : %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "En cours de téléchargement"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:358
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Téléchargement de %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
-msgstr "Le téléchargement de plusieurs dossiers indépendants n'est pas encore supporté"
+msgstr ""
+"Le téléchargement de plusieurs dossiers indépendants n'est pas encore "
+"supporté"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Téléchargement des résultats de recherche"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:83
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:101
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:103
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:104
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:88
-msgid "Drag&drop between different instances of FileZilla has not been implemented yet."
-msgstr "Le glisser-déposer entre plusieurs instances de FileZilla n'est pas encore implémenté."
-
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:96
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:107
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:109
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:110
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:94
+#: ../../locales/../src/interface/LocalListView.cpp:104
+#: ../../locales/../src/interface/LocalTreeView.cpp:104
+#: ../../locales/../src/interface/QueueView.cpp:83
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
+msgid ""
+"Drag&drop between different instances of FileZilla has not been implemented "
+"yet."
+msgstr ""
+"Le glisser-déposer entre plusieurs instances de FileZilla n'est pas encore "
+"implémenté."
+
+#: ../../locales/../src/interface/LocalListView.cpp:110
+#: ../../locales/../src/interface/LocalTreeView.cpp:110
+#: ../../locales/../src/interface/QueueView.cpp:96
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
-msgstr "Le glisser-déposer entre plusieurs serveurs n'est pas encore implémenté."
+msgstr ""
+"Le glisser-déposer entre plusieurs serveurs n'est pas encore implémenté."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&iquer"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "&Tout activer"
 
-#: resources.h:561
-#: resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "D&évelopper le dossier"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&xécuter"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Quitter"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "Courriel :"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Chaque filtre nécessite au moins une condition."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Édition des filtres"
 
-#: resources.h:566
-msgid "Edit the file with the configured editor and upload changes to the server."
-msgstr "Éditer le fichier avec l'éditeur sélectionné et envoyer les modifications au serveur."
+#: resources.h:583
+msgid ""
+"Edit the file with the configured editor and upload changes to the server."
+msgstr ""
+"Éditer le fichier avec l'éditeur sélectionné et envoyer les modifications au "
+"serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1952
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Échec de l'édition"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "Courriel :"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Commande absente"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit_associations.cpp:60
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
 msgid "Empty command."
 msgstr "Commande non définie."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Ce dossier ne contient aucun élément"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:26
+#: ../../locales/../src/interface/filelist_statusbar.cpp:26
 msgid "Empty directory."
 msgstr "Dossier vide."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit_associations.cpp:53
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
 msgstr "Extension de fichier non définie."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:206
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Les noms de filtres vides ne sont pas autorisés."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:206
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Le champ Nom est vide"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "La chaîne saisie entre guillemets est vide."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Tout &activer"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Activer le filtrage des ca&ractères invalides"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Chiffré"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Chiffrement"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Détails du chiffrement"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Arrêter la comparaison et changer l'ordre de tri ?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Saisir une &commande personnalisée..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Saisissez 0 pour aucune limitation."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Saisir une commande"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Saisie d'une commande personnalisée"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Développer le dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:134
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:194
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Saisie d'un nom pour le filtre"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Saisie d'un nom pour le jeu de filtres"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Saisir un nouveau nom pour le jeu de filtres"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Saisie de mot de passe"
 
-#: resources.h:562
-#: resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Développer le dossier sélectionné"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
-"To specify the server protocol, prepend the host with the protocol identifier. If no protocol is specified, the default protocol (ftp://) will be used.\n"
-"You can also enter complete URLs in the form protocol://user:pass@host:port here, the values in the other fields will be overwritten then."
+"To specify the server protocol, prepend the host with the protocol "
+"identifier. If no protocol is specified, the default protocol (ftp://) will "
+"be used.\n"
+"You can also enter complete URLs in the form protocol://user:pass@host:port "
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Saisissez l'adresse du serveur.\n"
-"Pour spécifier le protocole du serveur, préfixez l'hôte avec l'identificateur du protocole. Si aucun protocole n'est spécifié, le protocole par défaut (ftp://) sera utilisé.\n"
-"Vous pouvez également saisir des adresses URL complètes sous la forme protocole://identifiant:mot_de_passe@hôte:port, les valeurs des autres champs seront alors remplacées."
+"Pour spécifier le protocole du serveur, préfixez l'hôte avec "
+"l'identificateur du protocole. Si aucun protocole n'est spécifié, le "
+"protocole par défaut (ftp://) sera utilisé.\n"
+"Vous pouvez également saisir des adresses URL complètes sous la forme "
+"protocole://identifiant:mot_de_passe@hôte:port, les valeurs des autres "
+"champs seront alors remplacées."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
 msgid ""
 "Enter the password for the file '%s'.\n"
@@ -3152,7 +3313,7 @@
 "Saisissez le mot de passe pour le fichier '%s'.\n"
 "Notez qu'un fichier converti ne pourra pas être protégé par un mot de passe."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3160,985 +3321,1173 @@
 "Saisissez le port d'écoute du serveur.\n"
 "Le port par défaut pour le FTP est le 21 et le 22 pour le SFTP."
 
-#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:63
+#: ../../locales/../src/interface/loginmanager.cpp:63
 msgid "Enter username and password"
 msgstr "Saisie d'un identifiant et mot de passe"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:26
+#: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
 msgstr "Erreur lors de l'exportation des paramètres"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:28
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:38
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:108
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
 msgstr "Erreur lors de l'importation"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Erreur lors du chargement de la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1965
-#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:172
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:299
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:731
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:772
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1094
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1115
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:976
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:250
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:448
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:544
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:603
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:723
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:810
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:120
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:311
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:211
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:1046
+#: ../../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:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Erreur lors du chargement du fichier xml"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Erreur lors de la sauvegarde de la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr "Erreur lors du démarrage du programme"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1986
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:331
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../source/FileZilla3/locales/../src/interface/wrapengine.cpp:1135
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:658
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:785
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:847
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2187
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Erreur lors de l'écriture du fichier xml"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Erreur, le nom de fichier ne peut pas être analysé."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Erreur, le fichier local existe mais ne peut pas être supprimé"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:213
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:535
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:285
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/engine/logging.cpp:213
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Erreur :"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Établir une connexion dans un nouvel onglet"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Chaque mois"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Toutes les deux semaines"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Exemple : png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Exemples"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Exé&cuter"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Exécutable"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
-msgstr "L'exécutable ne contient pas d'information de version, impossible de rechercher des mises à jour."
+msgstr ""
+"L'exécutable ne contient pas d'information de version, impossible de "
+"rechercher des mises à jour."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorateur"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exporter la file &d'attente"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exporter les paramètre&s"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportation des paramètres"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Nom du f&iltre :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:117
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:117
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocole de Transfert de Fichiers"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:15
+#: ../../locales/../src/engine/server.cpp:15
 msgid "FTP - File Transfer Protocol with optional encryption"
 msgstr "FTP - Protocole de Transfert de Fichiers avec chiffrement optionnel"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:21
+#: ../../locales/../src/engine/server.cpp:21
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocole de Transfert de Fichiers non sécurisé"
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Le moteur FTP n'est pas initialisé, impossible de se connecter"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Paramètres anti-déconnexion"
 
-#: resources.h:767
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:120
+#: resources.h:788
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy FTP"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "URL FTP"
 
-#: resources.h:675
-msgid "FTP uses secondary connections for data transfers. These additional connections can be established in two ways."
-msgstr "FTP utilise des connexions secondaires pour les transferts de données. Ces connexions supplémentaires peuvent être établies de deux manières."
+#: resources.h:696
+msgid ""
+"FTP uses secondary connections for data transfers. These additional "
+"connections can be established in two ways."
+msgstr ""
+"FTP utilise des connexions secondaires pour les transferts de données. Ces "
+"connexions supplémentaires peuvent être établies de deux manières."
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:20
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr "FTPES - FTP sur connexion explicite (TLS/SSL)"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:19
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP sur connexion implicite (TLS/SSL)"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:534
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:614
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2248
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:906
-#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:535
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Impossible de changer de dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:53
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:259
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:267
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Impossible de changer de langue"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Impossible de rechercher de nouvelles versions de FileZilla."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Impossible de copier ou de déplacer les sites"
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:514
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr "Impossible de créer la copie de sauvegarde du fichier xml"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Impossible de créer le socket d'écoute, abandon"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Impossible de télécharger la dernière version de FileZilla."
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Impossible d'obtenir le chemin vers 'Mes Documents'"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Impossible d'obtenir le chemin vers le Bureau"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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."
+msgstr ""
+"Impossible d'obtenir l'adresse du client pour le contrôle de la connexion, "
+"connexion interrompue."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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."
+msgstr ""
+"Impossible d'obtenir l'adresse du client pour les données de la connexion, "
+"connexion interrompue."
 
-#: ../../source/FileZilla3/locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Impossible d'initialiser le moteur FTP"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:313
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Impossible d'initialiser le protocole TLS."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:173
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
-msgstr "Impossible de charger l'interface, les fichiers de ressources sont-ils valides ?"
+msgstr ""
+"Impossible de charger l'interface, les fichiers de ressources sont-ils "
+"valides ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
 msgstr "Impossible de charger la clé privée : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Impossible d'ouvrir \"%s\" pour ajout / écriture"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Impossible d'ouvrir \"%s\" pour lecture"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:391
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:448
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:391
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Impossible d'ouvrir \"%s\" pour écriture"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Impossible d'analyser le chemin retourné."
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:321
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr "Impossible d'analyser le certificat racine approuvé."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Impossible de réceptionner les données"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:194
+#: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
 msgstr "Impossible de récupérer le contenu du dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:719
+#: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Impossible de récupérer l'adresse IP externe, abandon"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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"
+msgstr ""
+"Impossible de récupérer l'adresse IP externe. Utilisation de l'adresse locale"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Impossible de récupérer l'adresse IP locale."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:688
+#: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
 msgstr "Impossible de récupérer l'adresse IP locale. Abandon"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:616
+#: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
 msgstr "Impossible de récupérer l'adresse IP externe."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:307
+#: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
 msgstr "Impossible d'envoyer la commande."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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"
+msgstr ""
+"Impossible de définir la langue sur %s (%s), utilisation de la langue par "
+"défaut du système"
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
-msgid "Failed to set language to %s (%s), using default system language (%s, %s)."
-msgstr "Impossible de définir la langue sur %s (%s), utilisation de la langue par défaut du système (%s, %s)."
+msgid ""
+"Failed to set language to %s (%s), using default system language (%s, %s)."
+msgstr ""
+"Impossible de définir la langue sur %s (%s), utilisation de la langue par "
+"défaut du système (%s, %s)."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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."
+msgstr ""
+"Impossible de définir la langue sur %s (%s), utilisation de la langue par "
+"défaut du système."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_language.cpp:53
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
-msgstr "Impossible de définir la langue sur %s, utilisation de la langue par défaut du système"
+msgstr ""
+"Impossible de définir la langue sur %s, utilisation de la langue par défaut "
+"du système"
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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)."
+msgstr ""
+"Impossible de définir la langue sur %s, utilisation de la langue par défaut "
+"du système (%s, %s)."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
-msgstr "Impossible de définir la langue sur %s, utilisation de la langue par défaut du système."
+msgstr ""
+"Impossible de définir la langue sur %s, utilisation de la langue par défaut "
+"du système."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage.cpp:215
+#: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
 msgstr "Impossible de valider les paramètres"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Impossible de vérifier le certificat client"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:566
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
 msgstr "Impossible d'écrire le fichier %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:532
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
 msgstr "Impossible d'écrire le fichier xml"
 
-#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:16
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Transferts échoués"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Retour en mode actif"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Fichi&er :"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fichi&ers"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:500
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:518
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:124
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:124
 msgid "File Types"
 msgstr "Types de fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:108
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
 msgstr "Le fichier ne contient aucune donnée importable."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:132
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
 msgstr "Édition des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Le fichier existe"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:125
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:125
 msgid "File exists action"
 msgstr "Action lorsque le fichier existe"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Le fichier a été modifié"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:130
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:130
 msgid "File lists"
 msgstr "Listes des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:182
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1722
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:702
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:796
+#: ../../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
 msgid "File not found"
 msgstr "Fichier introuvable"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Recherche de fichiers"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:128
+#: ../../locales/../src/engine/ControlSocket.cpp:128
 msgid "File transfer aborted by user"
 msgstr "Transfert de fichier interrompu par l'utilisateur"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:118
+#: ../../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"
+msgstr ""
+"Transfert de fichier interrompu par l'utilisateur après avoir transféré %s "
+"en %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:139
+#: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
 msgstr "Echec du transfert du fichier"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:122
+#: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
 msgstr "Echec du transfert du fichier après avoir transféré %s en %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:134
+#: ../../locales/../src/engine/ControlSocket.cpp:134
 msgid "File transfer skipped"
 msgstr "Transfert de fichier ignoré"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:132
+#: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
 msgstr "Transfert de fichier réussi"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:115
+#: ../../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"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Transfert de fichier en cours de progression."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Transfert de fichier avec type de données ASCII."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Transfert de fichier avec type de données binaires."
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:198
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Erreur de FileZilla"
 
-#: resources.h:712
-msgid "FileZilla can now test your configuration to ensure everything is configured properly."
-msgstr "FileZilla peut maintenant tester votre configuration afin de s'assurer que tout fonctionne correctement."
+#: resources.h:733
+msgid ""
+"FileZilla can now test your configuration to ensure everything is configured "
+"properly."
+msgstr ""
+"FileZilla peut maintenant tester votre configuration afin de s'assurer que "
+"tout fonctionne correctement."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla est déjà connecté à un serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:453
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
+msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
-"Filezilla fonctionne en mode kiosque.\n"
-"Les types d'authentifications 'Normal' et 'Compte' ne sont pas disponibles dans ce mode."
+"FileZilla doit être redémarré pour que le changement de langue prenne effet."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1512
-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."
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Mises à jour de FileZilla"
 
-#: resources.h:517
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Barre d'état des ar&borescences"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:358
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:379
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:265
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1230
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nom de fichier"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtres de contenus..."
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2310
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3097
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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"
+msgstr ""
+"Le nom de fichier ne peut pas être créé pour le dossier %s et le nom de "
+"fichier %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Nom de fichier invalide"
 
-#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:268
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Les noms de fichier ne peuvent pas contenir les caractères suivants : / \\ : "
+"* ? \" < > |"
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nom de fichier inchangé"
 
-#: resources.h:307
-#: resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nom de fichier :"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
-msgstr "Les noms de fichier ne peuvent pas contenir les caractères suivants : / * ? < > |"
+msgstr ""
+"Les noms de fichier ne peuvent pas contenir les caractères suivants : / * ? "
+"< > |"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1337
-msgid "Filenames may not contain any of the following characters: / \\ : * ? \" < > |"
-msgstr "Les noms de fichier ne peuvent pas contenir les caractères suivants : / \\ : * ? \" < > |"
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+msgid ""
+"Filenames may not contain any of the following characters: / \\ : * ? \" < > "
+"|"
+msgstr ""
+"Les noms de fichier ne peuvent pas contenir les caractères suivants : / \\ : "
+"* ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Fichiers en cours d'édition"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:359
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:381
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:266
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../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
 msgid "Filesize"
 msgstr "Taille de fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:129
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:129
 msgid "Filesize format"
 msgstr "Format de la taille des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:360
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:382
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:267
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Type de fichier"
 
-#: resources.h:946
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:133
+#: resources.h:967
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Associations par type de fichier"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filtre appliqué aux :"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrage des caractères invalides des noms de fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:147
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:254
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Nom de filtre déjà existant"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Filtrer les objets qui correspondent à toutes les conditions suivantes"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
-msgstr "Filtrer les objets qui correspondent à au moins une des conditions suivantes"
+msgstr ""
+"Filtrer les objets qui correspondent à au moins une des conditions suivantes"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Filtrer les objets qui correspondent à aucune des conditions suivantes"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:366
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Jeu de filtres déjà existant"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrer le contenu des dossiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:338
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:347
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Échec de la validation du filtre"
 
-#: resources.h:9
-#: resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Empreinte (MD5) :"
 
-#: resources.h:10
-#: resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Empreinte (SHA-1) :"
 
-#: resources.h:179
-#: resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Empreinte :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:42
+#: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
 msgstr "Assistant de configuration du routeur et du pare-feu"
 
-#: resources.h:730
-msgid "For more detailed information about what these options do, please run the network configuration wizard."
-msgstr "Pour plus d'informations sur les effets de ces options, utilisez l'Assistant de configuration réseau."
+#: resources.h:751
+msgid ""
+"For more detailed information about what these options do, please run the "
+"network configuration wizard."
+msgstr ""
+"Pour plus d'informations sur les effets de ces options, utilisez l'Assistant "
+"de configuration réseau."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr "Pour plus de fiabilité, vous devez spécifier une plage d'au moins 10 ports."
+msgstr ""
+"Pour plus de fiabilité, vous devez spécifier une plage d'au moins 10 ports."
 
-#: ../../source/FileZilla3/locales/../src/interface/Options.cpp:214
-msgid "For this session the default settings will be used. Any changes to the settings will not be saved."
-msgstr "Les paramètres par défaut seront utilisés pour cette session. Toute modification apportée à ces paramètres ne sera pas sauvegardée."
+#: ../../locales/../src/interface/Options.cpp:215
+msgid ""
+"For this session the default settings will be used. Any changes to the "
+"settings will not be saved."
+msgstr ""
+"Les paramètres par défaut seront utilisés pour cette session. Toute "
+"modification apportée à ces paramètres ne sera pas sauvegardée."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forcer l'&UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Forcer l'affic&hage des fichiers cachés"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Forcer l'affichage des fichiers cachés"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Spécifications du format :"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
-msgstr "Format : Extension suivie de la commande placée entre guillemets, elle-même suivie de ses éventuels arguments."
+msgstr ""
+"Format : Extension suivie de la commande placée entre guillemets, elle-même "
+"suivie de ses éventuels arguments."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Plus de documentation"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Général"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:430
+#: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
 msgstr "Échec général du serveur SOCKS"
 
-#: resources.h:792
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:122
+#: resources.h:813
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy générique"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Obtenir l'adresse IP externe à partir de l'URL suivante :"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Obtenir de l'aide"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:366
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Le nom de jeu de filtres existe déjà, remplacer le jeu de filtres ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:258
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr "Favoris globaux"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS :"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permissions de groupe"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "Éle&vée"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP sur TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash :"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Caché"
 
-#: resources.h:817
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:922
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Haute"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:924
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Le plus élevé"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:73
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 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."
+msgstr ""
+"Le port disponible le plus élevé doit être compris entre 1024 et 65535."
 
-#: resources.h:209
-msgid "Hold the shift key to toggle the filter state on both sides simultaneously."
-msgstr "Maintenez la touche Maj/Shift enfoncée pour activer/désactiver le filtre simultanément des deux côtés."
+#: resources.h:219
+msgid ""
+"Hold the shift key to toggle the filter state on both sides simultaneously."
+msgstr ""
+"Maintenez la touche Maj/Shift enfoncée pour activer/désactiver le filtre "
+"simultanément des deux côtés."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Site web :"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Empreinte de la clé de l'hôte :"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "La clé de l'hôte ne correspond pas"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 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é."
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:439
+#: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
 msgstr "Hôte inaccessible"
 
-#: resources.h:16
-#: resources.h:40
-#: resources.h:121
-#: resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Hôte :"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Heures,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (exemple : 15:47)"
 
-#: resources.h:734
-msgid "If no data is sent or received during an operation for longer than the specified time, the connection will be closed and FileZilla will try to reconnect."
-msgstr "Si aucune donnée n'est envoyée ou reçue durant ce laps de temps, la connexion sera interrompue et FileZilla essaiera de se reconnecter."
+#: resources.h:755
+msgid ""
+"If no data is sent or received during an operation for longer than the "
+"specified time, the connection will be closed and FileZilla will try to "
+"reconnect."
+msgstr ""
+"Si aucune donnée n'est envoyée ou reçue durant ce laps de temps, la "
+"connexion sera interrompue et FileZilla essaiera de se reconnecter."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
-msgstr "Si vous soumettez un rapport d'erreur, merci d'y joindre un journal d'événements détaillé."
+msgstr ""
+"Si vous soumettez un rapport d'erreur, merci d'y joindre un journal "
+"d'événements détaillé."
 
-#: resources.h:687
-msgid "If the automatic test at the end of this wizard succeeds, but you cannot transfer files to a particular server, the server might be misconfigured and you should try active mode. You can set the transfer mode on a per-server basis in the Site Manager."
-msgstr "Si, à la fin de cet assistant, le test automatique réussit, mais que vous ne pouvez pas transférer de fichiers vers un serveur en particulier, celui-ci est peut-être mal configuré et vous devrez essayer en mode actif. Vous pouvez définir un mode de transfert par serveur via le Gestionnaire de Sites."
-
-#: resources.h:682
-msgid "If the fallback option is enabled, you will be able to connect to misconfigured servers which reject the selected transfer mode."
-msgstr "Si l'option de retour est activée, vous pourrez vous connecter à des serveurs mal configurés qui refuseront le mode de transfert sélectionné."
-
-#: resources.h:188
-msgid "If the host key change was not expected, please contact the server administrator."
-msgstr "Si le changement de clé n'était pas prévu, contactez l'administrateur du serveur."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:554
-msgid "If the problem persists, some router and/or firewall keeps blocking FileZilla."
-msgstr "Si le problème persiste, c'est que votre routeur et/ou pare-feu interfère encore avec FileZilla."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:563
-msgid "If the problem persists, some router and/or firewall keeps interrupting the connection."
-msgstr "Si le problème persiste, c'est que votre routeur et/ou pare-feu interrompt la connexion."
+#: resources.h:708
+msgid ""
+"If the automatic test at the end of this wizard succeeds, but you cannot "
+"transfer files to a particular server, the server might be misconfigured and "
+"you should try active mode. You can set the transfer mode on a per-server "
+"basis in the Site Manager."
+msgstr ""
+"Si, à la fin de cet assistant, le test automatique réussit, mais que vous ne "
+"pouvez pas transférer de fichiers vers un serveur en particulier, celui-ci "
+"est peut-être mal configuré et vous devrez essayer en mode actif. Vous "
+"pouvez définir un mode de transfert par serveur via le Gestionnaire de Sites."
 
-#: resources.h:963
-msgid "If the size of the logfile reaches the limit, it gets renamed by adding \".1\" to the end of the filename (possibly overwriting older logfiles) and a new file gets created."
-msgstr "Si la limite du fichier journal est atteinte, celui-ci est renommé en ajoutant \".1\" à la fin du nom du fichier (d'anciens journaux peuvent être éventuellement remplacés) et un nouveau fichier est créé."
+#: resources.h:703
+msgid ""
+"If the fallback option is enabled, you will be able to connect to "
+"misconfigured servers which reject the selected transfer mode."
+msgstr ""
+"Si l'option de retour est activée, vous pourrez vous connecter à des "
+"serveurs mal configurés qui refuseront le mode de transfert sélectionné."
 
-#: resources.h:455
-msgid "If the symlink points to a directory, FileZilla can either delete the symbolic link or remove the contents of the linked directory."
-msgstr "Si le lien symbolique pointe vers un dossier, FileZilla pourra supprimer ce lien symbolique ou supprimer le contenu du dossier lié."
+#: resources.h:198
+msgid ""
+"If the host key change was not expected, please contact the server "
+"administrator."
+msgstr ""
+"Si le changement de clé n'était pas prévu, contactez l'administrateur du "
+"serveur."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:554
+msgid ""
+"If the problem persists, some router and/or firewall keeps blocking "
+"FileZilla."
+msgstr ""
+"Si le problème persiste, c'est que votre routeur et/ou pare-feu interfère "
+"encore avec FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:563
+msgid ""
+"If the problem persists, some router and/or firewall keeps interrupting the "
+"connection."
+msgstr ""
+"Si le problème persiste, c'est que votre routeur et/ou pare-feu interrompt "
+"la connexion."
+
+#: resources.h:988
+msgid ""
+"If the size of the logfile reaches the limit, it gets renamed by adding \".1"
+"\" to the end of the filename (possibly overwriting older logfiles) and a "
+"new file gets created."
+msgstr ""
+"Si la limite du fichier journal est atteinte, celui-ci est renommé en "
+"ajoutant \".1\" à la fin du nom du fichier (d'anciens journaux peuvent être "
+"éventuellement remplacés) et un nouveau fichier est créé."
+
+#: resources.h:465
+msgid ""
+"If the symlink points to a directory, FileZilla can either delete the "
+"symbolic link or remove the contents of the linked directory."
+msgstr ""
+"Si le lien symbolique pointe vers un dossier, FileZilla pourra supprimer ce "
+"lien symbolique ou supprimer le contenu du dossier lié."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:624
-msgid "If this problem persists, please contact your router or firewall manufacturer for a solution."
-msgstr "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:624
+msgid ""
+"If this problem persists, please contact your router or firewall "
+"manufacturer for a solution."
+msgstr ""
+"Si ce problème persiste, veuillez contacter le fabricant de votre routeur ou "
+"de votre pare-feu pour tenter d'obtenir une solution."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:582
+#: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr "Si ce problème persiste, veuillez contacter le fabricant de votre routeur."
+msgstr ""
+"Si ce problème persiste, veuillez contacter le fabricant de votre routeur."
 
-#: resources.h:278
-#: resources.h:856
-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 "Si vous utilisez « Remplacer si la source est plus récente », l'horodatage du système doit être synchronisé avec le serveur. Si l'horodatage diffère (ex. fuseau horaire différent), spécifiez un décalage horaire dans le Gestionnaire de Sites."
+#: resources.h:288 resources.h:877
+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 ""
+"Si vous utilisez « Remplacer si la source est plus récente », l'horodatage du "
+"système doit être synchronisé avec le serveur. Si l'horodatage diffère (ex. "
+"fuseau horaire différent), spécifiez un décalage horaire dans le "
+"Gestionnaire de Sites."
 
-#: resources.h:917
-msgid "If using timestamp based comparison, consider two files equal if their timestamp difference does not exceed this threshold."
-msgstr "Si la comparaison utilisée est basée sur l'horodatage, considérez que deux fichiers seront identiques si la différence de l'horodatage ne dépasse pas le seuil ci-dessous."
+#: resources.h:938
+msgid ""
+"If using timestamp based comparison, consider two files equal if their "
+"timestamp difference does not exceed this threshold."
+msgstr ""
+"Si la comparaison utilisée est basée sur l'horodatage, considérez que deux "
+"fichiers seront identiques si la différence de l'horodatage ne dépasse pas "
+"le seuil ci-dessous."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
-msgstr "Tout changement de langue ne sera pleinement effectif qu'après le redémarrage de FileZilla."
+msgstr ""
+"Tout changement de langue ne sera pleinement effectif qu'après le "
+"redémarrage de FileZilla."
 
-#: resources.h:713
-msgid "If you click on test, FileZilla will connect to probe.filezilla-project.org and will perform some simple tests."
-msgstr "Si vous cliquez sur Tester, FileZilla se connectera sur probe.filezilla-project.org et exécutera quelques tests simples."
+#: resources.h:734
+msgid ""
+"If you click on test, FileZilla will connect to probe.filezilla-project.org "
+"and will perform some simple tests."
+msgstr ""
+"Si vous cliquez sur Tester, FileZilla se connectera sur probe.filezilla-"
+"project.org et exécutera quelques tests simples."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Si vous quittez FileZilla, vos modifications seront perdues."
 
-#: resources.h:832
-msgid "If you enter the wrong filetypes, those files may get corrupted when transferred."
-msgstr "Si vous saisissez un type de fichier incorrect, ces fichiers pourraient à l'avenir être corrompus lors de leur transfert."
+#: resources.h:853
+msgid ""
+"If you enter the wrong filetypes, those files may get corrupted when "
+"transferred."
+msgstr ""
+"Si vous saisissez un type de fichier incorrect, ces fichiers pourraient à "
+"l'avenir être corrompus lors de leur transfert."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
-msgstr "Si vous obtenez la moindre erreur, c'est que votre configuration est incorrecte."
-
-#: resources.h:746
-msgid "If you have problems to retrieve directory listings or to transfer files, try to change the default transfer mode."
-msgstr "Si vous rencontrez des problèmes pour afficher le contenu des dossiers ou pour transférer des fichiers, essayez de changer le mode de transfert par défaut."
+msgstr ""
+"Si vous obtenez la moindre erreur, c'est que votre configuration est "
+"incorrecte."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:569
-msgid "If you keep having problems with a specific server, the server itself or a remote router or firewall might be misconfigured. In this case try to toggle passive mode and contact the server administrator for help."
-msgstr "Si vous continuez à avoir des problèmes avec un serveur spécifique, il se peut que le serveur lui-même, un routeur distant ou un pare-feu soient incorrectement configurés. Dans ce cas, essayez de basculer en mode passif, et contactez l'administrateur du serveur pour obtenir de l'aide."
+#: resources.h:767
+msgid ""
+"If you have problems to retrieve directory listings or to transfer files, "
+"try to change the default transfer mode."
+msgstr ""
+"Si vous rencontrez des problèmes pour afficher le contenu des dossiers ou "
+"pour transférer des fichiers, essayez de changer le mode de transfert par "
+"défaut."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:569
+msgid ""
+"If you keep having problems with a specific server, the server itself or a "
+"remote router or firewall might be misconfigured. In this case try to toggle "
+"passive mode and contact the server administrator for help."
+msgstr ""
+"Si vous continuez à avoir des problèmes avec un serveur spécifique, il se "
+"peut que le serveur lui-même, un routeur distant ou un pare-feu soient "
+"incorrectement configurés. Dans ce cas, essayez de basculer en mode passif, "
+"et contactez l'administrateur du serveur pour obtenir de l'aide."
 
-#: resources.h:673
-msgid "If you successfully complete the wizard and the final test succeeds, any firewalls and routers you have should be configured properly."
-msgstr "Si vous avez suivi l'assistant scrupuleusement et que le test final réussit, votre routeur ou pare-feu devraient être correctement configurés."
+#: resources.h:694
+msgid ""
+"If you successfully complete the wizard and the final test succeeds, any "
+"firewalls and routers you have should be configured properly."
+msgstr ""
+"Si vous avez suivi l'assistant scrupuleusement et que le test final réussit, "
+"votre routeur ou pare-feu devraient être correctement configurés."
 
-#: resources.h:709
-msgid "If you use a firewall, make sure FileZilla is allowed to accept connection on all given ports."
-msgstr "Si vous utilisez un pare-feu, assurez-vous que FileZilla est autorisé à accepter des connexions sur tous les ports spécifiés."
+#: resources.h:730
+msgid ""
+"If you use a firewall, make sure FileZilla is allowed to accept connection "
+"on all given ports."
+msgstr ""
+"Si vous utilisez un pare-feu, assurez-vous que FileZilla est autorisé à "
+"accepter des connexions sur tous les ports spécifiés."
 
-#: resources.h:708
-msgid "If you use a router, make sure all these ports are forwarded to the machine you're running FileZilla on."
-msgstr "Si vous utilisez un routeur, assurez-vous que tous les ports seront redirigés vers la machine sur laquelle FileZilla est exécuté."
+#: resources.h:729
+msgid ""
+"If you use a router, make sure all these ports are forwarded to the machine "
+"you're running FileZilla on."
+msgstr ""
+"Si vous utilisez un routeur, assurez-vous que tous les ports seront "
+"redirigés vers la machine sur laquelle FileZilla est exécuté."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:595
-msgid "If your router keeps changing the IP address, please contact your router manufacturer."
-msgstr "Si votre routeur persiste à changer l'adresse IP, contactez le fabricant du routeur."
+#: ../../locales/../src/interface/netconfwizard.cpp:595
+msgid ""
+"If your router keeps changing the IP address, please contact your router "
+"manufacturer."
+msgstr ""
+"Si votre routeur persiste à changer l'adresse IP, contactez le fabricant du "
+"routeur."
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Importer des données à partir d'une précédente version"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importation des paramètres"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:81
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:84
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
 msgstr "Importation réussie"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit_associations.cpp:50
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit_associations.cpp:57
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
 msgid "Improperly quoted association."
 msgstr "Usage incorrect des guillements."
 
-#: resources.h:701
-msgid "In active mode, FileZilla has to listen on a port for data transfers. You have to specify which ports FileZilla will use."
-msgstr "En mode actif, FileZilla doit écouter un port pour les transferts de données. Vous devez spécifier quels ports FileZilla utilisera."
+#: resources.h:722
+msgid ""
+"In active mode, FileZilla has to listen on a port for data transfers. You "
+"have to specify which ports FileZilla will use."
+msgstr ""
+"En mode actif, FileZilla doit écouter un port pour les transferts de "
+"données. Vous devez spécifier quels ports FileZilla utilisera."
 
-#: resources.h:703
-msgid "In case you have a router, you will have to forward all available ports, as FileZilla has no influence on the ports your system chooses."
-msgstr "Si vous disposez d'un routeur, vous devez rediriger tous les ports disponibles, étant donné que FileZilla n'a aucune influence sur les ports choisis par votre système."
+#: resources.h:724
+msgid ""
+"In case you have a router, you will have to forward all available ports, as "
+"FileZilla has no influence on the ports your system chooses."
+msgstr ""
+"Si vous disposez d'un routeur, vous devez rediriger tous les ports "
+"disponibles, étant donné que FileZilla n'a aucune influence sur les ports "
+"choisis par votre système."
 
-#: resources.h:254
-msgid "In case you prefer automatic updates, you can enable automatic update checks in the settings dialog."
-msgstr "Si vous préférez les mises à jour automatiques, vous pouvez activer la recherche de celles-ci via le menu Paramètres."
+#: resources.h:264
+msgid ""
+"In case you prefer automatic updates, you can enable automatic update checks "
+"in the settings dialog."
+msgstr ""
+"Si vous préférez les mises à jour automatiques, vous pouvez activer la "
+"recherche de celles-ci via le menu Paramètres."
 
-#: resources.h:691
-#: resources.h:755
-msgid "In order to use active mode, FileZilla needs to know your external IP address."
-msgstr "Pour utiliser le mode actif, FileZilla doit connaître votre adresse IP externe."
+#: resources.h:712 resources.h:776
+msgid ""
+"In order to use active mode, FileZilla needs to know your external IP "
+"address."
+msgstr ""
+"Pour utiliser le mode actif, FileZilla doit connaître votre adresse IP "
+"externe."
+
+#: resources.h:697
+msgid ""
+"In passive mode, which is recommended for most users, FileZilla asks the "
+"server for a port and connects to the given port. Not much configuration has "
+"to be done for this."
+msgstr ""
+"En mode passif, mode recommandé pour la plupart des utilisateurs, FileZilla "
+"demande un port au serveur et s'y connecte. Aucun paramètre supplémentaire "
+"n'est nécessaire."
 
-#: resources.h:676
-msgid "In passive mode, which is recommended for most users, FileZilla asks the server for a port and connects to the given port. Not much configuration has to be done for this."
-msgstr "En mode passif, mode recommandé pour la plupart des utilisateurs, FileZilla demande un port au serveur et s'y connecte. Aucun paramètre supplémentaire n'est nécessaire."
-
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:884
-msgid "Incomplete chain, top certificate is not self-signed certificate authority certificate"
-msgstr "Chaîne incomplète, le certificat n'est pas un certificat auto-signé par une autorité compétente"
+#: ../../locales/../src/engine/tlssocket.cpp:1101
+msgid ""
+"Incomplete chain, top certificate is not self-signed certificate authority "
+"certificate"
+msgstr ""
+"Chaîne incomplète, le certificat n'est pas un certificat auto-signé par une "
+"autorité compétente"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Mot de passe incorrect"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Initialisation de TLS..."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Serveur non sécurisé, celui-ci ne supporte pas FTP sur TLS."
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:851
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:870
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:191
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactif"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:126
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:126
 msgid "Interface"
 msgstr "Interface"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:219
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1021
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/engine/ControlSocket.cpp:219
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Interrompu par l'utilisateur"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:772
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
 msgstr "Longueur du contenu invalide"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:623
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:623
 msgid "Invalid HTTP Response"
 msgstr "Réponse HTTP invalide"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:544
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:604
-msgid "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in site manager to force UTF-8."
-msgstr "Séquence de caractères reçus invalide, désactivation de UTF-8. Sélectionnez l'option UTF-8 dans le Gestionnaire de Sites pour forcer l'utilisation de l'UTF-8."
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
+msgid ""
+"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
+"site manager to force UTF-8."
+msgstr ""
+"Séquence de caractères reçus invalide, désactivation de UTF-8. Sélectionnez "
+"l'option UTF-8 dans le Gestionnaire de Sites pour forcer l'utilisation de "
+"l'UTF-8."
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:896
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
 msgstr "Taille du paquet invalide"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:353
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:363
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:372
+#: ../../locales/../src/interface/netconfwizard.cpp:353
+#: ../../locales/../src/interface/netconfwizard.cpp:363
+#: ../../locales/../src/interface/netconfwizard.cpp:372
 msgid "Invalid data received"
 msgstr "Données reçues invalides"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:32
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:48
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
 msgstr "Date invalide"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1337
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nom de fichier invalide"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
-msgstr "Hôte invalide, après le crochet de fin, seuls les deux-points et le port peuvent être renseignés."
+msgstr ""
+"Hôte invalide, après le crochet de fin, seuls les deux-points et le port "
+"peuvent être renseignés."
 
-#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:104
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Entrée invalide"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:61
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:194
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Port spécifié invalide. Le port doit être compris entre 1 et 65535."
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:91
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Protocole spécifié invalide. Les protocoles valides sont :\n"
 "ftp:// pour le FTP normal,\n"
@@ -4146,856 +4495,930 @@
 "ftps:// pour le FTP sur SSL (implicite) et\n"
 "ftpes:// pour le FTP sur SSL (explicite)."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Expression invalide dans les conditions de recherche."
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:633
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
 msgstr "Code de réponse invalide"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Conditions de recherche invalides : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:419
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:439
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:456
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:463
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:470
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:487
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:556
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:735
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:742
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:822
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Chemin du site invalide"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Taille invalide dans cette condition"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Identifiant spécifié invalide."
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Juridiction du pays :"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Juridiction locale :"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Juridiction d'état ou de province :"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Maintenir les dossiers en tête"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:668
-msgid "Keep in mind that not all servers support this feature and may return incorrect listings if this option is enabled. Although FileZilla performs some tests to check if the server supports this feature, the test may fail."
-msgstr "Gardez à l'esprit que tous les serveurs ne supportent pas cette fonctionnalité et peuvent retourner une lecture de contenu incorrecte si cette option est activée. Bien que FileZilla effectue quelques tests pour vérifier si le serveur supporte cette fonctionnalité, le test peut échouer."
+#: ../../locales/../src/interface/Mainfrm.cpp:680
+msgid ""
+"Keep in mind that not all servers support this feature and may return "
+"incorrect listings if this option is enabled. Although FileZilla performs "
+"some tests to check if the server supports this feature, the test may fail."
+msgstr ""
+"Gardez à l'esprit que tous les serveurs ne supportent pas cette "
+"fonctionnalité et peuvent retourner une lecture de contenu incorrecte si "
+"cette option est activée. Bien que FileZilla effectue quelques tests pour "
+"vérifier si le serveur supporte cette fonctionnalité, le test peut échouer."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Échange de clé"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Échange de clé :"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "La &plus basse"
 
-#: resources.h:930
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:131
+#: resources.h:951
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Langue"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Langue modifiée"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:361
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:383
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:268
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Dernière modification"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Agencement"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Limite &de téléchargements simultanés :"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Limite d'envois sim&ultanés :"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limites des ports locaux"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Taille limite du fichier journal"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limite :"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
 msgstr "Longueur de ligne dépassée"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Dépendances"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:267
+#: ../../locales/../src/interface/netconfwizard.cpp:267
 msgid "Listen socket closed"
 msgstr "Socket d'écoute fermé"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:220
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:296
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/engine/logging.cpp:220
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Contenu :"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "P&ort le plus bas disponible :"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1278
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Local"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Fichier local"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:328
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
 msgstr "Le fichier local n'existe pas."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:323
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr "Le fichier local est un dossier et non un fichier normal."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:369
+#: ../../locales/../src/interface/manual_transfer.cpp:369
 msgid "Local file is not a valid filename."
 msgstr "Le fichier local ne possède pas un nom de fichier valide."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtres locaux :"
 
-#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:360
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Site local :"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Localité :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_logging.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
 msgid "Log file"
 msgstr "Fichier journal"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Journal de la recherche de mises à jour :"
 
-#: resources.h:955
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:140
+#: resources.h:980
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Journalisation"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:818
-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 "Les informations d'identification contiennent des caractères non-ASCII et il 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."
-
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:825
-msgid "Login data contains non-ASCII characters and server might not be UTF-8 aware. Trying local charset."
-msgstr "Les informations d'identification contiennent des caractères non ASCII et il se peut que le serveur ne gère pas l'UTF-8. Utilisation du jeu de caractères local."
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+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 ""
+"Les informations d'identification contiennent des caractères non-ASCII et il "
+"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:832
+msgid ""
+"Login data contains non-ASCII characters and server might not be UTF-8 "
+"aware. Trying local charset."
+msgstr ""
+"Les informations d'identification contiennent des caractères non ASCII et il "
+"se peut que le serveur ne gère pas l'UTF-8. Utilisation du jeu de caractères "
+"local."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
-msgstr "La séquence d'identification a entièrement été exécutée et vous n'êtes pourtant pas encore identifié. Abandon."
+msgstr ""
+"La séquence d'identification a entièrement été exécutée et vous n'êtes "
+"pourtant pas encore identifié. Abandon."
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
-msgstr "L'authentification doit être de type 'Demander un mot de passe' ou 'Interactif' (sans les guillemets)."
+msgstr ""
+"L'authentification doit être de type 'Demander un mot de passe' ou "
+"'Interactif' (sans les guillemets)."
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
-msgid "Logontype, can only be used together with FTP URL. Argument has to be either '%s' or '%s'"
-msgstr "L'authentification ne peut être utilisé conjointement qu'avec une URL FTP. L'argument doit être '%s' ou '%s'"
+msgid ""
+"Logontype, can only be used together with FTP URL. Argument has to be either "
+"'%s' or '%s'"
+msgstr ""
+"L'authentification ne peut être utilisé conjointement qu'avec une URL FTP. "
+"L'argument doit être '%s' ou '%s'"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:917
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Bas"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:915
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Le plus bas"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:67
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 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 65535."
+msgstr ""
+"Le port le plus bas disponible doit être un nombre compris entre 1024 et "
+"65535."
 
-#: resources.h:20
-#: resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC :"
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
-msgstr "Assurez-vous que le fichier est accessible et qu'il est bien un document XML correctement mis en forme."
+msgstr ""
+"Assurez-vous que le fichier est accessible et qu'il est bien un document XML "
+"correctement mis en forme."
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:827
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:839
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:854
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:896
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 #, c-format
 msgid "Malformed chunk data: %s"
 msgstr "Paquet de données non conforme : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:772
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 #, c-format
 msgid "Malformed header: %s"
 msgstr "Entête non conforme : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:593
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:593
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Réponse non conforme, le serveur envoie des fins de ligne incorrectes"
 
-#: resources.h:394
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:316
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:323
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:328
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:336
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:343
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:350
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:369
+#: resources.h:404 ../../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
 msgid "Manual transfer"
 msgstr "Transfert manuel"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Correspondances à toutes les conditions suivantes"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Correspondances à au moins une des conditions suivantes"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Correspondances à aucune des conditions suivantes"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Nombre maximum de &transferts simultanés :"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:377
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Journal des événements"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Journal des événements"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "Mio"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minutes"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "&Déplacer vers le bas"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Déplacer vers le ha&ut"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Ordinateur"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Mes Documents"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:290
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Mes Sites"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:176
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:178
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
 msgid "N/a"
 msgstr "N/d"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nom"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Le nom existe déjà"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Le nom du favori existe déjà."
 
-#: resources.h:120
-#: resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nom :"
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Saisissez un nom pour le filtre"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Saisissez un chemin distant valide"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Veuillez spécifier l'encodage des caractères"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:436
+#: ../../locales/../src/engine/proxy.cpp:436
 msgid "Network unreachable"
 msgstr "Réseau inaccessible"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Jamais"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Nouveau &Dossier"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Nouvel ongle&t"
 
-#: resources.h:74
-#: resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Nouveau Fa&vori"
 
-#: resources.h:395
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:55
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:69
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:76
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:83
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:93
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:99
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:108
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:545
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:551
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:557
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:580
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:759
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2115
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nouveau Favori"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1618
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nouveau dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nouvelles fonctionnalités et améliorations de la version %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nouveau filtre"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nouveau dossier"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:622
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:636
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nouveau site"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "A côté de la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Non"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:26
+#: ../../locales/../src/interface/export.cpp:26
 msgid "No category to export selected"
 msgstr "Aucune catégorie sélectionnée pour l'exportation"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Aucune commande spécifiée, abandon."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
-msgstr "Aucune adresse IP externe spécifiée, utilisation des paramètres par défaut."
+msgstr ""
+"Aucune adresse IP externe spécifiée, utilisation des paramètres par défaut."
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Aucun fichier en cours d'édition."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Aucun nom de filtre spécifié"
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:76
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:187
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Aucun hôte spécifié, saisissez un hôte."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:101
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
 msgstr "Aucune image disponible"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Il n'y a plus de fichiers dans la file d'attente !"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:351
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Le jeu de filtres spécifié n'a aucun nom."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Aucun programme associé à ce type de fichier"
 
-#: resources.h:420
+#: resources.h:430
 #, 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'."
+msgstr ""
+"Aucun programme n'a été associé pour éditer les fichiers portant l'extension "
+"'%s'."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Aucun résultat"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:256
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:268
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:299
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
 msgstr "Aucun site disponible"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:404
+#: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
 msgstr "Méthode d'authentification SOCKS5 non supportée"
 
-#: ../../source/FileZilla3/locales/../src/interface/loginmanager.cpp:104
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Aucun identifiant spécifié."
 
-#: resources.h:924
-#: resources.h:929
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:54
+#: resources.h:945 resources.h:950
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Aucune"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Pas encore sélectionné"
 
-#: resources.h:816
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:847
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:866
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:920
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1007
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:160
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:185
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:560
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1287
+#: resources.h:837 ../../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:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normale"
 
-#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:326
-#: ../../source/FileZilla3/locales/../src/interface/queueview_failed.cpp:351
+#: ../../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 "Tous les objets ne peuvent pas être replacés en file d'attente pour visualisation ou édition."
+msgstr ""
+"Tous les objets ne peuvent pas être replacés en file d'attente pour "
+"visualisation ou édition."
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:199
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:199
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Déconnecté"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Absence de connexion à un serveur"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Absence de connexion à un serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:27
+#: ../../locales/../src/interface/filelist_statusbar.cpp:27
 msgid "Not connected."
 msgstr "Déconnecté."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
-msgstr "Notez que cette fonctionnalité est uniquement supportée avec le protocole FTP."
+msgstr ""
+"Notez que cette fonctionnalité est uniquement supportée avec le protocole "
+"FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
-msgstr "Note : Ceci fonctionne uniquement avec les connexions FTP non chiffrées"
+msgstr ""
+"Note : Ceci fonctionne uniquement avec les connexions FTP non chiffrées"
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
-msgstr "Note : L'utilisation d'un Proxy générique force les connexions FTP en mode Passif."
+msgstr ""
+"Note : L'utilisation d'un Proxy générique force les connexions FTP en mode "
+"Passif."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Nombre de décimales :"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection.cpp:35
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Le nombre d'essais doit être compris entre 0 et 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Ou&vrir le fichier"
 
-#: resources.h:24
-#: resources.h:46
-#: resources.h:68
-#: resources.h:130
-#: resources.h:152
-#: resources.h:173
-#: resources.h:183
-#: resources.h:196
-#: resources.h:211
-#: resources.h:228
-#: resources.h:279
-#: resources.h:288
-#: resources.h:295
-#: resources.h:303
-#: resources.h:326
-#: resources.h:334
-#: resources.h:353
-#: resources.h:359
-#: resources.h:392
-#: resources.h:406
-#: resources.h:428
-#: resources.h:451
-#: resources.h:460
-#: resources.h:474
-#: resources.h:487
-#: resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
-msgid "On the following pages, the selected transfer mode will be configured, as well as the fallback mode if enabled."
-msgstr "Dans les pages suivantes, le mode de transfert que vous venez de sélectionner sera configuré de même que le mode alternatif si vous l'avez activé."
+#: resources.h:704
+msgid ""
+"On the following pages, the selected transfer mode will be configured, as "
+"well as the fallback mode if enabled."
+msgstr ""
+"Dans les pages suivantes, le mode de transfert que vous venez de "
+"sélectionner sera configuré de même que le mode alternatif si vous l'avez "
+"activé."
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Une seule fois"
 
-#: resources.h:954
-msgid "Only the versions of FileZilla and the operating system you are using will be submitted to the server."
-msgstr "Seules les informations concernant la version de FileZilla et du système d'exploitation seront transmises au serveur."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Une fois par semaine"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Ouvrir le dossier dans l'explorateur de fichiers de votre système"
 
-#: resources.h:976
-#: resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Ouvrir le Gestionnaire de Sites"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Ouvrir le Gestionnaire de Sites."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Ouvrir le Gestionnaire de Sites. Clic droit pour afficher la liste des sites."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Ouvrir le fichier."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Ouvrir le dialogue des paramètres de FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Ouvert comme :"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2647
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2029
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2074
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2161
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2174
+#: ../../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
 msgid "Opening failed"
 msgstr "L'ouverture a échoué"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Ouvrir un nouvel onglet"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Ouvre le Gestionnaire de Sites"
 
-#: resources.h:997
-msgid "Opens the directory listing filter dialog. Right-click to toggle filters."
-msgstr "Afficher la boîte de dialogue de gestion des filtres des dossiers. Faites un clic droit pour activer/désactiver les filtres."
+#: resources.h:1023
+msgid ""
+"Opens the directory listing filter dialog. Right-click to toggle filters."
+msgstr ""
+"Afficher la boîte de dialogue de gestion des filtres des dossiers. Faites un "
+"clic droit pour activer/désactiver les filtres."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Système d'exploitation"
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Un problème au niveau du système d'exploitation a été détecté"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organisation :"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Autre :"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Vue d'ensemble"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Remplacer s&i la source est plus récente"
 
-#: resources.h:260
-#: resources.h:270
-#: resources.h:839
-#: resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Remplacer le fichier"
 
-#: resources.h:262
-#: resources.h:272
-#: resources.h:841
-#: resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Remplacer le fichier si la taille est différente"
 
-#: resources.h:263
-#: resources.h:273
-#: resources.h:842
-#: resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
-msgstr "Remplacer le fichier si la taille est différente ou si la source est plus récente"
+msgstr ""
+"Remplacer le fichier si la taille est différente ou si la source est plus "
+"récente"
 
-#: resources.h:261
-#: resources.h:271
-#: resources.h:840
-#: resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Remplacer le fichier si la source est plus récente"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Remplacer si la taille est &différente"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
-msgstr "Remplacer si la taille est différente ou si la &source est plus récente"
+msgstr ""
+"Remplacer si la taille est différente ou si la &source est plus récente"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permissions du propriétaire"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:363
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/RemoteListView.cpp:377
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Propriétaire/Groupe"
 
-#: resources.h:874
-msgid "P&revent system from entering idle sleep during transfers and other operations"
-msgstr "Empêche&r la mise en veille de l'ordinateur pendant les transferts et toutes autres opérations"
+#: resources.h:895
+msgid ""
+"P&revent system from entering idle sleep during transfers and other "
+"operations"
+msgstr ""
+"Empêche&r la mise en veille de l'ordinateur pendant les transferts et toutes "
+"autres opérations"
 
-#: resources.h:781
-#: resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Hôte P&roxy :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:488
+#: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
 msgstr "La commande PORT a été corrompue par le routeur ou le pare-feu."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssif (recommandé)"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Application"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Le paramètre n'est pas une URL invalide"
 
-#: resources.h:85
-#: resources.h:383
-#: resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "&Mot de passe :"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passif (recommandé)"
 
-#: resources.h:763
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:119
+#: resources.h:784
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Mode passif"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:588
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:601
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:612
+#: ../../locales/../src/interface/netconfwizard.cpp:588
+#: ../../locales/../src/interface/netconfwizard.cpp:601
+#: ../../locales/../src/interface/netconfwizard.cpp:612
 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."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
 msgstr "Mot de passe requis"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:380
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Chemin"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2355
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3185
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
+msgstr ""
+"Le chemin ne peut pas être créé pour le dossier %s et le sous-dossier %s"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Chemin introuvable :"
 
-#: resources.h:401
+#: resources.h:411
 msgid "Paths"
 msgstr "Chemins"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1257
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1400
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1499
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "En attente de retrait"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Droit d'accès"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:362
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:384
+#: ../../locales/../src/interface/RemoteListView.cpp:376
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Droits d'accès"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plateforme :"
 
-#: resources.h:250
-msgid "Please check http://filezilla-project.org for the most recent version of FileZilla."
-msgstr "Rendez-vous sur http://filezilla-project.org pour obtenir la dernière version de FileZilla."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:553
-msgid "Please check on http://filezilla-project.org/probe.php that the server is running and carefully check your settings again."
-msgstr "Vérifiez sur http://filezilla-project.org/probe.php que le serveur est démarré et revérifiez attentivement vos paramètres."
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1076
-msgid "Please check the package manager of your system for an updated package or visit http://filezilla-project.org to download the source code of FileZilla."
-msgstr "Vérifiez le gestionnaire de paquet de votre système pour une éventuelle mise à jour ou visitez http://filezilla-project.org pour télécharger le code source de FileZilla."
-
-#: resources.h:685
-msgid "Please configure any firewalls and routers so that FileZilla can establish outgoing connection to arbitrary ports."
-msgstr "Configurez vos routeurs et pare-feux afin que FileZilla puisse établir des connexions sortantes sur les ports que vous avez spécifiés."
+#: resources.h:260
+msgid ""
+"Please check http://filezilla-project.org for the most recent version of "
+"FileZilla."
+msgstr ""
+"Rendez-vous sur http://filezilla-project.org pour obtenir la dernière "
+"version de FileZilla."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:553
+msgid ""
+"Please check on http://filezilla-project.org/probe.php that the server is "
+"running and carefully check your settings again."
+msgstr ""
+"Vérifiez sur http://filezilla-project.org/probe.php que le serveur est "
+"démarré et revérifiez attentivement vos paramètres."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1091
+msgid ""
+"Please check the package manager of your system for an updated package or "
+"visit http://filezilla-project.org to download the source code of FileZilla."
+msgstr ""
+"Vérifiez le gestionnaire de paquet de votre système pour une éventuelle mise "
+"à jour ou visitez http://filezilla-project.org pour télécharger le code "
+"source de FileZilla."
+
+#: resources.h:706
+msgid ""
+"Please configure any firewalls and routers so that FileZilla can establish "
+"outgoing connection to arbitrary ports."
+msgstr ""
+"Configurez vos routeurs et pare-feux afin que FileZilla puisse établir des "
+"connexions sortantes sur les ports que vous avez spécifiés."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:623
+#: ../../locales/../src/interface/netconfwizard.cpp:623
 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."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:562
-msgid "Please ensure you have a stable internet connection and carefully check your settings again."
-msgstr "Assurez-vous de disposer d'une connexion Internet stable et vérifiez à nouveau vos paramètres."
+#: ../../locales/../src/interface/netconfwizard.cpp:562
+msgid ""
+"Please ensure you have a stable internet connection and carefully check your "
+"settings again."
+msgstr ""
+"Assurez-vous de disposer d'une connexion Internet stable et vérifiez à "
+"nouveau vos paramètres."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_dateformatting.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
 msgid "Please enter a custom date format."
 msgstr "Saisissez un format de date personnalisé."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_dateformatting.cpp:73
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
 msgstr "Saisissez un format d'heure personnalisé."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:695
-msgid "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Saisissez une date au format YYYY-MM-DD comme par exemple 2010-07-18."
 
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
-msgstr "Saisissez une limite de taux de téléchargement supérieure ou égale à 0 %s/s."
+msgstr ""
+"Saisissez une limite de taux de téléchargement supérieure ou égale à 0 %s/s."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Saisissez un nom pour le nouveau filtre."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Saisissez un nouveau nom pour le filtre copié."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Saisissez un nouveau nom pour le jeu de filtres \"%s\""
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Saisissez un nouveau nom pour le filtre."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:101
-msgid "Please enter a number between 0 and 10 for the number of concurrent downloads."
-msgstr "Saisissez un nombre compris entre 0 et 10 pour le nombre de téléchargements simultanés."
-
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:105
-msgid "Please enter a number between 0 and 10 for the number of concurrent uploads."
-msgstr "Saisissez un nombre compris entre 0 et 10 pour le nombre d'envois simultanés."
-
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:97
-msgid "Please enter a number between 1 and 10 for the number of concurrent transfers."
-msgstr "Saisissez un nombre compris entre 1 et 10 pour le nombre de transferts simultanés."
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent "
+"downloads."
+msgstr ""
+"Saisissez un nombre compris entre 0 et 10 pour le nombre de téléchargements "
+"simultanés."
 
-#: resources.h:117
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent uploads."
+msgstr ""
+"Saisissez un nombre compris entre 0 et 10 pour le nombre d'envois simultanés."
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
+msgid ""
+"Please enter a number between 1 and 10 for the number of concurrent "
+"transfers."
+msgstr ""
+"Saisissez un nombre compris entre 1 et 10 pour le nombre de transferts "
+"simultanés."
+
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Saisissez un mot de passe pour ce serveur :"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5005,37 +5428,37 @@
 "Ex. : c:\\chemin\\fichier.exe sous MS Windows ou /chemin/fichier sous Unix.\n"
 "Vous pouvez aussi spécifier des arguments au programme si vous le désirez."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection.cpp:46
-msgid "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
-msgstr "Saisissez un délai d'attente compris entre 5 et 9999 secondes ou 0 pour désactiver ces délais d'attente."
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
+msgid ""
+"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
+msgstr ""
+"Saisissez un délai d'attente compris entre 5 et 9999 secondes ou 0 pour "
+"désactiver ces délais d'attente."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Saisissez un nom unique pour ce jeu de filtres"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Saisissez un identifiant pour ce serveur :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:182
+#: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
 msgstr "Saisissez une plage de ports valide."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:161
+#: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr "Saisissez une URL à partir de laquelle vous obtiendrez votre adresse externe"
-
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Saisissez un intervalle de mise à jour d'au moins 7 jours"
+msgstr ""
+"Saisissez une URL à partir de laquelle vous obtiendrez votre adresse externe"
 
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Saisissez une limite de taux d'envoi supérieure ou égale à 0 %s/s."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5043,1214 +5466,1434 @@
 "Saisissez une commande FTP brute.\n"
 "L'utilisation de commandes FTP brutes vide le cache du dossier."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1604
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:1183
-#: ../../source/FileZilla3/locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Saisissez le nom du dossier qui doit être créé :"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Saisissez le nom du fichier que vous souhaitez créer :"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Saisissez un identifiant et un mot de passe pour ce serveur :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:142
+#: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
 msgstr "Saisissez votre adresse IP externe"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:593
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:606
-msgid "Please enter your external IP address on the active mode page of this wizard. In case you have a dynamic address or don't know your external address, use the external resolver option."
-msgstr "Saisissez votre adresse IP externe dans la page de configuration du mode actif de l'assistant. Si vous disposez d'une adresse dynamique ou que vous ne connaissez pas votre adresse externe, utilisez l'option de résolution externe."
-
-#: resources.h:672
-msgid "Please follow the instructions carefully, as wrong configuration will prevent successful FTP connections."
-msgstr "Suivez les instructions attentivement, car une mauvaise configuration empêchera les connexions FTP d'aboutir."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:617
-msgid "Please make sure FileZilla is allowed to establish outgoing connections and make sure you typed the address of the address resolver correctly."
-msgstr "Assurez-vous que FileZilla est autorisé à établir des connexions sortantes et que vous avez correctement saisi l'adresse nécessaire à la résolution des adresses."
+#: ../../locales/../src/interface/netconfwizard.cpp:593
+#: ../../locales/../src/interface/netconfwizard.cpp:606
+msgid ""
+"Please enter your external IP address on the active mode page of this "
+"wizard. In case you have a dynamic address or don't know your external "
+"address, use the external resolver option."
+msgstr ""
+"Saisissez votre adresse IP externe dans la page de configuration du mode "
+"actif de l'assistant. Si vous disposez d'une adresse dynamique ou que vous "
+"ne connaissez pas votre adresse externe, utilisez l'option de résolution "
+"externe."
+
+#: resources.h:693
+msgid ""
+"Please follow the instructions carefully, as wrong configuration will "
+"prevent successful FTP connections."
+msgstr ""
+"Suivez les instructions attentivement, car une mauvaise configuration "
+"empêchera les connexions FTP d'aboutir."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:617
+msgid ""
+"Please make sure FileZilla is allowed to establish outgoing connections and "
+"make sure you typed the address of the address resolver correctly."
+msgstr ""
+"Assurez-vous que FileZilla est autorisé à établir des connexions sortantes "
+"et que vous avez correctement saisi l'adresse nécessaire à la résolution des "
+"adresses."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 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."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:594
-msgid "Please make sure your router is using the latest available firmware. Furthermore, your router has to be configured properly. You will have to use manual port forwarding. Don't run your router in the so called 'DMZ mode' or 'game mode'."
-msgstr "Assurez-vous que votre routeur dispose de la dernière version de son microprogramme. En plus, votre routeur doit être correctement configuré. Vous devez rediriger les ports manuellement. N'utilisez pas le 'mode DMZ' ou 'mode Jeu' de votre routeur."
-
-#: resources.h:686
-msgid "Please note that FileZilla has no influence on the port the server chooses. So the server might choose a port which your firewall thinks is only used by trojans or other malware. This might raise a false alarm you can safely discard."
-msgstr "Notez que FileZilla n'a aucune influence sur le choix du port par le serveur. De ce fait, il se peut qu'un serveur choisisse un port identifié par votre pare-feu comme habituellement utilisé par les Chevaux de Troie et autres logiciels malveillants. Ce comportement peut engendrer une fausse alerte que vous pouvez ignorer sans risque."
+#: ../../locales/../src/interface/netconfwizard.cpp:594
+msgid ""
+"Please make sure your router is using the latest available firmware. "
+"Furthermore, your router has to be configured properly. You will have to use "
+"manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
+"'game mode'."
+msgstr ""
+"Assurez-vous que votre routeur dispose de la dernière version de son "
+"microprogramme. En plus, votre routeur doit être correctement configuré. "
+"Vous devez rediriger les ports manuellement. N'utilisez pas le 'mode DMZ' ou "
+"'mode Jeu' de votre routeur."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:716
-msgid "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES servers only works if they support the MFMT command."
-msgstr "Notez que la conservation des horodatages des envois sur les serveurs FTP, FTPS and FTPES ne fonctionne uniquement que si la commande MFMT est supportée."
+#: resources.h:707
+msgid ""
+"Please note that FileZilla has no influence on the port the server chooses. "
+"So the server might choose a port which your firewall thinks is only used by "
+"trojans or other malware. This might raise a false alarm you can safely "
+"discard."
+msgstr ""
+"Notez que FileZilla n'a aucune influence sur le choix du port par le "
+"serveur. De ce fait, il se peut qu'un serveur choisisse un port identifié "
+"par votre pare-feu comme habituellement utilisé par les Chevaux de Troie et "
+"autres logiciels malveillants. Ce comportement peut engendrer une fausse "
+"alerte que vous pouvez ignorer sans risque."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:728
+msgid ""
+"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
+"servers only works if they support the MFMT command."
+msgstr ""
+"Notez que la conservation des horodatages des envois sur les serveurs FTP, "
+"FTPS and FTPES ne fonctionne uniquement que si la commande MFMT est "
+"supportée."
 
-#: resources.h:740
-msgid "Please note that some servers might ban you if you try to reconnect too often or in too short intervals."
-msgstr "Notez que certains serveurs risquent de vous bannir si vous tentez de vous reconnecter trop souvent ou avec un intervalle de temps trop court."
+#: resources.h:761
+msgid ""
+"Please note that some servers might ban you if you try to reconnect too "
+"often or in too short intervals."
+msgstr ""
+"Notez que certains serveurs risquent de vous bannir si vous tentez de vous "
+"reconnecter trop souvent ou avec un intervalle de temps trop court."
 
-#: resources.h:890
-#: resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
-msgid "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for details"
-msgstr "Visitez http://wiki.filezilla-project.org/Date_and_Time_formatting pour plus de détails"
+msgid ""
+"Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
+"details"
+msgstr ""
+"Visitez http://wiki.filezilla-project.org/Date_and_Time_formatting pour plus "
+"de détails"
 
-#: resources.h:246
-msgid "Please retry downloading the update. Possible reasons if the problem persists (listed in order of decreasing probability):"
-msgstr "Réessayer de télécharger la mise à jour. Les raisons possibles si le problème persiste (par ordre décroissant de probabilité) :"
+#: resources.h:256
+msgid ""
+"Please retry downloading the update. Possible reasons if the problem "
+"persists (listed in order of decreasing probability):"
+msgstr ""
+"Réessayer de télécharger la mise à jour. Les raisons possibles si le "
+"problème persiste (par ordre décroissant de probabilité) :"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:570
-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 "Utilisez à nouveau cet assistant si l'environnement de votre réseau subit une modification ou si vous rencontrez des problèmes avec des serveurs qui fonctionnaient parfaitement auparavant."
+#: ../../locales/../src/interface/netconfwizard.cpp:570
+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 ""
+"Utilisez à nouveau cet assistant si l'environnement de votre réseau subit "
+"une modification ou si vous rencontrez des problèmes avec des serveurs qui "
+"fonctionnaient parfaitement auparavant."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Sélectionnez une action :"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Sélectionnez les catégories que vous souhaitez importer."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
-msgstr "Sélectionnez le mode de transfert par défaut que vous souhaitez utiliser."
+msgstr ""
+"Sélectionnez le mode de transfert par défaut que vous souhaitez utiliser."
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Sélectionnez les nouveaux attributs pour le dossier \"%s\"."
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Sélectionnez les nouveaux attributs pour le fichier \"%s\"."
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Sélectionnez les nouveaux attributs pour les dossiers sélectionnés."
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:44
-msgid "Please select the new attributes for the selected files and directories."
-msgstr "Sélectionnez les nouveaux attributs pour les fichiers et dossiers sélectionnés."
+#: ../../locales/../src/interface/chmoddialog.cpp:57
+msgid ""
+"Please select the new attributes for the selected files and directories."
+msgstr ""
+"Sélectionnez les nouveaux attributs pour les fichiers et dossiers "
+"sélectionnés."
 
-#: ../../source/FileZilla3/locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Sélectionnez les nouveaux attributs pour les fichiers sélectionnés."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:581
-msgid "Please update your firewall and make sure your router is using the latest available firmware. Furthermore, your router has to be configured properly. You will have to use manual port forwarding. Don't run your router in the so called 'DMZ mode' or 'game mode'. Things like protocol inspection or protocol specific 'fixups' have to be disabled"
-msgstr "Mettez à jour votre pare-feu et assurez-vous que votre routeur dispose de la dernière version de son microprogramme. En plus, votre routeur doit être correctement configuré. Vous devez rediriger les ports manuellement. N'utilisez pas le 'mode DMZ' ou 'mode Jeu' de votre routeur. Certains protocoles d'inspections ou d'autres plus spécifiques doivent être désactivés."
-
-#: resources.h:253
-msgid "Please visit http://filezilla-project.org for more information about FileZilla."
-msgstr "Visitez http://filezilla-project.org pour plus d'informations à propos de FileZilla."
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1074
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1090
-msgid "Please visit http://filezilla-project.org to download the most recent version."
-msgstr "Visitez http://filezilla-project.org pour télécharger la dernière version."
+#: ../../locales/../src/interface/netconfwizard.cpp:581
+msgid ""
+"Please update your firewall and make sure your router is using the latest "
+"available firmware. Furthermore, your router has to be configured properly. "
+"You will have to use manual port forwarding. Don't run your router in the so "
+"called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
+"protocol specific 'fixups' have to be disabled"
+msgstr ""
+"Mettez à jour votre pare-feu et assurez-vous que votre routeur dispose de la "
+"dernière version de son microprogramme. En plus, votre routeur doit être "
+"correctement configuré. Vous devez rediriger les ports manuellement. "
+"N'utilisez pas le 'mode DMZ' ou 'mode Jeu' de votre routeur. Certains "
+"protocoles d'inspections ou d'autres plus spécifiques doivent être "
+"désactivés."
+
+#: resources.h:263
+msgid ""
+"Please visit http://filezilla-project.org for more information about "
+"FileZilla."
+msgstr ""
+"Visitez http://filezilla-project.org pour plus d'informations à propos de "
+"FileZilla."
+
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
+msgid ""
+"Please visit http://filezilla-project.org to download the most recent "
+"version."
+msgstr ""
+"Visitez http://filezilla-project.org pour télécharger la dernière version."
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:184
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Code postal :"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:289
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Sites prédéfinis"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Préserver l'horodatage des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_themes.cpp:223
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
 msgid "Preview:"
 msgstr "Aperçu :"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 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 correspondent pas."
+msgstr ""
+"Les certificats de la connexion primaire et de la connexion de données ne "
+"correspondent pas."
+
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Afficher le diagnostique de démarrage de FileZilla"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
-msgstr "Imprimer les informations de version sur la sortie par défaut et quitter"
+msgstr ""
+"Imprimer les informations de version sur la sortie par défaut et quitter"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Priorité aux dossiers (par défaut)"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Priorité"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Politique de confidentialité :"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Politique de confidentialité : Seules les versions de FileZilla, de votre "
+"système d'exploitation et de l'architecture de votre processeur seront "
+"soumises au serveur."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "&Clés privées :"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tocole :"
 
-#: resources.h:783
-#: resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Mot de passe Pro&xy :"
 
-#: resources.h:525
-#: resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Traiter la fi&le d'attente"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocole :"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Port du &Proxy :"
 
-#: resources.h:782
-#: resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Identifiant Proxy :"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:415
+#: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
 msgstr "Échec de l'authentification au Proxy"
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:132
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Échec de la négociation avec le Proxy : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:309
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
 msgstr "Réponse du Proxy : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:458
+#: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
 msgstr "Échec de la requête au Proxy : %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:480
+#: ../../locales/../src/engine/proxy.cpp:480
 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"
+msgstr ""
+"Échec de la requête au Proxy : Type d'adresse incluse dans la réponse "
+"CONNECT inconnue"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy spécifié mais le Proxy hôte ou le port sont invalides"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Authentification par clé publique"
 
-#: resources.h:8
-#: resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algorithme de la clé publique :"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permissions publiques"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "La file d'attente a été complètement traitée"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:462
+#: ../../locales/../src/interface/statusbar.cpp:462
 #, c-format
 msgid "Queue: %s MiB"
 msgstr "File d'attente : %s Mio"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:392
+#: ../../locales/../src/interface/statusbar.cpp:392
 #, c-format
 msgid "Queue: %s%s"
 msgstr "File d'attente : %s%s"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:388
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:453
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "File d'attente : vide"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Fichiers en file d'attente"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "File d'attente :"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&edémarrer l'ordinateur"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Arbor&escence des dossiers distants"
 
-#: resources.h:622
-#: resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
-msgstr "Réinitialis&er et replacer les fichiers sélectionnés dans la file d'attente"
+msgstr ""
+"Réinitialis&er et replacer les fichiers sélectionnés dans la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Commande FTP brute"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "L&ire"
 
-#: resources.h:569
-#: resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "A&ctualiser"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Re&nommer"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:576
-msgid "Re-run the wizard and carefully check your settings and configure all routers and firewalls accordingly."
-msgstr "Exécutez à nouveau l'Assistant de configuration et vérifiez attentivement vos paramètres en configurant tous les routeurs et pare-feux en conséquence."
+#: ../../locales/../src/interface/netconfwizard.cpp:576
+msgid ""
+"Re-run the wizard and carefully check your settings and configure all "
+"routers and firewalls accordingly."
+msgstr ""
+"Exécutez à nouveau l'Assistant de configuration et vérifiez attentivement "
+"vos paramètres en configurant tous les routeurs et pare-feux en conséquence."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Li&re"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Lecture seule"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Souhaitez-vous vraiment annuler l'opération en cours ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1692
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] ""
+"Voulez-vous vraiment supprimer %d dossier et son contenu du serveur ?"
+msgstr[1] ""
+"Voulez-vous vraiment supprimer %d dossiers et leurs contenus du serveur ?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Souhaitez-vous vraiment supprimer %d dossier et son contenu ?"
-msgstr[1] "Souhaitez-vous vraiment supprimer %d dossiers et leurs contenus ?"
-
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1690
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Souhaitez-vous vraiment supprimer %d fichier ?"
-msgstr[1] "Souhaitez-vous vraiment supprimer %d fichiers ?"
-
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1697
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:1030
-#, c-format
-msgid "Really delete %s and %s?"
-msgstr "Souhaitez-vous vraiment supprimer %s et %s ?"
-
-#: ../../source/FileZilla3/locales/../src/engine/local_filesys.cpp:136
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Souhaitez-vous vraiment supprimer tous les dossiers et/ou fichiers sélectionnés ?"
+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:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, 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:1125
+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 ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/engine/local_filesys.cpp:136
+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:1225
 msgid "Reason"
 msgstr "Raison"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Redémarrer maintenant"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Réc&ursion dans les sous-dossiers"
 
-#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../source/FileZilla3/locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Réception d'une ligne supérieure à 10000 caractères, abandon."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:998
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1007
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Données reçues corrompues"
 
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
-"Les informations de reconnexion ne peuvent pas être supprimées tant que vous êtes connecté à un serveur.\n"
+"Les informations de reconnexion ne peuvent pas être supprimées tant que vous "
+"êtes connecté à un serveur.\n"
 "Si vous continuez, votre connexion sera interrompue."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Paramètres de reconnexion"
 
-#: resources.h:994
-#: resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Se reconnecter au dernier serveur utilisé"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:715
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:715
 msgid "Redirection to invalid address"
 msgstr "Redirection vers une adresse invalide"
 
-#: resources.h:986
-#: resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Actualiser la liste des dossiers et des fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Se souvenir des mots de passe?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Distant"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Certificat distant non approuvé."
 
-#: resources.h:367
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Fichier distant"
 
-#: resources.h:440
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:676
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:682
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:692
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Recherche de fichiers distants"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filtres distants :"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Chemin distant"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:430
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, 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 "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu est valide et reconnu par le type de serveur du site actuel (%s)."
+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 ""
+"Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu "
+"est valide et reconnu par le type de serveur du site actuel (%s)."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, 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 "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu est valide et reconnu par le type de serveur (%s) sélectionné sur le site parent."
+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 ""
+"Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu "
+"est valide et reconnu par le type de serveur (%s) sélectionné sur le site "
+"parent."
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:432
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
-msgstr "Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu est valide."
+msgstr ""
+"Le chemin distant ne peut pas être analysé. Vérifiez que le chemin absolu "
+"est valide."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:350
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
 msgstr "Le chemin d'accès à distance n'a pas pu être analysé."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Traitement du chemin distant :"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Chemin distant :"
 
-#: ../../source/FileZilla3/locales/../src/interface/viewheader.cpp:560
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Site distant :"
 
-#: resources.h:619
-#: resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "&Tout retirer"
 
-#: resources.h:621
-#: resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Retirer la &sélection"
 
-#: resources.h:265
-#: resources.h:275
-#: resources.h:844
-#: resources.h:853
-#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:256
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Renommer le fichier"
 
-#: resources.h:637
-#: resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Renommer le dossier sélectionné"
 
-#: resources.h:573
-#: resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Renommer les fichiers et dossiers sélectionnés"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2557
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3531
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Changement du nom de '%s' en '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Rapporter des bogues et demander des améliorations"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Connexion FTP explicite sur TLS"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Connexion FTP implicite sur TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Réiniti&aliser et replacer tous les fichiers dans la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1198
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:497
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Résolution de l'adresse de %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Résolution du nom de l'hôte"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:544
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:395
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:290
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/engine/logging.cpp:215
+#: ../../locales/../src/interface/netconfwizard.cpp:395
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Réponse :"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Résultats :"
 
-#: resources.h:264
-#: resources.h:274
-#: resources.h:843
-#: resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Reprendre le transfert du fichier"
 
-#: resources.h:858
-msgid "Resuming ASCII files can cause problems if server uses a different line ending format than the client."
-msgstr "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."
+#: resources.h:879
+msgid ""
+"Resuming ASCII files can cause problems if server uses a different line "
+"ending format than the client."
+msgstr ""
+"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."
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:955
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Récupération du contenu du dossier..."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3916
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:707
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
+#: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Récupération de l'adresse IP externe depuis %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Certificat racine non approuvé"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Afficher les fic&hiers en cours d'édition..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "Afficher le Gestionnaire de Sites au démarrage de FileZilla"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Arrêter l'&ordinateur"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "Arrê&ter"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Navigation s&ynchronisée"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:121
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:121
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite :"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Sauvegarder les paramètres ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+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:1822
 msgid "Scanning for files to add to queue"
 msgstr "Examen des fichiers à ajouter à la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Examen des fichiers à envoyer"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "&Conditions de recherche :"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Chemin &de recherche :"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Recherche récursive de fichiers."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Recherche de serveur de fichiers"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:531
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
 msgstr "Information de sécurité"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:564
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:577
+#: ../../locales/../src/interface/netconfwizard.cpp:564
+#: ../../locales/../src/interface/netconfwizard.cpp:577
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Voir aussi : http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Séle&ctionner le serveur"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Sélectionnez une &page :"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Sélection du thème"
 
-#: resources.h:836
-msgid "Select default action to perform if target file of a transfer already exists."
-msgstr "Sélectionnez une action par défaut à effectuer si le fichier cible d'un transfert existe déjà."
+#: resources.h:857
+msgid ""
+"Select default action to perform if target file of a transfer already exists."
+msgstr ""
+"Sélectionnez une action par défaut à effectuer si le fichier cible d'un "
+"transfert existe déjà."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:162
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1702
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Sélection de l'éditeur par défaut"
 
-#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:18
-msgid "Select default file exists action if the target file already exists. This selection is valid only for the current session."
-msgstr "Sélectionnez une action par défaut à effectuer si le fichier cible existe déjà. Cette sélection est valide uniquement pour la session en cours."
-
-#: ../../source/FileZilla3/locales/../src/interface/defaultfileexistsdlg.cpp:16
-msgid "Select default file exists action only for the currently selected files in the queue."
-msgstr "Sélectionnez une action par défaut à effectuer uniquement pour les fichiers cibles sélectionnés présents dans la file d'attente."
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
+msgid ""
+"Select default file exists action if the target file already exists. This "
+"selection is valid only for the current session."
+msgstr ""
+"Sélectionnez une action par défaut à effectuer si le fichier cible existe "
+"déjà. Cette sélection est valide uniquement pour la session en cours."
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
+msgid ""
+"Select default file exists action only for the currently selected files in "
+"the queue."
+msgstr ""
+"Sélectionnez une action par défaut à effectuer uniquement pour les fichiers "
+"cibles sélectionnés présents dans la file d'attente."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Sélection du dossier de réception pour l'application"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
 msgstr "Sélection du fichier contenant la clé privée"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:38
+#: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
 msgstr "Sélection du fichier pour l'exportation des données"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:34
+#: ../../locales/../src/interface/export.cpp:34
 msgid "Select file for exported queue"
 msgstr "Sélection du fichier pour l'exportation de la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:36
+#: ../../locales/../src/interface/export.cpp:36
 msgid "Select file for exported settings"
 msgstr "Sélection du fichier pour l'exportation des paramètres"
 
-#: ../../source/FileZilla3/locales/../src/interface/export.cpp:32
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/export.cpp:32
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Sélection du fichier pour l'exportation des sites"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:15
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr "Sélection du fichier pour l'importation des paramètres"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:250
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
 msgstr "Sélection du fichier à envoyer"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
 msgstr "Sélection du nom pour la clé privée convertie"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Sélectionnez la façon dont ces fichiers doivent être ouverts."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Sélectionner le dossier cible du téléchargement"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:245
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Sélection du nom de fichier cible"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Sélectionnez les catégories à exporter :"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Sélectionnez les données personnelles que vous souhaitez supprimer."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
 msgstr[0] "%d dossier sélectionné avec son contenu pour le transfert."
 msgstr[1] "%d dossiers sélectionnés avec leurs contenus pour le transfert."
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:51
+#: ../../locales/../src/interface/filelist_statusbar.cpp:51
 #, c-format
 msgid "Selected %d directory."
 msgid_plural "Selected %d directories."
 msgstr[0] "Sélection de %d dossier."
 msgstr[1] "Sélection de %d dossiers."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
 msgstr[0] "%d fichier sélectionné pour le transfert."
 msgstr[1] "%d fichiers sélectionnés pour le transfert."
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:58
+#: ../../locales/../src/interface/filelist_statusbar.cpp:58
 #, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
 msgstr[0] "Sélection de %d fichier. Taille totale : %s"
 msgstr[1] "Sélection de %d fichiers. Taille totale : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:56
+#: ../../locales/../src/interface/filelist_statusbar.cpp:56
 #, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
 msgstr[0] "Sélection de %d fichier. Taille totale : Au moins %s"
 msgstr[1] "Sélection de %d fichiers. Taille totale : Au moins %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "%s et %s sélectionnés pour le transfert."
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:68
+#: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
 msgid "Selected %s and %s. Total size: %s"
 msgstr "Sélection de %s et %s. Taille totale : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelist_statusbar.cpp:66
+#: ../../locales/../src/interface/filelist_statusbar.cpp:66
 #, c-format
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Sélection de %s et %s. Taille totale : Au moins %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:182
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1643
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "L'éditeur sélectionné n'existe pas."
 
-#: resources.h:320
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Le fichier sélectionné est déjà en cours d'édition"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
 msgstr "Le fichier sélectionné est déjà chargé"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Le fichier sélectionné est déjà ouvert"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Le fichier sélectionné est encore en cours d'édition"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Le filtre sélectionné fonctionne uniquement pour les fichiers locaux."
 
-#: ../../source/FileZilla3/locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
-"Le favori global sélectionné et le serveur actuel utilisent un type de serveur différent.\n"
+"Le favori global sélectionné et le serveur actuel utilisent un type de "
+"serveur différent.\n"
 "Utilisez un favori spécifique au site pour ce serveur."
 
-#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:281
+#: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
 msgstr "Le port sélectionné est habituellement utilisé par un autre protocole."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Envoyer des &commandes FTP anti-déconnexion"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
-msgstr "Envoi d'une commande personnalisée au serveur si celui-ci est indisponible"
+msgstr ""
+"Envoi d'une commande personnalisée au serveur si celui-ci est indisponible"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Envoi d'une commande anti-déconnexion"
 
-#: resources.h:7
-#: resources.h:31
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Numéro de série :"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Type de serveur :"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Le serveur n'a pas correctement fermé la connexion TLS"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Le serveur ne supporte pas les caractères non-ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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."
+msgstr ""
+"Le serveur ne supporte pas la reprise de transfert pour les fichiers > %d "
+"Gio."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
-msgid "Server does not support resume of files > %d GB. End transfer since file sizes match."
-msgstr "Le serveur ne supporte pas la reprise de transfert pour les fichiers > %d Gio. Fin du transfert dès que la taille des fichiers en local et sur le serveur sont identiques."
+msgid ""
+"Server does not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"Le serveur ne supporte pas la reprise de transfert pour les fichiers > %d "
+"Gio. Fin du transfert dès que la taille des fichiers en local et sur le "
+"serveur sont identiques."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
-msgstr "Le serveur ne supporte pas la reprise de transfert pour les fichiers > 2 Gio."
+msgstr ""
+"Le serveur ne supporte pas la reprise de transfert pour les fichiers > 2 Gio."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
-msgstr "Le serveur ne supporte pas la reprise de transfert pour les fichiers > 4 Gio."
+msgstr ""
+"Le serveur ne supporte pas la reprise de transfert pour les fichiers > 4 Gio."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
-msgid "Server may not support resume of files > %d GB. End transfer since file sizes match."
-msgstr "Le serveur ne semble pas supporter la reprise de transfert pour les fichiers > %d Gio.Fin du transfert dès que la taille des fichiers en local et sur le serveur sont identiques."
+msgid ""
+"Server may not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+"Le serveur ne semble pas supporter la reprise de transfert pour les fichiers "
+"> %d Gio.Fin du transfert dès que la taille des fichiers en local et sur le "
+"serveur sont identiques."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:856
-msgid "Server might require an account. Try specifying an account using the Site Manager"
-msgstr "Le serveur requiert un compte. Essayez de spécifier un compte en utilisant le Gestionnaire de Sites"
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
+msgid ""
+"Server might require an account. Try specifying an account using the Site "
+"Manager"
+msgstr ""
+"Le serveur requiert un compte. Essayez de spécifier un compte en utilisant "
+"le Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Le serveur a retourné aucun chemin."
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:675
-msgid "Server sent an additional login prompt. You need to use the interactive login type."
-msgstr "Le serveur a envoyé une requête d'identification additionnelle. Vous devez utiliser un type d'identification interactif."
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
+msgid ""
+"Server sent an additional login prompt. You need to use the interactive "
+"login type."
+msgstr ""
+"Le serveur a envoyé une requête d'identification additionnelle. Vous devez "
+"utiliser un type d'identification interactif."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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."
+msgstr ""
+"Le serveur a envoyé une réponse passive avec une adresse non routable. Échec "
+"du mode passif."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3852
-msgid "Server sent passive reply with unroutable address. Using server address instead."
-msgstr "Le serveur a envoyé une réponse passive avec une adresse non routable. Adresse remplacée par celle du serveur."
-
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:403
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:410
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:449
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:458
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:470
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:494
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:501
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:510
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:521
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
+msgid ""
+"Server sent passive reply with unroutable address. Using server address "
+"instead."
+msgstr ""
+"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:403
+#: ../../locales/../src/interface/netconfwizard.cpp:410
+#: ../../locales/../src/interface/netconfwizard.cpp:449
+#: ../../locales/../src/interface/netconfwizard.cpp:458
+#: ../../locales/../src/interface/netconfwizard.cpp:470
+#: ../../locales/../src/interface/netconfwizard.cpp:494
+#: ../../locales/../src/interface/netconfwizard.cpp:501
+#: ../../locales/../src/interface/netconfwizard.cpp:510
+#: ../../locales/../src/interface/netconfwizard.cpp:521
 msgid "Server sent unexpected reply."
 msgstr "Le serveur a envoyé une réponse inattendue."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Serveur au client MAC :"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Serveur au client chiffré :"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Type de serveur :"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Serveur / Fichier local"
 
-#: resources.h:311
-#: resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Serveur :"
 
-#: resources.h:15
-#: resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Détails de session"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Définir la &priorité"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:2435
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:3683
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Définir les permissions de '%s' à '%s'"
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize appellé sans socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Paramètres de FileZilla"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Afficher le contenu b&rut du dossier"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Afficher le dialogue de &bienvenue..."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Afficher les arborescences des 2 côtés et continuer la comparaison ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:6
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Afficher les chiffrements TLS disponibles"
+
+#: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Afficher ce dialogue d'aide"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Arrêter maintenant"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Signature de l'algorithme :"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Entrées du &Gestionnaire de Sites"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1027
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1037
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1051
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1087
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1097
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gestionnaire de Sites - Impossible de se souvenir du mot de passe"
+
+#: ../../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
 msgid "Site Manager - Invalid data"
 msgstr "Gestionnaire de Sites - Données invalides"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Le Gestionnaire de Sites est déjà ouvert"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:439
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:456
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:470
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:742
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Le site n'existe pas."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr "Le chemin du site doit commencer par 0 ou 1."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:463
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:556
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:735
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Le chemin du site est incorrect."
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:263
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr "Favoris spécifiques au site"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:93
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
-"Site-specific bookmarks require the server to be stored in the Site Manager.\n"
+"Site-specific bookmarks require the server to be stored in the Site "
+"Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
-"Un favori spécifique au site requiert un serveur pour être sauvegardé dans le Gestionnaire de Sites.\n"
+"Un favori spécifique au site requiert un serveur pour être sauvegardé dans "
+"le Gestionnaire de Sites.\n"
 "Ajouter les paramètres de la connexion actuelle au Gestionnaire de Sites ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Taille"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Format des tailles"
 
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:62
-#: ../../source/FileZilla3/locales/../src/interface/fileexistsdlg.cpp:68
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Taille inconnue"
 
-#: resources.h:266
-#: resources.h:276
-#: resources.h:845
-#: resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Ignorer le fichier"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1270
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1289
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1314
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Ignorer le téléchargement de %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1274
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1293
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1318
-#: ../../source/FileZilla3/locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Ignorer l'envoi de %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
-msgstr "Certains fichiers sont encore en cours d'édition ou nécessitent d'être envoyés."
+msgstr ""
+"Certains fichiers sont encore en cours d'édition ou nécessitent d'être "
+"envoyés."
 
-#: resources.h:688
-#: resources.h:764
-msgid "Some misconfigured remote servers which are behind a router, may reply with their local IP address."
-msgstr "Certains serveurs distants mal configurés, se trouvant derrière un routeur, peuvent répondre avec leurs adresses IP locales."
+#: resources.h:709 resources.h:785
+msgid ""
+"Some misconfigured remote servers which are behind a router, may reply with "
+"their local IP address."
+msgstr ""
+"Certains serveurs distants mal configurés, se trouvant derrière un routeur, "
+"peuvent répondre avec leurs adresses IP locales."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Trier les dossiers en ligne"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
-msgstr "L'ordre de tri ne peut pas être modifié pendant la comparaison des dossiers."
+msgstr ""
+"L'ordre de tri ne peut pas être modifié pendant la comparaison des dossiers."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Tri"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Méthode de tri :"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteTreeView.cpp:101
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
-msgstr "La source et le chemin pour l'opération de glisser-déposer sont identiques"
+msgstr ""
+"La source et le chemin pour l'opération de glisser-déposer sont identiques"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 msgid "Source and target file may not be the same"
 msgstr "La source et la cible du fichier ne peuvent être identiques"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
-msgstr "La source et la cible pour l'opération de glisser-déposer sont identiques"
+msgstr ""
+"La source et la cible pour l'opération de glisser-déposer sont identiques"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Fichier source :"
 
-#: resources.h:489
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:54
-#: ../../source/FileZilla3/locales/../src/interface/speedlimits_dialog.cpp:62
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limitation des taux de transfert"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Limitation des taux de transfert"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:597
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr "La limitation des taux de transfert est désactivée, cliquez pour modifier."
+msgstr ""
+"La limitation des taux de transfert est désactivée, cliquez pour modifier."
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:601
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr "La limitation des taux de transfert est activée, cliquez pour modifier."
+msgstr ""
+"La limitation des taux de transfert est activée, cliquez pour modifier."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versions stables et bêtas"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Versions stables uniquement"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Démarrer le transfert &immédiatement"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:7
+#: ../../locales/../src/interface/cmdline.cpp:7
 msgid "Start with opened Site Manager"
 msgstr "Démarrer avec l'ouverture du Gestionnaire de Sites"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1633
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Démarrage du téléchargement de %s"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1637
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:2229
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Démarrage de l'envoi de %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+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:185
 msgid "State or province:"
 msgstr "État ou province :"
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1233
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Statut"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:212
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:538
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:299
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/engine/logging.cpp:212
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Statut :"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "&Arrêter et tout retirer"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Rue :"
 
-#: resources.h:11
-#: resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Objet du certificat"
 
-#: ../../source/FileZilla3/locales/../src/interface/queueview_successful.cpp:12
+#: ../../locales/../src/interface/queueview_successful.cpp:12
 msgid "Successful transfers"
 msgstr "Transferts réussis"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Résumé des résultats du test :"
 
-#: resources.h:459
-msgid "Symlinks to files are not affected by this choice, such symlinks are always deleted."
-msgstr "Les liens symboliques vers les fichiers ne sont pas affectés par ce choix, de tels liens symboliques sont toujours supprimés."
+#: resources.h:469
+msgid ""
+"Symlinks to files are not affected by this choice, such symlinks are always "
+"deleted."
+msgstr ""
+"Les liens symboliques vers les fichiers ne sont pas affectés par ce choix, "
+"de tels liens symboliques sont toujours supprimés."
 
-#: resources.h:1001
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:249
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:278
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:285
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:297
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:373
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:383
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:392
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1016
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1025
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1032
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1043
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1050
+#: resources.h:1027 ../../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
 msgid "Synchronized browsing"
 msgstr "Navigation synchronisée"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "La navigation synchronisée a été désactivée."
 
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:87
-#: ../../source/FileZilla3/locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Erreur de syntaxe"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:68
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:74
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:80
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:89
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:95
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Erreur de syntaxe dans la ligne de commande"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Système"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "Barre d'&outils"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:332
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Connexion TLS/SSL établie, envoi d'une requête HTTP"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Connexion TLS/SSL établie, attente du message d'accueil..."
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Connexion TLS/SSL établie."
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:445
+#: ../../locales/../src/engine/proxy.cpp:445
 msgid "TTL expired"
 msgstr "TTL expiré"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Le fichier cible existe déjà"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Fichier cible :"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Le fichier cible existe déjà !"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Le fichier cible existe déjà, souhaitez-vous vraiment continuer ?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Résultats du test"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Test de la capacité du serveur à reprendre les transferts"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
-"Do you want to continue? Any changes made in the Site Manager won't be saved then."
+"Do you want to continue? Any changes made in the Site Manager won't be saved "
+"then."
 msgstr ""
 "Le Gestionnaire de Sites est ouvert par une autre instance de FileZilla 3.\n"
-"Voulez-vous continuer ? Toutes modifications effectuées dans le Gestionnaire de Sites seront perdues."
+"Voulez-vous continuer ? Toutes modifications effectuées dans le Gestionnaire "
+"de Sites seront perdues."
 
-#: ../../source/FileZilla3/locales/../src/interface/clearprivatedata.cpp:103
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
@@ -6258,57 +6901,62 @@
 "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."
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Le document XML n'est pas correctement mis en forme : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:618
+#: ../../locales/../src/interface/netconfwizard.cpp:618
 #, c-format
 msgid "The address you entered was: %s"
 msgstr "L'adresse que vous avez saisie est : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Le favori ne peut pas être ajouté."
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Les favoris ne peuvent pas être supprimés."
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:490
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
 msgstr "La connexion est chiffrée. Cliquez sur l'icône pour plus de détails."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
 msgstr "La séquence d'identification personnalisée ne peut pas être vide."
 
-#: resources.h:424
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "La connexion des données ne peut pas être établie : %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "L'éditeur par défaut pour les fichiers texte est introuvable."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "L'éditeur par défaut pour les fichiers texte est '%s'."
 
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:147
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:215
-#: ../../source/FileZilla3/locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
-msgstr "Le nom du filtre que vous avez saisi existe déjà. Saisissez un autre nom."
+msgstr ""
+"Le nom du filtre que vous avez saisi existe déjà. Saisissez un autre nom."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_filetype.cpp:160
+#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
 msgstr "L'extension '%s' est déjà présente dans la liste"
 
-#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:246
-#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:253
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:246
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:253
 #, c-format
 msgid ""
 "The file %s already exists.\n"
@@ -6317,9 +6965,9 @@
 "Le fichier %s existe déjà.\n"
 "Saisissez un nouveau nom :"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2653
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2035
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2166
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6330,19 +6978,20 @@
 "Le programme associé (%s) n'a pas été trouvé.\n"
 "Vérifiez vos associations par type de fichier."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "Le fichier '%s' n'a pas pu être chargé ou ne contient pas de clé privée."
+msgstr ""
+"Le fichier '%s' n'a pas pu être chargé ou ne contient pas de clé privée."
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Le fichier '%s' ne peut pas être chargé."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2647
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2029
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2161
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6351,8 +7000,8 @@
 "Le fichier '%s' n'a pas pu être ouvert :\n"
 "Aucun programme n'est associé à ce type de fichier sur votre système"
 
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2074
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6361,18 +7010,20 @@
 "Le fichier '%s' n'a pas pu être ouvert :\n"
 "Échec de la commande associée"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
 #, 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"
+"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 ""
 "Le fichier '%s' est dans un format non supporté par FileZilla.\n"
-"Le fichier est aussi protégé par un mot de passe. Les fichiers protégés par mot de passe ne sont pas encore supportés par FileZilla.\n"
+"Le fichier est aussi protégé par un mot de passe. Les fichiers protégés par "
+"mot de passe ne sont pas encore supportés par FileZilla.\n"
 "Voulez-vous le convertir dans un format supporté et non protégé ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
 #, c-format
 msgid ""
 "The file '%s' is not in a format supported by FileZilla.\n"
@@ -6381,119 +7032,151 @@
 "Le fichier '%s' est dans un format non supporté par FileZilla.\n"
 "Voulez-vous le convertir dans un format supporté ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
+#: ../../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"
+"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 ""
-"Le fichier '%s' est protégé par un mot de passe. Les fichiers protégés par mot de passe ne sont pas encore supportés par FileZilla.\n"
+"Le fichier '%s' est protégé par un mot de passe. Les fichiers protégés par "
+"mot de passe ne sont pas encore supportés par FileZilla.\n"
 "Voulez-vous le convertir en fichier non protégé ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Le fichier sélectionné comme éditeur par défaut n'existe pas."
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:95
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
-"The file you have selected contains site manager data from a previous version of FileZilla.\n"
-"Due to differences in the storage format, only host, port, username and password will be imported.\n"
+"The file you have selected contains site manager data from a previous "
+"version of FileZilla.\n"
+"Due to differences in the storage format, only host, port, username and "
+"password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"Le fichier que vous avez sélectionné contient des données du Gestionnaire de Sites d'une version précédente de FileZilla.\n"
-"En raison des différences dans le format des données, seuls les paramètres hôte, port, identifiant et mot de passe peuvent être importés.\n"
+"Le fichier que vous avez sélectionné contient des données du Gestionnaire de "
+"Sites d'une version précédente de FileZilla.\n"
+"En raison des différences dans le format des données, seuls les paramètres "
+"hôte, port, identifiant et mot de passe peuvent être importés.\n"
 "Continuer l'importation ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:761
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
 msgstr "La colonne Nom de fichier ne peut ni être cachée ni déplacée."
 
-#: ../../source/FileZilla3/locales/../src/interface/listctrlex.cpp:811
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
 msgstr "La colonne Nom de fichier ne peut pas être cachée."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:68
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
 msgstr "Le caractère suivant sera remplacé : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:65
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
 msgstr "Les caractères suivants seront remplacés : %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Les fichiers suivants sont en cours d'édition :"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "La solution FTP libre et Open Source"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:298
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
 msgstr "Les favoris globaux ne peuvent pas être sauvegardés."
 
-#: resources.h:973
-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 "Plus le niveau de débogage est élevé, plus d'informations seront affichées dans le fichier journal. L'affichage d'informations de débogage a un impact négatif sur les performances."
+#: resources.h:998
+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 ""
+"Plus le niveau de débogage est élevé, plus d'informations seront affichées "
+"dans le fichier journal. L'affichage d'informations de débogage a un impact "
+"négatif sur les performances."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_logging.cpp:78
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
 msgstr "La limite doit être comprise entre 1 et 2000 Mio"
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:275
+#: ../../locales/../src/interface/state.cpp:275
 #, c-format
 msgid ""
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 "Le dossier local '%s' n'est pas synchronisé avec la racine (%s).\n"
-"Désactiver la navigation synchronisée et continuer le changement de dossier local ?"
+"Désactiver la navigation synchronisée et continuer le changement de dossier "
+"local ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:76
-msgid "The lowest available port has to be less or equal than the highest available port."
-msgstr "Le port le plus bas disponible doit être inférieur ou égal au port le plus élevé."
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
+msgid ""
+"The lowest available port has to be less or equal than the highest available "
+"port."
+msgstr ""
+"Le port le plus bas disponible doit être inférieur ou égal au port le plus "
+"élevé."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:607
-msgid "The most recent version has been downloaded. Click on Finish to close FileZilla and to start the installation."
-msgstr "La dernière version a été téléchargée. Cliquez sur Terminer pour quitter FileZilla et démarrer l'installation."
+#: ../../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 ""
+"La dernière version a été téléchargée. Cliquez sur Terminer pour quitter "
+"FileZilla et démarrer l'installation."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:609
-msgid "The most recent version has been downloaded. Please install it the same way you installed this version."
-msgstr "La dernière version a été téléchargée. Veuillez l'installer de la même manière que la version actuelle."
+#: ../../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 ""
+"La dernière version a été téléchargée. Veuillez l'installer de la même "
+"manière que la version actuelle."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "La file d'attente ne peut pas être sauvegardée."
 
-#: ../../source/FileZilla3/locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, 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 ""
 "Le dossier distant '%s' n'est pas synchronisé avec la racine (%s).\n"
-"Désactiver la navigation synchronisée et continuer le changement de dossier distant ?"
+"Désactiver la navigation synchronisée et continuer le changement de dossier "
+"distant ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:84
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr "Les catégories sélectionnées ont été importées."
 
-#: resources.h:298
-msgid "The selected file contains importable data for the following categories:"
-msgstr "Le fichier sélectionné contient des données importables pour les catégories suivantes :"
+#: resources.h:308
+msgid ""
+"The selected file contains importable data for the following categories:"
+msgstr ""
+"Le fichier sélectionné contient des données importables pour les catégories "
+"suivantes :"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Le fichier sélectionné est déjà en cours d'édition :"
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2707
-msgid "The selected file is still opened in some other program, please close it."
-msgstr "Le fichier sélectionné est encore ouvert dans un autre programme, fermez ce dernier."
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
+msgid ""
+"The selected file is still opened in some other program, please close it."
+msgstr ""
+"Le fichier sélectionné est encore ouvert dans un autre programme, fermez ce "
+"dernier."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2659
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2041
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6503,43 +7186,65 @@
 "Ceci peut être dangereux et corrompre votre système.\n"
 "Souhaitez-vous vraiment continuer ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager.cpp:602
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
 msgstr "Le serveur ne peut pas être ajouté."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:574
+#: ../../locales/../src/interface/netconfwizard.cpp:574
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Le serveur a envoyé une réponse inattendue ou non reconnue."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
-msgstr "Le serveur utilise l'encodage de caractères suivant pour les noms de fichiers :"
+msgstr ""
+"Le serveur utilise l'encodage de caractères suivant pour les noms de "
+"fichiers :"
 
 #: resources.h:2
-msgid "The server's certificate is unknown. Please carefully examine the certificate to make sure the server can be trusted."
-msgstr "Le certificat du serveur est inconnu. Examinez le certificat avec attention avant de faire confiance au serveur."
+msgid ""
+"The server's certificate is unknown. Please carefully examine the "
+"certificate to make sure the server can be trusted."
+msgstr ""
+"Le certificat du serveur est inconnu. Examinez le certificat avec attention "
+"avant de faire confiance au serveur."
 
-#: resources.h:187
-msgid "The server's host key does not match the key that has been cached. This means that either the administrator has changed the host key, or you are actually trying to connect to another computer pretending to be the server."
-msgstr "La clé du serveur ne correspond pas à la clé mise en cache. Soit l'administrateur a changé la clé du serveur, soit vous essayez de vous connecter à un ordinateur prétendant être le serveur."
+#: resources.h:197
+msgid ""
+"The server's host key does not match the key that has been cached. This "
+"means that either the administrator has changed the host key, or you are "
+"actually trying to connect to another computer pretending to be the server."
+msgstr ""
+"La clé du serveur ne correspond pas à la clé mise en cache. Soit "
+"l'administrateur a changé la clé du serveur, soit vous essayez de vous "
+"connecter à un ordinateur prétendant être le serveur."
 
-#: resources.h:175
-msgid "The server's host key is unknown. You have no guarantee that the server is the computer you think it is."
-msgstr "La clé du serveur hôte est inconnue. Vous n'avez aucune garantie que ce serveur est bien le bon."
+#: resources.h:185
+msgid ""
+"The server's host key is unknown. You have no guarantee that the server is "
+"the computer you think it is."
+msgstr ""
+"La clé du serveur hôte est inconnue. Vous n'avez aucune garantie que ce "
+"serveur est bien le bon."
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:81
-msgid "The settings have been imported. You have to restart FileZilla for all settings to have effect."
-msgstr "Les paramètres ont été importé. Vous devez redémarrer FileZilla pour que ceux-ci prennent effet."
+#: ../../locales/../src/interface/import.cpp:81
+msgid ""
+"The settings have been imported. You have to restart FileZilla for all "
+"settings to have effect."
+msgstr ""
+"Les paramètres ont été importé. Vous devez redémarrer FileZilla pour que "
+"ceux-ci prennent effet."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 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."
+msgstr ""
+"L'ordinateur va bientôt redémarrer à moins que vous ne cliquiez sur Annuler."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 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."
+msgstr ""
+"Le système va bientôt s'arrêter à moins que vous ne cliquiez sur Annuler."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6547,75 +7252,97 @@
 "Le fichier cible existe déjà.\n"
 "Choisissez une action."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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 ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:127
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
 msgstr "Thèmes"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Ce jeu de filtres ne peut pas être supprimé."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Ce jeu de filtres ne peut pas être renommé."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:575
-msgid "This means that some router and/or firewall is still interfering with FileZilla."
-msgstr "Ceci signifie qu'un routeur et/ou pare-feu interfère toujours avec FileZilla."
+#: ../../locales/../src/interface/netconfwizard.cpp:575
+msgid ""
+"This means that some router and/or firewall is still interfering with "
+"FileZilla."
+msgstr ""
+"Ceci signifie qu'un routeur et/ou pare-feu interfère toujours avec FileZilla."
 
-#: resources.h:693
-msgid "This only works if you are not behind a router, else your system would just return your internal address."
-msgstr "Ceci fonctionne à condition de ne pas être situé derrière un routeur, autrement votre système retournera votre adresse interne."
+#: resources.h:714
+msgid ""
+"This only works if you are not behind a router, else your system would just "
+"return your internal address."
+msgstr ""
+"Ceci fonctionne à condition de ne pas être situé derrière un routeur, "
+"autrement votre système retournera votre adresse interne."
 
-#: resources.h:671
-msgid "This wizard will help you to properly configure any routers and firewalls you have and tests your configuration."
-msgstr "Cet assistant va vous aider à configurer correctement vos routeurs et pare-feux et permettre ensuite de tester votre configuration."
+#: resources.h:692
+msgid ""
+"This wizard will help you to properly configure any routers and firewalls "
+"you have and tests your configuration."
+msgstr ""
+"Cet assistant va vous aider à configurer correctement vos routeurs et pare-"
+"feux et permettre ensuite de tester votre configuration."
 
-#: ../../source/FileZilla3/locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Temps"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Format des heures"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Délai d'attente en sec&ondes :"
 
-#: resources.h:735
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1066
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Délai d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1079
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1684
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
-msgid "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d seconds."
-msgstr "Décalage du fuseau horaire : Serveur : %d secondes, Local : %d secondes. Différence : %d secondes."
+msgid ""
+"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
+"seconds."
+msgstr ""
+"Décalage du fuseau horaire : Serveur : %d secondes, Local : %d secondes. "
+"Différence : %d secondes."
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titre :"
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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."
+msgstr ""
+"Pour comparer des dossiers, les listes de fichiers doivent être alignées des "
+"deux côtés."
 
-#: ../../source/FileZilla3/locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
-msgstr "Pour ce faire, les arborescences doivent être toutes deux visibles ou masquées."
+msgstr ""
+"Pour ce faire, les arborescences doivent être toutes deux visibles ou "
+"masquées."
 
-#: resources.h:786
-msgid "To support public key authentication, FileZilla needs to know the private keys to use."
-msgstr "Pour supporter l'authentification par clé publique, FileZilla doit connaître les clés privées à utiliser."
+#: resources.h:807
+msgid ""
+"To support public key authentication, FileZilla needs to know the private "
+"keys to use."
+msgstr ""
+"Pour supporter l'authentification par clé publique, FileZilla doit connaître "
+"les clés privées à utiliser."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6624,191 +7351,188 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
-"Activer ou désactiver la comparaison de dossier. Appuyez sur le bouton droit de la souris pour changer le mode de comparaison.\n"
+"Activer ou désactiver la comparaison de dossier. Appuyez sur le bouton droit "
+"de la souris pour changer le mode de comparaison.\n"
 "\n"
 "Couleurs :\n"
 "Jaune : Le fichier existe uniquement d'un seul côté\n"
 "Vert : Le fichier est plus récent que le fichier non marqué de l'autre côté\n"
 "Rouge : Les tailles des fichiers sont différentes"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
-"If enabled, navigating the local directory hierarchy will also change the directory on the server accordingly and vice versa."
+"If enabled, navigating the local directory hierarchy will also change the "
+"directory on the server accordingly and vice versa."
 msgstr ""
 "Activer ou désactiver la navigation synchronisée.\n"
-"Si activé, naviguer dans l'arborescence locale modifiera en conséquence le répertoire sur le serveur et inversément."
+"Si activé, naviguer dans l'arborescence locale modifiera en conséquence le "
+"répertoire sur le serveur et inversément."
 
-#: resources.h:988
-#: resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Démarrer ou arrêter le traitement de la file d'attente"
 
-#: resources.h:980
-#: resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Afficher ou masquer l'arborescence des dossiers locaux"
 
-#: resources.h:978
-#: resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Afficher ou masquer la journalisation"
 
-#: resources.h:982
-#: resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Afficher ou masquer l'arborescence des dossiers distants"
 
-#: resources.h:984
-#: resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Afficher ou masquer la file d'attente"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:605
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:605
 msgid "Too long header line"
 msgstr "Ligne d'en-tête trop longue"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:666
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:666
 msgid "Too many redirects"
 msgstr "Trop de redirections"
 
-#: ../../source/FileZilla3/locales/../src/engine/logging.cpp:216
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:293
-#: ../../source/FileZilla3/locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/engine/logging.cpp:216
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Suivi :"
 
-#: resources.h:921
-#: resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transférer"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Direction &du transfert"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Type de &transfert"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Mode de transfert"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "File d'attente"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Paramètres de transfert"
 
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:498
-#: ../../source/FileZilla3/locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Connexion interrompue : %s"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:621
+#: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
 msgstr "Les données transferrées ont été corrompues."
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1491
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Transfert en cours"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:123
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:123
 msgid "Transfers"
 msgstr "Transferts"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3136
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transferts réussis"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Traiter les fichiers sans &extension comme des fichiers ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Traiter les types de &fichiers suivants comme des fichiers ASCII :"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Approbation du changement de la clé de l'hôte :"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Approbation de la nouvelle clé de l'hôte :"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Approuver la nouvelle clé et l'associer à la connexion ?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Approuver ce certificat et l'associer à la connexion ?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Approuver ce serveur et l'associer à la connexion ?"
 
-#: resources.h:396
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Type"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Type de Proxy FTP :"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Type de Proxy générique :"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "E&nvoyer"
 
-#: resources.h:484
-#: resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limite à l'&envoi :"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Utili&ser l'association par type de fichier si elle est disponible"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Utili&ser les paramètres par défaut du système"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "UTILISATEUR@&HÔTE"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:454
+#: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
 msgstr "Code d'erreur non affecté %d"
 
-#: ../../source/FileZilla3/locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unité :"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1263
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Inconnu"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 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."
+msgstr ""
+"Type de Proxy FTP inconnu, impossible de générer une séquence "
+"d'identification."
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:368
+#: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
 msgstr "Version du protocole SOCKS inconnue : %d"
@@ -6817,251 +7541,283 @@
 msgid "Unknown certificate"
 msgstr "Certificat inconnu"
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:412
-msgid "Unknown error opening the file. Make sure the file can be accessed and is a well-formed XML document."
-msgstr "Erreur inconnue à l'ouverture du fichier. Assurez-vous que le fichier est accessible et qu'il s'agit bien d'un document XML correctement mis en forme."
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
+msgid ""
+"Unknown error opening the file. Make sure the file can be accessed and is a "
+"well-formed XML document."
+msgstr ""
+"Erreur inconnue à l'ouverture du fichier. Assurez-vous que le fichier est "
+"accessible et qu'il s'agit bien d'un document XML correctement mis en forme."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Clé de l'hôte inconnue"
 
-#: ../../source/FileZilla3/locales/../src/engine/proxy.cpp:378
+#: ../../locales/../src/engine/proxy.cpp:378
 #, c-format
-msgid "Unknown protocol version of SOCKS Username/Password Authentication subnegotiation: %d"
-msgstr "Version du protocole SOCKS de négociation d'authentification Utilisateur/Mot de passe inconnue : %d"
+msgid ""
+"Unknown protocol version of SOCKS Username/Password Authentication "
+"subnegotiation: %d"
+msgstr ""
+"Version du protocole SOCKS de négociation d'authentification Utilisateur/Mot "
+"de passe inconnue : %d"
 
-#: ../../source/FileZilla3/locales/../src/interface/xmlfunctions.cpp:457
-msgid "Unknown root element, the file does not appear to be generated by FileZilla."
-msgstr "Élément inconnu à la racine, il semblerait que ce fichier n'ait pas été généré par FileZilla."
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
+msgid ""
+"Unknown root element, the file does not appear to be generated by FileZilla."
+msgstr ""
+"Élément inconnu à la racine, il semblerait que ce fichier n'ait pas été "
+"généré par FileZilla."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:596
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:607
-msgid "Unless these problems get fixed, active mode FTP will not work and passive mode has to be used."
-msgstr "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:596
+#: ../../locales/../src/interface/netconfwizard.cpp:607
+msgid ""
+"Unless these problems get fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"Tant que ces problèmes ne seront pas résolus, le mode FTP actif ne "
+"fonctionnera pas et le mode passif devra être utilisé."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:583
-msgid "Unless this problem gets fixed, active mode FTP will not work and passive mode has to be used."
-msgstr "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/interface/netconfwizard.cpp:583
+msgid ""
+"Unless this problem gets fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+"Tant que ce problème ne sera pas résolu, le mode FTP actif ne fonctionnera "
+"pas et le mode passif devra être utilisé."
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Type de certificat non supporté"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:650
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:650
 msgid "Unsupported redirect"
 msgstr "Redirection non supportée"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Envoyer et terminer &l'édition"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Mise à jour du logiciel"
-
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:251
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:264
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_updatecheck.cpp:61
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Assistant de mise à jour"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Mises à jour"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Envoyer"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Échec de l'envoi"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:609
+#: ../../locales/../src/interface/statusbar.cpp:609
 #, c-format
 msgid "Upload limit: %s/s"
 msgstr "Limite à l'envoi : %s/s"
 
-#: ../../source/FileZilla3/locales/../src/interface/statusbar.cpp:611
+#: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
 msgstr "Limite à l'envoi : aucune"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Envoyer le dossier sélectionné"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Envoyer les fichiers et les dossiers sélectionnés"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Envoyer à nouveau ce fichier vers le serveur ?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Envoyer ce fichier vers le serveur ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1248
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1282
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Envoi en cours"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1251
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Envoi et attente de retrait"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1285
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Envoi et fin de l'édition"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Utiliser un jeu de &caractères personnalisé"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Utiliser l'éditeur pers&onnalisé :"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Utiliser l'éditeur par &défaut pour les fichiers texte"
 
-#: resources.h:405
-#: resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Utiliser la navigation &synchronisée"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
-msgstr "Utiliser l'UTF-8 si le serveur le supporte, sinon utiliser le jeu de caractères local."
+msgstr ""
+"Utiliser l'UTF-8 si le serveur le supporte, sinon utiliser le jeu de "
+"caractères local."
 
-#: resources.h:258
-#: resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Utiliser l'action par défaut"
 
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Connexion FTP simple (non sécurisée)"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Utiliser le serveur auquel vous êtes actuellement connecté"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Utiliser le serveur défini dans le Gestionnaire de Sites"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Utiliser les paramètres par &défaut du système"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Utiliser l'adresse IP suivante :"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Utiliser la plage de ports suivante :"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Utiliser à la place l'adresse IP externe des serveurs"
 
-#: resources.h:695
-#: resources.h:758
-msgid "Use this if you're behind a router and have a static external IP address."
-msgstr "Utilisez cette option si vous êtes derrière un routeur avec une adresse IP externe statique."
+#: resources.h:716 resources.h:779
+msgid ""
+"Use this if you're behind a router and have a static external IP address."
+msgstr ""
+"Utilisez cette option si vous êtes derrière un routeur avec une adresse IP "
+"externe statique."
 
-#: resources.h:698
-msgid "Use this option if you have a dynamic IP address. FileZilla will contact the above server once each session as soon as you use active mode for the first time. Only the version of FileZilla you're using is submitted to the server."
-msgstr "Utilisez cette option si vous disposez d'une adresse IP dynamique. FileZilla contactera le serveur ci-dessus à chaque session dès la première utilisation du mode actif. Seule la version de FileZilla utilisée sera transmise au serveur."
+#: resources.h:719
+msgid ""
+"Use this option if you have a dynamic IP address. FileZilla will contact the "
+"above server once each session as soon as you use active mode for the first "
+"time. Only the version of FileZilla you're using is submitted to the server."
+msgstr ""
+"Utilisez cette option si vous disposez d'une adresse IP dynamique. FileZilla "
+"contactera le serveur ci-dessus à chaque session dès la première utilisation "
+"du mode actif. Seule la version de FileZilla utilisée sera transmise au "
+"serveur."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Identifiant :"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:509
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "L'identifiant ne peut pas être une série d'espaces"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Utilisation du Proxy %s"
 
-#: resources.h:112
-msgid "Using the wrong charset can result in filenames not displaying properly."
-msgstr "Utiliser un encodage de caractères non approprié peut entraîner un affichage incorrect des noms de fichiers."
+#: resources.h:121
+msgid ""
+"Using the wrong charset can result in filenames not displaying properly."
+msgstr ""
+"Utiliser un encodage de caractères non approprié peut entraîner un affichage "
+"incorrect des noms de fichiers."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
-msgstr "Utilisez cet assistant pour rechercher d'éventuelles mises à jour de FileZilla."
+msgstr ""
+"Utilisez cet assistant pour rechercher d'éventuelles mises à jour de "
+"FileZilla."
 
-#: resources.h:5
-#: resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Valable du :"
 
-#: resources.h:6
-#: resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Valable jusqu'à :"
 
-#: ../../source/FileZilla3/locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Détailler les historiques d'événements depuis wxWidgets"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Vérification du certificat..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Version :"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Très haute"
 
-#: ../../source/FileZilla3/locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
-msgstr "L'option d'affichage des fichiers cachés est activée, mais n'est pas supportée par le serveur"
+msgstr ""
+"L'option d'affichage des fichiers cachés est activée, mais n'est pas "
+"supportée par le serveur"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Afficher / Éditer"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Colonnes visibles"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "Éc&rire"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "En attente"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Attente d'une connexion pour la navigation"
 
-#: ../../source/FileZilla3/locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Attente du mot de passe"
 
-#: ../../source/FileZilla3/locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Attente d'annulation du transfert"
 
-#: ../../source/FileZilla3/locales/../src/engine/engineprivate.cpp:203
+#: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
 msgstr "Attente avant nouvel essai..."
 
-#: ../../source/FileZilla3/locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7073,7 +7829,8 @@
 "- 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"
+"Unless you either disable Windows Firewall or the Application Layer Gateway "
+"service,\n"
 "FileZilla will timeout on big transfers."
 msgstr ""
 "Attention !\n"
@@ -7086,14 +7843,16 @@
 "- le service Application Layer Gateway activé\n"
 "Visitez http://support.microsoft.com/kb/931130 pour plus d'informations.\n"
 "\n"
-"À moins que vous ne désactiviez le pare-feu Windows ou le service Application Layer Gateway,\n"
+"À moins que vous ne désactiviez le pare-feu Windows ou le service "
+"Application Layer Gateway,\n"
 "FileZilla échouera sur les gros transferts."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr "Attention, données de connexion ignorées en provenance d'une IP incorrecte."
+msgstr ""
+"Attention, données de connexion ignorées en provenance d'une IP incorrecte."
 
-#: ../../source/FileZilla3/locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7101,312 +7860,390 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"Attention, utilisez les versions journalières (nightly builds) à vos propres risques.\n"
+"Attention, utilisez les versions journalières (nightly builds) à vos propres "
+"risques.\n"
 "Aucun support n'est disponible pour ces versions.\n"
-"Elles peuvent causer des problèmes voire même provoquer des dommages à votre système.\n"
+"Elles peuvent causer des problèmes voire même provoquer des dommages à votre "
+"système.\n"
 "\n"
 "Souhaitez-vous vraiment rechercher d'éventuelles versions journalières ?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Attention : Faille de sécurité potentielle !"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Bienvenue sur FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Quoi de neuf ?"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Quoi de neuf :"
 
-#: resources.h:821
-msgid "When enabled, characters that are not supported by the local operating system in filenames are replaced if downloading such a file."
-msgstr "Lorsque cette option est activée, les caractères des noms de fichiers qui ne sont pas supportés par le système d'exploitation local seront remplacés si un tel fichier est téléchargé."
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Autoriser FileZilla à se souvenir des mots de passe vous permet de vous "
+"reconnecter sans avoir à les resaisir la prochaine fois que vous "
+"réutiliserez FileZilla."
+
+#: resources.h:842
+msgid ""
+"When enabled, characters that are not supported by the local operating "
+"system in filenames are replaced if downloading such a file."
+msgstr ""
+"Lorsque cette option est activée, les caractères des noms de fichiers qui ne "
+"sont pas supportés par le système d'exploitation local seront remplacés si "
+"un tel fichier est téléchargé."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Écran large"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Autorisez-vous FileZilla à se souvenir de vos mots de passe?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Écr&ire"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:433
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:440
+#: ../../locales/../src/interface/netconfwizard.cpp:433
+#: ../../locales/../src/interface/netconfwizard.cpp:440
 msgid "Wrong external IP address"
 msgstr "Adresse IP externe incorrecte"
 
-#: ../../source/FileZilla3/locales/../src/engine/httpcontrolsocket.cpp:827
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 msgid "Wrong line endings"
 msgstr "Fins de ligne incorrectes"
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Oui"
 
-#: resources.h:252
-msgid "You are already using the most recent version of FileZilla. Please check again in future."
-msgstr "Vous utilisez déjà la dernière version de FileZilla. Recherchez des mises à jour ultérieurement."
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Il semble que vous utilisiez seulement une adresse IPv6 pour vous connecter. "
+"Cet assistant ne supporte pas ce type de configuration."
 
-#: resources.h:473
+#: resources.h:262
+msgid ""
+"You are already using the most recent version of FileZilla. Please check "
+"again in future."
+msgstr ""
+"Vous utilisez déjà la dernière version de FileZilla. Recherchez des mises à "
+"jour ultérieurement."
+
+#: resources.h:483
 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 (?)."
+msgstr ""
+"Vous pourrez toujours ouvrir cette boîte de dialogue via le menu Aide (?)."
 
-#: ../../source/FileZilla3/locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
-msgstr "Vous pouvez laisser le champ du port vide pour utiliser le port par défaut."
+msgstr ""
+"Vous pouvez laisser le champ du port vide pour utiliser le port par défaut."
 
-#: resources.h:147
-msgid "You can use an x at any position to keep the permission the original files have."
-msgstr "Vous pouvez appliquer un x sous n'importe quelle position pour conserver les permissions initiales des fichiers."
+#: resources.h:156
+msgid ""
+"You can use an x at any position to keep the permission the original files "
+"have."
+msgstr ""
+"Vous pouvez appliquer un x sous n'importe quelle position pour conserver les "
+"permissions initiales des fichiers."
 
-#: ../../source/FileZilla3/locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
-msgstr "Vous ne pouvez pas importer les paramètres de FileZilla à partir de son propre dossier."
+msgstr ""
+"Vous ne pouvez pas importer les paramètres de FileZilla à partir de son "
+"propre dossier."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_transfer.cpp:137
-msgid "You cannot replace an invalid character with another invalid character. Please enter a character that is allowed in filenames."
-msgstr "Vous ne pouvez pas remplacer un caractère invalide par un autre caractère invalide. Saisissez un caractère qui est autorisé dans les noms de fichiers."
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
+msgid ""
+"You cannot replace an invalid character with another invalid character. "
+"Please enter a character that is allowed in filenames."
+msgstr ""
+"Vous ne pouvez pas remplacer un caractère invalide par un autre caractère "
+"invalide. Saisissez un caractère qui est autorisé dans les noms de fichiers."
 
-#: ../../source/FileZilla3/locales/../src/interface/asyncrequestqueue.cpp:268
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
-msgstr "Vous n'avez pas saisi de nouveau nom pour le fichier. Remplacer le fichier ?"
+msgstr ""
+"Vous n'avez pas saisi de nouveau nom pour le fichier. Remplacer le fichier ?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Vous avez sélectionné au moins un lien symbolique."
 
-#: ../../source/FileZilla3/locales/../src/interface/RemoteListView.cpp:2626
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2008
-msgid "You have selected more than 10 files for editing, do you really want to continue?"
-msgstr "Vous avez sélectionné plus de 10 fichiers pour l'édition, souhaitez-vous vraiment continuer ?"
-
-#: ../../source/FileZilla3/locales/../src/interface/LocalListView.cpp:2128
-msgid "You have selected more than 10 files or directories to open, do you really want to continue?"
-msgstr "Vous avez sélectionné plus de 10 fichiers ou dossiers à ouvrir, souhaitez-vous vraiment continuer ?"
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
+msgid ""
+"You have selected more than 10 files for editing, do you really want to "
+"continue?"
+msgstr ""
+"Vous avez sélectionné plus de 10 fichiers pour l'édition, souhaitez-vous "
+"vraiment continuer ?"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2136
+msgid ""
+"You have selected more than 10 files or directories to open, do you really "
+"want to continue?"
+msgstr ""
+"Vous avez sélectionné plus de 10 fichiers ou dossiers à ouvrir, souhaitez-"
+"vous vraiment continuer ?"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:433
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Vous devez saisir un nom d'hôte."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Vous devez saisir un dossier local."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:149
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_active.cpp:89
+#: ../../locales/../src/interface/netconfwizard.cpp:149
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
 msgstr "Vous devez saisir une adresse IP valide."
 
-#: ../../source/FileZilla3/locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Vous devez saisir un dossier local accessible en écriture."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:520
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Vous devez saisir un nom de compte"
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:490
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Vous devez spécifier un identifiant"
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:622
-msgid "You likely have a router or firewall which erroneously modified the transferred data."
-msgstr "Vous disposez probablement d'un routeur ou pare-feu qui a modifié de façon incorrecte les données transférées."
+#: ../../locales/../src/interface/netconfwizard.cpp:622
+msgid ""
+"You likely have a router or firewall which erroneously modified the "
+"transferred data."
+msgstr ""
+"Vous disposez probablement d'un routeur ou pare-feu qui a modifié de façon "
+"incorrecte les données transférées."
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
 msgstr "Vous devez saisir un nom pour le favori."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_logging.cpp:67
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
 msgid "You need to enter a name for the log file."
 msgstr "Vous devez saisir un nom pour le fichier journal."
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Vous devez saisir une commande correcte et placée entre guillemets."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:70
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Vous devez saisir un hôte Proxy."
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Vous devez saisir un port Proxy compris dans une plage de 1 à 65535"
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:76
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
-msgstr "Vous devez saisir au moins un chemin d'accès, les favoris vides ne sont pas supportés."
+msgstr ""
+"Vous devez saisir au moins un chemin d'accès, les favoris vides ne sont pas "
+"supportés."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this bookmark."
+msgstr ""
+"Vous devez saisir un chemin d'accès local et distant afin de permettre la "
+"navigation synchronisée pour ce favori."
 
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:83
-#: ../../source/FileZilla3/locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1106
-msgid "You need to enter both a local and a remote path to enable synchronized browsing for this bookmark."
-msgstr "Vous devez saisir un chemin d'accès local et distant afin de permettre la navigation synchronisée pour ce favori."
-
-#: ../../source/FileZilla3/locales/../src/interface/sitemanager_dialog.cpp:1062
-msgid "You need to enter both a local and a remote path to enable synchronized browsing for this site."
-msgstr "Vous devez saisir un chemin d'accès local et distant afin de permettre la navigation synchronisée pour ce site."
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this site."
+msgstr ""
+"Vous devez saisir un chemin d'accès local et distant afin de permettre la "
+"navigation synchronisée pour ce site."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:316
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr "Vous devez spécifier un fichier local."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:336
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
 msgstr "Vous devez spécifier un fichier distant."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:343
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
 msgstr "Vous devez spécifier un chemin distant."
 
-#: ../../source/FileZilla3/locales/../src/interface/manual_transfer.cpp:309
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
 msgstr "Vous devez spécifier un serveur."
 
-#: ../../source/FileZilla3/locales/../src/interface/netconfwizard.cpp:568
-msgid "You should have no problems connecting to other servers, file transfers should work properly."
-msgstr "Vous ne devriez pas avoir de problèmes pour vous connecter à d'autres serveurs ; les transferts de fichiers devraient fonctionner correctement."
+#: ../../locales/../src/interface/netconfwizard.cpp:568
+msgid ""
+"You should have no problems connecting to other servers, file transfers "
+"should work properly."
+msgstr ""
+"Vous ne devriez pas avoir de problèmes pour vous connecter à d'autres "
+"serveurs ; les transferts de fichiers devraient fonctionner correctement."
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "postérieure à"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "antérieure à"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "qui commence par"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "octets"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "qui contient"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "qui ne contient pas"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "qui n'est pas égale à"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "qui se termine par"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "qui est égale à"
 
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:497
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:515
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:540
-#: ../../source/FileZilla3/locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "fichier"
 
-#: ../../source/FileZilla3/locales/../src/interface/edithandler.cpp:88
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr "fz3temp-lockfile"
 
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
-#: ../../source/FileZilla3/locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid ""
 "fzputtygen could not be started.\n"
-"Please make sure this executable exists in the same directory as the main FileZilla executable."
+"Please make sure this executable exists in the same directory as the main "
+"FileZilla executable."
 msgstr ""
 "Impossible de démarrer fzputtygen.\n"
-"Assurez-vous que cet exécutable est présent dans le même dossier que celui contenant l'exécutable de FileZilla."
+"Assurez-vous que cet exécutable est présent dans le même dossier que celui "
+"contenant l'exécutable de FileZilla."
 
-#: ../../source/FileZilla3/locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp n'a pas pu être démarré"
 
-#: ../../source/FileZilla3/locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers n'a retourné aucun certificat"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "plus grande que"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "exécutable par le groupe"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "lecture par le groupe"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "écriture par le groupe"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "qui est égal à"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "défini"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "non défini"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "plus petite que"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "correspondant à l'expression rationnelle (regex)"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "exécutable par le propriétaire"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "lecture par le propriétaire"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "écriture par le propriétaire"
 
-#: ../../source/FileZilla3/locales/../src/interface/sftp_crypt_info_dlg.cpp:29
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
+#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "inconnu"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "exécutable par tous"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "lecture par tous"
 
-#: ../../source/FileZilla3/locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "écriture par tous"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets :"
-
-#~ msgid "Duplicate filter name"
-#~ msgstr "Nom du filtre en double"
diff -Nru filezilla-3.5.3/locales/gl_ES.po filezilla-3.7.3~precise/locales/gl_ES.po
--- filezilla-3.5.3/locales/gl_ES.po	2010-06-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/locales/gl_ES.po	2012-10-21 20:00:08.000000000 +0000
@@ -1,29 +1,37 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# Antón Méixome <meixome@certima.net>, 2010.
+# Antón Méixome <meixome@certima.net>, 2012.
+# Iván Méndez <ivan.mendez.lopez@gmail.com> 2009-2010.
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla 3 GL 1.0\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
-"PO-Revision-Date: 2007-12-10 18:43+0100\n"
-"Last-Translator: Iván Méndez López <imendez@udc.es>\n"
-"Language-Team: \n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
+"PO-Revision-Date: 2012-07-10 19:35+0200\n"
+"Last-Translator: Antón Méixome <meixome@certima.net>\n"
+"Language-Team: proxecto@trasno.net\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: gl\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Virtaal 0.7.0\n"
 "X-Poedit-Language: Gallegan\n"
 "X-Poedit-Bookmarks: -1,-1,-1,271,-1,-1,-1,-1,-1,-1\n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:225
 msgid "%H:%M:%S elapsed"
 msgstr "transcorreron %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
-msgstr "fican %H:%M:%S"
+msgstr "faltan %H:%M:%S"
 
-#: resources.h:772
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -35,47 +43,47 @@
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
 #: ../../locales/../src/interface/filelist_statusbar.cpp:86
-#, fuzzy, c-format
+#, c-format
 msgid "%d directory"
 msgid_plural "%d directories"
-msgstr[0] "Crear directorio"
-msgstr[1] "Crear directorio"
+msgstr[0] "cartafol %d"
+msgstr[1] "cartafoles %d"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "cartafol %d cos seus contidos"
+msgstr[1] "cartafoles %d cos seus contidos"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
-#, fuzzy, c-format
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
+#, c-format
 msgid "%d file"
 msgid_plural "%d files"
-msgstr[0] "ficheiro"
-msgstr[1] "ficheiro"
+msgstr[0] "ficheiro %d"
+msgstr[1] "ficheiros %d"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ficheiro. Tamaño total: %s"
+msgstr[1] "%d ficheiros. Tamaño total: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ficheiro. Tamaño total: cando menos %s"
+msgstr[1] "%d ficheiros. Tamaño total: cando menos %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d ficheiros engadidos á cola"
@@ -84,49 +92,49 @@
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d segundo"
+msgstr[1] "%d segundos"
 
-#: resources.h:769
+#: resources.h:785
 msgid "%h - Host"
-msgstr "%h - Hospedaxe"
+msgstr "%h - Servidor"
 
-#: resources.h:771
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Contrasinal"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:181
+#, c-format
 msgid "%s (%d B/s)"
-msgstr "%s bytes (%d O/s)"
+msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:179
+#, c-format
 msgid "%s (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
+msgstr "%s (%d.%d KB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#, c-format
 msgid "%s (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
+msgstr "%s (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#, c-format
 msgid "%s (? B/s)"
-msgstr "%s bytes (? B/s)"
+msgstr "%s (? B/s)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
-msgstr "%s - Caducou o certificado."
+msgstr "%s - Caducou o certificado!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
-msgstr "%s - Xa non é válido."
+msgstr "%s - Xa non é correcto!"
 
-#: resources.h:773
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Usuario do proxy"
@@ -134,18 +142,18 @@
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
-msgstr ""
+msgstr "%s e %s. Tamaño total: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
-msgstr ""
+msgstr "%s e %s. Tamaño total: cando menos: %s"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:31
-#, fuzzy, c-format
+#, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
-msgstr[0] "%s bytes"
+msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
 #: ../../locales/../src/interface/updatewizard.cpp:904
@@ -156,7 +164,7 @@
 #: ../../locales/../src/interface/updatewizard.cpp:888
 #, c-format
 msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d O/s)"
+msgstr "%s bytes (%d B/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:886
 #, c-format
@@ -168,7 +176,7 @@
 msgid "%s bytes (%d.%d MB/s)"
 msgstr "%s bytes (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -177,8 +185,13 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
+"Non se puido achar %s. Sen este compoñente do FileZilla, o SFTP non "
+"funcionará.\n"
+"\n"
+"Descargue o FileZilla outra vez. Se este problema continúa, envíenos un "
+"informe de erros."
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -188,499 +201,478 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"Non foi posible achar %s. Sen este compoñente do FilleZilla, o SFTP non pode "
-"funcionar.\n"
+"Non se puido achar %s. Sen este compoñente do FileZilla, o SFTP non "
+"funcionará.\n"
 "\n"
-"Como solucións posibles recomendámoslle:\n"
-"- Asegúrese de que %s está relacionado nun directorio incluído na súa "
-"variable de contorno.\n"
-"- Defina a variable do contorno FZ_FZSFTP co camiño completo a %s. "
+"Solucións posíbeis:\n"
+"- Asegúrese de que %s se inclúe na súa variábel de ruta de entorno.\n"
+"- Estabeleza a ruta completa como %s na variábel do entorno FZ_FZSFTP."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s con %d bits"
 
-#: resources.h:770
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
-msgstr "%u - Nome de usuario:"
+msgstr "%u - Nome de usuario"
 
-#: resources.h:774
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Contrasinal do proxy"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
-msgstr "&Acerca de..."
+msgstr "&Sobre de..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "&Conta:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "&Activo"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
-msgstr ""
+msgstr "&Engadir marcador..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "Engadir &ficheiros á cola"
 
-#: resources.h:782
-#, fuzzy
+#: resources.h:798
 msgid "&Add keyfile..."
-msgstr "&Edición dos filtros..."
+msgstr "&Engadir ficheiro de chave..."
 
-#: resources.h:624 resources.h:643
-#, fuzzy
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
-msgstr "Engadir &ficheiros á cola"
+msgstr "&Engadir ficheiros á cola"
 
-#: resources.h:94
-#, fuzzy
+#: resources.h:95
 msgid "&Adjust server timezone offset:"
-msgstr "Axustar a zona horaria do servidor:"
+msgstr "&Axustar a zona horaria do servidor:"
 
 #: resources.h:23
 msgid "&Always trust certificate in future sessions."
 msgstr "&Confiar sempre neste certificado para as próximas sesións."
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
-msgstr "&Confiar sempre neste servidor e engadir a chave á memoria intermedia"
+msgstr ""
+"&Confiar sempre neste servidor e engadir a chave á memoria intermedia (caché)"
 
-#: resources.h:932
+#: resources.h:950
 msgid "&Always use default editor"
-msgstr "Us&ar sempre o editor preestablecido"
+msgstr "Us&ar sempre o editor predeterminado"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
-msgstr ""
+msgstr "&Usar sempre a escolla para ficheiros non asociados"
 
 #: resources.h:65
 msgid "&Always use this action"
-msgstr "Usar esta &acción sempre"
+msgstr "Usar sempre esta &acción"
 
-#: resources.h:750
-#, fuzzy
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
-msgstr "Solicitar o número de IP externo ao sistema operativo"
+msgstr "&Preguntar o sistema operativo para enderezos de IP externos"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
 msgstr "Detectar &automaticamente"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "&Eliminar automaticamente as transferencias correctas"
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "&Binario"
 
-#: resources.h:892
-#, fuzzy
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
-msgstr "Prefixos &binarios cos símbolos SI (por exemplo, 1 KB = 1024 bytes)."
+msgstr "&Prefixos binarios cos símbolos SI. (por exemplo, 1 KB = 1024 bytes)"
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
-msgstr ""
+msgstr "&Marcadores"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "&Navegar..."
 
-#: resources.h:809
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
-msgstr "Tolerancia de ráfaga"
+msgstr "Tolerancia de ráfaga:"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Comprobar as versións beta do FileZilla"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "&Limpar os datos privados..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&Pechar o FileZilla"
 
-#: resources.h:664
+#: resources.h:680
 msgid "&Configure speed limits..."
-msgstr ""
+msgstr "&Configurar os límites de velocidade..."
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
-msgstr ""
+msgstr "&Configurar..."
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "&Conectar"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "&Copiar"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
-msgstr ""
+msgstr "&Copiar a conexión actual no Xestor de sitios..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
-msgstr "&Copiar ao portapapeis"
+msgstr "&Copiar no portapapeis"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr "&Erro"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
-msgstr "&Crear directorio"
+msgstr "&Crear cartafol"
 
-#: resources.h:659
-#, fuzzy
+#: resources.h:675
 msgid "&Create new tab"
-msgstr "&Crear directorio"
+msgstr "&Crear nova lapela"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Eliminar erros"
 
-#: resources.h:959
+#: resources.h:977
 msgid "&Debug information in message log:"
 msgstr "&Eliminar a información de erros neste rexistro de mensaxes:"
 
-#: resources.h:925
+#: resources.h:943
 msgid "&Default editor:"
 msgstr "E&ditor predeterminado:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
-msgstr "&Acción preestablecida se o ficheiro xa existir..."
+msgstr "&Acción por omisión se o ficheiro xa existe..."
 
-#: resources.h:732
-#, fuzzy
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
-msgstr "Intervalo de tempo entre tentativas de conexión erradas:"
+msgstr "&Intervalo de tempo entre tentativas de inicio fallidas:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "&Eliminar"
 
-#: resources.h:456
-#, fuzzy
+#: resources.h:458
 msgid "&Delete symlink"
-msgstr "&Eliminar"
+msgstr "&Eliminar ligazón simbólica"
 
-#: resources.h:510
-#, fuzzy
+#: resources.h:519
 msgid "&Directory comparison"
-msgstr "Dire&ctories"
+msgstr "&Comparación de cartafoles"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
-msgstr ""
+msgstr "&Rexeitar o ficheiro local, descargar e mais editar o ficheiro novo"
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "&Desconexión"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "&Desconectar do servidor"
 
-#: resources.h:868
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
+"&Presentar a velocidade de transferencia do momento no canto da velocidade "
+"media"
 
-#: resources.h:890
+#: resources.h:908
 msgid "&Display size in bytes"
-msgstr "&Amosar o tamaño en bytes"
+msgstr "&Presentar o tamaño en bytes"
+
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "N&non gardar os contrasinais"
 
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
-msgstr "&Non amosar este diálogo unha outra vez."
+msgstr "&Non amosar máis este diálogo."
 
-#: resources.h:755
-#, fuzzy
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
-msgstr "Non empregue números externos de IP en conexións &locais."
+msgstr "&Non empregar números externos de IP en conexións locais."
 
-#: resources.h:912
+#: resources.h:930
 msgid "&Double-click action on files:"
-msgstr ""
+msgstr "Accións do clic &duplo sobre os ficheiros:"
 
-#: resources.h:572 resources.h:622
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "&Descargar"
 
-#: resources.h:442
-#, fuzzy
+#: resources.h:444
 msgid "&Download to:"
-msgstr "&Descargar"
+msgstr "&Descargar en:"
 
-#: resources.h:657
-#, fuzzy
+#: resources.h:673
 msgid "&Download..."
-msgstr "&Descargar"
+msgstr "&Descargar..."
 
-#: resources.h:256 resources.h:831
-#, fuzzy
+#: resources.h:258 resources.h:847
 msgid "&Downloads:"
-msgstr "Descargas"
+msgstr "&Descargas:"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "&Editar"
 
-#: resources.h:209
-#, fuzzy
+#: resources.h:211
 msgid "&Edit filter rules..."
-msgstr "&Edición dos filtros..."
+msgstr "&Editar as regras do filtro..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
-#, fuzzy
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
-msgstr "Activar todo"
+msgstr "&Activar"
 
-#: resources.h:940
+#: resources.h:958
 msgid "&Enable automatic update check"
 msgstr "&Activar a comprobación automática de actualizacións"
 
-#: resources.h:480 resources.h:804
-#, fuzzy
+#: resources.h:482 resources.h:820
 msgid "&Enable speed limits"
-msgstr "Límite de transferencia"
+msgstr "&Activar os límites de transferencia"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr "&Codificación:"
 
-#: resources.h:609
+#: resources.h:82
+msgid "&Encryption:"
+msgstr "&Cifrado:"
+
+#: resources.h:621
 msgid "&Enter custom command..."
-msgstr "Insira unha orde p&ersonalizada..."
+msgstr "Introduza unha orde p&ersonalizada..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "&Executar"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "&Exportar as entradas do xestor do sitio"
 
-#: resources.h:497 resources.h:653
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "&Exportación..."
 
-#: resources.h:760
+#: resources.h:776
 msgid "&Fall back to active mode"
 msgstr "&Retroceder para o modo activo"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: resources.h:634
+#: resources.h:650
 msgid "&File Attributes..."
 msgstr "&Atributos do ficheiro..."
 
-#: resources.h:588
-#, fuzzy
+#: resources.h:600
 msgid "&File permissions..."
-msgstr "Permisos de usuario"
+msgstr "Permisos do &ficheiro..."
 
-#: resources.h:364
-#, fuzzy
+#: resources.h:366
 msgid "&File:"
-msgstr "&Ficheiro"
+msgstr "&Ficheiro:"
 
-#: resources.h:219
-#, fuzzy
+#: resources.h:221
 msgid "&Filter conditions:"
-msgstr "Conxuntos de &filtros:"
+msgstr "Condicións dos &filtros:"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "Conxuntos de &filtros:"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&Filtros:"
 
 #: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "&Finish"
-msgstr ""
+msgstr "&Rematar"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "&Rematar a edición e eliminar o ficheiro local"
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
+"&Rasar a rutas remotas, descargar todos os ficheiros directamente no "
+"cartafol de destino"
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
+"&Seguir a ligazón simbólica e eliminar o contido do cartafol de destino"
 
-#: resources.h:753
-#, fuzzy
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
-msgstr "Obten o número externo de IP do URL seguinte:"
+msgstr "&Obter o número externo de IP do URL seguinte:"
 
-#: resources.h:551
-#, fuzzy
+#: resources.h:561
 msgid "&Getting help..."
-msgstr "&Opcións..."
+msgstr "&Buscar axuda..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
-msgstr ""
+msgstr "Marcador &global"
 
-#: resources.h:789
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
-msgstr ""
+msgstr "&HTTP/1.1 usando o método CONNECT"
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "&Axuda"
 
-#: resources.h:514 resources.h:640
-#, fuzzy
+#: resources.h:523 resources.h:656
 msgid "&Hide identical files"
-msgstr "Servidor / ficheiro local"
+msgstr "&Ocultar ficheiros idénticos"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "&Máxima"
 
-#: resources.h:748
+#: resources.h:764
 msgid "&Highest available port:"
-msgstr "Porto máis &alto dispoñible"
+msgstr "Porto máis &alto dispoñíbel:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
-msgstr "&Hospedaxe:"
+msgstr "&Servidor:"
 
-#: resources.h:891
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Prefixos binarios &IEC (por exemplo, 1KB = 1024 bytes)"
 
-#: resources.h:879
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exemplo: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
 msgstr "&Importación..."
 
-#: resources.h:934
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
 msgstr "Herdar as asociacións dos t&ipos de ficheiros do sistema"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
-msgstr ""
+msgstr "&Manter a estrutura da ruta remota relativa á raíz de busca"
 
-#: resources.h:854
-#, fuzzy
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
-msgstr "Distribución dos paneis dos ficheiros e dos directorios:"
+msgstr "&Distribución dos paneis dos ficheiros e dos cartafoles:"
 
-#: resources.h:745
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limitar os portos locais usados polo FileZilla"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limitar o número de conexións simultáneas"
 
-#: resources.h:519
-#, fuzzy
+#: resources.h:529
 msgid "&Local directory tree"
-msgstr "Directorio &local por defecto:"
+msgstr "Árbore do cartafo&l local"
 
-#: resources.h:401 resources.h:407
-#, fuzzy
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
-msgstr "Directorio &local por defecto:"
+msgstr "&Cartafol local:"
 
-#: resources.h:949
-#, fuzzy
+#: resources.h:967
 msgid "&Log to file"
-msgstr "Ficheiro remoto"
+msgstr "&Rexistro a ficheiro"
 
-#: resources.h:82
-#, fuzzy
+#: resources.h:83
 msgid "&Logon Type:"
-msgstr "&Modo de acceso:"
+msgstr "&Tipo de acceso:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&Modo de acceso:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "&Baixo"
 
-#: resources.h:545
-#, fuzzy
+#: resources.h:555
 msgid "&Manage bookmarks..."
-msgstr "Xestor dos &sitios..."
+msgstr "&Xestionar os marcadores..."
 
-#: resources.h:533
-#, fuzzy
+#: resources.h:543
 msgid "&Manual transfer..."
-msgstr "Fallou a transferencia"
+msgstr "&Transferencia manual..."
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "Número &máximo de conexións:"
 
-#: resources.h:730
-#, fuzzy
+#: resources.h:746
 msgid "&Maximum number of retries:"
-msgstr "Número máximo número de tentativas:"
+msgstr "&Número máximo de tentativas:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
-msgstr ""
+msgstr "&Rexistro de mensaxes"
 
-#: resources.h:866
+#: resources.h:883
 msgid "&Minimize to tray"
-msgstr ""
+msgstr "&Minimizar á bandexa"
 
-#: resources.h:399
-#, fuzzy
+#: resources.h:401
 msgid "&Name:"
-msgstr "Nome:"
+msgstr "&Nome:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "&Asistente para a configuración da rede..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
 msgstr "&Novo"
 
@@ -690,153 +682,150 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:1043
 msgid "&New version available!"
-msgstr "Hai unha nova versión dispoñible"
+msgstr "Hai unha &nova versión dispoñíbel!"
 
 #: ../../locales/../src/interface/updatewizard.cpp:27
-#, fuzzy
 msgid "&Next >"
-msgstr "&Novo"
+msgstr "&Seguinte >"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "&Non"
 
-#: resources.h:763 resources.h:788
+#: resources.h:779 resources.h:804
 msgid "&None"
 msgstr "&Ningún"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:941
-#, fuzzy
+#: resources.h:959
 msgid "&Number of days between update checks:"
-msgstr "Número de días entre as comprobacións de actualización:"
+msgstr "&Número de días entre as comprobacións de actualización:"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
-msgstr "Valor &numérico"
+msgstr "Valor &numérico:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&Aceptar"
 
-#: resources.h:766
+#: resources.h:782
 msgid "&OPEN"
 msgstr "&Abrir"
 
-#: resources.h:561 resources.h:645
+#: resources.h:571 resources.h:661
 msgid "&Open"
-msgstr ""
+msgstr "&Abrir"
 
 #: resources.h:58
 msgid "&Overwrite"
 msgstr "S&obrescribir"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "&Pasivo"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "&Contrasinal:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "&Reproducir un son"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
-msgstr "&Porto"
+msgstr "&Porto:"
 
-#: resources.h:860
-#, fuzzy
+#: resources.h:876
 msgid "&Position of the message log:"
-msgstr "Inverte a visualización do rexistro de mensaxes"
+msgstr "&Posición do rexistro da mensaxe:"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Conservar a data e a hora nos ficheiros transferidos"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
 msgstr "&Cola de transferencia"
 
-#: resources.h:718
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "Conexión rápida"
 
-#: resources.h:517
-#, fuzzy
+#: resources.h:527
 msgid "&Quickconnect bar"
-msgstr "Conexión rápida"
+msgstr "&Barra de conexión rápida"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "Le&r"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "&Reconectar"
 
-#: resources.h:508 resources.h:662
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
-msgstr ""
+msgstr "&Actualizar"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
 msgstr "&Lembrar o contrasinal para esta sesión"
 
-#: resources.h:403 resources.h:409
-#, fuzzy
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
-msgstr "&Crear directorio"
+msgstr "&Cartafol remoto:"
 
-#: resources.h:367
-#, fuzzy
+#: resources.h:369
 msgid "&Remote path:"
-msgstr "Sitio remoto:"
+msgstr "&Ruta remota:"
 
-#: resources.h:825
+#: resources.h:841
 msgid "&Remove"
 msgstr "Elimina&r"
 
-#: resources.h:783
-#, fuzzy
+#: resources.h:799
 msgid "&Remove key"
-msgstr "Elimina&r"
+msgstr "&Chave remota"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
-msgstr "Elimina&r os seleccionados:"
+msgstr "Elimina&r os seleccionados"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "Cambia&r o nome"
 
-#: resources.h:200
-#, fuzzy
+#: resources.h:202
 msgid "&Rename..."
-msgstr "Cambia&r o nome"
+msgstr "&Renomear..."
 
-#: resources.h:323
-#, fuzzy
+#: resources.h:325
 msgid "&Reopen local file"
-msgstr "Servidor / ficheiro local"
+msgstr "&Volver a abrir o ficheiro local"
 
-#: resources.h:816
-#, fuzzy
+#: resources.h:832
 msgid "&Replace invalid characters with:"
-msgstr "Fallou a validación do filtro"
+msgstr "&Substituír os caracteres incorrectos con:"
 
-#: resources.h:552
-#, fuzzy
+#: resources.h:562
 msgid "&Report a bug..."
-msgstr "&Exportación..."
+msgstr "&Informar dun erro..."
 
-#: resources.h:711
+#: resources.h:630
+msgid "&Reset and requeue all"
+msgstr "&Reiniciar e reestruturar a cola"
+
+#: resources.h:727
 msgid "&Restart Wizard"
 msgstr "&Reiniciar o asistente"
 
@@ -844,100 +833,95 @@
 msgid "&Resume"
 msgstr "Continua&r"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
 msgstr "Executa&r unha orde..."
 
-#: resources.h:725
+#: resources.h:741
 msgid "&Run configuration wizard now..."
 msgstr "&Executar agora o asistente de configuración..."
 
-#: resources.h:943
+#: resources.h:961
 msgid "&Run update check now..."
-msgstr "&Verificar agora a existencia de actualizacións... "
+msgstr "&Comprobar agora a existencia de actualizacións..."
 
-#: resources.h:765
+#: resources.h:781
 msgid "&SITE"
 msgstr "&Sitio"
 
-#: resources.h:790
+#: resources.h:806
 msgid "&SOCKS 5"
-msgstr ""
+msgstr "&SOCKS 5"
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&Gardar como..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
-msgstr ""
+msgstr "&Procurar"
 
-#: resources.h:538
-#, fuzzy
+#: resources.h:548
 msgid "&Search remote files..."
-msgstr "Filtra f&óra todos os ficheiros que:"
+msgstr "&Procurar ficheiros remotos..."
 
 #: resources.h:71
-#, fuzzy
 msgid "&Select Entry:"
-msgstr "Seleccionar entrada:"
+msgstr "&Seleccionar entrada:"
 
-#: resources.h:923
+#: resources.h:941
 msgid "&Select language:"
 msgstr "&Seleccionar idioma:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
-msgstr ""
+msgstr "&Seleccionar as columnas que se amosarán:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&Servidor"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
-msgstr "&Opcións"
+msgstr "&Configuración"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "&Opcións..."
 
-#: resources.h:958
+#: resources.h:976
 msgid "&Show debug menu"
-msgstr "&Amosar o menú da eliminación de erros"
+msgstr "&Amosar o menú de depuración"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr "&Amosar a mensaxe"
 
-#: resources.h:948
-#, fuzzy
+#: resources.h:966
 msgid "&Show timestamps in message log"
-msgstr "&Eliminar a información de erros neste rexistro de mensaxes:"
+msgstr "&Amosar as marcas de tempo no rexistro da mensaxe"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "Xestor dos &sitios..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
-msgstr ""
+msgstr "&Marcador específico do sitio"
 
 #: resources.h:64
 msgid "&Skip"
-msgstr "&Omitir"
+msgstr "&Saltar"
 
-#: resources.h:532
-#, fuzzy
+#: resources.h:542
 msgid "&Speed limits"
-msgstr "Límite de transferencia"
+msgstr "&Límite de transferencia"
 
-#: resources.h:448
-#, fuzzy
+#: resources.h:450
 msgid "&Start transfer immediately"
-msgstr "Modo de transferencia por defecto:"
+msgstr "&Comezar a transferencia inmediatamente"
 
-#: resources.h:859
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr "&Mudar a orde dos paneis local e remoto"
 
@@ -945,77 +929,71 @@
 msgid "&Test"
 msgstr "&Proba"
 
-#: resources.h:871
+#: resources.h:889
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
 msgstr "&Tranferencia"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
-msgstr "Modo de &Transferencia:"
+msgstr "Modo de &transferencia:"
 
-#: resources.h:521
-#, fuzzy
+#: resources.h:531
 msgid "&Transfer queue"
-msgstr "Limpar a cola de &transferencias"
+msgstr "&Cola de transferencias"
 
-#: resources.h:828
-#, fuzzy
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
-msgstr "Tratar os seguintes tipos de arquivo como arquivos ASCII:"
+msgstr "&Tratar os ficheiros .dot como ficheiros ASCII"
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
 msgstr "&Desfacer a edición"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
-msgstr "&Actualización da chave da memoría intermedia para esta hospedaxe"
+msgstr "&Actualizar a chave deste servidor memorizada na caché"
 
-#: resources.h:555 resources.h:641
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "&Enviar"
 
-#: resources.h:266 resources.h:840
-#, fuzzy
+#: resources.h:268 resources.h:856
 msgid "&Uploads:"
-msgstr "Envíos"
+msgstr "&Envíos:"
 
-#: resources.h:424
-#, fuzzy
+#: resources.h:426
 msgid "&Use custom program"
-msgstr "Usar o conxunto de &caracteres personalizado"
+msgstr "&Usar un programa personalizado"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
-msgstr ""
+msgstr "&Usar un navegador sincronizado"
 
-#: resources.h:927
-#, fuzzy
+#: resources.h:945
 msgid "&Use system's default editor for text files"
-msgstr "U&sar os valores predeterminados."
+msgstr "U&sar o editor do sistema para os ficheiros de texto"
 
-#: resources.h:751
-#, fuzzy
+#: resources.h:767
 msgid "&Use the following IP address:"
-msgstr "Usar o número de IP seguinte:"
+msgstr "&Usar o número de IP seguinte:"
 
-#: resources.h:759
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
 msgstr "&Usar, no seu lugar, o número de IP externo do servidor"
 
-#: resources.h:894
+#: resources.h:912
 msgid "&Use thousands separator"
 msgstr "&Usar o separador dos milleiros"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "&Usuario:"
 
-#: resources.h:714
+#: resources.h:730
 msgid "&Username:"
 msgstr "Nome de &usuario:"
 
@@ -1024,100 +1002,100 @@
 msgid "&Version %s"
 msgstr "&Versión %s"
 
-#: resources.h:507
-#, fuzzy
+#: resources.h:516
 msgid "&View"
-msgstr "&Novo"
+msgstr "&Ver"
 
-#: resources.h:578
-#, fuzzy
+#: resources.h:588
 msgid "&View/Edit"
-msgstr "&Vista e edición"
+msgstr "&Ver/Editar"
 
-#: resources.h:933
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
+"&Ver os ficheiros locais editados e solicitar permiso para subir as "
+"modificacións"
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "&Escribir"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "&Si"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "'%s' non existe ou non se pode acceder a el."
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
-#, fuzzy, c-format
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
 msgid "'%s' is not a directory."
-msgstr "Crear directorio"
+msgstr "'%s' non é un cartafol."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "O acceso con conta non é compatible por un protocolo seleccionado"
+msgstr "O tipo de sesión 'con conta' non é admisíbel co protocolo seleccionado"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'quote' é, polo xeral, unha orde local que se usa como cliente en liña para "
-"enviar os argumentos seguidos de 'quote' ao servidor. É preferible inserir a "
-"orde directamente sen 'quote' "
+"'quote' é, polo xeral, unha orde local que se usa nos clientes en liña para "
+"enviar os argumentos seguidos de 'quote' ao servidor. É preferíbel "
+"introducir a orde directamente sen 'quote'."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
 #, c-format
 msgid "(%d object filtered)"
 msgid_plural "(%d objects filtered)"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "(%d obxecto filtrado)"
+msgstr[1] "(%d obxectos filtrados)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr "(0 para non limitar)"
 
-#: resources.h:731
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 segundos)"
 
-#: resources.h:798
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 para desactivar)"
 
-#: resources.h:942
+#: resources.h:960
 msgid "(At least 7 days)"
 msgstr "(cando menos 7 días)"
 
-#: resources.h:887
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(exemplo: %H:%M)"
 
-#: resources.h:881
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
-msgstr "(exemplo: %d-%m-%Y)"
+msgstr "(examplo: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
-#, fuzzy, c-format
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
+#, c-format
 msgid "(in %s/s)"
-msgstr "(en KB/s)"
+msgstr "(en %s/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:896
 msgid ", %H:%M:%S left"
@@ -1125,137 +1103,128 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:900
 msgid ", --:--:-- left"
-msgstr "--:--:-- restantes"
+msgstr ", --:--:-- restantes"
 
-#: resources.h:699
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
-msgstr ""
+msgstr "- Rachou o enrutador e/ou a devasa"
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
-msgstr ""
+msgstr "- Ficheiro danado no servidor espello"
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
-msgstr ""
+msgstr "- Software malicioso no sistema"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
-msgstr "--:--:-- remanentes"
+msgstr "--:--:-- faltan"
 
 #: ../../locales/../src/interface/cmdline.cpp:80
 msgid "-c cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-c non se pode usar xunto cun URL de FTP."
 
 #: ../../locales/../src/interface/cmdline.cpp:89
 msgid "-l can only be used together with an FTP URL."
-msgstr ""
+msgstr "-l só se pode usar xunto cun FTP URL."
 
 #: ../../locales/../src/interface/cmdline.cpp:68
 msgid "-s and -c cannot be present at the same time."
-msgstr ""
+msgstr "-s e -c non se poden presentar ao mesmo tempo."
 
 #: ../../locales/../src/interface/cmdline.cpp:74
 msgid "-s cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-s non se pode empregar xunto cun URL de FTP."
 
-#: resources.h:960
+#: resources.h:978
 msgid "0 - None"
-msgstr "0 - NIngún"
+msgstr "0 - Ningún"
 
-#: resources.h:961
+#: resources.h:979
 msgid "1 - Warning"
 msgstr "1- Aviso"
 
-#: resources.h:962
+#: resources.h:980
 msgid "2 - Info"
 msgstr "2 - Información"
 
-#: resources.h:963
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr "3 - Detallado"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
-msgstr "Reiniciar o sistema"
+msgstr "Sistema de 32 bits"
 
-#: resources.h:964
+#: resources.h:982
 msgid "4 - Debug"
 msgstr "4 - Eliminación de erros"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
-msgstr "Reiniciar o sistema"
+msgstr "Sistema de 64 bits"
 
 #: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "< &Back"
-msgstr ""
+msgstr "< &Volver"
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
-"O ficheiro %s xa existe.\n"
-"Debe inserir un nome novo:"
+"Xa existe un marcador co mesmo nome. Por tanto, debes escribir un outro nome."
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
 msgid "A default editor needs to be set."
-msgstr "É necesario fixar un edior preestablecido."
+msgstr "É necesario estabelecer un edior predeterminado."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
-msgstr ""
-"Non se pode arrastrar un directorio a un dous seus directorios inferiores."
+msgstr "Non se pode arrastrar un cartafol a un dous seus subcartafoles."
 
-#: resources.h:671
+#: resources.h:687
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
-"Algúns servidores non permiten o modo pasivo ou estes están mal "
-"configurados. En ambos os casos, terá que empregar o modo activo. Neste "
+"Algúns servidores ben non permiten o modo pasivo ou ben están mal "
+"configurados. En ambos os dous casos, terá que empregar o modo activo. Neste "
 "modo, o FileZilla abre un porto e consulta o servidor para se conectar."
 
-#: resources.h:305
-#, fuzzy
+#: resources.h:307
 msgid "A file previously opened has been changed."
-msgstr "Cambiouse un ficheiro que se abriu con anterioridade"
+msgstr "Hai cambios nun ficheiro que se abriu con anterioridade."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
-#, fuzzy, c-format
+#: ../../locales/../src/interface/LocalListView.cpp:2069
+#, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
-msgstr ""
-"Xa se editou un ficheiro co mesmo nome. Desexa rexeitar o ficheiro antigo e "
-"descargar o novo?"
+msgstr "Xa se editou un ficheiro co mesmo nome. Quere abrir outra vez '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "Xa se transferiu un ficheiro co mesmo nome."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Xa se está a editar un ficheiro co mesmo nome. Debe pechalo e probar unha "
 "outra vez."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1263,23 +1232,26 @@
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
-"Non foi posible decodificar un ficheiro local.\n"
-"Cómpre ter certeza de que a variable de contorno de LC_TYPE (ou LC_ALL) está "
-"correctamente configurada\n"
-"De non corrixir este problema, podería perder algúns ficheiros da listaxe.\n"
-"Para alén diso, non se avisará deste erro durante a presente sesión."
+"Non foi posíbel descodificar un ficheiro local.\n"
+"Asegúrese de que a variábel de entorno LC_CTYPE (ou LC_ALL) está "
+"correctamente configurada.\n"
+"De non corrixir este problema, podería perder algúns ficheiros da lista.\n"
+"Non haberá avisos posteriores nesta sesión."
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
-msgstr "Dispón dunha versión máis nova do FileZilla:"
+msgstr "Está dispoñíbel unha nova versión do FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
+"Un servidor axeitado sempre amosa todos os ficheiros, no entanto algúns "
+"servidores avariados agochan algúns ficheiros. Use esta opción para obrigar "
+"a que o servidor amose todos os ficheiros."
 
-#: resources.h:743
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1292,80 +1264,82 @@
 "A remote operation is in progress and synchronized browsing is enabled.\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
+"Unha operación remota está en curso e a navegación sincronizada está "
+"activada.\n"
+"Quere desactivar a navegación sincronizada e continuar mudando o cartafol "
+"local?"
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr "A&CII"
 
-#: resources.h:824
+#: resources.h:840
 msgid "A&dd"
 msgstr "Enga&dir"
 
-#: resources.h:851
-#, fuzzy
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
-msgstr "P&ermitir a reanudación dos ficheiros ASCII"
+msgstr "P&ermitir retomar ficheiros ASCII"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "A&plicar só ás descargas"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "A&plicar somente aos envíos"
+msgstr "A&plicar soamente aos envíos"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
-msgstr "A&plicar a todos os ficheiros e directorios"
+msgstr "A&plicar a todos os ficheiros e cartafoles"
 
-#: resources.h:388
-#, fuzzy
+#: resources.h:637
+msgid "A&utomatically remove successful transfers"
+msgstr "Eliminar a&utomaticamente as transferencias completadas"
+
+#: resources.h:390
 msgid "ASCII"
-msgstr "A&CII"
+msgstr "ASCII"
 
-#: resources.h:478
-#, fuzzy
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
-msgstr ""
-"A conexión principal e os certificados de conexión de datos non coinciden."
+msgstr "Cancelar a conexión anterior e conectar na lapela actual"
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
 msgstr "Sobre o FileZilla"
 
-#: resources.h:861
-#, fuzzy
+#: resources.h:877
 msgid "Above the file lists"
-msgstr "Actualiza as listaxes de ficheiros e cartafoles"
+msgstr "Enriba da lista de ficheiros"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "Conta"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
-msgstr "Accións após &completar a listaxe"
+msgstr "Accións tras &completar a cola"
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "Acción para o ficheiro seleccionado:"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
-msgstr ""
+msgstr "Acción para realizar:"
 
 #: resources.h:57
-#, fuzzy
 msgid "Action:"
-msgstr "&Conta:"
+msgstr "Acción:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
@@ -1376,17 +1350,17 @@
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
 msgstr ""
-"Produciuse un erro na proba do modo activo do FTP. O FileZilla descoñece o "
-"número correcto do IP externo. "
+"Fallou a proba do modo activo do FTP. O FileZilla descoñece o número "
+"correcto do IP externo."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:592
 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 ""
-"Produciuse un erro na proba do modo de FTP. O FileZilla descoñece o número "
-"correcto do IP externo. Para alén diso, o seu encamiñador modificou o "
-"enderezo de envío."
+"Fallou a proba do modo activo de FTP. O FileZilla descoñece o número "
+"correcto do IP externo. Para alén diso, o seu enrutador modificou o enderezo "
+"de envío."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:580
 msgid ""
@@ -1394,547 +1368,547 @@
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
-"Produciuse un erro na proba do modo de FTP. O FileZilla coñece o número "
-"correcto do IP externo mais o seu encamiñador ou a súa barreira de "
-"protección modificou o enderezo de envío."
+"Fallou a proba do modo activo de FTP. O FileZilla coñece o número correcto "
+"do IP externo mais o seu enrutador ou a súa devasa modificou o enderezo de "
+"envío."
 
-#: resources.h:756
+#: resources.h:772
 msgid "Active mode IP"
 msgstr "IP do modo activo"
 
-#: resources.h:449
-#, fuzzy
+#: resources.h:451
 msgid "Add files to &queue only"
-msgstr "Engadir &ficheiros á cola"
+msgstr "Soamente engadir &ficheiros á cola"
 
-#: resources.h:625 resources.h:644
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
-msgstr "Engadir o directorio seleccionado á fila de transferencia"
+msgstr "Engadir o cartafol seleccionado á fila de transferencia"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr ""
 "Engadir os ficheiros e cartafoles seleccionados á cola de transferencia"
 
-#: resources.h:914 resources.h:920
-#, fuzzy
+#: resources.h:932 resources.h:938
 msgid "Add to queue"
-msgstr "Engadir &ficheiros á cola"
+msgstr "Engadir á cola"
 
 #: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
-msgstr ""
+msgstr "O tipo de enderezo non é compatíbel"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "Avanzadas"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "Opcións avanzadas:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
-msgstr ""
+msgstr "Algoritmo:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "All files have been successfully transferred"
-msgstr "&Eliminar automaticamente as transferencias correctas"
+msgstr "Todos os ficheiros se transferiron correctamente"
 
-#: resources.h:700
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "Todos os portos do intervalo dado teñen de estar entre 1024 e 65535."
+msgstr ""
+"Todos os portos do intervalo dado teñen de estar entre o 1024 e o 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
-#, fuzzy, c-format
+#: ../../locales/../src/interface/QueueView.cpp:3135
+#, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] ""
-"Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de "
-"sitios: %s"
+"Remataron todas as transferencias. %d ficheiro non se puido transferir."
 msgstr[1] ""
-"Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de "
-"sitios: %s"
+"Remataron todas as transferencias. %d ficheiros non se puideron transferir."
 
-#: resources.h:739
-#, fuzzy
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr "Permitir o retroceso a outro modo de transferencia caso de erros"
+msgstr "Permitir volver a outro modo de trans&ferencia se falla"
 
-#: resources.h:675
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
-msgstr "Permitir o retroceso a outro modo de transferencia caso de erros"
+msgstr "Permitir volver a outro modo de transferencia se falla"
 
-#: resources.h:475
-#, fuzzy
+#: resources.h:477
 msgid "Already connected"
-msgstr "Conectado"
+msgstr "Xa está conectado"
 
-#: resources.h:784
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
+"De xeito alternativo, pode empregar a ferramenta Pageant de PuTTY para "
+"xestionar as chaves; o FileZilla recoñece Pageant."
 
-#: resources.h:785
+#: resources.h:801
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
 msgstr ""
+"De xeito alternativo pode empregar o axente de SSH do sistema. Para o facer, "
+"cómpre asegurarse que a variábel de contorno SSH_AUTH_SOCK está configurada."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1097
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
-"Como alternativa, pode visitar http://filezilla-project.org para descargar a "
-"versión máis recente."
+"De xeito alternativo, pode visitar http://filezilla-project.org para "
+"descargar a versión máis recente."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+"Produciuse un erro ao cargar a cola de transferencia de \"%s\".\n"
+"Algúns ítems da cola non se puideron restaurar."
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"Produciuse un erro ao cargar a cola de transferencia de \"%s\".\n"
+"Algúns ítems da cola non se puideron gardar."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
-"Xa se está a editar un ficheiro co mesmo nome. Debe pechalo e probar unha "
-"outra vez."
+"Un elemento co mesmo nome que o do ficheiro traído xa existe na localización "
+"de destino."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
+"Está en curso outra operación remota, polo que non se pode mudar o cartafol "
+"agora."
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
-msgstr ""
-"Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de "
-"sitios: %s"
+msgstr "Non se pode gardar ningún cambio realizado no Xestor de sitios."
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
 msgstr ""
+"Non se gardará ningún cambio realizado no Xestor de sitios, a non ser que "
+"repare o ficheiro."
 
-#: ../../locales/../src/interface/filter.cpp:194
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
-msgstr ""
-"Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de "
-"sitios: %s"
+msgstr "Non se puido gardar ningún cambio realizado nos filtros."
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
-msgstr ""
+msgstr "Non se gardará ningún cambio realizado nos filtros."
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
-msgstr "Ap&licar só aos directorios"
+msgstr "Ap&licar só aos cartafoles"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
-msgstr "Aplicación"
+msgstr "Aplicar"
 
 #: resources.h:66
 msgid "Apply to &current queue only"
-msgstr "Aplicar á &cola actual somente"
+msgstr "Aplicar á &cola actual saomente"
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
 msgstr "Aplicar só aos &ficheiros"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "Ficheiro"
 
-#: resources.h:863
-#, fuzzy
+#: resources.h:879
 msgid "As tab in the transfer queue pane"
-msgstr "Inverte a visualización da cola de transferencia"
+msgstr "Como lapela no panel da cola de transferencias"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
-#, fuzzy
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 msgid "Ask for action"
-msgstr "&Preguntar pola acción"
+msgstr "Preguntar pola acción"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Preguntar polo contrasinal"
 
-#: resources.h:696
+#: resources.h:712
 msgid "Ask operating system for a port."
-msgstr "Solicitar un porto ao sistema opertativo"
+msgstr "Solicitarlle un porto ao sistema operativo."
 
-#: resources.h:686
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
 msgstr "Solicitar o número de IP externo ao sistema operativo"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
-msgstr ""
+msgstr "Formule as súas preguntas nos foros do FileZilla"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
 msgid "Associated program not found:"
 msgstr "Non se achou o programa asociado:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
 msgstr "Cando menos, non se completou unha condición de filtro"
 
-#: resources.h:705
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr "Chegados a este punto, recolleuse toda a información requirida."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
-msgstr "&Atributos do ficheiro..."
+msgstr "Atributos"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
-#, fuzzy
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 msgid "Authentication failed."
-msgstr "Fallou a validación do filtro"
+msgstr "Fallou a autenticación."
 
-#: resources.h:872
+#: resources.h:890
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:385
-#, fuzzy
+#: resources.h:387
 msgid "Auto"
-msgstr "&Auto"
+msgstr "Auto"
 
-#: resources.h:822
+#: resources.h:838
 msgid "Automatic file type classification"
 msgstr "Clasificación automática do tipo de ficheiro"
 
-#: resources.h:939
+#: resources.h:957
 msgid "Automatic update check"
 msgstr "Comprobación automática de ficheiros"
 
-#: resources.h:876
-#, fuzzy
+#: resources.h:894
 msgid "Available sizes"
-msgstr "Tamaño"
+msgstr "Tamaños dispoñíbeis"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
-msgstr ""
+msgstr "B"
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
-msgstr ""
+msgstr "Evitar &proxy"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
-msgstr ""
+msgstr "Instrucións de uso básico"
 
-#: resources.h:865
+#: resources.h:881
 msgid "Behaviour"
-msgstr ""
+msgstr "Comportamento"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
-msgstr "Estase a editar"
+msgstr "En edición"
+
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr "Clasificar a fusión de cadeas"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
-msgstr ""
+msgstr "Atención! O certificado foi revogado"
 
-#: resources.h:389
-#, fuzzy
+#: resources.h:391
 msgid "Binary"
-msgstr "&Binario"
+msgstr "Binario"
 
-#: resources.h:858
+#: resources.h:874
 msgid "Blackboard"
 msgstr "Cadro negro"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
-msgstr ""
+msgstr "Marcador"
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
-msgstr ""
+msgstr "Marcador:"
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
-msgstr ""
+msgstr "Marcadores"
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
-msgstr "Data da recompilación"
+msgstr "Data da compilación:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
-msgstr "Información da recompilación"
+msgstr "Información da compilación"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
-msgstr ""
+msgstr "Categoría de negocio:"
 
-#: resources.h:746
+#: resources.h:762
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"Por defecto, emprégase calquera porto local dispoñible para establecer as "
-"transferencias en modo activo. Se desexa limitar o uso dun pequeno intervalo "
-"de portos, debe introducilo a continuación:"
+"De modo predeterminado, emprégase calquera porto local dispoñíbel para "
+"estabelecer as transferencias en modo activo. Se desexa limitar o uso a un "
+"pequeno intervalo de portos, debe introducilo a continuación."
 
-#: resources.h:535
-#, fuzzy
+#: resources.h:545
 msgid "C&ancel current operation"
-msgstr "Cancelar a operación actual"
+msgstr "C&ancelar a operación actual"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "Co&mprobación das últimas versións de desenvolvemento do FileZilla"
+msgstr "Pro&curar versións de desenvolvemento do FileZilla"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
 msgstr "&Limpar todo"
 
-#: resources.h:586 resources.h:632
-#, fuzzy
+#: resources.h:598 resources.h:648
 msgid "C&opy URL(s) to clipboard"
-msgstr "&Copiar ao portapapeis"
+msgstr "C&opiar URL ao portapapeis"
 
-#: resources.h:880
+#: resources.h:898
 msgid "C&ustom"
 msgstr "Personaliz&zado"
 
-#: resources.h:935
+#: resources.h:953
 msgid "C&ustom filetype associations:"
-msgstr "Aso&ciacións de tipos de ficheiros personalizadas"
+msgstr "Aso&ciacións de tipos de ficheiros personalizadas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
-msgstr "Estase a calcular a difereza co fuso horario do servidor..."
+msgstr "Estase a calcular a diferenza coa zona horaria do servidor..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
 msgstr "Non se pode ler do ficheiro"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:712
+#: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
 msgstr "Non se pode escribir o ficheiro."
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
+#, c-format
 msgid "Can't write data to file: %s"
-msgstr "Non se pode escribir o ficheiro."
+msgstr "Non se poden escribir os datos no ficheiro: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: resources.h:982
+#: resources.h:1000
 msgid "Cancel current operation"
 msgstr "Cancelar a operación actual"
 
-#: resources.h:983
+#: resources.h:1001
 msgid "Cancels the current operation"
 msgstr "Cancela a operación actual"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
-"Non se pode acceder a '%s' pois non se inseriu ningún medio ou o dispositivo "
-"non está preparado."
+"Non se pode acceder a '%s', xa que ben non se inseriu ningún soporte ou ben "
+"a unidade non está preparada."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
-msgstr "Abrir o Xestor de sitios"
+msgstr "Non se pode engadir o servidor ao Xestor de sitios"
 
 #: ../../locales/../src/interface/context_control.cpp:345
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
 msgstr ""
+"Non se pode pechar a lapela mentres estea ocupada.\n"
+"Quere cancelar a operación actual e pechar a lapela?"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
+"Non se poden comparar os cartafoles pois están estabelecidos diferentes "
+"filtros para os cartafoles local e remoto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
-msgstr "Non se puido conectar ó servidor"
+msgstr "Non se puido comparar os cartafoles pois non hai conexión co servidor."
 
 #: ../../locales/../src/interface/filteredit.cpp:141
-#, fuzzy
 msgid "Cannot create new filter"
-msgstr "Non se pode renomear o ficheiro"
+msgstr "Non se pode crear o novo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "Non se pode editar o ficheiro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 msgid "Cannot edit file, not connected to any server."
-msgstr "Non se puido conectar ó servidor"
+msgstr "Non se pode editar o ficheiro pois hai conexión con ningún servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
-msgstr ""
+msgstr "Non se pode editar o ficheiro porque se descoñece a ruta remota."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
-"Non se pode pode establecer a conexión de FTP cun servidor de SFTP. Ten de "
-"escoller o protocolo axeitado."
+"Non se pode estabelecer unha conexión FTP cun servidor de SFTP. Escolla o "
+"protocolo axeitado."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Non se pode cargar a barra de conexión rápida do ficheiro de recurso"
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr "Non se pode cargar o ficheiro pois non é un válido XML."
+msgstr "Non se pode cargar o ficheiro pois non é un XML correcto."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
-#, fuzzy
 msgid "Cannot load keyfile"
-msgstr "Non se pode editar o ficheiro"
+msgstr "Non se pode cargar o ficheiro de chaves"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
-msgstr "Non se puido cargar a barra de ferramentas do ficheiro de recurso"
+msgstr "Non se pode cargar a barra de ferramentas do ficheiro de recurso"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr "Non se pode cambiar o nome da entrada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "Non se pode renomear o ficheiro"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
-msgstr "Non se pode renomear o ficheiro"
+msgstr "Non se pode gardar o conxunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:295
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
-msgstr "Non se pode editar o ficheiro"
+msgstr "Non se pode seleccionar o filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
-msgstr "Aso&ciacións de tipos de ficheiros personalizadas"
+msgstr "Non se pode estabelecer a asociación de ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "Non se pode amosar o diálogo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
-msgstr "Non se pode ver ou editar o ficheiro seleccionado"
+msgstr "Non se pode ver/editar o ficheiro seleccionado"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
 msgstr "Categorías"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
-msgstr ""
+msgstr "O certificado e os datos de sesión xa non están dispoñíbeis."
 
 #: resources.h:26
-#, fuzzy
 msgid "Certificate details"
-msgstr "Emisor do certificado"
+msgstr "Detalles do certificado"
 
 #: resources.h:3 resources.h:27
-#, fuzzy
 msgid "Certificate in chain:"
-msgstr "Emisor do certificado"
+msgstr "Certificado en cadea:"
 
 #: resources.h:13 resources.h:37
 msgid "Certificate issuer"
 msgstr "Emisor do certificado"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
-msgstr "Desafío"
+msgstr "Desafío:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
 msgstr "Cambiar os atributos do ficheiro"
 
-#: resources.h:589 resources.h:635
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
 msgstr "Cambiar os permisos do ficheiro."
 
-#: resources.h:956
-#, fuzzy
+#: resources.h:974
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "Abrir o diálogo de configuración do FileZilla"
+msgstr ""
+"Mudar a configuración do ficheiro de rexistro precisa reiniciar o FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
 msgstr "Problema de codificación de caracteres"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr "Conxunto de caracteres"
 
-#: resources.h:944
-#, fuzzy
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
-msgstr "&Comprobar as versións beta do FileZilla"
+msgstr "Comprobar por versións &beta e publicacións candidatas"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "Comprobe se hai act&ualizacións..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "Comprobación de novas versións do FileZilla"
 
@@ -1942,87 +1916,88 @@
 msgid "Check for updates"
 msgstr "Comprobación de actualizacións"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
-msgstr "Comprobación de actualizacións"
+msgstr "Fallou a comprobación de actualizacións"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
 msgstr "Comprobación para corrixir o número correcto de IP externo"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "Comprobación para as actualizacións"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1241
 msgid "Checksum mismatch of downloaded file."
-msgstr ""
+msgstr "Perdeuse a suma de comprobación do ficheiro descargado."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
-msgstr "Escolla o directorio local por defecto"
+msgstr "Escolla o cartafol local predeterminado"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
-msgstr "Escolla o directorio local por defecto"
+msgstr "Escolla o cartafol local"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
-msgstr "Os datos do fragmento rematáronse de xeito inadecuado"
+msgstr "Os datos do fragmento rematan de xeito inapropiado"
 
 #: resources.h:18 resources.h:42
-#, fuzzy
 msgid "Cipher:"
-msgstr "Outro:"
+msgstr "Cifrado:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
-msgstr ""
+msgstr "Pechar lape&la"
 
-#: resources.h:855
+#: resources.h:871
 msgid "Classic"
 msgstr "Clásico"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
-msgstr "Limpar as entradas do xestor do &sitios"
+msgstr "Limpar as entradas do Xestor de &sitios"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
-msgstr "Limpar o &formato da memoria intermedia"
+msgstr "Limpar a caché da &disposición"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
-msgstr "Lempar o historial da &conexión rápida"
+msgstr "Limpar o historial da &conexión rápida"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "Limpar a información de &reconexión"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "Limpar a cola de &transferencias"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Limpar o historial"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
 msgstr "Limpar os datos privados"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Limpar a barra de conexión rápida"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr "Limpar a fusión de cadeas"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Prema Rematar para gardar a configuración."
@@ -2031,78 +2006,73 @@
 msgid "Click on next to download the new version."
 msgstr "Prema seguinte para descargar a versión nova."
 
-#: resources.h:346
-#, fuzzy
+#: resources.h:348
 msgid "Client to server MAC:"
-msgstr "Estase a conectar ao servidor"
+msgstr "Cliente a servidor MAC:"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
-msgstr ""
+msgstr "Cifrado cliente a servidor:"
 
-#: resources.h:661
+#: resources.h:677
 msgid "Close &all other tabs"
-msgstr ""
+msgstr "Pech&ar todas os outras lapelas"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "Pechar o FileZilla"
 
 #: ../../locales/../src/interface/cmdline.cpp:14
 msgid "Close all running instances of FileZilla"
-msgstr ""
+msgstr "Pechar todas as instancias a se executaren do FileZilla"
 
-#: resources.h:496
-#, fuzzy
+#: resources.h:505
 msgid "Closes current tab"
-msgstr "Transferencias simultáneas"
+msgstr "Pecha a lapela actual"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "Co&mentarios:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
-msgstr ""
+msgstr "Propiedades da columna"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
-msgstr ""
+msgstr "Configuración da columna"
 
-#: resources.h:930
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
 msgstr "A orde e os seus argumentos han de estar correctamente entre comiñas."
 
 #: ../../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
-#, fuzzy
 msgid "Command failed"
-msgstr "Orde:"
+msgstr "Fallou a orde"
 
 #: ../../locales/../src/engine/proxy.cpp:448
-#, fuzzy
 msgid "Command not supported"
-msgstr "A orde non é compatible con este protocolo"
+msgstr "A orde non é compatíbel"
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr "A orde non é compatible con este protocolo"
+msgstr "A orde non é compatíbel con este protocolo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Orde:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
-#, fuzzy
 msgid "Comment"
-msgstr "Co&mentarios:"
+msgstr "Comentario"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
 msgid "Common name:"
 msgstr "Nome común:"
 
@@ -2110,82 +2080,78 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
 msgstr ""
-"A comunicación foi interferida polo encamiñador ou a barreira de protección"
+"A comunicación foi interferida polo enrutador ou a devasa de protección"
 
-#: resources.h:513 resources.h:639
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
-msgstr ""
+msgstr "Comparar o tempo de &modificación"
 
-#: resources.h:512 resources.h:638
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
-msgstr ""
+msgstr "Comparar o ta&maño do ficheiro"
 
-#: resources.h:910
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
-msgstr ""
+msgstr "Lími&te de comparación (en minutos):"
 
 #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
-#, fuzzy
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
-msgstr "O número de tentativas ten que estar entre 0 e 9."
+msgstr "A árbore de comparación precisa estar entre 0 e 1440 minutos."
 
-#: resources.h:159
-#, fuzzy
+#: resources.h:160
 msgid "Compiled for:"
-msgstr "Compilado con:"
+msgstr "Compilado por:"
 
-#: resources.h:160
-#, fuzzy
+#: resources.h:161
 msgid "Compiled on:"
-msgstr "Compilado con:"
+msgstr "Compilado en:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
 msgstr "Compilado con:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
 msgstr "Bandeiras do compilador:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
-msgstr ""
+msgstr "Comprimido"
 
-#: resources.h:796
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr "Transferencias simultáneas"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr "As condicións distinguen entre maiúsculas e minúsculas"
 
-#: resources.h:704
+#: resources.h:720
 msgid "Configuration test"
 msgstr "Proba de configuración"
 
-#: resources.h:678
+#: resources.h:694
 msgid "Configure passive mode"
 msgstr "Configurar o modo pasivo"
 
-#: resources.h:694
+#: resources.h:710
 msgid "Configure port range"
 msgstr "Configura o rango do porto"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
-msgstr ""
+msgstr "Configurando o FileZilla e a rede"
 
-#: ../../locales/../src/interface/search.cpp:1054
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1033
 msgid "Confirm deletion"
-msgstr "Requirese a confirmación"
+msgstr "Confirmar o borrado"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Requirese a confirmación"
 
@@ -2193,40 +2159,39 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Parabéns, semella que a configuración funciona correctamente."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
-#, fuzzy
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr "Opcións da conexión"
+msgstr "Conectar enviando os axustes do próxy"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr ""
+msgstr "Conectar a un sitio específico do xestor de sitios"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "Estase a conectar"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
 msgstr "Estase a conectar a %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1163
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s through proxy"
-msgstr "Estase a conectar a %s"
+msgstr "Estase a conectar a %s a través do prxy"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1034
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s..."
-msgstr "Estase a conectar a %s:%d..."
+msgstr "Estase a conectar a %s..."
 
 #: ../../locales/../src/interface/updatewizard.cpp:424
 #: ../../locales/../src/interface/updatewizard.cpp:998
@@ -2237,20 +2202,21 @@
 msgid "Connection"
 msgstr "Conexión"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
 msgstr "Fallou o intento de conexión"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1039
 #: ../../locales/../src/engine/proxy.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "Fallou o intento de conexión"
+msgstr ""
+"Fallou o intento de conexión con \"%s\"; tentando co seguinte enderezo."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1044
-#, fuzzy, c-format
+#, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "Fallou o intento de conexión"
+msgstr "Fallou o intento de conexión con \"%s\"."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
@@ -2262,37 +2228,34 @@
 msgstr "Pechouse a conexión"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
-msgstr "Pechouse a conexión"
+msgstr "Pechouse a conexión polo servidor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
-msgstr "Estableceuse a conexión; estase a iniciar o TLS..."
+msgstr "Estabeleceuse a conexión; estase a iniciar o TLS..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
-msgstr "Estableceuse a conexión; estase a enviar a solicitude de HTTP"
+msgstr "Estabeleceuse a conexión; estase a enviar a solicitude de HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
-msgstr "Estableceuse a conexión; estase a agardar pola mensaxe de benvida..."
+msgstr "Estabeleceuse a conexión; estase a agardar pola mensaxe de benvida..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
 msgstr "Perdeuse a conexión"
 
 #: ../../locales/../src/engine/proxy.cpp:433
-#, fuzzy
 msgid "Connection not allowed by ruleset"
-msgstr "Execedeuse o tempo de conexión"
+msgstr "A conexión non está permitida polo conxunto de regras"
 
 #: ../../locales/../src/engine/proxy.cpp:442
-#, fuzzy
 msgid "Connection refused"
-msgstr "Pechouse a conexión"
+msgstr "Conexión rexeitada"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:681
 msgid "Connection timed out"
@@ -2302,15 +2265,13 @@
 msgid "Connection timed out."
 msgstr "Execedeuse o tempo de conexión."
 
-#: ../../locales/../src/interface/search.cpp:702
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:676
 msgid "Connection to server lost."
-msgstr "Estase a conectar ao servidor"
+msgstr "Perdeuse a conexión co servidor."
 
 #: ../../locales/../src/engine/proxy.cpp:188
-#, fuzzy
 msgid "Connection with proxy established, performing handshake..."
-msgstr "Estableceuse a conexión; estase a agardar pola mensaxe de benvida..."
+msgstr "Estabeleceuse a conexión co próxy; estase a realizar a negociación..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
@@ -2322,71 +2283,67 @@
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
-msgstr ""
+msgstr "Converter o ficheiro de chaves"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "Cop&iar"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Copia (%d) de %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia de %s"
 
-#: resources.h:587 resources.h:633
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr ""
+msgstr "Copiar os URL dos elementos seleccionados ao portapapeis."
 
 #: ../../locales/../src/engine/transfersocket.cpp:207
-#, fuzzy, c-format
+#, c-format
 msgid "Could not accept connection: %s"
-msgstr "Non se puido establecer a conexión co servidor"
+msgstr "Non se puido aceptar a conexión: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "Non se puido establecer a conexión co servidor"
+msgstr "Non se puido engadir a conexión ao xestor do sitio"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Non se puido conectar ó servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1205
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to server: %s"
-msgstr "Non se puido conectar ó servidor"
+msgstr "Non se puido conectar ó servidor: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 msgid "Could not convert command to server encoding"
-msgstr "Non foi posible converter a orde á codificación do servidor"
+msgstr "Non foi posíbel converter a orde á codificación do servidor"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy
 msgid "Could not convert private key"
-msgstr "Non se puido conectar ó servidor"
+msgstr "Non se puido converter a chave privada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not copy URLs"
-msgstr "Non se puido conectar ó servidor"
+msgstr "Non se puido copiar os URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
-msgstr "Non se puido crear o fío de entrada e de saída:"
+msgstr "Non se puido copiar os datos"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 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 "
@@ -2396,11 +2353,11 @@
 "O a extensión de interpretación de ordes non está instalada correctamente ou "
 "non soltou os ficheiros nunha ventá do explorador."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
-msgstr "Non se puido establecer a conexión co servidor"
+msgstr "Non se puido estabelecer a conexión co servidor"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2408,80 +2365,87 @@
 "variable."
 msgstr ""
 "Non se puideron atopar os ficheiros de recurso para o FileZilla, polo que se "
-"está a pechar.\n"
-"Pode establecer o directorio de datos do FileZilla usando a opción da liña "
-"de ordes '--datadir <custompath>' ou establecendo a variable de contorno "
+"está a pechar o FileZilla.\n"
+"Pode estabelecer o cartafol de datos do FileZilla usando a opción da liña de "
+"ordes '--datadir <custompath>' ou estabelecendo a variábel de contorno "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 msgid "Could not generate custom login sequence."
 msgstr "Non foi posíbel xerar unha secuencia de rexistro personalizada."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
+"Non se puido obter un nome diferente do emisor do certificado, fallou "
+"gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
+"Non se puido obter un nome diferente do asunto do certificado, fallou "
+"gnutls_x509_get_dn"
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1015
 msgid "Could not get full remote path."
-msgstr ""
+msgstr "Non se puido obter a ruta remota completa."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
 msgid "Could not get reply from fzputtygen."
-msgstr ""
+msgstr "Non se obtivo resposta de fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
-msgstr ""
-"Non foi posible obter un directorio temporal para descargar o ficheiro."
+msgstr "Non foi posíbel obter un cartafol temporal para descargar o ficheiro."
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
-msgstr ""
+msgstr "Non se puido importar o certificado, fallou gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
+"Non se puido iniciar a estrutura para certificados, fallou "
+"gnutls_x509_crt_init"
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Non se puido cargar \"%s\", por favor asegúrese de que o ficheiro é válido e "
-"se pode acceder.\n"
+"Non se puido cargar \"%s\", por favor asegúrese de que o ficheiro é correcto "
+"e se pode acceder.\n"
 "Calquera cambio que se fixer no xestor de sitios non se gardará."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
-#, fuzzy
 msgid "Could not load keyfile"
-msgstr "Non se puido buscar até o remate do ficheiro"
+msgstr "Non se puido cargar o ficheiro de chaves"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
-#, fuzzy
 msgid "Could not load private key"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido cargar a chave privada"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1041
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
+"Non se puido obter o cartafol local correspondente co cartafol remoto: '%"
+"s'.\n"
+"Quere desactivar a sincronización da navegación remota e continuar cambiando "
+"o cartafol remoto?"
 
 #: ../../locales/../src/interface/state.cpp:381
 #, c-format
@@ -2490,6 +2454,8 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"Non se puido obter o cartafol local correspondente co cartafol remoto '%s'.\n"
+"Desactivouse a navegación sincronizada."
 
 #: ../../locales/../src/interface/state.cpp:295
 #, c-format
@@ -2498,70 +2464,68 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"Non se puido obter o cartafol remoto correspondente co cartafol local '%s'.\n"
+"A navegación sincronizada foi desactivada."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not open clipboard"
-msgstr "&Copiar ao portapapeis"
+msgstr "Non se puido abrir o portapapeis"
 
 #: ../../locales/../src/engine/logging.cpp:208
 #: ../../locales/../src/engine/logging.cpp:276
 #: ../../locales/../src/engine/logging.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open log file: %s"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido abrir o ficheiro de rexistro: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
-msgstr "Non se puido interpretar o enderezo do servidor:"
+msgstr "Non se puido analizar a ruta remota."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Non se puido interpretar o enderezo do servidor:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#, c-format
 msgid "Could not read from socket: %s"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se ler do sócket: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
-msgstr "Non se puido interpretar o enderezo do servidor:"
+msgstr "Non se puido ler o elemento do servidor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
-msgstr "Non se puido chegar á posición %s no ficheiro."
+msgstr "Non se puido chegar á posición %s no ficheiro"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
-msgstr "Non se puido buscar até o remate do ficheiro"
+msgstr "Non se puido buscar ata o remate do ficheiro"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
-#, fuzzy
 msgid "Could not send command to fzputtygen."
-msgstr "Non foi posible converter a orde á codificación do servidor"
+msgstr "Non se puido enviar a orde a fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
-msgstr "Non se puido crear o fío de entrada e de saída:"
+msgstr "Non se puido crear o fío de entrada e de saída"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1178
-#, fuzzy, c-format
+#, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "Non se puido iniciar a transferencia"
+msgstr "Non se puido iniciar a negociación co proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
 msgstr "Non se puido iniciar a transferencia"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2570,102 +2534,120 @@
 "Non se puido escribir \"%s\", non se puideron gardar os cambios no xestor de "
 "sitios: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
+#, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "Non se puido escribir \"%s\", a cola non se puido gardar."
+msgstr "Non se puido escribir \"%s\", o marcador non se puido engadir: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr "Non se puido escribir \"%s\", a cola non se puido gardar."
+msgstr ""
+"Non se puido escribir \"%s\", o marcador global non se puido gardar: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
-#, fuzzy, c-format
+#: ../../locales/../src/interface/QueueView.cpp:1985
+#, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
-msgstr "Non se puido escribir \"%s\", a cola non se puido gardar."
+msgstr ""
+"Non se puido escribir \"%s\", a cola non se puido gardar.\n"
+"%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
-#, fuzzy, c-format
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
+#, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr "Non se puido escribir \"%s\", a cola non se puido gardar."
+msgstr ""
+"Non se puido escribir \"%s\", os ficheiros seleccionados non se puideron "
+"exportar: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Non se puido escribir \"%s\": %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write keyfile: %s"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido escribir o ficheiro de rexistro: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido escribir ao ficheiro local"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write to log file: %s"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido escribir ao ficheiro de rexistro: %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:999
 #: ../../locales/../src/engine/ControlSocket.cpp:1097
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write to socket: %s"
-msgstr "Non se puido escribir \"%s\": %s"
+msgstr "Non se puido escribir ao sócket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr "País:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
-"Pecha o FileZilla ao momento. Só se emprega para a eliminación de erros do "
-"xestor de excepcións"
+"Pecha instantaneamente o FileZil. Só se emprega para a eliminación de erros "
+"do xestor de excepcións"
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "Non se pode crear o novo filtro"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
-msgstr "Crear un subdirectorio no directorio actual"
+msgstr "Crear un subcartafol no cartafol actual"
+
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Crear un subcartafol no cartafol actual"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
-msgstr "Crear directorio"
+msgstr "Crear cartafol"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "Non se pode editar o ficheiro"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
-msgstr "Estase a crear o directorio"
+msgstr "Creando o cartafol"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "Creando directorio '%s'..."
+msgstr "Creando cartafol '%s'..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
 msgstr "Erro crítico"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:137
-#, fuzzy
 msgid "Critical file transfer error"
-msgstr "Erro crítico"
+msgstr "Erro crítico de transferencia de ficheiro"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "Critical file transfer error after transferring %s in %s"
-msgstr "Erro crítico"
+msgstr ""
+"Erro crítico de transferencia de ficheiro despois de transferir %s en %s"
 
 #: ../../locales/../src/interface/state.cpp:370
 #, c-format
@@ -2673,20 +2655,24 @@
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"O cartafol remoto actual (%s) non está debaixo da raíz de sincronización (%"
+"s).\n"
+"A navegación sincronizada foi desactivada."
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
-msgstr ""
+msgstr "O tipo de transferencia actual está estabelcida a ASCII."
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr ""
+"O tipo de transferencia actual está estabelcida á detección automática."
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
-msgstr ""
+msgstr "O tipo de transferencia actual está estabelcido a binario."
 
-#: resources.h:767 resources.h:886
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr "Personali&zado"
 
@@ -2694,57 +2680,61 @@
 msgid "Custom filter set"
 msgstr "Conxunto de filtros personalizado"
 
-#: resources.h:375 resources.h:376
-#, fuzzy
+#: resources.h:377 resources.h:378
 msgid "Custom server"
-msgstr "Conxunto de filtros personalizado"
+msgstr "Servidor personalizado"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
-msgstr ""
+msgstr "Tipo de d&atos"
 
-#: resources.h:893
-#, fuzzy
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
-msgstr ""
-"Us&ar símbolos SI nos prefixos decimais (por exemplo, 1KB = 1000 bytes)"
+msgstr "Prefixos d&ecimais usando símbolos SI (por exemplo, 1KB = 1000 bytes)"
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "D&efecto"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "&Eliminar"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
 msgstr "Desact&ivar todo"
 
-#: resources.h:917
+#: resources.h:882
+msgid "D&o not save passwords"
+msgstr "N&non gardar os contrasinais"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
-msgstr ""
+msgstr "Acción de clic d&uplo nos cartafoles:"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr ""
+msgstr "Con rutas virtuais ao xeito de DOS"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "O tipo de ficheiro é perigoso"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
-#, fuzzy
 msgid "Data"
-msgstr "Data"
+msgstr "Datos"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:985
 #: ../../locales/../src/interface/netconfwizard.cpp:1051
 msgid "Data socket closed too early."
 msgstr "O sócket de datos pechouse moi cedo."
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+msgid "Date"
+msgstr "Data"
+
+#: resources.h:895
 msgid "Date formatting"
 msgstr "Formato de data e hora"
 
@@ -2752,10 +2742,10 @@
 msgid "Date/time format"
 msgstr "Formato de data/hora"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Data/hora descoñecida"
 
@@ -2763,63 +2753,63 @@
 msgid "Debug"
 msgstr "Eliminación de erros"
 
-#: resources.h:957
+#: resources.h:975
 msgid "Debugging settings"
 msgstr "Configuración para a eliminación de erros"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
-msgstr "Directorio &local por defecto:"
+msgstr "cartafol &local por defecto:"
 
-#: ../../locales/../src/engine/server.cpp:23
-#, fuzzy
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
-msgstr "Detectar &automaticamente"
+msgstr "Predeterminar (detectar automaticamente)"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
 msgid "Default editor not properly quoted."
-msgstr "O editor preestablecido non se puxo entre comiñas correctamente."
+msgstr "O editor preestabelcido non se puxo entre comiñas correctamente."
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
-msgstr "Acción do ficheiro exitente preestablecida"
+msgstr "Acción do ficheiro exitente preestabelcida"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
-msgstr "Directorio r&emoto por defecto:"
+msgstr "cartafol r&emoto por defecto:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
 msgstr ""
+"Non se pode analizar a ruta remota predeterminada. Asegúrese de é unha ruta "
+"absoluta correcta para tipo de servidor seleccionado."
 
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:78
-#, fuzzy
 msgid "Default system language"
-msgstr "&Seleccionar idioma:"
+msgstr "Idioma do sistema"
 
-#: resources.h:672
+#: resources.h:688
 msgid "Default transfer mode:"
 msgstr "Modo de transferencia por defecto:"
 
-#: resources.h:818
+#: resources.h:834
 msgid "Default transfer type:"
 msgstr "Tipo de transferencia por defecto:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
-msgstr "Prestablecido: http://ip.filezilla-project.org/ip.php"
+msgstr "Prestabelcido: http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
 msgstr ""
 "O intervalo entre tentativas de conexión erradas ten de estar entre 1 e 999 "
-"segundos"
+"segundos."
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
-#, fuzzy, c-format
+#: ../../locales/../src/engine/engineprivate.cpp:630
+#, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
 "attempt..."
@@ -2827,153 +2817,152 @@
 "Delaying connection for %d seconds due to previously failed connection "
 "attempt..."
 msgstr[0] ""
-"Estase a demorar a conexión por mor dunha tentativa previa de conexión "
-"errada..."
+"Estase a demorar a conexión %d segundo por mor dunha tentativa previa de "
+"conexión errada..."
 msgstr[1] ""
-"Estase a demorar a conexión por mor dunha tentativa previa de conexión "
-"errada..."
+"Estase a demorar a conexión %d segundos por mor dunha tentativa previa de "
+"conexión errada..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
-msgstr "Borrar a entrada do xestor do sitio"
+msgstr "Eliminar a entrada do xestor do sitio"
 
-#: resources.h:629 resources.h:650
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
-msgstr "Eliminar o directorio seleccionado"
+msgstr "Eliminar o cartafol seleccionado"
 
-#: resources.h:569 resources.h:583
-#, fuzzy
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
-msgstr "Borrar o ficheiro e os cartafoles seleccionados"
+msgstr "Eliminar os cartafoles seleccionados"
 
-#: ../../locales/../src/interface/search.cpp:1038
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting directories"
-msgstr "Estase a crear o directorio"
+msgstr "Eliminado os cartafoles"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
-msgstr ""
+msgstr "Non se admite aínda eliminar múltiplos cartafoles sen relación"
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
-msgstr ""
+msgstr "Borrando ligazón simbólica"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "Escritorio"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Detalles"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "Detalles para a chave nova:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "Dire&ctories"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Enderezo"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
-#, fuzzy
+#: ../../locales/../src/interface/filelistctrl.cpp:523
 msgid "Directory"
-msgstr "Enderezo"
+msgstr "Cartafol"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
-#, fuzzy
+#: resources.h:652 resources.h:926 resources.h:1009
+#: ../../locales/../src/interface/filelistctrl.cpp:445
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
-msgstr "Dire&ctories"
+msgstr "Comparación de cartafoles"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 #: ../../locales/../src/interface/listingcomparison.cpp:82
 #: ../../locales/../src/interface/listingcomparison.cpp:88
-#, fuzzy
 msgid "Directory comparison failed"
-msgstr "Fallou a relación do directorio"
+msgstr "Fallou a comparación de cartafoles"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
 msgstr ""
+"Quer non existe cartafol que contén o ficheiro de rexistro quer o nome do "
+"ficheiro non é correcto."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "O usuario cancelou a listaxe do directorio"
+msgstr "O usuario cancelou a listaxe do cartafol"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
-msgstr "Fallou a relación do directorio"
+msgstr "Fallou a relación do cartafol"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
-msgstr "Filtros da relación do directorio"
+msgstr "Filtros da relación do cartafol"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "Relacionouse o directorio correctamente"
+msgstr "Relacionouse o cartafol correctamente"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "Desacti&var todo"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
+"Quere desactivar a navegación sincronizada e continuar cambiando o cartafol "
+"remoto?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
-msgstr "Desactive esta opcións se non pode volver a ver os seus ficheiros. "
+msgstr ""
+"Desactive esta opción se xa non pode volver ver o contido correcto do "
+"cartafol."
 
-#: resources.h:984
+#: resources.h:1002
 msgid "Disconnect from server"
 msgstr "Desconectar do servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "Estase a desconectar do servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1134
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
-#, fuzzy, c-format
+#, c-format
 msgid "Disconnected from server: %s"
-msgstr "Estase a desconectar do servidor"
+msgstr "Desconectado do servidor: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1429
+#: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
 msgstr "Estase a desconectar do servidor anterior"
 
-#: resources.h:985
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
-msgstr "Desconecta do servidor actualmente visible"
+msgstr "Desconecta do servidor actualmente visíbel"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
-msgstr "Amosar diálogo Acerca de"
+msgstr "Amosar o diálogo Sobre"
 
-#: resources.h:926
-#, fuzzy
+#: resources.h:944
 msgid "Do &not use default editor"
-msgstr "Us&ar sempre o editor preestablecido"
+msgstr "No&n usar o editor predeterminado"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "Non facer &nada"
 
@@ -2983,92 +2972,88 @@
 "Do you really want to check for beta versions?\n"
 "Unless you want to test new features, keep using stable versions."
 msgstr ""
-"Desexa realmante comprobar se hai versións beta?\n"
-"A non ser que desexar probar novas características, é mellor que siga a "
-"empregar as versións estables."
+"Quere comprobar se hai versións beta?\n"
+"A non ser que desexe probar novas características, é mellor que continúe "
+"empregando as versións estábeis."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
-msgstr "Desexa realmente pechar o FileZilla?"
+msgstr "Quere pechar o FileZilla?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
-"Desexa relamente eliminar todas as entradas do Xestor de sitios e a listaxe "
-"de tranferencia?"
+"Quere eliminar todas as entradas do Xestor de sitios e a lista de "
+"tranferencia?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
-msgstr "Desexa realmente eliminar todas as entradas do Xestor de sitios?"
+msgstr "Quere eliminar todas as entradas do Xestor de sitios?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
-msgstr "Desexa realmente eliminar as entradas seleccionadas?"
+msgstr "Quere eliminar as entradas seleccionadas?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Desexa realmete eliminar a cola de transferencia?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr "Desexa realmente enivar '%s' ao servidor?"
-
-#: resources.h:465
-#, fuzzy
+msgstr "Quere enviar '%s' ao servidor?"
+
+#: resources.h:467
 msgid "Documentation"
-msgstr "Os meus documentos"
+msgstr "Documentación"
 
-#: resources.h:693
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
 msgstr "Non empregue números externos de IP en conexións &locais."
 
-#: resources.h:829
-#, fuzzy
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr "&Tratar os ficheiros que comezan con punto como os ficheiros ASCII"
+msgstr ""
+"Os ficheiros punto son os ficheiros cun nome que comezan con punto, i.e. ."
+"htaccess"
 
-#: resources.h:911
+#: resources.h:929
 msgid "Double-click action"
-msgstr ""
+msgstr "Acción ao premer dúas veces"
 
-#: resources.h:361
-#, fuzzy
+#: resources.h:363
 msgid "Download"
-msgstr "&Descargar"
+msgstr "Descargar"
 
-#: resources.h:481 resources.h:805
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
 msgstr "&Límite de descarga:"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
 msgid "Download limit: %s/s"
-msgstr "&Límite de descarga:"
+msgstr "Límite de descarga: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:606
 msgid "Download limit: none"
-msgstr "&Límite de descarga:"
+msgstr "Límite de descarga: ningún"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 msgid "Download search results"
-msgstr "Descargar o directorio seleccionado"
+msgstr "Descargar os resultados da procura"
 
-#: resources.h:623
+#: resources.h:639
 msgid "Download selected directory"
-msgstr "Descargar o directorio seleccionado"
+msgstr "Descargar o cartafol seleccionado"
 
-#: resources.h:573
-#, fuzzy
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "Descargar os ficheiros e os cartafoles seleccionados"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "Estase a descargar"
 
@@ -3078,20 +3063,19 @@
 msgid "Downloading %s"
 msgstr "Estase a descargar %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
-msgstr ""
+msgstr "Non é aínda compatíbel descargar múltiplos cartafoles sen relación"
 
-#: ../../locales/../src/interface/search.cpp:952
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading search results"
-msgstr "Estase a descargar %s"
+msgstr "Estase a descargar os resultados da procura"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
@@ -3099,82 +3083,74 @@
 "Aínda non se implementou a función de arrastrar e soltar entre diferentes "
 "instancias do FileZilla."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Aínda non se implementou a función de arrastrar e soltar entre diferentes "
 "servidores."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Duplicar o nome do filtro"
-
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "A&ctivar todo"
 
-#: resources.h:559 resources.h:576
-#, fuzzy
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
-msgstr "&Crear directorio"
+msgstr "I&nserir artafol"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "E&xecutar"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "Saír"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "E-Mail:"
 msgstr "Correo electrónico:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
 msgstr "Cada filtro precisa, cando menos, unha condición."
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
 msgstr "Edición dos filtros"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
+"Editar o ficheiro co editor configurado e enviar as mudanzas ao servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Editing failed"
-msgstr "A&brir ficheiro"
+msgstr "Fallou a edición"
 
-#: resources.h:874
+#: resources.h:892
 msgid "Email:"
-msgstr "Correo electrónico"
+msgstr "Correo electrónico:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
-msgstr "Orde baleira."
+msgstr "Orde vadía"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
 msgid "Empty command."
-msgstr "Orde en branco"
+msgstr "Orde vadía."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
-msgstr "A listaxe do directorio está baleira"
+msgstr "A listaxe do cartafol está baleira"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:26
-#, fuzzy
 msgid "Empty directory."
-msgstr "A listaxe do directorio está baleira"
+msgstr "Cartafol vadío."
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
@@ -3194,80 +3170,74 @@
 msgid "Empty quoted string."
 msgstr "A cadea entre comiñas está baleira."
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "Activar todo"
 
-#: resources.h:814
-#, fuzzy
+#: resources.h:830
 msgid "Enable invalid character &filtering"
-msgstr "Fallou a validación do filtro"
+msgstr "Activar o &filtro de caracteres incorrectos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
-msgstr ""
+msgstr "Cifrado"
 
-#: resources.h:343
-#, fuzzy
+#: resources.h:345
 msgid "Encryption"
-msgstr "Conexión"
+msgstr "Cifrado"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
-msgstr ""
+msgstr "Detalles do cifrado"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
-msgstr ""
+msgstr "Desexa rematar a comparación e mudar a orde?"
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
-msgstr "Introduza orde personalizada"
+msgstr "Introduza unha &orde personalizada..."
 
-#: resources.h:485
-#, fuzzy, no-c-format
+#: resources.h:487
+#, no-c-format
 msgid "Enter 0 for unlimited speed."
-msgstr "Insira un nome para o conxunto de filtros"
+msgstr "Escriba 0 para non ter límite de velocidade."
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
-msgstr "Insira a orde"
+msgstr "Introduza a orde"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
-msgstr "Insira a orde personalizada"
+msgstr "Introduza a orde personalizada"
 
-#: resources.h:918
-#, fuzzy
+#: resources.h:936
 msgid "Enter directory"
-msgstr "Crear directorio"
+msgstr "Introducir o cartafol"
 
 #: ../../locales/../src/interface/filteredit.cpp:134
 #: ../../locales/../src/interface/filteredit.cpp:194
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Enter filter name"
-msgstr "Insira o nome do filtro"
+msgstr "Introduza o nome do filtro"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
-msgstr "Insira un nome para o conxunto de filtros"
+msgstr "Introduza un nome para o conxunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:390
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
-msgstr "Insira un nome para o conxunto de filtros"
+msgstr "Escriba o novo nome para o conxunto de filtros"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
 msgstr "Introduza un contrasinal"
 
-#: resources.h:560 resources.h:577
-#, fuzzy
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
-msgstr "Eliminar o directorio seleccionado"
+msgstr "Introduza o cartafol seleccionado"
 
-#: resources.h:713
-#, fuzzy
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3278,11 +3248,10 @@
 msgstr ""
 "Introduza o enderezo do servidor.\n"
 "Para especificar o protocolo do servidor, faga que o identificador de "
-"protocolo preceda ao de hospedaxe. Se ningún protocolo é especificado, o "
-"protocolo por defecto (ftp://) será usado.\n"
-"Pode tamén introducir aquí URLS completas na forma protocolo://usuario:"
-"contrasinal@hospedador:porto, os valores nos outros campos serán "
-"sobreescritos entón."
+"protocolo preceda ao de servidor. Se non se especifica ningún protocolo, "
+"usarase o protocolo predeterminado (ftp://).\n"
+"Pode introducir os URL completos na forma protocol://user:pass@host:port "
+"aquí, os valores nos outros campos sobrescribiranse entón."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3290,8 +3259,11 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
+"Escriba o contrasinal para o ficheiro '%s'.\n"
+"Cómpre salientar que o ficheiro convertido non está protexido con "
+"contrasinal."
 
-#: resources.h:717
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3300,241 +3272,251 @@
 "Por defecto 21 para FTP, e 22 para SFT."
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
-#, fuzzy
 msgid "Enter username and password"
-msgstr "Introduza un contrasinal"
+msgstr "Escriba o nome de usuario e o contrasinal"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
 msgstr "Fallou a exportación da configuración"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
 msgstr "Produciuse un erro ao importar"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
+#: ../../locales/../src/interface/QueueView.cpp:2052
+msgid "Error loading queue"
+msgstr "Produciuse un erro a cargar a cola"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "Erro ao cargar o ficheiro de XML"
 
+#: ../../locales/../src/interface/QueueView.cpp:1951
+msgid "Error saving queue"
+msgstr "Produciuse un erro ao gardar a cola"
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
-msgstr ""
+msgstr "Erro ao iniciar o programa"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "Erro ao escribir o ficheiro de XML"
 
 #: ../../locales/../src/interface/updatewizard.cpp:335
-#, fuzzy
 msgid "Error, file name cannot be parsed."
-msgstr "Non se pode eliminar este conxunto de filtros."
+msgstr "Erro, non se pode procesar o nome do ficheiro."
 
 #: ../../locales/../src/interface/updatewizard.cpp:351
-#, fuzzy
 msgid "Error, local file exists but cannot be removed"
-msgstr "Non se pode eliminar este conxunto de filtros."
+msgstr "Erro: o ficheiro local existe pero non se pode borrar"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Erro:"
 
-#: resources.h:477
-#, fuzzy
+#: resources.h:479
 msgid "Establish connection in a new tab"
-msgstr "Non se puido establecer a conexión co servidor"
+msgstr "Estabelecer a conexión nunha nova lapela"
 
-#: resources.h:937
-#, fuzzy
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
-msgstr "png \"c:\\ficheiros do programa\\visor\\visor.exe\" -open"
+msgstr "Exemplo png \"c:\\ficheiros do programa\\visor\\visor.exe\" -open"
 
-#: resources.h:896
-#, fuzzy
+#: resources.h:914
 msgid "Examples"
-msgstr "Exemplo:"
+msgstr "Exemplos"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "Exe&cutar"
 
 #: ../../locales/../src/interface/updatewizard.cpp:320
 msgid "Executable"
-msgstr "Executable"
+msgstr "Executábel"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
-"O executable non contén a información de versión polo que non se pode "
+"O executábel non contén a información de versión polo que non se pode "
 "comprobar se hai actualizacións."
 
-#: resources.h:856
+#: resources.h:872
 msgid "Explorer"
 msgstr "Explorador"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "Exportar a &fila"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "Exportar as &opcións"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
 msgstr "Exportar as opcións"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
 msgstr "Nome do f&iltro:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Protocolo de transferencia de ficheiros"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Protocolo de transferencia de ficheiros con cifrado opcional"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Protocolo inseguro de transferencia de ficheiros"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Non se inciou o motor de FTP, polo que non se pode conectar"
 
-#: resources.h:741
+#: resources.h:757
 msgid "FTP Keep-alive"
 msgstr "Manter activo o FTP"
 
-#: resources.h:761
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy de FTP"
 
 #: ../../locales/../src/interface/cmdline.cpp:19
-#, fuzzy
 msgid "FTP URL"
-msgstr "FTP"
+msgstr "FTP URL"
 
-#: resources.h:669
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
 "O FTP emprega conexións secundarias para a tranferencia de datos. Estas "
-"conexións adicionais poden establecerse de dous xeitos diferentes."
+"conexións adicionais poden estabelecerse de dous xeitos diferentes."
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr "FTPES - FTP sobre TSL/SSL explícito"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP sobre TLS/SSL implícito"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
-msgstr "Fallou ao cambiar de directorio"
+msgstr "Produciuse un fallo ao cambiar de cartafol"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 msgid "Failed to change language"
-msgstr "Fallóuse en cambiar a lingua"
+msgstr "Produciuse un fallo ao cambiar a lingua"
 
 #: ../../locales/../src/interface/updatewizard.cpp:453
 msgid "Failed to check for newer version of FileZilla."
-msgstr "Produciuse un erro ao comprobar as novas versións do FileZilla."
+msgstr "Produciuse un fallo ao comprobar as novas versións do FileZilla."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
-msgstr "Fallou ao escribir o ficheiro %s"
+msgstr "Produciuse un fallo ao copiar ou ao mover os sitios"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
-msgstr "Produciuse un erro ao crear a copia de seguranza do ficheiro de XML"
+msgstr "Produciuse un fallo ao crear a copia de seguranza do ficheiro de XML"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:791
 msgid "Failed to create listen socket, aborting"
-msgstr "Fallou ao crear un conector de escoita, polo que se está a deter."
+msgstr "Produciuse un fallo ao crear un conector de escoita, abortar"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
-"Fallou ao crear un conector de escoita para a transferencia de modo activo"
+"Produciuse un fallo ao crear un conector de escoita para a transferencia de "
+"modo activo"
 
 #: ../../locales/../src/interface/updatewizard.cpp:455
 msgid "Failed to download the latest version of FileZilla."
-msgstr "Produciuse un erro ao descargar a última versión do FileZilla"
+msgstr "Produciuse un fallo ao descargar a última versión do FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:665
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
-msgstr "Non foi posible obter o camiño a \"Os meus documentos\"."
+msgstr "Produciuse un fallo ao obter a ruta de 'Os meus documentos'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:651
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
-msgstr "Fallou ao obter o camiño do escritorio"
+msgstr "Produciuse un fallo ao obter a ruta do escritorio"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:950
-#, fuzzy
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
-"Non foi posible obter o enderezo de destino, polo que se pecha a conexión."
+"Produciuse un fallo ao obter o enderezo homónimo da conexión de control; "
+"pechouse a conexión."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:958
-#, fuzzy
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
-"Non foi posible obter o enderezo de destino, polo que se pecha a conexión."
+"Fallou ao obter o enderezo homónimo da conexión de datos; a conexión "
+"pechouse."
 
 #: ../../locales/../src/interface/context_control.cpp:77
 msgid "Failed to initialize FTP engine"
 msgstr "Fallou ao iniciar o motor de FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
-msgstr "Produciuse un erro ao inciar o TLS"
+msgstr "Produciuse un fallo ao iniciar o TLS."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
@@ -3542,30 +3524,34 @@
 "Fallou ao cargar os paneis; serán incorrectos os ficheiros de recursos?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
-#, fuzzy, c-format
+#, c-format
 msgid "Failed to load private key: %s"
-msgstr "Fallou ao escribir o ficheiro %s"
+msgstr "Fallou ao descargar a chave privada: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
+#, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr "Fallóuse en abrir \"%s\" para engadir / escribir"
+msgstr "Fallou ao abrir \"%s\" para engadir/escribir"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "Fallóuse en abrir \"%s\" para lectura"
+msgstr "Fallou ao abrir \"%s\" para lectura"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "Fallóuse en abrir \"%s\" para escribir"
+msgstr "Fallou ao abrir \"%s\" para escribir"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+msgid "Failed to parse returned path."
+msgstr "Produciuse un erro ao procesar a ruta devolta."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
-msgstr ""
+msgstr "Fallou ao analizar o certificado raíz de confianza."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:1014
 msgid "Failed to receive data"
@@ -3573,25 +3559,25 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
-msgstr "Fallóuse en acadar a listaxe do directorio"
+msgstr "Fallou ao recuperar a lista do cartafol"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "Fallou ao recuperar o número de IP externo; estase a deter"
+msgstr "Fallou ao recuperar o número de IP externo; abortando"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr ""
-"Produciuse un erro ao recuperar o número externo de IP; empregarase o número "
-"local."
+"Produciuse un fallo ao recuperar o enderezo externo de IP; empregarase o "
+"enderezo local"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
 msgstr "Fallou ao recuperar o número de IP local."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "Fallou ao recuperar o número de IP local. Estase a deter"
+msgstr "Fallou ao recuperar o número de IP local. Abortando"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
@@ -3601,82 +3587,86 @@
 msgid "Failed to send command."
 msgstr "Produciuse un erro ao enviar a orde."
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s (%s), usarase o idioma predeterminado "
+"do sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:252
+#, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s (%s), usarase a lingua predeterminada "
+"do sistema (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:240
+#, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s (%s), usarase a lingua predeterminada "
+"do sistema."
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do "
+"sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:248
+#, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do "
+"sistema (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
-#, fuzzy, c-format
+#: ../../locales/../src/interface/FileZilla.cpp:237
+#, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
-"Fallóuse en establecer a lingua a %s, usando a lingua por defecto do sistema"
+"Fallou ao estabelecer o idioma como %s, usarase o idioma predeterminado do "
+"sistema."
 
 #: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
 msgstr "Fallou ao validar a configuración"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:896
 msgid "Failed to verify peer certificate"
-msgstr "Fallou ao recibir os datos"
+msgstr "Fallou ao verificar o certificado homónimo"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
 msgstr "Fallou ao escribir o ficheiro %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "Fallou ao escribir o ficheiro de XML"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Fallou a transferencia"
 
-#: resources.h:684
+#: resources.h:700
 msgid "Fall back to active mode"
 msgstr "Volver ao modo activo"
 
-#: resources.h:368
-#, fuzzy
+#: resources.h:370
 msgid "Fil&e:"
-msgstr "Fich&eiros"
+msgstr "Fich&eiro:"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "Fich&eiros"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:500
+#: ../../locales/../src/interface/filelistctrl.cpp:518
+#: ../../locales/../src/interface/filelistctrl.cpp:527
 msgid "File"
 msgstr "Ficheiro"
 
@@ -3684,16 +3674,15 @@
 msgid "File Types"
 msgstr "Tipos de ficheiros"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
 msgstr "O ficheiro non contén ningún dato que se poida importar."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
-#, fuzzy
 msgid "File editing"
-msgstr "Edición de ficheiros remotos"
+msgstr "Edición de ficheiros"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "O ficheiro existe"
 
@@ -3701,147 +3690,157 @@
 msgid "File exists action"
 msgstr "Acción se o ficheiro existe"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
 msgstr "Mudou o ficheiro"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
-#, fuzzy
 msgid "File lists"
-msgstr "Listaxe de ficheiros"
+msgstr "Listas de ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
-msgstr "Non se achou o ficheiro"
+msgstr "Non se encontrou o ficheiro"
 
-#: resources.h:995
-#, fuzzy
+#: resources.h:1013
 msgid "File search"
-msgstr "Tamaño"
+msgstr "Busca de ficheiros"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
-#, fuzzy
 msgid "File transfer aborted by user"
-msgstr "O usuario detivo a transferencia"
+msgstr "O usuario abortou a transferencia de ficheiros"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
 msgstr ""
+"A transferencia de ficheiros foi abortada logo de se transferir %s en %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
-#, fuzzy
 msgid "File transfer failed"
-msgstr "Transferiuse o ficheiro correctamente"
+msgstr "Fallou a transferencia de ficheiros"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
-msgstr ""
+msgstr "A transferencia de ficheiros fallou logo de se transferir %s en %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
-#, fuzzy
 msgid "File transfer skipped"
-msgstr "Fallou a transferencia"
+msgstr "Omitiuse a transferencia de ficheiros"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
 msgstr "Transferiuse o ficheiro correctamente"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer successful, transferred %s in %s"
-msgstr "Transferiuse o ficheiro correctamente"
+msgstr "Transferiuse o ficheiro correctamente, transferiuse %s en %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
-msgstr "A transferencia de ficheiros aínda está a se realizar."
+msgstr "A transferencia de ficheiros aínda en proceso."
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
-msgstr ""
+msgstr "O ficheiro transferirase co tipo de datos ASCII."
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
-msgstr ""
+msgstr "O ficheiro transferirase co tipo de datos binario."
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Erro do FileZilla"
 
-#: resources.h:706
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
-"O FileZilla non pode probar a configuración para se asegurar de que todo "
-"está axeitamente configurado."
+"O FileZilla non pode probar a súa configuración para se asegurar de que todo "
+"está apropiadamente configurado."
 
-#: resources.h:476
-#, fuzzy
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
-msgstr "Non se puido conectar ó servidor"
+msgstr "FileZilla xa está conectado ao servidor."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
 msgstr ""
+"O FileZilla está en execución en modo quiosco.\n"
+"Os inicios de sesión 'Normal' e 'Conta' non están dispoñíbeis neste modo."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
-msgstr ""
+msgstr "Debe reiniciar o FileZilla para que o cambio de idioma sexa efectivo."
 
-#: resources.h:516
-#, fuzzy
+#: resources.h:525
 msgid "Filelist status &bars"
-msgstr "Listaxe de ficheiros"
+msgstr "&Barras de estado da lista de ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Nome de ficheiro"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "&Filtros de nomes de ficheiros..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
+"Non se pode construír o nome do ficheiro para o cartafol %s e o ficheiro %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
-msgstr "O nome do ficheiro non é válido"
+msgstr "O nome do ficheiro non é correcto"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / "
+"\\ : * ? \" < > |"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nome de ficheiro non modificado"
 
-#: resources.h:306 resources.h:950
-#, fuzzy
+#: resources.h:308 resources.h:968
 msgid "Filename:"
-msgstr "Nome de ficheiro"
+msgstr "Nome de ficheiro:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / * ? "
 "< > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3849,69 +3848,67 @@
 "Os nomes de ficheiro non poden conter ningún dos seguintes caracteres: / "
 "\\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
-msgstr "Ficheiro con edición en progreso"
+msgstr "Ficheiros que se están a editar actualmente"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
-msgstr "Tamaño"
+msgstr "Tamaño do ficheiro"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
 msgid "Filesize format"
 msgstr "Formato do tamaño dos ficheiros"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tipo de ficheiro"
 
-#: resources.h:938
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
-#, fuzzy
 msgid "Filetype associations"
 msgstr "Asociacións do tipo de ficheiro"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "O filtro aplícase a:"
 
-#: resources.h:813
-#, fuzzy
+#: resources.h:829
 msgid "Filter invalid characters in filenames"
-msgstr "Fallou a validación do filtro"
+msgstr "Filtrar caracteres non correctos nos nomes de ficheiros"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
 msgstr "O nome do filtro xa existe"
 
-#: resources.h:220
-#, fuzzy
+#: resources.h:222
 msgid "Filter out items matching all of the following"
-msgstr "Todas estas condicións"
+msgstr "Filtrar os elementos que coincidan totalmente co seguinte"
 
-#: resources.h:221
-#, fuzzy
+#: resources.h:223
 msgid "Filter out items matching any of the following"
-msgstr "Todas estas condicións"
+msgstr "Filtrar os elementos que coincidan con calquera dos seguintes"
 
-#: resources.h:222
-#, fuzzy
+#: resources.h:224
 msgid "Filter out items matching none of the following"
-msgstr "Todas estas condicións"
+msgstr "Filtrar todos os elementos que non coincidan cos seguintes"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "O conxunto de filtros xa existe"
 
-#: resources.h:988
+#: resources.h:1006
 msgid "Filter the directory listings"
-msgstr "Filtrar a listaxe do directorio"
+msgstr "Filtrar a lista do cartafol"
 
 #: ../../locales/../src/interface/filteredit.cpp:338
 #: ../../locales/../src/interface/filteredit.cpp:347
@@ -3921,21 +3918,21 @@
 
 #: resources.h:9 resources.h:33
 msgid "Fingerprint (MD5):"
-msgstr "Impresión dixital (MDS)"
+msgstr "Impresión dixital (MD5):"
 
 #: resources.h:10 resources.h:34
 msgid "Fingerprint (SHA-1):"
-msgstr "Impresión dixital (SHA-1)"
+msgstr "Impresión dixital (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr "Impresión dixital:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
-msgstr "Asistente de configuración da barreira de protección e o encamiñador"
+msgstr "Asistente de configuración da devasa e do enrutador"
 
-#: resources.h:724
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3943,48 +3940,44 @@
 "Para unha información máis detallada sobre o que estas opcións fan, pode "
 "executar o asistente de configuración de rede."
 
-#: resources.h:701
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Por fiabilidade, debe especificar un intervalo de, cando menos, 10 portos."
 
-#: ../../locales/../src/interface/Options.cpp:194
-#, fuzzy
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr ""
-"Non se puido cargar \"%s\", asegúrese da que o ficheiro é válido.\n"
-"Para esta sesión, a configuración por defecto empregarase e calquera cambio "
-"na configuración non é persistente."
+"Nesta sesión empregarase a configuración predeterminada. Calquera mudanza na "
+"configuración non se gardará."
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
 msgstr "Forzar &UTF-8"
 
-#: resources.h:542
-#, fuzzy
+#: resources.h:552
 msgid "Force showing &hidden files"
-msgstr "Ver os fic&heiros ocultos"
+msgstr "Obrigar que se mostren os ficheiros &ocultos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
-msgstr "Ver os ficheiros ocultos"
+msgstr "Obrigar que se mostren os ficheiros ocultos"
 
-#: resources.h:768
+#: resources.h:784
 msgid "Format specifications:"
 msgstr "Especificacións do formato:"
 
-#: resources.h:936
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
-"Formato: a extensión ten de estar seguida da orde entre comiñas e os "
-"argumentos dela."
+"Formato: a extensión ten de estar seguida da orde apropiada e argumentos "
+"entre comiñas."
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
-msgstr ""
+msgstr "Documentación engadida"
 
 #: resources.h:78
 msgid "General"
@@ -3992,143 +3985,136 @@
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
-msgstr ""
+msgstr "Fallo xeral no servidor de SOCKS"
 
-#: resources.h:786
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr ""
+msgstr "Proxy xenérico"
 
-#: resources.h:690
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
-msgstr "Obten o número externo de IP do URL seguinte:"
+msgstr "Obtén o número externo de IP do URL seguinte:"
 
-#: resources.h:469
-#, fuzzy
+#: resources.h:471
 msgid "Getting help"
-msgstr "&Opcións..."
+msgstr "Obtendo axuda"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
-msgstr "Xa existe un conxunto de filtros con ese nome. Desexa sobrescribilo?"
+msgstr "Xa existe un conxunto de filtros con ese nome; quere sobrescribilo?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
-msgstr ""
+msgstr "Marcadores globais"
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
-msgstr ""
+msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "Permisos de grupo"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
 msgstr "Alta"
 
-#: ../../locales/../src/engine/server.cpp:16
-#, fuzzy
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
-msgstr "FTPS - FTP sobre TLS/SSL implícito"
+msgstr "HTTPS - HTTP sobre TLS"
 
-#: resources.h:339
-#, fuzzy
+#: resources.h:341
 msgid "Hash:"
-msgstr "Hospedador:"
+msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
-msgstr ""
+msgstr "Oculto"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Alta"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Máxima"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 msgid "Highest available port has to be a number between 1024 and 65535."
-msgstr "O porto máis alto dispoñible ten que ter un número entre 1024 e 65535."
+msgstr "O porto máis alto dispoñíbel ten que ter un número entre 1024 e 65535."
 
-#: resources.h:208
-#, fuzzy
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
-"Se preme e matén a tecla Maiúsculas cambiará o estado do filtro nos dous "
-"lados ao mesmo tempo."
+"Premer e manter a tecla de maiúsculas para mudar o estado do filtro en ambos "
+"os lados simultaneamente."
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr "Sitio web:"
 
-#: resources.h:341
-#, fuzzy
+#: resources.h:343
 msgid "Host key fingerprint:"
-msgstr "Impresión dixital:"
+msgstr "Impresión dixital da chave do servidor:"
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "Non coincide a chave do servidor"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
-msgstr ""
+msgstr "O servidor comeza con '[' mais non se atopou o peche para o corchete."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr ""
+msgstr "Servidor inatinxíbel"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
-msgstr "Hospedador:"
+msgstr "Servidor:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "Horas,"
 
-#: resources.h:885
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (examplo: 15:47)"
 
-#: resources.h:728
-#, fuzzy
+#: resources.h:744
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
-"Se non se recibir nin enviar ningún dato durante este tempo, a conexión "
-"pecharase e o FileZilla tentará conectase unha outra vez."
+"Se non se recibe nin envia ningún dato nunha operación durante este tempo, a "
+"conexión pecharase e o FileZilla tentará conectase unha outra vez."
 
-#: resources.h:966
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
-"Se desexa informar de erros, debe especificar un rexistro cun nivel de "
-"depuración alto."
+"Se desexa informar de erros, debe especificar un nivel de rexistro "
+"\"detallado\"."
 
-#: resources.h:681
+#: resources.h:697
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
 "you should try active mode. You can set the transfer mode on a per-server "
 "basis in the Site Manager."
 msgstr ""
-"Se a comprobación automática do asistente ten suceso mais non pode "
-"transferir ningún ficheiro a un servidor particular, é ben posiblel que o "
-"servidor estea mal configurado e debería probar co modo activo. Ten de "
-"configurar o modo de transferencia individualmente por cada servidor no "
-"Xestor de sitios."
+"Se a comprobación automática do asistente ten éxito mais non pode transferir "
+"ningún ficheiro a un servidor particular, o servidor podería estar mal "
+"configurado e debería probar co modo activo. Ten de configurar o modo de "
+"transferencia individualmente para cada servidor no Xestor de sitios."
 
-#: resources.h:676
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4136,107 +4122,114 @@
 "Se a opción de retroceso está activada, poderá conectarse a servidores mal "
 "configurados que rexeiten o modo de transferencia seleccionado."
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
 msgstr ""
+"Se cambia a chave do servidor e non estaba previsto, contacte co "
+"administrador do servidor."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:554
-#, fuzzy
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"Se este problema persistir, deberá contactar co fabricante do encamiñador ou "
-"da barreira de protección para procurar a solución."
+"Se este problema persiste, algún enrutador e/ou devasa mantén trabado o "
+"FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
-#, fuzzy
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"Se este problema persistir, deberá contactar co fabricante do encamiñador ou "
-"da barreira de protección para procurar a solución."
+"Se este problema persistir, algún enrutador e/ou devasa mantén interrompida "
+"a conexión."
 
-#: resources.h:955
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
+"Se o tamaño do ficheiro de rexistro supera o límite, renoméase engadíndolle "
+"\".1\" ao final do ficheiro (e posíbelmente sobrescribiranse outros "
+"ficheiros) e crearase un novo ficheiro."
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
+"Se a ligazón simbólica apunta a un cartafol, o FileZilla pode tanto eliminar "
+"a ligazón simbólica como borrar os contidos do cartafol ligado."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:624
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
 msgstr ""
-"Se este problema persistir, deberá contactar co fabricante do encamiñador ou "
-"da barreira de protección para procurar a solución."
+"Se este problema persistir, deberá contactar co fabricante do enrutador ou "
+"da devasan para procurar a solución."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr "Se o problema persistir, contacte co fabricante do encamiñador."
+msgstr "Se o problema persistir, contacte co fabricante do enrutador."
 
-#: resources.h:277 resources.h:850
+#: resources.h:279 resources.h:866
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
-"Se está a empregar a opción de sobrescribir se é máis recente, a hora do "
-"sistema ten de estar sicronizada coa hora do servidor. Se a hora diferir ao "
-"estaren en dúas zonas horarias diferentes, deberá especificar a diferenza "
-"horaria no xestor de sitios."
+"Se está a empregar a opción 'sobrescribir se é máis recente', a hora do "
+"sistema ten de estar sincronizada coa do servidor. Se a hora difire ao (p."
+"ex. en dúas zonas horarias diferentes), especifique a diferenza horaria no "
+"Xestor de sitios."
 
-#: resources.h:909
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
+"Se está a empregar un selo horario baseado na comparación, consideraranse "
+"dous ficheiros igual se a diferenza entre horaria non excede deste límite."
 
-#: resources.h:924
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Se vostede cambia o idioma, debería reiniciar o FileZilla."
 
-#: resources.h:707
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
-"Se elixe a comprobación, o FIleZilla conectarase a probe.filezilla-project."
+"Se elixe a comprobación, o FileZilla conectarase a probe.filezilla-project."
 "org e realizará algunhas probas sinxelas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Se pecha o FileZilla, perderanse as súas mudanzas."
 
-#: resources.h:826
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
-"Se insire un tipo de ficheiros incorrecto, estes ficheiros poden danarse ao "
-"se transferiren."
+"Se introduce un tipo de ficheiros incorrecto, estes ficheiros poden danarse "
+"ao se transferiren."
 
-#: resources.h:708
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Se obtiver algún erro, a configuración non pode ser correcta."
 
-#: resources.h:740
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"Se ten problemas para recuperar as listaxes de directorios ou para "
-"transferir ficheiros, tente mudar a configuración do modo de transferencia."
+"Se ten problemas para recuperar as listaxes de cartafoles ou para transferir "
+"ficheiros, tente mudar a configuración do modo de transferencia."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:569
 msgid ""
@@ -4244,55 +4237,52 @@
 "remote router or firewall might be misconfigured. In this case try to toggle "
 "passive mode and contact the server administrator for help."
 msgstr ""
-"Se continúa a ter problemas cun servidor en concreto, é posible que estea "
+"Se continúa a ter problemas cun servidor en concreto, é posíbel que estea "
 "mal configurado. Neste caso, pode tentar a cambiar entre os modos activos e "
 "pasivos e contactar coa administración do servidor para obter axuda."
 
-#: resources.h:667
-#, fuzzy
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"Se se completou o asistente e a comprobación tivo éxito, todos os "
-"encamiñadores e as barreiras de protección estarán configurados "
-"correctamente."
+"De se completar o asistente e se a proba final tivo éxito, todos os "
+"enrutadores e as devasas estarán configuradas correctamente."
 
-#: resources.h:703
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
-"Se está a empregar unha barreira de protección, debe asegurarse de que o "
-"FilleZilla está configurado para aceptar a conexión con todos os portos "
-"dados."
+"Se está a empregar unha devasa, debe asegurarse de que o FilleZilla está "
+"configurado para aceptar a conexión con todos os portos dados."
 
-#: resources.h:702
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"Se emprega un encamiñador, deberá asegurarse de que os portos estan "
-"redirixidos ao ordenador en que está a executar o FileZilla."
+"Se emprega un enrutador, deberá asegurarse de que os portos están "
+"redirixidos ao computador en que está a executar o FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
 msgstr ""
-"Se o encamiñador continúa a modificar o número de IP, debe contactar co "
+"Se o enrutador continúa a modificar o número de IP, debe contactar co "
 "fabricante."
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Importar datos dunha versión anterior"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
 msgstr "Configuración da importación"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
 msgstr "Importouse correctamente"
 
@@ -4301,7 +4291,7 @@
 msgid "Improperly quoted association."
 msgstr "A asociación non ten as comiñas correctamente."
 
-#: resources.h:695
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4309,16 +4299,16 @@
 "No modo activo, o FileZilla escoita un porto para as transferencias de "
 "datos. Ten de especificar que portos empregará o FileZilla."
 
-#: resources.h:697
+#: resources.h:713
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
-"Caso de empregar un encamiñador, terá que redirixir todos os portos "
-"dispoñibles pois nese caso o FileZilla non pode escoller aqueles que se han "
-"empregar."
+"Caso de empregar un enrutador, terá que redirixir todos os portos "
+"dispoñíbeis pois o FileZilla non inflúe sobre os portos que escolle o seu "
+"sistema."
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4326,40 +4316,46 @@
 "Caso de preferir as actualizacións automáticas, ten de activar a "
 "comprobación automática no diálogo da configuración."
 
-#: resources.h:685 resources.h:749
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "Para empregar o modo activo, o FileZilla precisa o número de IP externo."
 
-#: resources.h:670
+#: resources.h:686
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
-"No modo pasivo, o máis recomendable para a maioría de usuarios, o FileZilla "
+"No modo pasivo, o máis recomendábel para a maioría de usuarios, o FileZilla "
 "pediralle un porto ao servidor co que se conectará. Para facer isto, non é "
 "preciso configurar ningunha opción."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
+"Cadea incompleta, o certificado raíz non está asinado automaticamente por "
+"unha autoridade certificada"
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
 msgstr "Contrasinal incorrecto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr "Estase a iniciar o TLS..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "Servidor inseguro, non permite FTP sobre TLS."
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactivo"
 
@@ -4368,18 +4364,18 @@
 msgstr "Interface"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
 msgstr "Interrupción feita polo usuario"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
-msgstr "A lonxitude do contido non é válida"
+msgstr "A lonxitude do contido non é correcta"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:623
 msgid "Invalid HTTP Response"
-msgstr "A resposta de HTTP non é válida"
+msgstr "A resposta de HTTP non é correcta"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:544
 #: ../../locales/../src/engine/ControlSocket.cpp:604
@@ -4393,7 +4389,7 @@
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
-msgstr "O tamaño do anaco non é válido."
+msgstr "O tamaño do anaco non é correcto"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:353
 #: ../../locales/../src/interface/netconfwizard.cpp:363
@@ -4401,33 +4397,35 @@
 msgid "Invalid data received"
 msgstr "Recibiuse un dato incorrecto"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
-msgstr "A data non é válida"
+msgstr "A data non é correcta"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
-msgstr "O nome do ficheiro non é válido"
+msgstr "O nome do ficheiro non é correcto"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
+"O servidor non é valido, xa que despois de se pechar o corchete só poden "
+"seguirlle dous puntos e o porto."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
-#, fuzzy
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
-msgstr "A data non é válida"
+msgstr "Entrada incorrecta"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
-msgstr "Deuse un porto inválido. O porto ten que ter un valor de 1 a 65535."
+msgstr "Deuse un porto incorrecto. O porto ten que ter un valor de 1 a 65535."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4435,215 +4433,216 @@
 "ftps:// for FTP over SSL (implicit) and\n"
 "ftpes:// for FTP over SSL (explicit)."
 msgstr ""
-"Especificouse un protocolo que non é válido. Os válidos son os seguintes:\n"
-"ftp:// para un FTP normal.\n"
-"sftp:// para o protocolo de transferencia de ficheiros SSH.\n"
-"ftps:// para FTP sobre SSL (implícito)\n"
+"Especificouse un protocolo que non é correcto. Os correctos son os "
+"seguintes:\n"
+"ftp:// para un FTP normal,\n"
+"sftp:// para o protocolo de transferencia de ficheiros SSH,\n"
+"ftps:// para FTP sobre SSL (implícito) e\n"
 "ftpes:// para FTP sobre SSL (explícito)."
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
 #, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"O servidor non é valido, xa que despois de se pechar o corchete só poden "
+"seguirlle dous puntos e o porto."
+
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Invalid regular expression in search conditions."
-msgstr "O tamaño da condición non é válido"
+msgstr "Expresión regular incorrecta nas condicións de procura."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
-msgstr "O código da resposta non é válido"
+msgstr "O código da resposta non é correcto"
 
-#: ../../locales/../src/interface/search.cpp:718
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:692
+#, c-format
 msgid "Invalid search conditions: %s"
-msgstr "O tamaño da condición non é válido"
+msgstr "Condicións de procura incorrectas: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
-msgstr "A data non é válida"
+msgstr "Ruta do sitio incorrecta"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
-msgstr "O tamaño da condición non é válido"
+msgstr "O tamaño da condición non é correcto"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
-msgstr "Nome de usuario inválido."
+msgstr "Nome de usuario incorrecto."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Jurisdiction country:"
-msgstr ""
+msgstr "País da xurisdición:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction locality:"
-msgstr ""
+msgstr "Localidade de xurisdición:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
-msgstr ""
+msgstr "Provincia ou estado de xurisdición:"
 
-#: resources.h:906
+#: resources.h:924
 msgid "Keep directories on top"
-msgstr "Manter os directorios arriba"
+msgstr "Manter os cartafoles arriba"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"Para alén diso, non todos os servidores son compatibles con esta "
-"características e mesmo poden devolver listaxes incorrectas se a "
-"característica 'Vista de todos os ficheiros ocultos' estiver activada. A "
-"pesar de o FileZilla realizar algunhas probas para verificar se o servidor é "
-"compatible, esta proba pode fallar."
+"Repare que non todos os servidores son compatíbeis con esta caracterísitca e "
+"talvez poidan devolver listaxes incorrectas se esta opción está activada. "
+"Aínda que o FileZilla realiza algunhas probas para comprobar se o servidor é "
+"compatíbel con esta característica, a proba pode fallar."
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
-msgstr ""
+msgstr "Cambio de chave"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "Mínima"
 
-#: resources.h:922
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Idioma"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
-msgstr "Idioma"
+msgstr "Cambio de idioma"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Ültima modificación"
 
-#: resources.h:853
+#: resources.h:869
 msgid "Layout"
 msgstr "Distribución"
 
-#: resources.h:799
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
 msgstr "Límite para as &descargas simultáneas:"
 
-#: resources.h:801
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
 msgstr "Límite para os envíos simultáneos:"
 
-#: resources.h:744
+#: resources.h:760
 msgid "Limit local ports"
 msgstr "Limitar portos locais"
 
-#: resources.h:952
+#: resources.h:970
 msgid "Limit size of logfile"
-msgstr ""
+msgstr "Tamaño límite do ficheiro"
 
-#: resources.h:953
+#: resources.h:971
 msgid "Limit:"
-msgstr ""
+msgstr "Límite:"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
 msgstr "Excedeuse a lonxitude da liña"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
-msgstr ""
+msgstr "Ligado contra"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:267
 msgid "Listen socket closed"
 msgstr "Sócket de escoita pechado"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "Lista:"
 
-#: resources.h:747
-#, fuzzy
+#: resources.h:763
 msgid "Lo&west available port:"
-msgstr "P&orto más baixo dispoñible:"
+msgstr "P&orto más baixo dispoñíbel:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
-msgstr "Localidade:"
+msgstr "Local"
 
-#: resources.h:363
-#, fuzzy
+#: resources.h:365
 msgid "Local file"
-msgstr "Filtros locais:"
+msgstr "Ficheiro local"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
-msgstr "O ficheiro que escolleu non existe."
+msgstr "O ficheiro local non existe."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
-msgstr ""
+msgstr "O ficheiro local é un cartafol no canto dun ficheiro regular."
 
-#: resources.h:202
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr "O ficheiro local ten un nome incorrecto."
+
+#: resources.h:204
 msgid "Local filters:"
 msgstr "Filtros locais:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Sitio local:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Locality:"
 msgstr "Localidade:"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
-#, fuzzy
 msgid "Log file"
-msgstr "ficheiro"
+msgstr "Ficheiro de rexistro"
 
-#: resources.h:250
-#, fuzzy
+#: resources.h:252
 msgid "Log of update check:"
-msgstr "Comprobación automática de ficheiros"
+msgstr "Rexistrar comprobacións de actualizacións:"
 
-#: resources.h:947
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
-msgstr ""
+msgstr "Rexistro"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 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 ""
 "A identificación contén caracteres non-ASCII e talvez o servidor non é "
-"compatible co UTF-8. "
+"compatíbel co UTF-8. Non se pode volver ao xogo de caracteres local xa que "
+"se está a empregar o proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
-"Os datos de identificación contén caracteres non-ASCII e o servidor talvez "
-"non é compatible co UTF-8. Estase a tentar coa codificación local."
+"Os datos de identificación conteñen caracteres non-ASCII e o servidor talvez "
+"non é compatíbel co UTF-8. Estase a tentar coa codificación local."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "A secuencia de indentificación executouse completamente mais aínda non se "
@@ -4652,6 +4651,7 @@
 #: ../../locales/../src/interface/cmdline.cpp:95
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
+"O tipo de rexistro ten de ser 'preguntar' ou 'interactivo' (sen comiñas)."
 
 #: ../../locales/../src/interface/cmdline.cpp:10
 #, c-format
@@ -4659,29 +4659,33 @@
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
+"O rexistro só se pode empregar cun URL de FTP. O argumento debe de estar "
+"entre '%s' ou '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Baixa"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Mínima"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr ""
-"O porto máis baixo dispoñible ten que ter un número entre 1024 e 65535."
+"O porto máis baixo dispoñíbel ten que ter un número entre 1024 e 65535."
 
 #: resources.h:20 resources.h:44
 msgid "MAC:"
-msgstr ""
+msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
+"Cómpre asegurarse de que se pode acceder ao ficheiro e que é un documento "
+"XML ben formado."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
@@ -4697,76 +4701,73 @@
 msgstr "Cabeceira mal formada: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:593
-#, fuzzy
 msgid "Malformed reply, server not sending proper line endings"
 msgstr ""
 "Resposta mal formulada; o servidor non envía remates de liñas incorrectos"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: resources.h:395 ../../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
 msgid "Manual transfer"
-msgstr "Fallou a transferencia"
+msgstr "Transferencia manual"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "Todas estas condicións"
 
-#: resources.h:434
-#, fuzzy
+#: resources.h:436
 msgid "Match any of the following"
-msgstr "Todas estas condicións"
+msgstr "Usar unha das seguintes"
 
-#: resources.h:435
-#, fuzzy
+#: resources.h:437
 msgid "Match none of the following"
-msgstr "Todas estas condicións"
+msgstr "Non usar unha das seguintes"
 
-#: resources.h:797
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr "Número máximo de &transferencias simultáneas:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
-msgstr ""
+msgstr "Rexistro da mensaxe"
 
-#: resources.h:864
+#: resources.h:880
 msgid "Message log position"
-msgstr ""
+msgstr "Posición do rexistro da mensaxe"
 
-#: resources.h:954
+#: resources.h:972
 msgid "MiB"
-msgstr ""
+msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "Minutos"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
-msgstr ""
+msgstr "Bai&xar"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
-msgstr ""
+msgstr "S&ubir"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "O meu PC"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "Os meus documentos"
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Os meus sitios"
 
@@ -4775,106 +4776,100 @@
 msgid "N/a"
 msgstr "MVSN/a"
 
-#: resources.h:398
-#, fuzzy
+#: resources.h:400
 msgid "Name"
-msgstr "Nome:"
+msgstr "Nome"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "O nome xa existe"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
-msgstr "O nome xa existe"
+msgstr "O nome do marcador xa existe."
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Nome:"
 
 #: ../../locales/../src/interface/filteredit.cpp:347
 msgid "Need to enter filter name"
-msgstr "Precisa inserir un nome de ficheiro"
+msgstr "Cómpre introducir un nome de ficheiro"
 
-#: ../../locales/../src/interface/search.cpp:708
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:682
 msgid "Need to enter valid remote path"
-msgstr "Precisa inserir un nome de ficheiro"
+msgstr "Cómpre introducir unha ruta remota correcta"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr "Precisa especificar unha codificación de caracteres"
 
 #: ../../locales/../src/engine/proxy.cpp:436
 msgid "Network unreachable"
-msgstr ""
+msgstr "Rede inatinxíbel"
 
 #: resources.h:73
 msgid "New &Folder"
 msgstr "Carta&fol novo"
 
-#: resources.h:493
-#, fuzzy
+#: resources.h:502
 msgid "New &tab"
-msgstr "Novo sitio"
+msgstr "Nova &lapela"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
-msgstr ""
+msgstr "Novo &marcador"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
-msgstr ""
+msgstr "Novo marcador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
-#, fuzzy
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
-msgstr "Crear directorio"
+msgstr "Novo cartafol"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
-msgstr ""
+msgstr "Novas características e melloras en %s"
 
 #: ../../locales/../src/interface/filteredit.cpp:129
 msgid "New filter"
 msgstr "Novo filtro"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Novo cartafol"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Novo sitio"
 
-#: resources.h:862
-#, fuzzy
+#: resources.h:878
 msgid "Next to the transfer queue"
-msgstr "Inverte a visualización da cola de transferencia"
+msgstr "Preto da cola de trasnferencia"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
 msgid "No"
 msgstr "Non"
 
@@ -4882,303 +4877,291 @@
 msgid "No category to export selected"
 msgstr "Non se seleccionou ningunha categoría para exportar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
 msgstr "Non se especificou ningunha orde; estase a deter."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr ""
 "Non se configurou ningun número de IP externo, polo que se está a tentar co "
 "predeterminada."
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
-msgstr "Actualmente non se está a editar ningún ficheiro remoto"
+msgstr "Actualmente non se está a editar ningún ficheiro."
 
 #: ../../locales/../src/interface/filteredit.cpp:141
-#, fuzzy
 msgid "No filter name given"
-msgstr "Insira o nome do filtro"
+msgstr "Non se escribiu ningún nome ao ficheiro"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
 msgstr "Non se deu o hospedador, polo que debe introducir un."
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
-msgstr "Non hai imaxes dispoñibles"
+msgstr "Non hai imaxes dispoñíbeis"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
-msgstr "Engadir &ficheiros á cola"
+msgstr "Non hai máis ficheiros na cola!"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
-msgstr "Insira un nome para o conxunto de filtros"
+msgstr "Non se especificou ningún nome ao conxunto de filtros."
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
-msgstr ""
+msgstr "Non hai ningún programa asociado co tipo de ficheiro"
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
+"Non hai ningún programa asociado para editar ficheiros coa extensión '%s'."
 
-#: ../../locales/../src/interface/search.cpp:566
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:540
 msgid "No search results"
-msgstr "Descargar o directorio seleccionado"
+msgstr "Ningún resultado da procura"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
-msgstr "Non hai ningún sitio dispoñible"
+msgstr "Non hai ningún sitio dispoñíbel"
 
 #: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
-msgstr ""
+msgstr "O método de autenticación SOCKS5 non é compatíbel"
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
-#, fuzzy
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr "Insira o nome do filtro"
+msgstr "Non se especificou ningún nome de usuario."
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:934 resources.h:939
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
-msgstr " Ningún"
+msgstr "Ningún"
 
-#: resources.h:373
-#, fuzzy
+#: resources.h:375
 msgid "None selected yet"
-msgstr "Elimina&r os seleccionados:"
+msgstr "Aínda non se seleccionou nada"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Normal"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
-#, fuzzy
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
 msgid "Not all items could be requeued for viewing/editing."
 msgstr "Non todos os elementos poden volver á cola para se ver ou editar."
 
 #: ../../locales/../src/interface/state.cpp:199
 #: ../../locales/../src/interface/state.cpp:504
-#, fuzzy
 msgid "Not connected"
-msgstr "Conectado"
+msgstr "Non conectado"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "Non está conectado a ningún servidor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
-msgstr "Non está conectado a ningún servidor"
+msgstr "Non está conectado a ningún servidor."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:27
-#, fuzzy
 msgid "Not connected."
-msgstr "Conectado"
+msgstr "Non conectado."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
-"Cómpre salientar que esta característica só é compatible co protocolo FTP."
+"Cómpre salientar que esta característica só é compatíbel co protocolo FTP."
 
-#: resources.h:778
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Cómpre ter en conta que esta opción só funciona en conexións de FTP sen "
 "cifrar e planas."
 
-#: resources.h:795
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
+"Nota: ao usar un próxy xenérico obriga ao modo pasivo nas conexións de FTP."
 
-#: resources.h:895
-#, fuzzy
+#: resources.h:913
 msgid "Number of decimal places:"
-msgstr "Número de días entre as comprobacións de actualización:"
+msgstr "Número de lugares decimais:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
-msgstr "O número de tentativas ten que estar entre 0 e 9."
+msgstr "O número de tentativas ten que estar entre 0 e 99."
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "A&brir ficheiro"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:677
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
-"Nas páxinas seguintes, hase configurar o modo de transferencia seleccionado "
-"así como se se desexa activar o modo de retroceso."
+"Nas páxinas seguintes, hase configurar o modo de transferencia seleccionado, "
+"tamén no caso de estar activo o modo de retroceso."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 msgid "Once"
 msgstr "Unha vez"
 
-#: resources.h:946
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
 msgstr ""
+"Só as versións do FileZilla e o sistema operativo que está a empregar serán "
+"enviados ao servidor."
 
-#: resources.h:646
+#: resources.h:662
 msgid "Open directory in system's file manager"
-msgstr ""
+msgstr "Abrir o cartafol no xestor de ficheiros do sistema"
 
-#: resources.h:968 resources.h:969
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "Abrir o Xestor de sitios"
 
-#: resources.h:562
-#, fuzzy
+#: resources.h:572
 msgid "Open the file."
-msgstr "A&brir ficheiro"
+msgstr "Abrir o ficheiro."
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "Abrir o diálogo de configuración do FileZilla"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
-msgstr ""
+msgstr "Aberto como:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
-msgstr "A&brir ficheiro"
+msgstr "Fallou ao abrir"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
-msgstr ""
+msgstr "Abre nunha nova lapela"
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
-msgstr "Abrir o Xestor de sitios"
+msgstr "Abre o Xestor de sitios"
 
-#: resources.h:989
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
+"Abre o diálogo para filtro de listas de cartafoles. Prema co botón dereito "
+"do rato para alternar os filtros."
 
-#: resources.h:170
-#, fuzzy
+#: resources.h:172
 msgid "Operating system"
-msgstr "Detectouse un problema no sistema opertativo"
+msgstr "Sistema operativo"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
 msgstr "Detectouse un problema no sistema opertativo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
 msgstr "Organización:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
 msgid "Other:"
 msgstr "Outro:"
 
-#: resources.h:723
+#: resources.h:739
 msgid "Overview"
 msgstr "Sobrescribir"
 
 #: resources.h:59
-#, fuzzy
 msgid "Overwrite &if source newer"
-msgstr "Sobreescr&ibir se é máis novo"
+msgstr "Sobreescr&ibir se é máis nova a orixe"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
-#, fuzzy
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 msgid "Overwrite file"
-msgstr "S&obrescribir"
+msgstr "Sobrescribir ficheiro"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
-#, fuzzy
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 msgid "Overwrite file if size differs"
-msgstr "Sobrescr&ibir se é máis recente"
+msgstr "Sobrescribir o ficheiro se o tamaño difire"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
-#, fuzzy
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 msgid "Overwrite file if size differs or source file is newer"
-msgstr "Sobrescr&ibir se é máis recente"
+msgstr ""
+"Sobrescribir o ficheiro se o tamaño difire ou o ficheiro de orixe é máis "
+"recente"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
-#, fuzzy
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 msgid "Overwrite file if source file newer"
-msgstr "Sobrescr&ibir se é máis recente"
+msgstr "Sobrescribir ficheiro se o ficheiro de orixe é máis recente"
 
 #: resources.h:60
-#, fuzzy
 msgid "Overwrite if &different size"
-msgstr "Sobrescr&ibir se é máis recente"
+msgstr "Sobrescribir se teñen tamaño &diferente"
 
 #: resources.h:61
-#, fuzzy
 msgid "Overwrite if different si&ze or source newer"
-msgstr "Sobrescr&ibir se é máis recente"
+msgstr "Sobrescribir se teñen &tamaño diferente ou a orixe é máis recente"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
 msgstr "Permisos de usuario"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Propietario / Grupo"
 
-#: resources.h:867
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
+"Evita&r que o sistema entre en espera durante a transferencia e outras "
+"operacións"
 
-#: resources.h:775 resources.h:791
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Servidor de p&roxy:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
-msgstr "O encamiñador ou a barreira modificou a orde PORT."
+msgstr "O enrutador ou a devasa modificou a orde PORT."
 
-#: resources.h:737
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&sivo (recoméndase)"
 
@@ -5186,19 +5169,19 @@
 msgid "Package"
 msgstr "Paquete"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
-msgstr ""
+msgstr "O parámetro non é un URL correcto"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
-msgstr "Contrasinal"
+msgstr "Contra&sinal:"
 
-#: resources.h:673
+#: resources.h:689
 msgid "Passive (recommended)"
 msgstr "Modo pasivo (recoméndase)"
 
-#: resources.h:757
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Modo pasivo"
@@ -5207,55 +5190,54 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:601
 #: ../../locales/../src/interface/netconfwizard.cpp:612
 msgid "Passive mode has been set as default transfer mode."
-msgstr "O modo de transferencia configurouse como pasivo por omisión."
+msgstr "O modo de transferencia pasivo estabeleceuse como o predeterminado."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
-msgstr ""
+msgstr "Requírese o contrasinal"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
-msgstr ""
+msgstr "Ruta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
-msgstr ""
+msgstr "Non se pode construír a ruta para o cartafol %s e o subcartafol %s"
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
-msgstr ""
+msgstr "Rutas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "Pendente de eliminación"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
-msgstr "Permisos"
+msgstr "Permiso"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permisos"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
-msgstr ""
+msgstr "Plataforma:"
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
 msgstr ""
-"Debe ir á http://filezilla-project.org para comprobar se existe unha versión "
-"máis recente do FileZilla."
+"Vaia a http://filezilla-project.org para procurar a versión máis recente do "
+"FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
@@ -5263,7 +5245,7 @@
 "running and carefully check your settings again."
 msgstr ""
 "Debe comprobar en http://filezilla-project.org/probe.php se o servidor está "
-"a se executar e logo comprobe se a configuración é correcta."
+"en execución e logo comprobe se a configuración é correcta."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1076
 msgid ""
@@ -5274,93 +5256,94 @@
 "actualizado ou visite a páxina http://filezilla-project.org para descargar o "
 "código de FileZilla."
 
-#: resources.h:679
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
-"Debe configurar os encamiñadores ou as barreiras de protección para que o "
-"FileZilla poida establecer conexións de saída a portos arbitrarios."
+"Debe configurar todos os enrutadores e devasas para que o FileZilla poida "
+"estabelecer conexións de saída a portos arbitrarios."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
 msgstr ""
-"Debe desactivar as configuracións 'Modo DMZ' OU 'Modo xogos' do seu "
-"encamiñador."
+"Debe desactivar as configuracións 'Modo DMZ' ou 'Modo xogos' do seu "
+"enrutador."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
-#, fuzzy
 msgid ""
 "Please ensure you have a stable internet connection and carefully check your "
 "settings again."
 msgstr ""
-"Debe asegurarse de que ten unha conexión á rede estable e debe comprobar na "
-"páxina http://filezilla-project.org/probe.php que o servidor está a se "
-"executar."
+"Asegúrese de ter unha conexión á rede estábel e revise a súa configuración "
+"unha outra vez."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
 msgid "Please enter a custom date format."
-msgstr "Debe escoller un formato de dato personalizado."
+msgstr "Introduza un formato de dato personalizado."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
-msgstr "Debe introducir un formato de data personalizado."
+msgstr "Introduza un formato horario personalizado."
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr "Introduza a data na forma Ano-Mes-Día como por exemmplo 2010-07-18."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr ""
-"Debe introduciur un límite de velocidade de descarga superior ou igual a 0 "
-"KB/s"
+"Introduza un límite de velocidade de descarga superior ou igual a 0 %s/s."
 
 #: ../../locales/../src/interface/filteredit.cpp:134
 msgid "Please enter a name for the new filter."
-msgstr "Insira un nome para o novo filtro."
+msgstr "Introduza un nome para o novo filtro."
 
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Please enter a new name for the copied filter."
-msgstr "Insira un novo nome para o filtro copiado."
+msgstr "Introduza un novo nome para o filtro copiado."
 
-#: ../../locales/../src/interface/filter.cpp:388
-#, fuzzy, c-format
+#: ../../locales/../src/interface/filter.cpp:403
+#, c-format
 msgid "Please enter a new name for the filter set \"%s\""
-msgstr "Insira un novo nome para o filtro."
+msgstr "Introduza un novo nome para o filtro configurado: \"%s\""
 
 #: ../../locales/../src/interface/filteredit.cpp:194
 msgid "Please enter a new name for the filter."
-msgstr "Insira un novo nome para o filtro."
+msgstr "Introduza un novo nome para o filtro."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent "
 "downloads."
-msgstr "Debe inserir un número entre 0 e 10 para as descargas coincidentes."
+msgstr "Introduza un número entre 0 e 10 para as descargas concorrentes."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent uploads."
-msgstr "Debe inserir un número entre 0 e 10 para os envíos coincidentes."
+msgstr "Introduza un número entre 0 e 10 para os envíos concorrentes."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
 msgid ""
 "Please enter a number between 1 and 10 for the number of concurrent "
 "transfers."
-msgstr ""
-"Debe inserir un número entre 1 e 10 para as transferencias coincidentes."
+msgstr "Introduza un número entre 1 e 10 para as transferencias concorrentes."
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
-msgstr "Por favor escolla unha contrasinal para este servidor:"
+msgstr "Introduza un contrasinal para este servidor:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
 "You can also optionally specify program arguments."
 msgstr ""
-"Debe inserir un camiño e un executable.\n"
-"Por exemplo c:\\alguncamiño\\ficheiro.exe en MS Windows ou /alguncamiño/"
+"Introduza unha ruta e un executábel.\n"
+"Por exemplo c:\\algunharuta\\ficheiro.exe en MS Windows ou /algunharuta/"
 "ficheiro en Unix.\n"
 "Tamén pode especificar argumentos do programa."
 
@@ -5368,59 +5351,62 @@
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
-"Debe inserir un tempo de agarda entre 5 e 9999 segundos ou 0 para o "
-"desactivar."
+"Introduza un tempo de caducidade da espera entre 5 e 9999 segundos ou 0 para "
+"o desactivar."
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
-msgstr "Debe inserir un nome único para este conxunto de flltros."
+msgstr "Introduza un nome único para este conxunto de filtros"
 
-#: resources.h:117
-#, fuzzy
+#: resources.h:118
 msgid "Please enter a username for this server:"
-msgstr "Por favor escolla unha contrasinal para este servidor:"
+msgstr "Introduza un nome de usuario para este servidor:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
-msgstr "Debe inserir un intervalo de porto válido."
+msgstr "Introduza un intervalo de portos correcto."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr "Debe inserir o URL onde obter o enderezo externo."
+msgstr "Introduza o URL onde obter o enderezo externo"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
 msgid "Please enter an update interval of at least 7 days"
-msgstr "Debe inserir un intervalo de actualización de, cando menos, 7 días."
+msgstr "Introduza un intervalo de actualización de, cando menos, 7 días"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
-msgstr "Debe inserir un límite de velocidade de envío maior ou igual a 0 KB/s."
+msgstr "Introduza un límite de velocidade de envío maior ou igual a 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
-"Deve inser unhaa orde de FTP.\n"
-"Ao usar as ordes de FTP en bruto limpara a memoria intermedia do directorio."
+"Introduza unha orde directa de FTP.\n"
+"Ao usar ordes directas de FTP limpará a caché do cartafol."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
-msgstr "Debe introducir o nome do directorio que debe crearse:"
+msgstr "Introduza o nome do cartafol que se debe crear:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
 #, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Introduza o nome do cartafol que se debe crear:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
-msgstr "Por favor escolla unha contrasinal para este servidor:"
+msgstr "Escriba un nome de usuario e un contrasinal para este servidor:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
-msgstr "Debe inserir o seu número de IP externo"
+msgstr "Introduza o seu número de IP externo"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:593
 #: ../../locales/../src/interface/netconfwizard.cpp:606
@@ -5429,87 +5415,88 @@
 "wizard. In case you have a dynamic address or don't know your external "
 "address, use the external resolver option."
 msgstr ""
-"Debe inserir o número de IP externo na páxina do modo activo do asistente. "
-"Caso de ter un número dinámico ou non ter un número externo, debe empregar a "
-"opción de resolución externa."
+"Introduza o seu número de IP externo na páxina do modo activo deste "
+"asistente. Caso de ter un número dinámico ou non saber o seu enderezo "
+"externo, use a opción de resolución externa."
 
-#: resources.h:666
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
 msgstr ""
-"Debe seguir as instrucións con coidado pois caso de ter unha configuración "
-"errada non poderá conectarse correctamente co FTP."
+"Siga as instrucións con coidado pois caso de ter unha configuración errada "
+"non poderá conectarse correctamente co FTP."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:617
-#, fuzzy
 msgid ""
 "Please make sure FileZilla is allowed to establish outgoing connections and "
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
-"Debe confirmar se o FileZilla pode establecer conexións de saída e tamén se "
-"escribir correctamente o enderezo do servidor."
+"Asegúrese de que o FileZilla pode estabelecer conexións de saída e tamén de "
+"que escribiu correctamente o enderezo do servidor de resolucións de "
+"enderezos."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
+"Asegúrese de que o ficheiro locale solicitado está instalado no seu sistema."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:594
-#, fuzzy
 msgid ""
 "Please make sure your router is using the latest available firmware. "
 "Furthermore, your router has to be configured properly. You will have to use "
 "manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
 "'game mode'."
 msgstr ""
-"Debe asegurarse de que o seu encamiñador está a empregar a última versión do "
-"firmware. Para alén diso, o seu encamiñador debe estar correctamente "
-"configurado. Terá de facer un redireccionamento manual dos portos e non debe "
-"configurar o seu encamiñador no modo denominado DMZ ou Xogo."
+"Asegúrese de que o seu enrutador está a empregar a última versión do "
+"firmware dispoñíbel. Para alén diso, o seu enrutador debe estar "
+"correctamente configurado. Terá de facer un redireccionamento manual dos "
+"portos. Non execute o seu enrutador no modo denominado 'DMZ' ou 'modo xogo'."
 
-#: resources.h:680
+#: resources.h:696
 msgid ""
 "Please note that FileZilla has no influence on the port the server chooses. "
 "So the server might choose a port which your firewall thinks is only used by "
 "trojans or other malware. This might raise a false alarm you can safely "
 "discard."
 msgstr ""
-"Cómpre salientar que o FileZilla non ten influencia no porto que o servidor "
-"escolle. Por iso, o servidor pode escoller un porto que a barreira de "
-"protección acha que só o empregan troianos ou outras ameazas. Este feito "
-"podería provocar unha falsa alarma que pode ignorar tranquilamente."
+"Cómpre salientar que o FileZilla non inflúe no porto que escolla o servidor. "
+"Por iso, o servidor pode escoller un porto que a devasa acha que adoitan "
+"empregar troianos ou outras ameazas. Este feito podería provocar unha falsa "
+"alarma que pode ignorar tranquilamente."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
-"Cómpre salientar que conservar a información horaria nos envíos só funciona "
-"en servidores de FTP, FTP e FTPES, mais non en SFTP que admiten a orde MFMT."
+"Cómpre salientar que a conservación do selo horario nos envíos a servidores "
+"FTP, FTP e FTPES só funcionará se admiten a orde MFMT."
 
-#: resources.h:734
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
-"Cómpre salientar que algúns servidores poderían negarlle o acceso se tenta "
-"conectarse con moita frecuencia ou en intervalos moi curtos."
+"Cómpre salientar que algúns servidores poderían vetalo se tenta conectarse "
+"con demasiada frecuencia ou en intervalos moi curtos."
 
-#: resources.h:882 resources.h:888
-#, fuzzy, no-c-format
+#: resources.h:900 resources.h:906
+#, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
-"Debe ler http://filezilla-project.org/wiki/index.php/"
-"Date_and_Time_formatting para máis detalles."
+"Lea http://filezilla-project.org/wiki/index.php/Date_and_Time_formatting "
+"para máis detalles."
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
+"Tente descargar a actualización. As razóns máis probábeis se o problema "
+"persiste, relacionadas en orde de probabilidade decrecente, son as seguintes:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5517,46 +5504,45 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
-"Debe executar unha outra vez o asistente caso de mudar a rede ou se achar "
-"problemas con servidores que funcionaban correctamente con anterioridade."
+"Execute unha outra vez o asistente caso de mudar o seu contorno de rede ou "
+"se xorden problemas con servidores que funcionaban correctamente con "
+"anterioridade."
 
-#: resources.h:455
-#, fuzzy
+#: resources.h:457
 msgid "Please select an action:"
-msgstr "Debe escoller unha acción:"
+msgstr "Seleccione unha acción:"
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
-msgstr "Debe seleccionar as categorías que desexe importar."
+msgstr "Seleccione as categorías que desexe importar."
 
-#: resources.h:668
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
-msgstr "Debe seleccionar o modo de transferencia por omisión que desexa usar."
+msgstr "Seleccione o modo de transferencia predeterminado que quere usar."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:38
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr "Debe seleccionar os novos atributos para o directorio \"%s\"."
+msgstr "Seleccione os novos atributos para o cartafol \"%s\"."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:27
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr "Debe seleccionar os novos atributos para o ficheiro \"%s\"."
+msgstr "Seleccione os novos atributos para o ficheiro \"%s\"."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:41
 msgid "Please select the new attributes for the selected directories."
-msgstr "Debe seleccionar os novos atributos para os directorios seleccionados."
+msgstr "Seleccione os novos atributos para os cartafoles seleccionados."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:44
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
-"Debe seleccionar os novos atributos para os ficheiros e directorios "
-"seleccionados."
+"Seleccione os novos atributos para os ficheiros e cartafoles seleccionados."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:30
 msgid "Please select the new attributes for the selected files."
-msgstr "Debe seleccionar os novos atributos para os ficheiros seleccionados."
+msgstr "Seleccione os novos atributos para os ficheiros seleccionados."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:581
 msgid ""
@@ -5566,20 +5552,19 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
-"Debe actualizar a barreira de protección e asegurarse de que o encamiñador "
-"está a empregar o último firmware dispoñible. Para alén diso, o encamiñador "
-"debe estar correctamente configurado. Deberá facer un redireccionamento "
-"manual de portos, non deberá configurar o seu encamiñador no modo DMZ ou "
-"Xogos e a inspección de protocolo e mais o fixups do protocolo específico "
-"teñen de estar desactivados."
+"Actualize a devasa e asegúrese de que o enrutador está a empregar o último "
+"firmware dispoñíbel. Para alén diso, o enrutador debe estar correctamente "
+"configurado. Deberá facer un redireccionamento manual de portos. Non execute "
+"o seu enrutador no chamado 'modo DMZ' nin no 'modo xogo'. Cousas como a "
+"inspección de protocolo ou os 'fixups' do protocolo específico teñen de "
+"estar desactivadas"
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
-"Pode visitar http://filezilla-project.org para máis información sobre o "
-"FileZilla. "
+"Vexa http://filezilla-project.org para máis información sobre o FileZilla."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1074
 #: ../../locales/../src/interface/updatewizard.cpp:1090
@@ -5587,159 +5572,168 @@
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
-"Pode visitar a páxina http://filezilla-project.org para descargar a versión "
-"máis recente."
+"Ver http://filezilla-project.org para descargar a versión máis recente."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
-msgstr ""
+msgstr "Código postal:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
-msgstr "Sitios predefinidos"
+msgstr "Sitios predeterminados"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
-msgstr "Estase a conservar a información horaria do ficheiro."
+msgstr "Preservando o selo horario do ficheiro"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
-#, fuzzy
 msgid "Preview:"
-msgstr "Vista previa"
+msgstr "Vista previa:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "A conexión principal e os certificados de conexión de datos non coinciden."
 
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
-msgstr ""
+msgstr "Imprimir a información da versión por pantalla e saír"
 
-#: resources.h:905
+#: resources.h:923
 msgid "Prioritize directories (default)"
-msgstr "Priorizar os directorios (por omisión)"
+msgstr "Priorizar os cartafoles (por omisión)"
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioridade"
 
-#: resources.h:945
+#: resources.h:963
 msgid "Privacy policy:"
-msgstr ""
+msgstr "Política de privacidade:"
 
-#: resources.h:781
+#: resources.h:797
 msgid "Private &keys:"
-msgstr ""
+msgstr "C&haves de privacidade:"
 
-#: resources.h:777 resources.h:794
-#, fuzzy
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr "Pro&tocolo:"
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
-msgstr "&Contrasinal do proxy:"
+msgstr "Contrasinal do pro&xy:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "Cola de procesos"
 
-#: resources.h:792
-#, fuzzy
+#: resources.h:808
 msgid "Proxy &port:"
-msgstr "Servidor de p&roxy:"
+msgstr "Porto do &proxy:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
 msgstr "&Usuario do proxy:"
 
 #: ../../locales/../src/engine/proxy.cpp:415
-#, fuzzy
 msgid "Proxy authentication failed"
-msgstr "Fallou a validación do filtro"
+msgstr "Fallou a autenticación do proxy"
 
 #: ../../locales/../src/engine/transfersocket.cpp:132
 #: ../../locales/../src/engine/transfersocket.cpp:146
 #, c-format
 msgid "Proxy handshake failed: %s"
-msgstr ""
+msgstr "Fallou a negociación co proxy: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "O servidor comeza con '[' mais non se atopou o peche para o corchete."
 
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr ""
+msgstr "Resposta do proxy: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr ""
+msgstr "Fallou a solicitude do proxy: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
+"Fallou a solicitude co proxy: descoñécese o tipo de enderezo na resposta "
+"CONECTADO"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
-msgstr "O proxy está configurado mais o servirdor ou o porto non é correcto."
+msgstr "O proxy está configurado mais o servidor ou o porto non son correctos"
 
-#: resources.h:779
+#: resources.h:795
 msgid "Public Key Authentication"
-msgstr ""
+msgstr "Autenticación con chave pública"
 
 #: resources.h:8 resources.h:32
 msgid "Public key algorithm:"
 msgstr "Algoritmo de chave pública:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "Permisos públicos"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
-msgstr ""
+msgstr "A cola procesouse completamente"
 
-#: ../../locales/../src/interface/statusbar.cpp:458
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
 msgid "Queue: %s MiB"
-msgstr "Cola: %s%d MB"
+msgstr "Cola: %s MiB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
 msgid "Queue: %s%s"
-msgstr "Cola: %s%d MB"
+msgstr "Cola: %s%s"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Cola: baleira"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "Ficheiros na cola"
 
-#: resources.h:447
-#, fuzzy
+#: resources.h:449
 msgid "Queueing:"
-msgstr "&Cola de transferencia"
+msgstr "Na cola:"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "Reiniciar o sistema"
 
-#: resources.h:520
-#, fuzzy
+#: resources.h:530
 msgid "R&emote directory tree"
-msgstr "&Crear directorio"
+msgstr "Árbore do cartafol r&emoto"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: resources.h:632 resources.h:636
+msgid "R&eset and requeue selected files"
+msgstr "R&einiciar e reencolar os ficheiros seleccionados"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr "Orde de FTP directa"
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
 msgstr "Ler"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
-msgstr ""
+msgstr "Actuali&zar"
 
 #: resources.h:63
 msgid "Re&name"
@@ -5750,58 +5744,68 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
+"Execute outra vez o asistente, comprobe con coidado as opcións e configure "
+"todos os enrutadores e devasas en conformidade."
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "Le&r"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
-msgstr "Razón"
+msgstr "Só permite lectura"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
-msgstr "Desexa cancelar a operación actual?"
+msgstr "Quere cancelar a operación actual?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Quere eliminar o cartafol %d e o seu contido?"
+msgstr[1] "Quere eliminar %d cartafoles xunto co seu contido?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "Quere eliminar o ficheiro %d?"
+msgstr[1] "Quere eliminar %d ficheiros?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
-msgstr ""
+msgstr "Quere eliminar %s e %s?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
-msgstr "Desexa borrar todos os ficheiros e/ou directorios seleccionados?"
+msgstr "Quere eliminar todos os ficheiros e/ou cartafoles seleccionados?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Razón"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
-msgstr ""
+msgstr "Reiniciar agora"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
-msgstr "Rec&orrir dentro dos subdirectorios"
+msgstr "Rec&ursivamente dentro dos subartafoles"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "Recibiuse unha liña que pasa dos 10000 caracteres, cancelar."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
@@ -5809,20 +5813,20 @@
 msgid "Received data tainted"
 msgstr "Modificáronse os datos que se recibiron"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
 "A información de reconexión non se pode limpar durante a conexión a un "
 "servidor.\n"
-"Se continuar, perderase a conexión."
+"Se continua, perderase a conexión."
 
-#: resources.h:735
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr "Opcións da conexión"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
 msgstr "Reconecta ao último servidor usado"
 
@@ -5830,253 +5834,262 @@
 msgid "Redirection to invalid address"
 msgstr "Redireccionamento a un enderezo incorrecto"
 
-#: resources.h:978 resources.h:979
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
-msgstr "Actualiza as listaxes de ficheiros e cartafoles"
+msgstr "Actualiza as lista de ficheiros e cartafoles"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: resources.h:497
 #, fuzzy
+msgid "Remember password?"
+msgstr "Introduza un contrasinal"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
-msgstr "Elimina&r"
+msgstr "Remoto"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
-msgstr "Non se confiou non certificado remoto"
+msgstr "Non se confía no certificado remoto."
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Ficheiro remoto"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
-#, fuzzy
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Remote file search"
-msgstr "Ficheiro remoto"
+msgstr "Procura de ficheiro remoto"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "Filtros remotos:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
-msgstr "Elimina&r"
+msgstr "Ruta remota"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, 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 ""
+"Non se pode analizar a ruta remota. Asegúrese de que sexa unha ruta absoluta "
+"correcta e sexa compatíbel co tipo de servidor do sitio actual (%s)."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, 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 ""
+"Non se pode procesar a ruta remota. Asegúrese de que sexa unha ruta absoluta "
+"correcta e compatíbel co servidor (%s) seleccionado no sitio pai."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
+"Non se pode procesar a ruta. Asegúrese de que sexa unha ruta absoluta "
+"correcta."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "non se puido iniciar o fzsftp "
+msgstr "Non se puido procesar a ruta remota."
 
-#: resources.h:444
-#, fuzzy
+#: resources.h:446
 msgid "Remote path handling:"
-msgstr "Sitio remoto:"
+msgstr "Xestión da ruta remota:"
 
-#: resources.h:312
-#, fuzzy
+#: resources.h:314
 msgid "Remote path:"
-msgstr "Sitio remoto:"
+msgstr "Ruta remota:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Sitio remoto:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
 msgstr "Elimin&ar todo"
 
-#: resources.h:616 resources.h:619
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
 msgstr "Eliminar os &seleccionados"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Cambiar o nome do ficheiro"
 
-#: resources.h:631 resources.h:652
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
-msgstr "Cambiar o nome aos directorios seleccionados"
+msgstr "Cambiar o nome aos cartafoles seleccionados"
 
-#: resources.h:571 resources.h:585
-#, fuzzy
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "Cambiar o nome aos ficheiros e os cartafoles seleccionados"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Estase a cambiar o nome de '%s' a '%s'"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
-msgstr ""
+msgstr "Informar de erros e solicitude de características"
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
-msgstr "Reinicirar e pór na cola outra vez os ficheiros seleccionados"
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "Require FTP explícito sobre TLS"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "Require FTP implícito sobre TLS"
+
+#: resources.h:634
+msgid "Reset and requeue &all"
+msgstr "Restabelecer e reencol&ar todo"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
-#, fuzzy, c-format
+#, c-format
 msgid "Resolving address of %s"
-msgstr "Estase a resolver o número de IP de %s"
+msgstr "Estase a resolver o enderezo de %s"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1159
 msgid "Resolving hostname"
-msgstr "Estase a resolver o nome do hóspede."
+msgstr "Estase a resolver o nome do servidor"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Resposta:"
 
-#: resources.h:438
-#, fuzzy
+#: resources.h:440
 msgid "Results:"
-msgstr "Resultado da proba"
+msgstr "Resultados:"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
-#, fuzzy
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 msgid "Resume file transfer"
-msgstr "Ficheiro remoto"
+msgstr "Continuar a transferencia do ficheiro"
 
-#: resources.h:852
-#, fuzzy
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
-"Ao reiniciar ficheiros ASCII poderá ter problemas se o servidor emprega un "
-"formado de codificación diferente que o cliente."
+"Reanudar ASCII a tansferencia de ficheiros poderá ter problemas se o "
+"servidor emprega un formado de fin de liña diferente que o cliente."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
-msgstr "Estase a acadar a listaxe do directorio..."
+msgstr "Estase a acadar a listaxe do cartafol..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Estase a obter o número de IP externo de %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:917
 msgid "Root certificate is not trusted"
-msgstr "Non se confiou non certificado remoto"
+msgstr "O certificado raíz non se confiou"
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
-msgstr "Amosar os ficheiros que se editaron recentemente..."
+msgstr "Amo&sar os ficheiros que se editaron recentemente..."
 
-#: resources.h:607
+#: resources.h:885
+msgid "S&how the Site Manager on startup"
+msgstr "Amo&sar o Xestor dos sitios no arranque"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "Apa&gar o sistema"
 
-#: resources.h:436
-#, fuzzy
+#: resources.h:438
 msgid "S&top"
-msgstr "&Auto"
+msgstr "De&ter"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
-msgstr ""
+msgstr "Navegación s&incronizada"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:121
-#, fuzzy
 msgid "SFTP"
-msgstr "FTP"
+msgstr "SFTP"
+
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "Límite:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "Gardar a configuración?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
 msgstr "Estanse a procurar ficheiros para engadir á cola"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
 msgstr "Estase a buscar ficheiros para cargar"
 
-#: resources.h:432
-#, fuzzy
+#: resources.h:434
 msgid "Search &conditions:"
-msgstr "O tamaño da condición non é válido"
+msgstr "Condi&cións da procura:"
 
-#: resources.h:430
-#, fuzzy
+#: resources.h:432
 msgid "Search &directory:"
-msgstr "Crear directorio"
+msgstr "Procurar cartafol:"
 
-#: resources.h:994
+#: resources.h:1012
 msgid "Search for files recursively."
-msgstr ""
+msgstr "Procurar ficheiros recursivamente."
 
-#: resources.h:539
-#, fuzzy
+#: resources.h:549
 msgid "Search server for files"
-msgstr "Filtra f&óra todos os ficheiros que:"
+msgstr "Procurar servidor para os ficheiros"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
-msgstr "Información da recompilación"
+msgstr "Información de seguranza"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:564
 #: ../../locales/../src/interface/netconfwizard.cpp:577
-#, fuzzy
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
-msgstr "Prestablecido: http://ip.filezilla-project.org/ip.php"
+msgstr "Tamén pode ler http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
-#, fuzzy
+#: resources.h:376
 msgid "Sele&ct server"
-msgstr "Seleccionar tema"
+msgstr "Selec&cionar servidor"
 
-#: resources.h:720
+#: resources.h:736
 msgid "Select &page:"
 msgstr "Seleccionar &páxina:"
 
-#: resources.h:870
+#: resources.h:888
 msgid "Select Theme"
 msgstr "Seleccionar tema"
 
-#: resources.h:830
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Seleccionar unha acción por omisión que se realizará se o ficheiro de "
 "destino dunha transferencia xa existe."
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "Seleccione o editor por omisión"
@@ -6087,7 +6100,7 @@
 "selection is valid only for the current session."
 msgstr ""
 "Seleccione a acción por omisión que se executará se o ficheiro de destino "
-"existe. Esta escolla só é válida na sesión actual."
+"existe. Esta escolla só é correcta na sesión actual."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
 msgid ""
@@ -6099,223 +6112,210 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Select download location for package"
-msgstr "Escolla o destino de descarga para o paquete."
+msgstr "Escolla o destino de descarga para o paquete"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
-#, fuzzy
 msgid "Select file containing private key"
-msgstr "O ficheiro que se seleccionou segue a se editar."
+msgstr "Seleccionar ficheiro que conteña unha chave privada"
 
 #: ../../locales/../src/interface/export.cpp:38
-#, fuzzy
 msgid "Select file for exported data"
-msgstr "Escolla un ficheiro para a configuración exportada"
+msgstr "Seleccionar ficheiros para os datos exportados"
 
 #: ../../locales/../src/interface/export.cpp:34
-#, fuzzy
 msgid "Select file for exported queue"
-msgstr "Escolla un ficheiro para a configuración exportada"
+msgstr "Seleccionar ficheiro para a fila exportada"
 
 #: ../../locales/../src/interface/export.cpp:36
 msgid "Select file for exported settings"
 msgstr "Escolla un ficheiro para a configuración exportada"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2673
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
-msgstr "Escolla un ficheiro para a configuración exportada"
+msgstr "Seleccionar ficheiro para os sitios exportados"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr "Escolla un ficheiro para importar as características de"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "Estase a buscar ficheiros para cargar"
+msgstr "Seleccionar ficheiro para subir"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
-#, fuzzy
 msgid "Select filename for converted keyfile"
-msgstr "Escolla un ficheiro para a configuración exportada"
+msgstr "Seleccionar un nome de ficheiro para o ficheiro de chave convertido"
 
-#: resources.h:420
-#, fuzzy, no-c-format
+#: resources.h:422
+#, no-c-format
 msgid "Select how these files should be opened."
-msgstr "O ficheiro seleccionado xa se está a abrir."
+msgstr "Seleccionar como se abriran estes ficheiros."
 
-#: ../../locales/../src/interface/search.cpp:831
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:805
 msgid "Select target download directory"
-msgstr "Cambiar o nome aos directorios seleccionados"
+msgstr "Seleccionar cartafol de descargas de destino"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
-msgstr "Precisa inserir un nome de ficheiro"
+msgstr "Seleccionar o nome de ficheiro de destino"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "Escolla as características para exportar:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "Escolla os datos privados que desexa eliminar."
 
-#: ../../locales/../src/interface/search.cpp:798
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:772
+#, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
-msgstr[0] "Engadir o directorio seleccionado á fila de transferencia"
-msgstr[1] "Engadir o directorio seleccionado á fila de transferencia"
+msgstr[0] "Seleccionouse %d cartafol xunto co seu contido para se transferir."
+msgstr[1] ""
+"Seleccionouse %d cartafoles xunto cos seus contidos para transferir."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:51
-#, fuzzy, c-format
+#, c-format
 msgid "Selected %d directory."
 msgid_plural "Selected %d directories."
-msgstr[0] "Cambiar o nome aos directorios seleccionados"
-msgstr[1] "Cambiar o nome aos directorios seleccionados"
+msgstr[0] "Seleccionou %d cartafol."
+msgstr[1] "Seleccionou %d cartafoles."
 
-#: ../../locales/../src/interface/search.cpp:796
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:770
+#, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
-msgstr[0] "O ficheiro que escolleu non existe."
-msgstr[1] "O ficheiro que escolleu non existe."
+msgstr[0] "Seleccionou %d ficheiro para trasnferir."
+msgstr[1] "Seleccionou %d ficheiros para transferir."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:58
-#, fuzzy, c-format
+#, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
-msgstr[0] "O ficheiro que escolleu non existe."
-msgstr[1] "O ficheiro que escolleu non existe."
+msgstr[0] "Seleccionou %d ficheiro. Tamaño tota: %s"
+msgstr[1] "Seleccionou %d ficheiros. Tamaño total: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:56
-#, fuzzy, c-format
+#, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
-msgstr[0] "O ficheiro que escolleu non existe."
-msgstr[1] "O ficheiro que escolleu non existe."
+msgstr[0] "Seleccionou %d ficheiro. Tamaño total: cando menos %s"
+msgstr[1] "Seleccionou %d ficheiros. Tamaño total: cando menos %s"
 
-#: ../../locales/../src/interface/search.cpp:803
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:777
+#, c-format
 msgid "Selected %s and %s for transfer."
-msgstr ""
-"Engadir os ficheiros e cartafoles seleccionados á cola de transferencia"
+msgstr "Seleccionou %s e %s para trasnferir."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
 msgid "Selected %s and %s. Total size: %s"
-msgstr ""
+msgstr "Seleccionouse %s e %s. Tamaño total: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:66
 #, c-format
 msgid "Selected %s and %s. Total size: At least %s"
-msgstr ""
+msgstr "Seleccionouse %s e %s. Tamaño total: cando menos %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
-#, fuzzy
 msgid "Selected editor does not exist."
-msgstr "O editor que escolleu non existe"
+msgstr "O editor que escolleu non existe."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
 msgstr "O ficheiro seleccionado estase a editar"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-#, fuzzy
-msgid "Selected file already opened."
-msgstr "O ficheiro seleccionado xa se está a abrir."
-
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
-#, fuzzy
 msgid "Selected file is already loaded"
-msgstr "O ficheiro seleccionado xa se está a abrir."
+msgstr "O ficheiro seleccionado xa está cargado"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
-msgstr "O ficheiro que se seleccionou segue a se editar."
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+msgid "Selected file is already opened"
+msgstr "O ficheiro seleccionado xa está aberto"
 
-#: ../../locales/../src/interface/filter.cpp:295
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+msgid "Selected file is still being edited"
+msgstr "O ficheiro seleccionado xa se está a editar"
+
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr "O ficheiro que escolleu non existe."
+msgstr "O filtro que seleccionou só funciona con ficheiros locais."
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
+"O marcador global seleccionado e o servidor actual empregan un diferente "
+"tipo de servidor.\n"
+"Empregue uns marcadores específicos do sitio para este servidor."
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
 msgstr ""
 "Polo xeral, o porto que seleccionou está en uso por un protocolo diferente."
 
-#: resources.h:742
-#, fuzzy
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
-msgstr "Enviar ordes de manter a conexión co FTP."
+msgstr "Enviar ordes mant&er vivo o FTP"
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
-msgstr "Enviar mandatos persoalizados ao servidor non dispoñible doutro xeito"
+msgstr "Enviar unha orde persoalizada ao servidor, non dispoñíbel doutro xeito"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr "Estase a enviar a orde de manter a conexión"
 
 #: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
 msgstr "Número de serie:"
 
-#: resources.h:81 resources.h:88
-#, fuzzy
+#: resources.h:89
 msgid "Server &Type:"
 msgstr "&Tipo de servidor:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
-msgstr ""
+msgstr "O servidor non respondeu axeitadamente, cerre a conexión TSL"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr ""
-"O servidor non é compatible co reanudación de ficheiros maiores de %d GB."
+msgstr "O servidor non permite retomar ficheiros maiores de %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
+#, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"O servidor non é compatible coa reanudación de ficheiros maiores de %d GB. "
-"Remata a transferencia cando os tamaños coinciden."
+"O servidor non permite retomar ficheiros maiores de %d GB. Remata a "
+"transferencia cando os tamaños coinciden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
-msgstr ""
-"O servidor non é compatible coa reanudación de ficheiros maiores de 2 GB"
+msgstr "O servidor non permite retomar ficheiros maiores de 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
-msgstr ""
-"O servidor non é compatible coa reanudación de ficheiros maiores de 4 GB"
+msgstr "O servidor non permite retomar ficheiros maiores de 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
+#, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"O servidor non é compatible coa reanudación de ficheiros maiores de %d GB. "
-"Remata a transferencia cando os tamaños coinciden."
+"O servidor non permite retomar ficheiros maiores de %d GB. Remata a "
+"transferencia cando os tamaños coinciden."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6323,21 +6323,31 @@
 "O servidor precisa unha conta. Debe especificar unha conta mediante o Xestor "
 "do sitio"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr "O servidor devolveu unha ruta vadía."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
+"O servidor enviou unha solicitude adicional de acceso. Precisa usar un tipo "
+"de rexistro interactivo."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
+"O servidor enviou unha resposta pasiva cun enderezo non encamiñábel. Fallou "
+"o modo pasivo."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
 msgstr ""
+"O servidor enviou unha resposta pasiva cun enderezo non encamiñábel. Usarase "
+"o enderezo do servidor no seu lugar."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:403
 #: ../../locales/../src/interface/netconfwizard.cpp:410
@@ -6348,78 +6358,72 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:501
 #: ../../locales/../src/interface/netconfwizard.cpp:510
 #: ../../locales/../src/interface/netconfwizard.cpp:521
-#, fuzzy
 msgid "Server sent unexpected reply."
-msgstr "O servidor enviou unha resposta incorrecta"
+msgstr "O servidor enviou unha resposta que non se agardaba."
 
-#: resources.h:350
-#, fuzzy
+#: resources.h:352
 msgid "Server to client MAC:"
-msgstr "Servidor / ficheiro local"
+msgstr "Servidor a MAC cliente:"
 
-#: resources.h:348
-#, fuzzy
+#: resources.h:350
 msgid "Server to client cipher:"
-msgstr "Servidor / ficheiro local"
+msgstr "Servidor a cifrado cliente:"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
 msgstr "&Tipo de servidor:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
-msgstr "Servidor / ficheiro local"
+msgstr "Servidor/ficheiro local"
 
-#: resources.h:310 resources.h:372
-#, fuzzy
+#: resources.h:312 resources.h:374
 msgid "Server:"
-msgstr "&Servidor"
+msgstr "Servidor:"
 
 #: resources.h:15 resources.h:39
 msgid "Session details"
-msgstr ""
+msgstr "Detalles da sesión"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
-msgstr "Establecer &prioridade"
+msgstr "Estabelecer a &prioridade"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
-msgstr "Establecer permisos de '%s' a '%s'"
+msgstr "Estabelecer os permisos de '%s' a '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
-msgstr "SetSocketBufferSize chamouse sen sócket."
+msgstr "SetSocketBufferSize chamouse sen conectador"
 
-#: resources.h:719
+#: resources.h:735
 msgid "Settings"
 msgstr "Configuración"
 
-#: resources.h:967
+#: resources.h:985
 msgid "Show &raw directory listing"
-msgstr "Amosar tal cal a listaxe do directorio"
+msgstr "Amosar lite&ralmente a listaxe do cartafol"
 
-#: resources.h:550
+#: resources.h:560
 msgid "Show &welcome dialog..."
-msgstr ""
+msgstr "Amosar o diálogo de ben&vida..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
-msgstr ""
+msgstr "Amosar ambas as árbores do cartafol e continuar a comparación?"
 
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
-msgstr ""
+msgstr "Amosar este diálogo de axuda"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
-msgstr "Apa&gar o sistema"
+msgstr "Apagar agora"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "Entradas do xestor de sitios"
 
@@ -6427,76 +6431,76 @@
 msgid "Site Manager"
 msgstr "Xestor de sitios"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "Site Manager - Invalid data"
-msgstr "Xestor de Sitios xa aberto"
+msgstr "Xestor do sitio - Datos incorrectos"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Xestor de Sitios xa aberto"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
-msgstr "O ficheiro que escolleu non existe."
+msgstr "O sitio non existe."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
-msgstr ""
+msgstr "A ruta do sitio ten que comezar por 0 ou 1."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
-msgstr ""
+msgstr "A ruta do sitio está malformada."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
-msgstr ""
+msgstr "Marcadores específicos do sitio"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
+"Os marcadores específicos do sitio requiren que o servidor sexa almacenado "
+"no xestor do sitio.\n"
+"Desexa engadir a conexión actual ao xestor do sitio?"
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Tamaño"
 
-#: resources.h:889
+#: resources.h:907
 msgid "Size formatting"
 msgstr "Formato de tamaño"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Tamaño descoñecido"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
-#, fuzzy
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 msgid "Skip file"
-msgstr "A&brir ficheiro"
+msgstr "Omitir ficheiro"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1270
 #: ../../locales/../src/engine/ControlSocket.cpp:1289
@@ -6514,119 +6518,110 @@
 msgid "Skipping upload of %s"
 msgstr "Estase a omitir a carga de %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
-msgstr "Algúns ficheiros remotos seguen a se editar ou precisan ser enviados."
+msgstr "Algúns ficheiros seguen a se editar ou precisan ser enviados."
 
-#: resources.h:682 resources.h:758
-#, fuzzy
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
-"Algúns servidores remotos mal formatos que acharen tras o seu encamiñador "
+"Algúns servidores remotos mal formatos que se acharen tras o seu enrutador "
 "poderían responder co seu número de IP local."
 
-#: resources.h:907
+#: resources.h:925
 msgid "Sort directories inline"
-msgstr "Ordenar os directorios en liña."
+msgstr "Ordenar os cartafoles en liña"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
-#, fuzzy
+#: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
-"Non se pode arrastrar un directorio a un dous seus directorios inferiores."
+"A instrución de ordenación non se pode mudar ao tempo de comparar cartafoles."
 
-#: resources.h:903
-#, fuzzy
+#: resources.h:921
 msgid "Sorting"
-msgstr "Configuración"
+msgstr "Clasificación"
 
-#: resources.h:904
-#, fuzzy
+#: resources.h:922
 msgid "Sorting &mode:"
-msgstr "Modo de ordenación:"
+msgstr "&Modo de ordenación:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
-msgstr "A orixe e o camiño da operación de soltar son idénticos."
+msgstr "A orixe e a ruta para a operación de soltar son idénticos"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
-#, fuzzy
 msgid "Source and target file may not be the same"
-msgstr "A orixe e o destino da operación de soltar son idénticos."
+msgstr "O ficheiro de orixe e de destino talvez non son o mesmo"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
-msgstr "A orixe e o destino da operación de soltar son idénticos."
+msgstr "A orixe e o destino da operación de soltar son idénticos"
 
 #: resources.h:49
-#, fuzzy
 msgid "Source file:"
-msgstr "Filtros locais:"
+msgstr "Ficheiro de orixe:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
-#, fuzzy
 msgid "Speed Limits"
-msgstr "Límite de transferencia"
+msgstr "Límites de transferencia"
 
-#: resources.h:803
+#: resources.h:819
 msgid "Speed limits"
 msgstr "Límite de transferencia"
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
 msgstr ""
+"Os límites de velocidade están desactivados; faga clic para os cambiar."
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr ""
+msgstr "O límite de velocidade está activado, prema para o cambiar."
 
-#: resources.h:390
-#, fuzzy
+#: resources.h:392
 msgid "Start transfer &immediately"
-msgstr "Modo de transferencia por defecto:"
+msgstr "Comezar a transferencia &inmediatamente"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
-#, fuzzy
 msgid "Start with opened Site Manager"
-msgstr "Abrir o Xestor de sitios"
+msgstr "Comezar co xestor de sitios aberto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "Estase a comezar a descarga de %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Estase a comezar o envío de %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
-msgstr ""
+msgstr "Estado ou provincia:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Estado"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Estado:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "Deter e eliminar &todo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
 msgstr "Rúa:"
 
@@ -6638,37 +6633,39 @@
 msgid "Successful transfers"
 msgstr "Transferencias exitosas"
 
-#: resources.h:710
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr "Resumo dos resultados das probas:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
+"As ligazóns simbólicas aos ficheiros non están afectadas por esta escolla, "
+"estas sempre se borra."
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../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:373
 #: ../../locales/../src/interface/state.cpp:383
 #: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
-msgstr ""
+msgstr "Navegación sincronizada"
 
 #: ../../locales/../src/interface/state.cpp:391
 msgid "Synchronized browsing has been disabled."
-msgstr ""
+msgstr "A navegación sincronizada foi desactivada."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Erro de sintaxe"
 
@@ -6677,54 +6674,60 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
-msgstr "Erro de sintaxe"
+msgstr "Erro de sintaxe na liña de ordes"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
-msgstr ""
+msgstr "Sistema"
+
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "B&arra de ferramentas"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
-#, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
-msgstr "Estableceuse a conexión; estase a enviar a solicitude de HTTP"
+msgstr "Estabeleceuse a conexión TLS/SSL, estase a enviar a solicitude de HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr "Estableceuse a conexión, estase a agardar pola mensaxe de benvida..."
+msgstr "Estabeleceuse a conexión TLS/SSL, agardando pola mensaxe de benvida..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
-msgstr "Estableceuse a conexión TLS/SSL."
+msgstr "Estabeleceuse a conexión TLS/SSL."
 
 #: ../../locales/../src/engine/proxy.cpp:445
 msgid "TTL expired"
-msgstr ""
+msgstr "Expirou o TTL"
 
 #: resources.h:47
 msgid "Target file already exists"
 msgstr "O ficheiro de destino xa existe"
 
 #: resources.h:53
-#, fuzzy
 msgid "Target file:"
-msgstr "Ficheiro remoto"
+msgstr "Ficheiro de destino:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "O ficheiro de destino xa existe"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "O nome do ficheiro de destino xa existe, realmente desexa continuar?"
 
-#: resources.h:709
+#: resources.h:725
 msgid "Test results"
 msgstr "Resultado da proba"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
-msgstr "Estase a probar as capacidades de reanudación do servidor."
+msgstr "Probando as capacidades de retomar do servidor"
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6734,7 +6737,7 @@
 "Desexa continuar? Calquera cambio que se fixer no Xestor de sitios non se "
 "gardará."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
@@ -6742,49 +6745,49 @@
 "O Xestor de sitios está aberto noutra instancia do FileZilla 3.\n"
 "Pécheo ou non se poderán eliminar os datos."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
-msgstr ""
+msgstr "O documento XML non está composto correctamente: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:618
 #, c-format
 msgid "The address you entered was: %s"
 msgstr "O enderezo que introduciu era: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
-msgstr ""
+msgstr "Non se pode engadir o marcador."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
-msgstr "non se puido iniciar o fzsftp "
+msgstr "Os marcadores non se poden limpar."
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr ""
+msgstr "A conexión está cifrada. Prema a icona par ver os detalles."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
 msgstr "A secuencia de rexistro personalizada non pode estar baleira."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
-#, fuzzy, no-c-format
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
+#, no-c-format
 msgid "The default editor for text files could not be found."
-msgstr "É necesario fixar un edior preestablecido."
+msgstr ""
+"Non se puido atopar o editor predeterminado para os ficheiros de texto."
 
-#: resources.h:422
-#, fuzzy, c-format
+#: resources.h:424
+#, c-format
 msgid "The default editor for text files is '%s'."
-msgstr "É necesario fixar un edior preestablecido."
+msgstr "O editor predeterminado para os ficheiros de texto é '%s'."
 
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "O nome do filtro xa existe."
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "O nome do filtro introducido xa existe, escolla un nome diferente."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6799,44 +6802,51 @@
 "Please enter a new name:"
 msgstr ""
 "O ficheiro %s xa existe.\n"
-"Debe inserir un nome novo:"
+"Introduza un nome novo:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
+"Non se pode abrir o ficheiro '%s':\n"
+"Non se atopou o programa asociado (%s).\n"
+"Comprobe as asociacións dos tipos de ficheiros."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr ""
+msgstr "O ficheiro '%s' non se puido cargar ou non contén unha chave privada."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
-#, fuzzy, c-format
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#, c-format
 msgid "The file '%s' could not be loaded."
-msgstr "Non se pode eliminar este conxunto de filtros."
+msgstr "Non de puido cargar o ficheiro '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
+"Non se puido abrir o ficheiro '%s':\n"
+"Ningún programa está asociado no sistema con este tipo de ficheiro."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
+"Non se puido abrir o ficheiro '%s':\n"
+"Fallou a orde asociada"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
 #, c-format
@@ -6846,6 +6856,10 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
+"O ficheiro '%s' ten un formato que non é compatíbel co FileZilla.\n"
+"O ficheiro ademais está protexido cun contrasinal. Os ficheiros de chaves "
+"protexidos por contrasinal non son compatíbeis co FileZilla.\n"
+"Quere converter o ficheiro a un formato non protexido compatíbel?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
 #, c-format
@@ -6853,6 +6867,8 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
+"O ficheiro '%s' non ten un formato compatíbel co FIleZilla.\n"
+"Quere convertelo a un formato compatíbel?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
 #, c-format
@@ -6861,13 +6877,15 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
+"O ficheiro '%s' está protexido por un contrasinal. Os ficheiros de chaves "
+"protexidos con contrasinal non son compatíbeis co FileZilla.\n"
+"Quere convertelo nun ficheiro non protexido?"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
-#, fuzzy
 msgid "The file selected as default editor does not exist."
-msgstr "O editor que escolleu non existe"
+msgstr "O ficheiro seleccionado como editor predeterminado non existe."
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6881,37 +6899,37 @@
 "porto, o nome de usuario e o contrasinal.\n"
 "Desexa continuar coa importación?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr ""
+msgstr "A columna do nome do ficheiro non pode ocultarse nin moverse."
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
-msgstr ""
+msgstr "A columna do nome dos ficheiros non pode ocultarse."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
-msgstr ""
+msgstr "Substituirase o carácter seguinte: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
-msgstr ""
+msgstr "Substituiranse os caracteres seguintes: %s"
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "Os ficheiros seguintes estanse a editar:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
-msgstr ""
+msgstr "A solución FTP de código aberto"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
-msgstr ""
+msgstr "Non se poden gardar os marcadores globais."
 
-#: resources.h:965
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6922,9 +6940,8 @@
 "impacto negativo no rendemento."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
-#, fuzzy
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr "O número de tentativas ten que estar entre 0 e 9."
+msgstr "Cómpre que o límite estea entre 1 e 2000 MiB"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6932,14 +6949,17 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
+"O cartafol local '%s' non está debaixo da raíz de sincronización (%s).\n"
+"Quere desactivar a navegación sincronizada e continuar a cargar o cartafol "
+"local?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
 msgid ""
 "The lowest available port has to be less or equal than the highest available "
 "port."
 msgstr ""
-"O mais baixo porto dispoñible ten que ser menor o igual co porto mais alto "
-"dispoñible."
+"O mais baixo porto dispoñíbel ten que ser menor ou igual có porto mais alto "
+"dispoñíbel."
 
 #: ../../locales/../src/interface/updatewizard.cpp:607
 msgid ""
@@ -6950,52 +6970,51 @@
 "comezar a instalación."
 
 #: ../../locales/../src/interface/updatewizard.cpp:609
-#, fuzzy
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
 msgstr ""
-"Descargouse a versión máis recente. Debe instalala tal e como instalou esta "
+"Descargou a versión máis recente. Debe instalala tal e como instalou esta "
 "versión."
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1964
 msgid "The queue will not be saved."
-msgstr "Non se puido escribir \"%s\", a cola non se puido gardar."
+msgstr "A cola non se gardará."
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1022
 #, 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 ""
+"O cartafol remoto '%s' non está debaixo da raíz de sincronización (%s).\n"
+"Quere desactivar a navegación sincronizada e continuar a cargar o cartafol "
+"remoto?"
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr "Importaranse as categorías seleccionadas."
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
-"O ficheiro seleccionado contén datos que se poden importar para as "
-"categorías seguintes:"
+"O ficheiro seleccionado contén datos que se poden importar nas seguinte "
+"categorías:"
 
-#: resources.h:320
-#, fuzzy
+#: resources.h:322
 msgid "The selected file is already being edited:"
-msgstr "O ficheiro seleccionado estase a editar"
+msgstr "O ficheiro seleccionado estase a editar:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "O ficheiro que seleccionou aínda está aberto noutro programa; por tanto, "
 "debe pechalo."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -7003,19 +7022,17 @@
 msgstr ""
 "O ficheiro seleccionado ten de se executar directamente.\n"
 "Esta opción pode ser perigosa e pode danar o sistema.\n"
-"Desexa realmente continuar?"
+"Querecontinuar?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
-msgstr "non se puido iniciar o fzsftp "
+msgstr "Non se puido engadir o servidor."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
-#, fuzzy
 msgid "The server sent an unexpected or unrecognized reply."
-msgstr "O servidor enviou unha resposta que non se coñece."
+msgstr "O servidor enviou unha resposta que non se coñece ou non se agardaba."
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "O servidor emprega a codificación de caracteres seguintes para os nomes de "
@@ -7029,8 +7046,7 @@
 "Descoñécese o certificado do servidor. Debe examinar con coidado o "
 "certificado para se asegurar de que pode confiar no servidor."
 
-#: resources.h:186
-#, fuzzy
+#: resources.h:188
 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 "
@@ -7038,20 +7054,17 @@
 msgstr ""
 "A chave do servidor non coincide coa chave que está gardada na memoria "
 "intermedia. Isto significa que o administrador a mudou ou está a tentar "
-"conectarse con outro ordenador que finxe ser o servidor.\n"
-"Se a chave do sitio mudou sen se agardar, debe contactar co administrador do "
-"sitio."
+"conectarse con outro ordenador que finxe ser o servidor."
 
-#: resources.h:174
-#, fuzzy
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
-"A chave do servidor non está almacenada no rexistro. Nada lle garante que o "
-"servidor é o computador que pensa que é."
+"Descoñécese a chave do servidor. Nada lle garante que o servidor é o "
+"computador que pensa que é."
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
@@ -7059,77 +7072,80 @@
 "Importáronse as características. Ten de reiniciar o FileZilla para que estas "
 "opcións teñan o seu efecto."
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon reboot unless you click Cancel."
-msgstr ""
+msgstr "Axiña se reiniciará o sistema, a non ser que prema Cancelar."
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3220
 msgid "The system will soon shut down unless you click Cancel."
-msgstr ""
+msgstr "O sistema axiña se apagará a non ser que prema Cancelar."
 
 #: resources.h:48
-#, fuzzy
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
-"O ficheiro %s xa existe.\n"
-"Debe inserir un nome novo:"
+"O ficheiro de destino xa existe.\n"
+"Debe elixir unha acción."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "The test did not succeed. Do you really want to save the settings?"
-msgstr "Fallou a comprobación. Desexa realmente gardar esta configuración?"
+msgstr "Fallou a comprobación. Queregardar esta configuración?"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../locales/../src/interface/filter.cpp:447
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
-msgstr "Non se pode eliminar este conxunto de filtros."
+msgstr "O conxunto de filtros non se pode eliminar."
 
-#: ../../locales/../src/interface/filter.cpp:382
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
-msgstr "Non se pode eliminar este conxunto de filtros."
+msgstr "Non se pode cambiar o nome deste conxunto de filtros."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:575
 msgid ""
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
 msgstr ""
+"Isto significa que algún enrutador e/ou devasa está a interferir co "
+"FileZilla."
 
-#: resources.h:687
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
-"Esta opción só funciona se non está detrás dun encamiñador; se así non for, "
-"o sistema devolverá un enderezo interno."
+"Esta opción só funciona se non está tras dun enenrutadornoutro caso, o "
+"sistema devolverá un enderezo interno."
 
-#: resources.h:665
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
-"O asistente axudarao a configurar calquera encamiñador ou barreira de "
-"protección e probará a configuración."
+"O asistente axudarao a configurar calquera enrutador ou devasa e probará a "
+"configuración."
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Hora"
+
+#: resources.h:901
 msgid "Time formatting"
 msgstr "Formato de hora"
 
-#: resources.h:726
+#: resources.h:742
 msgid "Time&out in seconds:"
 msgstr "Tempo de agarda en segundos:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
 msgstr "Tempo de agarda"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
@@ -7139,25 +7155,31 @@
 "Compensacións da zona horaria: servidor: %d segundos. Local: %d segundos. "
 "Diferenza: %d segundos."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Title:"
 msgstr "Título:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
+"Para comparar cartafoles as dúas relacións de ficheiros deben de estar "
+"aliñadas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
+"Para facer isto, é preciso que as dúas árbores de cartafoles se amosen ou se "
+"agochen."
 
-#: resources.h:780
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
+"Para permitir a autenticación con chave oculta, o FileZilla precisa saber "
+"que chaves privadas se van empregar."
 
-#: resources.h:990
+#: resources.h:1008
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7166,31 +7188,41 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
+"Alternar a comparación de cartafoles. Prema co botón dereito para mudar o "
+"modo de comparación.\n"
+"\n"
+"Cores:\n"
+"Amarelo: o ficheiro só existe nun lugar\n"
+"Verde: o ficheiro é mais novo que o ficheiro sen marcar do outro lado\n"
+"Vermello: os tamaños dos ficheiros son diferentes"
 
-#: resources.h:992
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
+"Alternar a navegación sincronizada.\n"
+"Se estiver activado, ao navegar pola xerarquía do cartafol local tamén se "
+"cambiará o cartafol no servidor e viceversa."
 
-#: resources.h:980 resources.h:981
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
 msgstr "Inverte o procesado da cola de transferencia"
 
-#: resources.h:972 resources.h:973
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
-msgstr "Inverte a visualización da árbore do directorio local"
+msgstr "Inverte a visualización da árbore do cartafol local"
 
-#: resources.h:970 resources.h:971
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
 msgstr "Inverte a visualización do rexistro de mensaxes"
 
-#: resources.h:974 resources.h:975
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
-msgstr "Inverte a visualización da árbore do directorio remoto"
+msgstr "Inverte a visualización da árbore do cartafol remoto"
 
-#: resources.h:976 resources.h:977
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
 msgstr "Inverte a visualización da cola de transferencia"
 
@@ -7203,51 +7235,47 @@
 msgstr "Demasiados redireccionamentos"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "Seguimento:"
 
-#: resources.h:913 resources.h:919
-#, fuzzy
+#: resources.h:931 resources.h:937
 msgid "Transfer"
-msgstr "&Tranferencia"
+msgstr "Tranferencia"
 
-#: resources.h:360
-#, fuzzy
+#: resources.h:362
 msgid "Transfer &direction"
-msgstr "Configuración de transferencia"
+msgstr "&Dirección da transferencia"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "Tipo de &transferencia"
 
-#: resources.h:736
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "Modo de Transferencia"
 
-#: resources.h:869
-#, fuzzy
+#: resources.h:887
 msgid "Transfer Queue"
-msgstr "Limpar a cola de &transferencias"
+msgstr "Cola de transferencias"
 
-#: resources.h:97
-#, fuzzy
+#: resources.h:98
 msgid "Transfer Settings"
 msgstr "Configuración de transferencia"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:498
+#: ../../locales/../src/engine/transfersocket.cpp:522
+#, c-format
 msgid "Transfer connection interrupted: %s"
-msgstr "O ususario interropeu a conexión"
+msgstr "Interrompeuse a conexión de transferencia: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
 msgstr "Danáronse os datos transferidos."
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1491
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "Transfirindo"
 
@@ -7255,92 +7283,87 @@
 msgid "Transfers"
 msgstr "Transferencias"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "Transfers finished"
 msgstr "Configuración de transferencia"
 
-#: resources.h:827
-#, fuzzy
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
-msgstr "Tratar arquivos sen extensión como arquivos ASCII"
+msgstr "Tratar ficheiros sen e&xtensión como arquivos ASCII"
 
-#: resources.h:823
-#, fuzzy
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "Tratar os seguintes tipos de arquivo como arquivos ASCII:"
-
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
-msgstr "Confiar na chave do hóspede mudada:"
+msgstr "Tratar os &seguintes tipos de arquivo como arquivos ASCII:"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
-msgstr "Confiar na nova chave do hóspede:"
+msgid "Trust changed Hostkey:"
+msgstr "Confiar na chave do servidor cambiada:"
 
-#: resources.h:193
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+msgid "Trust new Hostkey:"
+msgstr "Confiar na nova chave do servidor:"
+
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr "Desexa confiar na nova chave e seguir conectado?"
 
 #: resources.h:22
-#, fuzzy
 msgid "Trust this certificate and carry on connecting?"
-msgstr "Confiar neste certificado e seguir conectado"
+msgstr "Confiar neste certificado e seguir conectado?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr "Desexa confiar nesta hospedaxe e seguir conectado?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
-msgstr ""
+msgstr "Tipo"
 
-#: resources.h:762
+#: resources.h:778
 msgid "Type of FTP Proxy:"
 msgstr "Tipo do proxy de FTP:"
 
-#: resources.h:787
-#, fuzzy
+#: resources.h:803
 msgid "Type of generic proxy:"
-msgstr "Tipo do proxy de FTP:"
+msgstr "Tipo do proxy de xenérico:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
 msgstr "En&viar"
 
-#: resources.h:483 resources.h:807
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Límite de en&vío:"
 
-#: resources.h:931
+#: resources.h:949
 msgid "U&se filetype associations if available"
-msgstr "U&sar as asociacións de tipo de ficheiros se estiver dispoñible"
+msgstr "U&sar as asociacións de tipo de ficheiros se estiver dispoñíbeis"
 
-#: resources.h:884
+#: resources.h:902
 msgid "U&se system defaults"
-msgstr "U&sar os valores predeterminados."
+msgstr "U&sar os valores predeterminados"
 
-#: resources.h:764
+#: resources.h:780
 msgid "USER@&HOST"
-msgstr "USUARIO@HOSPEDAXE"
+msgstr "USUARIO@SERVIDOR"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
-msgstr ""
+msgstr "Código de erro non asignado %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Unit:"
 msgstr "Unidade:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "Descoñecido"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Descoñécese o tipo do proxy de FTP polo que non se pode xerar a secuencia de "
@@ -7349,19 +7372,22 @@
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr ""
+msgstr "Descoñécese a versión do protocolo SOCKS: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
 msgstr "Descoñécese o certificado"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
+"Produciuse un erro que se descoñece ao abrir o ficheiro. Cómpre asegurarse "
+"de que se pode acceder ao ficheiro e que se trata dun documento XML ben "
+"composto."
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "Descoñécese a chave do servidor"
 
@@ -7371,11 +7397,15 @@
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
 msgstr ""
+"Descoñécese a versión do protocolo SOCKS de subnegociación de autenticación "
+"nome de usuario/Contrasinal: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
+"Descoñécese o elemento raíz; o ficheiro non parece ter sido xerado mediante "
+"FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:596
 #: ../../locales/../src/interface/netconfwizard.cpp:607
@@ -7394,17 +7424,15 @@
 "A non ser que este problema se solucionar, o FTP en modo activo non "
 "funcionará e terá de se usar o modo pasivo."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:888
 msgid "Unsupported certificate type"
-msgstr "O redireccionamento non é compatible."
+msgstr "TIpo de certificado non compatíbel"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:650
-#, fuzzy
 msgid "Unsupported redirect"
-msgstr "O redireccionamento non é compatible."
+msgstr "O redireccionamento non é compatíbel"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr "Subri e desfacer a edición"
 
@@ -7418,157 +7446,148 @@
 msgid "Update wizard"
 msgstr "Asistente de actualización"
 
-#: resources.h:362
-#, fuzzy
+#: resources.h:364
 msgid "Upload"
-msgstr "&Enviar"
+msgstr "Enviar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
-msgstr "Fallou a comprobación de actualización"
+msgstr "Fallou o envío"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
 msgid "Upload limit: %s/s"
-msgstr "Límite de en&vío:"
+msgstr "Límite de envío: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
-msgstr "Límite de en&vío:"
+msgstr "Límite de envío: ningún"
 
-#: resources.h:642
-#, fuzzy
+#: resources.h:658
 msgid "Upload selected directory"
-msgstr "Descargar o directorio seleccionado"
+msgstr "Enviar o cartafol seleccionado"
 
-#: resources.h:556
-#, fuzzy
+#: resources.h:566
 msgid "Upload selected files and directories"
-msgstr "Cargar arquivos e carpetas seleccionados"
+msgstr "Enviar os ficheiros e cartafoles seleccionados"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "Desexa subir os ficheiros e os cartafoles seleccionados?"
 
-#: resources.h:314
-#, fuzzy
+#: resources.h:316
 msgid "Upload this file to the server?"
-msgstr "Desexa subir os ficheiros e os cartafoles seleccionados?"
+msgstr "Desexa subir os ficheiros ao servidor?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "Estase a enviar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "Estase a enviar e pendente de eliminación"
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
-msgstr "Subri e desfacer a edición"
+msgstr "Subindo e desfacendo"
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
 msgstr "Usar o conxunto de &caracteres personalizado"
 
-#: resources.h:928
-#, fuzzy
+#: resources.h:946
 msgid "Use &custom editor:"
-msgstr "Usar o conxunto de &caracteres personalizado"
+msgstr "Usar &editor personalizado:"
 
-#: resources.h:421
-#, fuzzy
+#: resources.h:423
 msgid "Use &default editor for text files"
-msgstr "É necesario fixar un edior preestablecido."
+msgstr "Usar o e&ditor predeterminado para os ficheiros de texto"
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
-msgstr ""
+msgstr "Usar a navegación &sincronizada"
 
-#: resources.h:107
-#, fuzzy
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
-"Usar o UTF-8 se o servidor for compatible. Se así non for, empregar o "
+"Usar o UTF-8 se o servidor for compatíbel; caso contrario, empregar o "
 "conxunto de caracteres local."
 
-#: resources.h:257 resources.h:267
-#, fuzzy
+#: resources.h:259 resources.h:269
 msgid "Use default action"
-msgstr "Usar o valor por omisión"
+msgstr "Usar a acción por omisión"
 
-#: resources.h:370
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Usar FTP simple"
+
+#: resources.h:372
 msgid "Use server currently connected to"
-msgstr "Desexa romper a conexión actual?"
+msgstr "Usar servidor actualmente conectado"
 
-#: resources.h:371
-#, fuzzy
+#: resources.h:373
 msgid "Use server from site manager"
-msgstr "Abrir o Xestor de sitios"
+msgstr "Usar servidor dende o xestor do sitio"
 
-#: resources.h:878
+#: resources.h:896
 msgid "Use system &defaults"
 msgstr "Usar o valor por omisión &do sistema"
 
-#: resources.h:688
+#: resources.h:704
 msgid "Use the following IP address:"
 msgstr "Usar o número de IP seguinte:"
 
-#: resources.h:698
+#: resources.h:714
 msgid "Use the following port range:"
 msgstr "Usar o intervalo de porto seguinte:"
 
-#: resources.h:683
+#: resources.h:699
 msgid "Use the server's external IP address instead"
 msgstr "Usar no seu lugar o número de IP externo do servidor"
 
-#: resources.h:689 resources.h:752
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
-"Usar isto se estiver tras un encamiñador e ten un número de IP externo "
+"Use isto se estiver tras dun enrutador e ten un número de IP externo "
 "estático."
 
-#: resources.h:692
+#: resources.h:708
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
 "Use esta opción se ten un número de IP dinámico. O FileZilla contactará co "
-"servidor unha vez por cada sesión cado empregar o modo activo por vez "
+"servidor unha vez por cada sesión cado empregue o modo activo por vez "
 "primeira. Só se envía ao servidor a versión do FileZilla que está a empregar."
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "Usuario:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
-msgstr ""
+msgstr "O nome de usuario non pode ser unha serie de espazos"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
-msgstr "Estase a empregar o proxy %s"
+msgstr "Usando o proxy %s"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
-"Se se emprega o conxunto de caracteres incorrecto, os nomes dos ficheiros "
-"talvez aparecerán incorrectos."
+"De se empregar o conxunto de caracteres incorrecto, os nomes dos ficheiros "
+"non se amosarán apropiadamente."
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Ao usar este asistente, poderá comprobar se existe algunha actualización do "
@@ -7576,70 +7595,67 @@
 
 #: resources.h:5 resources.h:29
 msgid "Valid from:"
-msgstr "Desde válido:"
+msgstr "Correcto desde:"
 
 #: resources.h:6 resources.h:30
 msgid "Valid to:"
-msgstr "Até válido:"
+msgstr "Correcto ata:"
 
 #: ../../locales/../src/interface/cmdline.cpp:16
 msgid "Verbose log messages from wxWidgets"
-msgstr ""
+msgstr "Rexistro de mensaxes de rexistro detallado de wvWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
-msgstr "Estase a verificar o certificado..."
+msgstr "Comprobando o certificado..."
 
-#: resources.h:168
-#, fuzzy
+#: resources.h:170
 msgid "Version:"
-msgstr "&Versión %s"
+msgstr "Versión:"
 
-#: resources.h:812
+#: resources.h:828
 msgid "Very high"
 msgstr "Moi alta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
-"Fixouse a opción de ver os ficheiros ocultos mais non é compatible co "
-"servidor."
+"Estabeleceuse a opción de ver os ficheiros agochados, mais o servidor non a "
+"admite"
 
-#: resources.h:915
-#, fuzzy
+#: resources.h:933
 msgid "View/Edit"
-msgstr "&Vista e edición"
+msgstr "Vista / edición"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
-msgstr ""
+msgstr "Columnas visíbeis"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "Esc&ribir"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
-msgstr "Estase a agardar"
+msgstr "Esperando"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
-msgstr "Estase a agardar pola conexión do navegador"
+msgstr "Esperando pola conexión de navegación"
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
-msgstr "Estase a agardar o contrasinal"
+msgstr "Esperando polo contrasinal"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
-#, fuzzy
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Waiting for transfer to be cancelled"
-msgstr "Estase a agardar a que se cancelar a transferencia"
+msgstr "Esperando a que se cancele a transferencia"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
-msgstr "Estase a agardar para reintentar'..."
+msgstr "Agardando para volvelo tentar..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
 "Warning!\n"
 "\n"
@@ -7659,18 +7675,19 @@
 "\n"
 "Un erro no Windows está a provocar problemas co FileZilla\n"
 "\n"
-"O erro está provocado se ten\n"
+"O erro prodúcese con\n"
 "- Windows Server 2003 ou XP 64\n"
-"- A barreira de protección do Windows activada.\n"
-"Vexa a páxina http://support.microsoft.com/kb/931130 para máis información.\n"
+"- A devasa de Windows activada.\n"
+"- Pasarela de capa de aplicativo activada\n"
+"Vexa http://support.microsoft.com/kb/931130 para máis información.\n"
 "\n"
-"A menos que desactivar a barreira de protección do Windows ou o servizo de "
-"porta de ligazón de capa de aplicación,\n"
-"o FIleZilla fallará nas transferencias grandes."
+"A menos que desactive a devasa de Windows ou o servizo de Pasarela de capa "
+"de aplicativo,\n"
+"o FileZilla fallará nas transferencias grandes."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:966
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr "Aviso, estase a ingnorar a conexión de datos dun IP incorrecto."
+msgstr "Aviso, estase a ignorar a conexión de datos desde un IP incorrecto."
 
 #: ../../locales/../src/interface/updatewizard.cpp:264
 msgid ""
@@ -7680,74 +7697,79 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"Aviso: use as versións en desenvolvemento pola súa conta.\n"
-"Non se dá soporte a estas versións.\n"
-"As versións de desenvolvemento poden non funcionar do modo que se agardaba e "
-"mesmo poderían danar o sistema.\n"
+"Aviso: use as compilacións diarias en desenvolvemento pola súa conta.\n"
+"Non se fornece asistencia técnica para compilacións diarias.\n"
+"As compilacións diarias poden non funcionar do modo que se agardaba e mesmo "
+"poderían danar o sistema.\n"
 "\n"
-"Desexa realmente comprobar se existen versións de desenvolvemento?"
+"Quere comprobar se existen compilacións diarias?"
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
-msgstr "Aviso: hai un buraco potencial de seguranza."
+msgstr "Aviso: Hai unha fenda de seguranza potencial!"
 
-#: resources.h:474
-#, fuzzy
+#: resources.h:476
 msgid "Welcome to FileZilla"
-msgstr "Pechar o FileZilla"
+msgstr "Benvido/a ao FileZilla"
 
-#: resources.h:463
+#: resources.h:465
 msgid "What's new"
-msgstr ""
+msgstr "Cales son as novidades"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
-msgstr ""
+msgstr "Cales son as novidades:"
 
-#: resources.h:815
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
+"Cando activado, os caracteres dos nomes de ficheiros que non son compatíbeis "
+"co sistema operativo local substituiranse ao descargalo como un ficheiro."
 
-#: resources.h:857
+#: resources.h:873
 msgid "Widescreen"
 msgstr "Pantalla panorámica"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "Escr&ibir"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:433
 #: ../../locales/../src/interface/netconfwizard.cpp:440
 msgid "Wrong external IP address"
-msgstr "O número de IP externo non é correcto:"
+msgstr "O enderezo IP externo non é correcto"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
-#, fuzzy
 msgid "Wrong line endings"
-msgstr "Remates de liña incorrectos."
+msgstr "Remates de liña incorrectos"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr "Si"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 "Está a empregar a última versión do FileZilla. Volva comprobar no futuro."
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
-msgstr ""
+msgstr "Sempre poderá ver esta mensaxe a través do menú de axuda."
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
+"Pode deixar o campo do porto en branco para usar o porto predeterminado."
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7755,7 +7777,7 @@
 "Pode usar un x en calquera posición para manter o permiso que os ficheiros "
 "orixinais teñen."
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr ""
 "Non pode importar opcións desde o propio servidor de opcións do FileZilla."
@@ -7765,131 +7787,132 @@
 "You cannot replace an invalid character with another invalid character. "
 "Please enter a character that is allowed in filenames."
 msgstr ""
+"Non pode substituír un carácter incorrecto cun outro incorrecto. Introduza "
+"un carácter admitido para nomes de ficheiros."
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
-msgstr "Non inseriu un novo nome para o ficheiro. Desexa sobrescribilo?"
+msgstr "Non inseriu un novo nome para o ficheiro. Quere sobrescribilo?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
-msgstr ""
+msgstr "Seleccionou, cando menos, unha ligazón simbólica."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
+"Seleccionou máis que 10 ficheiros para editar; está certo de querer "
+"continuar?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
+"Seleccionou máis de 10 ficheiros ou cartafoles para abrir; está certo de "
+"querer continuar?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
-msgstr "Debe inserir un nome de hospedaxe."
+msgstr "Introduza un nome de servidor."
 
-#: ../../locales/../src/interface/search.cpp:843
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:817
 msgid "You have to enter a local directory."
-msgstr "Ten de inserir un número de IP válido."
+msgstr "Introduza un cartafol local."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:149
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
-msgstr "Ten de inserir un número de IP válido."
+msgstr "Introduza un número de IP correcto."
 
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:823
 msgid "You have to enter a writable local directory."
-msgstr "Ten de inserir un número de IP válido."
+msgstr "Ten de introducir un cartafol local escribíbel."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
-msgstr "Ten de inserir o nome da conta"
+msgstr "Introduza un nome de conta"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr "Ten de especificar un nome de usuario"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
-#, fuzzy
 msgid ""
 "You likely have a router or firewall which erroneously modified the "
 "transferred data."
 msgstr ""
-"Con total certeza, ten un encamiñador ou unha barreira de protección que "
-"modifica erradamente os datos transferidos."
+"Parece que teña un enrutador ou unha devasa que modifica erradamente os "
+"datos transferidos."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
-msgstr "Precisa inserir unha hospedaxe do proxy."
+msgstr "Cómpre introducir un nome para o marcador."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
-#, fuzzy
 msgid "You need to enter a name for the log file."
-msgstr "Insira un nome para o novo filtro."
+msgstr "Cómpre introducir un nome para o ficheiro de rexistro."
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1640
 msgid "You need to enter a properly quoted command."
-msgstr "Precisa inserir unha hospedaxe do proxy."
+msgstr "Cómpre introducir unha orde de liña apropiadamente acoutada."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
 msgid "You need to enter a proxy host."
-msgstr "Precisa inserir unha hospedaxe do proxy."
+msgstr "Cómpre introducir un servidor proxy."
 
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
-#, fuzzy
 msgid "You need to enter a proxy port in the range from 1 to 65535"
-msgstr "Precisa inserir unha hospedaxe do proxy."
+msgstr "Cómpre introducir un porto de proxy con valor entre 1 e 65535"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
+"Precisa escribir cando menos unha ruta, non se aceptarán os marcadores "
+"vadíos."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
+"Cómpre introducir tanto unha ruta remota como local para activar a "
+"navegación sincronizada deste marcador."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
 msgstr ""
+"Cómpre introducir tanto unha ruta remota como unha local para activar a "
+"navegación sincronizada neste sitio."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
-msgstr "Ten de especificar un nome de usuario"
+msgstr "Ten de especificar un ficheiro local."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
-msgstr "Ten de especificar un nome de usuario"
+msgstr "Ten de especificar un ficheiro remoto."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
-msgstr "Ten de especificar un nome de usuario"
+msgstr "Ten de especificar unha ruta remota."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
-msgstr "Ten de especificar un nome de usuario"
+msgstr "Ten de especificar un servidor."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:568
 msgid ""
@@ -7899,34 +7922,48 @@
 "Non debería ter problemas ao se conectar con outros servidores e as "
 "transferencias deberían funcionar correctamente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "after"
+msgstr "despois"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr "antes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "comeza por"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "contén"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
-msgstr ""
+msgstr "non contén"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr "non é igual a"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
-msgstr "remata por:"
+msgstr "remata en"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
-msgstr "igual"
+msgstr "iguais"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:497
+#: ../../locales/../src/interface/filelistctrl.cpp:515
+#: ../../locales/../src/interface/filelistctrl.cpp:540
+#: ../../locales/../src/interface/filelistctrl.cpp:556
 msgid "file"
 msgstr "ficheiro"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr "fz3temp-lockfile"
 
@@ -7937,83 +7974,106 @@
 "Please make sure this executable exists in the same directory as the main "
 "FileZilla executable."
 msgstr ""
+"fzputtygen non se pode iniciar.\n"
+"Asegúrese de que existe o executábel no mesmo cartafol que o executábel "
+"principal do FileZilla."
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
 msgid "fzsftp could not be started"
-msgstr "non se puido iniciar o fzsftp "
+msgstr "non se puido iniciar o fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
-msgstr ""
+msgstr "gnutls_certificate_get_peers non devolveu ningún certificado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
-msgstr "máis que"
+msgstr "máis ca"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
-msgstr "Executable"
+msgstr "executábel para o grupo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
-msgstr ""
+msgstr "lexíbel para o grupo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
-msgstr ""
+msgstr "escribíbel para o grupo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
-msgstr "é igual que"
+msgstr "é igual ca"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
-msgstr ""
+msgstr "está configurado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
-msgstr ""
+msgstr "está sen estabelecer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "menos que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr "coincide coa expresión regular"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
-msgstr "Executable"
+msgstr "executábel para o propietario"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
-msgstr ""
+msgstr "lexíbel para o propietario"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
-msgstr ""
+msgstr "escribíbel para o propietario"
 
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
-#, fuzzy
 msgid "unknown"
-msgstr "Descoñecido"
+msgstr "descoñecido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
-msgstr "Executable"
+msgstr "executábel para todos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
-msgstr ""
+msgstr "lexíbel para todos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
-msgstr ""
+msgstr "escribíbel para todos"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
-msgstr ""
+msgstr "wxWidgets:"
+
+#~ msgid "&Automatically remove successful transfers"
+#~ msgstr "&Eliminar automaticamente as transferencias correctas"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Duplicar o nome do filtro"
+
+#~ msgid "Reset and requeue selected files"
+#~ msgstr "Reiniciar e pór na cola outra vez os ficheiros seleccionados"
+
+#~ msgid "Selected file already opened."
+#~ msgstr "O ficheiro seleccionado xa se está aberto."
+
+#~ msgid "Selected file still being edited"
+#~ msgstr "O ficheiro que se seleccionou segue a se editar."
+
+#~ msgid "The entered filter name already exists."
+#~ msgstr "O nome do filtro xa existe."
+
+#~ msgid "Trust changed Hostkey: "
+#~ msgstr "Confiar na chave do hóspede mudada:"
+
+#~ msgid "Trust new Hostkey: "
+#~ msgstr "Confiar na nova chave do hóspede:"
diff -Nru filezilla-3.5.3/locales/he_IL.po filezilla-3.7.3~precise/locales/he_IL.po
--- filezilla-3.5.3/locales/he_IL.po	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/he_IL.po	2012-11-29 21:54:09.000000000 +0000
@@ -1,33 +1,34 @@
 # Yaron Shahrabani <sh.yaron@gmail.com>, 2010, 2011.
+# ysha <sh.yaron@gmail.com>, 2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: filezilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-08 11:58+0100\n"
-"PO-Revision-Date: 2011-12-04 11:02+0300\n"
-"Last-Translator: Yaron Shahrabani <sh.yaron@gmail.com>\n"
+"POT-Creation-Date: 2012-11-29 22:48+0100\n"
+"PO-Revision-Date: 2012-11-28 13:34+0300\n"
+"Last-Translator: ysha <sh.yaron@gmail.com>\n"
 "Language-Team: גזר\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: he\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Virtaal 0.7.0\n"
+"X-Generator: Virtaal 0.7.1\n"
 "X-Poedit-Language: Hebrew\n"
 "X-Poedit-Country: ISRAEL\n"
 "X-Poedit-SourceCharset: UTF-8\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S עברו"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S נותרו"
 
-#: resources.h:778
+#: resources.h:790
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -45,9 +46,9 @@
 msgstr[0] "תיקייה %d"
 msgstr[1] "%d תיקיות"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -56,9 +57,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -79,7 +80,7 @@
 msgstr[0] "קובץ %d. גודל כולל: לפחות %s"
 msgstr[1] "%d קבצים. גודל כולל: לפחות %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2939
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d קבצים נוספו לתור"
@@ -91,31 +92,21 @@
 msgstr[0] "שנייה %d"
 msgstr[1] "%d שניות"
 
-#: resources.h:775
+#: resources.h:787
 msgid "%h - Host"
 msgstr "%h - מארח"
 
-#: resources.h:777
+#: resources.h:789
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - ססמה"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d ב/ש׳)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/ש׳)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d ק״ב/ש׳)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d מ״ב/ש׳)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? ב/ש׳)"
@@ -130,7 +121,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - עדיין לא בתוקף!"
 
-#: resources.h:779
+#: resources.h:791
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - משתמש במתווך"
@@ -152,25 +143,15 @@
 msgstr[0] "בית %s"
 msgstr[1] "%s בתים"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:908
 #, c-format
 msgid "%s bytes"
 msgstr "%s בתים"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:892
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s בתים (%d ב/ש׳)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s בתים (%d.%d ק״ב/ש׳)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s בתים (%d.%d מ״ב/ש׳)"
+msgid "%s bytes (%s/s)"
+msgstr "%s בתים (%s/ש׳)"
 
 #: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
@@ -206,41 +187,41 @@
 msgid "%s with %d bits"
 msgstr "%s עם %d סיביות"
 
-#: resources.h:776
+#: resources.h:788
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - שם משתמש"
 
-#: resources.h:780
+#: resources.h:792
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - הססמה למתווך"
 
-#: resources.h:555
+#: resources.h:563
 msgid "&About..."
 msgstr "על &אודות..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "&חשבון:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:101 resources.h:692 resources.h:756
 msgid "&Active"
 msgstr "&פעיל"
 
-#: resources.h:546
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr "הוספת &סימנייה..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "&הוספת קבצים לתור"
 
-#: resources.h:788
+#: resources.h:800
 msgid "&Add keyfile..."
 msgstr "הוספת &קובץ מפתח..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:642 resources.h:661
 msgid "&Add to queue"
 msgstr "הוספה ל&תור"
 
@@ -252,15 +233,15 @@
 msgid "&Always trust certificate in future sessions."
 msgstr "מתן אמון &תמיד בתעודות במקרים עתידיים."
 
-#: resources.h:182
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr "מתן &אמון תמיד בשרת זה, הוספת הבקשה הזו לזיכרון הזמני"
 
-#: resources.h:940
+#: resources.h:952
 msgid "&Always use default editor"
 msgstr "&שימוש תמיד בעורך ברירת המחדל"
 
-#: resources.h:427
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr "&תמיד יש להשתמש בבחירה זו לקבצים שאינם משויכים"
 
@@ -268,11 +249,11 @@
 msgid "&Always use this action"
 msgstr "יש ל&פעול כך תמיד"
 
-#: resources.h:756
+#: resources.h:768
 msgid "&Ask your operating system for the external IP address"
 msgstr "&בקשה ממערכת הפעלה לקבלת כתובת ה־IP חיצוני"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:536 resources.h:672 resources.h:837
 msgid "&Auto"
 msgstr "&אוטומטי"
 
@@ -280,50 +261,50 @@
 msgid "&Autodetect"
 msgstr "&זיהוי אוטומטי"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:538 resources.h:674 resources.h:839
 msgid "&Binary"
 msgstr "בינרי"
 
-#: resources.h:900
+#: resources.h:912
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&קידומות בינאריות באמצעות סימון בינלאומי (לדוגמה 1 ק\"ב = 1024 בתים)"
 
-#: resources.h:545
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr "&סימניות"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:949 resources.h:971
 msgid "&Browse..."
 msgstr "&עיון..."
 
-#: resources.h:815
+#: resources.h:827
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "סף הה&תפרצות:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:740
 msgid "&Cancel"
 msgstr "&ביטול"
 
-#: resources.h:235
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "&בדיקה אחר גרסאות ניסיון של FileZilla"
 
-#: resources.h:505
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "ריקון ה&פרטים האישיים..."
 
-#: resources.h:603
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&סגירת FileZilla"
 
-#: resources.h:670
+#: resources.h:682
 msgid "&Configure speed limits..."
 msgstr "ה&גדרת מגבלות מהירות..."
 
-#: resources.h:533
+#: resources.h:541
 msgid "&Configure..."
 msgstr "הג&דרה..."
 
@@ -331,27 +312,27 @@
 msgid "&Connect"
 msgstr "ה&תחברות"
 
-#: resources.h:218
+#: resources.h:219
 msgid "&Copy"
 msgstr "ה&עתקה"
 
-#: resources.h:493
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr "ה&עתקת ההתחברות הנוכחית למנהל האתרים..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "ה&עתקה ללוח הגזירים"
 
-#: resources.h:617
+#: resources.h:627
 msgid "&Crash"
 msgstr "&קריסה"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:575 resources.h:589 resources.h:644 resources.h:665
 msgid "&Create directory"
 msgstr "יצירת &תיקייה"
 
-#: resources.h:665
+#: resources.h:677
 msgid "&Create new tab"
 msgstr "יצירת &לשונית חדשה"
 
@@ -359,100 +340,104 @@
 msgid "&Debug"
 msgstr "ניפוי &שגיאות"
 
-#: resources.h:967
+#: resources.h:979
 msgid "&Debug information in message log:"
 msgstr "נתוני ניפוי ה&שגיאות ברישום ההודעות:"
 
-#: resources.h:933
+#: resources.h:945
 msgid "&Default editor:"
 msgstr "&עורך הברירת המחדל:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr "&הגדרות ברירת המחדל לקבצים קיימים..."
 
-#: resources.h:738
+#: resources.h:750
 msgid "&Delay between failed login attempts:"
 msgstr "השהיה בין נסיונות התחברות &כושלים:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:667
 msgid "&Delete"
 msgstr "&מחיקה"
 
-#: resources.h:457
+#: resources.h:458
 msgid "&Delete symlink"
 msgstr "&מחיקת הקישור הסימבולי"
 
-#: resources.h:511
+#: resources.h:519
 msgid "&Directory comparison"
 msgstr "ה&שוואת תיקיות"
 
-#: resources.h:325
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr "ה&תעלמות מהקובץ המקומי ואז הורדה ועריכת הקובץ מחדש"
 
-#: resources.h:539
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "ה&נתקות"
 
-#: resources.h:604
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "ה&נתקות מהשרת"
 
-#: resources.h:876
+#: resources.h:888
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "הצגת מהירות העברה &רגעית במקום מהירות ממוצעת"
 
-#: resources.h:898
+#: resources.h:910
 msgid "&Display size in bytes"
 msgstr "הצגת ה&גודל בבתים"
 
+#: resources.h:494
+msgid "&Do not remember passwords"
+msgstr "אין ל&שמור ססמאות"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&לא להציג תיבת דו־שיח זו שוב."
 
-#: resources.h:761
+#: resources.h:773
 msgid "&Don't use external IP address on local connections."
 msgstr "&אין להשתמש בכתובת IP חיצונית עבור חיבורים מקומיים."
 
-#: resources.h:920
+#: resources.h:932
 msgid "&Double-click action on files:"
 msgstr "&פעולת הלחיצה הכפולה על קבצים:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:582 resources.h:640
 msgid "&Download"
 msgstr "ה&ורדה"
 
-#: resources.h:443
+#: resources.h:444
 msgid "&Download to:"
 msgstr "ה&ורדה אל:"
 
-#: resources.h:663
+#: resources.h:675
 msgid "&Download..."
 msgstr "ה&ורדה..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:258 resources.h:849
 msgid "&Downloads:"
 msgstr "ה&ורדות:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "ע&ריכה"
 
-#: resources.h:210
+#: resources.h:211
 msgid "&Edit filter rules..."
 msgstr "ע&ריכת כללי המסנן..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:520 resources.h:540 resources.h:655 resources.h:681
 msgid "&Enable"
 msgstr "ה&פעלה"
 
-#: resources.h:948
+#: resources.h:960
 msgid "&Enable automatic update check"
 msgstr "ה&פעלת בדיקת עדכונים אוטומטית"
 
-#: resources.h:481 resources.h:810
+#: resources.h:482 resources.h:822
 msgid "&Enable speed limits"
 msgstr "הפעלת מ&גבלות מהירות"
 
@@ -464,7 +449,7 @@
 msgid "&Encryption:"
 msgstr "ה&צפנה:"
 
-#: resources.h:611
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "הז&נת פקודה ידנית..."
 
@@ -472,125 +457,125 @@
 msgid "&Execute"
 msgstr "ה&פעלה"
 
-#: resources.h:292
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "יי&צוא הרשומות ממנהל האתרים"
 
-#: resources.h:498 resources.h:659
+#: resources.h:506 resources.h:671
 msgid "&Export..."
 msgstr "יי&צוא..."
 
-#: resources.h:766
+#: resources.h:778
 msgid "&Fall back to active mode"
 msgstr "ח&זרה למצב פעיל"
 
-#: resources.h:490
+#: resources.h:498
 msgid "&File"
 msgstr "&קובץ"
 
-#: resources.h:640
+#: resources.h:652
 msgid "&File Attributes..."
 msgstr "&תכונות הקובץ..."
 
-#: resources.h:590
+#: resources.h:600
 msgid "&File permissions..."
 msgstr "ה&רשאות הקובץ..."
 
-#: resources.h:365
+#: resources.h:366
 msgid "&File:"
 msgstr "&קובץ:"
 
-#: resources.h:220
+#: resources.h:221
 msgid "&Filter conditions:"
 msgstr "&תנאי הסינון:"
 
-#: resources.h:199
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "&ערכות מסננים:"
 
-#: resources.h:214
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&מסננים:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&סיום"
 
-#: resources.h:317
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "&סיום העריכה ומחיקת הקובץ המקומי"
 
-#: resources.h:447
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr "ה&שטחת הנתיבים המרוחקים, הורדת כל הקבצים המוכלים ישירות לתיקיית היעד"
 
-#: resources.h:458
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr "מ&עקב אחר קישורים סימבוליים ומחיקת תכני תיקיית היעד"
 
-#: resources.h:759
+#: resources.h:771
 msgid "&Get external IP address from the following URL:"
 msgstr "א&חזור כתובת IP חיצונית מהכתובת הבאה:"
 
-#: resources.h:553
+#: resources.h:561
 msgid "&Getting help..."
 msgstr "&קבלת עזרה..."
 
-#: resources.h:397
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr "&סימנייה כללית"
 
-#: resources.h:795
+#: resources.h:807
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "HTTP/1.1 באמצעות &שיטת CONNECT"
 
-#: resources.h:549
+#: resources.h:557
 msgid "&Help"
 msgstr "ע&זרה"
 
-#: resources.h:515 resources.h:646
+#: resources.h:523 resources.h:658
 msgid "&Hide identical files"
 msgstr "ה&סתרת קבצים זהים"
 
-#: resources.h:597
+#: resources.h:607
 msgid "&Highest"
 msgstr "הגבוהה ביו&תר"
 
-#: resources.h:754
+#: resources.h:766
 msgid "&Highest available port:"
 msgstr "הפתחה האפשרית הגבוהה ביותר:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:79 resources.h:379 resources.h:730
 msgid "&Host:"
 msgstr "מ&ארח:"
 
-#: resources.h:899
+#: resources.h:911
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "קידומות IEC &בינריות (לדוגמה 1 KiB‏ = 1024 בתים)"
 
-#: resources.h:887
+#: resources.h:899
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "ISO &8601 (לדוגמה: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:507
 msgid "&Import..."
 msgstr "יי&בוא..."
 
-#: resources.h:942
+#: resources.h:954
 msgid "&Inherit system's filetype associations"
 msgstr "&קבלה מהמערכת את שיוכי הקבצים בירושה"
 
-#: resources.h:446
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr "&שמירת המבנה המרוחק ביחס לשורש החיפוש"
 
-#: resources.h:860
+#: resources.h:872
 msgid "&Layout of file and directory panes:"
 msgstr "&פריסת הפאנלים של הקבצים והתיקיות:"
 
-#: resources.h:751
+#: resources.h:763
 msgid "&Limit local ports used by FileZilla"
 msgstr "הגב&לת מספר הפתחות שישמשו את FileZilla"
 
@@ -598,15 +583,15 @@
 msgid "&Limit number of simultaneous connections"
 msgstr "ה&גבלת מספר החיבורים בו־זמנית"
 
-#: resources.h:521
+#: resources.h:529
 msgid "&Local directory tree"
 msgstr "&עץ התיקיות המקומי"
 
-#: resources.h:402 resources.h:408
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
 msgstr "&תיקייה מקומית:"
 
-#: resources.h:957
+#: resources.h:969
 msgid "&Log to file"
 msgstr "&רישום לקובץ"
 
@@ -614,19 +599,19 @@
 msgid "&Logon Type:"
 msgstr "&סוג הכניסה:"
 
-#: resources.h:381
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&סוג הכניסה:"
 
-#: resources.h:600
+#: resources.h:610
 msgid "&Low"
 msgstr "&נמוך"
 
-#: resources.h:547
+#: resources.h:555
 msgid "&Manage bookmarks..."
 msgstr "&ניהול סימניות..."
 
-#: resources.h:535
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "&העברה ידנית..."
 
@@ -634,27 +619,27 @@
 msgid "&Maximum number of connections:"
 msgstr "מספר החיבורים ה&מירבי:"
 
-#: resources.h:736
+#: resources.h:748
 msgid "&Maximum number of retries:"
 msgstr "&מספר הנסיונות החוזרים המירבי:"
 
-#: resources.h:520
+#: resources.h:528
 msgid "&Message log"
 msgstr "&רישום ההודעות"
 
-#: resources.h:873
+#: resources.h:885
 msgid "&Minimize to tray"
 msgstr "&מזעור למגש המערכת"
 
-#: resources.h:400
+#: resources.h:401
 msgid "&Name:"
 msgstr "&שם:"
 
-#: resources.h:504
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "&אשף תצורת הרשת..."
 
-#: resources.h:215
+#: resources.h:216
 msgid "&New"
 msgstr "חד&ש"
 
@@ -662,27 +647,27 @@
 msgid "&New Site"
 msgstr "אתר &חדש"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1047
 msgid "&New version available!"
 msgstr "גרסה חדשה זמינה!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "ה&בא >"
 
-#: resources.h:319
+#: resources.h:320
 msgid "&No"
 msgstr "&לא"
 
-#: resources.h:769 resources.h:794
+#: resources.h:781 resources.h:806
 msgid "&None"
 msgstr "א&ף אחד"
 
-#: resources.h:599
+#: resources.h:609
 msgid "&Normal"
 msgstr "&רגיל"
 
-#: resources.h:949
+#: resources.h:961
 msgid "&Number of days between update checks:"
 msgstr "מספר ה&ימים לבדיקות אחר עדכונים:"
 
@@ -690,15 +675,15 @@
 msgid "&Numeric value:"
 msgstr "&ערך מספרי:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&אישור"
 
-#: resources.h:772
+#: resources.h:784
 msgid "&OPEN"
 msgstr "&פתיחה"
 
-#: resources.h:563 resources.h:651
+#: resources.h:571 resources.h:663
 msgid "&Open"
 msgstr "&פתיחה"
 
@@ -714,31 +699,31 @@
 msgid "&Password:"
 msgstr "&ססמה:"
 
-#: resources.h:607
+#: resources.h:617
 msgid "&Play sound"
 msgstr "ה&שמעת צליל"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:80 resources.h:380 resources.h:734
 msgid "&Port:"
 msgstr "&פתחה:"
 
-#: resources.h:866
+#: resources.h:878
 msgid "&Position of the message log:"
 msgstr "&מיקום הודעות הרישום:"
 
-#: resources.h:531
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "&שימור חותמות הזמן של הקבצים המועברים"
 
-#: resources.h:301
+#: resources.h:302
 msgid "&Queue"
 msgstr "&תור"
 
-#: resources.h:724
+#: resources.h:736
 msgid "&Quickconnect"
 msgstr "התחברות מהי&רה"
 
-#: resources.h:519
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "&סרגל ההתחברות המהירה"
 
@@ -746,11 +731,11 @@
 msgid "&Read"
 msgstr "&קריאה"
 
-#: resources.h:538
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "התחברות &מחדש"
 
-#: resources.h:509 resources.h:668
+#: resources.h:517 resources.h:680
 msgid "&Refresh"
 msgstr "&רענון"
 
@@ -758,52 +743,56 @@
 msgid "&Remember password for this session"
 msgstr "&שמירת הססמה להפעלה זו"
 
-#: resources.h:404 resources.h:410
+#: resources.h:493
+msgid "&Remember passwords"
+msgstr "&שמירת ססמאות"
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
 msgstr "תיקייה מ&רוחקת:"
 
-#: resources.h:368
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "ה&נתיב המרוחק:"
 
-#: resources.h:831
+#: resources.h:843
 msgid "&Remove"
 msgstr "&הסרה"
 
-#: resources.h:789
+#: resources.h:801
 msgid "&Remove key"
 msgstr "ה&סרת המפתח"
 
-#: resources.h:594
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "ה&סרת הנבחרים"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:648 resources.h:669
 msgid "&Rename"
 msgstr "&שינוי שם"
 
-#: resources.h:201
+#: resources.h:202
 msgid "&Rename..."
 msgstr "&שינוי שם..."
 
-#: resources.h:324
+#: resources.h:325
 msgid "&Reopen local file"
 msgstr "&פתיחה חוזרת של קובץ מקומי"
 
-#: resources.h:822
+#: resources.h:834
 msgid "&Replace invalid characters with:"
 msgstr "ה&חלפת תווים בלתי תקינים ב־:"
 
-#: resources.h:554
+#: resources.h:562
 msgid "&Report a bug..."
 msgstr "&דיווח על תקלה..."
 
-#: resources.h:620
+#: resources.h:632
 msgid "&Reset and requeue all"
 msgstr "&איפוס והצבה מחדש בתור של הקבצים הנבחרים"
 
-#: resources.h:717
+#: resources.h:729
 msgid "&Restart Wizard"
 msgstr "&איתחול האשף"
 
@@ -811,35 +800,35 @@
 msgid "&Resume"
 msgstr "ה&משך"
 
-#: resources.h:605
+#: resources.h:615
 msgid "&Run command..."
 msgstr "&הרצת פקודה..."
 
-#: resources.h:731
+#: resources.h:743
 msgid "&Run configuration wizard now..."
 msgstr "הרצת אשף ההגדרות כעת..."
 
-#: resources.h:951
+#: resources.h:963
 msgid "&Run update check now..."
 msgstr "הרצת בדיקה לע&דכונים כעת..."
 
-#: resources.h:771
+#: resources.h:783
 msgid "&SITE"
 msgstr "&אתר"
 
-#: resources.h:796
+#: resources.h:808
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&שמירה בשם..."
 
-#: resources.h:432
+#: resources.h:433
 msgid "&Search"
 msgstr "&חיפוש"
 
-#: resources.h:540
+#: resources.h:548
 msgid "&Search remote files..."
 msgstr "&חיפוש בקבצים מרוחקים..."
 
@@ -847,43 +836,43 @@
 msgid "&Select Entry:"
 msgstr "בחירת &רשומה:"
 
-#: resources.h:931
+#: resources.h:943
 msgid "&Select language:"
 msgstr "&בחירת שפה:"
 
-#: resources.h:356
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "&בחירת העמודות שיש להציג:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&שרת"
 
-#: resources.h:300
+#: resources.h:301
 msgid "&Settings"
 msgstr "ה&גדרות"
 
-#: resources.h:506
+#: resources.h:514
 msgid "&Settings..."
 msgstr "ה&גדרות..."
 
-#: resources.h:966
+#: resources.h:978
 msgid "&Show debug menu"
 msgstr "ה&צגת תפריט ניפוי שגיאות"
 
-#: resources.h:606
+#: resources.h:616
 msgid "&Show message"
 msgstr "ה&צגת הודעה"
 
-#: resources.h:956
+#: resources.h:968
 msgid "&Show timestamps in message log"
 msgstr "ה&צגת חותמות זמן בהודעות הרישום"
 
-#: resources.h:491
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "&מנהל האתרים..."
 
-#: resources.h:398
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr "סימנייה י&עודית לאתר"
 
@@ -891,27 +880,31 @@
 msgid "&Skip"
 msgstr "&דילוג"
 
-#: resources.h:534
+#: resources.h:542
 msgid "&Speed limits"
 msgstr "מגבלות מהירות"
 
-#: resources.h:449
+#: resources.h:450
 msgid "&Start transfer immediately"
 msgstr "התחלת ההעברה &מיידית"
 
-#: resources.h:865
+#: resources.h:877
 msgid "&Swap local and remote panes"
 msgstr "הח&לפה בין מיקומי המחשב המקומי והשרת"
 
+#: resources.h:629
+msgid "&TLS Ciphers"
+msgstr "&צופני TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "ב&דיקה"
 
-#: resources.h:879
+#: resources.h:891
 msgid "&Theme:"
 msgstr "&ערכת נושא:"
 
-#: resources.h:524
+#: resources.h:532
 msgid "&Transfer"
 msgstr "הע&ברה"
 
@@ -919,31 +912,31 @@
 msgid "&Transfer mode:"
 msgstr "&מצב העברה:"
 
-#: resources.h:523
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "&תור ההעברות"
 
-#: resources.h:834
+#: resources.h:846
 msgid "&Treat dotfiles as ASCII files"
 msgstr "התייחסות לקבצים המתחילים ב&נקודה כקובצי ASCII"
 
-#: resources.h:330
+#: resources.h:331
 msgid "&Unedit"
 msgstr "&ביטול העריכה"
 
-#: resources.h:195
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr "&עדכון המפתח השמור למארח זה"
 
-#: resources.h:557 resources.h:647
+#: resources.h:565 resources.h:659
 msgid "&Upload"
 msgstr "הע&לאה"
 
-#: resources.h:267 resources.h:846
+#: resources.h:268 resources.h:858
 msgid "&Uploads:"
 msgstr "הע&לאות:"
 
-#: resources.h:425
+#: resources.h:426
 msgid "&Use custom program"
 msgstr "&שימוש בתכנית אחרת"
 
@@ -951,44 +944,44 @@
 msgid "&Use synchronized browsing"
 msgstr "שימוש בעיון מ&סונכרן"
 
-#: resources.h:935
+#: resources.h:947
 msgid "&Use system's default editor for text files"
 msgstr "&שימוש בעורך ברירת המחדל של המערכת לקובצי טקסט"
 
-#: resources.h:757
+#: resources.h:769
 msgid "&Use the following IP address:"
 msgstr "שימוש ב&כתובת ה־IP הבאה:"
 
-#: resources.h:765
+#: resources.h:777
 msgid "&Use the server's external IP address instead"
 msgstr "שימוש בכתובת ה־IP של השרת במקום"
 
-#: resources.h:902
+#: resources.h:914
 msgid "&Use thousands separator"
 msgstr "שימוש במפריד &אלפים"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "&משתמש:"
 
-#: resources.h:720
+#: resources.h:732
 msgid "&Username:"
 msgstr "&שם משתמש:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1043
 #, c-format
 msgid "&Version %s"
 msgstr "&גרסה %s"
 
-#: resources.h:508
+#: resources.h:516
 msgid "&View"
 msgstr "&תצוגה"
 
-#: resources.h:580
+#: resources.h:588
 msgid "&View/Edit"
 msgstr "&תצוגה/עריכה"
 
-#: resources.h:941
+#: resources.h:953
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&מעקב אחר קבצים שנערכים באופן מקומי והצגת בקשות להעלאת השינויים"
 
@@ -996,7 +989,7 @@
 msgid "&Write"
 msgstr "כתיבה"
 
-#: resources.h:318
+#: resources.h:319
 msgid "&Yes"
 msgstr "&כן"
 
@@ -1036,68 +1029,68 @@
 msgstr[0] "(פריט %d סונן החוצה)"
 msgstr[1] "(%d פריטים סוננו החוצה)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:818 resources.h:820
 msgid "(0 for no limit)"
 msgstr "(0 ללא הגבלה)"
 
-#: resources.h:737
+#: resources.h:749
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:751
 msgid "(0-999 seconds)"
 msgstr "(0-999 שניות)"
 
-#: resources.h:804
+#: resources.h:816
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:745
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 לביטול)"
 
-#: resources.h:950
+#: resources.h:962
 msgid "(At least 7 days)"
 msgstr "(לפחות 7 ימים)"
 
-#: resources.h:895
+#: resources.h:907
 msgid "(example: %H:%M)"
 msgstr "(לדוגמה: %H:%M)"
 
-#: resources.h:889
+#: resources.h:901
 msgid "(example: %Y-%m-%d)"
 msgstr "(לדוגמה: ‎%Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:484 resources.h:486 resources.h:824 resources.h:826
 #, c-format
 msgid "(in %s/s)"
 msgstr "(ב%s/ש)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:900
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S נותרו"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:904
 msgid ", --:--:-- left"
 msgstr ", --:--:-- נותרו"
 
-#: resources.h:705
+#: resources.h:717
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr "- נתב ו/או חומת אש לא תקינים"
 
-#: resources.h:249
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr "- קובץ פגום באתר המראה"
 
-#: resources.h:247
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr "- תכנה זדונית במערכת שלך"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- נותרו"
 
@@ -1117,39 +1110,39 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s cannot be used together with an FTP URL."
 
-#: resources.h:968
+#: resources.h:980
 msgid "0 - None"
 msgstr "0 - כלום"
 
-#: resources.h:969
+#: resources.h:981
 msgid "1 - Warning"
 msgstr "1 - אזהרה"
 
-#: resources.h:970
+#: resources.h:982
 msgid "2 - Info"
 msgstr "2 - מידע"
 
-#: resources.h:971
+#: resources.h:983
 msgid "3 - Verbose"
 msgstr "3 - פירוט מלא"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "מערכת של 32 סיביות"
 
-#: resources.h:972
+#: resources.h:984
 msgid "4 - Debug"
 msgstr "4 - ניפוי שגיאות"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "מערכת של 64 סיביות"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &הקודם"
 
-#: resources.h:548
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
@@ -1162,12 +1155,12 @@
 msgid "A default editor needs to be set."
 msgstr "יש להגדיר את עורך ברירת המחדל."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
+#: ../../locales/../src/interface/RemoteListView.cpp:155
 #: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "לא ניתן לגרור תיקייה לתוך אחת מתת־התיקיות שלה."
 
-#: resources.h:677
+#: resources.h:689
 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 "
@@ -1176,22 +1169,22 @@
 "חלק מהשרתים אינם מאפשרים מצב סביל או שהם אינם מוגדרים. במקרים כזה, תאלץ "
 "להשתמש במצב פעיל. במצב פעיל FileZilla פותחת פתחה ומבקש משרת להתחבר אליה."
 
-#: resources.h:306
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr "קובץ שנפתח לאחרונה השתנה."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2071
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "קובץ בשם זה כבר נמצא בשלבי עריכה. האם ברצונך לפתוח את '%s' מחדש?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2067
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "קובץ בשם זה כבר מועבר."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "קובץ בשם זה עדיין נמצא בתהליכי עריכה. יש לסגור אותו ולנסות שוב."
@@ -1209,11 +1202,11 @@
 "עד שתתקן את הבעיה הזו, עלולים·להיות·קבצים חסרים ברשימת הקבצים.\n"
 "לא תופיע התראה נוספת עבור התחברות זו."
 
-#: resources.h:237
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr "גרסה עדכנית יותר של FileZilla זמינה:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:677
 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."
@@ -1221,7 +1214,7 @@
 "שרת תקין תמיד מציג את כל הקבצים, אך לעיתים שרתים פגומים מסתירים קבצים "
 "מהמשתמש. ניתן להשתמש בפקודה זו כדי להכריח את השרת להציג את כל הקבצים."
 
-#: resources.h:749
+#: resources.h:761
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1235,15 +1228,15 @@
 "ישנה פעולה מרוחק בתהליכים והעיון המסונכרן פעיל.\n"
 "האם לבטל את העיון המסונכרן ולהמשיך בשינוי התיקייה המקומית?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:537 resources.h:673 resources.h:838
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:842
 msgid "A&dd"
 msgstr "&הוספה"
 
-#: resources.h:857
+#: resources.h:869
 msgid "A&llow resume of ASCII files"
 msgstr "מתן הא&פשרות לחידוש העברת קובצי ASCII"
 
@@ -1259,15 +1252,15 @@
 msgid "A&pply to all files and directories"
 msgstr "&חל על כל הקבצים והתיקיות"
 
-#: resources.h:627
+#: resources.h:639
 msgid "A&utomatically remove successful transfers"
 msgstr "ה&סרה אוטומטית של העברות מוצלחות"
 
-#: resources.h:389
+#: resources.h:390
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
 msgstr "ביטול החיבור הקודם והתחברות בלשונית הנוכחית"
 
@@ -1275,7 +1268,7 @@
 msgid "About FileZilla"
 msgstr "על אודות FileZilla"
 
-#: resources.h:867
+#: resources.h:879
 msgid "Above the file lists"
 msgstr "מעל לרשימות הקבצים"
 
@@ -1291,15 +1284,15 @@
 msgid "Account"
 msgstr "חשבון"
 
-#: resources.h:602
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr "פעולה לאחר השלמת ה&תור"
 
-#: resources.h:329
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "פעולה ע הקובץ הנבחר:"
 
-#: resources.h:323
+#: resources.h:324
 msgid "Action to perform:"
 msgstr "פעולה לביצוע:"
 
@@ -1334,23 +1327,23 @@
 "בדיקת מצב ה־FTP הפעיל נכשלה. FileZilla יודעת את כתובת ה־IP החיצונית הנוכינה "
 "שלך, אך הנתיב או חומת־האש שלך משנים את הכתובת הנשלחת באופן מוטעה."
 
-#: resources.h:762
+#: resources.h:774
 msgid "Active mode IP"
 msgstr "מצב פעיל IP"
 
-#: resources.h:450
+#: resources.h:451
 msgid "Add files to &queue only"
 msgstr "הוספת קבצים ל&תור בלבד"
 
-#: resources.h:631 resources.h:650
+#: resources.h:643 resources.h:662
 msgid "Add selected directory to the transfer queue"
 msgstr "הוספת התיקייה הנבחרת לתור ההעברה"
 
-#: resources.h:560 resources.h:577
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "הוסף קבצים ותיקיות נבחרים לרשימת ההעברה"
 
-#: resources.h:922 resources.h:928
+#: resources.h:934 resources.h:940
 msgid "Add to queue"
 msgstr "הוספה לתור"
 
@@ -1362,42 +1355,42 @@
 msgid "Advanced"
 msgstr "מתקדם"
 
-#: resources.h:234
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "אפשרויות מתקדמות:"
 
-#: resources.h:338
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "אלגוריתם:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3141
 msgid "All files have been successfully transferred"
 msgstr "כל הקבצים הועברו בהצלחה"
 
-#: resources.h:706
+#: resources.h:718
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "כל הפורטים חייבים להיות בטווח של 1024 עד 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3137
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "כל ההעברות הסתיימו. העברתו של %d מהקבצים כשלה."
 msgstr[1] "כל ההעברות הסתיימו. העברתם של %d מהקבצים כשלה."
 
-#: resources.h:745
+#: resources.h:757
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "תן האפשרות ל„&נפילה“ למצב העברה אחר בעת כשל"
 
-#: resources.h:681
+#: resources.h:693
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "מתן האפשרות למעבר לשיטת העברת נתונים אחרת במקרה של כשל"
 
-#: resources.h:476
+#: resources.h:477
 msgid "Already connected"
 msgstr "כבר בוצע חיבור"
 
-#: resources.h:790
+#: resources.h:802
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1405,7 +1398,7 @@
 "לחלופין ניתן להשתמש בכלי Pageant מבית PuTTy לניהול המפתחות שלך, FileZilla "
 "אינה מכירה ב־Pageant."
 
-#: resources.h:791
+#: resources.h:803
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1413,14 +1406,14 @@
 "לחלופין ניתן להשתמש בסוכן ה־SSH של המערכת שלך. כדי לעשות כך, יש לוודא כי "
 "המשתנה הסביבתי SSH_AUTH_SOCK מוגדר."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1101
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
 "לחלופין, כנס ל http://filezilla-project.org ע\"מ להוריד את הגרסה האחרונה."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2053
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1429,7 +1422,7 @@
 "אירעה שגיאה בעת טעינת תור השמירה מ־„%s“.\n"
 "יתכן שחלק מהפריטים שהוצבו בתור לא שוחזרו."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1952
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1469,11 +1462,11 @@
 "file."
 msgstr "כל השינויים שבוצעו במנהל האתרים לא יישמרו אלא אם כן הקובץ יתוקן."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "לא הייתה אפשרות לשמור את כל השינויים שבוצעו במסננים."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr "כל השינויים שבוצעו במסננים לא ישמרו."
 
@@ -1481,7 +1474,7 @@
 msgid "App&ly to directories only"
 msgstr "החלה על &תיקיות בלבד"
 
-#: resources.h:213
+#: resources.h:214
 msgid "Apply"
 msgstr "החלה"
 
@@ -1494,15 +1487,15 @@
 msgstr "החלה על ה&קבצים בלבד"
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/updatewizard.cpp:323
 msgid "Archive"
 msgstr "ארכיון"
 
-#: resources.h:869
+#: resources.h:881
 msgid "As tab in the transfer queue pane"
 msgstr "כלשונית בחלונית תור ההעברות"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:260 resources.h:270 resources.h:850 resources.h:859
 msgid "Ask for action"
 msgstr "בקשה לפעולת המשך"
 
@@ -1512,15 +1505,15 @@
 msgid "Ask for password"
 msgstr "בקשת ססמה"
 
-#: resources.h:702
+#: resources.h:714
 msgid "Ask operating system for a port."
 msgstr "בקשת פתחה ממערכת ההפעלה."
 
-#: resources.h:692
+#: resources.h:704
 msgid "Ask your operating system for the external IP address"
 msgstr "בקש כתובת ה־IP החיצונית ממערכת ההפעלה"
 
-#: resources.h:471
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr "הצבת שאלות בפורומים של FileZilla"
 
@@ -1532,7 +1525,7 @@
 msgid "At least one filter condition is incomplete"
 msgstr "לפחות אחד מתנאי הכלל לא אומתו"
 
-#: resources.h:711
+#: resources.h:723
 msgid "At this point, all required information has been gathered."
 msgstr "בנקודה זו, כל המידע הדרוש נאסף."
 
@@ -1540,27 +1533,27 @@
 msgid "Attribute"
 msgstr "תכונה"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "האימות נכשל."
 
-#: resources.h:880
+#: resources.h:892
 msgid "Author:"
 msgstr "עורך:"
 
-#: resources.h:386
+#: resources.h:387
 msgid "Auto"
 msgstr "אוטומטי"
 
-#: resources.h:828
+#: resources.h:840
 msgid "Automatic file type classification"
 msgstr "מיון אוטומטי של סוגי קבצים"
 
-#: resources.h:947
+#: resources.h:959
 msgid "Automatic update check"
 msgstr "בדיקת עדכונים אוטומטית"
 
-#: resources.h:884
+#: resources.h:896
 msgid "Available sizes"
 msgstr "גדלים זמינים"
 
@@ -1573,32 +1566,32 @@
 msgid "B&ypass proxy"
 msgstr "מ&עקף המתווך"
 
-#: resources.h:467
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr "הנחיות שימוש בסיסיות"
 
-#: resources.h:871
+#: resources.h:883
 msgid "Behaviour"
 msgstr "התנהגות"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr "בעריכה"
 
-#: resources.h:616
+#: resources.h:626
 msgid "Benchmark string coalescer"
 msgstr "חקר ביצועי בוחר המחרוזות האוטומטי"
 
-#: ../../locales/../src/engine/tlssocket.cpp:881
+#: ../../locales/../src/engine/tlssocket.cpp:949
 msgid "Beware! Certificate has been revoked"
 msgstr "נא להיזהר! תעודה זו נשללה"
 
-#: resources.h:390
+#: resources.h:391
 msgid "Binary"
 msgstr "בינרי"
 
-#: resources.h:864
+#: resources.h:876
 msgid "Blackboard"
 msgstr "לוח"
 
@@ -1608,11 +1601,11 @@
 msgid "Bookmark"
 msgstr "סימנייה"
 
-#: resources.h:413
+#: resources.h:414
 msgid "Bookmark:"
 msgstr "סימנייה:"
 
-#: resources.h:412
+#: resources.h:413
 msgid "Bookmarks"
 msgstr "סימניות"
 
@@ -1628,7 +1621,7 @@
 msgid "Business category:"
 msgstr "קטגוריה עסקית:"
 
-#: resources.h:752
+#: resources.h:764
 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, "
@@ -1637,63 +1630,63 @@
 "כברירת מחדל, משתמש בכל הפתחות האפשריות כדי ליצור קשר פעיל. אם ברצונך להגביל "
 "את FileZilla לטווח מסוים של פתחות, הכנס את הטווח כאן."
 
-#: resources.h:537
+#: resources.h:545
 msgid "C&ancel current operation"
 msgstr "&ביטול הפעולה הנוכחית"
 
-#: resources.h:236
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "חיפוש אחד עדכונים משניים (nightly builds) של FileZilla"
 
-#: resources.h:613
+#: resources.h:623
 msgid "C&lear all"
 msgstr "ניקוי ה&כול"
 
-#: resources.h:588 resources.h:638
+#: resources.h:598 resources.h:650
 msgid "C&opy URL(s) to clipboard"
 msgstr "ה&עתקת הכתובות ללוח הגזירים"
 
-#: resources.h:888
+#: resources.h:900
 msgid "C&ustom"
 msgstr "&מותאם אישית"
 
-#: resources.h:943
+#: resources.h:955
 msgid "C&ustom filetype associations:"
 msgstr "שיוך &מותאם אישית של סוגי קבצים:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "קיזוז אזור הזמן של השרת בחישוב..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "לא ניתן לקרוא מהקובץ"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "לא ניתן לכתוב את הנתונים לקובץ."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "לא ניתן לכתובת את הנתונים אל הקובץ: %s"
 
 #: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "ביטול"
 
-#: resources.h:990
+#: resources.h:1002
 msgid "Cancel current operation"
 msgstr "ביטול הפעולה הנוכחית"
 
-#: resources.h:991
+#: resources.h:1003
 msgid "Cancels the current operation"
 msgstr "ביטול הפעולה הנוכחית"
 
@@ -1722,37 +1715,37 @@
 "לא ניתן להשוות בין תיקיות, ישנם מסננים שונים הפועלים על התיקיות המקומית "
 "והמרוחקת"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
 msgstr "לא ניתן להשוות בין תיקיות, לא מחובר לשרת."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "לא ניתן ליצור מסנן חדש"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/LocalListView.cpp:2180
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "לא ניתן לערוך קובץ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1965
 msgid "Cannot edit file, not connected to any server."
 msgstr "לא ניתן לערוך קובץ, לא מחובר לשום שרת."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1976
 msgid "Cannot edit file, remote path unknown."
 msgstr "לא ניתן לערוך את הקובץ, הנתיב המרוחק אינו ידוע."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "לא ניתן לקיים התחברות FTP לשרת SFTP. יש לבחור את הפרוטוקול הראוי."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "לא ניתן לטעון את סרגל ההתחברות המהירה מקובץ המשאב"
 
@@ -1764,7 +1757,7 @@
 msgid "Cannot load keyfile"
 msgstr "לא ניתן לטעון את קובץ המפתח"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1066
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
 msgid "Cannot load toolbar from resource file"
 msgstr "לא ניתן לטעון את סרגל הכלים מקובץ המשאב"
 
@@ -1773,35 +1766,35 @@
 msgid "Cannot rename entry"
 msgstr "לא ניתן לשנות שם לרשומה"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "לא ניתן לשנות את שם הקובץ"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "לא ניתן לשמור את ערכת המסננים"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "לא ניתן לבחר מסנן"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
 msgstr "לא ניתן להגדיר את שיוך הקובץ"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "לא ניתן להציג את תיבת הדו־שיח"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2067
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
 msgstr "לא ניתן לצפות/לערוך את הקובץ הנבחר"
 
-#: resources.h:283
+#: resources.h:284
 msgid "Categories"
 msgstr "קטגוריות"
 
@@ -1829,11 +1822,11 @@
 msgid "Change file attributes"
 msgstr "שינוי תכונות הקובץ"
 
-#: resources.h:591 resources.h:641
+#: resources.h:601 resources.h:653
 msgid "Change the file permissions."
 msgstr "שינוי הרשאות הקובץ."
 
-#: resources.h:964
+#: resources.h:976
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "שינוי הגדרות קובץ היומן דורשים את אתיחול FileZilla."
 
@@ -1845,23 +1838,23 @@
 msgid "Charset"
 msgstr "קידוד"
 
-#: resources.h:952
+#: resources.h:964
 msgid "Check for &beta versions and release candidates"
 msgstr "בדיקה אחר גרסאות &בטא ומועמדות להפצה"
 
-#: resources.h:550
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "&חפש עדכונים..."
 
-#: resources.h:551
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "בדוק האם יש חדשה של FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:164
 msgid "Check for updates"
 msgstr "בדוק עדכונים"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1807
 msgid "Check for updates failed"
 msgstr "בדיקת העדכונים נכשלה"
 
@@ -1869,11 +1862,11 @@
 msgid "Checking for correct external IP address"
 msgstr "בדיקה אחר כתובת IP חיצונית נכונה"
 
-#: resources.h:232
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "בדיקה אחר עדכונים"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1245
 msgid "Checksum mismatch of downloaded file."
 msgstr "בדיקת ההתאמה של הקובץ שהתקבל."
 
@@ -1895,39 +1888,39 @@
 msgid "Cipher:"
 msgstr "הצפנה:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:504 resources.h:678
 msgid "Cl&ose tab"
 msgstr "&סגירת לשונית"
 
-#: resources.h:861
+#: resources.h:873
 msgid "Classic"
 msgstr "קלאסי"
 
-#: resources.h:286
+#: resources.h:287
 msgid "Clear &Site Manager entries"
 msgstr "&ניקוי הרשומות במנהל האתרים"
 
-#: resources.h:614
+#: resources.h:624
 msgid "Clear &layout cache"
 msgstr "ניקוי מטמון ה&פריסה"
 
-#: resources.h:284
+#: resources.h:285
 msgid "Clear &quickconnect history"
 msgstr "ניקוי היסטוריית החיבור המהיר"
 
-#: resources.h:285
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "ניקוי המידע ל&צורך חידוש ההתחברות"
 
-#: resources.h:287
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "ניקוי תור ההעברות"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:146
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "ניקוי היסטוריה"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1935,11 +1928,11 @@
 msgid "Clear private data"
 msgstr "ניקוי מידע אישי"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:145
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "ניקוי אזור החיבור המהיר"
 
-#: resources.h:615
+#: resources.h:625
 msgid "Clear string coalescer"
 msgstr "ניקוי בוחר המחרוזות האוטומטי"
 
@@ -1947,24 +1940,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "יש ללחוץ על סיום כדי לשמור את ההגדרות."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1100
 msgid "Click on next to download the new version."
 msgstr "יש ללחוץ על הבא כדי להוריד גרסה חדשה."
 
-#: resources.h:347
+#: resources.h:348
 msgid "Client to server MAC:"
 msgstr "MAC הלקוח אל השרת:"
 
-#: resources.h:345
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr "הצפנת השרת ללקוח:"
 
-#: resources.h:667
+#: resources.h:679
 msgid "Close &all other tabs"
 msgstr "סגירת כל &שאר הכרטיסיות"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1138
-#: ../../locales/../src/interface/Mainfrm.cpp:1161
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1219
+#: ../../locales/../src/interface/Mainfrm.cpp:1242
 msgid "Close FileZilla"
 msgstr "את סגור FileZilla"
 
@@ -1972,7 +1965,7 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Close all running instances of FileZilla"
 
-#: resources.h:497
+#: resources.h:505
 msgid "Closes current tab"
 msgstr "הלשונית הנוכחית תיסגר"
 
@@ -1984,11 +1977,11 @@
 msgid "Column properties"
 msgstr "מאפייני העמודה"
 
-#: resources.h:354
+#: resources.h:355
 msgid "Column setup"
 msgstr "הגדרת העמודה"
 
-#: resources.h:938
+#: resources.h:950
 msgid "Command and its arguments should be properly quoted."
 msgstr "יש להוסיף פסיקים כראוי לפקודה ולארגומנטים שלה."
 
@@ -2007,9 +2000,9 @@
 msgstr "הפקודה לא נתמכת ע״י הפרוטוקול הזה"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:542
 msgid "Command:"
 msgstr "פקודה:"
 
@@ -2026,15 +2019,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "ההתקשרות נחסמה על ידי נתב או חומת אש"
 
-#: resources.h:514 resources.h:645
+#: resources.h:522 resources.h:657
 msgid "Compare &modification time"
 msgstr "השוואת זמן ה&שינוי"
 
-#: resources.h:513 resources.h:644
+#: resources.h:521 resources.h:656
 msgid "Compare file&size"
 msgstr "השוואת &גדלי הקבצים"
 
-#: resources.h:918
+#: resources.h:930
 msgid "Comparison &threshold (in minutes):"
 msgstr "&סף ההשוואה (בדקות):"
 
@@ -2062,39 +2055,39 @@
 msgid "Compressed"
 msgstr "דחוס"
 
-#: resources.h:802
+#: resources.h:814
 msgid "Concurrent transfers"
 msgstr "העברות בו זמנית"
 
-#: resources.h:224 resources.h:438
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr "התנאים הינם תלויי &רישיות"
 
-#: resources.h:710
+#: resources.h:722
 msgid "Configuration test"
 msgstr "בודק הגדרות"
 
-#: resources.h:684
+#: resources.h:696
 msgid "Configure passive mode"
 msgstr "מוגדר במצב פסיבי"
 
-#: resources.h:700
+#: resources.h:712
 msgid "Configure port range"
 msgstr "מגדיר טווח פורטים"
 
-#: resources.h:468
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr "FileZilla והרשת שלך מוגדרים"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "אישור המחיקה"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
+#: ../../locales/../src/interface/LocalListView.cpp:2020
+#: ../../locales/../src/interface/LocalListView.cpp:2140
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "נדרש אישור"
@@ -2103,7 +2096,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "מצוין! ההגדרות ככל הנראה עובדות."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:144
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "התחבר תוך דילוג על הגדרות המתווך"
 
@@ -2111,21 +2104,21 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Connect to specified Site Manager site"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "מחובר"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1456
 msgid "Connecting"
 msgstr "מתחבר"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "מתבצע חיבור ל־%s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1166
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "מתבצע חיבור ל־%s דרך מתווך"
@@ -2137,8 +2130,8 @@
 msgid "Connecting to %s..."
 msgstr "מתבצע חיבור ל־%s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:425
+#: ../../locales/../src/interface/updatewizard.cpp:1002
 msgid "Connecting to server"
 msgstr "מתחבר לשרת"
 
@@ -2146,7 +2139,7 @@
 msgid "Connection"
 msgstr "התחברות"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1072
 msgid "Connection attempt failed"
 msgstr "ניסיון ההתחברות נכשל"
 
@@ -2171,11 +2164,11 @@
 msgstr "חיבור נותק"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "החיבור נסגר על ידי השרת"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "חיבור התחדש, TLS מופעל..."
@@ -2184,7 +2177,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "חיבור התחדש, שולח בקשה דרך HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "חיבור התחדש, מחכה להודעת welcome (ברוכים הבאים)..."
 
@@ -2204,11 +2197,11 @@
 msgid "Connection timed out"
 msgstr "פג תוקף הקשר"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "פג תוקף ההתחברות."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "החיבור לשרת אבד."
 
@@ -2228,7 +2221,7 @@
 msgid "Convert keyfile"
 msgstr "המרת קובץ מפתח"
 
-#: resources.h:77 resources.h:417
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "העתק"
 
@@ -2244,11 +2237,11 @@
 msgid "Copy of %s"
 msgstr "העתק של %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:599 resources.h:651
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "העתקת הכתובות של הפריטים הנבחרים ללוח הגזירים."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "לא ניתן לקבל את החיבור: %s"
@@ -2262,12 +2255,12 @@
 msgid "Could not connect to server"
 msgstr "לא מצליח להתחבר לשרת"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1208
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "לא ניתן להתחבר לשרת: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "לא ניתן להמיר את הפקודה לקידוד השרת"
 
@@ -2276,16 +2269,16 @@
 msgid "Could not convert private key"
 msgstr "לא ניתן להמיר את המפתח האישי"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not copy URLs"
 msgstr "לא ניתן להעתיק את הכתובות"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "לא ניתן להעתיק את הנתונים"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
 #: ../../locales/../src/interface/RemoteTreeView.cpp:897
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
@@ -2295,7 +2288,7 @@
 "לא מצליח לאתר את יעד הגרירה.\n"
 "התוסף לא מותקן כראוי או שהגרירה לא התבצעה לתוך חלון של Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "לא ניתן להתחבר לשרת"
 
@@ -2310,11 +2303,11 @@
 "ניתן להגדיר את תיקיית הנתונים של FileZilla באמצעות הארגומנט '‎--datadir "
 "<custompath>‎' בשורת הפקודה כדי להגדיר את ה־FZ_DATADIT."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "לא ניתן לייצר רצף התחברות מותאם אישית."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1011
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2322,7 +2315,7 @@
 "לא ניתן לקבל את השם הייחודי של מנפיק התעודה, ארע כשל "
 "ב־gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:986
+#: ../../locales/../src/engine/tlssocket.cpp:1054
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2338,15 +2331,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "לא ניתן לקבל תשובה מ־fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr "לא ניתן לאחזר את תיקיית ברירת המחדל אליה ירד הקובץ."
 
-#: ../../locales/../src/engine/tlssocket.cpp:939
+#: ../../locales/../src/engine/tlssocket.cpp:1007
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "לא ניתן לייבא את תעודות העמית, ארע כשל ב־gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:932
+#: ../../locales/../src/engine/tlssocket.cpp:1000
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2401,8 +2394,8 @@
 "לא ניתן לאחזר את התיקייה המרוחקת התואמת לתיקייה המקומית '%s'.\n"
 "העיון המסונכרן בוטל."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not open clipboard"
 msgstr "לא ניתן לפתוח את לוח הגזירים"
@@ -2418,11 +2411,11 @@
 msgid "Could not parse remote path."
 msgstr "לא ניתן לנתח את הנתיב המאוחר."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "לא ניתן לפענח את כתובת השרת:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "לא ניתן לקרוא מהשקע: %s"
@@ -2431,12 +2424,12 @@
 msgid "Could not read server item."
 msgstr "לא ניתן לקרוא פריט מהשרת."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "לא ניתן להגיע למיקום %s בקובץ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "לא ניתן למצוא את סוף הקובץ"
 
@@ -2444,17 +2437,17 @@
 msgid "Could not send command to fzputtygen."
 msgstr "לא ניתן לשלוח פקודה אל fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "לא מצליח לפתוח IO thread (תת תוכנית שרצה במקביל)"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1181
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "לא ניתן להתחיל בלחיצת היד עם המתווך: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1123
+#: ../../locales/../src/interface/QueueView.cpp:1128
 msgid "Could not start transfer"
 msgstr "לא ניתן להתחיל בהעברה"
 
@@ -2476,7 +2469,7 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "לא ניתן לכתוב אל \"%s\", לא ניתן לשמור הסימניות הכלליות: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1987
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2485,14 +2478,14 @@
 "לא ניתן לכתוב אל \"%s\", לא ניתן לשמור את התור.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "לא ניתן לכתוב אל \"%s\", לא ניתן לייצא את האתרים הנבחרים: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "לא ניתן לכתוב אל \"%s\": %s"
@@ -2502,7 +2495,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "לא ניתן לכתוב את קובץ המפתח: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1117
 msgid "Could not write to local file"
 msgstr "לא ניתן לכתוב אל הקובץ המקורי"
 
@@ -2522,30 +2515,42 @@
 msgid "Country:"
 msgstr "מדינה:"
 
-#: resources.h:618
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "פעולה זו מקריסה את FileZilla. משמש אך ורק לניפוי מטפל החריגות"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:591
+msgid "Crea&te new file"
+msgstr "י&צירת קובץ חדש"
+
+#: resources.h:576 resources.h:590 resources.h:645 resources.h:666
 msgid "Create a new subdirectory in the current directory"
-msgstr "צור תת-תיקיה בתיקיה הנוכחית"
+msgstr "יצירת תת‏־תיקייה בתיקייה הנוכחית"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
+#: resources.h:592
+msgid "Create a new, empty file in the current directory"
+msgstr "יצירת קובץ חדש וריק בתיקייה הנוכחית"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1196
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "צור תיקייה"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+msgid "Create empty file"
+msgstr "יצירת קובץ ריק"
+
+#: ../../locales/../src/interface/QueueView.cpp:1529
 msgid "Creating directory"
-msgstr "יוצר תיקייה"
+msgstr "נוצרת תיקייה"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "יוצר תיקייה '%s'..."
+msgstr "נוצרת התיקייה '%s'..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
@@ -2581,23 +2586,23 @@
 msgid "Current transfer type is set to binary."
 msgstr "מצב ההעברה הנוכחי מוגדר לבינארי."
 
-#: resources.h:773 resources.h:894
+#: resources.h:785 resources.h:906
 msgid "Cus&tom"
 msgstr "&מותאם אישית"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "ערכת מסננים מותאמת"
 
-#: resources.h:376 resources.h:377
+#: resources.h:377 resources.h:378
 msgid "Custom server"
 msgstr "שרת מותאם אישית"
 
-#: resources.h:385
+#: resources.h:386
 msgid "D&ata type"
 msgstr "&סוג הנתונים"
 
-#: resources.h:901
+#: resources.h:913
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 "קידומות &עשרוניות באמצעות סימונים בינלאומיים (לדוגמה 1ק\"ב = 1000 בתים)"
@@ -2606,19 +2611,19 @@
 msgid "D&efault"
 msgstr "ברירת מחדל"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:594 resources.h:646 resources.h:676
 msgid "D&elete"
 msgstr "מחק"
 
-#: resources.h:205
+#: resources.h:206
 msgid "D&isable all"
 msgstr "בטל הכל"
 
-#: resources.h:872
+#: resources.h:884
 msgid "D&o not save passwords"
 msgstr "אין ל&שמור ססמאות"
 
-#: resources.h:925
+#: resources.h:937
 msgid "D&ouble-click action on directories:"
 msgstr "פעולת לחיצה &כפולה על תיקיות:"
 
@@ -2626,8 +2631,8 @@
 msgid "DOS-like with virtual paths"
 msgstr "דמוי־DOS עם נתיבים מדומים"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "סוג קובץ מסוכן"
 
@@ -2635,8 +2640,8 @@
 msgid "Data"
 msgstr "נתונים"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "שקע הנתונים נסגר בטרם עת."
 
@@ -2644,7 +2649,7 @@
 msgid "Date"
 msgstr "תאריך"
 
-#: resources.h:885
+#: resources.h:897
 msgid "Date formatting"
 msgstr "מבנה הזמנים"
 
@@ -2663,7 +2668,7 @@
 msgid "Debug"
 msgstr "ניפוי שגיאות"
 
-#: resources.h:965
+#: resources.h:977
 msgid "Debugging settings"
 msgstr "הגדרת ניפוי שגיאות"
 
@@ -2679,7 +2684,7 @@
 msgid "Default editor not properly quoted."
 msgstr "עורך ברירת המחדל אינו מסומן כראוי."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:256 resources.h:278 resources.h:867
 msgid "Default file exists action"
 msgstr "ברירת המחדל לקובץ קיים"
 
@@ -2699,15 +2704,15 @@
 msgid "Default system language"
 msgstr "שפת ברירת המחדל של המערכת"
 
-#: resources.h:678
+#: resources.h:690
 msgid "Default transfer mode:"
 msgstr "ברירת המחדל לסוג ההעברה:"
 
-#: resources.h:824
+#: resources.h:836
 msgid "Default transfer type:"
 msgstr "שיטת ההעברה כבררת המחדל:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:709 resources.h:772
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "ברירת מחדל: http://ip.filezilla-project.org/ip.php"
 
@@ -2731,53 +2736,53 @@
 msgid "Delete Site Manager entry"
 msgstr "מחק את הרשומה ממנהל האתרים"
 
-#: resources.h:635 resources.h:656
+#: resources.h:647 resources.h:668
 msgid "Delete selected directory"
 msgstr "מחיקת התיקייה הנבחרת"
 
-#: resources.h:571 resources.h:585
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
 msgstr "מחיקת הקבצים והתיקיות הנבחרים"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "התיקיות נמחקות"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "מחיקה של מספר תיקיות שאינן קשורות זו בזו אינה נתמכת עדיין"
 
-#: resources.h:453
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr "הקישור הסימבולי נמחק"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1045
 msgid "Desktop"
 msgstr "שולחן העבודה"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "פרטים"
 
-#: resources.h:189
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "פרטי המפתח החדש:"
 
-#: resources.h:227
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "&תיקיות"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Direction"
 msgstr "כיוון"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "תיקייה"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2338
+#: resources.h:654 resources.h:928 resources.h:1011
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2370
 msgid "Directory comparison"
 msgstr "השוואת תיקיות"
 
@@ -2795,11 +2800,11 @@
 msgid "Directory listing aborted by user"
 msgstr "תצוגת התיקיות בוטלה על ידי המשתמש"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
 msgstr "הצגת התיקיות נכשלה"
 
-#: resources.h:198
+#: resources.h:199
 msgid "Directory listing filters"
 msgstr "מסנני הצגת התיקיות"
 
@@ -2807,7 +2812,7 @@
 msgid "Directory listing successful"
 msgstr "הצגת התיקיות הצליחה"
 
-#: resources.h:208
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "בטל ה&כל"
 
@@ -2816,24 +2821,24 @@
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr "האם לבטל את העיון המסונכרן ולהמשיך בשינוי התיקייה המרוחקת?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:671
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "ניתן לבטל אפשרות זו שוב אם לא ניתן לצפות בתכני התיקייה הנכונה עוד."
 
-#: resources.h:992
+#: resources.h:1004
 msgid "Disconnect from server"
 msgstr "הנתק מהשרת"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Disconnected from server"
 msgstr "מנותק מהשרת"
 
@@ -2843,29 +2848,29 @@
 msgid "Disconnected from server: %s"
 msgstr "מנותק מהשרת: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "מתנתק מהשרת הקודם"
 
-#: resources.h:993
+#: resources.h:1005
 msgid "Disconnects from the currently visible server"
 msgstr "מתנתק מהשרת הגלוי הנוכחי"
 
-#: resources.h:556
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "הצגת תיבת אודות"
 
-#: resources.h:934
+#: resources.h:946
 msgid "Do &not use default editor"
 msgstr "&אל תשתמש בעורך ברירת המחדל"
 
-#: resources.h:610
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "&לא לבצע דבר"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../locales/../src/interface/updatewizard.cpp:252
 msgid ""
 "Do you really want to check for beta versions?\n"
 "Unless you want to test new features, keep using stable versions."
@@ -2873,8 +2878,8 @@
 "האם אתה בטוח שברצונך לחפש גרסאות ניסיון?\n"
 "אם אינך מעוניין להתנסות באפשרויות חדשות, השאר בגרסה יציבה."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
-#: ../../locales/../src/interface/Mainfrm.cpp:1165
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
+#: ../../locales/../src/interface/Mainfrm.cpp:1246
 msgid "Do you really want to close FileZilla?"
 msgstr "האם אתה בטוח שברצונך לסגור את FileZilla?"
 
@@ -2900,27 +2905,27 @@
 msgid "Do you really want to send '%s' to the server?"
 msgstr "האם אתה בטוח שברצונך לשלוח את '%s' אל השרת?"
 
-#: resources.h:466
+#: resources.h:467
 msgid "Documentation"
 msgstr "תיעוד"
 
-#: resources.h:699
+#: resources.h:711
 msgid "Don't use external IP address on &local connections."
 msgstr "אל תשתמש בכתובת IP חיצונית עבור חיבורים &מקומיים."
 
-#: resources.h:835
+#: resources.h:847
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "קובצי נקודה הינם קבצים ששמם מתחיל בנקודה, לדוגמה: .htaccess"
 
-#: resources.h:919
+#: resources.h:931
 msgid "Double-click action"
 msgstr "פעולת לחיצה כפולה"
 
-#: resources.h:362
+#: resources.h:363
 msgid "Download"
 msgstr "הורד"
 
-#: resources.h:482 resources.h:811
+#: resources.h:483 resources.h:823
 msgid "Download &limit:"
 msgstr "הגבלת הורדה:"
 
@@ -2933,60 +2938,60 @@
 msgid "Download limit: none"
 msgstr "הגבלת הורדה: אין"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:442 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "הורדת תוצאות החיפוש"
 
-#: resources.h:629
+#: resources.h:641
 msgid "Download selected directory"
 msgstr "הורד את התיקייה הנבחרת"
 
-#: resources.h:575
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "הורד את הקבצים והתיקיות הנבחרים"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "מוריד"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:416
 #, c-format
 msgid "Downloading %s"
 msgstr "מוריד %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "הורדת מספר תיקיות שאינן קשורות זו בזו עדיין אינה נתמכת"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "תוצאות החיפוש מתקבלות"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
-#: ../../locales/../src/interface/LocalTreeView.cpp:104
+#: ../../locales/../src/interface/LocalListView.cpp:104
+#: ../../locales/../src/interface/LocalTreeView.cpp:105
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 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:110
+#: ../../locales/../src/interface/LocalListView.cpp:110
+#: ../../locales/../src/interface/LocalTreeView.cpp:111
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "גרירה ושיחרור בין שרתים שונים אינה מוטמעת עדיין."
 
-#: resources.h:204
+#: resources.h:205
 msgid "E&nable all"
 msgstr "אשר הכל"
 
-#: resources.h:561 resources.h:578
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
 msgstr "ה&זן תיקייה"
 
@@ -2994,7 +2999,7 @@
 msgid "E&xecute"
 msgstr "בצע"
 
-#: resources.h:501
+#: resources.h:509
 msgid "E&xit"
 msgstr "יציאה"
 
@@ -3006,25 +3011,25 @@
 msgid "Each filter needs at least one condition."
 msgstr "כל מסנן זקוק לתנאי אחד לפחות."
 
-#: resources.h:230
+#: resources.h:231
 msgid "Edit filters"
 msgstr "עריכת מסננים"
 
-#: resources.h:566
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr "עריכת הקובץ עם העורך המוגדר והעלאת השינויים לשרת."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1965
+#: ../../locales/../src/interface/LocalListView.cpp:1976
 msgid "Editing failed"
 msgstr "העריכה נכשלה"
 
-#: resources.h:882
+#: resources.h:894
 msgid "Email:"
 msgstr "אימייל:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2299
 msgid "Empty command"
 msgstr "פקודה ריקה"
 
@@ -3032,7 +3037,7 @@
 msgid "Empty command."
 msgstr "פקודה ריקה."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
 msgstr "הצגת התיקיות ריקה"
 
@@ -3044,13 +3049,13 @@
 msgid "Empty file extension."
 msgstr "סיומת הקובץ ריקה."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "שמות ריקים למסננים אינם מורשים."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "שם ריק"
 
@@ -3058,11 +3063,11 @@
 msgid "Empty quoted string."
 msgstr "מחרוזת ריקה בגרשיים."
 
-#: resources.h:207
+#: resources.h:208
 msgid "En&able all"
 msgstr "אפשר את כולם"
 
-#: resources.h:820
+#: resources.h:832
 msgid "Enable invalid character &filtering"
 msgstr "הפעלת סינון &תווים בלתי תקניים"
 
@@ -3070,28 +3075,28 @@
 msgid "Encrypted"
 msgstr "מוצפן"
 
-#: resources.h:344
+#: resources.h:345
 msgid "Encryption"
 msgstr "הצפנה"
 
-#: resources.h:336
+#: resources.h:337
 msgid "Encryption details"
 msgstr "פרטי ההצפנה"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "לסיים את ההשוואה ולשנות את הסדר?"
 
-#: resources.h:542
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "הכנס פקודות לשרת..."
 
-#: resources.h:486
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "יש להזין 0 למהירות בלתי מוגבלת."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2288
 msgid "Enter command"
 msgstr "הזנת פקודה"
 
@@ -3099,21 +3104,21 @@
 msgid "Enter custom command"
 msgstr "הזנת פקודות לשרת"
 
-#: resources.h:926
+#: resources.h:938
 msgid "Enter directory"
 msgstr "הזנת תיקייה"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "הזנת שם החוצץ"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "הזנת השם עבור ערכת המסננים"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "הזנת שם חדש לערכת המסננים"
 
@@ -3121,11 +3126,11 @@
 msgid "Enter password"
 msgstr "הזנת ססמה"
 
-#: resources.h:562 resources.h:579
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
 msgstr "הזנת התיקייה הנבחרת"
 
-#: resources.h:719
+#: resources.h:731
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3149,7 +3154,7 @@
 "יש להזין את הססמה עבור הקובץ '%s'.\n"
 "נא לשים לב כי הקובץ המומר לא יהיה מוגן בססמה."
 
-#: resources.h:723
+#: resources.h:735
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3171,7 +3176,7 @@
 msgid "Error importing"
 msgstr "שגיאה בייבוא"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2054
 msgid "Error loading queue"
 msgstr "שגיאה בטעינת התור"
 
@@ -3180,27 +3185,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
 #: ../../locales/../src/interface/import.cpp:120
 #: ../../locales/../src/interface/import.cpp:311
-#: ../../locales/../src/interface/Options.cpp:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1967
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:731
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:786
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "שגיאה בטעינת קובץ XML"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1953
 msgid "Error saving queue"
 msgstr "שגיאה בשמירת התור"
 
@@ -3211,40 +3216,40 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1988
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:810
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "שגיאה בכתיבת קובץ XML"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Error, file name cannot be parsed."
 msgstr "שגיאה, לא ניתן לפענח את שם הקובץ."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:352
 msgid "Error, local file exists but cannot be removed"
 msgstr "שגיאה, הקובץ המקומי קיים אך לא ניתן להסירו"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:536
 msgid "Error:"
 msgstr "שגיאה:"
 
-#: resources.h:478
+#: resources.h:479
 msgid "Establish connection in a new tab"
 msgstr "התקשרות בלשונית חדשה"
 
-#: resources.h:945
+#: resources.h:957
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "דוגמה: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:916
 msgid "Examples"
 msgstr "דוגמאות"
 
@@ -3252,31 +3257,31 @@
 msgid "Exe&cute"
 msgstr "ה&פעלה"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:321
 msgid "Executable"
 msgstr "קובץ הפעלה"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1807
 msgid "Executable contains no version info, cannot check for updates."
 msgstr "קובץ ההפעלה לא מכיל נתוני גירסה, לא ניתן לבדוק אחר עדכונים."
 
-#: resources.h:862
+#: resources.h:874
 msgid "Explorer"
 msgstr "סייר"
 
-#: resources.h:294
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "ייצוא ה&תור"
 
-#: resources.h:293
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "יי&צוא ההגדרות"
 
-#: resources.h:290
+#: resources.h:291
 msgid "Export settings"
 msgstr "ייצוא ההגדרות"
 
-#: resources.h:219
+#: resources.h:220
 msgid "F&ilter name:"
 msgstr "שם המ&סנן:"
 
@@ -3296,16 +3301,16 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - פרוטוקול בלתי מאובטח להעברת קבצים"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "מנוע ה־FTP לא מופעל, לא ניתן להתחבר"
 
-#: resources.h:747
+#: resources.h:759
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:779
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "מתווך FTP"
@@ -3314,7 +3319,7 @@
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:687
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3330,10 +3335,10 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP על גבי TLS/SSL מרומז"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2261
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "כשל בהחלפת התיקייה"
@@ -3345,7 +3350,7 @@
 msgid "Failed to change language"
 msgstr "כשל בשינוי השפה"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:454
 msgid "Failed to check for newer version of FileZilla."
 msgstr "כשלון בבדיקה עבור גרסה חדשה של FileZilla."
 
@@ -3357,32 +3362,32 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "יצירת עותק גיבוי עבור קובץ ה־XML נכשלה"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "כשל ביצירת שקע להאזנה, מבטל"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "כשל ביצירת שקע האזנה לתעבורה במצב פעיל"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:456
 msgid "Failed to download the latest version of FileZilla."
 msgstr "כשלון בהורדת הגרסה האחרונה של FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:662
 msgid "Failed to get 'My Documents' path"
 msgstr "כשל באיחזור תיקיית 'המסמכים שלי'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:648
 msgid "Failed to get desktop path"
 msgstr "כשל באיחזור נתיב שולחן העבודה"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "כשל באיחזור כתובת העמית לבקרת החיבור, החיבור נסגר."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "כשל באיחזור כתובת העמית לחיבור נתונים, החיבור נסגר."
 
@@ -3390,8 +3395,8 @@
 msgid "Failed to initialize FTP engine"
 msgstr "כשל בהפעלת מנוע ה־FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "כשלון באיתחול TLS."
@@ -3405,17 +3410,17 @@
 msgid "Failed to load private key: %s"
 msgstr "כשל בטעינת המפתח הפרטי: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "כשל בפתיחת „%s“ לצורך הוספה/כתיבה"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "פתיחת „%s“ לקריאה נכשלה"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
@@ -3430,7 +3435,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "ארע כשל בפענוח תעודת השורש המהימנה."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "כשלון בקבלת נתונים"
 
@@ -3442,11 +3447,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "כשל באיחזור כתובת ה־ip החיצונית, מבטל"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "כשל באיחזור כתובת ה־ip החיצונית, עושה שימוש בכתובת המקומית"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "כשלון בקבלת IP מקומי."
 
@@ -3498,7 +3503,7 @@
 msgid "Failed to validate settings"
 msgstr "כשל באימות ההגדרות"
 
-#: ../../locales/../src/engine/tlssocket.cpp:874
+#: ../../locales/../src/engine/tlssocket.cpp:942
 msgid "Failed to verify peer certificate"
 msgstr "ארע כשל באימות תעודת העמית"
 
@@ -3515,21 +3520,19 @@
 msgid "Failed transfers"
 msgstr "העברות שנכשלו"
 
-#: resources.h:690
+#: resources.h:702
 msgid "Fall back to active mode"
 msgstr "חזור למצב פעיל"
 
-#: resources.h:369
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "ק&ובץ:"
 
-#: resources.h:226
+#: resources.h:227
 msgid "Fil&es"
 msgstr "קבצים"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "קובץ"
 
@@ -3545,7 +3548,7 @@
 msgid "File editing"
 msgstr "עריכת קובץ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "קובץ קיים"
 
@@ -3553,7 +3556,7 @@
 msgid "File exists action"
 msgstr "פועלות כשקובץ קיים"
 
-#: resources.h:305
+#: resources.h:306
 msgid "File has changed"
 msgstr "הקובץ השתנה"
 
@@ -3561,14 +3564,14 @@
 msgid "File lists"
 msgstr "רשימות קבצים"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/FileZilla.cpp:702
 #: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "קובץ לא נמצא"
 
-#: resources.h:1003
+#: resources.h:1015
 msgid "File search"
 msgstr "חיפוש אחר קבצים"
 
@@ -3603,31 +3606,31 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "העברת הקובץ הושלמה בהצלחה, הועברו %s ב־%s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "File transfers still in progress."
 msgstr "ישנן העברות קבצים פעילות."
 
-#: resources.h:387
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr "הקובץ יועבר במצב נתונים ASCII."
 
-#: resources.h:388
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr "הקובץ יועבר במצב נתונים בינארי."
 
 #: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "שגיאה בFileZilla"
 
-#: resources.h:712
+#: resources.h:724
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr "FileZilla עכשיו יבדוק את ההגדרות שלך, ע\"מ לוודא שהכל הוגדר כראוי."
 
-#: resources.h:477
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
 msgstr "התכנה FileZilla כבר מחוברת לשרת."
 
@@ -3640,62 +3643,67 @@
 "FileZilla פועלת כעת במצב בטוח.\n"
 "סוגי ההתחברות 'רגיל' ו־ 'חשבון' אינם זמינים במצב זה."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1556
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "יש להפעיל מחדש את FileZilla כדי שהשינויים יכנסו לתוקף."
 
-#: resources.h:517
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "שורות מצב &רשימות הקבצים"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
+#: ../../locales/../src/interface/edithandler.cpp:1232
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
 #: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "שם הקובץ"
 
-#: resources.h:510
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "מסנני &שמות קבצים..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "לא ניתן לבנות את שם הקובץ עבור התיקייה %s ושם הקובץ %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "שם הקובץ שגוי"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "שם הקובץ לא יכול להכיל אף אחד מהסימנים הבאים: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
-msgstr "שם הקובץ לא ניתן לשינוי"
+msgstr "שם הקובץ לא השתנה"
 
-#: resources.h:307 resources.h:958
+#: resources.h:308 resources.h:970
 msgid "Filename:"
 msgstr "שם הקובץ:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1375
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "שם הקובץ לא יכול להכיל את הסימנים הבאים: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1350
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "שם הקובץ לא יכול להכיל את הסימנים הבאים: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "קבצים שנערכים כעת"
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
 #: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "גודל הקובץ"
@@ -3704,56 +3712,56 @@
 msgid "Filesize format"
 msgstr "מבנה גודל הקובץ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "סוג הקובץ"
 
-#: resources.h:946
+#: resources.h:958
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "שיוך סוגי הקבצים"
 
-#: resources.h:225
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "המסנן חל על:"
 
-#: resources.h:819
+#: resources.h:831
 msgid "Filter invalid characters in filenames"
 msgstr "סינון תווים בלתי תקניים בשמות הקבצים"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "שם המסנן כבר קיים"
 
-#: resources.h:221
+#: resources.h:222
 msgid "Filter out items matching all of the following"
 msgstr "סינון כל הפריטים התואמים לכל התנאים הבאים"
 
-#: resources.h:222
+#: resources.h:223
 msgid "Filter out items matching any of the following"
 msgstr "סינון כל הפריטים התואמים לפחות לאחד מהתנאים הבאים"
 
-#: resources.h:223
+#: resources.h:224
 msgid "Filter out items matching none of the following"
 msgstr "סינון כל הפריטים שאינם תואמים לאף אחד מהתנאים הבאים"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "המסנן שהוגדר כבר קיים"
 
-#: resources.h:996
+#: resources.h:1008
 msgid "Filter the directory listings"
 msgstr "סינון הצגת התיקיות"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "אימות המסנן נכשל"
 
@@ -3765,7 +3773,7 @@
 msgid "Fingerprint (SHA-1):"
 msgstr "טביעת אצבע (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr "טביעת אצבע (שיטת קידוד):"
 
@@ -3773,17 +3781,17 @@
 msgid "Firewall and router configuration wizard"
 msgstr "אשף תצורת הנתב וחומת־האש"
 
-#: resources.h:730
+#: resources.h:742
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr "לפרטים נוספים על הגדרה זו, אנא הפעל את אשף ההגדרות."
 
-#: resources.h:707
+#: resources.h:719
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "עבור תוצאות אמינות, עליך לאפשר טווח של לפחות 10 פורטים."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3793,23 +3801,23 @@
 msgid "Force &UTF-8"
 msgstr "כפה שימוש ב־UTF-8"
 
-#: resources.h:544
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr "אילוץ ה&צגת קבצים מוסתרים"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:674
 msgid "Force showing hidden files"
 msgstr "אילוץ הצגת קבצים מוסתרים"
 
-#: resources.h:774
+#: resources.h:786
 msgid "Format specifications:"
 msgstr "מפרט המבנה:"
 
-#: resources.h:944
+#: resources.h:956
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "מבנה: הרחבה ולאחריה פקודה העושה שימוש נכון בגרשיים ואז ארגומנטים."
 
-#: resources.h:469
+#: resources.h:470
 msgid "Further documentation"
 msgstr "תיעוד נוסף"
 
@@ -3821,21 +3829,21 @@
 msgid "General SOCKS server failure"
 msgstr "שגיאת שרת SOCKS כללית"
 
-#: resources.h:792
+#: resources.h:804
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "מתווך כללי"
 
-#: resources.h:696
+#: resources.h:708
 msgid "Get external IP address from the following URL:"
 msgstr "קבל כתובת IP מהאתר הבא:"
 
-#: resources.h:470
+#: resources.h:471
 msgid "Getting help"
 msgstr "קבלת עזרה"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "ערכת המסננים הנתונה כבר קיימת, לשכתב על ערכת המסננים?"
 
@@ -3851,7 +3859,7 @@
 msgid "Group permissions"
 msgstr "הרשאות הקבוצה"
 
-#: resources.h:598
+#: resources.h:608
 msgid "H&igh"
 msgstr "גובה"
 
@@ -3859,7 +3867,7 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP על גבי TLS"
 
-#: resources.h:340
+#: resources.h:341
 msgid "Hash:"
 msgstr "גיבוב:"
 
@@ -3867,13 +3875,13 @@
 msgid "Hidden"
 msgstr "מוסתר"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:829 ../../locales/../src/interface/queue.cpp:921
+#: ../../locales/../src/interface/queue.cpp:1008
 msgid "High"
 msgstr "גבוה"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:923
+#: ../../locales/../src/interface/queue.cpp:1010
 msgid "Highest"
 msgstr "הכי גבוה"
 
@@ -3881,7 +3889,7 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "הפורט צריך להיות בטווח של 1024 עד 65535."
 
-#: resources.h:209
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
@@ -3891,11 +3899,11 @@
 msgid "Homepage:"
 msgstr "דף הבית:"
 
-#: resources.h:342
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr "טביעת האצבע של המארח:"
 
-#: resources.h:185
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "מפתח המארח אינו תואם"
 
@@ -3907,8 +3915,8 @@
 msgid "Host unreachable"
 msgstr "המארח אינו נגיש"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "שרת מארח:"
 
@@ -3916,11 +3924,11 @@
 msgid "Hours,"
 msgstr "שעות,"
 
-#: resources.h:893
+#: resources.h:905
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "ISO &8601 (לדוגמה: 15:47)"
 
-#: resources.h:734
+#: resources.h:746
 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 "
@@ -3929,11 +3937,11 @@
 "אם אף נתון לא נשלח או התקבל במהלך הפעולה למשך זמן הארוך מהזמן שצוין, החיבור "
 "ינותק ו־FileZilla יתנתק וינסה להתחבר מחדש."
 
-#: resources.h:974
+#: resources.h:986
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "בעת דיווח על שגיאות, יש לספק דיווח ברמת „פירוט מלא“ (Verbose)."
 
-#: resources.h:687
+#: resources.h:699
 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 "
@@ -3944,7 +3952,7 @@
 "ייתכן ולא הגדרת טוב את השרת ההו, ועליך לעבור למצב פעיל. אתה יכול לקבוע את "
 "הגדרות העברה בתפריט ניהול אתרים ובחירת השרת הספציפי."
 
-#: resources.h:682
+#: resources.h:694
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -3952,7 +3960,7 @@
 "אם המעבר לשיטה אחרת מסומן ב V, זה אומר שאתה תוכל להתחבר גם לשרתים שלא הוגדרו "
 "כראוי ודחו את שיטת ההעברה שבחרת."
 
-#: resources.h:188
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3970,7 +3978,7 @@
 "connection."
 msgstr "אם בעיה זו חוזרת, ישנם נתב ו/או חומת אש שממשיכים להפריע לחיבור."
 
-#: resources.h:963
+#: resources.h:975
 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 "
@@ -3979,7 +3987,7 @@
 "במידה שקובץ הרישום מגיע למגבלתו, שמו משתנה והוא מקבל \".1\" לסוף שם הקובץ "
 "(ותתכן דריסה של קובצי רישום ישנים) ונוצר קובץ חדש."
 
-#: resources.h:455
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3999,7 +4007,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "אם הבעיה הזו חוזרת, אנא פנה ליצרן החוצץ (router) שלך."
 
-#: resources.h:278 resources.h:856
+#: resources.h:279 resources.h:868
 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 "
@@ -4009,7 +4017,7 @@
 "השעה המדויקת. כדי להגדיר את השעה עליך להכנס ל'ניהול אתרים' ולהגדיר בשרת את "
 "התאמת הזמן."
 
-#: resources.h:917
+#: resources.h:929
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4017,11 +4025,11 @@
 "באם נעשה שימוש בהשוואה על בסיס חותמות זמן, התייחס לשני קבצים כזהים אם חותמות "
 "הזמן שלהן אינן חורגות מסף זה."
 
-#: resources.h:932
+#: resources.h:944
 msgid "If you change the language, you should restart FileZilla."
 msgstr "אם משנים את השפה, יש להפעיל מחדש את FileZilla."
 
-#: resources.h:713
+#: resources.h:725
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4029,21 +4037,21 @@
 "אם תלחץ על 'בדיקה' FileZilla תתחבר לשרת probe.filezilla-project.org ותבצע "
 "מספר בדיקות פשוטות."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1164
+#: ../../locales/../src/interface/Mainfrm.cpp:1245
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "אם FileZilla תסגר, יאבדו השינויים שנערכו."
 
-#: resources.h:832
+#: resources.h:844
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "אם הכנסת סוג קובץ שגוי, הקבצים האלו עלולים להגיע משובשים כשיועברו."
 
-#: resources.h:714
+#: resources.h:726
 msgid "If you get any errors, your configuration is not correct."
 msgstr "אם יש שגיאות, ההגדרות שלך לא טובות."
 
-#: resources.h:746
+#: resources.h:758
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4061,7 +4069,7 @@
 "מרוחקים אינם מוגדים כראוי. במצב כזה נסה להחליף בין להפעיל מצב סביל וצור קשר "
 "עם מנהל השרת לקבלת עזרה."
 
-#: resources.h:673
+#: resources.h:685
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4069,14 +4077,14 @@
 "אם פעולת האשף הסתיימה והבדיקה הסופית הצליחה, כל הנתבים וחומות־האש שלך אמורים "
 "להיות מוגדרים כראוי."
 
-#: resources.h:709
+#: resources.h:721
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
 "אם אתה משתמש בפיירוול, וודא שFileZilla יכול להתחבר שרך כל טווח הפורטים שבחרת."
 
-#: resources.h:708
+#: resources.h:720
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4096,7 +4104,7 @@
 msgid "Import data from older version"
 msgstr "ייבוא נתונים מגירסה ישנה יותר"
 
-#: resources.h:297
+#: resources.h:298
 msgid "Import settings"
 msgstr "ייבוא הגדרות"
 
@@ -4110,7 +4118,7 @@
 msgid "Improperly quoted association."
 msgstr "שיוך עם שגיאת גרשיים."
 
-#: resources.h:701
+#: resources.h:713
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4118,7 +4126,7 @@
 "במצב פעיל, FileZilla צריך להקשיב לפתחה כדי להעביר נתונים. עליך לבחור פתחות "
 "בהן FileZilla יוכל להתשמש."
 
-#: resources.h:703
+#: resources.h:715
 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."
@@ -4126,20 +4134,20 @@
 "במידה ויש לך חוצץ (router), אתה תצטרך להעביר את כל הפורטים, בגלל שלFileZilla "
 "אין כל השפעה על הפורטים שהמערכת שלך תבחר."
 
-#: resources.h:254
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
 "במידה שאתה מעדיף עדכונים אוטומטיים תוכל להפעיל אותם בתיבת דו־שיח ההגדרות."
 
-#: resources.h:691 resources.h:755
+#: resources.h:703 resources.h:767
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "כדי להיות במצב פעיל, FileZilla צריך לדעת את ה IP שלך."
 
-#: resources.h:676
+#: resources.h:688
 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 "
@@ -4148,21 +4156,21 @@
 "במצב פסיבי, שזה המצב המועדף, FileZilla מבקש מהשרת פורט ומתחבר דרך הפורט הזה. "
 "אין שום הגדרה בשביל זה."
 
-#: ../../locales/../src/engine/tlssocket.cpp:888
+#: ../../locales/../src/engine/tlssocket.cpp:956
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr "שרשרת מקוטעת, התעודה הראשית לא נחתמה עצמאית על ידי רשות מוסמכת"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1066
 msgid "Incorrect password"
 msgstr "הססמה שגויה"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "מאתחל TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "שרת בלתי מאובטח, אין בו תמיכה ב־FTP על גבי TLS."
 
@@ -4177,8 +4185,8 @@
 msgstr "מנשק"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1023
+#: ../../locales/../src/interface/QueueView.cpp:1599
 msgid "Interrupted by user"
 msgstr "בוטל ע\"י המשתמש"
 
@@ -4214,8 +4222,9 @@
 msgid "Invalid date"
 msgstr "תאריך לא תקני"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1350
+#: ../../locales/../src/interface/LocalListView.cpp:1375
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "שם קובץ לא תקני"
 
@@ -4234,7 +4243,7 @@
 msgstr "הפתחה שצוינה אינה תקנית. ערך הפתחה חייב להיות בין 1 ל־65535."
 
 #: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:124
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4248,7 +4257,12 @@
 "ftps:// ל־FTP על גבי SSL (מרומז) ו־\n"
 "ftpes:// ל־FTP על גבי SSL (מפורש)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr "מתווך שגוי, לאחר הסוגר המסיים מותר לרשום רק נקודתיים ופתחה."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "הביטוי הרגולרי שבתנאי החיפוש שגוי."
 
@@ -4256,7 +4270,7 @@
 msgid "Invalid response code"
 msgstr "קוד התגובה שגוי"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "תנאי החיפוש שגויים: %s"
@@ -4268,10 +4282,10 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "נתיב האתר לא תקני"
 
@@ -4295,11 +4309,11 @@
 msgid "Jurisdiction state or province:"
 msgstr "מחוז או מדינת סמכות השיפוט:"
 
-#: resources.h:914
+#: resources.h:926
 msgid "Keep directories on top"
 msgstr "השאר את התיקיות למעלה"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:670
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4309,50 +4323,50 @@
 "אפשרות זו פעילה. למרות ש־FileZilla מבצעת כמה בדיקות לווידוא שהשרת תומך "
 "בתכונה זו, יתכן שהבדיקה תכשל."
 
-#: resources.h:337
+#: resources.h:338
 msgid "Key exchange"
 msgstr "החלפת מפתחות"
 
-#: resources.h:601
+#: resources.h:611
 msgid "L&owest"
 msgstr "ה&נמוך ביותר"
 
-#: resources.h:930
+#: resources.h:942
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "שפה"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1556
 msgid "Language changed"
 msgstr "השפה שונתה"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "שונה לאחרונה"
 
-#: resources.h:859
+#: resources.h:871
 msgid "Layout"
 msgstr "פריסה"
 
-#: resources.h:805
+#: resources.h:817
 msgid "Limit for concurrent &downloads:"
 msgstr "מגבלת ההורדות &בו־זנית:"
 
-#: resources.h:807
+#: resources.h:819
 msgid "Limit for concurrent &uploads:"
 msgstr "מגבלת ההעלאות &בו־זנית:"
 
-#: resources.h:750
+#: resources.h:762
 msgid "Limit local ports"
 msgstr "הגבל הפתחות המקומיות"
 
-#: resources.h:960
+#: resources.h:972
 msgid "Limit size of logfile"
 msgstr "הגבלת גודל קובץ הרישום"
 
-#: resources.h:961
+#: resources.h:973
 msgid "Limit:"
 msgstr "מגבלה:"
 
@@ -4360,7 +4374,7 @@
 msgid "Line length exceeded"
 msgstr "בוצעה חריגה מאורך השורה"
 
-#: resources.h:167
+#: resources.h:168
 msgid "Linked against"
 msgstr "מקושר כנגד"
 
@@ -4369,21 +4383,21 @@
 msgstr "שקע ההאזנה נסגר"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "הצגה:"
 
-#: resources.h:753
+#: resources.h:765
 msgid "Lo&west available port:"
 msgstr "הפתחה האפשרית ה&נמוכה ביותר:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "מקומי"
 
-#: resources.h:364
+#: resources.h:365
 msgid "Local file"
 msgstr "קובץ מקומי"
 
@@ -4399,7 +4413,7 @@
 msgid "Local file is not a valid filename."
 msgstr "שם הקובץ המקומי אינו תקני."
 
-#: resources.h:203
+#: resources.h:204
 msgid "Local filters:"
 msgstr "מסננים מקומיים:"
 
@@ -4415,16 +4429,16 @@
 msgid "Log file"
 msgstr "קובץ רישום"
 
-#: resources.h:251
+#: resources.h:252
 msgid "Log of update check:"
 msgstr "יומן בדיקת העדכונים האוטומטית:"
 
-#: resources.h:955
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "רישום"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4432,7 +4446,7 @@
 "פרטי ההתחברות מכילים תווים שאינם תווי ASCII ויתכן שהשרת אינו מודע ל־UTF-8. "
 "לא ניתן לחזור אל הקידוד המקומי מאחר ונעשה שימוש במתווך."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4440,7 +4454,7 @@
 "פרטי ההתחברות מכילים תווים שאינם תווי ASCII ויתכן שהשרת אינו מודע ל־UTF-8. "
 "מנסה להשתמש בקידוד המקומי."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "רצף ההתחברות הופעל במלואו והחיבור עדיין לא התקיים. מבטל."
 
@@ -4458,13 +4472,13 @@
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:916
+#: ../../locales/../src/interface/queue.cpp:1003
 msgid "Low"
 msgstr "נמוך"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:914
+#: ../../locales/../src/interface/queue.cpp:1001
 msgid "Lowest"
 msgstr "הנמוך ביותר"
 
@@ -4497,7 +4511,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "תגובה פגומה, השרת לא שולח סיומת תקנית לשורות"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:395 ../../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
@@ -4508,32 +4522,32 @@
 msgid "Manual transfer"
 msgstr "העברה ידנית"
 
-#: resources.h:434
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "התאמת כל הבאים"
 
-#: resources.h:435
+#: resources.h:436
 msgid "Match any of the following"
 msgstr "התאמה לפחות לאחד מהבאים"
 
-#: resources.h:436
+#: resources.h:437
 msgid "Match none of the following"
 msgstr "התאמה לאף אחד מהבאים"
 
-#: resources.h:803
+#: resources.h:815
 msgid "Maximum simultaneous &transfers:"
 msgstr "מספר ההעברות המירבי בו־זנית:"
 
 #: ../../locales/../src/interface/Mainfrm.cpp:378
-#: ../../locales/../src/interface/Mainfrm.cpp:1855
+#: ../../locales/../src/interface/Mainfrm.cpp:1884
 msgid "Message log"
 msgstr "רישום ההודעות"
 
-#: resources.h:870
+#: resources.h:882
 msgid "Message log position"
 msgstr "מיקום רישום ההודעות"
 
-#: resources.h:962
+#: resources.h:974
 msgid "MiB"
 msgstr "מ\"ב"
 
@@ -4541,19 +4555,19 @@
 msgid "Minutes"
 msgstr "דקות"
 
-#: resources.h:358
+#: resources.h:359
 msgid "Move &down"
 msgstr "הזז מ&טה"
 
-#: resources.h:357
+#: resources.h:358
 msgid "Move &up"
 msgstr "הזז מ&עלה"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1064
 msgid "My Computer"
 msgstr "המחשב שלי"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1054
 msgid "My Documents"
 msgstr "המסמכים שלי"
 
@@ -4568,7 +4582,7 @@
 msgid "N/a"
 msgstr "לא זמין"
 
-#: resources.h:399
+#: resources.h:400
 msgid "Name"
 msgstr "שם"
 
@@ -4578,19 +4592,19 @@
 msgstr "השם כבר קיים"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "שם הסימנייה כבר קיים."
 
-#: resources.h:120 resources.h:168
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "שם:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "יש להקיש שם למסנן"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "יש להזין נתיב מרוחק תקני"
 
@@ -4606,15 +4620,15 @@
 msgid "New &Folder"
 msgstr "תיקייה &חדשה"
 
-#: resources.h:494
+#: resources.h:502
 msgid "New &tab"
 msgstr "&לשונית חדשה"
 
-#: resources.h:74 resources.h:414
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr "סימנייה &חדשה"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4627,23 +4641,23 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr "סימנייה חדשה"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
 msgstr "תיקייה חדשה"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "תכונות ושיפורים חדשים ב־%s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "מסנן חדש"
 
@@ -4657,11 +4671,11 @@
 msgid "New site"
 msgstr "אתר חדש"
 
-#: resources.h:868
+#: resources.h:880
 msgid "Next to the transfer queue"
 msgstr "בסמוך לתור ההעברות"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "לא"
 
@@ -4669,19 +4683,19 @@
 msgid "No category to export selected"
 msgstr "לא נבחרה קטגוריה לייצוא"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2299
 msgid "No command given, aborting."
 msgstr "לא ניתנה פקודה, מבטל."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "לא הוגדרה כתובת IP חיצונית, מנסה את ברירת המחדל."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "לא נערכים קבצים כעת."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "לא ניתן שם למסנן"
 
@@ -4695,25 +4709,25 @@
 msgid "No images available"
 msgstr "אין תמונות זמינות"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3170
 msgid "No more files in the queue!"
 msgstr "אין עוד קבצים בתור!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "לא ניתן שם לערכת המסננים."
 
-#: resources.h:430
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr "אף תוכנה אינה משוייכת לסוג קובץ זה"
 
-#: resources.h:420
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "לא שוייכה תוכנה לעריכת קבצים בעלי הסיומת '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "אין תוצאות חיפוש"
 
@@ -4731,22 +4745,22 @@
 msgid "No username given."
 msgstr "לא ניתן שם משתמש."
 
-#: resources.h:924 resources.h:929
+#: resources.h:936 resources.h:941
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "ללא"
 
-#: resources.h:374
+#: resources.h:375
 msgid "None selected yet"
 msgstr "טרם נבחרו"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:852
+#: resources.h:828 ../../locales/../src/engine/server.cpp:852
 #: ../../locales/../src/engine/server.cpp:871
 #: ../../locales/../src/interface/manual_transfer.cpp:160
 #: ../../locales/../src/interface/manual_transfer.cpp:185
 #: ../../locales/../src/interface/manual_transfer.cpp:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "רגיל"
@@ -4761,7 +4775,7 @@
 msgid "Not connected"
 msgstr "לא מחובר"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "לא מחובר לאף שרת"
 
@@ -4773,19 +4787,19 @@
 msgid "Not connected."
 msgstr "לא מחובר."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "שים לב שאפשרות זו נתמכת רק עבור שימוש בפרוטוקול FTP."
 
-#: resources.h:784
+#: resources.h:796
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "לתשומת לבך: תכונה זו פועלת רק עם חיבורי FTP פשוטים ולא מוצפנים."
 
-#: resources.h:801
+#: resources.h:813
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "לתשומת לבך: שימוש במתווך כללי מאלצת שימוש במצב סביל על חיבורי FTP."
 
-#: resources.h:903
+#: resources.h:915
 msgid "Number of decimal places:"
 msgstr "מספר המקומות העשרוניים:"
 
@@ -4793,21 +4807,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "מספר הנסיונות צריך להיות בין 0 ל־99."
 
-#: resources.h:333
+#: resources.h:334
 msgid "O&pen file"
 msgstr "&פתח קובץ"
 
 #: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:739
 msgid "OK"
 msgstr "אישור"
 
-#: resources.h:683
+#: resources.h:695
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4815,58 +4829,58 @@
 "בעמודים הבאים, יוגדר מצב ההעברה הנבחר, כמו־כן מצב ה\"נפילה\" עבור אפשרות "
 "המעבר במקרה של כשלון."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "פעם אחת"
 
-#: resources.h:954
+#: resources.h:966
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
 msgstr "רק גירסאות FileZilla ומערכת ההפעלה בה אתה משתמש ישלחו אל השרת."
 
-#: resources.h:652
+#: resources.h:664
 msgid "Open directory in system's file manager"
 msgstr "פתיחת התיקייה במנהל הקבצים של המערכת"
 
-#: resources.h:976 resources.h:977
+#: resources.h:988 resources.h:989
 msgid "Open the Site Manager"
 msgstr "פתיחת מנהל האתרים"
 
-#: resources.h:564
+#: resources.h:572
 msgid "Open the file."
 msgstr "פתיחת הקובץ."
 
-#: resources.h:507
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "פתיחת דו־שיח ההגדרות של FileZilla"
 
-#: resources.h:309
+#: resources.h:310
 msgid "Opened as:"
 msgstr "נפתח כ־:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
+#: ../../locales/../src/interface/LocalListView.cpp:2042
+#: ../../locales/../src/interface/LocalListView.cpp:2087
 #: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2187
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
 msgstr "הפתיחה נכשלה"
 
-#: resources.h:495
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr "נפתח בלשונית חדשה"
 
-#: resources.h:492
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "פתיחת מנהל האתרים"
 
-#: resources.h:997
+#: resources.h:1009
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "פתיחת תיבת הדו־שיח למסנן תצוגת התיקיות. מקש ימני להחלפת המסננים."
 
-#: resources.h:171
+#: resources.h:172
 msgid "Operating system"
 msgstr "מערכת ההפעלה"
 
@@ -4882,7 +4896,7 @@
 msgid "Other:"
 msgstr "אחר:"
 
-#: resources.h:729
+#: resources.h:741
 msgid "Overview"
 msgstr "סקירה"
 
@@ -4890,19 +4904,19 @@
 msgid "Overwrite &if source newer"
 msgstr "שיכתוב באם המקור &חדש יותר"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:261 resources.h:271 resources.h:851 resources.h:860
 msgid "Overwrite file"
 msgstr "שכתוב על קובץ"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:263 resources.h:273 resources.h:853 resources.h:862
 msgid "Overwrite file if size differs"
 msgstr "שכתוב על קובץ אם הגדלים שונים"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:264 resources.h:274 resources.h:854 resources.h:863
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "שכתוב על הקובץ אם הגודל שונה או שקובץ המקור חדש יותר"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:262 resources.h:272 resources.h:852 resources.h:861
 msgid "Overwrite file if source file newer"
 msgstr "שכתוב על קובץ אם קובץ המקור חדש יותר"
 
@@ -4918,18 +4932,18 @@
 msgid "Owner permissions"
 msgstr "הרשאות הבעלים"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "בעלים/קבוצה"
 
-#: resources.h:874
+#: resources.h:886
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "יש &למנוע מהמערכת מלהיכנס למצב שינה במהלך העברות קבצים ופעולות אחרות"
 
-#: resources.h:781 resources.h:797
+#: resources.h:793 resources.h:809
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "מארח המ&תווך:"
@@ -4938,27 +4952,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "פקודת ה־PORT נחסמה על ידי נתב או חומת אש."
 
-#: resources.h:743
+#: resources.h:755
 msgid "Pa&ssive (recommended)"
 msgstr "&סביל (מומלץ)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:325
 msgid "Package"
 msgstr "חבילה"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2489
+#: ../../locales/../src/interface/Mainfrm.cpp:2521
 msgid "Parameter not a valid URL"
 msgstr "הפרמטר אינו כתובת תקנית"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:85 resources.h:384 resources.h:733
 msgid "Pass&word:"
 msgstr "&ססמה:"
 
-#: resources.h:679
+#: resources.h:691
 msgid "Passive (recommended)"
 msgstr "סביל (מומלץ)"
 
-#: resources.h:763
+#: resources.h:775
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "מצב סביל"
@@ -4978,20 +4992,20 @@
 msgid "Path"
 msgstr "נתיב"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "לא ניתן לבנות את הכתובת עבור התיקייה %s ותת־התיקייה %s"
 
-#: resources.h:401
+#: resources.h:402
 msgid "Paths"
 msgstr "נתיבים"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "בהמתנה להסרה"
 
@@ -4999,16 +5013,16 @@
 msgid "Permission"
 msgstr "הרשאה"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "הרשאות"
 
-#: resources.h:170
+#: resources.h:171
 msgid "Platform:"
 msgstr "פלטפורמה:"
 
-#: resources.h:250
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5024,7 +5038,7 @@
 "אנא עיין בכתובת http://filezilla-project.org/probe.php כדי לוודא שהשרת פעיל "
 "ובדוק את הגדרותיך שוב בקפידה."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1080
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5032,7 +5046,7 @@
 "אנא בדוק את מנהל חבילות המערכת שלך אחר חבילה מעודכנת או בקר באתר http://"
 "filezilla-project.org to download להורדת קוד המקור של FileZilla."
 
-#: resources.h:685
+#: resources.h:697
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5069,20 +5083,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "נא להזין מגבלת מהירות הורדה העולה או שווה ל־0 %s/ש."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "נא להזין שם עבור המסנן החדש."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "נא להזין שם עבור המסנן המועתק."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "נא להזין שם חדש עבור ערכת המסננים \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "נא להזין שם חדש עבור המסנן."
 
@@ -5107,7 +5121,7 @@
 msgid "Please enter a password for this server:"
 msgstr "נא להזין ססמה לשרת זה:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2288
 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"
@@ -5123,7 +5137,7 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "נא להזין זמן תפוגה בין 5 ל 9999 שניות או 0 כדי לבטל את זמן התפוגה."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "נא להזין שם ייחודי עבור ערכת מסננים זו"
 
@@ -5157,13 +5171,17 @@
 "נא להזין פקודת FTP גולמית.\n"
 "השימוש בפקודות ftp גולמיות ירוקן את מטמון התיקייה."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
+#: ../../locales/../src/interface/LocalListView.cpp:1196
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "נא להזין את שם התיקייה שאמורה להיווצר:"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+msgid "Please enter the name of the file which should be created:"
+msgstr "נא להזין את שם הקובץ שאמור להיווצר:"
+
 #: resources.h:119
 msgid "Please enter username and password for this server:"
 msgstr "נא להזין שם משתמש וססמה לשרת זה:"
@@ -5182,7 +5200,7 @@
 "נא להזין את כתובת ה־IP החיצונית בעמוד המצב הפעיל באשף זה. במידה שיש לך כתובת "
 "דינמית ואינך יודע את הכתובת החיצונית, ניתן השתמש באפשרות הפותר החיצוני."
 
-#: resources.h:672
+#: resources.h:684
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5212,7 +5230,7 @@
 "שלך להיות מוגדר כראוי. יהיה עליך להשתמש בהעברת פתחות ידנית. אין להריץ את "
 "הנתב שלך במצב הידוע בשם 'מצב DMZ' או 'מצב משחק'."
 
-#: resources.h:686
+#: resources.h:698
 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 "
@@ -5223,7 +5241,7 @@
 "שתיבחר פתחה אותה תזהה חומת־האש שלך כווירוס. מצב כזה עלול לגרור אזעקת שווא "
 "ממנה ניתן להתעלם בבטחה."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:718
+#: ../../locales/../src/interface/Mainfrm.cpp:726
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5231,7 +5249,7 @@
 "אנא שים לב ששימור חותמות הזמן בשרתי FTP, FTPS ו־FTPES עובד רק אם השרתים "
 "תומכים בפקודה MFMT."
 
-#: resources.h:740
+#: resources.h:752
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5239,7 +5257,7 @@
 "אנא שים לב שכמה מהשרתים עלולים לחסום אותך אם תנסה להתחבר מחדש לעיתים קרובות "
 "מדי או בהפרשי זמן קצרים."
 
-#: resources.h:890 resources.h:896
+#: resources.h:902 resources.h:908
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5248,7 +5266,7 @@
 "ניתן לקרוא את http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "לקבלת פרטים"
 
-#: resources.h:246
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5265,38 +5283,38 @@
 "אנא הפעל אשף זה שוב במידה שסביבת הרשת שלך משתנה או במידה שלפתח מופיעות בעיות "
 "בשרת שלא קרו בעבר."
 
-#: resources.h:456
+#: resources.h:457
 msgid "Please select an action:"
 msgstr "נא לבחור בפעולה:"
 
-#: resources.h:302
+#: resources.h:303
 msgid "Please select the categories you would like to import."
 msgstr "אנא בחר את הקטגוריות שברצונך לייבא."
 
-#: resources.h:674
+#: resources.h:686
 msgid "Please select the default transfer mode you would like to use."
 msgstr "אנא בחר את מצב ההעברה כברירת המחדל בו ברצונך להשתמש."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "אנא בחרו את התכונות החדשות לתיקייה \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "אנא בחר את התכונות החדשות לקובץ \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "אנא בחר את התכונות החדשות עבור התיקיות הנבחרות."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "אנא בחר את התכונות החדשות עבור הקבצים והתיקיות הנבחרים."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "אנא בחר את התכונות החדשות עבור הקבצים הנבחרים."
 
@@ -5314,14 +5332,14 @@
 "פונקציות כגון חקירת פרוטוקולים או תיקונים (fixups) המיועדים לפרוטוקולים "
 "מסוימים"
 
-#: resources.h:253
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr "אנא בקר באתר http://filezilla-project.org למידע נוסף אודות FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1078
+#: ../../locales/../src/interface/updatewizard.cpp:1094
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5337,7 +5355,7 @@
 msgid "Predefined Sites"
 msgstr "אתרים מוגדרים מראש"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:717
+#: ../../locales/../src/interface/Mainfrm.cpp:725
 msgid "Preserving file timestamps"
 msgstr "תוך שימוש חותמות הזמן של הקבצים"
 
@@ -5345,7 +5363,7 @@
 msgid "Preview:"
 msgstr "תצוגה מקדימה:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:914
+#: ../../locales/../src/engine/tlssocket.cpp:982
 msgid "Primary connection and data connection certificates don't match."
 msgstr "התעודות של החיבור הראשוני וחיבור הנתונים אינם תואמים."
 
@@ -5353,19 +5371,19 @@
 msgid "Print version information to stdout and exit"
 msgstr "Print version information to stdout and exit"
 
-#: resources.h:913
+#: resources.h:925
 msgid "Prioritize directories (default)"
 msgstr "העדפה לתיקיות (ברירת מחדל)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Priority"
 msgstr "עדיפות"
 
-#: resources.h:953
+#: resources.h:965
 msgid "Privacy policy:"
 msgstr "מדיניות הפרטיות:"
 
-#: resources.h:787
+#: resources.h:799
 msgid "Private &keys:"
 msgstr "&מפתחות פרטיים:"
 
@@ -5373,19 +5391,19 @@
 msgid "Pro&tocol:"
 msgstr "&פרוטוקול:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:795 resources.h:812
 msgid "Pro&xy password:"
 msgstr "ססמת ה&מתווך:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "עיבור ה&תור"
 
-#: resources.h:798
+#: resources.h:810
 msgid "Proxy &port:"
 msgstr "&פתחת המתווך:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:794 resources.h:811
 msgid "Proxy &user:"
 msgstr "מ&שתמש במתווך:"
 
@@ -5393,12 +5411,16 @@
 msgid "Proxy authentication failed"
 msgstr "האימות עם המתווך נכשל"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "לחיצת היד (handshake) עם המתווך כשלה: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "המתווך מתחיל ב־'[' אך לא נמצא סוגר נגדי לו."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5413,11 +5435,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "בקשת המתווך נכשלה: סוג הכתובת לא ידוע בתגובת ה־CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "המתווך הוגדר אך המארח או הפתחה אינם נכונים"
 
-#: resources.h:785
+#: resources.h:797
 msgid "Public Key Authentication"
 msgstr "אימות מפתח ציבורי"
 
@@ -5429,7 +5451,7 @@
 msgid "Public permissions"
 msgstr "הרשאות ציבוריות"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "Queue has been fully processed"
 msgstr "עיבוד התור הסתיים לחלוטין"
 
@@ -5448,23 +5470,23 @@
 msgid "Queue: empty"
 msgstr "תור: ריק"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "קבצים בתור"
 
-#: resources.h:448
+#: resources.h:449
 msgid "Queueing:"
 msgstr "הוספה לתור:"
 
-#: resources.h:608
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "&איתחול המערכת"
 
-#: resources.h:522
+#: resources.h:530
 msgid "R&emote directory tree"
 msgstr "&עץ התיקיות המרוחקות"
 
-#: resources.h:622 resources.h:626
+#: resources.h:634 resources.h:638
 msgid "R&eset and requeue selected files"
 msgstr "איפוס והצבה מחדש בתור של הקבצים הנבחרים"
 
@@ -5476,7 +5498,7 @@
 msgid "Re&ad"
 msgstr "&קריאה"
 
-#: resources.h:569 resources.h:583
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
 msgstr "&רענון"
 
@@ -5500,42 +5522,46 @@
 msgid "Read-only"
 msgstr "קריאה בלבד"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1095
+#: ../../locales/../src/interface/Mainfrm.cpp:1103
 msgid "Really cancel current operation?"
 msgstr "האם באמת לבטל את הפעולה הנוכחית?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "האם באמת למחוק תיקייה %d על כל תוכנה?"
-msgstr[1] "האם באמת למחוק %d תיקיות על כל תוכנן?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "האם ברמת למחוק קובץ %d?"
-msgstr[1] "האם באמת למחוק %d קבצים?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "האם באמת למחוק תיקייה %d על כל תוכנה מהשרת?"
+msgstr[1] "האם באמת למחוק %d תיקיות על כל תוכנן מהשרת?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "האם באמת למחוק את %s ואת %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "האם באמת למחוק את %s ואת %s מהשרת?"
 
-#: ../../locales/../src/engine/local_filesys.cpp:136
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "האם באמת למחוק את כל הקבצים ו/או התיקיות שנבחרו?"
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "האם באמת למחוק את כל הקבצים ו/או התיקיות שנבחרו מהשרת?"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "האם באמת למחוק את כל הקבצים ו/או התיקיות שנבחרו מהמחשב שלך?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Reason"
 msgstr "סיבה"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Reboot now"
 msgstr "איתחול כעת"
 
@@ -5543,14 +5569,18 @@
 msgid "Rec&urse into subdirectories"
 msgstr "בנ&סיגה אל תת־התיקיות"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "התקבל רישום תיקיות שמסתבר שמקודד בתור EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "התקבלה שורה החורגת ממגבלת 10000 התווים, הפעולה מבוטלת."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "הנתונים שהתקבלו פגומים"
 
@@ -5562,11 +5592,11 @@
 "לא ניתן לרוקן את נתוני החיבור החוזר בזמן החיבור לשרת.\n"
 "אם תמשיך, החיבור שלך ינותק."
 
-#: resources.h:741
+#: resources.h:753
 msgid "Reconnection settings"
 msgstr "הגדרות התחברות מחדש"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1006 resources.h:1007
 msgid "Reconnects to the last used server"
 msgstr "מתחבר מחדש אל השרת האחרון"
 
@@ -5574,34 +5604,38 @@
 msgid "Redirection to invalid address"
 msgstr "הפניה לכתובת שגויה"
 
-#: resources.h:986 resources.h:987
+#: resources.h:998 resources.h:999
 msgid "Refresh the file and folder lists"
 msgstr "רענון רשימת הקבצים והתיקיות"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:497
+msgid "Remember passwords?"
+msgstr "האם לשמור ססמאות?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "מרוחק"
 
-#: ../../locales/../src/engine/tlssocket.cpp:837
+#: ../../locales/../src/engine/tlssocket.cpp:905
 msgid "Remote certificate not trusted."
 msgstr "תעודת השרת אינה מהימנה."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1222
 msgid "Remote file"
 msgstr "קובץ מרוחק"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:441 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "חיפוש קובץ מרוחק"
 
-#: resources.h:206
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "מסננים מרוחקים:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "הנתיב המרוחק"
 
@@ -5633,11 +5667,11 @@
 msgid "Remote path could not be parsed."
 msgstr "לא ניתן לנתח את הנתיב המאוחר."
 
-#: resources.h:445
+#: resources.h:446
 msgid "Remote path handling:"
 msgstr "טיפול בנתיבים מרוחקים:"
 
-#: resources.h:313
+#: resources.h:314
 msgid "Remote path:"
 msgstr "הנתיב המרוחק:"
 
@@ -5645,34 +5679,34 @@
 msgid "Remote site:"
 msgstr "האתר המרוחק:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:631 resources.h:635
 msgid "Remove &all"
 msgstr "הסרת ה&כול"
 
-#: resources.h:621 resources.h:625
+#: resources.h:633 resources.h:637
 msgid "Remove &selected"
 msgstr "הסרת ה&נבחרים"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:266 resources.h:276 resources.h:856 resources.h:865
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "שינוי שם הקובץ"
 
-#: resources.h:637 resources.h:658
+#: resources.h:649 resources.h:670
 msgid "Rename selected directory"
 msgstr "שינוי שם התיקייה הנבחרת"
 
-#: resources.h:573 resources.h:587
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "שינוי שם לקבצים ולתיקיות הנבחרים"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "שינוי שם מ־'%s' ל־'%s'"
 
-#: resources.h:472
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr "דיווח על באגים ובקשת תכונות"
 
@@ -5684,37 +5718,37 @@
 msgid "Require implicit FTP over TLS"
 msgstr "דרישת FTP מרומז על גבי TLS"
 
-#: resources.h:624
+#: resources.h:636
 msgid "Reset and requeue &all"
 msgstr "איפוס והצבת ה&כול מחדש בתור"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1201
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "פתירת הכתובת %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1163
 msgid "Resolving hostname"
 msgstr "פתירת שם המארח"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:545
 msgid "Response:"
 msgstr "תגובה:"
 
-#: resources.h:439
+#: resources.h:440
 msgid "Results:"
 msgstr "תוצאות:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:265 resources.h:275 resources.h:855 resources.h:864
 msgid "Resume file transfer"
 msgstr "המשך בהעברת הקובץ"
 
-#: resources.h:858
+#: resources.h:870
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5722,38 +5756,38 @@
 "חידוש העברת קבצי ASCII עלולה לגרום לבעיות אם השרת משתמש בסיומת שורה השונה "
 "מהלקוח."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "איחזור רשימת התיקיות..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "איחזור כתובת ה־IP החיצונית מ־%s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:895
+#: ../../locales/../src/engine/tlssocket.cpp:963
 msgid "Root certificate is not trusted"
 msgstr "תעודת השורש של השרת אינה מהימנה"
 
-#: resources.h:500
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "ה&צגת קבצים הנערכים כעת..."
 
-#: resources.h:875
+#: resources.h:887
 msgid "S&how the Site Manager on startup"
 msgstr "ה&צגת מנהל האתרים עם ההפעלה"
 
-#: resources.h:609
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "&כיבוי המערכת"
 
-#: resources.h:437
+#: resources.h:438
 msgid "S&top"
 msgstr "ע&צירה"
 
-#: resources.h:516
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr "עיון מ&סונכרן"
 
@@ -5761,31 +5795,35 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:167
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "האם לשמור את הגדרות?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to add to queue"
 msgstr "סריקה אחר הקבצים להוספה לתור"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to upload"
 msgstr "סריקה אחר הקבצים להעלאה"
 
-#: resources.h:433
+#: resources.h:434
 msgid "Search &conditions:"
 msgstr "תנאי ה&חיפוש:"
 
-#: resources.h:431
+#: resources.h:432
 msgid "Search &directory:"
 msgstr "&תיקיית החיפוש:"
 
-#: resources.h:1002
+#: resources.h:1014
 msgid "Search for files recursively."
 msgstr "חיפוש אחר קבצים באופן רקורסיבי."
 
-#: resources.h:541
+#: resources.h:549
 msgid "Search server for files"
 msgstr "חיפוש אחר קבצים בשרת"
 
@@ -5799,24 +5837,24 @@
 msgstr ""
 "ניתן לעיין גם בזה: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:376
 msgid "Sele&ct server"
 msgstr "ב&חירת שרת"
 
-#: resources.h:726
+#: resources.h:738
 msgid "Select &page:"
 msgstr "&בחירת עמוד:"
 
-#: resources.h:878
+#: resources.h:890
 msgid "Select Theme"
 msgstr "בחירת ערכת נושא"
 
-#: resources.h:836
+#: resources.h:848
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "בחר בפעולה שתהיה כברירת מחדל כאשר שם הקובץ המיועד להעברה כבר קיים."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "בחירה בעורך ברירת המחדל"
@@ -5835,7 +5873,7 @@
 "the queue."
 msgstr "בחר בפעולה שתתבצע על התור הנוכחי כאשר שם הקובץ שיועבר כבר קיים."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:329
 msgid "Select download location for package"
 msgstr "בחר את מיקום הורדת החבילה"
 
@@ -5872,12 +5910,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "בחר את שם הקובץ לקובץ המפתח המומר"
 
-#: resources.h:421
+#: resources.h:422
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "בחר כיצד יש לפתוח קבצים אלו."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "יש לבחור תיקיית יעד להורדה"
 
@@ -5885,15 +5923,15 @@
 msgid "Select target filename"
 msgstr "בחר את שם קובץ היעד"
 
-#: resources.h:291
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "בחר את הקטגוריות לייצוא:"
 
-#: resources.h:282
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "בחירת הנתונים האישיים שברצונך למחוק."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5907,7 +5945,7 @@
 msgstr[0] "נבחרה תיקייה %d."
 msgstr[1] "נבחרו %d תיקיות."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5928,7 +5966,7 @@
 msgstr[0] "נבחר קובץ %d. הגודל הכולל: לפחות %s"
 msgstr[1] "נבחרו %d קבצים. הגודל הכולל: לפחות %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "נבחרו %s ו־%s להעברה."
@@ -5943,13 +5981,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "נבחרו %s ו־%s. הגודל הכולל: לפחות %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "Selected editor does not exist."
 msgstr "העורך הנבחר אינו קיים."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2071
 msgid "Selected file already being edited"
 msgstr "הקובץ הנבחר כבר נערך"
 
@@ -5957,15 +5995,15 @@
 msgid "Selected file is already loaded"
 msgstr "הקובץ הנבחר כבר נטען"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid "Selected file is already opened"
 msgstr "הקובץ הנבחר כבר פתוח"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid "Selected file is still being edited"
 msgstr "הקובץ הנבחר עדיין בשלבי עריכה"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "המסנן הנבחר פועל רק על קבצים מקומיים."
 
@@ -5981,15 +6019,15 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "הפתחה הנבחרת לרב נמצאת בשימוש על ידי פרוטוקול אחר."
 
-#: resources.h:748
+#: resources.h:760
 msgid "Send FTP &keep-alive commands"
 msgstr "שלח פקודות keep-alive ל־FTP"
 
-#: resources.h:543
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr "שלח פקודה מותאמת אישית לשרת אחרת אינו זמין"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "שולח פקודת keep-alive"
 
@@ -6002,42 +6040,47 @@
 msgid "Server &Type:"
 msgstr "&סוג השרת:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:721
+#: ../../locales/../src/engine/tlssocket.cpp:785
 msgid "Server did not properly shut down TLS connection"
 msgstr "השרת לא סגר את התחברות ה־TLS כראוי"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "השרת אינו תומך בתווים שאינם בתקן ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־%d ג\"ב."
+msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־%d ג״ב."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"השרת אינו תומך בחידוש העברת קבצים הגדולים מ־%d ג\"ב. סיים את ההעברה כיוון "
+"השרת אינו תומך בחידוש העברת קבצים הגדולים מ־%d ג״ב. סיים את ההעברה כיוון "
 "שגדלי הקבצים תואמים."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
-msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־2 ג\"ב."
+msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־2 ג״ב."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
-msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־4 ג\"ב."
+msgstr "השרת אינו תומך בהעברה בהמשכים של קבצים שגודלם מעל ל־4 ג״ב."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"יתכן כי השרת אינו תומך בחידוש העברת קבצים הגדולים מ־%d ג\"ב. סיים את ההעברה "
+"יתכן כי השרת אינו תומך בחידוש העברת קבצים הגדולים מ־%d ג״ב. סיים את ההעברה "
 "כיוון שגדלי הקבצים תואמים."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6045,19 +6088,19 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:417
 msgid "Server returned empty path."
-msgstr "השרת שלח נתיב ריקה."
+msgstr "השרת שלח נתיב ריק."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr "השרת שלח בקשת התחברות נוספת. עליך להשתמש בסוג ההתחברות האינטרקטיבי."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr "השרת שלח תגובה סבילה עם כתובת בלתי ניתנת לניתוב. המצב הסביל נכשל."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6076,23 +6119,23 @@
 msgid "Server sent unexpected reply."
 msgstr "השרת שלח תשובה בלתי צפויה."
 
-#: resources.h:351
+#: resources.h:352
 msgid "Server to client MAC:"
 msgstr "MAC השרת אל הלקוח:"
 
-#: resources.h:349
+#: resources.h:350
 msgid "Server to client cipher:"
 msgstr "הצפנת השרת ללקוח:"
 
-#: resources.h:380
+#: resources.h:381
 msgid "Server&type:"
 msgstr "&סוג השרת:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Server/Local file"
 msgstr "קובץ שרת/מקומי"
 
-#: resources.h:311 resources.h:373
+#: resources.h:312 resources.h:374
 msgid "Server:"
 msgstr "שרת:"
 
@@ -6100,45 +6143,49 @@
 msgid "Session details"
 msgstr "פרטי ההתקשרות"
 
-#: resources.h:596
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "הגדר &עדיפות"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "הגדרת ההרשאות של '%s' ל־'%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "בוצעה קריאה ל־SetSocketBufferSize ללא שקע"
 
-#: resources.h:725
+#: resources.h:737
 msgid "Settings"
 msgstr "הגדרות"
 
-#: resources.h:975
+#: resources.h:987
 msgid "Show &raw directory listing"
 msgstr "הצג רשימת תיקיות &גולמית"
 
-#: resources.h:552
+#: resources.h:560
 msgid "Show &welcome dialog..."
 msgstr "הצגת דו־שיח &קבלת הפנים..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2341
+#: ../../locales/../src/interface/Mainfrm.cpp:2373
 msgid "Show both directory trees and continue comparing?"
 msgstr "האם להציג את שני עצי התיקיות ולהמשיך בהשוואה?"
 
+#: resources.h:630
+msgid "Shows available TLS ciphers"
+msgstr "הצגת צופני TLS זמינים"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Shows this help dialog"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Shutdown now"
 msgstr "כבה כעת"
 
-#: resources.h:299
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "רשומות ב&מנהל האתרים"
 
@@ -6169,8 +6216,8 @@
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "האתר אינו קיים."
 
@@ -6180,8 +6227,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "נתיב האתר שגוי."
 
@@ -6199,11 +6246,11 @@
 "סימניות יעודיות לאתרים דורשות את שמירת השרת במנהל האתרים.\n"
 "האם להוסיף את החיבור הנוכחי למנהל האתרים?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Size"
 msgstr "גודל"
 
-#: resources.h:897
+#: resources.h:909
 msgid "Size formatting"
 msgstr "מבנה הגודל"
 
@@ -6212,31 +6259,31 @@
 msgid "Size unknown"
 msgstr "גודל לא ידוע"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:267 resources.h:277 resources.h:857 resources.h:866
 msgid "Skip file"
 msgstr "דילוג על קובץ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1273
+#: ../../locales/../src/engine/ControlSocket.cpp:1292
+#: ../../locales/../src/engine/ControlSocket.cpp:1317
+#: ../../locales/../src/engine/ControlSocket.cpp:1383
 #, c-format
 msgid "Skipping download of %s"
 msgstr "מדלג על הורדה של %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1277
+#: ../../locales/../src/engine/ControlSocket.cpp:1296
+#: ../../locales/../src/engine/ControlSocket.cpp:1321
+#: ../../locales/../src/engine/ControlSocket.cpp:1387
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "מדלג על העלאה של %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1163
+#: ../../locales/../src/interface/Mainfrm.cpp:1244
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "כמה מהקבצים עדיין נמצאים בעריכה או שיש להעלותם."
 
-#: resources.h:688 resources.h:764
+#: resources.h:700 resources.h:776
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6244,19 +6291,19 @@
 "כמה שרתים מרוחקים שלא הוגדרו כראוי הנמצאים מאחורי נתב, עלולים להגיב עם כתובת "
 "ה־IP המקומית שלהם."
 
-#: resources.h:915
+#: resources.h:927
 msgid "Sort directories inline"
 msgstr "סדר את התיקיות בפנים"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "לא ניתן לשנות את צורת הסידור בעת השוואה בין תיקיות."
 
-#: resources.h:911
+#: resources.h:923
 msgid "Sorting"
 msgstr "סידור"
 
-#: resources.h:912
+#: resources.h:924
 msgid "Sorting &mode:"
 msgstr "שיטת ה&סידור:"
 
@@ -6268,7 +6315,7 @@
 msgid "Source and target file may not be the same"
 msgstr "קובץ המקור וקובץ היעד לא יכולים להיות זהים"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "המקור והיעד של פעולת הגרירה זהים"
 
@@ -6276,12 +6323,12 @@
 msgid "Source file:"
 msgstr "קובץ המקור:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "מגבלות מהירות"
 
-#: resources.h:809
+#: resources.h:821
 msgid "Speed limits"
 msgstr "מגבלות מהירות"
 
@@ -6293,7 +6340,7 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "מגבלות המהירות פועלות, יש ללחוץ לשינוי."
 
-#: resources.h:391
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "התחל את ההעברה &מיידית"
 
@@ -6301,14 +6348,14 @@
 msgid "Start with opened Site Manager"
 msgstr "Start with opened Site Manager"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "מתחיל הורדה של %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "מתחיל העלאה של %s"
@@ -6317,19 +6364,19 @@
 msgid "State or province:"
 msgstr "מדינה או מחוז:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Status"
 msgstr "מצב"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:539
 msgid "Status:"
 msgstr "מצב:"
 
-#: resources.h:593
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "עצור והסר ה&כל"
 
@@ -6345,11 +6392,11 @@
 msgid "Successful transfers"
 msgstr "העברות מוצלחות"
 
-#: resources.h:716
+#: resources.h:728
 msgid "Summary of test results:"
 msgstr "תקציר תוצאות הבדיקה:"
 
-#: resources.h:459
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6357,7 +6404,7 @@
 "קישורים סימבוליים לקבצים אינם מושפעים מבחירה זו, קישורים סימבוליים אלה "
 "נמחקים תמיד."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1013 ../../locales/../src/interface/state.cpp:249
 #: ../../locales/../src/interface/state.cpp:278
 #: ../../locales/../src/interface/state.cpp:285
 #: ../../locales/../src/interface/state.cpp:297
@@ -6376,8 +6423,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr "העיון מסונכרן בוטל."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "שגיאה תחבירית"
 
@@ -6386,7 +6433,7 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2491
+#: ../../locales/../src/interface/Mainfrm.cpp:2523
 msgid "Syntax error in command line"
 msgstr "Syntax error in command line"
 
@@ -6394,7 +6441,7 @@
 msgid "System"
 msgstr "מערכת"
 
-#: resources.h:518
+#: resources.h:526
 msgid "T&oolbar"
 msgstr "&סרגל כלים"
 
@@ -6402,11 +6449,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "נוצר חיבור TLS/SSL, נשלחת בקשת HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "מתקיים חיבור TLS/SSL, ממתין להודעת פתיחה..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "מתקיים חיבור TLS/SSL."
 
@@ -6422,15 +6469,19 @@
 msgid "Target file:"
 msgstr "קובץ היעד:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+msgid "Target filename already exists!"
+msgstr "שם קובץ היעד כבר קיים!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "שם הקובץ כבר קיים, האם להמשיך?"
 
-#: resources.h:715
+#: resources.h:727
 msgid "Test results"
 msgstr "תוצאות הבדיקה"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "בדיקת יכולות הורדה המשכית מהשרת"
 
@@ -6462,11 +6513,11 @@
 msgstr "הכתוב שהוזנה הינה: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "לא ניתן להוסיף את הסימנייה."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "לא ניתן לפנות את הסימניות."
 
@@ -6478,19 +6529,19 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "רצף ההתחברות המתואם לא יכול להשאר ריק."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "לא ניתן למצוא את עורך ברירת המחדל לקבצי טקסט."
 
-#: resources.h:423
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "עורך ברירת המחדל לקבצי טקסט הוא '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "שם המסנן שהוזן כבר קיים, נא לבחור בשם אחר."
 
@@ -6509,9 +6560,9 @@
 "הקובץ %s כבר קיים.\n"
 "נא להזין שם חדש:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2048
+#: ../../locales/../src/interface/LocalListView.cpp:2179
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6532,9 +6583,9 @@
 msgid "The file '%s' could not be loaded."
 msgstr "לא ניתן לטעון את הקובץ '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2042
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6543,8 +6594,8 @@
 "לא ניתן לפתוח את הקובץ '%s':\n"
 "לא שויכה תוכנה במערכת שלך עם סוג קובץ זה."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2087
+#: ../../locales/../src/interface/LocalListView.cpp:2187
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6620,11 +6671,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "התווים הבאים יוחלפו: %s"
 
-#: resources.h:328
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "הקבצים הבאים נערכים כעת:"
 
-#: resources.h:463
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr "הפתרון החופשי בקוד פתוח ל־FTP"
 
@@ -6632,7 +6683,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "לא ניתן לשמור את הסימניות הכלליות."
 
-#: resources.h:973
+#: resources.h:985
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6660,21 +6711,21 @@
 "port."
 msgstr "הפורט הנמוך ביותר חייב להיות נמוך מהפורט הגבוה היותר."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../locales/../src/interface/updatewizard.cpp:608
 msgid ""
 "The most recent version has been downloaded. Click on Finish to close "
 "FileZilla and to start the installation."
 msgstr ""
 "הגרסה המתקדמת ביותר הורדה. לחץ על סיים כדי לסגור את FileZilla ולהתחיל בהתקנה."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:610
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
 msgstr ""
 "הגרסה החדשה ביותר התקבלה. נא להתקין אותו באותו האופן בו הותקנה גרסה זו."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1966
 msgid "The queue will not be saved."
 msgstr "התור לא יישמר."
 
@@ -6691,22 +6742,22 @@
 msgid "The selected categories have been imported."
 msgstr "הקטגוריות המבוקשות יובאו."
 
-#: resources.h:298
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "הקובץ הנבחר מכיל נתונים הניתנים לייבוא עבור הקטגוריות הבאות:"
 
-#: resources.h:321
+#: resources.h:322
 msgid "The selected file is already being edited:"
 msgstr "הקובץ הנבחר כבר נערך:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "הקובץ הנבחר עדיין פתוח בתוכנית אחרת, אנא סגור אותו."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6734,7 +6785,7 @@
 "certificate to make sure the server can be trusted."
 msgstr "האישור של השרת לא ידוע, בדוק היטב את האישור כדי לוודא שהשרת אמין."
 
-#: resources.h:187
+#: resources.h:188
 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 "
@@ -6743,7 +6794,7 @@
 "מפתח השרת המארח לא תואם למפתח ששמור אצלך. כלומר, או שמנהל השרת החליף מפתח או "
 "שתבצע ניסיון למחשב אחר המתחזה לשרת המבוקש."
 
-#: resources.h:175
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6757,11 +6808,11 @@
 "settings to have effect."
 msgstr "ההגדרות יובאו. יש להתחיל את FileZilla כדי שכל ההגדרות יכנסו לתוקף."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "המערכת תתאתחל בזמן הקרוב אלא אם כן בחירתך תהיה ביטול."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "המערכת תכבה בזמן הקרוב אלא אם כן בחירתך תהיה ביטול."
 
@@ -6773,7 +6824,7 @@
 "קובץ היעד כבר קיים.\n"
 "אנא בחר בפעולה."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "הבדיקה לא הצליחה. האם באמת לשמור את ההגדרות?"
 
@@ -6781,11 +6832,11 @@
 msgid "Themes"
 msgstr "ערכות נושא"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "לא ניתן להסיר מסנן זה."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "לא ניתן לשנות את שמה של ערכת מסננים זו."
 
@@ -6796,7 +6847,7 @@
 msgstr ""
 "משמעות הדבר היא שנתב ו/או חומת אש כלשהם עדיין מפריעים לפעולת FileZilla."
 
-#: resources.h:693
+#: resources.h:705
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6804,31 +6855,31 @@
 "זה יעבוד אך ורק אם אתה לא מאחורי נתב (router), אחרת המערכת שלך פשוט תתן את "
 "הכתובת המקומית."
 
-#: resources.h:671
+#: resources.h:683
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr "אשף זה יסייע לך להגדיר נתבים וחומות־אש שברשותך ויבדוק את התצורה שלך."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1222
 msgid "Time"
 msgstr "זמן"
 
-#: resources.h:891
+#: resources.h:903
 msgid "Time formatting"
 msgstr "מבנה הזמנים"
 
-#: resources.h:732
+#: resources.h:744
 msgid "Time&out in seconds:"
 msgstr "מגבלת ה&זמן בשניות:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:747 ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Timeout"
 msgstr "מגבלת זמן"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6839,22 +6890,22 @@
 msgid "Title:"
 msgstr "כותרת:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2339
+#: ../../locales/../src/interface/Mainfrm.cpp:2371
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "כדי להשוות תיקיות, יש ליישר את שתי רשימות הקבצים."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2340
+#: ../../locales/../src/interface/Mainfrm.cpp:2372
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr "כדי לעשות זאת, שני עצי התיקיות חייבים להיות או מוסתרים או גלויים."
 
-#: resources.h:786
+#: resources.h:798
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
 "כדי לתמוך באימות במפתח ציבורי, על FileZilla לדעת באיזה מפתח ציבורי להשתמש."
 
-#: resources.h:998
+#: resources.h:1010
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6870,7 +6921,7 @@
 "ירוק: הקובץ יותר עדכני מהקובץ שלא מסומן בצד השני\n"
 "אדום: גדלי הקבצים שונים"
 
-#: resources.h:1000
+#: resources.h:1012
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6880,23 +6931,23 @@
 "במידה שהופעל, העיון בהיררכיית התיקייה המקומית ישנה גם את התיקייה בצד השרת "
 "בהתאם ולהפך."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1000 resources.h:1001
 msgid "Toggles processing of the transfer queue"
 msgstr "הפעלה/השהיה של תור ההעברות"
 
-#: resources.h:980 resources.h:981
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the local directory tree"
 msgstr "הצגה/הסתרה של עץ התיקיות המקומיות"
 
-#: resources.h:978 resources.h:979
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the message log"
 msgstr "הצגה/הסתרה של רישום ההודעות"
 
-#: resources.h:982 resources.h:983
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the remote directory tree"
 msgstr "הצגה/הסתרה של עץ התיקיות בשרת המרוחק"
 
-#: resources.h:984 resources.h:985
+#: resources.h:996 resources.h:997
 msgid "Toggles the display of the transfer queue"
 msgstr "הצגה/הסתרה של תור העברות"
 
@@ -6909,28 +6960,28 @@
 msgstr "יותר מדי הפניות"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "מעקב:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:933 resources.h:939
 msgid "Transfer"
 msgstr "העברה"
 
-#: resources.h:361
+#: resources.h:362
 msgid "Transfer &direction"
 msgstr "&כיוון ההעברה"
 
-#: resources.h:527
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "&סוג ההעברה"
 
-#: resources.h:742
+#: resources.h:754
 msgid "Transfer Mode"
 msgstr "מצב העברה"
 
-#: resources.h:877
+#: resources.h:889
 msgid "Transfer Queue"
 msgstr "תור ההעברות"
 
@@ -6938,8 +6989,8 @@
 msgid "Transfer Settings"
 msgstr "הגדרות העברה"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "חיבור ההעברה נקטע: %s"
@@ -6948,8 +6999,8 @@
 msgid "Transferred data got tainted."
 msgstr "העברת הנתונים נחסמה."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1493
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "מעביר"
 
@@ -6957,28 +7008,28 @@
 msgid "Transfers"
 msgstr "העברות"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3138
+#: ../../locales/../src/interface/QueueView.cpp:3141
 msgid "Transfers finished"
 msgstr "ההעברות הסתיימו"
 
-#: resources.h:833
+#: resources.h:845
 msgid "Treat files &without extension as ASCII file"
 msgstr "התייחס אל קבצים ל&לא סיומות כקבצי ASCII"
 
-#: resources.h:829
+#: resources.h:841
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "התייחס לסוגי הקבצים הבאים כ&קבצי ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "מתן אמון במפתח המארח שהשתנה:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "מתן אמון במפתח המארח החדש:"
 
-#: resources.h:194
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr "האם לתת אמון במפתח החדש ולהמשיך בהתחברות?"
 
@@ -6986,40 +7037,40 @@
 msgid "Trust this certificate and carry on connecting?"
 msgstr "האם לתת אמון בתעודה זו ולהמשיך בהתחברות?"
 
-#: resources.h:181
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr "האם לתת אמון במארח זה ולהמשיך בהתחברות?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "סוג"
 
-#: resources.h:768
+#: resources.h:780
 msgid "Type of FTP Proxy:"
 msgstr "סוג מתווך ה־FTP:"
 
-#: resources.h:793
+#: resources.h:805
 msgid "Type of generic proxy:"
 msgstr "סוג המתווך הכללי:"
 
-#: resources.h:331
+#: resources.h:332
 msgid "U&pload"
 msgstr "ה&עלאה"
 
-#: resources.h:484 resources.h:813
+#: resources.h:485 resources.h:825
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "מ&גבלת העלאה:"
 
-#: resources.h:939
+#: resources.h:951
 msgid "U&se filetype associations if available"
 msgstr "השתמש ב&שיוכי קבצים במידה שניתן"
 
-#: resources.h:892
+#: resources.h:904
 msgid "U&se system defaults"
 msgstr "השתמש ב&ברירת המחדל של המערכת"
 
-#: resources.h:770
+#: resources.h:782
 msgid "USER@&HOST"
 msgstr "משתמש@מ&ארח"
 
@@ -7032,12 +7083,12 @@
 msgid "Unit:"
 msgstr "יחידה:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "לא ידוע"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "סוג מתווך FTP לא ידוע, לא ניתן לייצא את רצף ההתחברות."
 
@@ -7058,7 +7109,7 @@
 "שגיאה בלתי ידוע בעת פתיחת הקובץ. נא לוודא כי ניתן לגשת לקובץ ושזהו מסמך XML "
 "המסוגנן כראוי."
 
-#: resources.h:174
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "מפתח מארח לא ידוע"
 
@@ -7090,7 +7141,7 @@
 msgstr ""
 "אלא אם כן בעיה זו תטופל, מצב FTP פעיל לא יעבור ויהיה צורך להשתמש במצב סביל."
 
-#: ../../locales/../src/engine/tlssocket.cpp:866
+#: ../../locales/../src/engine/tlssocket.cpp:934
 msgid "Unsupported certificate type"
 msgstr "סוג התעודה אינו נתמך"
 
@@ -7098,7 +7149,7 @@
 msgid "Unsupported redirect"
 msgstr "הפניה לא נתמכת"
 
-#: resources.h:332
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr "ה&עלאה וביטול עריכה"
 
@@ -7107,16 +7158,16 @@
 msgstr "בדיקה אחר עדכונים"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:252
+#: ../../locales/../src/interface/updatewizard.cpp:265
 msgid "Update wizard"
 msgstr "אשף העדכונים"
 
-#: resources.h:363
+#: resources.h:364
 msgid "Upload"
 msgstr "העלאה"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "ההעלאה נכשלה"
 
@@ -7129,35 +7180,35 @@
 msgid "Upload limit: none"
 msgstr "מגבלת העלאה: אין"
 
-#: resources.h:648
+#: resources.h:660
 msgid "Upload selected directory"
 msgstr "העלה את התיקייה הנבחרת"
 
-#: resources.h:558
+#: resources.h:566
 msgid "Upload selected files and directories"
 msgstr "העלה את הקבצים והתיקיות הנבחרים"
 
-#: resources.h:316
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "להעלות קובץ זה בחזרה לשרת?"
 
-#: resources.h:315
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr "האם להעלות קובץ זה לשרת?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "מעלה"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "העלאה והסרה בהמתנה"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr "העלאה וביטול העריכה"
 
@@ -7165,15 +7216,15 @@
 msgid "Use &custom charset"
 msgstr "השתמש בערכת תווים &עצמאית"
 
-#: resources.h:936
+#: resources.h:948
 msgid "Use &custom editor:"
 msgstr "השתמש ב&עורך מותאם אישית:"
 
-#: resources.h:422
+#: resources.h:423
 msgid "Use &default editor for text files"
 msgstr "השתמש ב&עורך ברירת המחדל עבור קובצי טקסט"
 
-#: resources.h:405 resources.h:411
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr "שימוש בעיון מ&סונכרן"
 
@@ -7181,7 +7232,7 @@
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr "שימוש ב־UTF-8 אם השרת תומך בכך, אחרת בקידוד המקומי."
 
-#: resources.h:258 resources.h:268
+#: resources.h:259 resources.h:269
 msgid "Use default action"
 msgstr "שימוש בפעולת ברירת המחדל"
 
@@ -7189,36 +7240,36 @@
 msgid "Use plain FTP"
 msgstr "שימוש ב־FTP פשוט"
 
-#: resources.h:371
+#: resources.h:372
 msgid "Use server currently connected to"
 msgstr "שימוש בשרת המחובר כעת אל"
 
-#: resources.h:372
+#: resources.h:373
 msgid "Use server from site manager"
 msgstr "השתמש בשרת ממנהל האתרים"
 
-#: resources.h:886
+#: resources.h:898
 msgid "Use system &defaults"
 msgstr "השתמש ב&ברירת המחדל של המערכת"
 
-#: resources.h:694
+#: resources.h:706
 msgid "Use the following IP address:"
 msgstr "השתמש בכתובת ה־IP הבאה:"
 
-#: resources.h:704
+#: resources.h:716
 msgid "Use the following port range:"
 msgstr "השתמש בטווח הפתחות הבא:"
 
-#: resources.h:689
+#: resources.h:701
 msgid "Use the server's external IP address instead"
 msgstr "השתמש בכתובת ה־IP החיצונית של השרת במקום"
 
-#: resources.h:695 resources.h:758
+#: resources.h:707 resources.h:770
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr "השתמש באפשרות זו אם אתה מאחורי נתב ויש לך כתובת IP קבועה."
 
-#: resources.h:698
+#: resources.h:710
 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 "
@@ -7236,7 +7287,7 @@
 msgid "Username cannot be a series of spaces"
 msgstr "שם המשתמש לא יכול להיות סדרה של רווחים"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "משתמש במתווך %s"
@@ -7246,7 +7297,7 @@
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "שימוש בקידוד לא נכון עלול לגרום לבעיות בהצגת הקבצים."
 
-#: resources.h:231
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "באמצעות אשף זה תוכל לבדוק אחר עדכונים עבור FileZilla."
 
@@ -7262,27 +7313,27 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Verbose log messages from wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1056
+#: ../../locales/../src/engine/tlssocket.cpp:1124
 msgid "Verifying certificate..."
 msgstr "מאמת את התעודה..."
 
-#: resources.h:169
+#: resources.h:170
 msgid "Version:"
 msgstr "גרסה:"
 
-#: resources.h:818
+#: resources.h:830
 msgid "Very high"
 msgstr "גבוה מאוד"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "האפשרות להצגת פריטים מוסתרים נבחרה, אך איננה נתמכת על ידי השרת"
 
-#: resources.h:923
+#: resources.h:935
 msgid "View/Edit"
 msgstr "תצוגה/עריכה"
 
-#: resources.h:355
+#: resources.h:356
 msgid "Visible columns"
 msgstr "העמודות הגלויות"
 
@@ -7290,19 +7341,19 @@
 msgid "W&rite"
 msgstr "כ&תוב"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1792
 msgid "Waiting"
 msgstr "ממתין"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1400
 msgid "Waiting for browsing connection"
 msgstr "בהמתנה לחיבור עיוני"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1443
 msgid "Waiting for password"
 msgstr "ממתין לססמה"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "ממתין לביטול ההעברה"
 
@@ -7340,11 +7391,11 @@
 "אלמלא תבוטל חומת האש של Windows או השירות Application Layer Gateway,\n"
 "פעולת FileZilla תפסק בהעברות גדולות."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "אזהרה, מתעלם מחיבור הנתונים מ־IP שגוי."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:265
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7358,23 +7409,31 @@
 "\n"
 "האם אתה בטוח שברצונך לבדוק אחר עדכונים משניים?"
 
-#: resources.h:186
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "אזהרה: ייתכן שקיים כשל באבטחה!"
 
-#: resources.h:475
+#: resources.h:476
 msgid "Welcome to FileZilla"
 msgstr "ברוך בואך ל־FileZilla"
 
-#: resources.h:464
+#: resources.h:465
 msgid "What's new"
 msgstr "מה חדש"
 
-#: resources.h:241
+#: resources.h:242
 msgid "What's new:"
 msgstr "מה חדש:"
 
-#: resources.h:821
+#: resources.h:492
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"בעת מתן האפשרות ל־FileZilla לזכור ססמאות, ניתן להתחבר מחדש מבלי להזין מחדש "
+"את ססמה לאחר הפעלת FileZilla מחדש."
+
+#: resources.h:833
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7382,10 +7441,14 @@
 "כאשר פעיל, התווים שאינם נתמכים על ידי מערכת ההפעלה בשמות הקבצים יוחלפו אם "
 "יתקבל קובץ שכזה."
 
-#: resources.h:863
+#: resources.h:875
 msgid "Widescreen"
 msgstr "מסך רחב"
 
+#: resources.h:491
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "האם לאפשר ל־FileZilla לשמור ססמאות?"
+
 #: resources.h:144
 msgid "Wr&ite"
 msgstr "כתוב"
@@ -7399,17 +7462,23 @@
 msgid "Wrong line endings"
 msgstr "סיומות השורות שגויות"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "כן"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "מסתבר כי המארח תומך אך ורק ב־IPv6. אשף זה אינו תומך בסביבה זו."
+
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "הינך משתמש בגירסה העדכנית ביותר של FileZilla. אנא בדוק שוב בעתיד."
 
-#: resources.h:473
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr "תמיד ניתן לפתוח דו־שיח זה שוב דרך תפריט העזרה."
 
@@ -7439,18 +7508,18 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "לא הזנת שם חדש לקובץ. האם לשכתב על הקובץ במקום?"
 
-#: resources.h:454
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr "נבחר לפחות קישור סימבולי אחד."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2021
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "בחרת ביותר מ־10 קבצים לעריכה, האם באמת ברצונך להמשיך?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2141
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7461,7 +7530,7 @@
 msgid "You have to enter a hostname."
 msgstr "עליך להזין את שם המארח."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "עליך להעליך להזין כתובת IP תקנית."
 
@@ -7470,7 +7539,7 @@
 msgid "You have to enter a valid IP address."
 msgstr "עליך להזין כתובת IP תקנית."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "עליך להזין תיקייה מקומית הניתנת לכתיבה."
 
@@ -7498,16 +7567,16 @@
 msgid "You need to enter a name for the log file."
 msgstr "עליך להזין שם עבור קובץ הרישום."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1640
 msgid "You need to enter a properly quoted command."
 msgstr "עליך להזין פקודה בה התווים מוצבים כראוי."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "עליך להזין מתווך מארח."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "עליך להזין את פתחת המתווך בטווח שבין 1 ל־65535"
 
@@ -7590,10 +7659,10 @@
 msgid "equals"
 msgstr "שווה"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "קובץ"
 
@@ -7612,11 +7681,11 @@
 "יש לוודא כי קובץ הפעלה זה קיים ושהוא נמצא באותה התיקייה יחד עם קובץ ההפעלה "
 "של FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp לא ניתן להפעיל את"
 
-#: ../../locales/../src/engine/tlssocket.cpp:904
+#: ../../locales/../src/engine/tlssocket.cpp:972
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "הפעולה gnutls_certificate_get_peers החזירה כי אין תעודות"
 
@@ -7688,6 +7757,21 @@
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d ק״ב/ש׳)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d מ״ב/ש׳)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s בתים (%d.%d ק״ב/ש׳)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s בתים (%d.%d מ״ב/ש׳)"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "opState שגוי: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "שם המסנן כפול"
 
diff -Nru filezilla-3.5.3/locales/hu_HU.po filezilla-3.7.3~precise/locales/hu_HU.po
--- filezilla-3.5.3/locales/hu_HU.po	2010-06-21 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/locales/hu_HU.po	2012-10-21 20:00:08.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: FileZilla 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
 "PO-Revision-Date: 2009-08-10 21:15+0100\n"
 "Last-Translator: Bata György <bagyurek@freestart.hu>\n"
 "Language-Team: \n"
@@ -14,16 +14,16 @@
 "Plural-Forms: nplurals=2; plural=n != 1;\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:225
 msgid "%H:%M:%S elapsed"
 msgstr "Eltelt: %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
 msgstr "Hátralévő: %H:%M:%S"
 
-#: resources.h:772
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -41,9 +41,9 @@
 msgstr[0] "%d mappa"
 msgstr[1] "%d mappa"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -52,9 +52,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -75,7 +75,7 @@
 msgstr[0] "%d fájl. Fájl mérete: Legalább %s"
 msgstr[1] "%d fájl. Fájlok mérete: Legalább %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d fájl hozzáadva a várólistához"
@@ -87,46 +87,46 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:769
+#: resources.h:785
 msgid "%h - Host"
 msgstr "%h - Cím"
 
-#: resources.h:771
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Jelszó"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:181
 #, fuzzy, c-format
 msgid "%s (%d B/s)"
 msgstr "%s byte (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
+#: ../../locales/../src/interface/statuslinectrl.cpp:179
 #, fuzzy, c-format
 msgid "%s (%d.%d KB/s)"
 msgstr "%s byte (%d.%d KB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
+#: ../../locales/../src/interface/statuslinectrl.cpp:177
 #, fuzzy, c-format
 msgid "%s (%d.%d MB/s)"
 msgstr "%s byte (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
 #, fuzzy, c-format
 msgid "%s (? B/s)"
 msgstr "%s byte (? B/s)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
 msgstr "%s - A tanúsítvány érvényessége lejárt!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - A tanúsítvány még nem érvényes!"
 
-#: resources.h:773
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxy felhasználónév"
@@ -168,7 +168,7 @@
 msgid "%s bytes (%d.%d MB/s)"
 msgstr "%s byte (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -183,7 +183,7 @@
 "Kérem a FileZilla-t töltse le ismételten. Amennyiben a probléma továbbra is "
 "fennáll, kérem küldjön egy hibajelentést."
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -202,50 +202,50 @@
 "- Az FZ_FZSFTP környezeti változó értékében állítsa be a(z) %s teljes "
 "elérési útját."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s %d bittel"
 
-#: resources.h:770
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Felhasználónév"
 
-#: resources.h:774
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proxy jelszó"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
 msgstr "Névjegy..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "Fiók:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "Aktív"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr "Kedvenc könyvtár hozzáadása..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "Várólistához adás"
 
-#: resources.h:782
+#: resources.h:798
 msgid "&Add keyfile..."
 msgstr "Kulcsfájl hozzáadása..."
 
-#: resources.h:624 resources.h:643
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
 msgstr "Várólistához adás"
 
-#: resources.h:94
+#: resources.h:95
 msgid "&Adjust server timezone offset:"
 msgstr "A kiszolgáló időzónájának időeltolódása:"
 
@@ -253,17 +253,17 @@
 msgid "&Always trust certificate in future sessions."
 msgstr "A továbbiakban mindig fogadja el ezt a tanúsítványt."
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
 "A továbbiakban mindig fogadja el ezt a címkulcsot, és tárolja el a "
 "regisztrációs adatbázisban."
 
-#: resources.h:932
+#: resources.h:950
 msgid "&Always use default editor"
 msgstr "Mindig az alapértelmezett szerkesztő használata"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr "A továbbiakban mindig ezt használja a hiányzó fájl társításokhoz"
 
@@ -271,251 +271,257 @@
 msgid "&Always use this action"
 msgstr "A továbbiakban mindig ez legyen a beállítás"
 
-#: resources.h:750
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
 msgstr "A külső IP cím elkérése az operációs rendszertől"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "Automatikus"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
 msgstr "Automatikus"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "Sikeres átvitelek automatikus eltávolítása"
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "Bináris"
 
-#: resources.h:892
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Bináris előtagok SI mértékegységekkel (pl. 1 KB = 1024 byte)"
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr "Mappakedvencek"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "Tallózás..."
 
-#: resources.h:809
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Burst tűrés:"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "Mégse"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "Keresse a FileZilla beta verzióit is"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "Személyes adatok törlése..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "FileZilla bezárása"
 
-#: resources.h:664
+#: resources.h:680
 msgid "&Configure speed limits..."
 msgstr ""
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
 msgstr ""
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "Csatlakozás"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "Másolás"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr "Jelenlegi kapcsolat másolása Kedvenc Helyekbe..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "Másolás a vágólapra"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr "Összeomlasztás"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
 msgstr "Könyvtár létrehozása"
 
-#: resources.h:659
+#: resources.h:675
 #, fuzzy
 msgid "&Create new tab"
 msgstr "Könyvtár létrehozása"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "Hibakeresés"
 
-#: resources.h:959
+#: resources.h:977
 msgid "&Debug information in message log:"
 msgstr "Hibakeresési információk követése az üzenet naplóban:"
 
-#: resources.h:925
+#: resources.h:943
 msgid "&Default editor:"
 msgstr "Alapértelmezett szerkesztő:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr "Fájl felülírás beállítása..."
 
-#: resources.h:732
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
 msgstr "Késleltetés a bejelentkezési kísérletek között:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "Törlés"
 
-#: resources.h:456
+#: resources.h:458
 #, fuzzy
 msgid "&Delete symlink"
 msgstr "Törlés"
 
-#: resources.h:510
+#: resources.h:519
 msgid "&Directory comparison"
 msgstr "Könyvtárak összehasonlítása"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr "Helyi fájl elvetése és a távoli fájl újbóli letöltése és szerkesztése."
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "Kapcsolat bontása"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "Kapcsolat bontása a kiszolgálóról"
 
-#: resources.h:868
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 
-#: resources.h:890
+#: resources.h:908
 msgid "&Display size in bytes"
 msgstr "Méret megjelenítése byte-okban"
 
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "Jelszó megadása"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "Ezt az ablakot ne jelenítse meg a továbbiakban."
 
-#: resources.h:755
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
 msgstr "Ne használja a külső IP címet helyi kapcsolatok esetén."
 
-#: resources.h:912
+#: resources.h:930
 msgid "&Double-click action on files:"
 msgstr "Dupla kattintás fájlokra:"
 
-#: resources.h:572 resources.h:622
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "Letöltés"
 
-#: resources.h:442
+#: resources.h:444
 msgid "&Download to:"
 msgstr "Letöltés ide:"
 
-#: resources.h:657
+#: resources.h:673
 msgid "&Download..."
 msgstr "Letöltés..."
 
-#: resources.h:256 resources.h:831
+#: resources.h:258 resources.h:847
 #, fuzzy
 msgid "&Downloads:"
 msgstr "Letöltések"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "Szerkesztés"
 
-#: resources.h:209
+#: resources.h:211
 msgid "&Edit filter rules..."
 msgstr "Szűrő szabályok szerkesztése..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
 msgstr "Engedélyezés"
 
-#: resources.h:940
+#: resources.h:958
 msgid "&Enable automatic update check"
 msgstr "Automatikus frissítés keresés engedélyezése"
 
-#: resources.h:480 resources.h:804
+#: resources.h:482 resources.h:820
 #, fuzzy
 msgid "&Enable speed limits"
 msgstr "Sebességkorlátozás"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr "Kódolás:"
 
-#: resources.h:609
+#: resources.h:82
+#, fuzzy
+msgid "&Encryption:"
+msgstr "Titkosítás"
+
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "Egyéni parancs beírása..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "Végrehajtás"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "Kedvenc Helyek bejegyzéseinek exportálása"
 
-#: resources.h:497 resources.h:653
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "Exportálás..."
 
-#: resources.h:760
+#: resources.h:776
 msgid "&Fall back to active mode"
 msgstr "Áttérés aktív módra"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "Fájl"
 
-#: resources.h:634
+#: resources.h:650
 msgid "&File Attributes..."
 msgstr "Attribútumok..."
 
-#: resources.h:588
+#: resources.h:600
 msgid "&File permissions..."
 msgstr "Engedélyek..."
 
-#: resources.h:364
+#: resources.h:366
 msgid "&File:"
 msgstr "Fájl:"
 
-#: resources.h:219
+#: resources.h:221
 msgid "&Filter conditions:"
 msgstr "Szűrési feltételek:"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "Szűrőkészletek:"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
 msgstr "Szűrők:"
 
@@ -524,146 +530,146 @@
 msgid "&Finish"
 msgstr "Szerkesztés befejezése"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "Szerkesztés befejezése és a helyi fájl törlése"
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr "Az összes tartalmazott fájlt közvetlenül a letöltési könyvtárba töltse"
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 
-#: resources.h:753
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
 msgstr "Külső IP cím lekérdezése az alábbi URL-ről:"
 
-#: resources.h:551
+#: resources.h:561
 msgid "&Getting help..."
 msgstr "Online súgó..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr "Globális kedvenc mappa"
 
-#: resources.h:789
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "HTTP/1.1 a CONNECT módszer használatával"
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "Súgó"
 
-#: resources.h:514 resources.h:640
+#: resources.h:523 resources.h:656
 msgid "&Hide identical files"
 msgstr "Azonos fájlok elrejtése"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "Legmagasabb"
 
-#: resources.h:748
+#: resources.h:764
 msgid "&Highest available port:"
 msgstr "Legmagasabb elérhető port:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
 msgstr "Cím:"
 
-#: resources.h:891
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "IEC bináris előtagok (pl. 1 KiB = 1024 byte)"
 
-#: resources.h:879
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "ISO 8601 (példa: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
 msgstr "Importálás..."
 
-#: resources.h:934
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
 msgstr "A rendszer fájl társításainak öröklése"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr "A relatív távoli elérési utak megtartása"
 
-#: resources.h:854
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
 msgstr "A fájlablak és könyvtárfa panelek elrendezése:"
 
-#: resources.h:745
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
 msgstr "A FileZilla által használt helyi portok korlátozása"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
 msgstr "Az egyidejű kapcsolati szálak számának korlátozása"
 
-#: resources.h:519
+#: resources.h:529
 msgid "&Local directory tree"
 msgstr "Helyi könyvtárfa"
 
-#: resources.h:401 resources.h:407
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
 msgstr "Helyi mappa:"
 
-#: resources.h:949
+#: resources.h:967
 msgid "&Log to file"
 msgstr "Naplózás fájlba"
 
-#: resources.h:82
+#: resources.h:83
 #, fuzzy
 msgid "&Logon Type:"
 msgstr "Bejelentkezés típusa:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "Bejelentkezés típusa:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "Alacsony"
 
-#: resources.h:545
+#: resources.h:555
 msgid "&Manage bookmarks..."
 msgstr "Kedvenc könyvtárak szerkesztése..."
 
-#: resources.h:533
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "Kézi átvitel..."
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "A kapcsolati szálak maximális száma:"
 
-#: resources.h:730
+#: resources.h:746
 msgid "&Maximum number of retries:"
 msgstr "Újrapróbálkozások maximális száma:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
 msgstr "Üzenet napló"
 
-#: resources.h:866
+#: resources.h:883
 msgid "&Minimize to tray"
 msgstr "Kicsinyítés az értesítési területre"
 
-#: resources.h:399
+#: resources.h:401
 msgid "&Name:"
 msgstr "Név:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "Hálózati beállítások varázsló..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
 msgstr "Új"
 
@@ -680,35 +686,35 @@
 msgid "&Next >"
 msgstr "Új"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "Nem"
 
-#: resources.h:763 resources.h:788
+#: resources.h:779 resources.h:804
 msgid "&None"
 msgstr "Nincs"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "Normál"
 
-#: resources.h:941
+#: resources.h:959
 msgid "&Number of days between update checks:"
 msgstr "Frissítések keresésének gyakorisága:"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
 msgstr "Számérték:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "OK"
 
-#: resources.h:766
+#: resources.h:782
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:561 resources.h:645
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr "Megnyitás"
 
@@ -716,101 +722,110 @@
 msgid "&Overwrite"
 msgstr "Felülírás"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "Passzív"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "Jelszó:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "Hangjelzés"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "Port:"
 
-#: resources.h:860
+#: resources.h:876
 msgid "&Position of the message log:"
 msgstr "Az üzenet napló elhelyezkedése:"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "Időbélyeg megtartása az átvitt fájlokon"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
 msgstr "Átviteli várólista"
 
-#: resources.h:718
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "Csatlakozás"
 
-#: resources.h:517
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "Gyorscsatlakozás eszköztár"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "Olvasás"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "Újracsatlakozás"
 
-#: resources.h:508 resources.h:662
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
 msgstr "Frissítés"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
 msgstr "Jelszó megjegyzése erre a munkamenetre"
 
-#: resources.h:403 resources.h:409
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
 msgstr "Távoli mappa:"
 
-#: resources.h:367
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "Távoli mappa:"
 
-#: resources.h:825
+#: resources.h:841
 msgid "&Remove"
 msgstr "Eltávolítás"
 
-#: resources.h:783
+#: resources.h:799
 msgid "&Remove key"
 msgstr "Kulcs eltávolítása"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "Kijelölt elemek eltávolítása a várólistából"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "Átnevezés"
 
-#: resources.h:200
+#: resources.h:202
 msgid "&Rename..."
 msgstr "Átnevezés..."
 
-#: resources.h:323
+#: resources.h:325
 msgid "&Reopen local file"
 msgstr "Helyi fájl újbóli megnyitása"
 
-#: resources.h:816
+#: resources.h:832
 #, fuzzy
 msgid "&Replace invalid characters with:"
 msgstr "A szűrő érvényesítése nem sikerült"
 
-#: resources.h:552
+#: resources.h:562
 msgid "&Report a bug..."
 msgstr "Hibajelentés küldése..."
 
-#: resources.h:711
+#: resources.h:630
+#, fuzzy
+msgid "&Reset and requeue all"
+msgstr "Kijelölt elemek állapotának törlése és újbóli várólistába helyezése"
+
+#: resources.h:727
 msgid "&Restart Wizard"
 msgstr "Varázsló újraindítása"
 
@@ -818,35 +833,35 @@
 msgid "&Resume"
 msgstr "Folytatás"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
 msgstr "Parancs futtatása..."
 
-#: resources.h:725
+#: resources.h:741
 msgid "&Run configuration wizard now..."
 msgstr "Hálózati beállítások varázsló futtatása..."
 
-#: resources.h:943
+#: resources.h:961
 msgid "&Run update check now..."
 msgstr "Frissítések keresésének futtatása most..."
 
-#: resources.h:765
+#: resources.h:781
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:790
+#: resources.h:806
 msgid "&SOCKS 5"
 msgstr "SOCKS 5"
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr "Mentés másként..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
 msgstr "Keresés"
 
-#: resources.h:538
+#: resources.h:548
 msgid "&Search remote files..."
 msgstr "Fájlkeresés a kiszolgálón..."
 
@@ -855,43 +870,43 @@
 msgid "&Select Entry:"
 msgstr "Válassza ki a bejegyzést:"
 
-#: resources.h:923
+#: resources.h:941
 msgid "&Select language:"
 msgstr "Válassza ki a FileZilla által használt nyelvet:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "Jelölje ki a megjeleníteni kívánt oszlopokat:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "Kiszolgáló"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "Beállítások"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "Beállítások..."
 
-#: resources.h:958
+#: resources.h:976
 msgid "&Show debug menu"
 msgstr "A Hibakeresés menü engedélyezése"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr "Üzenet megjelenítése"
 
-#: resources.h:948
+#: resources.h:966
 msgid "&Show timestamps in message log"
 msgstr "Idő megjelenítése az üzenet naplóban"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "Kedvenc Helyek..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr "Állomáshoz rendelt kedvenc mappa"
 
@@ -899,16 +914,16 @@
 msgid "&Skip"
 msgstr "Kihagyás"
 
-#: resources.h:532
+#: resources.h:542
 #, fuzzy
 msgid "&Speed limits"
 msgstr "Sebességkorlátozás"
 
-#: resources.h:448
+#: resources.h:450
 msgid "&Start transfer immediately"
 msgstr "Az átvitel megkezdése azonnal"
 
-#: resources.h:859
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr "A helyi és a távoli panelek felcserélése"
 
@@ -916,74 +931,74 @@
 msgid "&Test"
 msgstr "Teszt"
 
-#: resources.h:871
+#: resources.h:889
 msgid "&Theme:"
 msgstr "Téma:"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
 msgstr "Átvitel"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
 msgstr "Átviteli mód:"
 
-#: resources.h:521
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "Várólista"
 
-#: resources.h:828
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
 msgstr "A dot fájlok kezelése ASCII fájlokként történjen"
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
 msgstr "Szerkesztés befejezése"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr ""
 "Módosítsa a regisztrációs adatbázisban eltárolt címkulcsot ehhez a címhez."
 
-#: resources.h:555 resources.h:641
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "Feltöltés"
 
-#: resources.h:266 resources.h:840
+#: resources.h:268 resources.h:856
 #, fuzzy
 msgid "&Uploads:"
 msgstr "Feltöltések"
 
-#: resources.h:424
+#: resources.h:426
 msgid "&Use custom program"
 msgstr "Egyéni program használata"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
 msgstr "Szinkronizált böngészés használata"
 
-#: resources.h:927
+#: resources.h:945
 msgid "&Use system's default editor for text files"
 msgstr ""
 "A rendszer alapértelmezett szerkesztőjének használata szöveges fájlokhoz"
 
-#: resources.h:751
+#: resources.h:767
 msgid "&Use the following IP address:"
 msgstr "A következő IP cím használata:"
 
-#: resources.h:759
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
 msgstr "Ehelyett, a kiszolgáló külső IP címének használata"
 
-#: resources.h:894
+#: resources.h:912
 msgid "&Use thousands separator"
 msgstr "Ezreselválasztó használata"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "Felhasználónév:"
 
-#: resources.h:714
+#: resources.h:730
 msgid "&Username:"
 msgstr "Felhasználónév:"
 
@@ -992,46 +1007,46 @@
 msgid "&Version %s"
 msgstr "Verzió: %s"
 
-#: resources.h:507
+#: resources.h:516
 msgid "&View"
 msgstr "Nézet"
 
-#: resources.h:578
+#: resources.h:588
 msgid "&View/Edit"
 msgstr "Megnyitás / Szerkesztés"
 
-#: resources.h:933
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "Helyileg szerkesztett fájlok figyelése és jelzés a feltöltéshez"
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "Írás"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "Igen"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "A következő nem létezik vagy nem hozzáférhető: '%s'."
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, fuzzy, c-format
 msgid "'%s' is not a directory."
 msgstr "%d mappa"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
 "A 'Fiókos' bejelentkezési típust a kiválasztott protokoll nem támogatja."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1050,39 +1065,39 @@
 msgstr[0] "(%d objektum ki van szűrve)"
 msgstr[1] "(%d objektum ki van szűrve)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr "(0 ha nincs korlátozás)"
 
-#: resources.h:731
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 másodperc)"
 
-#: resources.h:798
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 a letiltáshoz)"
 
-#: resources.h:942
+#: resources.h:960
 msgid "(At least 7 days)"
 msgstr "naponta. (Legalább 7 nap.)"
 
-#: resources.h:887
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(például: %H:%M)"
 
-#: resources.h:881
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr "(például: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
 #, fuzzy, c-format
 msgid "(in %s/s)"
 msgstr "(KB/s, 0 ha nincs korlátozás)"
@@ -1095,23 +1110,23 @@
 msgid ", --:--:-- left"
 msgstr ", hátralévő: --:--:--"
 
-#: resources.h:699
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr ""
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr ""
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr ""
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
 msgstr "Hátralévő: --:--:--"
 
@@ -1132,32 +1147,32 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr "A -s argumentum nem használható együtt FTP címmel."
 
-#: resources.h:960
+#: resources.h:978
 msgid "0 - None"
 msgstr "0 - Nincs"
 
-#: resources.h:961
+#: resources.h:979
 msgid "1 - Warning"
 msgstr "1 - Figyelmeztetések"
 
-#: resources.h:962
+#: resources.h:980
 msgid "2 - Info"
 msgstr "2 - Információk"
 
-#: resources.h:963
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr "3 - Részletes"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 #, fuzzy
 msgid "32 bit system"
 msgstr "Rendszer újraindítása"
 
-#: resources.h:964
+#: resources.h:982
 msgid "4 - Debug"
 msgstr "4 - Hibakeresés"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 #, fuzzy
 msgid "64 bit system"
 msgstr "Rendszer újraindítása"
@@ -1166,11 +1181,11 @@
 msgid "< &Back"
 msgstr ""
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
@@ -1180,13 +1195,13 @@
 msgid "A default editor needs to be set."
 msgstr "Be kell állítania az alapértelmezett szerkesztőt."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
 #, fuzzy
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Egy mappa nem húzható bele a saját almappájába."
 
-#: resources.h:671
+#: resources.h:687
 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 "
@@ -1197,11 +1212,11 @@
 "FileZilla megnyit egy portot, majd kéri a kiszolgálót hogy ehhez "
 "csatlakozzon."
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr "Egy előzőleg megnyitott fájl módosult."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
@@ -1209,19 +1224,19 @@
 "Egy fájl ugyanezzel a fájlnévvel már ki lett jelölve szerkesztésre. Szeretné "
 "a következő fájlt újra megnyitni? %s"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "Egy ugyanilyen nevű fájl átvitele már folyamatban van."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Egy fájl ugyanezzel a fájlnévvel még szerkesztés alatt van. Kérem zárja be "
 "és próbálja újra."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1236,11 +1251,11 @@
 "listázásokból.\n"
 "Ebben a munkamenetben már nem lesz több figyelmeztetés."
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr "A FileZilla egy újabb verziója elérhető:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 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."
@@ -1249,7 +1264,7 @@
 "beállított kiszolgáló esetleg elrejtheti azokat. Ez a beállítás kényszeríti "
 "a kiszolgálót az összes fájl megjelenítésére."
 
-#: resources.h:743
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1263,70 +1278,75 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr "ASCII"
 
-#: resources.h:824
+#: resources.h:840
 msgid "A&dd"
 msgstr "Hozzáadás"
 
-#: resources.h:851
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
 msgstr "ASCII fájlok átviteli folytatásának engedélyezése"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "Csak a letöltésekre alkalmazza"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "Csak a feltöltésekre alkalmazza"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
 msgstr "Alkalmazás az összes fájlra és mappára"
 
-#: resources.h:388
+#: resources.h:637
+#, fuzzy
+msgid "A&utomatically remove successful transfers"
+msgstr "Sikeres átvitelek automatikus eltávolítása"
+
+#: resources.h:390
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:480
 #, fuzzy
 msgid "Abort previous connection and connect in current tab"
 msgstr ""
 "Az elsődleges kapcsolati szál és az adatkapcsolati szál tanúsítványai nem "
 "egyeznek."
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
 msgstr "FileZilla névjegye"
 
-#: resources.h:861
+#: resources.h:877
 msgid "Above the file lists"
 msgstr "A fájlablak fölött"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "Fiókos"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr "Művelet a várólista végrehajtása után"
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "Művelet a kijelölt fájlon:"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
 msgstr "Válassza ki a műveletet:"
 
@@ -1364,23 +1384,23 @@
 "címet, azonban a router vagy tűzfal félrevezető módon megváltoztatta az "
 "elküldött címet."
 
-#: resources.h:756
+#: resources.h:772
 msgid "Active mode IP"
 msgstr "IP cím aktív módban"
 
-#: resources.h:449
+#: resources.h:451
 msgid "Add files to &queue only"
 msgstr "A fájlokat csak a várólistához adja hozzá"
 
-#: resources.h:625 resources.h:644
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
 msgstr "Kijelölt mappa hozzáadása az átviteli várólistához"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Kijelölt mappák és fájlok hozzáadása az átviteli várólistához"
 
-#: resources.h:914 resources.h:920
+#: resources.h:932 resources.h:938
 msgid "Add to queue"
 msgstr "Hozzáadás a várólistához"
 
@@ -1388,28 +1408,28 @@
 msgid "Address type not supported"
 msgstr "Nem támogatott cím típus"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "Speciális"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "Speciális opciók:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "Algoritmus:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, fuzzy
 msgid "All files have been successfully transferred"
 msgstr "Sikeres átvitelek automatikus eltávolítása"
 
-#: resources.h:700
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "A megadott port tartománynak 1024 és 65535 között kell lennie."
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, fuzzy, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
@@ -1422,20 +1442,20 @@
 "\"%s\"\n"
 "A Kedvenc Helyek módosításai nem menthetőek: %s"
 
-#: resources.h:739
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Áttérés a másik átviteli módra, ha hiba történik"
 
-#: resources.h:675
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Áttérés a másik átviteli módra, ha hiba történik"
 
-#: resources.h:475
+#: resources.h:477
 #, fuzzy
 msgid "Already connected"
 msgstr "A csatlakozás sikerült"
 
-#: resources.h:784
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1444,7 +1464,7 @@
 "is a PuTTY programcsomagból, a FileZilla együttműködik a Pageant "
 "alkalmazással."
 
-#: resources.h:785
+#: resources.h:801
 #, fuzzy
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
@@ -1462,28 +1482,42 @@
 "Vagy pedig meglátogathatja a http://filezilla-project.org webcímet a "
 "legfrissebb verzió letöltéséhez."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Az áthúzott elemmel megegyező nevű elem már létezik a célhelyen."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Névtelen"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 #, fuzzy
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
@@ -1491,13 +1525,13 @@
 "\"%s\"\n"
 "A Kedvenc Helyek módosításai nem menthetőek: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../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 ""
 
-#: ../../locales/../src/interface/filter.cpp:194
+#: ../../locales/../src/interface/filter.cpp:209
 #, fuzzy
 msgid "Any changes made to the filters could not be saved."
 msgstr ""
@@ -1505,15 +1539,15 @@
 "\"%s\"\n"
 "A Kedvenc Helyek módosításai nem menthetőek: %s"
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr ""
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
 msgstr "Alkalmazás csak a mappákra"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
 msgstr "Alkalmaz"
 
@@ -1521,39 +1555,39 @@
 msgid "Apply to &current queue only"
 msgstr "Csak az aktuális várólistára alkalmazza"
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
 msgstr "Alkalmazás csak a fájlokra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "Archív"
 
-#: resources.h:863
+#: resources.h:879
 msgid "As tab in the transfer queue pane"
 msgstr "A várólista panel egy új füleként"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 #, fuzzy
 msgid "Ask for action"
 msgstr "Rákérdezés"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Jelszó bekérése"
 
-#: resources.h:696
+#: resources.h:712
 msgid "Ask operating system for a port."
 msgstr "Port kérése az operációs rendszertől"
 
-#: resources.h:686
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
 msgstr "A külső IP cím elkérése az operációs rendszertől"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr ""
 
@@ -1561,103 +1595,107 @@
 msgid "Associated program not found:"
 msgstr "A társított program nem található:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
 msgstr "Legalább egy szűrő feltétel nem érvényes."
 
-#: resources.h:705
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr "A hálózati beállításokhoz minden információ megadásra került."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
 msgstr "Attribútum"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 msgid "Authentication failed."
 msgstr "A hitelesítés nem sikerült"
 
-#: resources.h:872
+#: resources.h:890
 msgid "Author:"
 msgstr "Szerző:"
 
-#: resources.h:385
+#: resources.h:387
 msgid "Auto"
 msgstr "Automatikus"
 
-#: resources.h:822
+#: resources.h:838
 msgid "Automatic file type classification"
 msgstr "Fájltípusok automatikus besorolása"
 
-#: resources.h:939
+#: resources.h:957
 msgid "Automatic update check"
 msgstr "Automatikus frissítés keresés"
 
-#: resources.h:876
+#: resources.h:894
 msgid "Available sizes"
 msgstr "Elérhető méretek"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
 msgstr "Proxy kihagyása"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr ""
 
-#: resources.h:865
+#: resources.h:881
 msgid "Behaviour"
 msgstr "Működési mód"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr "Szerkesztés alatt"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
 msgstr ""
 
-#: resources.h:389
+#: resources.h:391
 msgid "Binary"
 msgstr "Bináris"
 
-#: resources.h:858
+#: resources.h:874
 msgid "Blackboard"
 msgstr "Blackboard"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Kedvenc mappa"
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
 msgstr "Kedvenc mappák:"
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
 msgstr "Kedvenc mappák"
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
 msgstr "Változat dátuma:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
 msgstr "Program változat"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
 msgstr ""
 
-#: resources.h:746
+#: resources.h:762
 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, "
@@ -1667,74 +1705,74 @@
 "kapcsolat létesítéséhez. Ha azt szeretné, hogy a FileZilla csak a portoknak "
 "egy kis tartományát használja, adja meg a port tartomány határait."
 
-#: resources.h:535
+#: resources.h:545
 msgid "C&ancel current operation"
 msgstr "Az aktuális művelet megszakítása"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Keresse a FileZilla napi programváltozatait is"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
 msgstr "Napló törlése"
 
-#: resources.h:586 resources.h:632
+#: resources.h:598 resources.h:648
 msgid "C&opy URL(s) to clipboard"
 msgstr "URL(ek) másolása a vágólapra"
 
-#: resources.h:880
+#: resources.h:898
 msgid "C&ustom"
 msgstr "Egyéni:"
 
-#: resources.h:935
+#: resources.h:953
 msgid "C&ustom filetype associations:"
 msgstr "Egyéni fájl társítások:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
 msgstr "A kiszolgáló időzónája eltolódásának számítása..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
 msgstr "A fájl nem olvasható"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:712
+#: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
 msgstr "Nem sikerült az adatok fájlba írása."
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Nem sikerült az adatok írása ebbe a fájlba: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Mégse"
 
-#: resources.h:982
+#: resources.h:1000
 msgid "Cancel current operation"
 msgstr "Az aktuális művelet megszakítása"
 
-#: resources.h:983
+#: resources.h:1001
 msgid "Cancels the current operation"
 msgstr "Az aktuális művelet megszakítása"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
 "A következő meghajtóhoz nem sikerült a hozzáférés: '%s', nincs adathordozó a "
 "meghajtóban, vagy a meghajtó nincs kész."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
 msgstr "Nem sikerült az állomás hozzáadása a Kedvenc Helyekhez"
 
@@ -1752,7 +1790,7 @@
 "A könyvtárak összehasonlítása nem lehetséges, a helyi és távoli mappákhoz "
 "különböző szűrők vannak engedélyezve."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
 msgstr ""
 "A könyvtárak összehasonlítása nem lehetséges, nincs kapcsolat kiszolgálóval."
@@ -1761,24 +1799,24 @@
 msgid "Cannot create new filter"
 msgstr "Az új szűrő nem hozható létre"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "A fájl nem szerkeszthető"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 #, fuzzy
 msgid "Cannot edit file, not connected to any server."
 msgstr ""
 "A könyvtárak összehasonlítása nem lehetséges, nincs kapcsolat kiszolgálóval."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1786,12 +1824,12 @@
 "FTP kapcsolat nem létesíthető az SFTP szerverrel. Kérem válasszon megfelelő "
 "protokollt."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "A Gyorskapcsolódás eszköztár nem tölthető be az erőforrás fájlból."
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
 msgstr "A fájl nem tölthető be, nem érvényes XML fájl."
 
@@ -1799,50 +1837,50 @@
 msgid "Cannot load keyfile"
 msgstr "A kulcsfájl nem betölthető"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
 msgstr "Az eszköztár nem tölthető be az erőforrás fájlból."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr "Többszörös név"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "A fájl átnevezés nem sikerült"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "A szűrőkészlet mentése nem sikerült"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "A kijelölt szűrő nem választható ki"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 #, fuzzy
 msgid "Cannot set file association"
 msgstr "Egyéni fájl társítások:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "A párbeszédpanel megjelenítése nem lehetséges"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 #, fuzzy
 msgid "Cannot view/edit selected file"
 msgstr "A kijelölt fájl megnyitása / szerkesztése nem sikerült"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
 msgstr "Kategóriák"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
 msgstr "A tanúsítvány és az adatkapcsolat adatai még nem érhetőek el."
 
@@ -1859,40 +1897,40 @@
 msgid "Certificate issuer"
 msgstr "Tanúsítvány kiállítója"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
 msgstr "Kérdés:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
 msgstr "Attribútumok módosítása"
 
-#: resources.h:589 resources.h:635
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
 msgstr "Fájl engedélyek módosítása"
 
-#: resources.h:956
+#: resources.h:974
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "A naplófájl beállítások módosításához a FileZilla újraindítása szükséges."
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
 msgstr "Karakter kódolási probléma"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr "Karakterkészlet"
 
-#: resources.h:944
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
 msgstr "Keresse a beta és release candidate verziókat is"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "Frissítések keresése..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "A FileZilla újabb verzióinak keresése"
 
@@ -1900,7 +1938,7 @@
 msgid "Check for updates"
 msgstr "Frissítések keresése"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
 msgstr "Nem sikerült a frissítések keresése"
 
@@ -1908,7 +1946,7 @@
 msgid "Checking for correct external IP address"
 msgstr "A helyes külső IP cím ellenőrzése"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "Frissítések keresése"
 
@@ -1916,13 +1954,13 @@
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
 msgstr "Válassza ki az alapértelmezett helyi mappát"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
 msgstr "Válassza ki a helyi mappát"
 
@@ -1934,50 +1972,54 @@
 msgid "Cipher:"
 msgstr "Blokk kódolás:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
 msgstr ""
 
-#: resources.h:855
+#: resources.h:871
 msgid "Classic"
 msgstr "Klasszikus"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
 msgstr "Kedvenc Helyek bejegyzéseinek törlése"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
 msgstr "Elrendezés gyorsítótár törlése"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
 msgstr "Gyorskapcsolódás előzmények törlése"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "Újracsatlakozás adatok törlése"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "Átviteli várólista törlése"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Előzmények törlése"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
 msgstr "Személyes adatok törlése"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Beírt címadatok törlése"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Kattintson a Befejezés gombra a beállítások mentéséhez."
@@ -1986,20 +2028,20 @@
 msgid "Click on next to download the new version."
 msgstr "Kattintson a Következő gombra az új verzió letöltéséhez."
 
-#: resources.h:346
+#: resources.h:348
 msgid "Client to server MAC:"
 msgstr "Üzenethitelesítés kódolása a klienstől a szerver felé:"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr "Blokk kódolás a klienstől a szerver felé:"
 
-#: resources.h:661
+#: resources.h:677
 msgid "Close &all other tabs"
 msgstr ""
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "A FileZilla bezárása"
 
@@ -2007,24 +2049,24 @@
 msgid "Close all running instances of FileZilla"
 msgstr "A FileZilla minden példányának bezárása"
 
-#: resources.h:496
+#: resources.h:505
 #, fuzzy
 msgid "Closes current tab"
 msgstr "Egyidejű kapcsolatok"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "Megjegyzések:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr "Oszlopok tulajdonsága"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
 msgstr "Oszlopok beállítása"
 
-#: resources.h:930
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
 msgstr "Az idézőjelek közötti elérési utat követik az argumentumok."
 
@@ -2043,8 +2085,8 @@
 msgstr "Ezt a parancsot ez a protokoll nem támogatja."
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Parancs:"
@@ -2053,7 +2095,7 @@
 msgid "Comment"
 msgstr "Megjegyzés"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
 msgid "Common name:"
 msgstr "Rövid név:"
 
@@ -2062,15 +2104,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Az adatkapcsolatot a router vagy tűzfal sérültté teszi"
 
-#: resources.h:513 resources.h:639
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
 msgstr "Összehasonlítás a módosítás ideje alapján"
 
-#: resources.h:512 resources.h:638
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
 msgstr "Összehasonlítás a fájlméret alapján"
 
-#: resources.h:910
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
 msgstr "Időkülönbségi küszöb a könyvtár összehasonlításhoz (percben):"
 
@@ -2079,61 +2121,61 @@
 msgstr ""
 "Az időkülönbségi küszöb értékének 0 és 1440 perc közöttinek kell lennie."
 
-#: resources.h:159
+#: resources.h:160
 msgid "Compiled for:"
 msgstr "Célplatform:"
 
-#: resources.h:160
+#: resources.h:161
 msgid "Compiled on:"
 msgstr "Fordító platform:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
 msgstr "Fordító:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
 msgstr "Kapcsolók:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr "Tömörített"
 
-#: resources.h:796
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr "Egyidejű kapcsolatok"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr "Kis- és nagybetűk megkülönböztetése a szabályok alkalmazásakor"
 
-#: resources.h:704
+#: resources.h:720
 msgid "Configuration test"
 msgstr "Beállítások tesztje"
 
-#: resources.h:678
+#: resources.h:694
 msgid "Configure passive mode"
 msgstr "Passzív mód beállítása"
 
-#: resources.h:694
+#: resources.h:710
 msgid "Configure port range"
 msgstr "Port tartomány beállítása"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1033
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Megerősítés szükséges"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Megerősítés szükséges"
 
@@ -2141,7 +2183,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Gratulálunk, úgy tűnik a hálózati beállítás megfelelően működik."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Csatlakozás a proxybeállítások kihagyásával"
 
@@ -2149,16 +2191,16 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Csatlakozás megadott kedvenc állomáshoz"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "A csatlakozás sikerült"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "Csatlakozás"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
 msgstr "Csatlakozás a következő kiszolgálóhoz: %s"
@@ -2184,7 +2226,7 @@
 msgid "Connection"
 msgstr "Kapcsolat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
 msgstr "A csatlakozási kísérlet nem sikerült"
 
@@ -2210,11 +2252,11 @@
 msgstr "A kapcsolat bezáródott."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
 msgstr "A kiszolgáló bezárta a kapcsolatot."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Az adatkapcsolat létrejött, a TLS inicializálása..."
@@ -2223,7 +2265,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Az adatkapcsolat létrejött, HTTP kérés küldése"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
 msgstr "Az adatkapcsolat létrejött, várakozás az üdvözlő üzenetre..."
 
@@ -2247,7 +2289,7 @@
 msgid "Connection timed out."
 msgstr "Időtúllépés a kapcsolatban."
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:676
 #, fuzzy
 msgid "Connection to server lost."
 msgstr "Csatlakozás a kiszolgálóhoz"
@@ -2268,23 +2310,23 @@
 msgid "Convert keyfile"
 msgstr "Kulcsfájl konvertálása"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "Másolás"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "(%d) másolása: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr "%s másolata"
 
-#: resources.h:587 resources.h:633
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr ""
 
@@ -2293,8 +2335,8 @@
 msgid "Could not accept connection: %s"
 msgstr "A kapcsolat elfogadása nem sikerült: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
 msgstr "Nem sikerült a kapcsolat hozzáadása a Kedvenc Helyekhez"
 
@@ -2307,7 +2349,7 @@
 msgid "Could not connect to server: %s"
 msgstr "A kiszolgálóhoz nem sikerült a csatlakozás: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 msgid "Could not convert command to server encoding"
 msgstr "Nem sikerült a parancs konvertálása a szerver kódolásához"
 
@@ -2316,19 +2358,19 @@
 msgid "Could not convert private key"
 msgstr "A titkos kulcs konvertálása nem sikerült"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not copy URLs"
 msgstr "A kiszolgálóhoz nem sikerült a csatlakozás"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 #, fuzzy
 msgid "Could not copy data"
 msgstr "Az IO szál elágaztatása nem sikerült"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 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 "
@@ -2338,11 +2380,11 @@
 "A keretprogramba való beépülés nincsen megfelelően telepítve, vagy a "
 "fájlokat nem egy Intéző ablakba húzta bele."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
 msgstr "Nem létesíthető kapcsolat a kiszolgálóhoz"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2353,23 +2395,23 @@
 "A FileZilla adatkönyvtárát beállíthatja a '--datadir <elérési út>' "
 "parancssori kapcsolóval, vagy az FZ_DATADIR környezeti változó beállításával."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 msgid "Could not generate custom login sequence."
 msgstr "Nem sikerült az egyéni bejelentkezési parancssorozat létrehozása."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1015
 #, fuzzy
 msgid "Could not get full remote path."
 msgstr "A távoli mappa elérési útja nem elemezhető."
@@ -2379,24 +2421,24 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Nem sikerült választ kapni az fzputtygen alkalmazástól."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 "Nem sikerült az ideiglenes mappa lekérdezése vagy létrehozása a fájl "
 "letöltéséhez."
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
@@ -2415,7 +2457,7 @@
 msgid "Could not load private key"
 msgstr "A titkos kulcs nem betölthető"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1041
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2439,9 +2481,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not open clipboard"
 msgstr "Másolás a vágólapra"
@@ -2453,29 +2495,29 @@
 msgid "Could not open log file: %s"
 msgstr "A naplófájl nem nyitható meg: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
 msgstr "A távoli mappa elérési útja nem elemezhető."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "A kiszolgáló címe nem elemezhető:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "A szoftvercsatornából történő olvasás nem sikerült: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
 msgstr "Az állomás bejegyzés nem olvasható."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "A fájlon belüli %s eltolás pozícionálása nem sikerült"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
 msgstr "A fájl végének pozícionálása nem sikerült"
 
@@ -2483,7 +2525,7 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Nem sikerült a parancs küldése az fzputtygen alkalmazásnak."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
 msgstr "Az IO szál elágaztatása nem sikerült"
 
@@ -2492,13 +2534,13 @@
 msgid "Could not start proxy handshake: %s"
 msgstr "A kapcsolategyeztetés a proxy-val nem indítható: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
 msgstr "Az átvitel nem indítható el"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2507,7 +2549,7 @@
 "A következő fájl nem írható: \"%s\" A Kedvenc Helyek módosításai nem "
 "menthetőek: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
 msgstr ""
@@ -2516,7 +2558,7 @@
 "A várólista adatai nem menthetőek.\n"
 "%s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr ""
@@ -2525,8 +2567,7 @@
 "A várólista adatai nem menthetőek.\n"
 "%s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2535,16 +2576,16 @@
 "A következő fájl nem írható: \"%s\" A várólista adatai nem menthetőek.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "A következő fájl nem írható: \"%s\" A kijelölt állomások nem exportálhatóak: "
 "%s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "A következő fájl nem írható: \"%s\": %s"
@@ -2554,7 +2595,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "A kulcsfájl írása nem sikerült: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
 msgstr "Nem sikerült a helyi fájl írása"
 
@@ -2570,33 +2611,48 @@
 msgid "Could not write to socket: %s"
 msgstr "A szoftvercsatornába történő írás nem sikerült: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr "Ország:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "A FileZilla azonnali összeomlasztása. Kizárólag a kivételkezelő "
 "hibakeresésénél használatos."
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "Az új szűrő nem hozható létre"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
 msgstr "Új könyvtár létrehozása a jelenlegi mappában"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Új könyvtár létrehozása a jelenlegi mappában"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "Könyvtár létrehozása"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "A fájl nem szerkeszthető"
+
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
 msgstr "Mappa létrehozása"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Mappa létrehozása: '%s'..."
@@ -2622,19 +2678,19 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
 msgstr "Az átvitel típusa jelenleg ASCII-ra van állítva."
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr "Az átvitel típusa jelenleg automatikusra van állítva."
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr "Az átvitel típusa jelenleg binárisra van állítva."
 
-#: resources.h:767 resources.h:886
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr "Egyéni:"
 
@@ -2642,40 +2698,45 @@
 msgid "Custom filter set"
 msgstr "Egyéni szűrőkészlet"
 
-#: resources.h:375 resources.h:376
+#: resources.h:377 resources.h:378
 msgid "Custom server"
 msgstr "Egyéni kiszolgáló"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
 msgstr "Átvitel típusa"
 
-#: resources.h:893
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Decimális előtagok SI mértékegységekkel (pl. 1 KB = 1000 byte)"
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "Alapértelmezett"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "Törlés"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
 msgstr "Mind tiltása"
 
-#: resources.h:917
+#: resources.h:882
+#, fuzzy
+msgid "D&o not save passwords"
+msgstr "Jelszó megadása"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
 msgstr "Dupla kattintás könyvtárakra:"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-szerű virtuális elérés"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "Veszélyes fájltípus"
 
@@ -2688,7 +2749,12 @@
 msgid "Data socket closed too early."
 msgstr "Az adatcsatorna a vártnál korábban záródott be."
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#, fuzzy
+msgid "Date"
+msgstr "Adat"
+
+#: resources.h:895
 msgid "Date formatting"
 msgstr "Dátum formátuma"
 
@@ -2696,10 +2762,10 @@
 msgid "Date/time format"
 msgstr "Dátum/idő formátum"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Dátum/idő ismeretlen"
 
@@ -2707,15 +2773,15 @@
 msgid "Debug"
 msgstr "Hibakeresés"
 
-#: resources.h:957
+#: resources.h:975
 msgid "Debugging settings"
 msgstr "Hibakeresés beállítások"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
 msgstr "Alapértelmezett helyi mappa:"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
 msgstr "Alapértelmezett (Automatikus)"
 
@@ -2723,15 +2789,15 @@
 msgid "Default editor not properly quoted."
 msgstr "Az alapértelmezett szerkesztő nincs megfelelően idézőjelezve."
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
 msgstr "Fájl felülírás beállítása"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
 msgstr "Alapértelmezett távoli mappa:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 #, fuzzy
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
@@ -2744,15 +2810,15 @@
 msgid "Default system language"
 msgstr "Alapértelmezett rendszernyelv"
 
-#: resources.h:672
+#: resources.h:688
 msgid "Default transfer mode:"
 msgstr "Alapértelmezett átviteli mód:"
 
-#: resources.h:818
+#: resources.h:834
 msgid "Default transfer type:"
 msgstr "Átvitel alapértelmezett típusa:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Alapértelmezett: http://ip.filezilla-project.org/ip.php"
 
@@ -2763,7 +2829,7 @@
 "A sikertelen bejelentkezési kísérletek közötti késleltetésnek 1 és 999 "
 "másodperc közöttinek kell lennie."
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, fuzzy, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2776,58 +2842,58 @@
 msgstr[1] ""
 "Csatlakozás késleltetése az előző sikertelen csatlakozási kísérlet miatt..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
 msgstr "Kedvenc állomás törlése"
 
-#: resources.h:629 resources.h:650
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
 msgstr "Kijelölt mappa törlése"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
 msgstr "Kijelölt mappák és fájlok törlése"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 #, fuzzy
 msgid "Deleting directories"
 msgstr "Mappa létrehozása"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "Asztal"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Részletek"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "Az új kulcs részletei:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "Mappákra"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Irány"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
+#: ../../locales/../src/interface/filelistctrl.cpp:523
 msgid "Directory"
 msgstr "Könyvtár"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
+#: resources.h:652 resources.h:926 resources.h:1009
+#: ../../locales/../src/interface/filelistctrl.cpp:445
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
 msgstr "Könyvtárak összehasonlítása"
 
@@ -2847,11 +2913,11 @@
 msgid "Directory listing aborted by user"
 msgstr "A könyvtár listázást a felhasználó megszakította"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
 msgstr "A könyvtár listázás nem sikerült"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
 msgstr "Könyvtár listázás szűrése"
 
@@ -2859,18 +2925,18 @@
 msgid "Directory listing successful"
 msgstr "A könyvtár listázás sikerült"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "Mind tiltása"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Kívánja a szinkronizált böngészést kikapcsolni és a távoli mappaváltást "
 "folytatni?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2878,18 +2944,18 @@
 "Kapcsolja ki ezt a beállítást, amennyiben nem látja a mappa tartalmát "
 "megfelelően."
 
-#: resources.h:984
+#: resources.h:1002
 msgid "Disconnect from server"
 msgstr "Kapcsolat bontása"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "Kapcsolat bontódott a kiszolgálóval"
 
@@ -2899,24 +2965,24 @@
 msgid "Disconnected from server: %s"
 msgstr "Kapcsolat bontódott a kiszolgálóval: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1429
+#: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
 msgstr "Kapcsolat bontása az előző kiszolgálóról"
 
-#: resources.h:985
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
 msgstr "Kapcsolat bontása"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "A FileZilla névjegye"
 
-#: resources.h:926
+#: resources.h:944
 msgid "Do &not use default editor"
 msgstr "Ne használjon alapértelmezett szerkesztőt"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "Nincs művelet"
 
@@ -2930,85 +2996,85 @@
 "Hacsak nem kívánja tesztelni az új funkciókat, használja inkább a stabil "
 "verziókat."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
 msgstr "Biztosan bezárja a FileZilla-t?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
 "Biztos benne, hogy törölni szeretné az összes kedvenc állomás bejegyzést és "
 "az átviteli várólista tartalmát?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr ""
 "Biztos benne, hogy törölni szeretné az összes kedvenc állomás bejegyzést?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
 msgstr "Biztos benne, hogy törölni szeretné a kijelölt elemet?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Biztos benne, hogy törölni szeretné átviteli várólista tartalmát?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Biztosan el szeretné küldeni a(z) '%s' parancsot a kiszolgálónak?"
 
-#: resources.h:465
+#: resources.h:467
 #, fuzzy
 msgid "Documentation"
 msgstr "Dokumentumok"
 
-#: resources.h:693
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
 msgstr "Ne használja a külső IP címet helyi kapcsolatok esetén."
 
-#: resources.h:829
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "A dot fájlok nevei ponttal kezdődnek, pl: .htaccess."
 
-#: resources.h:911
+#: resources.h:929
 msgid "Double-click action"
 msgstr "Dupla kattintás művelete"
 
-#: resources.h:361
+#: resources.h:363
 msgid "Download"
 msgstr "Letöltés"
 
-#: resources.h:481 resources.h:805
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
 msgstr "Letöltés korlátozása:"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
+#: ../../locales/../src/interface/statusbar.cpp:604
 #, fuzzy, c-format
 msgid "Download limit: %s/s"
 msgstr "Letöltés korlátozása:"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
+#: ../../locales/../src/interface/statusbar.cpp:606
 #, fuzzy
 msgid "Download limit: none"
 msgstr "Letöltés korlátozása:"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 msgid "Download search results"
 msgstr "Keresési találatok letöltése"
 
-#: resources.h:623
+#: resources.h:639
 msgid "Download selected directory"
 msgstr "Kijelölt mappa letöltése"
 
-#: resources.h:573
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "Kijelölt mappák és fájlok letöltése"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "Letöltés"
 
@@ -3018,20 +3084,20 @@
 msgid "Downloading %s"
 msgstr "A következő letöltése: %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Több különálló mappa letöltése jelenleg még nem támogatott"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 #, fuzzy
 msgid "Downloading search results"
 msgstr "A következő letöltése: %s"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
@@ -3039,67 +3105,61 @@
 "Az áthúzás művelet a FileZilla különböző példányai között még nincs "
 "megvalósítva."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Az áthúzás művelet különböző kiszolgálók között még nincs megvalósítva."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Többszörös szűrőnév"
-
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "Mind engedélyezése"
 
-#: resources.h:559 resources.h:576
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
 msgstr "Belépés a mappába"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "Végrehajtás"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "Kilépés"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
 msgstr "Minden szűrőnek legalább egy szabállyal kell rendelkeznie."
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
 msgstr "Szűrő szabályok szerkesztése"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "A fájl szerkesztése a beállított szerkesztővel és a módosítások feltöltése a "
 "szerverre."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 #, fuzzy
 msgid "Editing failed"
 msgstr "A megnyitás nem sikerült"
 
-#: resources.h:874
+#: resources.h:892
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
 msgstr "Üres parancs"
 
@@ -3107,7 +3167,7 @@
 msgid "Empty command."
 msgstr "Nincs megadva parancs."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
 msgstr "Üres mappa"
 
@@ -3133,50 +3193,50 @@
 msgid "Empty quoted string."
 msgstr "Üres idézőjeles karakterlánc."
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "Mind engedélyezése"
 
-#: resources.h:814
+#: resources.h:830
 #, fuzzy
 msgid "Enable invalid character &filtering"
 msgstr "A szűrő érvényesítése nem sikerült"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr "Titkosított"
 
-#: resources.h:343
+#: resources.h:345
 msgid "Encryption"
 msgstr "Titkosítás"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
 msgstr "Titkosítás részletei"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
 msgstr ""
 "Szeretné az összehasonlítást kikapcsolni és a rendezés sorrendjét módosítani?"
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "Egyéni parancs beírása..."
 
-#: resources.h:485
+#: resources.h:487
 #, fuzzy, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Szűrőkészlet név megadása"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
 msgstr "Parancs megadása"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
 msgstr "Egyéni parancs beírása"
 
-#: resources.h:918
+#: resources.h:936
 msgid "Enter directory"
 msgstr "Belépés a mappába"
 
@@ -3186,24 +3246,24 @@
 msgid "Enter filter name"
 msgstr "Szűrőnév megadása"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Szűrőkészlet név megadása"
 
-#: ../../locales/../src/interface/filter.cpp:390
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Új szűrőkészlet név megadása"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
 msgstr "Jelszó megadása"
 
-#: resources.h:560 resources.h:577
+#: resources.h:570 resources.h:587
 #, fuzzy
 msgid "Enter selected directory"
 msgstr "Kijelölt mappa törlése"
 
-#: resources.h:713
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3230,7 +3290,7 @@
 "Vegye figyelembe, hogy az átkonvertált kulcsfájl nem lesz jelszó által "
 "védett."
 
-#: resources.h:717
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3246,53 +3306,61 @@
 msgid "Error exporting settings"
 msgstr "Exportálási hiba"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
 msgstr "Importálási hiba"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
+#: ../../locales/../src/interface/QueueView.cpp:2052
+#, fuzzy
+msgid "Error loading queue"
+msgstr "Hiba az xml fájl betöltésekor"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "Hiba az xml fájl betöltésekor"
 
+#: ../../locales/../src/interface/QueueView.cpp:1951
+#, fuzzy
+msgid "Error saving queue"
+msgstr "Hiba az xml fájl betöltésekor"
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr "Hiba a program futtatásakor"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "Hiba az xml fájl írásakor"
 
@@ -3307,26 +3375,26 @@
 msgstr "Ez a szűrőkészlet nem távolítható el."
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Hiba:"
 
-#: resources.h:477
+#: resources.h:479
 #, fuzzy
 msgid "Establish connection in a new tab"
 msgstr "Nem létesíthető kapcsolat a kiszolgálóhoz"
 
-#: resources.h:937
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Például: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:896
+#: resources.h:914
 msgid "Examples"
 msgstr "Példák"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "Végrehajtás"
 
@@ -3334,47 +3402,58 @@
 msgid "Executable"
 msgstr "Program"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "A program nem tartalmaz verzió információt, a frissítések keresése nem "
 "lehetséges."
 
-#: resources.h:856
+#: resources.h:872
 msgid "Explorer"
 msgstr "Intéző-szerű"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "Átviteli várólista exportálása"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "Beállítások exportálása"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
 msgstr "Exportálás beállításai"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
 msgstr "Szűrő neve:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Az FTP programmotor nem inicializálódott, nem lehetséges a csatlakozás"
 
-#: resources.h:741
+#: resources.h:757
 msgid "FTP Keep-alive"
 msgstr "FTP Ébrentartás"
 
-#: resources.h:761
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP Proxy"
@@ -3383,7 +3462,7 @@
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:669
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3391,25 +3470,25 @@
 "Az FTP protokoll az adatok átvitelére másodlagos kapcsolati szálat használ. "
 "Ez a járulékos adatkapcsolat kétféle módon létesíthető."
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr "FTPES - FTP explicit TLS/SSL felett"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP implicit TLS/SSL felett"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Mappaváltás nem sikerült"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 msgid "Failed to change language"
 msgstr "A nyelv módosítása nem sikerült"
@@ -3418,11 +3497,11 @@
 msgid "Failed to check for newer version of FileZilla."
 msgstr "A FileZilla frissítéseinek keresése nem sikerült."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
 msgstr "Nem sikerült az állomásokat másolni vagy mozgatni"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr "Az xml fájl biztonsági másolata nem hozható létre."
 
@@ -3430,8 +3509,8 @@
 msgid "Failed to create listen socket, aborting"
 msgstr "A figyelő szoftvercsatorna létrehozása nem sikerült, megszakítás"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "A figyelő szoftvercsatorna létrehozása nem sikerült az aktív módú átvitelhez"
@@ -3440,11 +3519,11 @@
 msgid "Failed to download the latest version of FileZilla."
 msgstr "A FileZilla legfrissebb változatának letöltése nem sikerült."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:665
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
 msgstr "Nem sikerült a 'Dokumentumok' mappa elérési útjának lekérdezése"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:651
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
 msgstr "Nem sikerült az asztal elérési útjának lekérdezése"
 
@@ -3464,8 +3543,8 @@
 msgid "Failed to initialize FTP engine"
 msgstr "Nem sikerült az FTP programmotor inicializálása"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "A TLS inicializálása nem sikerült."
@@ -3479,23 +3558,28 @@
 msgid "Failed to load private key: %s"
 msgstr "A titkos kulcs betöltése nem sikerült: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "A következőt nem sikerült hozzáfűzésre / írásra megnyitni: \"%s\""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "A következőt nem sikerült olvasásra megnyitni: \"%s\""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "A következőt nem sikerült írásra megnyitni: \"%s\""
 
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+#, fuzzy
+msgid "Failed to parse returned path."
+msgstr "A távoli mappa elérési útja nem elemezhető."
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr ""
@@ -3512,11 +3596,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "A külső IP cím lekérdezése nem sikerült, megszakítás."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "A külső IP cím lekérdezése nem sikerült, a helyi IP cím használata"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
 msgstr "A helyi IP cím lekérdezése nem sikerült."
 
@@ -3532,14 +3616,14 @@
 msgid "Failed to send command."
 msgstr "Nem sikerült a parancs küldése."
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
+#: ../../locales/../src/interface/FileZilla.cpp:267
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer "
 "nyelv használata"
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3547,14 +3631,14 @@
 "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer "
 "nyelv (%s, %s) használata."
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
+#: ../../locales/../src/interface/FileZilla.cpp:240
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "A(z) %s (%s) nyelv beállítása nem sikerült, az alapértelmezett rendszer "
 "nyelv használata."
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3562,14 +3646,14 @@
 "A(z) %s nyelv beállítása nem sikerült, az alapértelmezett rendszer nyelv "
 "használata"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:248
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "A(z) %s nyelv beállítása nem sikerült, az alapértelmezett rendszer nyelv (%"
 "s, %s) használata."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:237
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3580,7 +3664,7 @@
 msgid "Failed to validate settings"
 msgstr "A beállítások érvényesítése nem sikerült"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:896
 #, fuzzy
 msgid "Failed to verify peer certificate"
 msgstr "Az adatok fogadása nem sikerült"
@@ -3590,29 +3674,29 @@
 msgid "Failed to write to file %s"
 msgstr "Nem sikerült az írás a következő fájlba: %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "Az xml fájl írása nem sikerült."
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Sikertelen átvitelek"
 
-#: resources.h:684
+#: resources.h:700
 msgid "Fall back to active mode"
 msgstr "Áttérés aktív módra"
 
-#: resources.h:368
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "Fájlnév:"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "Fájlokra"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:500
+#: ../../locales/../src/interface/filelistctrl.cpp:518
+#: ../../locales/../src/interface/filelistctrl.cpp:527
 msgid "File"
 msgstr "Fájl"
 
@@ -3620,7 +3704,7 @@
 msgid "File Types"
 msgstr "Fájltípusok"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
 msgstr "A kiválasztott fájl nem tartalmaz semmilyen importálható adatot."
 
@@ -3628,7 +3712,7 @@
 msgid "File editing"
 msgstr "Fájl szerkesztés"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "A fájl már létezik"
 
@@ -3636,7 +3720,7 @@
 msgid "File exists action"
 msgstr "Fájl felülírás"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
 msgstr "Módosított fájl"
 
@@ -3644,14 +3728,14 @@
 msgid "File lists"
 msgstr "Fájl listázás"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "Fájl nem található"
 
-#: resources.h:995
+#: resources.h:1013
 msgid "File search"
 msgstr "Távoli fájlok rekurzív keresése a kiszolgálón"
 
@@ -3689,25 +3773,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "A fájl átvitel sikerült"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
 msgstr "A fájl átvitelek folyamatban vannak."
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr "A fájlátvitel ASCII típusú lesz."
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr "A fájlátvitel bináris típusú lesz."
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla Hiba"
 
-#: resources.h:706
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3715,14 +3799,20 @@
 "A továbbiakban a kialakított beállításokat tesztelheti annak ellenőrzésére, "
 "hogy minden megfelelően működik-e."
 
-#: resources.h:476
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 #, fuzzy
 msgid "FileZilla is already connected to a server."
 msgstr ""
 "A könyvtárak összehasonlítása nem lehetséges, nincs kapcsolat kiszolgálóval."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
@@ -3730,67 +3820,74 @@
 "A FileZilla biztonságos módban fut (a jelszavak nem íródnak a lemezre).\n"
 "A 'Normál' és 'Fiókos' bejelentkezési típus ebben a módban nem elérhető."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "A FileZilla újraindítása szükséges a nyelv módosítás érvénybe léptetéséhez."
 
-#: resources.h:516
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "Fájlpanel állapotsor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Fájlnév"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "Könyvtár listázás szűrése..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "A fájlnév elérési útja nem építhető fel ezzel a könyvtárral: %s, és ezzel az "
 "fájlnévvel: %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "Érvénytelen fájlnév"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"A fájlnév nem tartalmazhatja a következő karaktereket: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "A fájlnév változatlan"
 
-#: resources.h:306 resources.h:950
+#: resources.h:308 resources.h:968
 msgid "Filename:"
 msgstr "Fájlnév:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "A fájlnév nem tartalmazhatja a következő karaktereket: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "A fájlnév nem tartalmazhatja a következő karaktereket: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "Jelenleg szerkesztett fájlok"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "Fájlméret"
 
@@ -3798,51 +3895,54 @@
 msgid "Filesize format"
 msgstr "Fájlméret formátum"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Fájltípus"
 
-#: resources.h:938
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Fájltípus társítások"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "A szűrő vonatkozik:"
 
-#: resources.h:813
+#: resources.h:829
 #, fuzzy
 msgid "Filter invalid characters in filenames"
 msgstr "A szűrő érvényesítése nem sikerült"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
 msgstr "A szűrőnév már létezik"
 
-#: resources.h:220
+#: resources.h:222
 msgid "Filter out items matching all of the following"
 msgstr ""
 "Azon elemek kiszűrése, amelyek az alábbi szabályok mindegyikének megfelelnek"
 
-#: resources.h:221
+#: resources.h:223
 msgid "Filter out items matching any of the following"
 msgstr ""
 "Azon elemek kiszűrése, amelyek az alábbi szabályok bármelyikének megfelelnek"
 
-#: resources.h:222
+#: resources.h:224
 msgid "Filter out items matching none of the following"
 msgstr ""
 "Azon elemek kiszűrése, amelyek az alábbi szabályok egyikének sem felelnek meg"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Többszörös szűrőkészlet név"
 
-#: resources.h:988
+#: resources.h:1006
 msgid "Filter the directory listings"
 msgstr "Könyvtár listázás szűrése"
 
@@ -3860,7 +3960,7 @@
 msgid "Fingerprint (SHA-1):"
 msgstr "Ujjlenyomat (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr "Ujjlenyomat:"
 
@@ -3868,7 +3968,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Hálózati beállítások varázsló"
 
-#: resources.h:724
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3876,12 +3976,12 @@
 "Futtassa a Hálózati beállítások varázslót, amennyiben részletes "
 "információkra kíváncsi az itt megjelenő hálózati beállításokkal kapcsolatban."
 
-#: resources.h:701
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "A megbízhatóság érdekében, legalább 10 portos tartományt javasolt megadni."
 
-#: ../../locales/../src/interface/Options.cpp:194
+#: ../../locales/../src/interface/Options.cpp:215
 #, fuzzy
 msgid ""
 "For this session the default settings will be used. Any changes to the "
@@ -3892,29 +3992,29 @@
 "Erre a munkamenetre az alapértelmezett beállítások lesznek érvényben, és "
 "beállítások módosításai nem állandóak."
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
 msgstr "UTF-8 kényszerítése"
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr "Rejtett fájlok megjelenítése"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
 msgstr "Rejtett fájlok megjelenítésének kényszerítése"
 
-#: resources.h:768
+#: resources.h:784
 msgid "Format specifications:"
 msgstr "Formátum specifikációk:"
 
-#: resources.h:936
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formátum: A kiterjesztést követi idézőjelek között az elérési út, majd az "
 "argumentumok."
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
 msgstr ""
 
@@ -3926,62 +4026,62 @@
 msgid "General SOCKS server failure"
 msgstr "Általános SOCKS szerver hiba"
 
-#: resources.h:786
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Általános proxy"
 
-#: resources.h:690
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
 msgstr "Külső IP cím lekérdezése az alábbi URL-ről:"
 
-#: resources.h:469
+#: resources.h:471
 #, fuzzy
 msgid "Getting help"
 msgstr "Online súgó..."
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "A megadott szűrőkészlet név már létezik. Szeretné felülírni a szűrőkészletet?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr "Globális kedvenc mappák"
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "Csoport engedélyek"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
 msgstr "Magas"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 #, fuzzy
 msgid "HTTPS - HTTP over TLS"
 msgstr "FTPS - FTP implicit TLS/SSL felett"
 
-#: resources.h:339
+#: resources.h:341
 msgid "Hash:"
 msgstr "Ujjlenyomat típus:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr "Rejtett"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Magas"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Legmagasabb"
 
@@ -3990,26 +4090,26 @@
 msgstr ""
 "A legmagasabb elérhető portnak 1024 és 65535 közötti számnak kell lennie."
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Tartsa a shift billentyűt lenyomva a szűrők állapotának mindkét oldali "
 "változtatásához."
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr "Honlap:"
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr "Címkulcs ujjlenyomata:"
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "Címkulcs eltérés"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 "A cím '[' szögletes zárójellel kezdődik, de a zárójel másik fele nem "
@@ -4019,20 +4119,20 @@
 msgid "Host unreachable"
 msgstr "A cím nem elérhető"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "Cím:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "Óra,"
 
-#: resources.h:885
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "ISO 8601 (példa: 15:47)"
 
-#: resources.h:728
+#: resources.h:744
 #, fuzzy
 msgid ""
 "If no data is sent or received during an operation for longer than the "
@@ -4042,13 +4142,13 @@
 "Amennyiben ezidő alatt nem történik adatátvitel, a FileZilla bezárja a "
 "kapcsolatot, és megpróbál újracsatlakozni."
 
-#: resources.h:966
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Amennyiben hibaleírást szeretne küldeni, a napló legalább \"Részletes\" "
 "szintű legyen."
 
-#: resources.h:681
+#: resources.h:697
 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 "
@@ -4061,7 +4161,7 @@
 "kipróbálása. Az átviteli módot szerverenként külön-külön lehet állítani a "
 "Kedvenc Helyek-ben."
 
-#: resources.h:676
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4070,7 +4170,7 @@
 "rosszul beállított kiszolgálókhoz is, amelyek visszautasítják a kiválasztott "
 "átviteli módot."
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4094,7 +4194,7 @@
 "Amennyiben a probléma folyamatosan fennáll, forduljon a router vagy a tűzfal "
 "gyártójához segítségért."
 
-#: resources.h:955
+#: resources.h:973
 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 "
@@ -4104,7 +4204,7 @@
 "\" adódik hozzá (esetleg felülírva a régebbi naplófájlt), és egy új "
 "naplófájl jön létre."
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4122,7 +4222,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Amennyiben a probléma megmarad, forduljon a router gyártójához."
 
-#: resources.h:277 resources.h:850
+#: resources.h:279 resources.h:866
 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 "
@@ -4133,7 +4233,7 @@
 "idő eltér (pl. különböző időzónák), akkor adja meg a kiszolgáló időzónájának "
 "időeltolódását a Kedvenc Helyek speciális beállításánál."
 
-#: resources.h:909
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4142,11 +4242,11 @@
 "fájlt tekintse azonosnak, ha az időkülönbség nem haladja meg az alábbi "
 "értéket."
 
-#: resources.h:924
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Ha nyelvet módosít, a FileZilla újraindítása szükséges."
 
-#: resources.h:707
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4154,22 +4254,22 @@
 "Ha a Teszt gombra kattint, a FileZilla a 'probe.filezilla-project.org' címre "
 "csatlakozik, és néhány egyszerű tesztet hajt végre."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Ha bezárja a FileZilla-t, a módosítások el fognak veszni."
 
-#: resources.h:826
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "Ha rossz fájltípust ad meg, azok az átvitel során meghibásodhatnak."
 
-#: resources.h:708
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "Ha a teszt eredménye hibával végződik, akkor a beállítások nem megfelelőek."
 
-#: resources.h:740
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4188,7 +4288,7 @@
 "az esetben próbálja meg az átviteli mód (aktív/passzív) átkapcsolását, vagy "
 "forduljon a kiszolgáló rendszergazdájához segítségért."
 
-#: resources.h:667
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4196,7 +4296,7 @@
 "Ha a varázsló lépéseit sikeresen elvégzi és a végső teszt sikeres, akkor a "
 "tűzfalak és router-ek is megfelelően vannak beállítva."
 
-#: resources.h:703
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4204,7 +4304,7 @@
 "Amennyiben tűzfalat használ, ügyeljen arra, hogy a FileZilla bejövő "
 "kapcsolatokat tudjon fogadni a megadott tartomány minden portján."
 
-#: resources.h:702
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4221,16 +4321,16 @@
 "Amennyiben a router továbbra is módosítja az IP címet, forduljon a router "
 "gyártójához."
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Importálás régebbi verzióból"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
 msgstr "Importálás beállításai"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
 msgstr "Sikeres importálás"
 
@@ -4239,7 +4339,7 @@
 msgid "Improperly quoted association."
 msgstr "A társítás nincs megfelelően idézőjelezve."
 
-#: resources.h:695
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4248,7 +4348,7 @@
 "e adatkapcsolat létesítése. Meg kell adnia, hogy a FileZilla mely portokat "
 "használhatja."
 
-#: resources.h:697
+#: resources.h:713
 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."
@@ -4257,7 +4357,7 @@
 "továbbítania kell, mivel a FileZilla nincs hatással arra, hogy az operációs "
 "rendszer milyen portot választ."
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4265,7 +4365,7 @@
 "Ha jobban kedveli az automatikus frissítéseket, akkor engedélyezheti azt a "
 "beállításokban."
 
-#: resources.h:685 resources.h:749
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4273,7 +4373,7 @@
 "Az aktív mód használatához, a külső IP cím ismerete szükséges a FileZilla "
 "számára."
 
-#: resources.h:670
+#: resources.h:686
 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 "
@@ -4283,23 +4383,27 @@
 "kiszolgálótól kér egy portot, és az adott porthoz csatlakozik. Ehhez nem "
 "szükséges bonyolult konfiguráció."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
 msgstr "Helytelen jelszó"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr "TLS inicializálása..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktív"
 
@@ -4308,8 +4412,8 @@
 msgstr "Megjelenés"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
 msgstr "Megszakítva a felhasználó által"
 
@@ -4340,36 +4444,37 @@
 msgid "Invalid data received"
 msgstr "Érvénytelen adat érkezett"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
 msgstr "Érvénytelen dátum"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "Érvénytelen fájlnév"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Érvénytelen cím, a zárójel záró része után már csak kettőspont és a port "
 "következhet."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Érvénytelen bemenet"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Érvénytelen portot adott meg. A port értékének 1 és 65535 közöttinek kell "
-"lennie. "
+"lennie."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4384,7 +4489,15 @@
 "ftps:// az FTP implicit SSL felett használatához, és\n"
 "ftpes:// az FTP explicit SSL felett használatához."
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Érvénytelen cím, a zárójel záró része után már csak kettőspont és a port "
+"következhet."
+
+#: ../../locales/../src/interface/search.cpp:698
 #, fuzzy
 msgid "Invalid regular expression in search conditions."
 msgstr "Érvénytelen méret a feltétel mezőben."
@@ -4393,50 +4506,50 @@
 msgid "Invalid response code"
 msgstr "Érvénytelen válaszkód"
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:692
 #, fuzzy, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Érvénytelen méret a feltétel mezőben."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Érvénytelen állomás specifikáció"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
 msgstr "Érvénytelen méret a feltétel mezőben."
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
 msgstr "A megadott felhasználónév érvénytelen."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Jurisdiction country:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction locality:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
 msgstr ""
 
-#: resources.h:906
+#: resources.h:924
 msgid "Keep directories on top"
 msgstr "Mappák mindig felül legyenek"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4448,50 +4561,50 @@
 "kiszolgálón a funkció támogatásának ellenőrzésére, de a teszt esetleg "
 "sikertelen is lehet."
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
 msgstr "Titkosító kulcsok cseréje"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "Legalacsonyabb"
 
-#: resources.h:922
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Nyelvek"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
 msgstr "Nyelv módosítás"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Módosítás ideje"
 
-#: resources.h:853
+#: resources.h:869
 msgid "Layout"
 msgstr "Panelek elrendezése"
 
-#: resources.h:799
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
 msgstr "Egyidejű letöltések maximális száma:"
 
-#: resources.h:801
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
 msgstr "Egyidejű feltöltések maximális száma:"
 
-#: resources.h:744
+#: resources.h:760
 msgid "Limit local ports"
 msgstr "Helyi portok korlátozása"
 
-#: resources.h:952
+#: resources.h:970
 msgid "Limit size of logfile"
 msgstr "A naplófájl méretének korlátozása"
 
-#: resources.h:953
+#: resources.h:971
 msgid "Limit:"
 msgstr "Korlát:"
 
@@ -4499,7 +4612,7 @@
 msgid "Line length exceeded"
 msgstr "Sorhosszúság túllépés"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
 msgstr "Csatolt komponensek"
 
@@ -4508,42 +4621,47 @@
 msgstr "A figyelő szoftvercsatorna bezáródott"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "Listázás:"
 
-#: resources.h:747
+#: resources.h:763
 msgid "Lo&west available port:"
 msgstr "Legalacsonyabb elérhető port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "Helyi"
 
-#: resources.h:363
+#: resources.h:365
 msgid "Local file"
 msgstr "Helyi fájlnév"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
 msgstr "Nem létezik a helyi fájl."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr ""
 "A helyi fájl helyett egy könyvtár van megadva. Adja meg a helyi fájlnevet."
 
-#: resources.h:202
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+#, fuzzy
+msgid "Local file is not a valid filename."
+msgstr "A fájl nem tölthető be, nem érvényes XML fájl."
+
+#: resources.h:204
 msgid "Local filters:"
 msgstr "Helyi szűrők:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Helyi fájlok:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Locality:"
 msgstr "Helység:"
 
@@ -4552,17 +4670,17 @@
 msgid "Log file"
 msgstr "Naplózás fájlba"
 
-#: resources.h:250
+#: resources.h:252
 #, fuzzy
 msgid "Log of update check:"
 msgstr "Automatikus frissítés keresés"
 
-#: resources.h:947
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Naplózás"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4571,7 +4689,7 @@
 "kiszolgáló esetleg nem támogatja az UTF-8-at. A proxy használata miatt a "
 "helyi karakterkészletre váltás nem alkalmazható."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4580,7 +4698,7 @@
 "kiszolgáló esetleg nem támogatja az UTF-8-at. Helyi karakterkészlet "
 "használata."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "A bejelentkezési parancssorozat lefuttatódott, de a bejelentkezés nem "
@@ -4597,13 +4715,13 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Alacsony"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Legalacsonyabb"
 
@@ -4616,7 +4734,7 @@
 msgid "MAC:"
 msgstr "Üzenethitelesítés kódolása:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4638,68 +4756,69 @@
 msgstr ""
 "Rossz formátumú válasz, a kiszolgáló nem megfelelő sorvégződéseket küld."
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: resources.h:395 ../../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
 msgid "Manual transfer"
 msgstr "Kézi átvitel"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "Az alábbi szabályok mindegyikének megfelelő elemek"
 
-#: resources.h:434
+#: resources.h:436
 msgid "Match any of the following"
 msgstr "Az alábbi szabályok bármelyikének megfelelő elemek"
 
-#: resources.h:435
+#: resources.h:437
 msgid "Match none of the following"
 msgstr "Az alábbi szabályok egyikének sem megfelelő elemek"
 
-#: resources.h:797
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr "Az egyidejű kapcsolati szálak maximális száma:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
 msgstr "Üzenet napló"
 
-#: resources.h:864
+#: resources.h:880
 msgid "Message log position"
 msgstr "Üzenet napló helyzete"
 
-#: resources.h:954
+#: resources.h:972
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "Perc"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
 msgstr "Mozgatás le"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
 msgstr "Mozgatás fel"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "Sajátgép"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "Dokumentumok"
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Kedvenc állomásaim"
 
@@ -4708,22 +4827,22 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:398
+#: resources.h:400
 msgid "Name"
 msgstr "Név"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "A megadott név már létezik."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr ""
 "Egy kedvenc könyvtár már létezik ezen a néven. Kérem adjon meg egy új nevet."
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Név:"
 
@@ -4731,12 +4850,12 @@
 msgid "Need to enter filter name"
 msgstr "Szűrőnév megadása szükséges"
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:682
 #, fuzzy
 msgid "Need to enter valid remote path"
 msgstr "Szűrőnév megadása szükséges"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr "Karakter kódolás megadása szükséges"
 
@@ -4748,40 +4867,40 @@
 msgid "New &Folder"
 msgstr "Új mappa"
 
-#: resources.h:493
+#: resources.h:502
 #, fuzzy
 msgid "New &tab"
 msgstr "Új állomás"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr "Új mappakedvenc"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr "Új kedvenc mappa"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
 msgstr "Új mappa"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr ""
@@ -4790,21 +4909,21 @@
 msgid "New filter"
 msgstr "Új szűrő"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Új mappa"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Új állomás"
 
-#: resources.h:862
+#: resources.h:878
 msgid "Next to the transfer queue"
 msgstr "A várólista mellett"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
 msgid "No"
 msgstr "Nem"
 
@@ -4812,15 +4931,15 @@
 msgid "No category to export selected"
 msgstr "Nem jelölt ki egyetlen kategóriát sem az exportálásra."
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
 msgstr "Nem adott meg parancsot. Megszakítás."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr "Nincs külső IP cím beállítva, az alapértelmezett használata."
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "Jelenleg nincsen egyetlen fájl sem szerkesztés alatt."
 
@@ -4828,9 +4947,9 @@
 msgid "No filter name given"
 msgstr "Nem adott meg szűrőnevet"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
 msgstr "Kérem adja meg a címet."
 
@@ -4838,31 +4957,31 @@
 msgid "No images available"
 msgstr "Nincs elérhető kép"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
 msgstr "A várólista végrehajtódott, nincs több átviendő fájl a várólistában!"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Nem adott meg nevet a szűrőkészlethez."
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr "Programtársítás hiányzik"
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "A következő kiterjesztéshez nincsen társítva program: '%s'."
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:540
 msgid "No search results"
 msgstr "Nincs keresési eredmény"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
 msgstr "Nincsenek állomások"
 
@@ -4870,31 +4989,32 @@
 msgid "No supported SOCKS5 auth method"
 msgstr "Nem található támogatott SOCKS5 hitelesítési mód"
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Nincs megadva felhasználónév."
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:934 resources.h:939
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Nincs"
 
-#: resources.h:373
+#: resources.h:375
 msgid "None selected yet"
 msgstr "Nincs még kiválasztva"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Normál"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
 #, fuzzy
 msgid "Not all items could be requeued for viewing/editing."
 msgstr ""
@@ -4906,11 +5026,11 @@
 msgid "Not connected"
 msgstr "A csatlakozás sikerült"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "Nincs kapcsolat kiszolgálóval"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
 msgstr "Nincs kapcsolat kiszolgálóval."
 
@@ -4919,23 +5039,23 @@
 msgid "Not connected."
 msgstr "A csatlakozás sikerült"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Fontos, hogy ez a beállítás csak az FTP protokoll használatakor támogatott."
 
-#: resources.h:778
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Megjegyzés: Ez csak normál, titkosítatlan FTP kapcsolatok esetén működik."
 
-#: resources.h:795
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Megjegyzés: Az általános proxy használata az FTP kapcsolatok esetén maga "
 "után vonja a passzív módot."
 
-#: resources.h:895
+#: resources.h:913
 msgid "Number of decimal places:"
 msgstr "Tizedesjegyek száma:"
 
@@ -4944,32 +5064,32 @@
 msgstr ""
 "Az újrapróbálkozások maximális számának 0 és 99 közöttinek kell lennie."
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "Fájl megnyitása"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:677
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
 "A következő lépésekben, az egyes átviteli módok beállításai következnek."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 msgid "Once"
 msgstr "Csak most"
 
-#: resources.h:946
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
@@ -4977,67 +5097,67 @@
 "A frissítés kereséskor csak a FileZilla verziószáma és az operációs rendszer "
 "típusa továbbítódik a kiszolgálóra."
 
-#: resources.h:646
+#: resources.h:662
 msgid "Open directory in system's file manager"
 msgstr ""
 
-#: resources.h:968 resources.h:969
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "A Kedvenc Helyek megnyitása"
 
-#: resources.h:562
+#: resources.h:572
 msgid "Open the file."
 msgstr "Kijelölt fájl megnyitása"
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "A Beállítások ablak megnyitása"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
 msgstr "Megnyitott mint:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
 msgstr "A megnyitás nem sikerült"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr ""
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "A Kedvenc Helyek megnyitása"
 
-#: resources.h:989
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Könyvtár listázás szűrés szerkesztése. Jobb kattintás a szűrő be- és "
 "kikapcsolásához."
 
-#: resources.h:170
+#: resources.h:172
 #, fuzzy
 msgid "Operating system"
 msgstr "Operációs rendszer hiba történt"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
 msgstr "Operációs rendszer hiba történt"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
 msgstr "Szervezet:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
 msgid "Other:"
 msgstr "Más:"
 
-#: resources.h:723
+#: resources.h:739
 msgid "Overview"
 msgstr "Áttekintés"
 
@@ -5045,22 +5165,22 @@
 msgid "Overwrite &if source newer"
 msgstr "Felülírás, ha a forrásfájl újabb"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 #, fuzzy
 msgid "Overwrite file"
 msgstr "Felülírás"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 #, fuzzy
 msgid "Overwrite file if size differs"
 msgstr "Felülírás, ha a méret különböző"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 #, fuzzy
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Előző két opció kombinációja"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 #, fuzzy
 msgid "Overwrite file if source file newer"
 msgstr "Felülírás, ha a forrásfájl újabb"
@@ -5075,22 +5195,22 @@
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Előző két opció kombinációja"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
 msgstr "Tulajdonos engedélyei"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Tulajdonos / Csoport"
 
-#: resources.h:867
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "A rendszer készenléti módjának megakadályozása a fájlátvitelek alatt"
 
-#: resources.h:775 resources.h:791
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Proxy címe:"
@@ -5099,7 +5219,7 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "A PORT parancsot a router vagy tűzfal sérültté teszi"
 
-#: resources.h:737
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
 msgstr "Passzív (ajánlott)"
 
@@ -5107,19 +5227,19 @@
 msgid "Package"
 msgstr "Csomag"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
 msgstr "A megadott paraméter nem érvényes URL"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
 msgstr "Jelszó:"
 
-#: resources.h:673
+#: resources.h:689
 msgid "Passive (recommended)"
 msgstr "Passzív (ajánlott)"
 
-#: resources.h:757
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passzív mód"
@@ -5134,44 +5254,44 @@
 msgid "Password required"
 msgstr "Jelszó szükséges"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Elérési út"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr ""
 "Az elérési út nem építhető fel ezzel a könyvtárral: %s, és ezzel az "
 "almappával: %s"
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
 msgstr "Elérési utak"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "Eltávolítás függőben"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "Engedély"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Engedélyek"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
 msgstr ""
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5196,7 +5316,7 @@
 "vagy látogassa meg a http://filezilla-project.org webcímet a FileZilla "
 "forráskódjának letöltéséhez."
 
-#: resources.h:679
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5227,6 +5347,11 @@
 msgid "Please enter a custom time format."
 msgstr "Adja meg az egyéni idő formátumot."
 
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr ""
+
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, fuzzy, c-format
@@ -5243,7 +5368,7 @@
 msgid "Please enter a new name for the copied filter."
 msgstr "Kérem adjon meg egy új nevet a másolt szűrőhöz:"
 
-#: ../../locales/../src/interface/filter.cpp:388
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Kérem adjon meg egy új nevet ehhez a szűrőkészlethez: \"%s\""
@@ -5273,11 +5398,11 @@
 "Az egyidejű kapcsolati szálak maximális számához 1 és 10 közötti számot "
 "írjon be."
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
 msgstr "Kérem adja meg a jelszót ehhez a kiszolgálóhoz:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
@@ -5295,11 +5420,11 @@
 "Az időtúllépéshez 5 és 9999 másodperc közötti értéket írjon be, vagy 0-át ha "
 "az időtúllépést le akarja tiltani."
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Kérem adjon meg egy egyedi nevet ehhez a szűrőkészlethez:"
 
-#: resources.h:117
+#: resources.h:118
 msgid "Please enter a username for this server:"
 msgstr "Kérem adja meg a felhasználónevet ehhez a kiszolgálóhoz:"
 
@@ -5324,7 +5449,7 @@
 "A feltöltés sebességének korlátozásához 0 KB/s-nál nagyobb vagy azzal "
 "egyenlő értéket írjon be."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5333,14 +5458,19 @@
 "Nyers FTP parancsok használatakor a távoli könyvtár gyorsítótára törlésre "
 "kerül."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Kérem adja meg a létrehozni kívánt új könyvtár nevét:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Kérem adja meg a létrehozni kívánt új könyvtár nevét:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
 msgstr "Kérem adja meg a felhasználónevet és jelszót ehhez a kiszolgálóhoz:"
 
@@ -5359,7 +5489,7 @@
 "Amennyiben dinamikus IP címmel rendelkezik, vagy nem tudja a külső IP címét, "
 "akkor használja a külső IP cím lekérdezése opciót."
 
-#: resources.h:666
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5376,7 +5506,7 @@
 "FileZilla számára, és ellenőrizze, hogy a helyesen írta-e be a külső IP cím "
 "lekérdezéséhez szükséges webcímet."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Győződjön meg róla, hogy a kért nyelv telepítve a rendszeren."
 
@@ -5392,7 +5522,7 @@
 "alkalmaznia. A router-t ne használja a 'DMZ mode' vagy 'Game mode' nevű "
 "működési módban."
 
-#: resources.h:680
+#: resources.h:696
 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 "
@@ -5404,7 +5534,7 @@
 "a tűzfal azt gondolja, hogy valamely vírus vagy más káros szándékú program "
 "használja. Ez egy téves riasztást okozhat, amelyet nyugodtan elvethet."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5413,7 +5543,7 @@
 "FTP, FTPS és FTPES szervereken csak akkor lehetséges, ha azok támogatják az "
 "MFMT parancsot."
 
-#: resources.h:734
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5421,7 +5551,7 @@
 "Vegye figyelembe, hogy néhány kiszolgáló letilthatja a felhasználót, ha túl "
 "sokszor próbál csatlakozni, vagy túl rövid időközönként."
 
-#: resources.h:882 resources.h:888
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5430,7 +5560,7 @@
 "Látogassa meg az alábbi webcímet a részletes formázási tudnivalókért: http://"
 "wiki.filezilla-project.org/Date_and_Time_formatting"
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5446,15 +5576,15 @@
 "környezetben változások történnek, vagy hirtelen problémákat tapasztal olyan "
 "állomásokkal, amelyek azelőtt megfelelően működtek."
 
-#: resources.h:455
+#: resources.h:457
 msgid "Please select an action:"
 msgstr ""
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
 msgstr "Kérem jelölje ki a beimportálandó kategóriákat."
 
-#: resources.h:668
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Válassza ki a használni kívánt alapértelmezett átviteli módot."
 
@@ -5495,7 +5625,7 @@
 "mode' vagy 'Game mode' nevű működési módban. A protokoll vizsgálathoz vagy a "
 "protokoll specifikus 'javítás'-hoz hasonló funkciókat le kell tiltani."
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5512,16 +5642,17 @@
 "Kérem látogassa meg a http://filezilla-project.org webcímet a legújabb "
 "verzió letöltéséhez."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr "Előre definiált állomások"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
 msgstr "Időbélyegek megtartása"
 
@@ -5529,7 +5660,7 @@
 msgid "Preview:"
 msgstr "Előnézet:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Az elsődleges kapcsolati szál és az adatkapcsolati szál tanúsítványai nem "
@@ -5539,35 +5670,39 @@
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:905
+#: resources.h:923
 msgid "Prioritize directories (default)"
-msgstr "Mappák előnyben részesítése (alapértelmezett) "
+msgstr "Mappák előnyben részesítése (alapértelmezett)"
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritás"
 
-#: resources.h:945
+#: resources.h:963
 msgid "Privacy policy:"
 msgstr "Adatvédelmi nyilatkozat:"
 
-#: resources.h:781
+#: resources.h:797
 msgid "Private &keys:"
 msgstr "Titkos kulcsok:"
 
-#: resources.h:777 resources.h:794
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr ""
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
 msgstr "Proxy jelszó:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "Várólista végrehajtása"
 
-#: resources.h:792
+#: resources.h:808
 msgid "Proxy &port:"
 msgstr "Proxy port:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
 msgstr "Proxy felhasználónév:"
 
@@ -5581,6 +5716,13 @@
 msgid "Proxy handshake failed: %s"
 msgstr "Nem sikerült a kapcsolategyeztetés a proxy-val: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"A cím '[' szögletes zárójellel kezdődik, de a zárójel másik fele nem "
+"található."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5595,11 +5737,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "A proxykérés nem sikerült: Ismeretlen címtípus a CONNECT válaszban"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr "A proxy beállítva, de a proxy címe vagy portja érvénytelen"
 
-#: resources.h:779
+#: resources.h:795
 msgid "Public Key Authentication"
 msgstr "Nyilvános kulcsú hitelesítés"
 
@@ -5607,54 +5749,59 @@
 msgid "Public key algorithm:"
 msgstr "Nyilvános kulcsú algoritmus:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "Nyilvános engedélyek"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
 msgstr "A várólista végrehajtásra került"
 
-#: ../../locales/../src/interface/statusbar.cpp:458
+#: ../../locales/../src/interface/statusbar.cpp:462
 #, fuzzy, c-format
 msgid "Queue: %s MiB"
 msgstr "Várólista: %s%d MiB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:392
 #, fuzzy, c-format
 msgid "Queue: %s%s"
 msgstr "Várólista: %s%d %c"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Várólista: üres"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "Várólista"
 
-#: resources.h:447
+#: resources.h:449
 msgid "Queueing:"
 msgstr "Várólista kezelés:"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "Rendszer újraindítása"
 
-#: resources.h:520
+#: resources.h:530
 msgid "R&emote directory tree"
 msgstr "Távoli könyvtárfa"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: resources.h:632 resources.h:636
+#, fuzzy
+msgid "R&eset and requeue selected files"
+msgstr "Kijelölt elemek állapotának törlése és újbóli várólistába helyezése"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr "Nyers FTP parancs"
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
 msgstr "Olvasás"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 #, fuzzy
 msgid "Re&fresh"
 msgstr "Frissítés"
@@ -5669,64 +5816,73 @@
 "routers and firewalls accordingly."
 msgstr ""
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "Olvasás"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
 msgstr "Írásvédett"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
 msgstr "Biztosan megszakítja az aktuális műveletet?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
 msgstr[0] "Biztosan törölni szeretne %d kijelölt mappát a tartalmával együtt?"
 msgstr[1] "Biztosan törölni szeretne %d kijelölt mappát a tartalmával együtt?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
 msgstr[0] "Biztosan törölni szeretne %d kijelölt fájlt?"
 msgstr[1] "Biztosan törölni szeretne %d kijelölt fájlt?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
 msgstr "Biztosan törölni szeretné a következő kijelölt elemeket: %s és %s?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
 msgstr "Biztosan törölni szeretné a kijelölt fájlokat és/vagy mappákat?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "A hiba oka"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
 msgstr "Újraindítás most"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
 msgstr "Rekurzív beállítás az almappákra is:"
 
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
 #: ../../locales/../src/interface/netconfwizard.cpp:1031
 msgid "Received data tainted"
 msgstr "A fogadott adat sérült"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
@@ -5735,11 +5891,11 @@
 "van kapcsolódva.\n"
 "Ha folytatja, a aktuális kapcsolat meg fog szakadni."
 
-#: resources.h:735
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr "Újracsatlakozás beállításai"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
 msgstr "Újracsatlakozás az utoljára használt kiszolgálóhoz"
 
@@ -5747,38 +5903,43 @@
 msgid "Redirection to invalid address"
 msgstr "Átirányítás érvénytelen címre"
 
-#: resources.h:978 resources.h:979
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
 msgstr "A fájlablakok frissítése"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "Jelszó megadása"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "Távoli"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
 msgstr "A távoli tanúsítvány nem megbízható"
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Távoli fájlnév"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Remote file search"
 msgstr "Fájlkeresés a kiszolgálón"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "Távoli szűrők:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "Távoli elérési út"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5788,7 +5949,7 @@
 "abszolút elérési utat adott meg, és azt a jelenlegi állomás típusa (%s) "
 "támogatja."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5798,63 +5959,72 @@
 "abszolút elérési utat adott meg, és azt a hozzárendelt állomás típusa (%s) "
 "támogatja."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "A távoli mappa elérési útja nem elemezhető. Ellenőrizze, hogy érvényes "
 "abszolút elérési utat adott meg."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
 msgstr "A távoli elérési út nem elemezhető."
 
-#: resources.h:444
+#: resources.h:446
 msgid "Remote path handling:"
 msgstr "Távoli elérési utak kezelése:"
 
-#: resources.h:312
+#: resources.h:314
 msgid "Remote path:"
 msgstr "Távoli elérési út:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Távoli fájlok:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
 msgstr "Összes eltávolítása"
 
-#: resources.h:616 resources.h:619
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
 msgstr "Kijelölt elemek eltávolítása a listáról"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Fájl átnevezése"
 
-#: resources.h:631 resources.h:652
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
 msgstr "Kijelölt mappa átnevezése"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "Kijelölt mappák és fájlok átnevezése"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Objektum átnevezése erről: '%s' erre: '%s'"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr ""
+
+#: resources.h:634
+#, fuzzy
+msgid "Reset and requeue &all"
 msgstr "Kijelölt elemek állapotának törlése és újbóli várólistába helyezése"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
@@ -5869,22 +6039,22 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Válasz:"
 
-#: resources.h:438
+#: resources.h:440
 msgid "Results:"
 msgstr "Találatok:"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 #, fuzzy
 msgid "Resume file transfer"
 msgstr "Fájlkeresés a kiszolgálón"
 
-#: resources.h:852
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5892,35 +6062,40 @@
 "Az ASCII fájlok átviteli folytatása problémákat okozhat, amennyiben a "
 "kiszolgáló más sorvégződés formátumot használ, mint a kliens."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
 msgstr "Könyvtár lista lekérdezése..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "A külső IP cím lekérdezése a következő helyről: %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:917
 #, fuzzy
 msgid "Root certificate is not trusted"
 msgstr "A távoli tanúsítvány nem megbízható"
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "Jelenleg szerkesztett fájlok..."
 
-#: resources.h:607
+#: resources.h:885
+#, fuzzy
+msgid "S&how the Site Manager on startup"
+msgstr "Kedvenc Helyek bejegyzéseinek exportálása"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "Rendszer leállítása"
 
-#: resources.h:436
+#: resources.h:438
 msgid "S&top"
 msgstr "Megállítás"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr "Szinkronizált böngészés"
 
@@ -5928,35 +6103,40 @@
 msgid "SFTP"
 msgstr "SFTP"
 
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "Korlát:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "Beállítások mentése"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
 msgstr "Fájlok keresése a várólistához történő adáshoz"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
 msgstr "Fájlok keresése a feltöltéshez"
 
-#: resources.h:432
+#: resources.h:434
 msgid "Search &conditions:"
 msgstr "Keresési feltételek:"
 
-#: resources.h:430
+#: resources.h:432
 msgid "Search &directory:"
 msgstr "Keresés ebben a mappában:"
 
-#: resources.h:994
+#: resources.h:1012
 msgid "Search for files recursively."
 msgstr "Távoli fájlok rekurzív keresése a kiszolgálón"
 
-#: resources.h:539
+#: resources.h:549
 msgid "Search server for files"
 msgstr "Távoli fájlok rekurzív keresése a kiszolgálón"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
 msgstr "Biztonsági információk"
 
@@ -5966,26 +6146,26 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Alapértelmezett: http://ip.filezilla-project.org/ip.php"
 
-#: resources.h:374
+#: resources.h:376
 msgid "Sele&ct server"
 msgstr "Állomás kiválasztása"
 
-#: resources.h:720
+#: resources.h:736
 msgid "Select &page:"
 msgstr "Válassza ki az oldalt:"
 
-#: resources.h:870
+#: resources.h:888
 msgid "Select Theme"
 msgstr "Téma kiválasztása"
 
-#: resources.h:830
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Válassza ki az alapértelmezett műveletet arra az esetre, ha a célfájl már "
 "létezik."
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "Válassza ki az alapértelmezett szerkesztőt"
@@ -6028,15 +6208,15 @@
 msgstr "Adja meg a fájlnevet a beállítások exportálásához"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2673
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
 msgstr "Adja meg a fájlnevet a kedvenc helyek exportálásához"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr "Válassza ki a fájlt az importáláshoz"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 #, fuzzy
 msgid "Select file to upload"
 msgstr "Fájlok keresése a feltöltéshez"
@@ -6045,28 +6225,28 @@
 msgid "Select filename for converted keyfile"
 msgstr "Adja meg a fájlnevet a konvertált kulcsfájlhoz"
 
-#: resources.h:420
+#: resources.h:422
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Adja meg hogy ezt a fájltípust milyen program nyissa meg."
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:805
 msgid "Select target download directory"
 msgstr "Válassza ki a letöltés célkönyvtárát"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Válassza ki a helyi fájlt"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "Válassza ki a kiexportálandó kategóriákat:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "Válassza ki a törölni kívánt személyes adatokat."
 
-#: ../../locales/../src/interface/search.cpp:798
+#: ../../locales/../src/interface/search.cpp:772
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6080,7 +6260,7 @@
 msgstr[0] "%d mappa kijelölve."
 msgstr[1] "%d mappa kijelölve."
 
-#: ../../locales/../src/interface/search.cpp:796
+#: ../../locales/../src/interface/search.cpp:770
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6101,7 +6281,7 @@
 msgstr[0] "%d fájl kijelölve. Kijelölt fájl mérete: Legalább %s"
 msgstr[1] "%d fájl kijelölve. Kijelölt fájlok mérete: Legalább %s"
 
-#: ../../locales/../src/interface/search.cpp:803
+#: ../../locales/../src/interface/search.cpp:777
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "%s és %s van kijelölve a letöltéshez."
@@ -6116,34 +6296,36 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s és %s kijelölve. Kijelölt fájlok mérete: Legalább %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 #, fuzzy
 msgid "Selected editor does not exist."
 msgstr "A kijelölt szerkesztő nem található."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
 msgstr "A kijelölt fájl már szerkesztés alatt van"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-msgid "Selected file already opened."
-msgstr "A kijelölt fájl már meg van nyitva."
-
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
 msgstr "A kiválasztott fájl már be van töltve"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+#, fuzzy
+msgid "Selected file is already opened"
+msgstr "A kijelölt fájl már meg van nyitva."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+#, fuzzy
+msgid "Selected file is still being edited"
 msgstr "A kijelölt fájl még szerkesztés alatt van"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "A kijelölt szűrő csak a helyi fájlokra alkalmazható."
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6156,39 +6338,40 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "A megadott portot általában egy másik protokoll használja"
 
-#: resources.h:742
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
 msgstr "FTP ébrentartási parancsok küldése"
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr "Egyéni FTP parancsok küldése a kiszolgálóra"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr "Ébrentartási parancs küldése"
 
 #: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
 msgstr "Sorozatszám:"
 
-#: resources.h:81 resources.h:88
+#: resources.h:89
 #, fuzzy
 msgid "Server &Type:"
 msgstr "Adatkapcsolat típusa:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
 msgstr "A kiszolgáló a TLS kapcsolatot nem megfelelően zárta le."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr ""
 "A kiszolgáló nem támogatja a(z) %d GB-nál nagyobb méretű fájlok átviteli "
 "folytatását."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6197,19 +6380,19 @@
 "A kiszolgáló nem támogatja a(z) %d GB-nál nagyobb méretű fájlok átviteli "
 "folytatását. Az átvitel befejezése, a fájlok méretei megegyeznek."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
 msgstr ""
 "A kiszolgáló nem támogatja a 2 GB-nál nagyobb méretű fájlok átviteli "
 "folytatását."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
 msgstr ""
 "A kiszolgáló nem támogatja a 4 GB-nál nagyobb méretű fájlok átviteli "
 "folytatását."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6218,7 +6401,7 @@
 "A kiszolgáló esetleg nem támogatja a(z) %d GB-nál nagyobb méretű fájlok "
 "átviteli folytatását. Az átvitel befejezése, a fájlok méretei megegyeznek."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6226,7 +6409,12 @@
 "A kiszolgáló esetleg egy fiókot igényel. Próbáljon meg egy fiókot megadni a "
 "Kedvenc Helyek beállításaiban."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+#, fuzzy
+msgid "Server returned empty path."
+msgstr "A kiszolgáló érvénytelen választ küldött."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6234,13 +6422,13 @@
 "A kiszolgáló egy további bejelentkezési kérést küldött el. Az interaktív "
 "bejelentkezési típust kell használnia."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "A kiszolgáló nem lekérdezhető című passzív választ küldött. A passzív mód "
 "használata nem sikerült."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6261,23 +6449,23 @@
 msgid "Server sent unexpected reply."
 msgstr "A kiszolgáló érvénytelen választ küldött."
 
-#: resources.h:350
+#: resources.h:352
 msgid "Server to client MAC:"
 msgstr "Üzenethitelesítés kódolása a szervertől a kliens felé:"
 
-#: resources.h:348
+#: resources.h:350
 msgid "Server to client cipher:"
 msgstr "Blokk kódolás a szervertől a kliens felé:"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
 msgstr "Adatkapcsolat típusa:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Kiszolgáló / Helyi fájlnév"
 
-#: resources.h:310 resources.h:372
+#: resources.h:312 resources.h:374
 msgid "Server:"
 msgstr "Kiszolgáló:"
 
@@ -6285,34 +6473,34 @@
 msgid "Session details"
 msgstr "Adatkapcsolat részletek"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "Prioritás beállítása"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Engedélyek módosítása a '%s' objektumon erre: '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
 msgstr "A SetSocketBufferSize az adatcsatorna nélkül hívódott meg"
 
-#: resources.h:719
+#: resources.h:735
 msgid "Settings"
 msgstr "Beállítások"
 
-#: resources.h:967
+#: resources.h:985
 msgid "Show &raw directory listing"
 msgstr "Nyers könyvtár lista megjelenítése az üzenet naplóban"
 
-#: resources.h:550
+#: resources.h:560
 #, fuzzy
 msgid "Show &welcome dialog..."
 msgstr "Ezen súgó ablak megjelenítése"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 "Szeretné mindkét könyvtárfát megjeleníteni és folytatni az összehasonlítást?"
@@ -6321,11 +6509,11 @@
 msgid "Shows this help dialog"
 msgstr "Ezen súgó ablak megjelenítése"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
 msgstr "Leállítás most"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "Kedvenc Helyek bejegyzései"
 
@@ -6333,53 +6521,53 @@
 msgid "Site Manager"
 msgstr "Kedvenc Helyek"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 #, fuzzy
 msgid "Site Manager - Invalid data"
 msgstr "A Kedvenc Helyek már meg van nyitva"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "A Kedvenc Helyek már meg van nyitva"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "A parancssorosan megadott állomás nem létezik."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr ""
 "A parancssoros állomás specifikációnak 0-val vagy 1-gyel kell kezdődnie."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "A parancssoros állomás specifikáció nem megfelelő."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr "Állomáshoz rendelt kedvenc mappák"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
@@ -6389,20 +6577,20 @@
 "Helyek között szerepelnie kell.\n"
 "Kívánja hozzáadni a jelenlegi kapcsolatot a Kedvenc Helyek közé?"
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Méret"
 
-#: resources.h:889
+#: resources.h:907
 msgid "Size formatting"
 msgstr "Fájlméret formátuma"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Ismeretlen méret"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 #, fuzzy
 msgid "Skip file"
 msgstr "Fájl megnyitása"
@@ -6423,11 +6611,11 @@
 msgid "Skipping upload of %s"
 msgstr "Feltöltés kihagyása: %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Valamely fájl még szerkesztés alatt van vagy feltöltés szükséges."
 
-#: resources.h:682 resources.h:758
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6435,25 +6623,25 @@
 "Néhány, router mögött található és rosszul beállított távoli kiszolgáló, "
 "esetleg a saját helyi IP címével válaszolhat."
 
-#: resources.h:907
+#: resources.h:925
 msgid "Sort directories inline"
 msgstr "Mappák rendezése a fájlok között"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "A rendezés sorrendje nem módosítható miközben a könyvtárak összehasonlítása "
 "be van kapcsolva."
 
-#: resources.h:903
+#: resources.h:921
 msgid "Sorting"
 msgstr "Rendezés"
 
-#: resources.h:904
+#: resources.h:922
 msgid "Sorting &mode:"
 msgstr "Rendezés módja:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
 msgstr "Az áthúzási művelet forrása és elérési útja megegyezik."
 
@@ -6461,7 +6649,7 @@
 msgid "Source and target file may not be the same"
 msgstr "A forrásfájl és a célfájl lehet hogy nem ugyanaz"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Az áthúzási művelet forrása és célja megegyezik."
 
@@ -6469,25 +6657,25 @@
 msgid "Source file:"
 msgstr "Forrásfájl:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, fuzzy
 msgid "Speed Limits"
 msgstr "Sebességkorlátozás"
 
-#: resources.h:803
+#: resources.h:819
 msgid "Speed limits"
 msgstr "Sebességkorlátozás"
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr ""
 
-#: resources.h:390
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "Az átvitel megkezdése azonnal"
 
@@ -6495,39 +6683,39 @@
 msgid "Start with opened Site Manager"
 msgstr "Indítás a Kedvenc Helyek megnyitásával"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "Letöltés indítása: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Feltöltés indítása: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
 msgstr "Megye:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Állapot"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Állapot:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "Összes megállítása és eltávolítása"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
 msgstr "Utca:"
 
@@ -6539,28 +6727,28 @@
 msgid "Successful transfers"
 msgstr "Sikeres átvitelek"
 
-#: resources.h:710
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr "A tesztek eredménye:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../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:373
 #: ../../locales/../src/interface/state.cpp:383
 #: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
 msgstr "Szinkronizált böngészés"
 
@@ -6568,8 +6756,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Szintaktikai hiba"
 
@@ -6578,24 +6766,28 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
 msgstr "Szintaktikai hiba a parancssorban"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr "Rendszerfájl"
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr ""
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 #, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Az adatkapcsolat létrejött, HTTP kérés küldése"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "A TLS/SSL adatkapcsolat létrejött, várakozás az üdvözlő üzenetre..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
 msgstr "A TLS/SSL adatkapcsolat létrejött"
 
@@ -6611,19 +6803,24 @@
 msgid "Target file:"
 msgstr "Célfájl:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "A fájl már létezik"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "A célfájl már létezik, biztosan folytatni szeretné?"
 
-#: resources.h:709
+#: resources.h:725
 msgid "Test results"
 msgstr "Teszt eredmények"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr "A kiszolgáló átviteli felfüggesztés/folytatás képességeinek tesztelése"
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6632,7 +6829,7 @@
 "A Kedvenc Helyek már meg van nyitva a FileZilla 3 egy másik példányában.\n"
 "Kívánja folytatni? A Kedvenc Helyek módosítai nem lesznek menthetőek."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
@@ -6640,7 +6837,7 @@
 "A Kedvenc Helyek már meg van nyitva a FileZilla 3 egy másik példányában.\n"
 "Kérem zárja be, ellenkező esetben az adat nem törölhető."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr ""
@@ -6650,18 +6847,18 @@
 msgid "The address you entered was: %s"
 msgstr "Az Ön által megadott cím: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 #, fuzzy
 msgid "The bookmark could not be added."
 msgstr "A távoli elérési út nem elemezhető."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
+#: ../../locales/../src/interface/sitemanager.cpp:805
 #, fuzzy
 msgid "The bookmarks could not be cleared."
 msgstr "A távoli elérési út nem elemezhető."
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
 msgstr ""
 "A kapcsolat titkosított. Kattintson az ikonra a részletes információkért."
@@ -6670,12 +6867,12 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Az egyéni bejelentkezési parancssor nem lehet üres."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, fuzzy, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Be kell állítania az alapértelmezett szerkesztőt."
 
-#: resources.h:422
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Az alapértelmezett szöveges fájl szerkesztő: '%s'."
@@ -6683,7 +6880,8 @@
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
+#, fuzzy
+msgid "The entered filter name already exists, please choose a different name."
 msgstr "A megadott szűrőnév már létezik."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
@@ -6701,9 +6899,9 @@
 "A következő fájl már létezik: %s.\n"
 "Kérem adjon meg egy új nevet:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6717,15 +6915,15 @@
 msgstr ""
 "A következő fájl nem tölthető be vagy nem tartalmaz titkos kulcsot: '%s'"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, fuzzy, c-format
 msgid "The file '%s' could not be loaded."
 msgstr ""
 "A következő fájl nem tölthető be vagy nem tartalmaz titkos kulcsot: '%s'"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6734,8 +6932,8 @@
 "A következő fájl nem nyitható meg: '%s'.\n"
 "A rendszerben nincs semmilyen program társítva ehhez a fájltípushoz."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6782,7 +6980,7 @@
 msgid "The file selected as default editor does not exist."
 msgstr "Az alapértelmezett szerkesztőként megadott fájl nem létezik."
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6796,11 +6994,11 @@
 "jelszó importálható be.\n"
 "Folytatja a beimportálást?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
 msgstr "A fájlnév oszlop nem rejthető el és nem mozgatható."
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
 msgstr "A fájlnév oszlop nem rejthető el."
 
@@ -6814,20 +7012,20 @@
 msgid "The following characters will be replaced: %s"
 msgstr ""
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "Az alábbi fájlok vannak jelenleg szerkesztésre megnyitva:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 #, fuzzy
 msgid "The global bookmarks could not be saved."
 msgstr "A távoli elérési út nem elemezhető."
 
-#: resources.h:965
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6877,14 +7075,13 @@
 "A legfrissebb verzió letöltésre került. Telepítse ugyanúgy, ahogyan ezt a "
 "verziót telepítette."
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
+#: ../../locales/../src/interface/QueueView.cpp:1964
 #, fuzzy
 msgid "The queue will not be saved."
 msgstr ""
 "A következő fájl nem írható: \"%s\", a várólista adatai nem menthetőek."
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1022
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6895,29 +7092,29 @@
 "Kívánja a szinkronizált böngészést kikapcsolni és a távoli mappaváltást "
 "folytatni?"
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr "A kijelölt kategóriák beimportálásra kerültek."
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "A kiválasztott fájl a következő kategóriák beimportálható adatait "
 "tartalmazza:"
 
-#: resources.h:320
+#: resources.h:322
 msgid "The selected file is already being edited:"
 msgstr "Az alábbi fájl már szerkesztés alatt van:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "A kijelölt fájl még meg van nyitva valamely programban, kérem zárja be."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6927,7 +7124,7 @@
 "Ez veszélyes lehet és a rendszert károsíthatja.\n"
 "Biztosan folytatni kívánja?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
+#: ../../locales/../src/interface/sitemanager.cpp:602
 #, fuzzy
 msgid "The server could not be added."
 msgstr "A fájlnév oszlop nem rejthető el."
@@ -6937,7 +7134,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "A kiszolgáló nem felismerhető választ küldött."
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "A kiszolgáló a következő karakterkészletet alkalmazza a fájlnevek kódolására:"
@@ -6950,7 +7147,7 @@
 "A kiszolgáló tanúsítványa nem ismert. Kérem a tanúsítványt az alábbiakban "
 "figyelmesen vizsgálja meg, hogy biztos legyen a szerver megbízhatóságában."
 
-#: resources.h:186
+#: resources.h:188
 #, fuzzy
 msgid ""
 "The server's host key does not match the key that has been cached. This "
@@ -6964,7 +7161,7 @@
 "Amennyiben a címkulcs változására nem számított, kérem lépjen kapcsolatba a "
 "szerver rendszergazdájával."
 
-#: resources.h:174
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6972,7 +7169,7 @@
 "A kiszolgáló címkulcsa ismeretlen. Semmi sem garantálja, hogy a szerver az a "
 "számítógép, melyre csatlakozni szeretne."
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
@@ -6980,13 +7177,13 @@
 "A beállítások beimportálásra kerültek. Az összes beállítás érvénybe "
 "lépéséhez a FileZilla újraindítása szükséges."
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3222
 #, fuzzy
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "A rendszer hamarosan újraindítja magát, kivéve ha a Mégse gombra kattint."
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3220
 #, fuzzy
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
@@ -7008,11 +7205,11 @@
 msgid "Themes"
 msgstr "Témák"
 
-#: ../../locales/../src/interface/filter.cpp:447
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Ez a szűrőkészlet nem távolítható el."
 
-#: ../../locales/../src/interface/filter.cpp:382
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Ez a szűrőkészlet nem nevezhető át."
 
@@ -7022,7 +7219,7 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:687
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7030,7 +7227,7 @@
 "Ez csak akkor működik, ha a számítógép nincs egy router mögött, különben az "
 "operációs rendszer csak a belső címet fogja visszaadni a programnak."
 
-#: resources.h:665
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7038,20 +7235,25 @@
 "A varázsló a hálózati beállítások megfelelő kialakításában és tesztelésében "
 "segít, különösen ha router vagy tűzfal is található a hálózaton."
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+#, fuzzy
+msgid "Time"
+msgstr "Időtúllépés"
+
+#: resources.h:901
 msgid "Time formatting"
 msgstr "Idő formátuma"
 
-#: resources.h:726
+#: resources.h:742
 msgid "Time&out in seconds:"
 msgstr "Időtúllépés beállítása másodpercben:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
 msgstr "Időtúllépés"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
@@ -7061,22 +7263,22 @@
 "Időzóna eltolódások: Kiszolgáló: %d másodperc. Helyileg: %d másodperc. "
 "Különbség: %d másodperc."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Title:"
 msgstr "Beosztás:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "A könyvtárak összehasonlításához, mindkét fájllistát egy vonalba kell "
 "igazítani."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Ehhez, egyszerre kell megjeleníteni vagy elrejteni mindkét könyvtárfát."
 
-#: resources.h:780
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7084,7 +7286,7 @@
 "A nyilvános kulcsú hitelesítés működéséhez szükség van a használni kívánt "
 "titkos személyes kulcsokra is."
 
-#: resources.h:990
+#: resources.h:1008
 #, fuzzy
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
@@ -7102,7 +7304,7 @@
 "Zöld: A fájl újabb mint a másik oldalon lévő nem jelölt fájl.\n"
 "Piros: A fájlméretek különböznek."
 
-#: resources.h:992
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7112,23 +7314,23 @@
 "Ha engedélyezve van, az egyik oldali mapparendszerben való navigálás a másik "
 "oldalon is megfelelően változtatja a mappát."
 
-#: resources.h:980 resources.h:981
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
 msgstr "A várólista végrehajtása"
 
-#: resources.h:972 resources.h:973
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
 msgstr "A helyi könyvtárfa megjelenítése vagy elrejtése"
 
-#: resources.h:970 resources.h:971
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
 msgstr "Az üzenet napló megjelenítése vagy elrejtése"
 
-#: resources.h:974 resources.h:975
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
 msgstr "A távoli könyvtárfa megjelenítése vagy elrejtése"
 
-#: resources.h:976 resources.h:977
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
 msgstr "A várólista megjelenítése vagy elrejtése"
 
@@ -7141,39 +7343,39 @@
 msgstr "Túl sok átirányítás"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "Részlet:"
 
-#: resources.h:913 resources.h:919
+#: resources.h:931 resources.h:937
 msgid "Transfer"
 msgstr "Átvitel"
 
-#: resources.h:360
+#: resources.h:362
 msgid "Transfer &direction"
 msgstr "Átvitel iránya"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "Átvitel típusa"
 
-#: resources.h:736
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "Átviteli mód:"
 
-#: resources.h:869
+#: resources.h:887
 #, fuzzy
 msgid "Transfer Queue"
 msgstr "Várólista"
 
-#: resources.h:97
+#: resources.h:98
 #, fuzzy
 msgid "Transfer Settings"
 msgstr "Átviteli beállítások"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
+#: ../../locales/../src/engine/transfersocket.cpp:498
+#: ../../locales/../src/engine/transfersocket.cpp:522
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Az átviteli kapcsolat megszakadt: %s"
@@ -7182,8 +7384,8 @@
 msgid "Transferred data got tainted."
 msgstr "Az átvitt adatfolyam sérült."
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1491
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "Átvitel folyamatban"
 
@@ -7191,29 +7393,31 @@
 msgid "Transfers"
 msgstr "Átvitel"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, fuzzy
 msgid "Transfers finished"
 msgstr "Átviteli beállítások"
 
-#: resources.h:827
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
 msgstr "A kiterjesztés nélküli fájlok kezelése ASCII fájlokként történjen"
 
-#: resources.h:823
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Az alábbi fájltípusok kezelése ASCII fájlokként történjen:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#, fuzzy
+msgid "Trust changed Hostkey:"
 msgstr "Módosított címkulcs elfogadása: "
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#, fuzzy
+msgid "Trust new Hostkey:"
 msgstr "Új címkulcs elfogadása: "
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr "Megbízik az új címkulcsban, és folytatni szeretné a csatlakozást?"
 
@@ -7221,40 +7425,40 @@
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Elfogadja a tanúsítványt, és folytatni szeretné a csatlakozást?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr "Megbízik a címkulcsban, és folytatni szeretné a csatlakozást?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "Típus"
 
-#: resources.h:762
+#: resources.h:778
 msgid "Type of FTP Proxy:"
 msgstr "FTP Proxy típusa:"
 
-#: resources.h:787
+#: resources.h:803
 msgid "Type of generic proxy:"
 msgstr "Általános proxy típusa:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
 msgstr "Feltöltés"
 
-#: resources.h:483 resources.h:807
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Feltöltés korlátozása:"
 
-#: resources.h:931
+#: resources.h:949
 msgid "U&se filetype associations if available"
 msgstr "Fájltípus társítások használata amennyiben elérhető"
 
-#: resources.h:884
+#: resources.h:902
 msgid "U&se system defaults"
 msgstr "A rendszer alapértelmezett beállítása"
 
-#: resources.h:764
+#: resources.h:780
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7263,16 +7467,16 @@
 msgid "Unassigned error code %d"
 msgstr "Nem ismert hibakód %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Unit:"
 msgstr "Egység:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "Ismeretlen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "A proxy típusa ismeretlen, a bejelentkezési parancssorozat létrehozása nem "
@@ -7287,13 +7491,13 @@
 msgid "Unknown certificate"
 msgstr "Ismeretlen tanúsítvány"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "Ismeretlen címkulcs"
 
@@ -7306,7 +7510,7 @@
 "Ismeretlen protokoll verzió a SOCKS felhasználónév/jelszó hitelesítés "
 "egyeztetése során: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7328,7 +7532,7 @@
 "Amíg ez a probléma meg nem oldódik, az aktív módú FTP nem fog működni, és a "
 "passzív módot kell használnia."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:888
 #, fuzzy
 msgid "Unsupported certificate type"
 msgstr "Nem támogatott átirányítás"
@@ -7337,7 +7541,7 @@
 msgid "Unsupported redirect"
 msgstr "Nem támogatott átirányítás"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr "Feltöltés és a szerkesztés befejezése"
 
@@ -7351,113 +7555,117 @@
 msgid "Update wizard"
 msgstr "Frissítés varázsló"
 
-#: resources.h:362
+#: resources.h:364
 msgid "Upload"
 msgstr "Feltöltés"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "Sikertelen feltöltés"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
+#: ../../locales/../src/interface/statusbar.cpp:609
 #, fuzzy, c-format
 msgid "Upload limit: %s/s"
 msgstr "Feltöltés korlátozása:"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
+#: ../../locales/../src/interface/statusbar.cpp:611
 #, fuzzy
 msgid "Upload limit: none"
 msgstr "Feltöltés korlátozása:"
 
-#: resources.h:642
+#: resources.h:658
 msgid "Upload selected directory"
 msgstr "Kijelölt mappa feltöltése"
 
-#: resources.h:556
+#: resources.h:566
 msgid "Upload selected files and directories"
 msgstr "Kijelölt mappák és fájlok feltöltése"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "Szeretné a fájlt visszatölteni a szerverre?"
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr "Szeretné a fájlt feltölteni a szerverre?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "Feltöltés"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "Feltöltés és eltávolítás függőben"
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr "Feltöltés és befejezés"
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
 msgstr "Egyéni karakterkészlet használata:"
 
-#: resources.h:928
+#: resources.h:946
 msgid "Use &custom editor:"
 msgstr "Egyéni szerkesztő használata:"
 
-#: resources.h:421
+#: resources.h:423
 msgid "Use &default editor for text files"
 msgstr "Az alapértelmezett szöveges fájl szerkesztő használata"
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr "Szinkronizált böngészés használata"
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Amennyiben a kiszolgáló támogatja, akkor UTF-8 használata, egyébként a helyi "
 "karakterkészlet használata."
 
-#: resources.h:257 resources.h:267
+#: resources.h:259 resources.h:269
 #, fuzzy
 msgid "Use default action"
 msgstr "Alapértelmezett beállítás"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr ""
+
+#: resources.h:372
 msgid "Use server currently connected to"
 msgstr "Jelenleg csatlakozott szerveren"
 
-#: resources.h:371
+#: resources.h:373
 msgid "Use server from site manager"
 msgstr "Kedvenc állomás használata"
 
-#: resources.h:878
+#: resources.h:896
 msgid "Use system &defaults"
 msgstr "A rendszer alapértelmezett beállítása"
 
-#: resources.h:688
+#: resources.h:704
 msgid "Use the following IP address:"
 msgstr "A következő IP cím használata:"
 
-#: resources.h:698
+#: resources.h:714
 msgid "Use the following port range:"
 msgstr "Az alábbi port tartomány használata"
 
-#: resources.h:683
+#: resources.h:699
 msgid "Use the server's external IP address instead"
 msgstr "Ehelyett, a kiszolgáló külső IP címének használata"
 
-#: resources.h:689 resources.h:752
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr "Ezt használja, ha egy router mögött van, és a külső IP címe statikus."
 
-#: resources.h:692
+#: resources.h:708
 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 "
@@ -7468,28 +7676,28 @@
 "amikor az aktív módot először használja. Az IP cím lekérdezésekor csak a "
 "FileZilla verziószáma továbbítódik a kiszolgálóra."
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "Felhasználónév:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
 msgstr "A felhasználónév nem állhat csupa szóközből."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
 msgstr "A következő proxy használata: %s"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "A nem megfelelő karakterkészlet használata a fájlnevek helytelen "
 "megjelenését eredményezheti."
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "Ezzel a varázslóval a FileZilla elérhető frissítéseit ellenőrizheti."
 
@@ -7505,50 +7713,50 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Részletes naplóüzenetek a wxWidgets-től"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
 msgstr "Tanúsítvány ellenőrzése..."
 
-#: resources.h:168
+#: resources.h:170
 #, fuzzy
 msgid "Version:"
 msgstr "Verzió: %s"
 
-#: resources.h:812
+#: resources.h:828
 msgid "Very high"
 msgstr "Nagyon magas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 "A rejtett fájlok megjelenítése opció be van kapcsolva, azonban a kiszolgáló "
 "nem támogatja."
 
-#: resources.h:915
+#: resources.h:933
 msgid "View/Edit"
 msgstr "Megnyitás / Szerkesztés"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
 msgstr "Megjelenített oszlopok"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "Írás"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
 msgstr "Várakozás"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
 msgstr "Várakozás a böngésző kapcsolatra"
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
 msgstr "Várakozás a jelszóra"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Waiting for transfer to be cancelled"
 msgstr "Várakozás az átvitel megszakítására"
 
@@ -7556,7 +7764,7 @@
 msgid "Waiting to retry..."
 msgstr "Várakozás az újracsatlakozásra..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
 "Warning!\n"
 "\n"
@@ -7606,35 +7814,39 @@
 "\n"
 "Biztosan szeretne frissítést keresni a napi programváltozatok között is?"
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "Vigyázat: Lehetséges, hogy a biztonság sérül!"
 
-#: resources.h:474
+#: resources.h:476
 #, fuzzy
 msgid "Welcome to FileZilla"
 msgstr "A FileZilla bezárása"
 
-#: resources.h:463
+#: resources.h:465
 #, fuzzy
 msgid "What's new"
 msgstr "Újdonságok:"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
 msgstr "Újdonságok:"
 
-#: resources.h:815
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 
-#: resources.h:857
+#: resources.h:873
 msgid "Widescreen"
 msgstr "Szélesképernyős"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "Írás"
 
@@ -7647,11 +7859,11 @@
 msgid "Wrong line endings"
 msgstr "Rossz sorvégződések"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr "Igen"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7659,15 +7871,15 @@
 "Jelenleg már a FileZilla legfrissebb verzióját használja. A későbbiekben "
 "ismét ellenőrizheti."
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7675,7 +7887,7 @@
 "Az 'x'-et bármely pozícióban használhatja a fájlok eredeti engedélyeinek "
 "megtartására."
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr ""
 "A beállítások a FileZilla saját beállítások mappájából nem importálhatóak."
@@ -7690,19 +7902,19 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Nem adott meg új nevet a fájlhoz. Felülírja inkább a fájlt?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 "Több mint 10 fájlt választott ki szerkesztésre. Biztosan folytatni szeretné?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7710,12 +7922,12 @@
 "Több mint 10 fájlt vagy könyvtárat választott ki megnyitásra. Biztosan "
 "folytatni szeretné?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Meg kell adnia egy címet."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:817
 #, fuzzy
 msgid "You have to enter a local directory."
 msgstr "Kérem adjon meg egy érvényes IP címet."
@@ -7725,18 +7937,18 @@
 msgid "You have to enter a valid IP address."
 msgstr "Kérem adjon meg egy érvényes IP címet."
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:823
 #, fuzzy
 msgid "You have to enter a writable local directory."
 msgstr "Kérem adjon meg egy érvényes IP címet."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
 msgstr "Adjon meg egy fiók nevet."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr "Meg kell adnia egy felhasználónevet."
 
@@ -7748,7 +7960,7 @@
 "Valószínűleg egy olyan router-t vagy tűzfalat használ, amely tévesen "
 "módosítja az átvitt adatokat."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
 msgstr "Meg kell adnia egy nevet a kedvenc könyvtárhoz."
 
@@ -7756,7 +7968,7 @@
 msgid "You need to enter a name for the log file."
 msgstr "Meg kell adnia a naplófájl nevét és elérési útját."
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
+#: ../../locales/../src/interface/edithandler.cpp:1640
 #, fuzzy
 msgid "You need to enter a properly quoted command."
 msgstr "Meg kell adnia a proxy címét."
@@ -7770,17 +7982,17 @@
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "A proxy porthoz 1 és 65535 közötti értéket adjon meg."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Adja meg legalább az egyik elérési utat, mindkét kedvenc könyvtár nem lehet "
 "üres."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7788,7 +8000,7 @@
 "A szinkronizált böngészés használatához meg kell adnia a helyi és a távoli "
 "mappát is ehhez a kedvenc mappához."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7796,19 +8008,19 @@
 "A szinkronizált böngészés használatához meg kell adnia a helyi és a távoli "
 "mappát is ehhez az állomáshoz."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr "Meg kell adnia a helyi fájlt."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
 msgstr "Meg kell adnia a távoli fájlnevet."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
 msgstr "Meg kell adnia a távoli könyvtárat."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
 msgstr "Válassza ki a használni kívánt kedvenc állomást."
 
@@ -7820,34 +8032,49 @@
 "Tudnia kell csatlakoznia más kiszolgálókhoz, és a fájl átvitelnek "
 "megfelelően kell működnie."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#, fuzzy
+msgid "after"
+msgstr "Átvitel"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "kezdete"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "tartalmazza"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
 msgstr "vége"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
 msgstr "egyenlő"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:497
+#: ../../locales/../src/interface/filelistctrl.cpp:515
+#: ../../locales/../src/interface/filelistctrl.cpp:540
+#: ../../locales/../src/interface/filelistctrl.cpp:556
 msgid "file"
 msgstr "fájl"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr "fz3temp-lockfile"
 
@@ -7866,55 +8093,55 @@
 msgid "fzsftp could not be started"
 msgstr "Az fzsftp nem indítható el"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr "nagyobb, mint"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
 msgstr "csoport által futtatható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr "csoport által olvasható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr "csoport által írható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr "egyenlő"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr "bekapcsolt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr "kikapcsolt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "kisebb, mint"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr "mintaillesztése"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
 msgstr "tulajdonos által futtatható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
 msgstr "tulajdonos által olvasható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
 msgstr "tulajdonos által írható"
 
@@ -7922,18 +8149,21 @@
 msgid "unknown"
 msgstr "Ismeretlen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
 msgstr "mindenki által futtatható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr "mindenki által olvasható"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr "mindenki által írható"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Többszörös szűrőnév"
diff -Nru filezilla-3.5.3/locales/hy.po filezilla-3.7.3~precise/locales/hy.po
--- filezilla-3.5.3/locales/hy.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/hy.po	2013-05-06 03:30:13.000000000 +0000
@@ -6,30 +6,28 @@
 msgstr ""
 "Project-Id-Version: Հայերեն թարգմանություն\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-08-29 18:10+0400\n"
-"Last-Translator: Hrant Ohanyan <hrantohanyan@mail.am>\n"
+"POT-Creation-Date: 2013-04-30 22:56+0200\n"
+"PO-Revision-Date: 2013-05-01 11:19+0400\n"
+"Last-Translator: Hrant Ohanyan <h.ohanyan@haysoft.org>\n"
 "Language-Team: Hrant Ohanyan <hrantohanyan@mail.am>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
 "Language: hy\n"
 "Plural-Forms: nplurals=2; plural=(n > 1);\n"
-"X-Generator: Virtaal 0.5.2\n"
-"X-Poedit-Language: Armenian\n"
-"X-Poedit-Country: ARMENIA\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "Անցել է՝ %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "Մնացել է՝ %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -47,9 +45,9 @@
 msgstr[0] "%d թղթապանակ"
 msgstr[1] "%d թղթապանակներ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -58,9 +56,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -81,7 +79,7 @@
 msgstr[0] "%d ֆայլ։ Ընդհանուր չափը՝ ոչ քիչ քան %s"
 msgstr[1] "%d ֆայլեր։ Ընդհանուր չափը՝ ոչ քիչ քան %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d ֆայլեր են ավելացվել"
@@ -93,31 +91,21 @@
 msgstr[0] "%d վայրկյանում"
 msgstr[1] "%d վայրկյան"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Հոսթը"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Գաղտնաբառը"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d Բ/վ)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d ԿԲ/վ)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d Մբ/վ)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/վ)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (Բ/վ)"
@@ -132,7 +120,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ճիշտ չէ։"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Միջնորդ սպասարկիչ"
@@ -154,27 +142,17 @@
 msgstr[0] "%s բայթ"
 msgstr[1] "%s բայթ"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s բայթ"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s բայթ (%d Բ/վ)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s բայթ (%d.%d ԿԲ/վ)"
+msgid "%s bytes (%s/s)"
+msgstr "%s բայթ (%s/վ)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s բայթ (%d. %d Մբ/վ)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -185,9 +163,9 @@
 msgstr ""
 "%s-ը չի գտնվել։ Առանց այդ բաղադրիչի FileZilla, SFTP չի աշխատի։\n"
 "\n"
-"Բեռնեք ծրագիրը նորից և տեղակայեք։"
+"Կրկին բեռնեք ծրագիրը և տեղակայեք։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -208,154 +186,150 @@
 msgid "%s with %d bits"
 msgstr "%s %d բիթ"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
-msgstr "%u - Օգտվողի անունը"
+msgstr "%u - Օգտատերի անունը"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Միջնորդի գաղտնաբառը"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "&Ծրագրի մասին..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
-msgstr "&Գործածողի գրանցում."
+msgstr "&Գործածողը."
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Ակտիվ"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
 msgstr "&Ավելացնել էջանիշներին..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "&Ավելացնել ֆայլեր"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "&Ավելացնել ֆայլեր keyfile-ով..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "&Ավելացնել հերթում"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "&Կիրառել սպասարկիչի ժամանակավոր գոտու կարգավորումները."
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "&Միշտ կիրառել այս սերտիֆիկատը բոլոր աշխատաշրջանների համար։"
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Միշտ վստահել այս հոսթին"
 
-#: resources.h:939
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "&Միշտ օգտագործել ծրագրային խմբագիրը"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "&Միշտ օգտագործել չասոցացված ֆայլերի համար"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "&Միշտ օգտագործել այս գործողությունը"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr ""
 "&Ստանալ տեղեկություններ արտաքին IP հասցեի մասին՝ համակարգի կարգավորումներում"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Ինքնա"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "&Ինքնորոշում"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Կրկնակի"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 "&Կրկնակի մասնիկներ, որոնք օգտագործում են SI նշաններ։ (Օր.՝ 1 ԿԲ = 1024 բայթ)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Էջանիշներ"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Դիտել..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Հասանելի գերազանցում."
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "&Մերժել"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Ստուգել FileZilla-ի փորձարկվող տարբերակների առկայությունը"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
 msgstr "&Ջնջել անձնական տվյալները..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "&Փակել FileZilla"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
 msgstr "&Կարգավորել արագության սահմանափակումները..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Կարգավորել..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Միանալ"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Պատճենել"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Պատճենել գործող միացումները Կայքերի կառավարչում..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "&Պատճենել հիշոցում"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Վթար"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "&Ստեղծել թղթապանակ"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "&Ստեղծել նոր պատուհան"
 
@@ -363,168 +337,168 @@
 msgid "&Debug"
 msgstr "&Վրիպազերծել"
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "&Գրառում վրիպազերծումների գրանցումների ֆայլում."
 
-#: resources.h:932
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Ծրագրային խմբագիրը."
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "&Ծրագրային գործողություն, եթե ֆայլը գոյություն ունի..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Դադար՝ անհաջող միացումների ընթացքում."
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "&Ջնջել"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
 msgstr "&Ջնջել նշան-հղումը"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Համեմատել բաժինները"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Մերժել համակարգչի ֆայլը, բեռնել այն և վերականգնել խմբագրումը"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "&Անջատել"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "&Անջատվել սպասարկիչից"
 
-#: resources.h:875
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Միջին արագության փոխարեն ցուցադրել գործող արագությունը"
 
-#: resources.h:897
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Ցուցադրել ֆայլի չափը բայթերով"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "&Չհիշել գաղտնաբառերը"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Այլևս չցուցադրել։"
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
-msgstr "Չօգտագործել արտաքին IP հասցե՝ &լոկալ միացումների ժամանակ։"
+msgstr "Չօգտագործել արտաքին IP հասցե՝ &տեղային միացումների ժամանակ։"
 
-#: resources.h:919
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "&Գործողություն՝ մկնիկի կրկնակի սեղմամբ."
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Բեռնել"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "&Բեռնել."
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
 msgstr "&Բեռնում..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "&Բեռնումներ."
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "&Խմբագրել"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
 msgstr "&Խմբագրել ֆիլտրացման կանոնները..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Միացնել"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "&Թարմացումների ինքնաշխատ ստուգում"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "&Միացնել արագության սահմանափակումները"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "&Կոդավորումը."
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
-msgstr "&Կոդավորում."
+msgstr "&Կոդավորումը."
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
 msgstr "&Պատահական հրաման..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
-msgstr "&Կատարել"
+msgstr "&Գործարկել"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Արտածել Կայքերի կառավարչի գրառումները"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "&Արտածել..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Վերադառնալ ակտիվ եղանակին"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Ֆայլ"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Ֆայլի հատկությունները..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "&Ֆայլի թույլտվությունները ..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Ֆայլ."
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "&Ֆիլտրի պայմանները."
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Ֆիլտրերը."
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Ֆիլտրեր."
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Ավարտել"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "&Ավարտել խմբագրումը և ջնջել ֆայլը"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -532,477 +506,485 @@
 "&Հարթեցրեք հեռադիր ճանապարհները, բեռնեք բոլոր պարունակող ֆայլերը միանգամից "
 "հիմնական թղթապանակում։"
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Հետևելով հղում-նշանին ջնջել թղթապանակի պարունակությունը"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
 msgstr "&Ստանալ արտաքին IP հասցե հետևյալ տեղից."
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Ստանալ օգնություն..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Ընդհանուր էջանիշ"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 օգտագործվում է CONNECT եղանակը"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "&Օգնություն"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Թաքցնել նույնանման ֆայլերը"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Բարձրագույն"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
 msgstr "&Հասանելի ամենաբարձր պորտը."
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Հոսթը."
 
-#: resources.h:898
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC կրկնակի մասնիկներ (Օր.՝ 1 Կբիթ = 1024 բայթ)"
 
-#: resources.h:886
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (օրինակ՝ 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Ներմուծել..."
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "&Օգտագործել ֆայլերի համակարգային ասոցացումները"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Թողեք հեռադիր ճանապարհների կառուցվածքը՝ փնտրման խորքի համար"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "&Վահանակների դիրքը."
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
-msgstr "&Սահմանափակել լոկալ դարպասների օգտագործումը"
+msgstr "&Սահմանափակել տեղային դարպասների օգտագործումը"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "&Սահմանափակել միաժամանակյա միացումները"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "&Համակարգչի ֆայլերի &ցանկը"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "&Համակարգչային թղթապանակներ."
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Log to file"
 msgstr "&Կատարել գրառում"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
-msgstr "&Մուտքի տեսակը."
+msgstr "&Մուտքի եղանակը."
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
-msgstr "&Մուտքի տեսակը."
+msgstr "&Մուտքի եղանակը."
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "&Ցածր"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
 msgstr "&Խմբագրել էջանիշները..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "&Ձեռադիր փոխանցում..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&Կապուղիների մաքս. քանակը."
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Փորձերի մաք. քանակը."
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "&Հաղորդագրությունների պատուհան"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Թաքցնել ներքևում"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Անունը."
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
-msgstr "&Ցանցի կարգավորման վարպետ..."
+msgstr "&Ցանցի կարգավորման Օգնական..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
-msgstr "&Նոր"
+msgstr "&Նորը"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "&Նոր կայք"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Հասանելի է նոր տարբերակը."
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Առաջ »"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Ոչ"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Ոչ մի"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "&Նորմալ"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Քանի օրը մեկ ստուգել."
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Համարային նշանակում."
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&ԼԱՎ"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&ԲԱՑԵԼ"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Բացել"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "&Վերագրել"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Պասիվ"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Գաղտնաբառը."
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "&Վերարտադրել ձայն"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "&Դարպասը."
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "&Հաղորդագրությունների տողի դիրքը."
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Պահպանել ֆայլերի ժամանակավոր նշանները"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "&Առաջադրանք"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "&Արագ միացում"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "&Արագ միացման վահանակ"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Կարդում է"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "&Կրկնել միացումը"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Թարմացնել"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "&Հիշել գաղտնաբառը սեսիայի համար"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Հիշել գաղտնաբառերը"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "&Հեռադիր թղթապանակը."
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Հեռադիր ճանապարհը."
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Ջնջել"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "&Ջնջել բանալին"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "&Ջնջել ընտրվածը"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "&Անվանափոխել"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "&Անվանափոխել..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
-msgstr "&Նորից բացել լոկալ ֆայլը"
+msgstr "&Կրկին բացել համակարգչային ֆայլը"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "&Փոխել սխալ նշանները."
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "&Հաղորդել սխալի մասին..."
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "&Ետարկել և վերականգնել ֆայլերը հերթում"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
-msgstr "&Վերսկսել Վարպետը"
+msgstr "&Վերաբացել Օգնականը"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "&Շարունակել"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "&Կատարել հրաման..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
-msgstr "&Բացել կարգավորումների վարպետը..."
+msgstr "&Բացել կարգավորումների Օգնականը..."
 
-#: resources.h:950
+#: resources.h:976
 msgid "&Run update check now..."
 msgstr "&Ստուգել թարմացումները..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&ԿԱՅՔԸ"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
 msgstr "&Պահպանել որպես..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Փնտրել"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
 msgstr "&Փնտրել ֆայլեր սպասարկիչում..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "&Ընտրեք գրառումը."
 
-#: resources.h:930
+#: resources.h:951
 msgid "&Select language:"
 msgstr "&Ընտրել ծրագրի լեզուն."
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "&Ընտրեք ցուցադրվող սյուները."
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Սպասարկիչը"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Կարգավորումներ"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "&Կարգավորումներ..."
 
-#: resources.h:965
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "&Ցուցադրել վրիպազերծման ընտրացանկը"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "&Ցուցադրել հաղորդագրությունը"
 
-#: resources.h:955
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "&Ցուցադրել ֆայլի ստեղծման ժամանակը"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "&Կայքերի Կառավարիչ..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "&Որոշված էջանիշ"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "&Բաց թողնել"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "&Արագության սահմանափակում"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "&Սկսել փոխանցումը"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Տեղ-տեղ փոխել վահանակները"
 
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "&TLS չիպերներ"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Թեստ"
 
-#: resources.h:878
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Թեման."
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
-msgstr "&Փոխանցում"
+msgstr "&Փոխանցումներ"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "&Փոխանցման եղանակը."
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "&Առաջադրանքի պատուհանը"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&ASCII նշաններով ֆայլեր"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Ետարկել խմբագրումը"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Թարմացնել գրանցատեղի բանալին այս հոսթի համար"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
-msgstr "&Փոխանցել"
+msgstr "&Վերբեռնել"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
-msgstr "&Փոխանցումներ."
+msgstr "&Վերբեռնումներ."
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "&Օգտագործել ընտրված ծրագիր"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "&Օգտագործել համաժամանակեցված դիտումը"
 
-#: resources.h:934
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "&Օգտագործել համակարգչային խմբագրիչը տեքստային ֆայլերի համար"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "&Օգտագործել հետևյալ IP հասցեն."
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "&Օգտագործել սպասարկիչի արտաքին IP հասցեն."
 
-#: resources.h:901
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "&Օգտագործել բաժանիչ"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
-msgstr "&Օգտվող."
+msgstr "&Օգտատերը."
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
-msgstr "&Օգտվողի անունը."
+msgstr "&Օգտատերի անունը."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Տարբերակ %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "&Տեսքը"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Դիտել/Խմբագրել"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr "&Հետևել ֆայլերի խմբագրմանը և հուշել փոփոխությունների փոխանցման մասին"
+msgstr "&Հետևել ֆայլերի խմբագրմանը և հուշել փոփոխությունների վերբեռման մասին"
+
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "&Թարմացումները ստուգելիս ստուգել՝"
 
-#: resources.h:136
+#: resources.h:144
 msgid "&Write"
 msgstr "&Գրել"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Այո"
 
@@ -1020,17 +1002,33 @@
 msgstr "'%s' թղթապանակ չէ"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "'Գործածողի գրանցման' միջոցով մուտքը չի աջակցվում։"
+msgstr "'Գործածող' եղանակով մուտք չի աջակցվում։"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"'Նորմալ' և 'Գործածողը' եղանակները հասանելի չեն: Փոխարենը օգտագործեք 'Հարցնել "
+"գաղտնաբառը':"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"'Նորմալ' և 'Գործածողը' եղանակները հասանելի չեն: Փոխվել է 'Հարցնել "
+"գաղտնաբառով':"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'quote' - սա լոկալ հրաման է, որը օգտագործվում է հրամանի տողով՝ փաստարկները "
+"'quote' - սա տեղայի հրաման է, որը օգտագործվում է հրամանի տողով՝ փաստարկները "
 "սպասարկիչ ուղարկելու համար։ Կարող եք գրել raw հրաման՝ առանց օգտագործելու "
 "համար 'quote'։"
 
@@ -1042,120 +1040,116 @@
 msgstr[0] "(%d-ը ֆիլտրված է)"
 msgstr[1] "(%d-ը ֆիլտրված են)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(0 - առանց սահմանափակման)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 վայր.)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 - անջատված է"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(Մինիմում 7 օր)"
-
-#: resources.h:894
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(օր.՝. %H:%M)"
 
-#: resources.h:888
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(օր.՝ %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(%s/վ-ում)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", մնացել է %H:%M:%S"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- է մնացել"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
 msgstr "- firewall-ի կամ router-ի սխալ"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- Ֆայլը վնասված է"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- Malware Ձեր համակարգում"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "մնացել է՝ --:--:--"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c հնարավոր չէ օգտագործել FTP-ի հասցեի հետ։"
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l կարող է օգտագործվել միայն FTP-ի հասցեի հետ։"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s և -c չեն կարող միաժամանակ օգտագործվել։"
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s հնարավոր չէ օգտագործել FTP-ի հետ։"
 
-#: resources.h:967
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Ոչինչ"
 
-#: resources.h:968
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Զգուշացում"
 
-#: resources.h:969
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Ինֆո"
 
-#: resources.h:970
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Մանրամասն"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 բիթային համակարգ"
 
-#: resources.h:971
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Վրիպազերծում"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 բիթային համակարգ"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "« &Հետ"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1164,16 +1158,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Այս անունով արդեն կա։ Նշեք այլ անուն։"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Նշեք հիմնական խմբագրիչը։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Այս թղթապանակը չի կարող տեղափոխվել ենթաթղթապնակ։"
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1182,27 +1177,27 @@
 "Կան սպասարկիչներ, որոնք չեն թույլատրում օգտագործել պասիվ եղանակը, կամ նշված "
 "չեն համապատասխան կարգավորումներ։ Այս դեպքում անհրաժեշտ կլինի ակտիվ եղանակը։"
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Բացված ֆայլը փոփոխվել է։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Այս անունով ֆայլը խմբագրվում է։ Կրկի՞ն բացել '%s'-ը։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Այս անունով ֆայլ արդեն փոխանցվում է։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
-msgstr "Այս անունով ֆայլ դեռևս խմբագրվում է։ Փակեք այն և նորից փորձեք։"
+msgstr "Այս անունով ֆայլ դեռևս խմբագրվում է։ Փակեք այն և կրկին փորձեք։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1215,11 +1210,11 @@
 "Եթե խնդիրը չլուծվի, ապա հնարավոր է ֆայլերը բացակայեն ցանկից։\n"
 "Այլևս հաղորդագրություն չի ցուցադրվի։"
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Հասանելի է FileZilla-ի նոր տարբերակը։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1228,7 +1223,7 @@
 "թաքցնում են ֆայլերը։ Օգտագործեք այս կարգավորումները՝ ստիպելու համար "
 "սպասարկիչն ցուցադրելու բոլոր ֆայլերը։"
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1242,15 +1237,15 @@
 "Կատարվում է հեռադիր գործողություն և միացված է համաժամանակեցված դիտումը։\n"
 "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել թղթապանակի փոփոխությունները։"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "Ա&վելացնել"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "Թ&ույլատրել ASCII ֆայլերի փոխանցումը"
 
@@ -1260,57 +1255,57 @@
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "Կ&իրառել միայն փոխանցումներին"
+msgstr "Կ&իրառել միայն վերբեռնումներին"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "Կ&իրառել բոլոր ֆայլերին թղթապանակներին"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "Ջնջ&ել հաջողված բեռնումները"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "Միանալ այս պատուհանում"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "FileZilla-ի մասին"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Ֆայլերի ցանկից վեր"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
-msgstr "Գործածողի հաշվեկշիռ"
+msgstr "Գործածող"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Գործողություն՝ առաջադրանքը կատարելուց &հետո"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Գործողություն ընտրված ֆայլի հետ."
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Կատարել գործողություն."
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "Գործողություն."
 
@@ -1344,23 +1339,23 @@
 "հասցեն, սակայն Ձեր բաշխիչը կամ արգելապատնեշ ծրագիրը ճիշտ չէ փոփոխել "
 "ուղարկվող հասցեն։"
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "IP հասցեն՝ ակտիվ եղանակի համար"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "&Ֆայլերն ավելացնել միայն հերթում"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Ավելացնել ընտրված թղթապանակները հերթում"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Ավելացնել ընտրված թղթապանակները և ֆայլերը հերթում"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Ավելացնել առաջադրանք"
 
@@ -1368,46 +1363,59 @@
 msgid "Address type not supported"
 msgstr "Հասցեի տեսակը չի աջակցվում"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Լրացուցիչ"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Լրացուցիչ կարգավորումներ."
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Խորհուրդ. Եթե չեք ցանկանում փորձել ծրագրի նոր հնարավորությունները՝ "
+"օգտագործեք կայուն տարբերակը: Beta տարբերակները և nightly build-երը "
+"նախատեսված են փորձարկման համար: FileZilla-ի nightly build-երը հնարավոր է "
+"նորմալ չաշխատեն և անգամ վնասեն ձեր համակարգը: Այնպես որ զգույշ եղեք:"
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Ալգորիթմը."
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Բոլոր ֆայլերը հաջողությամբ փոխանցվել են"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Բոլոր դարպասները պետք է գտնվեն 1024-ի և 65535-ի միջև։"
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Բոլոր փոխանցումները ավարտվեցին։ %d ֆայլ չի փոխանցվել։"
 msgstr[1] "Բոլոր փոխանցումները ավարտվեցին։ %d ֆայլեր չեն փոխանցվել։"
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Թույլ &տալ վերադառնալ այլ եղանակի՝ ձախողման դեպքում"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Թույլ տալ վերադառնալ այլ եղանակի՝ ձախողման դեպքում"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Միացել է"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1415,7 +1423,7 @@
 "Որպես այլընտրանք կարելի է օգտագործել Pageant-ը՝ PuTTY ծրագրում՝ կոճակները "
 "հաստատելու համար։ FileZilla-ն կարող է աշխատել Pageant-ի հետ։"
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1423,7 +1431,7 @@
 "Որպես այլընտրանք կարելի է օգտագործել համակարգային SSH-ը։ Դրա համար համոզվեք, "
 "որ ընտրված է SSH_AUTH_SOCK նշանակությունը։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1431,7 +1439,7 @@
 "Կարող եք այցելել http://filezilla-project.org՝ վերջին տարբերակը բեռնելու "
 "համար։"
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1440,7 +1448,7 @@
 "Սխալ՝ փոխանցման հերթը \"%s\"-ից բացելիս։\n"
 "Հնարավոր է որոշ ֆայլեր չեն վերականգնվել։"
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1449,33 +1457,33 @@
 "Սխալ՝ փոխանցման հերթը \"%s\"-ում պահպանելիս։\n"
 "Հնարավոր է որոշ ֆայլեր չեն պահպանվել։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Այս անունով ֆայլ արդեն կա։"
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Անանուն"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Իրականացվում է հեռադիր գործողություն, այժմ հնարավոր չէ փոխել թղթապանակը։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Կայքերի Կառավարչի փոփոխությունները չեն պահպանվի։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1483,58 +1491,58 @@
 "Կայքերի Կառավարչի փոփոխությունները չեն պահպանվի, եթե չվերականգնեք ջնջված "
 "ֆայլը։"
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Ֆիլտրերի որևէ փոփոխություն չի պահպանվի։"
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Ֆիլտրերի որևէ փոփոխություն չի պահպանվի։"
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "Կիրա&ռել միայն թղթապանակներին"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Կիրառել"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Կիրառել միայն &այս առաջադրանքին"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "Կիրառել միայն &ֆայլերին"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Արխիվ"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Պատուհանի տեսքով առաջադրանքի տողում"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Հարցնել գործողության մասին"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Գաղտնաբառի հարցում"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
 msgstr "Հարցում օպերացիոն համակարգին՝ դարպասի համար։"
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "Հարցում օպերացիոն համակարգում արտաքին IP հասցեի մասին"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Հարցեր տալ FileZilla-ի Ֆորումում"
 
@@ -1542,39 +1550,35 @@
 msgid "Associated program not found:"
 msgstr "Չի գտնվել ասոցացված ծրագիր."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Առնվազն մեկ ֆիլտր ավարտված չէ"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "Պահանջվող տեղեկատվությունը հավաքված է։"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Հատկանիշ"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Ներկայացումը ձախողվեց։"
 
-#: resources.h:879
+#: resources.h:900
 msgid "Author:"
 msgstr "Հեղինակը."
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Ինքնա"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Ֆայլերի տեսակների սիստեմավորում"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Թարմացումների ծրագրային ստուգում"
-
-#: resources.h:883
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Հասանելի չափերը"
 
@@ -1583,131 +1587,131 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Նշան բայթերի համար։ Թարգմանել միայն առաջին տառը>"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
 msgstr "Շ&րջանցել միջնորդը"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Օգտագործման հիմնական ցուցումներ"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Դրությունը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Խմբագրվում է"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Փորձել տողի միացուցիչը"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Ուշադրություն. Սերտիֆիկատը մերժվել է"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "Կրկնակի"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Գրատախտակ"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Էջանիշ"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Էջանիշ."
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Էջանիշներ"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Թողարկման ամսաթիվը."
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
-msgstr "Կազմվածքի մասին"
+msgstr "Տարբերակի մասին"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Գործնեության տեսակը."
 
-#: resources.h:752
+#: resources.h:772
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"Ըստ ծրագրայինի օգտագործվում է հասանելի լոկալ դարպաս՝ ակտիվ եղանակում "
+"Ըստ ծրագրայինի օգտագործվում է հասանելի տեղային դարպաս՝ ակտիվ եղանակում "
 "փոխանցումների համար։ Եթե ցանկանում եք նշել մեկ ուրիշը, կատարեք դա ստորև։"
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "Չ&եղարկել այս գործողությունը"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Ս&տուգել FileZilla-ի 'Nightly' կառուցվածքը։"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "Ջ&նջել բոլորը"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Պատճենել հիշապահեստում"
 
-#: resources.h:887
+#: resources.h:908
 msgid "C&ustom"
 msgstr "Պ&ատահական"
 
-#: resources.h:942
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "Ֆ&այլերի ընտրովի ասոցացումներ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Ժամային գոտիների միջև տարբերության հաշվում..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Հնարավոր չէ՝ կարդալ ֆայլի տվյալները"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Հնարավոր չէ գրել տվյալներ ֆայլում։"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Հնարավոր չէ գրել տվյալներ %s ֆայլում"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "Մերժել"
 
-#: resources.h:989
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Մերժել ընթացիկ գործողությունը"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Մերժել ընթացիկ գործողությունը"
 
@@ -1716,11 +1720,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Մուտք չկա '%s'-ին։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Հնարավոր չէ ավելացնել սպասարկիչը Կայքերի Կառավարչում"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1733,40 +1737,40 @@
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
-"Հնարավորչ չէ համեմատել թղթապանակները, նշված են տարբեր ֆիլտրեր համակարգչային "
-"և հեռադիր թղթապանակների համար։"
+"Հնարավոր չէ համեմատել թղթապանակները, նշված են տարբեր ֆիլտրեր համակարգչային և "
+"հեռադիր թղթապանակների համար։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
-msgstr "Հնարավորչ չէ համեմատել թղթապանակները, չկա կապ սպասարկիչի հետ։"
+msgstr "Հնարավոր չէ համեմատել թղթապանակները, չկա կապ սպասարկիչի հետ։"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Հնարավոր չէ ստեղծել նոր ֆիլտր"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Հնարավոր չէ խմբագրել ֆայլը"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Հնարավոր չէ խմբագրել ֆայլը։ Չկա կապ սպասարկիչի հետ։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Հնարավոր չէ խմբագրել ֆայլը, ճանապարհը հայտնի չէ։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "Հնարավոր չէ հաստատել FTP միացում SFTP սպասարկիչի համար։"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Հնարավոր չէ բացել Արագ միացման վահանակը՝ ռեսուրսների ֆայլից"
 
@@ -1778,44 +1782,48 @@
 msgid "Cannot load keyfile"
 msgstr "Հնարավոր չէ բացել բանալի-ֆայլը"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Հնարավոր չէ բացել գործիքաշերտը ռեսուրսների ֆայլից"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Հնարավոր չէ հիշել գաղտնաբառը"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Հնարավոր չէ անվանափոխել"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Հնարավոր չէ անվանափոխել ֆայլը"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Հնարավոր չէ պահպանել ֆիլտրերը"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Հնարավոր չէ ընտրել ֆիլտրը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Հնարավոր չէ ասոցացնել ֆայլը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Հնարավոր չէ ցուցադրել երկխոսության պատուհանը"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Հնարավոր չէ դիտել/խմբագրել ընտրված ֆայլը"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Բաժիններ"
 
@@ -1823,60 +1831,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Սերտիֆիկատը և տեղեկությունը աշխատաշրջանի մասին հասանելի չեն։"
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Տեղեկության սերտիֆիկատի մասին"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Տեղեկության սերտիֆիկատի մասին."
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Սերտիֆիկատը տրվել է"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Փորձ."
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Փոխել ֆայլի հատկանիշը"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Փոխել ֆայլի լիազորությունները։"
 
-#: resources.h:963
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Փոփոխությունը ուժի մեջ մտնելու համար պահանջվում է FileZilla-ի վերամեկնարկում։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Նշաների կոդավորման սխալ"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Կոդավորումը"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "&Ստուգել փորձարկվող տարբերակները"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
 msgstr "Ստուգել &թարմացումները..."
 
-#: resources.h:551
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Ինքնավար ստուգել FileZilla-ի &թարմացումները."
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
 msgstr "Ստուգել FileZilla-ի նոր տարբերակի առկայությունը"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Թարմացումների ստուգում"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Հնարավոր չեղավ ստուգել թարմացումները"
 
@@ -1884,21 +1892,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Ստուգվում է ճիշտ արտաքին IP հասցեն"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
 msgstr "Ստուգվում է թարմացումների առկայությունը"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Չի համապատասխանում բեռնվող ֆայլի հանրագումարը։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Ընտրել համակարգչային հիմնական թղթապանակը"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Ընտրել թղթապանակ համակարգչում"
 
@@ -1906,43 +1914,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Որոշ տվյալներ ճիշտ չեն ջնջվել"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Նիշը."
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "Փակ&ել պատուհանը"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Դասական"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "Ջնջել &Կայքերի Կառավարչի գրառումները"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "Ջնջել &հիշոցը"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "Ջնջել &արագ միացման պատմությունը"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "Ջնջել &միացման մասին տեղեկությունները"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Ջնջել &հերթը"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Ջնջել պատմությունը"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1950,11 +1958,11 @@
 msgid "Clear private data"
 msgstr "Ջնջել անձնական տվյալները"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Մաքրել միացման տողը"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Մաքրել տողի միացուցիչը"
 
@@ -1962,24 +1970,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Սեղմեք 'Ավարտել'՝ կազմաձևումը պահպանելու համար։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Սեղմեք 'Առաջ'՝ բեռնումը սկսելու համար։"
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "MAC-ի սպասրկիչ ծրագիր."
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Սպասարկիչ ծրագրի շիֆրը."
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "Փակել &բոլոր այլ պատուհանները"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Փակել FileZilla-ն"
 
@@ -1987,11 +1995,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Փակել FileZilla-ի բոլոր բացված օրինակները"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Փակել այս պատուհանը"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "Մեկ&նաբանություններ."
 
@@ -1999,11 +2007,11 @@
 msgid "Column properties"
 msgstr "Սյան հատկությունները"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Սյան կարգավորում"
 
-#: resources.h:937
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Հրամանը պետք է լինի չակերտներում։"
 
@@ -2022,9 +2030,9 @@
 msgstr "Հրամանը չի աջակցվում"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Հրամանը."
 
@@ -2032,7 +2040,7 @@
 msgid "Comment"
 msgstr "Մեկնաբանություններ."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Ընդհանուր անունը."
 
@@ -2041,15 +2049,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Կապը ընդհատվել է router-ի կամ firewall-ի կողմից"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "Համեմատել &փոփոխման ժամանակը"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Համեմատել ֆայլերի &չափը"
 
-#: resources.h:917
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Համեմատման &ժամանակային դադար (րոպե)."
 
@@ -2057,60 +2065,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Համեմատման &ժամանակային դադարը պետք է լինի 0-ի և 1440րոպեի միջև։"
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Մշակված՝"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Հենքը՝"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Մշակված է ըստ."
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Մշակման նիշերը."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Սեղմված է"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
-msgstr "Փոխանցումների քանակը"
+msgstr "Զուգահեռ փոխանցումներ"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Զգայուն է &գրանցատեղի նկատմամբ"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Կազմաձևման թեստ"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Պասիվ եղանակի կարգավորում"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Դարպասների կազմաձևում"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "Կարգավորել FileZilla-ն և Ձեր ցանցը"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Հաստատեք ջնջումը"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Պահանջվում է հաստատում"
 
@@ -2118,7 +2126,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Շնորհավորում ենք, Ձեր կազմաձևումը աշխատում է։"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Միանալ՝ շրջանցելով միջնորդը"
 
@@ -2126,34 +2134,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Միանալ սպասարկիչին Կայքերի Կառավարչից"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Միացել է"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Միացում"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Միանում է %s-ին"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Միանում է %s-ին՝ միջնորդված"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Միանում է %s-ին..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Միացում սպասարկիչին"
 
@@ -2161,17 +2169,17 @@
 msgid "Connection"
 msgstr "Միացում"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
 msgstr "Հնարավոր չէ միանալ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Հնարավոր չէ միանալ \"%s\"-ին, փորձվում է այլ հասցե։"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Հնարավոր չէ միանալ \"%s\"-ին։"
@@ -2179,18 +2187,18 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
-msgstr "Միացումը ընդհատվել է օգտվողի կողմից"
+msgstr "Միացումը ընդհատվել է օգտատերի կողմից"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:543
 msgid "Connection closed"
 msgstr "Միացումը անջատվել է"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Միացումը անջատվել է սպասարկիչի կողմից"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Կապը հաստատված է, որոշվում է TLS-ն..."
@@ -2199,7 +2207,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Կապը հաստատված է, HTTP հարցում"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Կապը հաստատված է, սպասվում է հրավեր..."
 
@@ -2215,15 +2223,15 @@
 msgid "Connection refused"
 msgstr "Կապը մերժված է"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Գերազանցվել է սպասման ժամանակը"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Գերազանցվել է սպասման ժամանակը։"
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Սպասարկիչի հետ կապը կորցվել է։"
 
@@ -2243,27 +2251,23 @@
 msgid "Convert keyfile"
 msgstr "Փոխարկել բանալի-ֆայլը"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Պատճ&ենել"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Պատճենվում է (%d)-ը %s-ից"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Պատճենել %s-ից"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Պատճենել ընտրված գրառման URL-ները գզրոց։"
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Հնարավոր չէ միանալ. %s"
@@ -2273,16 +2277,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Հնարավոր չէ ավելացնել Կայքերի Կառավարիչում"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Հնարավոր չէ ավարտել գործողությունը"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Հնարավոր չէ միանալ սպասարկիչին"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Հնարավոր չէ միանալ սպասարկիչին. %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Հնարավոր չէ ձևափոխել հրամանը սպասարկիչի կոդավորման"
 
@@ -2291,17 +2299,17 @@
 msgid "Could not convert private key"
 msgstr "Հնարավոր չէ փոխակերպել գաղտնի բանալին"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Հնարավոր չէ պատճենել հասցեները"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Հնարավոր չէ պատճենել տվյալները"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2310,11 +2318,11 @@
 "Հնարավոր չէ որոշել Drag&Drop-ի գործողությունը։\n"
 "Կամ կան տեղակայման սխալներ կամ Դուք չեք վերցրել ֆայլեր։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Հնարավոր չէ միանալ սպասարկիչին"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2325,24 +2333,24 @@
 "Տեղավորեք FileZilla-ի ծրագրային գրադարանը՝ օգտագործելով հրաման. '--datadir "
 "<ճանապարհը>'։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Հնարավոր չէ ստեղծել պատահական մուտքային հղում։"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 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:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr "Հնարավոր չէ ստանալ սերտիֆիկատի անունը, սխալ gnutls_x509_get_dn-ում"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Հնարավոր չէ ստանալ ամբողջական ճանապարհը։"
 
@@ -2351,15 +2359,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Հնարավոր չէ ստանալ պատասխան fzputtygen-ից։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr "Բացակայում է ժամանակավոր ֆայլերի թղթապանակը։"
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "Հնարավոր չէ բացել սերտիֆիկատորները, սխալ gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2384,7 +2392,7 @@
 msgid "Could not load private key"
 msgstr "Հնարավոր չէ բացել գաղտնի բանալին"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2394,7 +2402,7 @@
 "Չկա մուտք համակարգչային թղթապանակին, որը համապատասխանում է հեռադիր '%s'-ին։\n"
 "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռադիր թղթապանակի փոփոխումը։"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2414,9 +2422,9 @@
 "Չկա մուտք հեռադիր թղթապանակին, որը համապատասխանում է համակարգչային '%s'-ին։\n"
 "Համաժամանակեցված դիտումը անջատվել է։"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Հնարավոր չէ օգտագործել հիշապահեստը"
 
@@ -2431,11 +2439,11 @@
 msgid "Could not parse remote path."
 msgstr "Հնարավոր չէ որոշել հեռադիր ճանապարհը։"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Հնարավոր չեղավ որոշել սպասարկիչի հասցեները."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Հնարավոր չէ ստանալ տվյալներ դարպասից %s"
@@ -2444,12 +2452,12 @@
 msgid "Could not read server item."
 msgstr "Հնարավոր չեղավ կարդալ սպասարկիչի տվյալները։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Հնարավոր չէ գտնել դիրքը %s ֆայլում"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Հնարավոր չէ գտնել ֆայլի վերջը"
 
@@ -2457,22 +2465,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Հնարավոր չէ հրաման ուղարկել fzputtygen-ին։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Հնարավոր չէ օգտագործել I/O գործողությունը!"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Հնարավոր չէ հաստատել միջնորդավորված միացումը. %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Հնարավոր չէ սկսել փոխանցումը"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2491,7 +2499,7 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "Հնարավոր չէ գրել \"%s\", ընդհանուր էջանիշը չի պահպանվել. %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2500,14 +2508,14 @@
 "Հնարավոր չէ գրել \"%s\", առաջադրանքը չի պահպանվել։\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Հնարավոր չէ գրել \"%s\", հնարավոր չէ արտածել ընտրված ֆայլերը. %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Հնարավոր չէ գրել \"%s\". %s"
@@ -2517,7 +2525,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Հնարավոր չէ գրանցել գաղտնի բանալին. %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Հնարավոր չէ գրել համակարգչային ֆայլում"
 
@@ -2527,39 +2535,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Հնարավոր չէ գրառել %s-ում"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Հնարավոր չէ գրանցել տվյալները. %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Երկիրը."
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Հանգեցնում է FileZilla-ի խափանմանը։ Օգտագործվում է միայն վրիպազերծման "
 "բացառությունները մշակելու համար։"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "Ստեղ&ծել նոր ֆայլ"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Ստեղծել թղթապանակ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Ստեղծել նոր՝ դատարկ ֆայլ այս թղթապանակում"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Ստեղծել թղթապանակ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Ստեղծել դատարկ ֆայլ"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Ստեղծվում է թղթապանակ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Ստեղծվում է '%s' թղթապանակը..."
@@ -2577,7 +2597,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Կրիտիկական սխալ՝ %s-ի փոխանցման ժամանակ %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2598,52 +2618,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Ընտրված է binary եղանակը։"
 
-#: resources.h:773 resources.h:893
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "Պատահա&կան"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Ֆիլտրերի որոշված տեսակ"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Ընտրված սպասարկիչ"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "Ֆ&այլերի տեսակը"
 
-#: resources.h:900
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "SI նշաններ (օր.՝, 1 ԿԲ = 1000 բայթ)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "Ըս&տ ծրագրայինի"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "Ջ&նջել"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Ա&րգելել բոլորը"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "Նշեք գաղտնաբառը"
 
-#: resources.h:924
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "Գ&ործողություն մկնիկի կրկնակի սեղմամբ."
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr "Կ&րկնօրինակել"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-ի տեսքով՝վիրտուալ ճանապարհով"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Ֆայլերի վտանգավոր տեսակներ"
 
@@ -2651,16 +2675,16 @@
 msgid "Data"
 msgstr "Տվյալներ"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Տվյալների դարպասը շուտ է փակվել։"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Ամսաթիվը."
 
-#: resources.h:884
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Ամսաթվի ձևը"
 
@@ -2679,31 +2703,31 @@
 msgid "Debug"
 msgstr "Վրիպազերծում"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Վրիպազերծման կարգավորումներ"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Համակարգչային հիմնական &թղթապանակը."
 
 #: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
-msgstr "Ըստ լռելյայնի (Ինքնորոշում)"
+msgstr "Ըստ ծրագրայինի (Ինքնորոշում)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Ծրագրային խմբագիրը սխալ է ընտրված։"
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Եթե ֆայլը կար ծրագրային գործողությունը"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Հ&եռադիր հիմնական թղթապանակը."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2715,17 +2739,17 @@
 msgid "Default system language"
 msgstr "Համակարգային լեզուն"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Փոխանցման եղանակը."
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
-msgstr "Փոխանցման եղանակը ըստ լռելյայնի."
+msgstr "Փոխանցման եղանակը ըստ ծրագրայինի."
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
-msgstr "Ըստ լռելյայնի. http://ip.filezilla-project.org/ip.php"
+msgstr "Ըստ ծրագրայինի. http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
@@ -2743,57 +2767,57 @@
 msgstr[0] "Սպասում է միացման %d վայրկյանից անհաջող միացումից հետո..."
 msgstr[1] "Սպասում է միացման %d վայրկյանից անհաջող միացումից հետո..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Ջնջել Կայքերի Կառավարչից"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Ջնջել ընտրված թղթապանակը"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Ջնջել ընտրված ֆայլերը և թղթապանակները"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Թղթապանակները ջնջվում են"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Իրար հետ կապ չունեցող մի քանի թղթապանակների ջնջումը չի աջակցվում։"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Նշանային հղման ջնջում"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Desktop"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Մանրամասն"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Նոր բանալու մանրամասները."
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "Թղթա&պանակներ"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
-msgstr "Դեպի"
+msgstr "Դեպի՝"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Թղթապանակ"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Թղթապանակների համեմատում"
 
@@ -2809,80 +2833,79 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "Թղթապանակների ցանկի կառուցումը ընդհատվել է օգտվողի կողմից"
+msgstr "Թղթապանակների ցանկի կառուցումը ընդհատվել է օգտատերի կողմից"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Հնարավոր չեղավ կառուցել թղթապանակների ցանկը"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Թղթապանակների ցանկի կառուցման ֆիլտրեր"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "Փոխանցումները ավարտվեցին"
+msgstr "Թղթապանակների կազմը ստացվեց"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "Արգել&ել բոլորը"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Անջատե՞լ համաժամանակեցված դիտումը և շարունակել հեռադիր թղթապանակի փոփոխումը։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "Անջատեք այս ընտրանքը, եթե թղթապանակի բովանդակությունը սխալ կդիտվի։"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Անջատվում է սպասարկիչից"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Անջատում սպասարկիչից"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Անջատված է սպասարկիչից. %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Անջատվում է նախորդ սպասարկիչից"
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Անջատվում է ընթացիկ սպասարկիչից"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "Ցուցադրել 'Ծրագրի մասին' պատուհանը"
 
-#: resources.h:933
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "Չօ&գտագործել ծրագրային խմբագիրը"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "Ոչինչ &չանել"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2891,8 +2914,8 @@
 "Եթե չեք ցանկանում փորձարկել նոր հնարավորությունները, օգտագործեք կայուն "
 "տարբերակը։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Փակե՞լ FileZilla-ն։"
 
@@ -2905,7 +2928,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Ջնջե՞լ բոլոր կարգավորումները Կայքերի Կառավարչից։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Ջնջե՞լ ընտրված գրառումը։"
 
@@ -2913,33 +2936,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Ջնջե՞լ ընտրված առաջադրանքը։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Փոխանցե՞լ '%s'-ը սպասարկիչի վրա։"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Թղթաբանություն"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "Չօգտագործել արտաքին IP հասցեն &համակարգիչների միջև միացումների համար։"
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Ֆայլերը կետերով, դա այն է, որ ֆայլի անունը սկսվում է կետով, օր.՝ .htaccess"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Մկնիկի կրկնակի սեղմում"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "Բեռնել"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "Բեռնման &սահմանափակում."
 
@@ -2952,98 +2975,111 @@
 msgid "Download limit: none"
 msgstr "Բեռնման սահմանափակումներ. չկան"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Բեռնել փնտրման արդյունքը"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Բեռնել ընտրված թղթապանակը"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Բեռնել ընտրված ֆայլերը և թղթապանակները"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Բեռնելու արագ-ը. %s/վ\n"
+"Վերբեռնելու արագ-ը. %s/վ"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Բեռնվում է"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Բեռնվում է %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Մի քանի իրար հետ չկապված թղթապանակերի բեռնումը չի աջակցվում։"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Բեռնվում է փնտրման արդյունքները"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 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/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Drag&drop-ը տարբեր սպասարկիչների միջև անհասանելի է։"
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr "Կ&րկնօրինակել"
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "Թ&ույլատրել բոլորը"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "&Բացել թղթապանակը"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "Կ&իրառել"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
-msgstr "Դուր&ս գալ"
+msgstr "Փակ&ել"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "E-Mail-ը."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Յուրաքանչյուր ֆիլտրը պետք է ունենա գոնե մեկ պայման։"
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Խմբագրել ֆիլտրերը"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
-msgstr "Խմբագրել ընտրված ֆայլը և փոխանցել սպասարկիչի վրա։"
+msgstr "Խմբագրել ընտրված ֆայլը և վերբեռնել սպասարկիչ։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Հնարավոր չէ խմբագրել"
 
-#: resources.h:881
+#: resources.h:902
 msgid "Email:"
 msgstr "Email-ը."
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Դատարկ հրաման"
 
@@ -3051,7 +3087,7 @@
 msgid "Empty command."
 msgstr "Դատարկ հրաման։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Թղթապանակներ չկան"
 
@@ -3063,99 +3099,113 @@
 msgid "Empty file extension."
 msgstr "Ֆայլի ընդլայնումը հայտնի չէ։"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Նշեք ֆիլտրի անունը։"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Դատարկ անուն"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Դատարկ տող։"
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "Մի&ացնել բոլորը"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "Թույլատրել &սխալ նշանների ֆիլտրացիան"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Կոդավորված"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
-msgstr "Կոդավորում"
+msgstr "Կոդավորումը"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
 msgstr "Կոդավորման տվյալները"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Ավարտել համեմատումը և փոփոխել դասավորման կարգը։"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
 msgstr "Գրել &հրաման..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Մուտքագրեք 0՝ սահմանափակումները անջատելու համար։"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Նշեք հրաման"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Նշեք հրաման"
 
-#: resources.h:925
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Մուտք թղթապանակին"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Նշեք ֆիլտրի անունը"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Նշեք ֆիլտրերի անունը"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Ֆիլտրերի նոր անունը"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Նշեք գաղտնաբառը"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Բացել թղթապանակը"
 
-#: resources.h:719
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
-msgstr ""
-"Նշեք սպասարկիչի հասցեն։\n"
-"Նշեք FTP պրոտոկոլը (ftp://)։\n"
-"Կարող եք գրել նաև URL-ն՝ protocol://user:pass@host:port։"
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
+msgstr ""
+"Նշեք սպասարկիչի հասցեն:\n"
+"Որոշելու համար սպասարկիչի արձանագրությունը՝ հոսթը ավելացրեք արձանագրության "
+"որոշիչով: Եթե արձանագրությունը նշված չէ՝ կօգտագործվի ծրագրայինը (ftp://):\n"
+"Այստեղ կարող եք նաև նշել ամբողջական URL-ներ՝ protocol://user:pass@host:port, "
+"մյուս դաշտերի նշանակումները հետո կվերագրվեն:\n"
+"\n"
+"Աջակցվում են հետևյալները՝\n"
+"- ftp:// նորմալ FTP-ի համար\n"
+"- sftp:// SSH ֆայլի փոխանցման արձանագրությունը\n"
+"- ftps:// FTP over TLS (implicit)\n"
+"- ftpes:// FTP over TLS (explicit)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3166,17 +3216,17 @@
 "Նշեք գաղտնաբառ՝ '%s' ֆայլի համար։\n"
 "Ձևափոխված ֆայլը պաշտպանված չի լինի գաղտնաբառով։"
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
 msgstr ""
 "Նշեք սպասարկիչի դարպասի համարը։\n"
-"Ըստ ծրագրայինի՝ FTP-ն դա 21 է,SFTP-ի համար 22 է։"
+"Ըստ ծրագրայինի՝ FTP-ն դա 21 է, SFTP-ի համար 22 է։"
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
 msgid "Enter username and password"
-msgstr "Նշեք օգտվողի անունը և գաղտնաբառը"
+msgstr "Նշեք օգտատերի անունը և գաղտնաբառը"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
@@ -3188,7 +3238,7 @@
 msgid "Error importing"
 msgstr "Սխալ՝ ներմուծման"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Հերթի բացման սխալ"
 
@@ -3197,27 +3247,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Սխալ՝ xml ֆայլը բացելիս"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Հերթի պահպանման սխալ"
 
@@ -3228,72 +3278,80 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Սխալ՝ xml ֆայլում գրելիս"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Սխալ, ֆայլի տեսակը անհայտ է։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Սխալ։ Ֆայլը համակարգչից հանարավոր չէ ջնջել։"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Սխալ."
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Կապ հաստատել նոր պատուհանում"
 
-#: resources.h:944
+#: resources.h:971
+msgid "Every month"
+msgstr "Ամեն ամիս"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "Ամեն երկու շաբաթ"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Օրինակ՝ png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:924
 msgid "Examples"
 msgstr "Օրինակներ"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
-msgstr "Կատարել"
+msgstr "Գործա&րկել"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
-msgstr "Կատարելի"
+msgstr "Գործարկելի"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr "Չկա տարբերակի մասին տեղեկությունը։ Հնարավոր չէ ստուգել թարմացումները։"
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Ուղեցույց"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Արտածել &առաջադրանքը"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "Կարգավորումների &արտածում"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Կարգավորումների արտածում"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "Ֆ&իլտրի անունը."
 
@@ -3301,7 +3359,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Ֆայլերի փոխանցման արձանագրություն"
 
@@ -3313,25 +3371,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Ֆայլերի փոխանցման արձանագրությունը վստահելի չէ"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-ի հենքը որոշված չէ, հնարավոր չէ միանալ"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP միացման աջակցում"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP միջնորդ"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP հասցե"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3347,26 +3405,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP՝ անորոշ TLS/SSL-ով"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Հնարավոր չէ փոխել թղթապանակը"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Հնարավոր չէ փոխել լեզուն"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Հնարավոր չէ ստուգել FileZilla-ի նոր տարբերակի առկայությունը!"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Հնարավոր չէ պատճենել կամ տեղափոխել կայքերը"
 
@@ -3374,42 +3432,42 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Հնարավոր չէ ստեղծել xml ֆայլի պահեստային օրինակը"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Հնարավոր չէ ստեղծել դարպասի լսիչ, մերժվում է"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Հնարավոր չէ ստեղծել դարպասի լսիչ՝ փոխանցման ակտիվ եղանակի համար"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
-msgstr "Հնարավոր չէ բեռնել FileZilla-ի նոր տարբերակը!"
+msgstr "Հնարավոր չէ բեռնել FileZilla-ի նոր տարբերակը"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "'My Documents'-ի ճանապարհը հասանելի չէ"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "'Desktop '-ի ճանապարհը հասանելի չէ"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "Հնարավոր չեղավ ստանալ peer հասցեն։ Կապը անջատվեց։"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Հնարավոր չեղավ ստանալ peer հասցեն՝ տվյալների փոխանցման համար։ Կապը անջատվեց։"
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Հնարավոր չէ որոշել FTP-ի մղիչը!"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Հնարավոր չէ որոշել TLS-ի մղիչը!"
@@ -3423,24 +3481,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Հնարավոր չէ բացել գաղտնի բանալին. %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Հնարավոր չէ բացել \"%s\" ավելացնելու/գրելու համար"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Հնարավոր չէ բացել \"%s\" կարդալու համար։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Հնարավոր չէ բացել \"%s\" գրելու համար։"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Հնարավոր չէ որոշել վերադարձված ճանապարհը։"
 
@@ -3448,7 +3506,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Սխալ՝ խորքային սերտիֆիկատը որոշելիս։"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Հնարավոր չէ ստանալ տվյալները։"
 
@@ -3460,17 +3518,17 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, գործողությունը մերժվել է"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
-msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, օգտագործվում է լոկալ հասցե"
+msgstr "Հնարավոր չեղավ որոշել արտաքին IP հասցեն, օգտագործվում է տեղային հասցե"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
-msgstr "Հնարավոր չեղավ որոշել լոկալ IP հասցեն։"
+msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "Հնարավոր չեղավ որոշել լոկալ IP հասցեն։ Մերժվում է"
+msgstr "Հնարավոր չեղավ որոշել տեղային IP հասցեն։ Մերժվում է"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
@@ -3480,36 +3538,36 @@
 msgid "Failed to send command."
 msgstr "Հնարավոր չէ ուղարկել հրաման։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "Հնարավոր չէ անցնել %s (%s) լեզվին, օգտագործվում է ծրագրային լեզուն"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, 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:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "Հնարավոր չէ անցնել %s (%s) լեզվին, օգտագործվում է ծրագրային լեզուն։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն (%s, %s)։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Հնարավոր չէ անցնել %s լեզվին, օգտագործվում է ծրագրային լեզուն։"
@@ -3518,7 +3576,7 @@
 msgid "Failed to validate settings"
 msgstr "Կարգավորումները ճիշտ չեն"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Հնարավոր չէ ստուգել սերտիֆիկատը"
 
@@ -3535,21 +3593,19 @@
 msgid "Failed transfers"
 msgstr "Չհաջողված փոխանցումներ"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "Վերադարձ ակտիվ եղանակաին"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "Ֆայ&լ."
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "Ֆայ&լեր"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Ֆայլ"
 
@@ -3565,7 +3621,7 @@
 msgid "File editing"
 msgstr "Խմբագրել ֆայլը"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Ֆայլը գոյություն ունի"
 
@@ -3573,7 +3629,7 @@
 msgid "File exists action"
 msgstr "Գործողություն ,եթե ֆայլը գոյություն ունի"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Ֆայլը փոխվել է"
 
@@ -3581,14 +3637,14 @@
 msgid "File lists"
 msgstr "Ֆայլերի ցանկը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Ֆայլը չի գտնվել"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "File search"
 msgstr "Փնտրել ֆայլ"
 
@@ -3623,25 +3679,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Ֆայլը հաջողությամբ է փոխանցվել, փոխանցվել է %s %s-ում"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Ֆայլը փոխանցվում է։"
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Ֆայլը փոխանցվելու է ASCII տիպի տվյալներով։"
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Ֆայլը փոխանցվելու է binary տիպի տվյալներով։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-ի սխալ"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3649,75 +3705,75 @@
 "FileZilla-ն կարող է փորձարկել կազմաձևման ձևը՝ համոզվելու համար, որ դրանք "
 "ճիշտ են։"
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla-ն արդեն միացել է սպասարկիչին։"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla-ն աշխատում է 'kiosk' եղանակով։\n"
-"Այս եղանակում 'Նորմալ' և 'Գործածող' ֆունկցիաները հասանելի չեն։"
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "Վերամեկնարկեք FileZilla-ն՝ լեզուն փոխելու համար։"
 
-#: resources.h:517
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla-ի թարմացումները"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "Դրության &տողը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Ֆայլի անունը"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "Ֆիլտրեր՝ &ֆայլի անունով..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Հնարավոր չէ նշել %s թղթապանակի %s ֆայլի անունը"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Ֆայլի անունը սխալ է"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Ֆայլի անվան մեջ չպետք է լինեն հետևյալ նշանները՝ / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Ֆայլի անունը չի փոխվել"
 
-#: resources.h:307 resources.h:957
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Ֆայլի անունը."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Ֆայլի անվան մեջ չպետք է լինեն այս նշանները. / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Ֆայլի անվան մեջ չպետք է լինեն այս նշանները. / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Խմբագրվող ֆայլեր"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Չափը"
@@ -3726,68 +3782,68 @@
 msgid "Filesize format"
 msgstr "Ֆայլի չափի ձևը"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Ֆայլի տեսակը"
 
-#: resources.h:945
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Ասոցացումներ"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Կիրառել ֆիլտր՝"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Ֆայլի անունում ֆիլտրի սխալ նշաններ"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Այս անունով արդեն կա"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Բաղադրիչներ, որոնք համապատասխանում են բոլոր հետևյալներին"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr "Բաղադրիչներ, որոնք համապատասխանում են բոլոր հետևյալներին"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
 msgstr "Բաղադրիչներ, որոնք չեն համապատասխանում բոլոր հետևյալներին"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Այս ֆիլտրը արդեն գոյություն ունի"
 
-#: resources.h:995
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Թղթապանակների ցանկի ֆիլտր"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Հնարավոր չէ ստուգել ֆիլտրը"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Հաշվեգումար MD5."
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Հաշվեգումար SHA-1."
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Հաշվեգումարը."
 
@@ -3795,21 +3851,21 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Արգելապատնեշ ծրագրի կազմաձևման ծրագիր"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
 "Կարգավորումների մասին լրացուցիչ տեղեկանալու համար բացեք ցանցի կարգավորման "
-"վարպետը։"
+"Օգնականը։"
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Ապահովության համար դարպասների միջև տարբերությունը պետք է լինի ոչ պակաս քան "
 "10։"
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3817,31 +3873,31 @@
 "Այս աշխատաշրջանում օգտագործվելու են ծրագրային կարգավորումները։ "
 "Կարգավորումների փոփոխությունները չեն պահպանվի։"
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "UTF-8՝ &ստիպողաբար"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "Ցուցադրել &թաքնված ֆայլերը"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Ցուցադրել թաքնված ֆայլերը"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Ձևի դասակարգում."
 
-#: resources.h:943
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Ձևը. ընդլայնումը \"հրաման\" հատկանիշներ։"
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Մանրամասն թղթաբանություն"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Ընդհանուր"
 
@@ -3849,21 +3905,21 @@
 msgid "General SOCKS server failure"
 msgstr "SOCKS սպասարկիչի ձախողում"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Հիմնական միջնորդը"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
 msgstr "Ստանալ արտաքին IP հասցեն հետևյալ URL-ից։"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Օգնություն"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Այս անունով ֆիլտրեր կան։ Փոխարինե՞լ։"
 
@@ -3871,15 +3927,15 @@
 msgid "Global bookmarks"
 msgstr "Ընդհանուր էջանիշներ"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Խմբի լիազորությունները"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "Բ&արձր"
 
@@ -3887,21 +3943,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP TLS-ի միջոցով"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Թաքնված"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Բարձր"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Բարձրագույն"
 
@@ -3909,25 +3965,25 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Դարպասի ամենամեծ նշանակումը պետք է լինի 1024-ի 65535-ի միջև։"
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Սեղմած պահեք SHIFT-ը՝ միաժամանակ երկու կողմի համար ֆիլտրը միացնելու համար։"
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Վեբ կայքը."
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Հոսթի բանալու հանրագումարը."
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Հոսթի բանալին չի համընկնում"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։"
 
@@ -3935,20 +3991,20 @@
 msgid "Host unreachable"
 msgstr "Հոսթը հասանելի չէ"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Հոսթ."
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "Ժամ,"
 
-#: resources.h:892
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (Օր.՝ 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 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 "
@@ -3957,11 +4013,11 @@
 "Եթե գործողության ընթացքում տվյալները չփոխանցվեն այս ժամանակում, ապա կապը "
 "կընդհատվի և FileZilla-ն կփորձի կրկնել միացումը։"
 
-#: resources.h:973
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "Սխալների մասին հաղորդելու համար ընտրեք \"Մանրամասն\" ցանկում։"
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -3971,15 +4027,15 @@
 "Եթե թեստը հաջող է, բայց Դուք չեք կարողանում փոխանցել ֆայլեր, ապա փորձեք "
 "օգտագործել ակտիվ եղանակը։"
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
 "Եթե կարգավորումը ընտրված է, ապա Դուք կկարողանաք միանալ չկարգավորված "
-"սպասակիչների, որոնք մերժում են փոխանցման ընտրված եղանակը։"
+"սպասարկիչների, որոնք մերժում են փոխանցման ընտրված եղանակը։"
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4001,7 +4057,7 @@
 "Եթե խնդիրը չի լուծվել, դա նշանակում է, որ router-ը և/կամ firewall-ը "
 "շարունակում են արգելակել կապը։"
 
-#: resources.h:962
+#: resources.h:987
 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 "
@@ -4010,7 +4066,7 @@
 "Երբ հաղորդագրությունների ֆայլի չափը հասնի լիմիտին, անվան վերջում կավելացվի "
 "\".1\" (հնարավոր է ջնջվի հինը), որից հետո կստեղծվի նորը։"
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4029,7 +4085,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Եթե խնդիրը դեռ առկա է, ապա դիմեք router ծրագրի հեղինակներին։"
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 "
@@ -4038,7 +4094,7 @@
 "Եթե ընտրված է 'փոխել,եթե ֆայլը նոր է', ապա Ձեր համակարգային ժամանակը "
 "կհամապատասխանեցվի սպասարկիչի հետ։"
 
-#: resources.h:916
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4046,13 +4102,13 @@
 "Եթե օգտագորվում է համեմատումը ըստ ամսաթվի, ապա երկու ֆայլերը կդիտվեն նույնը, "
 "եթե նրանց ստեղծման կամ փոփոխման ժամանակը չի գերազանցում նշված սահմանափակումը։"
 
-#: resources.h:931
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
 msgstr ""
 "Լեզուն փոխելիս վերամեկնարկեք FileZilla-ն » Ծրագիրը Հայերեն թարգմանեց Հրանտ "
 "Օհանյանը։"
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4060,11 +4116,11 @@
 "Սեղմելով 'Թեստ', FileZilla-ն կմիանա probe.filezilla-project.org-ին և "
 "կանցկացնի մի քանի պարզ թեստեր։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Եթե փակեք FileZilla-ն, փոփոխությունները չեն պահպանվի։"
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4072,11 +4128,11 @@
 "Եթե նշեք ֆայլերի սխալ տեսակներ, ապա ֆայլերը կարող են վնասվել փոխանցման "
 "ժամանակ։"
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Եթե ծագեն սխալներ, ուրեմն կան կարգավորման սխալներ։"
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4092,15 +4148,15 @@
 msgstr ""
 "Եթե խնդիրները մնացել են, ապա ըստ էության դա կապված է հենց սպասարկիչի հետ։"
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"Եթե վարպետի աշխատանքը ավարտվել է հաջողությամբ և թեստը հաջողվել է, ուրեմն "
+"Եթե օգնականի աշխատանքը ավարտվել է հաջողությամբ և թեստը հաջողվել է, ուրեմն "
 "բոլոր ծրագրային կարգավորումները ճիշտ են։"
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4108,7 +4164,7 @@
 "Եթե տեղակայված է firewall, համոզվեք, որ FileZilla-ն ունի մուտք բոլոր "
 "դարպասներին։"
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4128,7 +4184,7 @@
 msgid "Import data from older version"
 msgstr "Ներմուծել տվյալներ հին տարբերակից"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Ներմուծել կարգավորումները"
 
@@ -4142,13 +4198,13 @@
 msgid "Improperly quoted association."
 msgstr "Ասոցացումը սխալ է նշվել։"
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr "Ակտիվ եղանակում FileZilla-ն պահանջում է հետևել դարպասին։"
 
-#: resources.h:703
+#: resources.h:723
 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."
@@ -4156,7 +4212,7 @@
 "router օգտագործելու դեպքում պետք է Ձեզ հասանելի լինեն բոլոր դարպասները, "
 "քանզի FileZilla չի կարող փոխել համակարգային կարգավորումները։"
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4164,14 +4220,14 @@
 "Եթե ցանկանում եք տեղեկացված լինել ծրագրի թարմացումներին, ապա ընտրեք "
 "համապատասխան կետը՝ կարգավորումների պատուհանում։"
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "Ակտիվ եղանակը օգտագործելու համար FileZilla-ն պետք է ստանա արտաքին IP հասցեն։"
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4180,26 +4236,26 @@
 "Պասիվ եղանակում, որը խորհուրդ է տրվում, FileZilla-ն սպասարկիչից հայցում է "
 "դարպասը և միանում նրան։"
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr "Սերտիֆիկատի սխալ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Սխալ գաղտնաբառ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Որոշվում է TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Սպասարկիչը անվտանգ չէ, այն չի աջակցում FTP-ն TLS-ով։"
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Ինտերակտիվ"
@@ -4209,10 +4265,10 @@
 msgstr "Տեսքը"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
-msgstr "Կանգնեցված է օգտվողի կողմից"
+msgstr "Կանգնեցված է օգտատերի կողմից"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
@@ -4222,8 +4278,8 @@
 msgid "Invalid HTTP Response"
 msgstr "HTTP-ի սխալ պատասխան"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4246,12 +4302,13 @@
 msgid "Invalid date"
 msgstr "Սխալ ամսաթիվ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Ֆայլի սխալ անուն"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "Սխալ հոսթ, նշանից հետո պետք է լինի կետ և դարպասը։"
 
@@ -4259,28 +4316,33 @@
 msgid "Invalid input"
 msgstr "Սխալ տվյալներ"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Դարպասի սխալ թիվ։ Պետք է լինի 1-ից 65535"
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Պրոտոկոլը սխալ է։ Աջակցվում են.\n"
+"Արձանագրությունը սխալ է։ Աջակցվում են՝\n"
 "ftp:// նորմալ FTP-ի համար,\n"
 "sftp:// SSH փոխանցումների համար,\n"
-"ftps:// FTP-ի ու SSL-ի համար (ակնհայտ)\n"
-"ftpes:// FTP-ի ու SSL-ի համար (ոչ ակնհայտ)։"
+"ftps:// for FTP over TLS (implicit) և\n"
+"ftpes:// for FTP over TLS (explicit):"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr "Միջնորդի հոսթ, նշանից հետո պետք է լինի կետ և դարպասը։"
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Փնտրման պայմանների սխալ։"
 
@@ -4288,7 +4350,7 @@
 msgid "Invalid response code"
 msgstr "Պատասխանի սխալ կոդ"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Փնտրման պայմանների սխալ. %s"
@@ -4300,88 +4362,92 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Կայքի սխալ ճանապարհ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Սխալ չափ"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
-msgstr "Օգտվողի սխալ անուն։"
+msgstr "Օգտատերի անունը սխալ է։"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Իրավաբանական երկիրը."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Իրավաբանական հասցեն."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Նահանգը կամ շրջանը."
 
-#: resources.h:913
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Սկզբից ցուցադրել թղթապանակները"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr "Ոչ բոլոր սպասարկիչներն են աջակցում այս ընտրանքը։"
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Բանալիների փոխարինում"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+msgid "Key exchange:"
+msgstr "Բանալիների փոխանակում."
+
+#: resources.h:619
 msgid "L&owest"
 msgstr "Փ&ոքրագույն"
 
-#: resources.h:929
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Լեզուն"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Լեզուն փոխվել է"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Վերջին փոփոխումը"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Տեղադրությունը"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Սահմանափակել միաժամանակյա բեռնումների &քանակը."
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
-msgstr "Սահմանափակել միաժամանակյա փոխանցումների &քանակը."
+msgstr "Սահմանափակել միաժամանակյա &վերբեռնումները."
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
-msgstr "Սահմանափակել լոկալ դարպասները"
+msgstr "Սահմանափակել տեղային դարպասները"
 
-#: resources.h:959
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Սահմանափակել log ֆայլի չափը"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit:"
 msgstr "Սահմանափակում."
 
@@ -4389,7 +4455,7 @@
 msgid "Line length exceeded"
 msgstr "Շատ է երկար"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Բացի դա՝"
 
@@ -4398,21 +4464,21 @@
 msgstr "socket-ը փակ է"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Ցանկը."
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
 msgstr "Փոքրագույն դարպասը."
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Համակարգչում"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Ֆայլը համակարգչում"
 
@@ -4428,7 +4494,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Ֆայլի անունը սխալ է։"
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Ֆիլտրեր."
 
@@ -4436,7 +4502,7 @@
 msgid "Local site:"
 msgstr "Ճանապարհը."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Համակարգչային."
 
@@ -4444,16 +4510,16 @@
 msgid "Log file"
 msgstr "Գրանցումների ֆայլը"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Թարմացումների ստուգման գրառման ֆայլը."
 
-#: resources.h:954
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
-msgstr "Մուտք"
+msgstr "Մուտքը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4461,7 +4527,7 @@
 "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է "
 "չաջակցի UTF-8։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4469,11 +4535,11 @@
 "Մուտքի տվյալները պարունակում են ոչ ASCII նշաններ, սպասարկիչը հնարավոր է "
 "չաջակցի UTF-8։ Փորձվում է օգտագործել համակարգային կոդավորումը։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "Մուտքի հաջորդականությունը հաջող է կատարվել, բայց հնարավոր չեղավ մտնել։"
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "Մուտքի եղանակը պետք է լինի 'Հարցնել գաղտնաբառը' կամ 'Ինտերակտիվ'։"
 
@@ -4486,13 +4552,13 @@
 "Մուտքի տեսակը կարող է օգտագործվել FTP հասցեի հետ։ Հատկանիշները պետք է լինեն "
 "'%s' կամ '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Ցածր"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Ամենացածր"
 
@@ -4500,11 +4566,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "Ամենացածր թիվը պետք է լինի 1024-ից 65535։"
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr "Համոզվեք, որ ֆայլը հասանելի է և ճիշտ XMLփաստաթուղթ է։"
 
@@ -4525,7 +4591,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Սպասարկիչը նորմալ պատասխան չի ուղարկում"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4536,58 +4602,58 @@
 msgid "Manual transfer"
 msgstr "Ձեռադիր փոխանցում"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Գտնվել է բոլորը հետևյալից"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Գտնվել է ցանկացածը հետևյալից"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Ոչինչ չի գտնվել հետևյալից"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "Միաժամանակյա մաքսիմում &փոխանցումներ."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Հաղորդագրությունների ֆայլը"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "Հաղորդագրությունների ֆայլի դիրքը"
 
-#: resources.h:961
+#: resources.h:986
 msgid "MiB"
 msgstr "ՄԲ"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "Րոպե"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "Շարժել ներքև"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "Շարժել վերև"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "My Computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "My Documents"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Իմ կայքերը"
 
@@ -4596,33 +4662,33 @@
 msgid "N/a"
 msgstr "Չկան տվյալներ"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Անունը"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Անունով արդեն կա"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Այս անունով էջանիշ արդեն կա։"
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Անունը."
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Նշեք ֆիլտրի անունը"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Պետք է նշել գործող հեռադիր ճանապարհը"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Նշեք նշանների կոդավորումը"
 
@@ -4630,19 +4696,23 @@
 msgid "Network unreachable"
 msgstr "Ցանցը հասանելի չէ"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "Երբեք"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "Նոր &թղթապանակ"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Նոր &պատուհան"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "Նոր &Էջանիշ"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4655,41 +4725,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Նոր էջանիշ"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Նոր թղթապանակ"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Նոր հնարավորություններ և շտկումներ %s-ում"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Նոր ֆիլտր"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Նոր թղթապանակ"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Նոր կայք"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "Առաջադրանքների պատուհանի մոտ"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Ոչ"
 
@@ -4697,25 +4767,25 @@
 msgid "No category to export selected"
 msgstr "Ընտրված չէ արտածման բաժինը"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Չկա նշված հրաման։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Արտաքին IP հասցեն նշված չէ։ Օգտագործում է ծրագրայինը։"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Ոչ մի ֆայլ չի խմբագրվում։"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Նշված չէ ֆիլտրի անունը"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Նշեք հոսթը։"
 
@@ -4723,25 +4793,25 @@
 msgid "No images available"
 msgstr "Չկան հասանելի նկարներ"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Հերթում ֆայլեր չեն մնացել։"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Նշված է ֆիլտրերի անունը։"
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Չկա այս ֆայլերի հետ ասոցացված ծրագիր։"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "Ոչ մի ծրագիր ասոցիացված չէ '%s' ֆայլերի հետ։"
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Ոչինչ չի գտնվել"
 
@@ -4757,27 +4827,27 @@
 
 #: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr "Նշված չէ օգտվողի անունը։"
+msgstr "Նշված չէ օգտատերի անունը։"
 
-#: resources.h:923 resources.h:928
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ոչ"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Ոչինչ չի ընտրված"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
-msgstr "Նոր"
+msgstr "Նորմալ"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:326
 #: ../../locales/../src/interface/queueview_failed.cpp:351
@@ -4785,15 +4855,15 @@
 msgstr "Ոչ բոլոր ֆայլերն են հասանելի լինելու նայելու/խմբագրելու համար։"
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Կապ չկա"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Միացած չէ սպասարկիչին"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Միացված չէ սպասարկիչին։"
 
@@ -4801,24 +4871,24 @@
 msgid "Not connected."
 msgstr "Միացված չէ։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Ուշադրություն. Այս հնարավորությունը աջակցվում է միայն FTP եղանակի դեպքում։"
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Ուշադրություն. Այս հնարավորությունը աջակցվում է միայն սովորական, չկոդավորված "
 "FTP միացումների դեպքում։"
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Ուշադրություն. Բազային դարպասի օգտագործումը ստիպողաբար միացնում է FTP "
 "միացումների պասիվ եղանակը։"
 
-#: resources.h:902
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Նշանների ք-ը ստորակետից հետո."
 
@@ -4826,143 +4896,147 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Փորձերի քանակը պետք է լինի 0 և 99-ի միջև"
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "Բացել ֆայլ"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "ԼԱՎ"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr "Ընտրված եղանակը կկազմաձևևի հաջորդ էջերում։"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Մեկ անգամ"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Կուղարկվի տեղեկություն միայն FileZilla-ի և օպերացիոն համակարգի տարբերակի "
-"մասին։"
+#: resources.h:969
+msgid "Once a week"
+msgstr "Շաբաթը մեկ անգամ"
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Բացել թղթապանակը՝ համակարգային file manager-ում"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Բացել Կայքերի Կառավարիչը"
 
-#: resources.h:564
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Բացել Կայքերի Կառավարիչը:"
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Բացել Կայքերի կառավարիչը: Աջ սեղմում կայքերի ցանկում:"
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Բացել ֆայլ։"
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
 msgstr "Բացել FileZilla-ի կարգավորումները"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Բացել որպես."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Հնարավոր չէ բացել"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Բացել նոր պատուհան"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Բացում է Կայքերի կառավարիչը"
 
-#: resources.h:996
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "Բացում է թղթապանակների ցանկի ֆիլտրի պատուհանը։"
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "Օպերացիոն համակարգը"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Խնդիրներ՝ կապված օպերացիոն համակարգի հետ"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Կապմակերպությունը."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Այլ."
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Որոշել"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Փոխարինել &ավելի նորով"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Փոխարինել ֆայլը"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Փոխարինել ֆայլը, եթե չափով մեծ է"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Փոխարինել ֆայլը, եթե չափով ավելի մեծ է կամ ավելի նոր է"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Փոխարինել ֆայլը, եթե այն ավելի նոր է"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Փոխարինել, եթե &տարբերվում է չափով"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Փոխարինել, եթե տարբերվում է չա&փով կամ ավելի նոր է"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Օգտվողի իրավունքները"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Օգտվողը/Խումբը"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "Կան&խարգելել համակարգչի «քնեցումը» փոխանցումների ժամանակ"
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Միջնորդի հոսթը."
@@ -4971,27 +5045,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT հրամանը արգելված է router-ի կամ firewall-ի կողմից։"
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "Պաս&սիվ (խորհուրդ է տրվում)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Արխիվ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Ընդունելի URL հասցե չէ"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
-msgstr "Գաղտնա&բառը.."
+msgstr "Գաղտնա&բառը."
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "Պասիվ (խորհուրդ է տրվում)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Պասիվ եղանակ"
@@ -5006,42 +5080,42 @@
 msgid "Password required"
 msgstr "Պահանջվում է գաղտնաբառ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Ճանապարհը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Հնարավոր չէ նշել %s թղթապանակի և %s ենթաթղթապանակի ճանապարհը"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Ճանապարհներ"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Սպասում է ջնջման"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Իրավունք"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Իրավունք"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Սարքահիմքը."
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5057,7 +5131,7 @@
 "Այցելեք http://filezilla-project.org/probe.php կայքը՝ համոզվելու համար, որ "
 "սպասարկիչը աշխատում է"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5065,7 +5139,7 @@
 "Ստուգեք արխիվային ծրագրի նոր տարբերակը, կամ այցելեք http://filezilla-project."
 "org՝ FileZilla-ի հիմնաֆայլերի կոդը բեռնելու համար։"
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5091,7 +5165,7 @@
 msgid "Please enter a custom time format."
 msgstr "Նշեք ժամանակի ձևը։"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Նշեք ամսաթիվը հետևյալ ձևով Տարի/Ամիս/Օր ձևով, օրինակ՝ ՝2010-09-10"
@@ -5102,20 +5176,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Նշեք բեռնման արագության սահմանափակում (մեծ կամ հավասար 0-ի %s/վայր.)։"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Նշեք նոր ֆիլտրի անունը։"
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Նշեք պատճենված ֆիլտրի անունը։"
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Նշեք նոր ֆիլտրերի անունը։ \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Նշեք նոր ֆիլտրի անունը։։"
 
@@ -5128,7 +5202,7 @@
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
 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:97
 msgid ""
@@ -5136,11 +5210,11 @@
 "transfers."
 msgstr "Նշեք սպասարկիչ միաժամանակյա փոխանցումների քանակը (0-10)։"
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Նշեք գաղտնաբառ՝ այս սպասարկիչի համար."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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"
@@ -5155,13 +5229,13 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "Նշեք դադարի ժամանակը՝5-ից 9999 վայր. (0՝ չկա դադար)։"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Նշեք նոր անուն այս ֆիլտրերի համար"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
-msgstr "Նշեք օգտվողի անունը այս սպասարկիչում."
+msgstr "Նշեք օգտատերի անունը այս սպասարկիչում."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
@@ -5171,17 +5245,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Նշեք այն URL-ն, որից պետք է վերցվի Ձեր արտաքին IP հասցեն"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Նշեք թարմացումների ժամանակը (7 օրից ոչ քիչ)"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../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:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5189,16 +5259,20 @@
 "Նշեք raw FTP հրաման։\n"
 "raw ftp հրամանի օգտագործումը կմաքրի հիշոցը։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Նշեք թղթապանակի անունը."
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Նշեք ֆայլի անունը."
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
-msgstr "Նշեք օգտվողի անունը և գաղտնաբառը այս սպասարկիչի համար."
+msgstr "Նշեք օգտատերի անունը և գաղտնաբառը այս սպասարկիչի համար."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
@@ -5215,7 +5289,7 @@
 "IP-ին դինամիկ է, կամ Դուք չգիտեք Ձեր արտաքին IP-ին, ապա միացրեք IP-ին "
 "որոշելու կարգավորումը։"
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5231,7 +5305,7 @@
 "Համոզվեք, որ FileZilla-ն ունի միացումներ հաստատելու իրավունք և գրված հասցեն "
 "ճիշտ է։"
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Համոզվեք, որ այս լեզվի ֆայլը տեղակայված է համակարգչում։"
 
@@ -5243,7 +5317,7 @@
 "'game mode'."
 msgstr "Համոզվեք, որ Ձեր router-ը ճիշտ է կարգավորված։"
 
-#: resources.h:686
+#: resources.h:706
 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 "
@@ -5253,15 +5327,15 @@
 "FileZilla չի կարող ազդել սպասարկիչի ընտրության վրա։ Սպասարկիչը կարող է "
 "ընտրել դարպաս, որը firewall-ը բնորոշել է որպես վտանգավոր և կողփել է այն։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
 "Հաշվի առեք այն, որ ֆայլի ստեղծման ժամանակը FTP, FTPS և FTPES սպասարկիչներ "
-"փոխանցելիս կպահպանվի, եթե դրանք աջակցում են MFMT հրամանը։"
+"վերբեռնելիս կպահպանվի, եթե դրանք աջակցում են MFMT հրամանը։"
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5269,7 +5343,7 @@
 "Հաշվի առեք այն, որ որոշ սպասարկիչներ կարող են արգելակել Ձեր կապը, եթե "
 "միացումների միջև դադարը շատ կարճ լինի։"
 
-#: resources.h:889 resources.h:895
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5278,11 +5352,11 @@
 "Մանրամասները http://filezilla-project.org/wiki/index.php/"
 "Date_and_Time_formatting-ում"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
-msgstr "Նորից փորձեք։ Հնարավոր պատճառներն են."
+msgstr "Կրկին փորձեք։ Հնարավոր պատճառներն են՝"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5290,42 +5364,41 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
-"Նորից բացեք Վարպետի պատուհանը, եթե Դուք փոխել եք ցանցային կարգավորումները, "
-"կամ եթե ծագում են խնդիրներ այն սպասարկիչի հետ, որին Դուք նախկինում նորմալ "
-"միացել եք։"
+"Կրկին բացեք Օգնականը, եթե Դուք փոխել եք ցանցային կարգավորումները, կամ եթե "
+"ծագում են խնդիրներ այն սպասարկիչի հետ, որին Դուք նախկինում նորմալ միացել եք։"
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Ձեր քայլը."
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Ընտրեք ներմուծման բաժինները։"
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Ընտրեք փոխանցման ծրագրային եղանակը։"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Ընտրեք նոր հատկանիշներ \"%s\" թղթապանակի համար։"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Ընտրեք նոր հատկանիշներ \"%s\" ֆայլի համար։"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Ընտրեք նոր հատկանիշներ ընտրված թղթապանակների համար։"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Ընտրեք նոր հատկանիշներ ընտրված ֆայլերի և թղթապանակների համար։"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Ընտրեք նոր հատկանիշներ ընտրված ֆայլերի համար։"
 
@@ -5338,7 +5411,7 @@
 "protocol specific 'fixups' have to be disabled"
 msgstr "Թարմացրեք Ձեր firewall-ը և համոզվեք, որ router-ը ճիշտ է կարգավորված։"
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5346,25 +5419,25 @@
 "Այցելեք http://filezilla-project.org՝ FileZilla-ի մասին մանրամասն "
 "տեղեկություններ ստանալու համար։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 "Այցելեք http://filezilla-project.org՝ ծրագրի վերջին տարբերակը բեռնելու համար։"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Փոստային ինդեքսը."
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Որոշված կայքերը"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Պահպանվում է ֆայլերի ստեղծման ժամանակը"
 
@@ -5372,60 +5445,76 @@
 msgid "Preview:"
 msgstr "Նախնական դիտում."
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Հիմնական միացման և տվյալների ալիքի սերտիֆիկատները չեն համապատասխանում։"
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Տպել FileZilla-ը բացելուն վերաբերող տեղեկությունը"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
-msgstr "Տպել տարբերակի տեղեկությունը stdout և դուրս գալ"
+msgstr "Տպել տարբերակի տեղեկությունը stdout և փակել"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Թղթապանակների առաջնայնությունը"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Առաջնայնությունը"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Անվտանգության քաղաքականությունը."
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Անվտանգության քաղաքականություն. Կուղարկվի տեղեկություն միայն FileZilla-ի, "
+"CPU-ի և օպերացիոն համակարգի տարբերակի մասին։"
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "Գաղտնի &կոդեր."
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "Արձա&նագրությունը"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
-msgstr "&Դարպասի գաղտնաբառը."
+msgstr "&Միջնորդի գաղտնաբառը."
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "Կատարել &առաջադրանքը"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+msgid "Protocol:"
+msgstr "Արձանագրությունը."
+
+#: resources.h:818
 msgid "Proxy &port:"
 msgstr "Միջնորդի &դարպասը."
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
-msgstr "Միջնորդի &օգտվողը."
+msgstr "Միջնորդի &օգտատերը."
 
 #: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
 msgstr "Միջնորդի ներկայացումը ձախողվեց"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Հնարավոր չէ միանալ %s միջնորդին"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Միջնորդ հոսթը սկսվում է '['-ով, բայց չկա փակագիծը վերջում։"
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5440,23 +5529,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Միջնորդի հարցման սխալ. Հասցեի անհայտ տեսակ CONNECT պատասխանում"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Հաստատված է միջնորդ, բայց միջնորդի հոսթը և դարպասը սխալ են"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Բանալու ստուգում"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Բանալու ալգորիթմը."
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Հրապարակային իրավունք"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "Առաջադրանքը ավարտվել է"
 
@@ -5475,39 +5564,39 @@
 msgid "Queue: empty"
 msgstr "Առաջադրանք. դատարկ է"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Ֆայլեր հերթում"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "Առաջադրանք."
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "Վերա&մեկնարկել"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "Հ&եռադիր թղթապանակների ցանկը"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "Մա&քրել ցանկը և ավելացնել ֆայլերը հերթում"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Raw FTP-ի հրաման"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "Կա&րդալ"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Թարմացնել"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Ան&վանափոխել"
 
@@ -5516,67 +5605,75 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"Նորից բացեք Վարպետը և ուշադրությամբ ստուգեք նշված բոլոր կարգավորումները։"
+"Կրկին բացեք Օգնականը և ուշադրությամբ ստուգեք նշված բոլոր կարգավորումները։"
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "Կար&դալ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Միայն կարդալ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Դադարեցնե՞լ։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Ջնջե՞լ %d թղթապանակը՝ իր պարունակությամբ։"
-msgstr[1] "Ջնջե՞լ %d թղթապանակը՝ իր պարունակությամբ։"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Ջնջե՞լ %d ֆայլերը։"
-msgstr[1] "Ջնջե՞լ %d ֆայլերը։"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Ջնջե՞լ %s -ը և %s-ը։"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "Ջնջե՞լ %d թղթապանակը սպասարկիչից։"
+msgstr[1] "Ջնջե՞լ %d թղթապանակները սպասարկիչից։"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Ջնջե՞լ %s-ը և %s-ը սպասարկիչից։"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Ջնջե՞լ ընտրված բոլոր ֆայլերը և/կամ թղթապանակները սպասարկիչից։"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Ջնջե՞լ բոլորը։"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "Ջնջե՞լ ընտրված բոլոր ֆայլերը և/կամ թղթապանակները համակարգչից։"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Պատճառը"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Վերամեկնարկել այժմ"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "Վերա&ուղղորդել ենթաթղթապանակներ"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Թղթապանակների կառուցվածքը, որոնք կարծես կոդավորված են EBCDIC:"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Գերազանցում է 10000 նիշը, դադարեցվում է։"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Ընդունված տվյալները սխալ էեն"
 
@@ -5589,11 +5686,11 @@
 "ժամանակ։\n"
 "Եթե շարունակեք, ապա միացումը կընդհատվի։"
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Վերամիացման կարգավորումներ"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Միանալ վերջին օգտագործված սպասարկիչին"
 
@@ -5601,34 +5698,38 @@
 msgid "Redirection to invalid address"
 msgstr "Վերաուղղում սխալ հասցեի"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Թարմացնել ֆայլերի և թղթապանակների ցանկը"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "&Հիշե՞լ գաղտնաբառը"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Հեռադիր"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Հեռադիր սպասարկիչի սերտիֆիկատը սխալ է։"
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Ֆայլը սպասարկիչում"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Հեռադիր ֆայլերի փնտրում"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Հեռադիր ֆիլտրեր."
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Հեռադիր ճանապարհը"
 
@@ -5641,7 +5742,7 @@
 "Հնարավոր չէ որոշել հեռադիր ճանապարհը։ Համոզվեք, որ ընտրված ճանապարհը ճիշտ է "
 "և այն աջակցվում է սպասարկիչի կողմից (%s)։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5652,7 +5753,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Հնարավոր չէ որոշել հեռադիր ճանապարհը։ Համոզվեք, որ ընտրված ճանապարհը ճիշտ է։"
@@ -5661,11 +5762,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Հնարավոր չէ որոշել հեռադիր ճանապարհը։"
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Հեռադիր ֆայլի ճանապարհը."
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Հեռադիր ճանապարհը."
 
@@ -5673,76 +5774,76 @@
 msgid "Remote site:"
 msgstr "Ճանապարհը."
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "Ջնջել &բոլորը"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "Ջնջել &ընտրվածը"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Անվանափոխել ֆայլը"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Փոխել ընտրված թղթապանակի անունը"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Փոխել ընտրված թղթապանակների և ֆայլերի անունները"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Անվանափոխում '%s'-ը '%s'-ի"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
 msgstr "Հաղորդել սխալի մասին"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
-msgstr "Պահանջվում է պարզ FTP TLS-ով"
+msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
-msgstr "Պահանջվում է ենթադրելի FTP TLS-ով"
+msgstr "Պահանջվում է որոշակի FTP՝ TLS-ով"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Մաքրել ցանկը և վերականգնել ֆայլերը &հերթում"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "%s-ի համար որոշվում է IP հասցեն"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Որոշվում է հոսթի անունը"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Պատասխանը."
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Արդյունքները."
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Շարունակել փոխանցումը"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5750,34 +5851,38 @@
 "ASCII ֆայլերի բեռնման շարունակումը կարող է հանգեցնել խնդիրների, եթե "
 "սպասարկիչը օգտագործում է այլ ձևաչափ։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Ստացվում է թղթապանակների կառուցվածքը..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Ստացվում է արտաքին IP հասցեն %s-ից"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Սերտիֆիկատը սխալ է"
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
-msgstr "Ց&ույց տալ խմբագրվող ֆայլերը..."
+msgstr "Ց&ուցադրել խմբագրվող ֆայլերը..."
+
+#: resources.h:895
+msgid "S&how the Site Manager on startup"
+msgstr "Բ&ացելիս ցուցադրել Կայքերի Կառավարիչը"
 
-#: resources.h:609
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "Ան&ջատել համակարգիչը"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "&Դադարեցնել"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "Հ&ամաժամանակեցված դիտում"
 
@@ -5785,31 +5890,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Պահպանե՞լ կարգավորումները։"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Գաղտնաբառի պահպանումը ցուցադրվել է համակարգի ադմինին:"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Գաղտնաբառերի պահպանումը ցուցադրվել է ձեր կողմից:"
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
 msgstr "Փնտրվում են ֆայլեր, որոնք կավելացվեն հերթին"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
-msgstr "Փնտրվում են ֆայլեր, որոնք փոխանցվելու են"
+msgstr "Փնտրվում են ֆայլեր, որոնք վերբեռնվելու են"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "Որոնման &պայմանները."
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "Փնտրել &թղթապանակ."
 
-#: resources.h:1001
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Ֆայլերի ինքնականչ փնտրում։"
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Ֆայլեր փնտրելու սպասարկիչը"
 
@@ -5822,26 +5941,26 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Նայեք այստեղ. http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Ընտր&եք սպասարկիչը"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "&Ցանկը."
 
-#: resources.h:877
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Ընտրեք Թեման"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյություն ունի։"
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Ընտրեք ծրագրային խմբագիրը"
 
@@ -5861,7 +5980,7 @@
 "Ընտրեք ծրագրային գործողությունը, եթե փոխանցվող ֆայլը արդեն գոյությւոն ունի։ "
 "Միայն ընտրված ֆայլերի համար։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Ընտրեք տեղը՝ արխիվը բեռնելու համար"
 
@@ -5882,7 +6001,7 @@
 msgstr "Ընտրեք ֆայլը՝ կարգավորումները արտածելու"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Ընտրեք ֆայլը՝ կայքերը արտածելու համար"
 
@@ -5892,18 +6011,18 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "Ընտրեք ֆայլ՝ փոխանցելու համար"
+msgstr "Ընտրեք ֆայլ՝ վերբեռնելու համար"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
 msgstr "Ընտրեք ֆայլի անունը"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Նշեք, թե ինչպես բացել տվյալ ֆայլը։"
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Ընտրեք բեռնման թղթապանակը"
 
@@ -5911,15 +6030,15 @@
 msgid "Select target filename"
 msgstr "Ընտրեք ֆայլի անունը"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Արտածման համար ընտրեք բաժինները."
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Ընտրեք ֆայլերը, որոնք ցանկանում եք ջնջել։"
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5933,7 +6052,7 @@
 msgstr[0] "Ընտրված է %d թղթապանակ։"
 msgstr[1] "Ընտրված են %d թղթապանակներ։"
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5954,7 +6073,7 @@
 msgstr[0] "Ընտրված է %d ֆայլ։ Չափը՝ ամենաքիչը %s"
 msgstr[1] "Ընտրված են %d ֆայլեր։ Չափը՝ ամենաքիչը %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Փոխանցման համար ընտրված են %s և %s։"
@@ -5969,13 +6088,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Ընտրված են %s և %s։ Չափը ոչ քիչ քան՝ %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Ընտրված խմբագիրը գոյություն չունի։"
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Ընտրված ֆայլը արդեն խմբագրվում է"
 
@@ -5983,15 +6102,15 @@
 msgid "Selected file is already loaded"
 msgstr "Ընտրված ֆայլը արդեն բացված է"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Ընտրված ֆայլը արդեն բացված է"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Ընտրված ֆայլը արդեն խմբագրվում է"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Ընտրված ֆիլտրը վերաբերում է միայն համակարգչային ֆայլերին։"
 
@@ -6006,61 +6125,66 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr "Ընտրված դարպասը հիմնականում օգտագործում է այլ պրոտոկոլ։"
+msgstr "Ընտրված դարպասը հիմնականում օգտագործում է այլ արձանագրություն։"
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "Ուղարկել FTP &ակտիվության հրամաններ"
 
-#: resources.h:543
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
 msgstr "Պետք է ուղարկել անհատական հրաման սպասարկիչին"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Ուղարկվում է FTP &ակտիվության հրաման"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Սերիական համարը."
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "Սպասարկիչի &տեսակը."
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Սպասարկիչը ճիշտ չի փակել TLS կապը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Սպասարկիչը չի աջակցում ոչ-ASCII նիշեր:"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Սպասարկիչը չի աջակցում ֆայլեր %d ԳԲ-ից մեծ ֆայլեր։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr "Սպասարկիչը չի աջակցում ֆայլեր %d ԳԲ-ից մեծ ֆայլեր։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Սպասարկիչը չի աջակցում 2ԳԲ-ից մեծ ֆայլեր։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Սպասարկիչը չի աջակցում 4ԳԲ-ից մեծ ֆայլեր։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, 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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6068,23 +6192,23 @@
 "Սպասարկիչը հնարավոր է պահանջի գործածողի անուն։ Որոշեք այն Կայքերի Կառավարիչի "
 "միջոցով"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Սպասարկիչը վերադարձրել է դատարկ ճանապարհ։"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
-msgstr "Սպասարկիչը նորից հայցում է ներկայացման անունը։"
+msgstr "Սպասարկիչը կրկին հայցում է Մուտքանունը։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Սպասարկիչը ուղարկել է պասսիվ պատասխան՝ անորոշ հասցեով։ Պասիվ եղանակը "
 "չաշխատեց։"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6104,101 +6228,108 @@
 msgid "Server sent unexpected reply."
 msgstr "Սպասարկիչը ուղարկել է անորոշ պատասխան։"
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "MAC սպասառուի սպասարկիչը."
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Սպասարկիչի շիֆրը."
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "Սպասարկիչի &տեսակը."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Սպասարկիչը/Ֆայլը համակարգչում"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Սպասարկիչը."
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Շրջանի մանրամասները"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "Հաստատել &առաջնայնությունը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Փոխել իրավունքները '%s'-ից '%s'-ին"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize կանչվել է առանց սոկեթը նշելու"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Կարգավորումներ"
 
-#: resources.h:974
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "Ցուցադրել թղթապանակների &ցանկը"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
 msgstr "Ցուցա&դրել ողջյունի պատուհանը..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Ցուցադրել թղթապանակների կառուցվածքը և շարունակել համեմատումը։"
 
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "Հասանելի TLS չիպերները"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Ցուցադրել օգնության այս պատուհանը"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Անջատել"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "&Կայքերի Կառավարչի ցանկը"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Կայքերի Կառավարիչ"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Կայքերի Կառավարիչ՝ հնարավոր չէ հիշել գաղտնաբառը"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Կայքերի Կառավարիչ՝ սխալ տվյալներ"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Կայքերի Կառավարիչը արդեն բաց է"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Կայքը գոյություն չունի։"
 
@@ -6208,8 +6339,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Սխալ ճանապարհ։"
 
@@ -6228,11 +6359,11 @@
 "Կառավարչում։\n"
 "Ավելացնե՞լ գործող կապը Կայքերի Կառավարչում։"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Չափը"
 
-#: resources.h:896
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Ընդհանուր չսփը"
 
@@ -6241,51 +6372,51 @@
 msgid "Size unknown"
 msgstr "Չափը հայտնի չէ"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Բաց թողնել ֆայլը"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Բաց է թողնվում %s-ի բեռնումը"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
-msgstr "Բաց է թողնվում %s-ի փոխանցումը"
+msgstr "Բաց է թողնվում %s-ի վերբեռնումը"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
-msgstr "Որոշ ֆայլեր խմբագրվում են կամ պահանջում են փոխանցել սպասարկիչի վրա։"
+msgstr "Որոշ ֆայլեր խմբագրվում են կամ պահանջում են վերբեռնում սպասարկիչ։"
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
 "Չկարգավորված սպասարկիչները router-ի միջոցով միանալու դեպքում կարող են "
-"օգտագործել լոկալ IP հասցե."
+"օգտագործել տեղային IP հասցե."
 
-#: resources.h:914
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Դասավորել թղթապանակները մի գծով"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Դասավորման եղանակը չի կարող փոփոխվել թղթապանակները համեմատելիս։"
 
-#: resources.h:910
+#: resources.h:931
 msgid "Sorting"
 msgstr "Դասավորում"
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "Դասավոման &եղանակը."
 
@@ -6297,20 +6428,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Աղբյուրը և նշանակման ճանապարհը չեն կարող նույնը լինել։"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Աղբյուրը և ճանապարհը նույնն են"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Աղբյուր-ֆայլը."
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Արագության սահմանափակումներ"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Արագության սահմանափակումներ"
 
@@ -6322,7 +6453,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Արագության սահմանափակումներ չկան, սեղմեք՝ փոխելու համար։"
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Կայուն և փորձարկվող տարբերակներ"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Միայն կայուն տարբերակները"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "Անհապաղ սկսել &փոխանցումը"
 
@@ -6330,43 +6469,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Բացել Կայքերի Կառավարիչի հետ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Սկսվում է %s-ի բեռնումը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
-msgstr "Սկսվում է %s-ի փոխանցումը"
+msgstr "Սկսվում է %s-ի վերբեռնումը"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Նահանգը կամպրովինցիան."
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Դրությունը"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Գործողությունը."
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "Կանգնեցնել և ջնջել &բոլորը"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Փողոցը."
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Սերտիֆիկատի թեման"
 
@@ -6374,55 +6513,54 @@
 msgid "Successful transfers"
 msgstr "Հաջողված փոխանցումներ"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Թեստի արդյունքները."
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr "Այսպսի հղումները միշտ ջնջվում են։"
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Համաժամանակեցված դիտում"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Համաժամանակեցված դիտումը անջատվել է։"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Սինթեքսի սխալ"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Սինթեքսի սխալ՝ հրամանի տողում"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Համակարգը"
 
-#: resources.h:518
-#, fuzzy
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "Գ&ործիքներ"
 
@@ -6430,11 +6568,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL կապը հաստատված է, ուղարկվում է HTTP հարցում"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL կապը հաստատված է, սպասվում է մուտքի հաղորդագրություն..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL կապը հաստատված է։"
 
@@ -6442,27 +6580,31 @@
 msgid "TTL expired"
 msgstr "TTL ավարտվել է"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Ֆայլը գոյություն ունի"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Ֆայլը սպասարկիչի վրա."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Այս անունով ֆայլ կա։"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Այս անունով ֆայլ կա։ Շարունակե՞լ։"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Թեստի արդյունքները"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Ստուգվում է սպասարկիչից բեռնման հնարավորությունը"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6479,7 +6621,7 @@
 "Կայքերի Կառավարիչը օգտագործվում է FileZilla-ի այլ գործողության կողմից։ 3.\n"
 "Փակեք այն, տվյալները չեն ջնջվելու։"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-ն ունի սխալ ձև՝ %s"
@@ -6490,11 +6632,11 @@
 msgstr "Դուք գրել եք %s հասցեն."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Հնարավոր չէ ավելացնել էջանիշը։"
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Հնարավոր չէ մաքրել էջանիշները։"
 
@@ -6506,22 +6648,21 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Մուտքաբառը չի կարող դատարկ լինել։"
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Չի գտնվել տեքստային ֆայլերի խմբագրման հաստատված ծրագիր։"
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Տեքստային ֆայլերի հաստատված ծրագիր '%s'։"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
-msgstr "Այս անունով արդեն կա։"
+msgstr "Նշված ֆիլտրի անունը արդեն առկա է: Ընտրեք այլ անուն:"
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6538,9 +6679,9 @@
 "%s ֆայլը գոյություն ունի։\n"
 "Նշեք նոր անուն."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6556,14 +6697,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "'%s' ֆայլում չկա անհրաժեշտ տեղեկություններ։"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "'%s' ֆայլը չի կարող բացվել։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6572,8 +6713,8 @@
 "'%s' ֆայլը հնարավոր չէ բացել.\n"
 "Նշված չէ այս տիպի ֆայլերի հետ ասոցացված ծրագիր։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6613,7 +6754,7 @@
 "'%s' ֆայլը պաշտպանված է գաղնտաբառով, այս ֆայլերը FileZilla-ն չի աջակցում։\n"
 "Փոխե՞լ այն ոչ պաշտպանված ֆայլի։"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Ընտրված խմբագիրը գոյություն չունի։"
 
@@ -6626,7 +6767,8 @@
 "Continue with the import?"
 msgstr ""
 "Այս ֆայլի տեղեկությունները FileZilla-ի նախորդ տարբերակից են։\n"
-"Այդ պատճառով կներմուծվեն միայն հոսթը, դարպասը, օգտվողի անունը և գաղտնաբառը։\n"
+"Այդ պատճառով կներմուծվեն միայն հոսթը, դարպասը, օգտատերի անունը և "
+"գաղտնաբառը։\n"
 "Շարունակե՞լ։"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
@@ -6647,19 +6789,19 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Այս նշանները կփոխվեն. %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "Խմբագրվում են հետևյալ ֆայլերը."
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
-msgstr "Անվճար Open Source FTP ծրագիր"
+msgstr "Ազատ, բաց կոդով FTP ծրագիր"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
 msgstr "Ընդհանուր Էջանիշները հնարավոր չէ պահպանել։"
 
-#: resources.h:972
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6691,7 +6833,7 @@
 "Ամենացածրը պետք է լինի կամ ավելի քիչ, կամ հավասար ընտրված դարպասների "
 "մեծագույն թվից։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6699,17 +6841,17 @@
 "Վերջին տարբերակը բեռնված է։ Սեղմեք 'Ավարտել'՝ FileZilla-ն փակելու և "
 "տեղակայումը սկսելու համար։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 "Վերջին տարբերակը բեռնված է։ Կարող եք տեղակայել այն։"
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Հերթականությունը չի կարող պահպանվել։"
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6722,22 +6864,22 @@
 msgid "The selected categories have been imported."
 msgstr "Ընտրված բաժինները ներմուծվել են։"
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Ընտրված ֆայլը ունի տվյալներ հետևյալ բաժինների համար."
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Ընտրված ֆայլը արդեն խմբագրվում է."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Ընտրված ֆայլը օգտագործվում է այլ ծրագրի կողմից։ Փակեք այն։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6755,7 +6897,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Սպասարկիչը ուղարկել է անհայտ պատասխան։"
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Սպասարկիչի կողմից օգտագործվող կոդավորումը."
 
@@ -6765,7 +6907,7 @@
 "certificate to make sure the server can be trusted."
 msgstr "Սպասարկիչի անհայտ տեսակի սերտիֆիկատ"
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6774,7 +6916,7 @@
 "Սպասարկիչի և հիշոցի բանալիները չեն համընկնում։ Հնարավոր է սպասարկիչի ադմինը "
 "փոխել է բանալին։"
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6788,15 +6930,15 @@
 "Կարգավորումները ներմուծվել են։ Վերամեկնարկեք FileZilla-ն՝ դրանք կիրառելու "
 "համար։"
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Համակարգիչը կվերամեկնարկի, եթե Դուք չսեղմեք 'Մերժել'։"
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Համակարգիչը կանջատվի, եթե Դուք չսեղմեք 'Մերժել'։"
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6804,7 +6946,7 @@
 "Ֆայլւժը արդեն գոյություն ունի։.\n"
 "Ինչ անել։"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Թեստը անհաջող էր։ Պահպանե՞լ կարգավորումները։"
 
@@ -6812,11 +6954,11 @@
 msgid "Themes"
 msgstr "Թեմաներ"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Ֆիլտրերի խումբը հնարավոր չէ ջնջել։"
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Ֆիլտրերի խումբը հնարավոր չէ անվանափոխել։"
 
@@ -6827,7 +6969,7 @@
 msgstr ""
 "Սա նշանակում է, որ router կամ և firewall ծրագրերը խանգարում են FileZilla-ին։"
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6835,31 +6977,31 @@
 "Աշխատում է, եթե միայն Դուք միանում եք router-ի միջոցով։ Հակառակ դեպքում "
 "համակարգը կվերադարձնի արտաքին IP-ն։"
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
-msgstr "Այս վարպետը կօգնի Ձեզ ճիշտ կարգավորել router և firewall ծրագրերը։"
+msgstr "Այս Օգնականը կօգնի Ձեզ ճիշտ կարգավորել router և firewall ծրագրերը։"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Ժամանակը"
 
-#: resources.h:890
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Ժամանակի ձևը"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Սպասելու &ժամանակը՝ վայր."
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Սպասելու ժամանակը"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6868,26 +7010,26 @@
 "Ժմանանակային տարբերություն. Սպասարկիչը. %d վայրկյան, համակարգիչը. %d "
 "վայրկյան, տարբերությունը. %d վայրկյան։"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Անունը."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Համեմատելու համար թղթապանակները երկու կողմն էլ պետք է լինեն հավասարեցված։"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr "Սրա համար թղթապանակների հենքը պետք է կամ թաքցված լինեն կամ միացված։"
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr "FileZilla-ն պետք է իմանա, թե որ բանալիները կարող է օգտագործել։"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6904,7 +7046,7 @@
 "Կանաչ. Ֆայլը ավելի նոր է մյուս կողմի չնշված ֆայլից։\n"
 "Կարմիր. Ֆայլերի չափերը չեն համընկնում։"
 
-#: resources.h:999
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6914,23 +7056,23 @@
 "Միացնելու դեպքում համակարգչային թղթապանակում փոփոխությունները կբերի "
 "փոփոխությունների նաև սպասարկիչում և հակառակը։"
 
-#: resources.h:987 resources.h:988
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Ցուցադրել/Թաքցնել առաջադրանքի կատարման ընթացքը"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Ցուցադրել/Թաքցնել համակարգչում թղթապանակների սխեման"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Ցուցադրել/Թաքցնել հաղորդագրությունների ֆայլը"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Ցուցադրել/Թաքցնել հեռադիր թղթապանակների սխեման"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Ցուցադրել/Թաքցնել ֆայլերի հերթականությունը"
 
@@ -6943,37 +7085,37 @@
 msgstr "Վերաուղղորդումները չափազանց շատ են"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Ուղեգծում."
 
-#: resources.h:920 resources.h:926
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Փոխանցվում է"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "Փոխանցման &տեղը"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "Փոխանցելու &եղանակը"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
-msgstr "Փոխանցելու եղանակը"
+msgstr "Փոխանցման եղանակը"
 
-#: resources.h:876
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Հերթականության պատուհանը"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Փոխանցման կարգավորումները"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Կապը ընդհատվել է. %s"
@@ -6982,8 +7124,8 @@
 msgid "Transferred data got tainted."
 msgstr "Փոխանցված տվյալները վնասված են։"
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Փոխանցվում է"
 
@@ -6991,87 +7133,87 @@
 msgid "Transfers"
 msgstr "Փոխանցումներ"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Փոխանցումները ավարտվել են"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "Հաշվել ֆայլերը &առանց նշելու որպես ASCII"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Հաշվել &ֆայլերը որպես ASCII"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Ընդունել հոսթի բանալու փոփոխությունը."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Հոսթի նոր բանալի."
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Ընդունե՞լ նոր բանալին և շարունակել միացումը։"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Ընդունե՞լ սերտիֆիկատը և շարունակել միացումը։"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Վստահե՞լ այս հոսթին և շարունակել միացումը։"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Տեսակը"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
 msgstr "FTP միջնորդի տեսակը."
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
 msgstr "Բազային միջնորդի տեսակը."
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
-msgstr "Փ&ոխանցել"
+msgstr "Վ&երբեռնել"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
-msgstr "Փ&ոխանցման սահմանափակում."
+msgstr "Վ&երբեռման սահմանափակում."
 
-#: resources.h:938
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "Բացելու համար օգտագործել ֆայլերի ասոցացումները"
 
-#: resources.h:891
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "Օ&գտագործել համակարգային կարգավորումներ"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
-msgstr "ՕԳՏՎՈՂԸ@&ՀՈՍԹԸ"
+msgstr "ՕԳՏԱՏԵՐԸ@&ՀՈՍԹԸ"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
 msgstr "Սխալի անորոշ կոդ %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Օբյեկտը."
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Անհայտ է"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "FTP միջնորդի անհայտ տեսակ, հնարավոր չէ ստեղծել անհրաժեշտ հաջորդականությունը "
@@ -7080,19 +7222,19 @@
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr "SOCKS պրոտոկոլի անհայտ տեսակ. %d"
+msgstr "SOCKS արձանագրության անհայտ տեսակ. %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
 msgstr "Անհայտ սերտիֆիկատ"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr "Անհայտ սխալ՝ ֆայլը բացելիս։"
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Անհայտ բանալի"
 
@@ -7101,9 +7243,9 @@
 msgid ""
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
-msgstr "SOCKS-ի անհայտ պրոտոկոլ. %d"
+msgstr "SOCKS-ի անհայտ արձանագրություն. %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "Անհայտ մաս, հնարավոր է այն ստեղծվել է FileZilla-ի կողմից։"
@@ -7125,7 +7267,7 @@
 "Եթե խնդիրները չլուծվեն, FTP-ի ակտիվ եղանակը չի աշխատի և անհրաժեշտ կլինի "
 "օգտագործել պասիվ եղանակը։"
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Սերտիֆիկատի տեսակը չի աջակցվում"
 
@@ -7133,129 +7275,128 @@
 msgid "Unsupported redirect"
 msgstr "Վերաուղղորդումը չի աջակցվում"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
-msgstr "Փոխ&անցել առանց փոփոխությունների"
+msgstr "Վե&րբեռնել առանց փոփոխությունների"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Ստուգել թարմացումները"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
-msgstr "Թարմացման վարպետ"
+msgstr "Թարմացումների Օգնական"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Թարմացումներ"
+
+#: resources.h:372
 msgid "Upload"
-msgstr "Փոխանցել"
+msgstr "Վերբեռնել"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Անհաջող էր"
 
 #: ../../locales/../src/interface/statusbar.cpp:609
 #, c-format
 msgid "Upload limit: %s/s"
-msgstr "Փոխանցման սահմանափակում. %s/s"
+msgstr "Վերբեռման սահմանափակում. %s/s"
 
 #: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
 msgstr "Սահմանափակումներ չկան"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
-msgstr "Փոխանցել ընտրված թղթապանակը"
+msgstr "Վերբեռնել ընտրված թղթապանակը"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
-msgstr "Փոխանցել ընտրված ֆայլերը և թղթապանակները"
+msgstr "Վերբեռնել ընտրված ֆայլերը և թղթապանակները"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
-msgstr "Հետ փոխանցե՞լ այս ֆայլը դեպի սպասարկիչ։"
+msgstr "Ֆայլը ետ վերբեռնե՞լ սպասարկիչ:"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
-msgstr "Փոխանցե՞լ ֆայլը սպասարկիչ։"
+msgstr "Վերբեռնե՞լ ֆայլը սպասարկիչ։"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
-msgstr "Փոխանցվում է"
+msgstr "Վերբեռնում է"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
-msgstr "Փոխանցվում է և սպասում է ջնջման"
+msgstr "Վերբեռնվում է և սպասում է ջնջման"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
-msgstr "Փոխանցում առանց փոփոխությունների"
+msgstr "Վերբեռնում առանց փոփոխությունների"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Օգտագործել &ընտրված կոդավորումը"
 
-#: resources.h:935
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "Օգտագործել &հետևյալ խմբագրիչը."
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "Օգտագորխել &ծրագրային խմբագիրը"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Օգտագործել հ&ամաժամանակեցված դիտում"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
-msgstr "Օգտագործել UTF-8, եթե սպասարկիչւ աջակցում է այն։"
+msgstr "Օգտագործել UTF-8, եթե սպասարկիչը աջակցում է այն։"
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
-msgstr "Օգտ. հիմնական գործ."
+msgstr "Օգտ հիմնական գործ."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
-msgstr "Օգտ. հիմնական FTP"
+msgstr "Օգտագործել հիմնական FTP"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
-msgstr "Օգտագործել սպասակիչ, որին միացված են"
+msgstr "Օգտագործել սպասարկիչ, որը միացած է"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Օգտագործել սպասարկիչ Կայքերի Կառավարչից"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "Օգտագործել համակարգային &կարգավորումները"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Օգտագործել հետևյալ IP հասցեն."
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "Օգտագործել դարպասների հետևյալ ձևը."
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "Օգտագործել արտաքին IP հասցե"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Օգտագործեք սա, եթե միացել եք router-ի միջոցով և ունեք հաստատուն արտաքին IP "
 "հասցե։"
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7264,36 +7405,35 @@
 "Օգտագործեք սա, եթե ունեք դինամիկ IP հասցե։ FileZilla-ն կուղարկի հարցումներ "
 "այս սպասարկիչին մեկ անգամ ամեն աշխատաշրջանի համար։"
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
-msgstr "Օգտվող."
+msgstr "Օգտատերը."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
-msgstr "Օգտվողի անունը չի կարող ունենալ միայն բացեր"
+msgstr "Օգտատերի անունը չի կարող ունենալ միայն բացեր"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Օգտագործվում է %s սպասարկիչը"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Սխալ կոդավորման օգտագործումը կհանգեցնի ֆայլերի անվանումների սխալ արտացոլման։"
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
-msgstr ""
-"Օգտագործեք այս Վարպետի աշխատանքը՝ FileZilla-ի թարմացումները ստուգելու համար։"
+msgstr "Այս Օգնականի միջոցով կարող եք ստուգել FileZilla-ի թարմացումները:"
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Գործածական է՝"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Գործածական է մինչ՝"
 
@@ -7301,47 +7441,47 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "wxWidgets-ի հաղորդագրություն"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Ստուգվում է սերտիֆիկատը..."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Տարբերակը."
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Շատ բարձր"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Նայել կարգավորումների այն մասը, որը սպասարկիչը չի աջակցում"
 
-#: resources.h:922
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Դիտել/Խմբագրել"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Տեսանելի սյուներ"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "Գ&րել"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Սպասում"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Սպասվում է միացման"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Ստուգվում է գաղտնաբառը"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Սպասում է փոխանցման կանգնեցմանը"
 
@@ -7349,7 +7489,7 @@
 msgid "Waiting to retry..."
 msgstr "Սպասում է կրկնման..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7378,11 +7518,11 @@
 "Եթե չանջատեք Windows Firewall-ը կամ Application Layer Gateway-ն,ապա\n"
 "FileZilla-ն մեծ ֆայլեր փոխանցելիս կունենա դադարներ իր աշխատանքում։"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Ուշադրություն, անտեսվում է միացումը սխալ IP-ից։"
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7398,23 +7538,31 @@
 "\n"
 "Ստուգե՞լ 'Nightly' կառուցվածքի առկայությունը։"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Ուշադրություն. Առկա է անվտանգության չեղք։"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Բարի Գալուստ FileZilla"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Ինչն է նոր"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Ինչն է նոր."
 
-#: resources.h:821
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Երբ արտոնում եք FileZilla-ին հիշելու գաղտնաբառերը, ապա կարող եք վերամիանալ՝ "
+"առանց գաղտնաբառի մուտքագրման:"
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7422,11 +7570,15 @@
 "Եթե թույլատրված է, ապա նշանները, որոնք չի աջակցում համակարգիչը, կփոխարինվեն "
 "փոխանցման ժամանակ։"
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Լայնէկրան"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Ցանկանու՞մ եք, որ FileZilla-ն հիշի գաղտնաբառերը:"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "Գր&ել"
 
@@ -7439,25 +7591,31 @@
 msgid "Wrong line endings"
 msgstr "Տողերի սխալ վերջավորություն"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Այո"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "Կարծես Դուք օգտագործում եք միայն IPv6 հոսթ: Այն չի աջակցվում:"
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "Դուք օգտագործում եք FileZilla-ի վերջին տարբերակը։"
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Կարող եք բացել այս պատուհանը Օգնություն ընտրացանկից։"
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Թողեք դաշտը դատարկ՝ ծրագրային կարգավորումը օգտագործելու համար։"
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7483,18 +7641,18 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Դուք չեք նշել ֆայլի նոր անունը։ Փոխարինե՞լ այն։"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "Ընտրեք եք առնվազն մեկ հղում։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "Խմբագրման համար դուք ընտրել եք 10 ֆայլից ավելի։ Շարունակե՞լ։"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7502,11 +7660,11 @@
 "Բացելու համար դուք ընտրել եք 10 ֆայլից կամ թղթապանակից ավելի։ Շարունակե՞լ։"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Նշեք հոսթի անունը։"
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Նշեք թղթապանակըէ համակարգչում։"
 
@@ -7515,19 +7673,19 @@
 msgid "You have to enter a valid IP address."
 msgstr "Նշեք ճիշտ IP հասցե։"
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Նշեք թղթապանակ համակարգչում, որտեղ հնրավոր է պահպանել։"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
-msgstr "Օգտվողի հաշվեկշիռը"
+msgstr "Նշեք գործածողի անունը"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
-msgstr "Օգտվողի անունը"
+msgstr "Օգտատերի անունը"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
 msgid ""
@@ -7543,28 +7701,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Նշեք log ֆայլի անունը։"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Նշեք ճիշտ հրաման։"
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Նշեք միջնորդի հոսթը։"
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Նշեք թիվը 1-ից 65535-ի միջև"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Պետք է նշեք գոնե մեկ ճանապարհ, հնարավոր չէ նշել դատարկ էջանիշ։"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7572,7 +7730,7 @@
 "Պետք է նշեք համակարգչային և հեռադիր ճանապարհը՝ պատուհանի համաժամանակեցված "
 "դիտումը ապահովելու համար։"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7602,44 +7760,49 @@
 "should work properly."
 msgstr "Պետք է որ կապը նորմալ աշխատի։"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "հետո"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "մինչ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "սկսվում է՝"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "բայթ"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "պարունակում է"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "չի պարունակում"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "չի համապատասխանում"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "ավարտվում է՝"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "հավասարաչափ"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "ֆայլ"
 
@@ -7657,82 +7820,124 @@
 "Հնարավոր չէ բացել fzputtygen-ը։\n"
 "Համոզվեք, որ ֆայլը գտնվում է այնտեղ, որտեղ որ FileZilla.ехе է։"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "Հնարավոր չէ բացել fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers չկան սերտիֆիկատներ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "մեծ քան"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "օգտագործված խմբի համար"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "խմբային կարդացվող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "խմբային գրվող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "հավասարաչափ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "նշված է"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "նշված չէ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "քիչ քան"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "համապատասխանում է regex-ի"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "կատարող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "միայն կարդացվող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "կարդացվող և գրվող"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "անհայտ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "կատարող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "միայն կարդացվող"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "կարդացվող և գրվող"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Պատճենել"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Թարմացումների ինքնաշխատ ստուգում"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Քանի օրը մեկ ստուգել."
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Մինիմում 7 օր)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Թարմացումների ծրագրային ստուգում"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "&Ստուգել փորձարկվող տարբերակները"
+
+#~ msgid "Cop&y"
+#~ msgstr "Պատճ&ենել"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Նշեք թարմացումների ժամանակը (7 օրից ոչ քիչ)"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Անվտանգության քաղաքականությունը."
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d ԿԲ/վ)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d Մբ/վ)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s բայթ (%d.%d ԿԲ/վ)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s բայթ (%d. %d Մբ/վ)"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Կրկնօրինակել ֆայլի անունը"
 
diff -Nru filezilla-3.5.3/locales/id_ID.po filezilla-3.7.3~precise/locales/id_ID.po
--- filezilla-3.5.3/locales/id_ID.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/id_ID.po	2013-06-18 20:02:24.000000000 +0000
@@ -1,30 +1,31 @@
 # translation of id_ID.po to Bahasa Indonesia
-# Willy Sudiarto Raharjo <willysr@gmail.com>, 2008-2009.
+# Willy Sudiarto Raharjo <willysr@gmail.com>, 2008-2012.
 msgid ""
 msgstr ""
 "Project-Id-Version: id_ID\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-02 21:14+0700\n"
-"Last-Translator: Willy Sudiarto Raharjo <willysr@gmail.com>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-12 19:05+0700\n"
+"Last-Translator: Willy Sudiarto Raharjo <willysr@slackware-id.org>\n"
 "Language-Team: Bahasa Indonesia <willysr@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
+"Language: Indonesian\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S terlewati"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S lagi"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -41,9 +42,9 @@
 msgid_plural "%d directories"
 msgstr[0] "%d direktori"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -51,9 +52,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -71,7 +72,7 @@
 msgid_plural "%d files. Total size: At least %s"
 msgstr[0] "%d berkas. Ukuran total: Paling tidak %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d berkas telah dimasukkan ke antrian"
@@ -82,31 +83,21 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d detik"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Host"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Kata sandi"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -121,7 +112,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Belum juga valid!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Pengguna proxy"
@@ -142,27 +133,17 @@
 msgid_plural "%s bytes"
 msgstr[0] "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -177,7 +158,7 @@
 "Harap mendownload FileZilla kembali. Jika hal ini masih tetap ada, harap "
 "kirimkan laporan kesalahan."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -199,152 +180,148 @@
 msgid "%s with %d bits"
 msgstr "%s dengan %d bit"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nama pengguna"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Kata sandi proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Tentang..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Akun:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Aktif"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Tambah penanda..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Tambahkan berkas ke antrian"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Tambah berkas kunci..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Tambahkan ke antrian"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Sesuaikan offset zone waktu server:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Selalu percaya sertifikat pada sesi di masa mendatang."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Selalu percaya pada host ini, tambahkan kunci ini pada cache"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Selalu gunakan editor default ini"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Selalu gunakan pilihan untuk semua berkas yang tidak diasosiasikan"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Selalu gunakan aksi ini"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Meminta sistem operasi anda untuk alamat IP eksternal"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Otomatis"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Deteksi otomatis"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Biner"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Awalan biner menggunakan simbol SI. (cth. 1 KB = 1024 byte)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Penanda"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Jelajah..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Toleransi burst:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Batal"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Periksa versi beta FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Hapus data privat..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Tutup FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Mengkonfigurasi batas kecepatan..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Konfigurasikan..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Menghubungkan"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Salin"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Salin koneksi saat ini ke Manajemen Situs..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Salin ke clipboard"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Rusak"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Buat direktori"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Buka tab baru"
 
@@ -352,168 +329,168 @@
 msgid "&Debug"
 msgstr "&Debug"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Informasi debug pada pesan log:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "Editor &default:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Aksi default jika berkas sudah ada..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Keterlambatan diantara percobaan login yang gagal:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Hapus"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Hapus symlink"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "Perbandingan &direktori"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Buang berkas lokal lalu download dan edit berkas baru"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Putuskan hubungan"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Terputus dari server"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Tampilkan kecepatan transfer dan bukan kecepatan rata-rata"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Tampilkan ukuran dalam byte"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Jangan simpan kata kunci"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Jangan tampilkan dialog ini lagi."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Jangan gunakan alamat IP eksternal pada koneksi lokal."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Aksi klik &ganda untuk berkas:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Download"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Download ke:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Mendownload..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Download:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Edit"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Edit aturan filter..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Aktifkan"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Aktifkan pemeriksaan update otomatis"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Aktifkan batas kecepatan"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Enkoding:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Enkripsi:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Masukkan perintah sendiri..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Eksekusi"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Ekspor daftar manajemen situs"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Ekspor..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Kembali ke mode aktif"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Berkas"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Atribut berkas..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Hak akses &berkas..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Berkas:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Kondisi filter:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Sekumpulan filter:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filters"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Selesai"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Selesaikan pengeditan dan hapus berkas lokal"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -521,479 +498,487 @@
 "&Path remote lebih ramping, download semua berkas yang ada langsung pada "
 "direktori target"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Ikuti symlink, hapus isi direktori target"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Dapatkan alamat IP eksternal dari URL berikut:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Mendapatkan bantuan..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Penanda &global"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1/1 menggunakan metode CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Bantuan"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Sembunyikan berkas yang sama"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Tertinggi"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Port tertinggi yand ada:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Mesin:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Prefix biner IEC (cth. 1 KiB = 1024 byte)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "ISO 8601 (contoh: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Import..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Turunkan asosiasi jenis berkas sistem"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Pertahankan struktur path remote relatif pada root pencarian"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Layout dari berkas dan direktori:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Batasi port lokal yang digunakan oleh FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Batasi jumlah koneksi simultan"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Pohon direktori &lokal"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Direktori &lokal:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Catat log ke berkas"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Tipe Logon:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&TipeLogon:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Rendah"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Kelola penanda..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transfer &manual..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Jumlah maksimum koneksi:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Jumlah maksimum percobaan:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Log &pesan"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimalkan ke tray"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nama:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Panduan konfigurasi jaringan..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Baru"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Situs Baru"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Versi baru tersedia!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Berikutnya >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Tidak"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Tidak ada"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Jumlah hari diantara pemeriksaan update:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Nilai numerik:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&BUKA"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Buka"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Timpa"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Pasif"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&KataKunci:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Mainkan suara"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Posisi dari pesan log:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Pertahankan waktu pada berkas yang ditransfer"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Antrian"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&KoneksiCepat"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Batang &koneksi cepat"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Baca"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Hubungkan ulang"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Perbarui"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Ingat Kata kunci untuk sesi ini"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Ingat kata kunci?"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Direktori remote:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Path &remote:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Hapus"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Hapus kunci"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Hapus yang dipilih"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Ganti nama"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Ganti nama..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Buka kembali berkas lokal"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Ganti karakter yang tidak valid dengan:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Laporkan kesalahan..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Ulangi dan antri ulang semua berkas"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Ulang kembali Panduan"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Teruskan"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Jalankan perintah..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Jalankan panduan konfigurasi sekarang..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Jalankan pemeriksaan update sekarang..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Simpan sebagai..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Pencarian"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Mencari berkas remote..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Pilih Entri:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Pilih bahasa:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Pilih kolom yang harus ditampilkan:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Pengaturan"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Pengaturan..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Tampilkan menu debug"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Tampilkan pesan"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Tampilkan timestamp pada pesan log"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Manajemen Situs..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Penanda &situs khusus"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Lewati"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Batas kecepatan"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&Mulai transfer secepatnya"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Tukar jendela lokal dan remote"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS Cipher"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Tes"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transfer"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Mode &transfer"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Antrian &transfer"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Anggap berkas bertitik sebagai berkas ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Batalkan Edit"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Update kunci yang di-cache untuk mesin ini"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Upload"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Upload:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Gunakan program kustomisasi"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Gunakan Penjelajahan tersinkronisasi"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "Gunakan editor default sistem untuk berkas teks"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Gunakan alamat IP berikut:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Gunakan alamat IP eksternal server"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Gunakan pemisah ribuan"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Pengguna:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Nama pengguna:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versi %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Lihat"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Lihat/Edit"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Perhatikan berkas yang diedit secara lokal dan konfirmasikan untuk upload "
 "modifikasi"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Ketika memeriksa update, periksa untuk:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Tulis"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Ya"
 
@@ -1011,11 +996,27 @@
 msgstr "'%s' bukan direktori."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Jenis login 'Akun' tidak didukung oleh protokol yang dipilih"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Jenis login 'Normal' dan 'Account' tidak lagi tersedia, gunakan 'Tanya kata "
+"sandi'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Jenis akun 'Normal' dan 'Account' tidak tersedia. Pilihan Anda telah "
+"berganti menjadi 'Tanyakan kata sandi'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1032,120 +1033,116 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d objek terfilter)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 untuk tanpa batas)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 detik)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 untuk menonaktifkan)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Paling tidak 7 hari)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(contoh: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(contoh: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(dalam %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S lagi"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- Lagi"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Router dan atau firewall rusak"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Berkas rusak pada mirror"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware pada sistem Anda"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- Lagi"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c tidak bisa digunakan bersama dengan FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l hanya bisa digunakan dengan FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s dan -c tidak bisa ada pada waktu yang bersamaan."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s tidak bisa digunakan bersama dengan FTP URL"
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Tidak ada"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Peringatan"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Informasi"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Detail"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "Sistem 32 bit"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "Sistem 64 bit"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Kembali"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1156,16 +1153,17 @@
 "Penanda dengan nama yang dimasukkan sudah ada. Harap masukkan nama yang "
 "belum terpakai."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Editor default harus ditentukan."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Sebuah direktori tidak bisa dipindah pada salah satu sub direktorinya."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1176,11 +1174,11 @@
 "FileZilla membuka sebuah port dan meminta server untuk terhubung ke port "
 "tersebut."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Sebuah berkas yang sebelumnya dibuka sudah berubah."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2066
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
@@ -1188,18 +1186,18 @@
 "Berkas dengan nama tersebut sudah diedit sebelumnya. Apakah Anda hendak "
 "membuka kembali '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Berkas dengan nama tersebut sudah ditransfer."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Berkas dengan nama tersebut masih diedit. Harap ditutup dan coba kembali."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1214,11 +1212,11 @@
 "daftar.\n"
 "Tidak ada pesan lain yang akan ditampilkan pada sesi ini."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Versi baru dari FileZilla sudah tersedia:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1227,7 +1225,7 @@
 "yang salah menyembunyikan berkas dari pengguna. Gunakan opsi ini untuk "
 "memaksa server menampilkan semua berkas."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1245,15 +1243,15 @@
 "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori "
 "lokal?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "T&ambah"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "&Ijinkan melanjutkan berkas-berkas ASCII"
 
@@ -1265,55 +1263,55 @@
 msgid "A&pply only to uploads"
 msgstr "G&unakan hanya untuk upload"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "&Terapkan pada semua berkas dan direktori"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "&Hapus transfer yang berhasil secara otomatis"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Batalkan koneksi sebelumnya dan buka koneksi pada tab aktual"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Tentang FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Diatas daftar berkas"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Akun"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Aksi setelah antrian &selesai"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Aksi pada berkas yang terpilih:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Aksi yang harus dilakukan:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Aksi:"
 
@@ -1347,23 +1345,23 @@
 "Pengujian mode aktif FTP gagal. FileZilla tahu alamat IP eksternal yang "
 "benar, tetapi router atau firewall Anda telah memodifikasi alamat pengiriman."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP mode aktif"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "Tambahkan berkas ke hanya ke &antrian"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Masukkan direktori yang dipilih pada antrian transfer"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Masukkan berkas dan direktori yang dipilih pada antrian transfer"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Tambahkan ke antrian"
 
@@ -1371,45 +1369,59 @@
 msgid "Address type not supported"
 msgstr "Jenis alamat tidak didukung"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Tingkat lanjut"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opsi tingkat lanjut:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Saran: Kecuali Anda hendak menguji fitur baru, harap menggunakan versi "
+"stabil. Versi Beta dan build harian adalah versi pengembangan ditujukan "
+"untuk tujuan pengujian. Build harian dari FileZilla mungkin tidak bekerja "
+"dan mungkin merusak sistem Anda. Gunakan versi beta dan build harian dengan "
+"resiko Anda sendiri."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritma:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Semua berkas telah berhasil ditransfer"
 
-#: resources.h:706
+#: resources.h:727
 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:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Semua transfer sudah selesai. %d berkas tidak bisa ditransfer."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Ijinkan &kembali pada mode transfer lain jika gagal"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Ijinkan kembali pada mode transfer lain jika gagal"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Sudah terhubung"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1417,7 +1429,7 @@
 "Alternatif lain, Anda bisa menggunakan aplikasi Pageant dari PuTTY untuk "
 "mengelola kunci Anda, FileZilla bisa mengenali Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1425,7 +1437,7 @@
 "Alternatif lain, Anda bisa menggunakan agent SSH sistem Anda. Untuk "
 "melakukannya, pastikan variabel lingkungan SSH_AUTH_SOCK sudah diset."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1433,7 +1445,7 @@
 "Alternatif lain, kunjungi http://filezilla-project.org untuk mendownload "
 "versi terbaru."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1442,7 +1454,7 @@
 "Sebuah kesalahan memuat antrian transfer dari \"%s\".\n"
 "Beberapa antrian mungkin belum dikembalikan."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1451,7 +1463,7 @@
 "Sebuah kesalahan memuat antrian transfer ke \"%s\".\n"
 "Beberapa antrian mungkin belum dikembalikan."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1459,28 +1471,28 @@
 "Berkas dengan nama yang sama dengan berkas yang sedang di-geser sudah ada "
 "pada lokasi target."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Operasi remote lain sedang berlangsung, tidak dapat mengganti direktori saat "
 "ini."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Semua perubahan pada Manajemen Situs tidak bisa disimpan."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1488,58 +1500,58 @@
 "Semua perubahan pada Manajemen Situs tidak akan disimpan kecuali Anda "
 "memperbaiki berkasnya."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Semua perubahan pada filter tidak akan disimpan."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "&Terapkan pada direktori saja"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Terapkan"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Terapkan pada &antrian saat ini saja"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Terapkan pada &berkas saja"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arsip"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Sebagai tab dalam tampilan antrian transfer"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Meminta tindakan"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Meminta kata sandi"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Meminta sistem operasi untuk sebuah port."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Meminta sistem operasi anda untuk alamat IP eksternal"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Menanyakan pertanyaan pada forum FileZilla"
 
@@ -1547,39 +1559,35 @@
 msgid "Associated program not found:"
 msgstr "Program yang sesuai tidak ditemukan:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Paling tidak satu kondisi filter tidak lengkap"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Pada titik ini, semua informasi yang diperlukan sudah didapatkan."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atribut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Authentikasi gagal."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Pembuat:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Otomatis"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Klasifikasi jenis berkas secara otomatis"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Pemeriksaan update otomatis"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Ukuran yang tersedia"
 
@@ -1588,66 +1596,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Simbol unit untuk byte. Hanya menterjemahkan huruf pertama>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "L&ewati proxy"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instruksi penggunaan dasar"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Perilaku"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Sedang diedit"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "String benchmark coalescer"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Hati-hati! Sertifikat sudah dibatalkan"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Biner"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Blackboard"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Penanda"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Penanda:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Penanda"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Tanggal pembuatan:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Informasi pembuatan"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Kategori bisnis:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1658,63 +1666,63 @@
 "untuk hanya menggunakan port tertentu, harap masukan batasan port dibawah "
 "ini."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "B&atalkan operasi saat ini"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "&Periksa untuk pembuatan harian dari FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "B&ersihkan semua"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Salin URL ke clipboard"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Kustomisasi"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Klasifikasi jenis berkas kustomisasi:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Menkalkulasi offset zona waktu server..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Tidak dapat membaca dari berkas"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Tidak dapat menulis data ke berkas"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Tidak dapat menulis data ke berkas: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Batal"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Batalkan operasi saat ini"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Batalkan operasi saat ini"
 
@@ -1725,11 +1733,11 @@
 "Tidak bisa mengakses '%s', tidak ada media yang dimasukkan atau drive tidak "
 "siap"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Tidak bisa menambahkan server pada Manajemen Situs"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1745,30 +1753,30 @@
 "Tidak dapat membandingkan direktori, filter yang berbeda untuk direktori "
 "lokal dan remote diaktifkan"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Tidak dapat membandingkan direktori, tidak terhubung ke server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Tidak dapat membuat filter baru"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Tidak dapat mengedit berkas"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Tidak dapat mengedit berkas, tidak terhubung ke server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Tidak bisa mengedit berkas, path remote tidak diketahui."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1776,8 +1784,8 @@
 "Tidak bisa membuat koneksi FTP pada server SFTP. Harap pilih protokol yang "
 "benar."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Tidak dapat membuka papan Koneksi cepat dari berkas sumber"
 
@@ -1789,44 +1797,48 @@
 msgid "Cannot load keyfile"
 msgstr "Tidak dapat memuat berkas kunci"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Tidak dapat membuka toolbar dari berkas sumber"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Tidak bisa mengingat kata sandi"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Tidak dapat mengganti nama daftar"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Tidak dapat mengganti nama berkas"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Tidak dapat menyimpat kumpulan filter"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Tidak dapat memilih filter"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Tidak dapat menentukan asosiasi berkas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Tidak bisa menampilkan dialog"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Tidak bisa melihat/edit berkas yang dipilih"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Kategori"
 
@@ -1834,59 +1846,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Data sertifikat dan sesi tidak tersedia."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detail sertifikat"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Sertifikat dalam kendali:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Pembuat sertifikat"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Tantangan:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Ganti atribut berkas"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Ganti hak akses berkas."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Mengganti pengaturan berkas log membutuhkan akses ulang FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Masalah enkoding karakter"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Charset"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Periksa versi &beta dan release candidate"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Periksa &update..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Periksa untuk &update FileZilla secara otomatis:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Periksa versi baru dari FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Periksa untuk update"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Pemeriksaan update gagal"
 
@@ -1894,21 +1906,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Memeriksa alamat IP eksternal yang benar"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Memeriksa update"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Pemeriksaan checksum berkas yang didownload tidak cocok."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Pilih direktori lokal default"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Pilih direktori lokal"
 
@@ -1916,43 +1928,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Potongan data terhapus secara tidak benar"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cipher:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Tut&up tab"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Klasik"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Hapus daftar &Manajemen Situs"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Hapus cache &layout"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Hapus sejarah &koneksi cepat"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Hapus informasi &koneksi ulang"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Hapus antrian &transfer"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Hapus sejarah"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1960,11 +1972,11 @@
 msgid "Clear private data"
 msgstr "Hapus data privat"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Hapus koneksi cepat"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Bersihkan string coalescer"
 
@@ -1972,36 +1984,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klik pada Selesai untuk menyimpan konfigurasi Anda."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klik pada selanjutnya untuk mendownload versi baru."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Klien ke server MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Cipher klien ke server:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Tutup &semua tab yang lain"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Tutup FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Tutup semua FileZilla yang sedang berjalan"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Tutup tab aktual"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Ko&mentar:"
 
@@ -2009,11 +2021,11 @@
 msgid "Column properties"
 msgstr "Properti kolom"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Setup kolom"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Perintah dan argumennya harus diberi tanda kutip dengan benar."
 
@@ -2032,9 +2044,9 @@
 msgstr "Perintah tidak didukung oleh protokol ini"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Perintah:"
 
@@ -2042,7 +2054,7 @@
 msgid "Comment"
 msgstr "Komentar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nama umum:"
 
@@ -2051,15 +2063,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Komunikasi diputus oleh router atau firewall"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Bandingkan waktu &modifikasi"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Bandingkan &ukuran berkas"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Batasan &perbandingan (dalam menit):"
 
@@ -2067,60 +2079,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Jumlah percobaan harus diantara 0 dan 1440 menit."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Dikompilasi untuk:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Dikompilasi pada:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Dikompilasi dengan:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Opsi kompiler:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Terkompresi"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transfer konkurensi"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Kondisi bersifat &case sensitive"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Pengujian konfigurasi"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Konfigurasi mode pasif"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Konfigurasi batasan port"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Mengkonfigurasi FileZilla dan jaringan Anda"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Konfirmasi penghapusan"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Dibutuhkan konfirmasi"
 
@@ -2128,7 +2140,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Selamat, konfigurasi Anda bekerja."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Pengaturan koneksi tanpa melalui proxy"
 
@@ -2136,34 +2148,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Hubungkan ke situs Manajemen Situs yang ditentukan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Terhubung"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Menghubungkan"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Menghubungkan ke %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Menghubungkan ke %s melalui proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Menghubungkan ke %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Menghubungkan ke server"
 
@@ -2171,17 +2183,17 @@
 msgid "Connection"
 msgstr "Koneksi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Percobaan koneksi gagal"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Percobaan koneksi gagal dengan \"%s\"."
@@ -2195,12 +2207,12 @@
 msgid "Connection closed"
 msgstr "Koneksi tertutup"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Koneksi ditutup oleh server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Koneksi terbentuk, menginisialisasi TLS..."
@@ -2209,7 +2221,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Koneksi terbentuk, mengirimkan permintaan HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Koneksi terbentuk, menunggu ucapan selamat datang..."
 
@@ -2225,15 +2237,15 @@
 msgid "Connection refused"
 msgstr "Koneksi ditolak"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Koneksi time out"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Koneksi time out."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Koneksi ke server putus."
 
@@ -2253,27 +2265,23 @@
 msgid "Convert keyfile"
 msgstr "Konversi berkas kunci"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Sal&in"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Salin (%d) dari %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Salinan dari %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Salin URL dari item yang dipilih pada clipboard."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Tidak dapat menerima hubungan: %s"
@@ -2283,16 +2291,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Tidak bisa menambahkan koneksi pada Manajemen Situs"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Tidak dapat menyelesaikan operasi"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Tidak dapat terhubung ke server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Tidak dapat terhubung ke server: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Tidak dapat mengkonversi perintah ke enkoding server"
 
@@ -2301,17 +2313,17 @@
 msgid "Could not convert private key"
 msgstr "Tidak dapat mengkonversi kunci privat"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Tidak dapat menyalin URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Tidak dapat menyalin data"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2321,11 +2333,11 @@
 "Entah ekstensi shell tidak terinstal dengan benar atau Anda tidak meletakkan "
 "berkas pada jendela Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Tidak dapat menjalin hubungan dengan server"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2337,11 +2349,11 @@
 "perintah '--datadir <custompath>' atau dengan menentukan variabel lingkungan "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Tidak dapat menghasilkan urutan login."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2349,7 +2361,7 @@
 "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, "
 "gnutls_x509_get_issuer_dn gagal"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2357,7 +2369,7 @@
 "Tidak dapat mendapatkan nama unik dari pemberi sertifikat, "
 "gnutls_x509_get_dn gagal"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Tidak dapat memperoleh path remote lengkap"
 
@@ -2366,15 +2378,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Tidak dapat mendapatkan jawaban dari fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "Tidak bisa mendapatkan direktori sementara untuk mendownload berkas"
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2401,7 +2413,7 @@
 msgid "Could not load private key"
 msgstr "Tidak bisa memuat kunci privat"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2412,7 +2424,7 @@
 "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori "
 "remote?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2433,9 +2445,9 @@
 "s'.\n"
 "Penjelajahan tersinkronisasi telah dinonaktifkan."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Tidak dapat membuka clipboard"
 
@@ -2450,11 +2462,11 @@
 msgid "Could not parse remote path."
 msgstr "Tidak dapat memproses path remote."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Tidak dapat memproses alamat server:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Tidak bisa menulis dari socket: %s"
@@ -2463,12 +2475,12 @@
 msgid "Could not read server item."
 msgstr "Tidak dapat membaca item server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Tidak dapat mencari hingga ke akhir berkas"
 
@@ -2476,22 +2488,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Tidak dapat mengirimkan perintah ke fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Tidak dapat mengulang thread IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Tidak dapat memulai handshake proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Tidak dapat memulai transfer"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2510,7 +2522,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:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2519,15 +2531,15 @@
 "Tidak dapat menulis \"%s\", antrian tidak dapat disimpan.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Tidak dapat menulis \"%s\", situs yang terpilih tidak bisa diekspor: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Tidak bisa menulis \"%s\": %s"
@@ -2537,7 +2549,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Tidak bisa menulis berkas kunci: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Tidak bisa menulis ke berkas lokal"
 
@@ -2547,37 +2559,49 @@
 msgid "Could not write to log file: %s"
 msgstr "Tidak bisa menulis ke berkas log: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Tidak bisa menulis ke socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Negara:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "FileZilla rusak seketika. Hanya gunakan untuk melakukan debug"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Membua&t berkas baru"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Membuat sub direkori baru di direktori saat ini"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Membuat berkas kosong baru di direktori saat ini"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Membuat direktori"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Membuat berkas kosong"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Membuat direktori"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Membuat direktori '%s'..."
@@ -2595,7 +2619,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2616,52 +2640,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Jenis transfer saat ini ditentukan ke biner."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Kus&tomisasi"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Sekumpulan filter kustomisasi"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Server kustomisasi"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tipe d&ata"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Prefix d&esimal menggunakan simbol SI (cth. 1 KB = 1000 byte)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "D&efault"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "H&apus"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "&Nonaktifkan semua"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "J&angan simpan kata kunci"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "A&ksi klik ganda pada direktori:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplikat"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Seperi DOS dengan path virtual"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Jenis berkas berbahaya"
 
@@ -2669,16 +2697,16 @@
 msgid "Data"
 msgstr "Data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Soket data tertutup terlalu cepat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Tanggal"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Pemformatan tanggal"
 
@@ -2697,11 +2725,11 @@
 msgid "Debug"
 msgstr "Debug"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Pengaturan debug"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Direktori &lokal default:"
 
@@ -2709,19 +2737,19 @@
 msgid "Default (Autodetect)"
 msgstr "Default (Deteksi Otomatis)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Editor default tidak diberi tanda kutip dengan benar."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Aksi berkas sudah ada default"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Direktori r&emote default:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2733,15 +2761,15 @@
 msgid "Default system language"
 msgstr "Bahasa sistem default"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Mode transfer default:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Jenis transfer default:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Default: http://ip.filezilla-project.org/ip.php"
 
@@ -2764,57 +2792,57 @@
 "Menunda koneksi selama %d detik karena percobaan koneksi yang gagal "
 "sebelumnya..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Hapus daftar Manajemen Situs"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Hapus direktori yang dipilih"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Hapus berkas-berkas dan direktori yang dipilih"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Menghapus direktori"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Penghapusan banyak direktori yang tidak berelasi belum didukung"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Menghapus link simbolis"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Desktop"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detail"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detail untuk kunci baru:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Dire&ktori"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Arah"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Direktori"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Perbandingan direktori"
 
@@ -2832,11 +2860,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Pendataan direktori dibatalkan oleh pengguna"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Pendataan direktori gagal"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filter pendataan direktori"
 
@@ -2844,18 +2872,18 @@
 msgid "Directory listing successful"
 msgstr "Pendataan direktori berhasil"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "&Nonaktifkan semua"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Nonaktifkan penjelajahan tersinkronisasi dan lanjutkan mengganti direktori "
 "remote?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2863,50 +2891,49 @@
 "Nonaktifkan opsi ini kembali jika Anda tidak bisa melihat isi direktori "
 "dengan benar."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Putuskan hubungan dari server"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Telah terputus dari server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Telah terputus dari server: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Memutuskan dari server sebelumnya"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Memutuskan dari server yang terlihat sekarang"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Tampilkan dialog \"tentang\""
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Jangan gunakan editor default ini"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Tidak &lakukan apa-apa"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2914,8 +2941,8 @@
 "Apakah Anda hendak menguji versi beta?\n"
 "Kecuali Anda hendak menguji fitur baru, selalu gunakan versi stabil."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Apakah Anda hendak menutup FileZilla?"
 
@@ -2930,7 +2957,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Apakah Anda hendak menghapus semua daftar Manajemen Situs?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Apakah Anda hendak menghapus daftar yang terpilih?"
 
@@ -2938,34 +2965,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Apakah Anda hendak menghapus antrian transfer?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Apakah Anda hendak mengirimkan '%s' pada server?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Dokumentasi"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Jangan gunakan alamat IP eksternal pada koneksi &lokal."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Berkas bertitik adalah nama berkas yang dimulai dengan titik, misalnya ."
 "htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Aksi klik ganda"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Download"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Batasan download:"
 
@@ -2978,100 +3005,113 @@
 msgid "Download limit: none"
 msgstr "Batasan download: tidak ada"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Download hasil pencarian"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Download direktori yang dipilih"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Download berkas dan direktori yang dipilih"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Kecepatan download: %s/s\n"
+"Kecepatan upload: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Mendownload"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Mendownload %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Menndownload banyak direktori yang tidak berhubungan belum didukung"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Mendownload hasil pencarian"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr "Drag&drop antar FileZilla yang berbeda belum diimplementasikan."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Drag&drop antara server yang berbeda belum diimplementasikan."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&ikat"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "&Aktifkan semua"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "&Masukkan direktori"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&ksekusi"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "Ke&luar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Setiap filter perlu paling tidak satu kondisi."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Edit filter"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Edit berkas dengan editor yang telah dikonfigurasi dan upload perubahan pada "
 "server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Pengeditan gagal"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Masukkan perintah sendiri"
 
@@ -3079,7 +3119,7 @@
 msgid "Empty command."
 msgstr "Perintah kosong."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Daftar direktori kosong"
 
@@ -3091,101 +3131,113 @@
 msgid "Empty file extension."
 msgstr "Ekstensi berkas kosong"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Nama filter kosong tidak diijinkan."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nama kosong"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "String tanda kutip kosong."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Ak&tifkan semua"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Aktifkan &penyaringan karakter yang tidak valid"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Terenkripsi"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Enkripsi"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Detail enkripsi"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Akhiri perbandingan dan ganti urutan pengurutan?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Masukkan &perintah sendiri..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Masukkan 0 untuk kecepatan tidak terbatas."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Masukkan perintah"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Masukkan perintah sendiri"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Masukkan direktori"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Masukkan nama filter"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Masukkan nama untuk kelompok filter"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Masukkan nama baru untuk kelompok filter"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Masukkan Kata kunci"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Masukkan direktori yang terpilih"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Masukkan alamat server.\n"
 "Untuk menentukan protokol server, masukkan host dengan protokolnya. Jika "
 "protokol tidak ditentukan, protokol default (ftp://) akan digunakan.\n"
 "Anda juga dapat memasukkan URL lengkap dalam bentuk protokol://pengguna:"
-"katasandi@host:port disini, nilai di field lainnya akan ditimpa."
+"katasandi@host:port disini, nilai di field lainnya akan ditimpa.\n"
+"\n"
+"Protokol yang didukung:\n"
+"- ftp:// untuk FTP normal\n"
+"- sftp:// untuk protokol transfer berkas SSH\n"
+"- ftps:// untuk FTP melalui TLS (implisit)\n"
+"- ftpes:// untuk FTP melalui TLS (eksplisit)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3196,7 +3248,7 @@
 "Masukkan kata sandi untuk berkas '%s'.\n"
 "Harap dicatat bahwa berkas yang dikonversi akan tanpa proteksi kata sandi."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3218,7 +3270,7 @@
 msgid "Error importing"
 msgstr "Kesalahan dalam mengimpor"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Kesalahan memuat antrian"
 
@@ -3227,27 +3279,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Kesalahan memuat berkas xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Kesalahan menyimpan antrian"
 
@@ -3258,72 +3310,80 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Kesalahan menulis berkas xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Kesalahan, nama berkas tidak bisa diproses."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Kesalahan, berkas lokal ada, tetapi tidak bisa dihapus"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Kesalahan:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Buat koneksi pada tab baru"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Setiap bulan"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Setiap dua minggu"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Contoh: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Contoh"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Jal&ankan"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "&Dapat dieksekusi"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr "Aplikasi tidak berisi informasi versi, tidak bisa memeriksa update."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Penjelajah"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Ekspor &Antrian"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "&Pengaturan Ekspor"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Pengaturan ekspor"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Nama F&ilter"
 
@@ -3331,7 +3391,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - File Transfer Protocol"
 
@@ -3343,25 +3403,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - File Transfer Protocol Tidak Aman"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Mesin FTP tidak bisa diinisialisasi, tidak terhubung"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3377,26 +3437,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "TFTPS - FTP diatas TLS/SSL implisit"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Gagal mengganti direktori"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Gagal mengganti bahasa"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Gagal memeriksa versi baru dari FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Gagal menyalin atau memindahkan situs"
 
@@ -3404,43 +3464,43 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Gagal membuat salinan backup dari berkas xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Gagal membuat soket, membatalkan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Gagal membuat soket untuk mengirim mode transfer aktif"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Gagal mendownload versi terbaru dari FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Gagal untuk mendapatkan path 'Dokumenku'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Gagal mengambil path desktop"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Gagal untuk menginisialisasi mesin FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Gagal untuk menginisialisasi TLS."
@@ -3454,24 +3514,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Gagal memuat kunci privat: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Gagal membuka \"%s\" untuk menambah/menulis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Gagal membuka \"%s\" untuk dibaca"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Gagal membuka \"%s\" untuk ditulis"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Tidak dapat memproses path."
 
@@ -3479,7 +3539,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Gagal untuk memprsing sertifikat root yang dipercaya"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Gagal menerima data"
 
@@ -3491,11 +3551,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Gagal mengambil alamat ip eksternal, membatalkan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Gagal mengambil alamat ip eksternal, menggunakan alamat lokal"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Gagal mengambil alamat ip lokal."
 
@@ -3511,12 +3571,12 @@
 msgid "Failed to send command."
 msgstr "Gagal mengirimkan perintah."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3524,23 +3584,23 @@
 "Gagal menentukan bahasa ke %s (%s), menggunakan bahasa sistem default (%s, %"
 "s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, 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:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Gagal menentukan bahasa ke %s, menggunakan bahasa sistem default."
@@ -3549,7 +3609,7 @@
 msgid "Failed to validate settings"
 msgstr "Gagal memvalidasi pengaturan"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Gagal memverifikasi sertifikat peer"
 
@@ -3566,21 +3626,19 @@
 msgid "Failed transfers"
 msgstr "Pengiriman yang gagal"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Kembali ke mode aktif"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "B&erkas:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "B&erkas"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Berkas"
 
@@ -3596,7 +3654,7 @@
 msgid "File editing"
 msgstr "Pengeditan berkas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Berkas ada"
 
@@ -3604,7 +3662,7 @@
 msgid "File exists action"
 msgstr "Aksi jika berkas ada"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Berkas sudah berubah"
 
@@ -3612,14 +3670,14 @@
 msgid "File lists"
 msgstr "Daftar berkas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Berkas tidak ditemukan"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Pencarian berkas"
 
@@ -3655,25 +3713,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Transfer berkas berhasil, tertransfer %s pada %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Transfer berkas sedang dalam proses."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Berkas akan ditransfer dengan tipe data ASCII"
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Berkas akan ditransfer dengan tipe data biner"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla Bermasalah"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3681,76 +3739,77 @@
 "FileZilla sekarang bisa menguji konfigurasi Anda untuk memastikan semua "
 "sudah sudah benar."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla sudah terhubung ke sebuah server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla berjalan pada mode kiosk.\n"
-"Jenis login 'Normal' dan 'Account' tidak lagi tersedia pada mode ini."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "FileZilla harus dijalankan ulang agar perubahan bahasa berjalan."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Update FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Status bar daftar berkas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nama berkas"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filter nama berkas..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Nama berkas tidak valid"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Nama berkas tidak boleh mengandung karakter berikut: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nama berkas tidak berubah"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nama berkas:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Nama berkas tidak boleh menggunakan karakter berikut: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Nama berkas tidak boleh menggunakan karakter berikut: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Berkas saat ini sedang diedit"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Ukuran berkas"
@@ -3759,68 +3818,68 @@
 msgid "Filesize format"
 msgstr "Format ukuran berkas"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Jenis berkas"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Asosiasi jenis berkas"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filter diterapkan pada:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Saring karakter yang tidak valid pada nama berkas"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Nama filter sudah ada"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Buang semua item yang cocok dengan berikut"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Buang semua item yang cocok dengan salah satu berikut"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Buang semua item yang tidak cocok dengan berikut"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Kumpulan filter sudah ada"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filter daftar direktori"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Validasi filter gagal"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Sidik jari (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Sidik jari (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Sidik jari:"
 
@@ -3828,7 +3887,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Panduan konfigurasi firewall dan router"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3836,11 +3895,11 @@
 "Untuk informasi lebih detail tentang opsi-opsi ini, harap jalankan panduan "
 "konfigurasi jaringan."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Untuk reliabilitas, Anda harus menentukan paling tidak 10 port."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3848,33 +3907,33 @@
 "Untuk sesi ini, pengaturan default akan digunakan. Semua perubahan pada "
 "aturan tidak akan disimpan."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Paksa &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Paksa menampilkan berkas &tersembunyi"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Paksa menampilkan berkas tersembunyi"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Klasifikasi format:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Format: Ekstensi diikuti dengan perintah dan argumen yang diberi tanda kutip "
 "dengan benar."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Dokumentasi lebih lanjut"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Umum"
 
@@ -3882,21 +3941,21 @@
 msgid "General SOCKS server failure"
 msgstr "Kegagalan server SOCKS umum"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy generik"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Dapatkan alamat IP eksternal dari URL berikut:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Mendapatkan bantuan"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Karena nama filter sudah ada, timpa kumpulan filter yang ada?"
 
@@ -3904,15 +3963,15 @@
 msgid "Global bookmarks"
 msgstr "Penanda global"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Hak akses grup"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "T&inggi"
 
@@ -3920,21 +3979,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP diatas TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Tersembunyi"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Tinggi"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Tertinggi"
 
@@ -3942,26 +4001,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Port tertinggi yang tersedia harus angka antara 1024 dan 65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Tahan kunci shift untuk mengganti kondisi filter pada kedua sisi secara "
 "simultan."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Situs:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Sidik jari kunci host:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Kunci mesin tidak cocok"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Host dimulai dengan '[' tetapi tidak ada kurung penutup."
 
@@ -3969,20 +4028,20 @@
 msgid "Host unreachable"
 msgstr "Host tidak dapat dicapai"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Mesin:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Jam,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (contoh: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -3992,13 +4051,13 @@
 "waktu tertentu, koneksi akan ditutup dan FileZilla akan mencoba untuk "
 "menyambung kembali."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Jika melaporkan kesalahan, harap sediakan log dengan level pencatatan "
 "\"Detail\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4010,7 +4069,7 @@
 "konfigurasi dan Anda harus mencoba mode aktif. Anda bisa menentukan mode "
 "transfer dengan basis per server pada Manajemen Situs."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4018,7 +4077,7 @@
 "Jika opsi kembali (fallback) diaktifkan, Anda bisa terhubung ke server yang "
 "salah konfigurasi yang menolak mode transfer yang dipilih."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4042,7 +4101,7 @@
 "Jika masalah ini tetap muncul, beberapa router dan/atau firewall akan "
 "menginterupsi koneksi."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4052,7 +4111,7 @@
 "menambahkan \".1\" pada akhir nama berkas (kemungkinan menimpa berkas log "
 "lama) dan berkas baru akan dibuat."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4072,7 +4131,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Jika masalah ini tetap ada, harap hubungi pembuat router Anda."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4082,7 +4141,7 @@
 "disinkronkan dengan server. Jika waktu berbeda (misalnya zona waktu "
 "berbeda), tentukan offset zona waktu pada manajemen situs."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4091,11 +4150,11 @@
 "sama jika perbedaan timestamp diantara keduanya tidak melebihi batas "
 "threshold ini."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Jika Anda mengganti bahasa, FileZilla harus dijalankan ulang."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4103,11 +4162,11 @@
 "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:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Jika Anda menutup FileZilla, perubahan Anda akan hilang."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4115,12 +4174,12 @@
 "Jika Anda salah memasukkan jenis berkas, berkas tersebut mungkin akan rusak "
 "ketika ditransfer"
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "Jika Anda mendapatkan sembarang kesalahan, konfigurasi Anda tidak benar."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4138,7 +4197,7 @@
 "atau router remote atau firewall mungkin salah konfigurasi. Pada kasus ini, "
 "coba ganti mode pasif dan hubungi administrator server untuk bantuan."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4147,7 +4206,7 @@
 "sembarang firewall dan router yang Anda miliki seharusnya terkonfigurasi "
 "dengan baik."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4155,7 +4214,7 @@
 "Jika Anda menggunakan sebuah firewall, pastikan FileZilla diijinkan menerima "
 "koneksi dari semua port yang diberikan."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4175,7 +4234,7 @@
 msgid "Import data from older version"
 msgstr "Mengimpor data dari versi lama"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Impor pengaturan"
 
@@ -4189,7 +4248,7 @@
 msgid "Improperly quoted association."
 msgstr "Pemberian tanda kutip pada asosiasi salah"
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4197,7 +4256,7 @@
 "Pada mode aktif, FileZilla harus mendengarkan sebuah port untuk transfer "
 "data. Anda harus menentukan port yang akan digunakan FileZilla."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4205,7 +4264,7 @@
 "Jika Anda memiliki router, Anda harus mengirimkan semua port yang tersedia, "
 "karena FileZilla tidak punya hubungan pada port yang dipilih sistem Anda."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4213,14 +4272,14 @@
 "Jika Anda memilih update otomatis, Anda bisa mengaktifkan pengujian update "
 "otomatis pada dialog pengaturan."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "Untuk menggunakan mode aktif, FileZilla harus tahu alamat IP eksternal Anda."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4230,7 +4289,7 @@
 "meminta sebuah port kepada server dan terhubung melalui port tersebut. Tidak "
 "banyak konfigurasi yang harus dilakukan untuk ini."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4238,20 +4297,20 @@
 "Rantai yang tidak lengkap, sertifikat induk bukan sertifikat yang "
 "ditandatangani certificate authority"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Kata kunci salah"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Menginisialisasi TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Server tidak aman, tidak mendukung FTP diatas TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktif"
@@ -4261,8 +4320,8 @@
 msgstr "Antarmuka"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "DIinterupsi oleh pengguna"
 
@@ -4274,8 +4333,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Respon HTTP tidak valid"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4298,12 +4357,13 @@
 msgid "Invalid date"
 msgstr "Tanggal tidak valid"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nama berkas tidak valid"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Host tidak valid, setelah kurung penutup hanya titik dua dan port yang boleh "
@@ -4313,28 +4373,35 @@
 msgid "Invalid input"
 msgstr "Masukan tidak valid"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Port yang diberikan tidak valid. Port harus bernilai 1 sampai 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Protokol yang diberikan tidak valid. Protokol yang valid adalah:\n"
 "ftp:// untuk FTP normal,\n"
-"sftp:// untuk protokol transfer berkas melalui SSH ,\n"
-"ftps:// untuk FTP diatas SSL (implicit) dan\n"
-"ftpes:// untuk FTP diatas SSL (explicit)."
+"sftp:// untuk protokol transfer berkas melalui SSH,\n"
+"ftps:// untuk FTP diatas TLS (implisit) dan\n"
+"ftpes:// untuk FTP diatas TLS (eksplisit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Regular expression pada kondisi pencarian tidak valid."
 
@@ -4342,7 +4409,7 @@
 msgid "Invalid response code"
 msgstr "Kode respon tidak valid"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Kondisi pencarian tidak valid: %s"
@@ -4354,38 +4421,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Path site tidak valid"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ukuran tidak valid"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nama Pengguna tidak valid."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Negara yuridiksi:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Lokalitas yuridiksi:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Kota atau provinsi yuridiksi:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Pertahankan direktori diatas"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4396,50 +4463,54 @@
 "pengujian untuk melihat apakah server mendukung fitur ini, pengujian bisa "
 "gagal."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Pertukaran kunci"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Pertukaran kunci:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Ter&endah"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Bahasa"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Bahasa sudah berubah"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Terakhir dimodifikasi"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Layout"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Batas untuk &download konkuren:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Batas untuk &upload konkuren:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Batas port lokal"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Batas ukuran untuk berkas log"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Batas:"
 
@@ -4447,7 +4518,7 @@
 msgid "Line length exceeded"
 msgstr "Ukuran baris kelebihan"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Dihubungkan dengan"
 
@@ -4456,21 +4527,21 @@
 msgstr "Soket ditutup"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Daftar:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Port ter&endah yang tersedia:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokal:"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Berkas lokal"
 
@@ -4486,7 +4557,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Berkas lokal bukan nama berkas yang valid."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filter lokal:"
 
@@ -4494,7 +4565,7 @@
 msgid "Local site:"
 msgstr "Situs lokal:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Lokalitas:"
 
@@ -4502,16 +4573,16 @@
 msgid "Log file"
 msgstr "Berkas log"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Log pemeriksaan update:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Melakukan pencatatan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4519,7 +4590,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:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4527,15 +4598,15 @@
 "Data login berisi karakter non-ASCII dan server mungkin tidak mendukung UTF-"
 "8. Mencoba charset lokal."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "Urutan login dilakukan, namun belum login. Membatalkan."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "Jenis login harus berupa 'ask' atau 'interactive' (tanpa kutip)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4544,13 +4615,13 @@
 "Jenis login, hanya bisa digunakan dengan URL FTP. Argumen harus berupa '%s' "
 "atau '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Rendah"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Terendah"
 
@@ -4558,11 +4629,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "Port terendah yang tersedia harus angka antara 1024 dan 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Pastikan berkas dapat diakses dan merupakan dokumen XML yang well-formed."
@@ -4584,7 +4655,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Balasan rusak, server tidak mengirimkan akhir baris yang benar"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4595,58 +4666,58 @@
 msgid "Manual transfer"
 msgstr "Transfer manual"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Cocokkan semua dari pilihan berikut"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Cocok dengan sembarang pilihan berikut"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Tidak cocok dengan pilihan berikut"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Jumlah maksimum &transfer secara simultan:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Pesan log"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Posisi pesan log"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Menit"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Ke &bawah"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Ke &atas"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Komputerku"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Dokumenku"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Situsku"
 
@@ -4655,33 +4726,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nama"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Nama sudah ada"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Nama penanda sudah ada."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nama:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Harus memasukkan nama filter"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Harus memasukkan nama path remote yang valid"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Harus menentukan enkoding karakter"
 
@@ -4689,19 +4760,23 @@
 msgid "Network unreachable"
 msgstr "Jaringan tidak dapat dicapai"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Tidak pernah"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Direktori &Baru"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "&Tab baru"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Pe&nanda Baru"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4714,41 +4789,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Penanda baru"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Direktori baru"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Fitur dan peningkatan baru pada %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Filter baru"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Direktori baru"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Situs baru"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Disebelah antrian transfer"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Tidak"
 
@@ -4756,26 +4831,26 @@
 msgid "No category to export selected"
 msgstr "Tidak ada kategori yang akan diekspor"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Tidak ada perintah yang diberikan, membatalkan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr ""
 "Tidak ada alamat IP eksternal yang ditentukan, mencoba menggunakan default."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Tidak ada berkas yang sedang diedit."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Tidak ada nama filter yang diberikan"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Tidak ada mesin yang diberikan, harap masukkan sebuah mesin."
 
@@ -4783,27 +4858,27 @@
 msgid "No images available"
 msgstr "Tidak ada gambar yang tersedia"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Tidak ada lagi berkas pada antrian!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Tidak ada nama untuk kelompok filter yang diberikan."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Tidak ada program yang diasosiasikan dengan tipe berkas"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Tidak ada hasil pencarian"
 
@@ -4821,23 +4896,23 @@
 msgid "No username given."
 msgstr "Tidak ada nama pengguna yang diberikan."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Tidak ada"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Tidak ada yang terpilih"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4847,15 +4922,15 @@
 msgstr "Tidak semua barang bisa di antrikan ulang untuk dilihat/diedit."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Tidak terhubung"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Tidak terhubung pada sembarang server"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Tidak terhubung pada sembarang server."
 
@@ -4863,20 +4938,20 @@
 msgid "Not connected."
 msgstr "Tidak terhubung."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Perhatikan bahwa fitur ini hanya didukung menggunakan protokol FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Catatan: Ini hanya bekerja dengan koneksi FTP tak terenkripsi."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Catatan: Menggunakan proxy generik memaksa mode pasif pada koneksi FTP."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Jumlah bilangan desimal:"
 
@@ -4884,21 +4959,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Jumlah percobaan harus diantara 0 dan 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "&Buka berkas"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4906,125 +4981,129 @@
 "Pada halaman berikut, mode transfer yang dipilih akan dikonfigurasi, dan "
 "juga mode kembali jika diaktifkan."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Satu kali"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Hanya versi FileZilla dan sistem operasi yang Anda gunakan yang akan "
-"dikirimkan ke server."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Sekali seminggu"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Buka direktori pada manajemen berkas sistem"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Buka Manajemen Situs"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Buka Manajemen Situs."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Membuka dialog filter daftar situs. Klik kanan untuk daftar situs."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Buka berkas."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Buka dialog pengaturan FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Dibuka sebagai:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Pembukaan berkas gagal"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Buka tab baru"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Buka Manajemen Situs"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Membuka dialog filter daftar direktori. Klik kanan untuk mengganti status "
 "filter."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistem operasi"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Masalah sistem operasi terdeteksi"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organisasi:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Lainnya:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Gambaran"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Timpa &jika sumber lebih baru"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Timpa berkas"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Timpa berkas jika ukuran berbeda"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Timpa berkas jika ukuran berbeda atau sumber lebih baru"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Timpa berkas jika sumber lebih baru"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Timpa jika &ukuran berbeda"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Timpa jika uku&ran berbeda atau sumber lebih baru"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Hak akses pemilik"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Pemilik/Grup"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "M&encegah sistem untuk memasuki idle ketika transfer dan operasi lain"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Host p&roxy:"
@@ -5033,27 +5112,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Perintah PORT diabaikan oleh router atau firewall."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&sif (disarankan)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paket"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Parameter bukan URL yang valid"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Kata &kunci:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Pasif (disarankan)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Mode pasif"
@@ -5068,42 +5147,46 @@
 msgid "Password required"
 msgstr "Kata sandi diperlukan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Path"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Path tidak ditemukan:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Path"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Penghapusan tertunda"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Hak akses"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Hak akses"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Platform:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5118,7 +5201,7 @@
 "Harap periksa http://filezilla-project.org/probe.php bahwa server sudah "
 "berjalan dan periksa pengaturan Anda kembali."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5127,7 +5210,7 @@
 "kunjungi http://filezilla-project.org untuk mendownload kode sumber dari "
 "FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5157,7 +5240,7 @@
 msgid "Please enter a custom time format."
 msgstr "Harap masukkan format waktu kustomisasi."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5170,20 +5253,20 @@
 msgstr ""
 "Harap masukkan batas kecepatan download lebih besar atau sama dengan 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Harap masukkan nama untuk filter baru."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Harap masukkan nama baru untuk filter yang disalin."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Harap masukkan nama baru untuk kelompok filter \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Harap masukkan nama baru untuk filter."
 
@@ -5204,11 +5287,11 @@
 "transfers."
 msgstr "Harap masukkan angka antara 1 dan 10 untuk jumlah transfer konkuren."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Harap masukkan kata sandi untuk server ini:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5225,11 +5308,11 @@
 "Harap masukan waktu timeout antara 5 dan 9999 detik atau 0 untuk "
 "menonaktifkan timeout."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Harap masukkan nama unik untuk kumpulan filter ini"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Harap masukkan nama pengguna untuk server ini:"
 
@@ -5241,10 +5324,6 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Harap masukkan URL untuk mendapatkan alamat eksternal Anda"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Harap masukkan waktu interval paling tidak 7 hari"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5252,7 +5331,7 @@
 msgstr ""
 "Harap masukkan batas kecepatan upload lebih besar atau sama dengan 0 %s/s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5260,14 +5339,18 @@
 "Harap masukkan perintah FTP.\n"
 "Menggunakan perintah ftp akan menghapus cache direktori."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Masukkan nama direktori yang akan dibuat:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Harap masukkan nama berkas yang akan dibuat:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Harap masukkan nama pengguna dan kata sandi untuk server ini:"
 
@@ -5286,7 +5369,7 @@
 "Jika Anda memiliki alamat dinamis atau tidak tahu alamat eksternal, gunakan "
 "opsi resolver eksternal."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5302,7 +5385,7 @@
 "Harap pastikan FileZilla diijinkan untuk membuat koneksi keluar dan pastikan "
 "Anda menuliskan alamat dari alamat resolver dengan benar."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Harap pastikan lokal yang diminta sudah terinstall pada sistem Anda."
 
@@ -5318,7 +5401,7 @@
 "meneruskan port secara manual. Jangan jalankan router Anda pada 'mode DMZ' "
 "atau 'mode game'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5330,7 +5413,7 @@
 "dianggap digunakan oleh trojan atau malware. Hal ini bisa menimbulkan false "
 "alarm yang bisa Anda abaikan."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5338,7 +5421,7 @@
 "Harap perhatikan bahwa mempertahankan waktu timestamp pada upload hanya "
 "berlaku pada server FTP, FTPS, dan FTPES yang mendukung perintah MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5346,7 +5429,7 @@
 "Harap perhatikan bahwa beberapa server bisa memblokir Anda jika Anda terlalu "
 "banyak melakukan hubungan ulang pada interval yang singkat."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5355,7 +5438,7 @@
 "Harap baca http://wiki.filezilla-project.org/Date_and_Time_formatting untuk "
 "detailnya"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5373,38 +5456,38 @@
 "atau Anda mengalami masalah dengan server padahal sebelumnya bekerja dengan "
 "baik."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Harap pilih sebuah aksi:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Harap memilih kategori yang hendak Anda import."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Harap pilih mode transfer default yang hendak Anda gunakan."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Harap pilih attribut baru untuk direktori \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Harap pilih atribut baru untuk berkas \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Tentukan atribut baru dari direktori yang dipilih."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Harap pilih atribut baru dari berkas dan direktori yang dipilih."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Harap pilih attribut baru untuk berkas yang dipilih"
 
@@ -5422,7 +5505,7 @@
 "pada 'mode DMZ' atau 'mode game'. Hal-hal seperti inspeksi protokol atau "
 "'perbaikan' pada protokol tertentu harus dinonaktifkan"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5430,25 +5513,25 @@
 "Harap kunjungi http://filezilla-project.org untuk informasi lebih lanjut "
 "tentang FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 "Harap kunjungi http://filezilla-project.org untuk mendownload versi terbaru."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Kode pos:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Situs Terdefinisi"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Mempertahankan berkas waktu"
 
@@ -5456,47 +5539,60 @@
 msgid "Preview:"
 msgstr "Preview:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Sertifikat koneksi utama dan koneksi data tidak sesuai."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Cetak informasi diagnosa yang berhubungan pada saat FileZilla dijalankan"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Cetak informasi versi pada stdout dan selesai"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Direktori prioritas (default)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritas"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Aturan privasi:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Kebijakan privasi: Hanya versi FileZilla, sistem operasi, dan arsitektur CPU "
+"Anda yang akan dikirimkan ke server."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "&Kunci privat:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tokol:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Katasandi pro&xy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Proses &Antrian"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protokol:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Port proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Pengguna proxy:"
 
@@ -5504,12 +5600,16 @@
 msgid "Proxy authentication failed"
 msgstr "Authentikasi proxy gagal"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Handshake proxy gagal: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5524,23 +5624,23 @@
 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:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy ditentukan tetapi host atau port proxy tidak valid"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Authentikasi Kunci Publik"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritma kunci publik:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Hak akses publik"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Antrian sudah diproses sepenuhnya"
 
@@ -5559,39 +5659,39 @@
 msgid "Queue: empty"
 msgstr "Antrian: kosong"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Berkas antrian"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Mengantri:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&eboot sistem"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Pohon direktori R&emote"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "U&langi dan antri ulang berkas yang terpilih"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Perintah Raw FTP"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Ba&ca"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Per&barui"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Ganti &nama"
 
@@ -5603,63 +5703,75 @@
 "Jalankan ulang panduan dan periksa pengaturan Anda dan konfigurasikan semua "
 "router dan firewall dengan benar."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Bac&a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Hanya-baca"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Yakin batalkan operasi yang sedang berjalan?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Yakin menghapus %d direktori dengan isinya?"
+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:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Yakin menghapus %d berkas?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Yakin menghapus %s dan %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Yakin menghapus %s dan %s dari server?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Yakin menghapus semua berkas dan/atau direktori yang dipilih?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Alasan"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Reboot sistem sekarang"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Mas&uk jauh kedalam sub direktori"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Menerima baris melebihi 10000 karakter, dibatalkan."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Data yang diterima ditolak"
 
@@ -5671,11 +5783,11 @@
 "Informasi koneksi ulang tidak bisa dihapus selama terhubung ke server.\n"
 "Jika Anda melanjutkan, koneksi Anda akan terputus."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Pengaturan koneksi ulang"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Sambung lagi ke server yang terakhir digunakan"
 
@@ -5683,34 +5795,38 @@
 msgid "Redirection to invalid address"
 msgstr "Pengalihan ke alamat yang tidak valid"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Perbarui daftar berkas dan direktori"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Ingat kata kunci?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Remote"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Sertifikat remote tidak dipercaya."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Berkas remote"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Pencarian berkas remote"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filter remote:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Path Remote"
 
@@ -5723,7 +5839,7 @@
 "Path remote tidak bisa diproses. Pastikan sudah path absolut valid dan "
 "didukung oleh jenis server yang dipilih (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5734,7 +5850,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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."
 
@@ -5742,11 +5858,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Path remote tidak bisa diproses."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Penanganan path remote:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Path remote:"
 
@@ -5754,76 +5870,76 @@
 msgid "Remote site:"
 msgstr "Situs remote:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Hapus &semua"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Hapus &yang terpilih"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Ganti nama berkas"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Ganti nama direktori yang terpilih"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Ganti nama berkas dan direktori yang terpilih"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Mengganti nama '%s' menjadi '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Melaporkan kesalahan dan permintaan fitur"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Membutuhkan FTP diatas TLS secara eksplisit"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Membutuhkan FTP diatas TLS secara implisit"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Ulangi dan antri ulang &semua berkas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Me-resolve alamat dari %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Me-resolve nama mesin"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Respon:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Hasil:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Melanjutkan pengiriman berkas"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5831,38 +5947,38 @@
 "Melanjutkan berkas ASCII dapat menimbulkan masalah jika server menggunakan "
 "format akhir baris yang berbeda dengan klien."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Mengambil daftar direktori..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Menerima alamat IP eksternal dari %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Sertifikat root tidak dipercaya"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "&Tampilkan berkas yang sedang diedit..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "Ta&mpilkan Manajemen Situs di awal"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "&Mematikan sistem"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Berhenti"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Penjelajahan t&ersinkronisasi"
 
@@ -5870,31 +5986,46 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Simpan pengaturan?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Penyimpanan kata sandi telah dinonaktifkan oleh Anda."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Membaca berkas untuk di masukkan ke antrian"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Membaca file yang akan di-upload"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "&Kondisi pencarian:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "&Direktori pencarian:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Mencari berkas secara rekursif."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Mencari berkas pada server"
 
@@ -5907,25 +6038,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Lihat juga: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Pil&ih server"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Pilih &halaman:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Pilih Tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Pilih aksi default yang akan dilakukan jika berkas tujuan sudah ada."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Pilih editor default"
 
@@ -5945,7 +6076,7 @@
 "Pilih aksi default yang akan dilakukan hanya jika untuk berkas yang terpilih "
 "pada antrian."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Pilih lokasi download untuk paket"
 
@@ -5966,7 +6097,7 @@
 msgstr "Pilih pengaturan untuk berkas yang akan diekspor"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Pilih berkas untuk situs yang akan diekspor"
 
@@ -5982,12 +6113,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Pilih nama berkas untuk berkas kunci yang akan dikonversi"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Pilih bagaimana berkas ini harus dibuka"
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Pilih direktori target download"
 
@@ -5995,15 +6126,15 @@
 msgid "Select target filename"
 msgstr "Pilih nama berkas target"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Pilih kategori yang akan diekspor:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Pilih data privat yang hendak Anda hapus."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6015,7 +6146,7 @@
 msgid_plural "Selected %d directories."
 msgstr[0] "Direktori yang dipilih %d."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6033,7 +6164,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Terpilih %s dan %s untuk ditransfer."
@@ -6048,13 +6179,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Terpilih %s dan %s. Ukuran total: Paling tidak %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Editor yang dipilih tidak ada."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Berkas yang dipilih sudah diedit"
 
@@ -6062,15 +6193,15 @@
 msgid "Selected file is already loaded"
 msgstr "Berkas yang dipilih sudah dimuat"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Berkas yang dipilih sudah terbuka"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Berkas yang dipilih masih diedit"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Filter yang dipilih hanya bekerja untuk berkas lokal."
 
@@ -6087,37 +6218,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Port yang dipilih biasanya digunakan oleh protokol lain."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Kirim perintah FTP &keep-alive"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "Kirim perintah tertentu ke server jika tidak tersedia"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Mengirimkan perintah keep-alive"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Nomor seri:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Jenis Server:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Server tidak memutuskan koneksi TLS dengan benar"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Server tidak mendukung karakter bukan ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6126,15 +6262,15 @@
 "Server tidak mendukung proses kelanjutan dari berkas > %d GB. Mengakhiri "
 "transfer karena ukuran berkas sesuai."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Server tidak mendukung proses kelanjutan dari berkas > 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Server tidak mendukung proses kelanjutan dari berkas > 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6143,7 +6279,7 @@
 "Server mungkin tidak mendukung proses kelanjutan dari berkas > %d GB. "
 "Mengakhiri transfer karena ukuran berkas sesuai."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6151,11 +6287,11 @@
 "Server mungkin membutuhkan akun. Harap tentukan sebuah akun menggunakan "
 "Manajemen Situs"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Server mengirimkan path kosong."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6163,13 +6299,13 @@
 "Server mengirimkan prompt login tambahan. Anda harus menggunakan jenis login "
 "interaktif."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6189,102 +6325,113 @@
 msgid "Server sent unexpected reply."
 msgstr "Server mengirimkan balasan yang tidak diharapkan."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Server ke MAC klien:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Server ke cipher klien:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Jenis &Server:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Berkas server/lokal"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Detail sesi"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Tentukan &Prioritas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Menentukan hak akses dari '%s' menjadi '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize dipanggil tanpa soket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Pengaturan"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Tampilkan &daftar direktori"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Tampilkan dialog &selamat datang..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 "Tampilkan struktur pohon dari dua direktori dan melanjutkan perbandingan?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Tampilkan cipher TLS yang tersedia"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Tampilkan dialog bantuan ini"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Mematikan sistem sekarang"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Algoritma tandatangan:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Daftar &Manajemen Situs"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Manajemen Situs"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Manajer Situs - Tidak bisa mengingat kata sandi"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Manajemen Situs - Data tidak valid"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Manajemen Situs telah dibuka"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Site tidak ada."
 
@@ -6294,8 +6441,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Path situs sudah diganti."
 
@@ -6314,11 +6461,11 @@
 "Situs.\n"
 "Tambahkan koneksi aktual pada manajemen situs?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Ukuran"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Pemformatan ukuran"
 
@@ -6327,31 +6474,31 @@
 msgid "Size unknown"
 msgstr "Ukuran tidak diketahui"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Lewati berkas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Lewati download %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Lewati upload %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Beberapa berkas masih diedit atau harus diupload."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6359,19 +6506,19 @@
 "Beberapa server remote yang salah konfigurasi yang berada dibelakang router, "
 "mungkin membalas dengan alamat IP lokal mereka."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Urutkan direktori secara inline"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Urutan pengurutan tidak bisa diganti jika membandingkan direktori."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Pengurutan"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Mode pengurutan:"
 
@@ -6383,20 +6530,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Berkas sumber dan target tidak boleh sama"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Sumber dan target dari operasi drop sama"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Berkas sumber:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Batas Kecepatan"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Batas kecepatan"
 
@@ -6408,7 +6555,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Batas kecepatan diaktifkan, klik untuk mengubahnya."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versi stabil dan beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Versi stabil saja"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Mulai transfer &secepatnya"
 
@@ -6416,43 +6571,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Mulai dengan Manajemen Situs yang terbuka"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Mulai mendownload %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Mulai upload %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Menjalankan situs lokal pada path yang diberikan"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Kota atau provinsi:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Stop dan hapus &semua"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Jalan:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Subyek sertifikat"
 
@@ -6460,11 +6619,11 @@
 msgid "Successful transfers"
 msgstr "Transfer berhasil"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Ringkasan dari hasil pengujian:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6472,44 +6631,45 @@
 "Symlink ke berkas tidak terpengaruh oleh pilihan ini, karena symlink selalu "
 "dihapus."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Penjelajahan tersinkronisasi"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Penjelajahan tersinkronisasi sudah dinonaktifkan."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Kesalahan sintaks"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Kesalahan sintaks pada perintah baris"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistem"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "T&oolbar"
 
@@ -6517,11 +6677,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Koneksi TLS/SSL terbentuk, mengirimkan permintaan HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Koneksi TLS/SSL terjalin, menunggu ucapan selamat datang..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Koneksi TLS/SSL terjalin."
 
@@ -6529,27 +6689,31 @@
 msgid "TTL expired"
 msgstr "TLS kadaluarsa"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Berkas tujuan telah ada"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Berkas target:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Nama berkas tujuan telah ada!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Berkas tujuan telah ada, yakin melanjutkan?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Hasil pengujian"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Menguji kemampuan melanjutkan dari server"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6567,7 +6731,7 @@
 "Manajemen Situs telah dibuka pada FileZilla 3 lainnya.\n"
 "Harap menutupnya atau data tidak akan bisa dihapus."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Dokumen XML tidak well-form: %s"
@@ -6578,11 +6742,11 @@
 msgstr "Alamat yang Anda masukkan adalah: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Penanda tidak bisa ditambahkan."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Penanda tidak bisa dibersihkan."
 
@@ -6594,19 +6758,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Urutan login kustom tidak boleh kosong."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Koneksi data tidak dapat terbentuk: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Editor default untuk berkas teks tidak ditemukan."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Editor default untuk berkas teks adalah '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
 "Nama filter yang dimasukkan sudah ada, harap memilih nama yang berbeda."
@@ -6626,9 +6795,9 @@
 "Berkas %s telah ada.\n"
 "Masukkan nama baru:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6644,14 +6813,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Berkas '%s' tidak bisa dimuat atau tidak mengandung kunci privat."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Berkas '%s' tidak bisa dimuat."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6660,8 +6829,8 @@
 "Berkas '%s' tidak bisa dibuka:\n"
 "Tidak ada program yang diasosiasikan pada sistem Anda dengan berkas ini."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6704,7 +6873,7 @@
 "belum didukung oleh FileZilla.\n"
 "Apakah Anda hendak mengkonversinya menjadi berkas tanpa proteksi?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "File yang dipilih sebagai editor default tidak ada."
 
@@ -6740,11 +6909,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Karakter berikut akan diganti: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Berkas-berkas berikut ini sedang diedit:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Solusi FTP open source yang gratis"
 
@@ -6752,7 +6921,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Penanda global tidak bisa disimpan."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6783,7 +6952,7 @@
 "Port terendah yang tersedia harus lebih rendah atau sama dengan port "
 "tertinggi yang tersedia."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6791,7 +6960,7 @@
 "Versi terbaru sudah berhasil didownload. Klik pada Selesai untuk menutup "
 "FileZilla dan memulai instalasi."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6799,11 +6968,11 @@
 "Versi terbaru sudah berhasil didownload. Harap lakukan installasi seperti "
 "yang Anda lakukan pada versi ini."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Antrian tidak akan disimpan."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6817,23 +6986,23 @@
 msgid "The selected categories have been imported."
 msgstr "Kategori yang dipilih sudah berhasil diimpor"
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Berkas yang terpilih berisi data yang dapat diimpor untuk kategori berikut:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Berkas yang dipilih sedang diedit:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Berkas yang dipilih masih dibuka oleh program lain, harap ditutup."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6851,7 +7020,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Server mengirimkan balasan yang tidak diharapkan atau tidak dikenali."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Server menggunakan enkoding charset berikut untuk nama berkas:"
 
@@ -6863,7 +7032,7 @@
 "Sertifikat server tidak diketahui. Harap periksa sertifikat untuk memastikan "
 "server dapat dipercayai."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6873,7 +7042,7 @@
 "berarti administrator telah mengganti kunci mesin, atau Anda mencoba "
 "terhubung pada komputer lain yang mencoba menjadi server."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6889,15 +7058,15 @@
 "Pengaturan sudah berhasil diimpor. Anda harus menjalankan ulang FileZilla "
 "agar efek pengaturan berjalan."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Sistem akan segera reboot kecuali Anda menekan Batal."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Sistem akan segera mati kecuali Anda menekan Batal."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6905,7 +7074,7 @@
 "Berkas target telah ada.\n"
 "Harap pilih sebuah aksi."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Pengujian tidak sukses. Apakah Anda hendak menyimpan perubahan?"
 
@@ -6913,11 +7082,11 @@
 msgid "Themes"
 msgstr "Tema"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Kumpulan filter ini tidak bisa dihapus."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Filter ini tidak bisa diganti namanya."
 
@@ -6928,7 +7097,7 @@
 msgstr ""
 "Ini berarti beberapa router dan/atau firewall masih menganggu FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6936,7 +7105,7 @@
 "Ini hanya bekerja jika Anda tidak berada dibelakang router, atau sistem Anda "
 "hanya akan mengembalikan alamat internal Anda."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6944,25 +7113,25 @@
 "Panduan ini akan membantu mengkonfigurasi router dan firewall yang Anda "
 "miliki dan menguji konfigurasi Anda."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Waktu"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Pemformatan waktu"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Time&out dalam detik:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6970,21 +7139,21 @@
 msgstr ""
 "Offset zona waktu: Server: %d detik. Lokal: %d detik. Perbedaan: %d detik."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Judul:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Untuk melakukannya, struktur pohon direktori harus menampilkan berkas "
 "tersembunyi dan tidak"
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -6992,7 +7161,7 @@
 "Untuk mendukung authentikasi kunci publik, FileZilla harus tahu kunci privat "
 "yang hendak digunakan."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7010,7 +7179,7 @@
 "lain\n"
 "Merah: Ukuran file berbeda"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7020,23 +7189,23 @@
 "Jika aktif, menjelajahi hirarki direktori lokal juga mengganti direktori "
 "pada server dan sebaliknya."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Mengganti pemrosesan antrian pengiriman"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Mengganti tampilan pohon directori lokal"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Mengganti tampilan pesan log"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Mengganti tampilan pohon direktori remote"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Mengganti tampilan antrian pengiriman"
 
@@ -7049,37 +7218,37 @@
 msgstr "Terlalu banyak pengalihan"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Jejak:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transfer"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Arah transfer"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Mode Transfer"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Mode Transfer"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Antrian Transfer"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Pengaturan Transfer"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Percobaan koneksi diinterupsi: %s"
@@ -7088,8 +7257,8 @@
 msgid "Transferred data got tainted."
 msgstr "Data transfer rusak."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Mentransfer"
 
@@ -7097,69 +7266,69 @@
 msgid "Transfers"
 msgstr "Transfer"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transfer selesai"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Anggap berkas &tanpa ekstensi sebagai berkas ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Anggap jenis berkas &berikut sebagai berkas ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Percayai Kunci mesin yang berubah:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Percayai Kunci mesin baru:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Percayai kunci baru dan lanjutkan dengan menghubungkan diri?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Percayai sertifikat ini dan lanjutkan dengan menghubungkan diri?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Percayai mesin ini dan lanjutkan dengan koneksi?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Jenis"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Jenis Proxy FTP:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Jenis proxy generik:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "U&pload"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Batasn U&pload:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Gunakan asosiasi jenis berkas jika tersedia"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "&Gunakan default sistem"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "PENGGUNA@HOST"
 
@@ -7168,16 +7337,16 @@
 msgid "Unassigned error code %d"
 msgstr "Kode kesalahan yang belum ditentukan %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unit:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Tidak diketahui"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Jenis Proxy FTP tidak diketahui, tidak bisa menghasilkan urutan login."
 
@@ -7190,7 +7359,7 @@
 msgid "Unknown certificate"
 msgstr "Sertifikat tidak diketahui"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7198,7 +7367,7 @@
 "Kesalahan tidak diketahui saat membuka berkas. Pastikan berkas dapat diakses "
 "dan merupakan dokumen XML well-formed."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Kunci mesin tidak diketahui"
 
@@ -7211,7 +7380,7 @@
 "Versi protokol dari Autentikasi Nama pengguna/Kata sandi SOCKS sub "
 "negosiasi: %d tidak diketahui"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7235,7 +7404,7 @@
 "Kecuali masalah ini diperbaiki, mode aktif FTP tidak akan bekerja dan mode "
 "pasif harus digunakan."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Jenis sertifikat tidak didukung"
 
@@ -7243,25 +7412,24 @@
 msgid "Unsupported redirect"
 msgstr "Pengalihan tidak didukung"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Up&load dan batalkan pengeditan"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Pengujian Update"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Panduan update"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Update"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Upload"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Upload gagal"
 
@@ -7274,99 +7442,99 @@
 msgid "Upload limit: none"
 msgstr "Batasn Upload: tidak ada"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Upload direktori yang dipilih"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Upload berkas dan direktori yang dipilih"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Upload berkas ini kembali ke server?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Upload berkas ini kembali ke server?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Mengupload"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Mengupload dan penghapusan tertunda"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Mengupload dan batalkan pengeditan"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Gunakan charset &kustomisasi"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Gunakan editor &kustomisasi:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Gunakan editor default untuk berkas teks"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Gunakan Penjelajahan t&ersinkronisasi"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Gunakan UTF-8 jika server mendukung, selain itu menggunakan charset lokal."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Gunakan aksi standar"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Gunakan FTP biasa"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Gunakan server yang saat ini terhubung"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Gunakan server dari manajemen situs"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Gunakan &default sistem"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Gunakan alamat IP berikut:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Gunakan batas port berikut:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Gunakan alamat eksternal server"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Gunakan ini jika Anda berada dibelakang router dan memiliki alamat IP "
 "eksternal statis."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7377,86 +7545,86 @@
 "mode aktif untuk pertama kalinya. Hanya versi FileZilla yang Anda gunakan "
 "yang dikirim ke server."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Pengguna:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Pengguna tidak bisa merupakan kumpulan spasi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Menggunakan proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Menggunakan charset yang salah bisa berdampak pada nama berkas tidak "
 "ditampilkan dengan benar."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Dengan menggunakan panduan ini, Anda bisa menguji ketersediaan update "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Valid dari:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Valid hingga:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Pesan log detail dari wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Memverifikasi sertifikat..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versi:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Sangat tinggi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Opsi sudah ditentukan, tetapi tidak didukung oleh server"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Lihat/Edit"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Kolom yang tampak"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "T&ulis"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Menunggu"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Menunggu koneksi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Menunggu kata sandi"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Menunggu transer untuk dibatalkan"
 
@@ -7464,7 +7632,7 @@
 msgid "Waiting to retry..."
 msgstr "Menunggu untuk mencoba kembali..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7494,11 +7662,11 @@
 "Gateway,\n"
 " FileZilla akan mengalami timeout pada transfer besar."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Peringatan, mengabaikan koneksi data dari IP yang salah."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7513,23 +7681,32 @@
 "\n"
 "Apakah Anda yakin untuk menguji build harian?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Peringatan: Kemungkinan masalah keamanan!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Selamat datang ke FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Apa yang baru"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Apa yang baru:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Ketika mengijinkan FileZilla untuk mengingat kata sandi, Anda bisa terhubung "
+"kembali tanpa harus memasukkan kembali kata kunci setelah menjalankan ulang "
+"FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7537,11 +7714,15 @@
 "Bila diaktifkan, karakter yang tidak didukung oleh sistem operasi lokal "
 "dalam nama berkas akan diganti jika mendownload berkas tersebut."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Layar lebar"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Apakah Anda menghendaki FileZilla untuk mengingat kata sandi ini?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Tu&lis"
 
@@ -7554,11 +7735,19 @@
 msgid "Wrong line endings"
 msgstr "Akhir baris salah"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ya"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Tampaknya Anda menggunakan host berbasis IPv6. Panduan ini tidak mendukung "
+"lingkungan ini."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7566,15 +7755,15 @@
 "Anda sudah menggunakan versi terbaru FileZilla. Harap periksa kembali di "
 "masa depan."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Anda selalu bisa membuka dialog ini kemudian melalui menu bantuan."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Anda bisa membiarkan kolom port kosong untuk menggunakan port default."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7600,12 +7789,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?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Anda telah memilih paling tidak satu link simbolis."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7613,7 +7802,7 @@
 "Anda telah memilih lebih dari 10 berkas untuk pengeditan, apakah Anda hendak "
 "melanjutkan?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7622,11 +7811,11 @@
 "Anda hendak melanjutkan?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Anda harus memasukkan nama mesin"
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Anda harus memasukkan direktori lokal."
 
@@ -7635,17 +7824,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Anda harus memasukkan alamat IP valid."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Anda harus memasukkan direktori lokal yang dapat ditulisi."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Anda harus memasukkan nama akun"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Anda harus memasukkan nama pengguna"
 
@@ -7665,29 +7854,29 @@
 msgid "You need to enter a name for the log file."
 msgstr "Anda harus memasukan sebuah nama untuk berkas log."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Anda harus memasukkan perintah yang dikutip dengan benar."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Anda harus memasukkan host proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Anda harus memasukkan port proxy antara 1 hingga 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Anda harus memasukkan paling tidak satu path, penanda kosong tidak didukung."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7695,7 +7884,7 @@
 "Anda harus memasukkan path lokal dan remote untuk mengaktifkan penjelajahan "
 "tersinkronisasi untuk penanda ini."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7727,44 +7916,49 @@
 "Anda seharusnya tidak memiliki masalah terhubung dengan server lain, "
 "transfer berkas seharusnya bekerja dengan baik."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "setelah"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "sebelum"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "diawali dengan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "berisi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "tidak mengandung"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "tidak sama"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "diakhiri dengan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "sama"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "berkas"
 
@@ -7783,81 +7977,126 @@
 "Harap pastikan program ini ada pada direktori yang sama dengan program utama "
 "FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp tidak bisa dijalankan"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers tidak menghasilkan sertifikat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "lebih besar dari"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "grup yang dapat dieksekusi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "grup yang hanya dapat dibaca"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "grup yang hanya dapat ditulisi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "sama dengan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "sudah ditentukan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "sudah dihilangkan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "kurang dari"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "cocok dengan regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "dapat dieksekusi pemilik"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "dapat dibaca pemilik"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "dapat ditulisi pemilik"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "Tidak diketahui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "dapat dieksekusi oleh semua"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "dapat dibaca oleh semua"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "dapat ditulisi oleh semua"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Salin"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Aktifkan pemeriksaan update otomatis"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Jumlah hari diantara pemeriksaan update:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Paling tidak 7 hari)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Pemeriksaan update otomatis"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Periksa versi &beta dan release candidate"
+
+#~ msgid "Cop&y"
+#~ msgstr "Sal&in"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Harap masukkan waktu interval paling tidak 7 hari"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Aturan privasi:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "&Ingat kata sandi ini dan seterusnya"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Nama filter duplikat"
diff -Nru filezilla-3.5.3/locales/it.po filezilla-3.7.3~precise/locales/it.po
--- filezilla-3.5.3/locales/it.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/it.po	2013-06-18 20:02:24.000000000 +0000
@@ -2,29 +2,29 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-03 15:17+0100\n"
-"Last-Translator: bovirus <bovirus@live.it>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-11 13:29+0100\n"
+"Last-Translator: bovirus <bovirus@gmail.com>\n"
 "Language-Team: Andrea Sanavia - Roberto Boriotti - Vincenzo Reale - Riccardo "
 "Vianello <www.filezilla-project.it>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Italian\n"
+"Language: it\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S trascorsi"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S alla fine"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -42,9 +42,9 @@
 msgstr[0] "%d cartella"
 msgstr[1] "%d cartelle"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -53,9 +53,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -76,7 +76,7 @@
 msgstr[0] "%d file. Dimensione totale: almeno %s"
 msgstr[1] "%d file. Dimensione totale: almeno %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d file aggiunti alla coda"
@@ -88,31 +88,21 @@
 msgstr[0] "%d secondo"
 msgstr[1] "%d secondi"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Host"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Password"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -127,7 +117,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Non ancora valido!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Utente proxy"
@@ -149,27 +139,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s byte (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s byte (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s byte (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s byte (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -184,7 +164,7 @@
 "Riscaricate FileZilla. Se il problema persiste, inviate una segnalazione per "
 "questo errore."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -207,153 +187,149 @@
 msgid "%s with %d bits"
 msgstr "%s con %d bit"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nome utente"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Password proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Informazioni su..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Account:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Attiva"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Aggiungi preferito..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Aggiungi file alla coda"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Aggiungi file chiave..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Aggiungi alla coda"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "Regol&a il fuso orario del server:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Considera sempre sicuro il certificato nelle sessioni future."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
 "Considera sempre sicuro questo host, &aggiungi questa chiave alla cache"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Utilizza sempre l'editor predefinito"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "Us&a sempre la selezione per i file non associati"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Usa sempre questa azione"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "Richiedi l'indirizzo IP esterno &al sistema operativo"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automatico"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "Rilevamento &automatico"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binario"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Prefissi &binari utilizzando i simboli del SI (es. 1KB = 1024 byte)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Segnalibri"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Sfoglia..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Tolleranza &burst:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "A&nnulla"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "Includi versioni &beta"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Elimina i dati personali..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Chiudi FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configura limiti di velocità..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Configura..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Connetti"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Copia"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Copia connessione corrente nel Gestore siti..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copia negli appunti"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Crash"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Crea cartella"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Crea nuova scheda"
 
@@ -361,169 +337,169 @@
 msgid "&Debug"
 msgstr "&Debug"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "Informazioni di &debug nel registro messaggi:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "E&ditor predefinito:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "Azione &predefinita per i file esistenti..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "Ritar&do tra i tentativi di login non riusciti:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Elimina"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Elimina collegamento simbolico"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Comparazione cartelle"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Abbandona il file locale quindi scarica e modifica un nuovo file"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Disconnetti"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Disconnetti dal server"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "&Visualizza velocità trasferimento istantanea invece della velocità media"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "Visualizza dimensione in b&yte"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Non memorizzare le passwor&d"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Non visualizzare più questa finestra."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Non utilizzare l'in&dirizzo IP esterno per le connessioni locali."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Azione &doppio clic sui file:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Scarica"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Download in:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Download..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Download:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Modifica"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Modifica regole filtri..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Abilita"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Abilita controllo automatico degli aggiornamenti"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Abilita Limiti di velocità"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Codifica:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Criptazione:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Esegui comando personalizzato..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Esegui"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Esporta le voci del Gestore siti"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Esporta..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Torna in modalità attiva"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&File"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Attributi file..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Permessi &file..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&File:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Condizioni di &filtro:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "Gruppi di &filtri:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtri:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Chiudi"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Termina le modifiche ed elimina il file locale"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -531,480 +507,488 @@
 "&Percorso remoto non strutturato, download di tutti i file contenuti "
 "direttamente nella cartella destinazione"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 "&Seguire i collegamenti simbolici, eliminare il contenuto della cartella "
 "destinazione"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "Ottieni l'indirizzo &IP esterno dal seguente URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Ottieni aiuto..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Preferito &globale"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "Metodo connessione &HTTP/1.1"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Aiuto"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Nascondi file identici"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Massima"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Massima porta disponibile:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Host:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Prefissi binari &IEC (es. 1KiB = 1024 byte)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (esempio: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importa..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "Eredita le assoc&iazioni dal sistema"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Mantieni struttura percorso remoto nella radice di ricerca"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "Disposizione de&lle viste di file e cartelle:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limita le porte locali usate da FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limita il numero di connessioni simultanee"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Struttura cartella &locale"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Cartella &locale:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Log nel file"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Tipo di accesso:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Tipo di accesso:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Bassa"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "Gestore &segnalibri..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Trasferimento &manuale..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Numero massimo di connessioni:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Numero &massimo di nuovi tentativi:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Registro &messaggi"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimizza nella barra"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "Configurazione guidata &rete..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Nuovo"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Nuovo sito"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Nuova versione disponibile!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Avanti >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&No"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Nessuno"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normale"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Numero giorni tra ogni controllo aggiornamenti:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Valore numerico:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Apri"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Sovrascrivi"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passiva"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Password:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Avvia suono"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Porta:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Posizione del registro messaggi:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Preserva data e ora dei file trasferiti"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Coda"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Connessione rapida"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Barra &connessione rapida"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Lettura"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Riconnetti"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "Aggio&rna"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Ricorda la password per questa sessione"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "Memo&rizza la password"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Cartella &remota:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Percorso &remoto:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Rimuovi"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Rimuovi chiave"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Rimuovi selezionato"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Rinomina"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Rinomina..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Riapri file locale"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Sostituisci i caratteri non validi con:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Riporta un errore..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Ripristina e rimetti in coda tutti i file"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Riavvia la procedura guidata"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Ripristina"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Esegui comando..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "Avvia configu&razione guidata rete..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Controlla gli aggiornamenti adesso..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCK5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Salva come..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Trova"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Cerca i file remoti..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Seleziona elemento:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Seleziona la lingua:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Seleziona la colonna che deve essere visualizzata:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Impostazioni"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Impostazioni..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Visualizza il menu di debug"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Visualizza messaggio"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Vi&sualizza data e ora nel log messaggi"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "Gestore &siti..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Segnalibri specifici per &sito"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Salta"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Limiti di velocità"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Avvia &immediatamente il trasferimento"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "Inverti vi&sualizzazione locale/remota"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Crittografie &TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Test"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Trasferimento"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Modalità di &trasferimento:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Coda di &trasferimento"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Tratta i file che iniziano con un punto come file ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "Ann&ulla modifiche"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Aggiorna la chiave in cache per questo host"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Upload"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Upload:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Usa programma personalizzato"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Usa navigazione sincronizzata"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Usa il programma predefinito di sistema per i file di testo"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Usa il seguente indirizzo IP:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Usa l'indirizzo IP esterno del server"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "Usa &separatore delle migliaia"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Utente:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Nome &utente:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versione %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Visualizza"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Visualizza / modifica"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Controlla i file modificati localmente e richiedi se inviare le modifiche"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Quando controlli gli aggiornamenti, verifica:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Scrittura"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Sì"
 
@@ -1022,12 +1006,28 @@
 msgstr "'%s' non è una cartella."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
 "L'accesso di tipo 'Account' non è supportato dal protocollo selezionato"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"I tipi di accesso 'Normale' e 'Account' non sono disponibili. Usa invece "
+"'Richiedi password'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"I tipi di accesso 'Normale' e 'Account' non sono disponibili. L'elemento è "
+"stato modificato in 'Richiedi password'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1045,120 +1045,116 @@
 msgstr[0] "(%d oggetto filtrato)"
 msgstr[1] "(%d oggetti filtrati)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 per senza limite)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 secondi)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 per disabilitato)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "giorni (almeno 7)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(esempio: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(esempio: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(in %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S alla fine"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr "--:--:-- alla fine"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Router e/o firewall guasto"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- File corrotto nel mirror"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware nel sistema"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- alla fine"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c non può essere usato insieme ad una URL FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l può essere usato insieme ad una URL FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s e -c non possono essere presenti contemporaneamente."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s non può essere usato insieme ad una URL FTP."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Nessuno"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Attenzione"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Informazioni"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Informazioni dettagliate"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "sistema a 32bit"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "sistema a 64bit"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Indietro"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1169,17 +1165,18 @@
 "Un preferito con il nome indicato esiste già. Scegliere un nome non "
 "esistente."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "È necessario selezionare un editor predefinito."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr ""
 "Non è possibile trascinare una cartella in una delle sue sottocartelle."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1189,28 +1186,28 @@
 "questi casi è necessario utilizzare la modalità attiva. In modalità attiva, "
 "FileZilla apre una porta e chiede al server di connettersi ad essa."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Un file precedentemente aperto è stato modificato."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 ""
 "Stai già modificando un file con questo nome. Vuoi riaprire il file '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Si sta già trasferendo un file con questo nome."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "Si sta già modificando un file con questo nome. Chiuderlo e riprovare."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1225,11 +1222,11 @@
 "negli elenchi.\n"
 "Durante questa sessione non saranno visualizzati altri avvisi."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "È disponibile una versione nuova di FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1237,7 +1234,7 @@
 "Un server standard non richiede questo. Se vi serve questo contattate "
 "l'amministratore del server."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1254,15 +1251,15 @@
 "Disabilitare la navigazione sincronizzata e continuare le modifiche nella "
 "cartella locale?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Aggiungi"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "&Permetti il ripristino del trasferimento di file ASCII"
 
@@ -1274,55 +1271,55 @@
 msgid "A&pply only to uploads"
 msgstr "A&pplica solo agli upload"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "A&pplica a tutti i file e cartelle"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Rimuovi a&utomaticamente i trasferimenti completati"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Interrompi connessione precedente e connetti nella scheda corrente"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Informazioni su FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Sopra la lista file"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Account"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "&Azione dopo il complemento della coda"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Azione sul file selezionato:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Azione da eseguire:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Azione:"
 
@@ -1355,23 +1352,23 @@
 "Test della modalità attiva non riuscito. È stato fornito l'indirizzo IP "
 "corretto, ma il vostro router l'ha erroneamente modificato."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP in modalità attiva"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Aggiungi solo i file alla coda"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Aggiungi le cartelle selezionate alla coda di trasferimento"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Aggiungi i file e cartelle selezionati alla coda di trasferimento"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Aggiungi alla coda"
 
@@ -1379,29 +1376,43 @@
 msgid "Address type not supported"
 msgstr "Tipo di indirizzo non supportato"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avanzate"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opzioni avanzate:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Avviso: a meno che tu vuoi testare nuove funzionalità, usa solo le versioni "
+"stabili. Le versioni beta e i rilasci notturni sono versioni di sviluppo per "
+"scopo di test. I rilasci notturni di Filezilla potrebbero non funzionare "
+"come ti aspetti e anche danneggiare il tuo sistema. Puoi usare le versioni "
+"beta e i rilasci notturni a tuo rischio."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritmo:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Tutti i file sono stati trasferiti correttamente"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Tutte le porte nell'intervallo specificato devono essere comprese tra 1024 e "
 "65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1410,23 +1421,23 @@
 msgstr[1] ""
 "Tutti i trasferimenti completati. I file %d non possono essere trasferiti."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr ""
 "Permetti il passaggio ad altra modalità di tras&ferimento in caso di "
 "fallimento"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr ""
 "Permetti il passaggio ad altra modalità di trasferimento in caso di "
 "fallimento"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Già connesso"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1434,7 +1445,7 @@
 "È possibile usare lo strumento Pageant di PuTTY per la gestione delle "
 "chiavi; FileZilla non riconosce Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1442,14 +1453,14 @@
 "È possibile alternativamente usare il vostro agente SSH di sistema. Per fare "
 "ciò assicuratevi che la variabile SSH_AUTH_SOCK sia impostata."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
 "Visitare http://filezilla-project.org per scaricare la versione più recente."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1459,7 +1470,7 @@
 "\".\n"
 "Alcuni elementi della coda potrebebro non essere stati ripristinati."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1469,7 +1480,7 @@
 "\".\n"
 "Alcuni elementi della coda potrebebro non essere stati ripristinati."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1477,27 +1488,27 @@
 "Un oggetto con lo stesso nome del oggetto trascinato già esiste nella "
 "posizione di destinazione."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonimo"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Un'altra operazione remota è in corso, impossibile cambiare la cartella ora."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 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/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1505,58 +1516,58 @@
 "Qualsiasi modifica al Gestore siti non verrà salvata a meno di riparare il "
 "file."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Qualsiasi modifica ai filtri non verrà salvata."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "App&lica solo alle cartelle"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Applica"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Applica solo alla &coda attiva"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Applica solo ai &file"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archivio"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Come scheda nel pannello coda trasferimento"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Richiedi un'azione"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Richiedi password"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Richiedi una porta al sistema operativo."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Richiedi l'indirizzo IP esterno al sistema operativo"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Inserimento richieste nel forum di FileZilla"
 
@@ -1564,39 +1575,35 @@
 msgid "Associated program not found:"
 msgstr "Programma associato non trovato:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Almeno una condizione del filtro è incompleta"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "A questo punto tutte le informazioni richieste sono state raccolte."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attributo"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Autenticazione non riuscita."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Autore:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Automatico"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Classificazione automatica dei tipi di file"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Aggiornamenti automatici"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Dimensioni disponibili"
 
@@ -1605,66 +1612,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Simbolo d'unità per i byte. Traduci solo la prima lettera>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "I&gnora proxy"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Istruzione per l'uso base"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Per conto"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Modifiche in corso"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Prestazioni unione stringa"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Attenzione! Il certificato è stato revocato"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binario"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Lavagna"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Preferito"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Preferito:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Segnalibri"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Data di creazione:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Informazioni versione"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Categoria business:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1675,63 +1682,63 @@
 "FileZilla ad usare uno specifico intervallo di porte, inserire i valori nei "
 "campi sottostanti."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "A&nnulla operazione corrente"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Includi &nightly builds"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&Cancella tutto"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opia URL negli appunti"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Personalizza"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Associazioni &personalizzate:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Calcolo scostamento fuso orario del server..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Non si riesce a leggere il file"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Non si riesce a scrivere nel file."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Impossibile scrivere nel file: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Annulla"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Annulla operazione attiva"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Annulla l'operazione attiva"
 
@@ -1742,11 +1749,11 @@
 "Non è possibile accedere a '%s', nessun supporto inserito o dispositivo non "
 "pronto."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Impossibile aggiungere server al Gestore siti"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1762,30 +1769,30 @@
 "Impossibile comparare le cartelle, sono abilitati filtri differenti per le "
 "cartelle locali e remote"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Non è possibile collegarsi al server e comparare le cartelle."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Non è possibile creare un nuovo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Non è possibile modificare il file"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Impossibile modificare il file, non connesso a nessun server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Impossibile modificare il file, percorso remoto sconosciuto."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1793,8 +1800,8 @@
 "Non è stato possibile stabilire una connessione FTP ad un server SFTP. "
 "Seleziona un protocollo adeguato."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Non è possibile caricare la barra Connessione rapida dal file risorse"
 
@@ -1806,44 +1813,48 @@
 msgid "Cannot load keyfile"
 msgstr "Impossibile caricare il file chiave"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Non è possibile caricare la barra strumenti dal file risorse"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Impossibile memorizzare le password"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Non è possibile rinominare la voce"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Non è possibile rinominare il file"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Non è possibile salvare un gruppo di filtri"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Impossibile selezionare il filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Impossibile impostare l'associazione dei file"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Non è possibile visualizzare la finestra"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Impossibile visualizzare / modificare il file selezionato"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Categorie"
 
@@ -1851,59 +1862,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certificato e dati sessione non ancora disponibili."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Dettagli certificato"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certificato collegato:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Ente emissione certificato"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Eccezione:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Cambia gli attributi del file"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Cambia i permessi del file."
 
-#: resources.h:964
+#: resources.h:989
 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:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problema di codifica del carattere"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Set di caratteri"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Controllo versioni &beta e release candidate"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Controlla gli &aggiornamenti..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Verifica a&utomaticamente aggiornamenti Filezilla:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Verifica l'esistenza di versioni più recenti di FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Aggiornamento software"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Verifica aggiornamenti non riuscita"
 
@@ -1911,21 +1922,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Controllo di correttezza dell'IP esterno"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Controllo degli aggiornamenti in corso"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Discordanza checksum del file scaricato."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Selezionare la cartella locale predefinita"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Selezionare la cartella locale"
 
@@ -1933,43 +1944,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Blocco di dati terminato non appropriatamente"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cipher:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "C&hiudi scheda"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Classica"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Voci del &Gestore siti"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Pulisci la cache del &layout"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Cronologia di &Connessione rapida"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Informazioni di &riconnessione"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Coda di &trasferimento"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Azzera cronologia"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1977,11 +1988,11 @@
 msgid "Clear private data"
 msgstr "Elimina i dati personali"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Azzera la lista della barra di Connessione rapida"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Azzera unione stringa"
 
@@ -1989,36 +2000,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Fare clic su 'Fine' per salvare la configurazione."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Fare clic su 'Avanti' per scaricare l'ultima versione."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Client a server MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Client a server cipher:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Chiudi &tutte le altre schede"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Chiudi FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Chiudi tutte le istanze in esecuzione di FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Chiudi scheda corrente"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mmenti:"
 
@@ -2026,11 +2037,11 @@
 msgid "Column properties"
 msgstr "Proprietà colonna"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Impostazione colonna"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Il comando e i parametri devono essere correttamente specificati."
 
@@ -2049,9 +2060,9 @@
 msgstr "Comando non supportato da questo protocollo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Comando:"
 
@@ -2059,7 +2070,7 @@
 msgid "Comment"
 msgstr "Commento"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nome comune:"
 
@@ -2068,15 +2079,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Comunicazione corrotta dal router"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Confronta data &modifica"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Confronta dimen&sione file"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Soglia di confron&to (in minuti):"
 
@@ -2084,60 +2095,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "La soglia di confronto deve essere tra 0 e 1440 minuti."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilato con:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilato con:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilato con:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Opzioni di compilazione:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Compresso"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Trasferimenti concorrenti"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Le condizioni f&anno distinzione tra maiuscole e minuscole"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Testa la configurazione"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Configura la modalità passiva"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Configura l'intervallo di porte"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Configurazione di FileZilla e della rete"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Conferma cancellazione"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Richiedi conferma"
 
@@ -2145,7 +2156,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Congratulazioni, la configurazione sembra funzionante."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Connetti ignorando le impostazioni proxy"
 
@@ -2153,34 +2164,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Connetti al sito specificato nel Gestore siti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Connesso"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Connessione"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Connessione a %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Connessione a %s attraverso proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Connessione a %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Connessione in corso al server"
 
@@ -2188,11 +2199,11 @@
 msgid "Connection"
 msgstr "Connessione"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Tentativo di connessione non riuscito"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
@@ -2200,7 +2211,7 @@
 "Tentativo di connessione non riuscito con \"%s\", provare l'indirizzo "
 "successivo."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Tentativo di connessione non riuscito con \"%s\"."
@@ -2214,12 +2225,12 @@
 msgid "Connection closed"
 msgstr "Connessione chiusa"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Connessione chiusa dal server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Connessione stabilita, inizializzazione TLS in corso..."
@@ -2228,7 +2239,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Connessione stabilita, invio richiesta HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Connessione stabilita, in attesa del messaggio di benvenuto..."
 
@@ -2244,15 +2255,15 @@
 msgid "Connection refused"
 msgstr "Connessione rifiutata"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Tempo scaduto per la connessione"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Tempo scaduto per la connessione."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Connessione al server persa."
 
@@ -2273,27 +2284,23 @@
 msgid "Convert keyfile"
 msgstr "Converti file chiave"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Cop&ia"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Copia (%d) di %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Copia di %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Copia gli URL degli elementi selezionati negli appunti."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Impossibile accettare la connessione: %s"
@@ -2303,16 +2310,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Impossibile aggiungere il sito al Gestore siti"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Impossibile completare l'operazione."
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Impossibile collegarsi al server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Impossibile collegarsi al server: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Impossibile convertire comando alla codifica del server"
 
@@ -2321,17 +2332,17 @@
 msgid "Could not convert private key"
 msgstr "Impossibile convertire la chiave privata"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Impossibile copiare gli URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Impossibile copiare i dati"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2342,11 +2353,11 @@
 "L'estensione della shell non è installata correttamente o non avete "
 "rilasciato i file su una finestra di Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Impossibile stabilire una connessione al server"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2359,11 +2370,11 @@
 "riga di comando '--datadir <custompath>' 0 impostando la variabile "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Impossibile generare sequenza login personalizzata."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2371,7 +2382,7 @@
 "Impossibile distinguere nome del certificato emittente, "
 "gnutls_x509_get_issuer_dn fallito"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2379,7 +2390,7 @@
 "Impossibile distinguere nome del certificato oggetto, gnutls_x509_get_dn "
 "fallito"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Impossibile analizzare il percorso remoto."
 
@@ -2388,17 +2399,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Impossibile ricevere da fzputtyget."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2425,7 +2436,7 @@
 msgid "Could not load private key"
 msgstr "Impossibile caricare chiave privata"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2437,7 +2448,7 @@
 "Disabilitare la navigazione sincronizzata e continuare le modifiche nella "
 "cartella remota?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2459,9 +2470,9 @@
 "'%s'.\n"
 "La navigazione sincronizzata è stata disabilitata."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Impossibile aprire gli appunti"
 
@@ -2476,11 +2487,11 @@
 msgid "Could not parse remote path."
 msgstr "Impossibile analizzare il percorso remoto."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Impossibile analizzare l'indirizzo del server:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Impossibile leggere dal socket: %s"
@@ -2489,12 +2500,12 @@
 msgid "Could not read server item."
 msgstr "Impossibile leggere l'elemento del server."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Impossibile trovare l'offset %s nel file"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Impossibile trovare la fine del file"
 
@@ -2502,22 +2513,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Impossibile inviare comando a ftzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Impossibile lanciare thread di IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Impossibile avviare handshake proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Impossibile avviare il trasferimento"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2537,7 +2548,7 @@
 msgstr ""
 "Impossibile scrivere \"%s\", i segnalibri globali non saranno salvati: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2546,16 +2557,16 @@
 "Impossibile scrivere su \"%s\", la coda non sarà salvata.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Impossibile scrivere su \"%s\", il sito selezionato non può essere "
 "esportato: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Impossibile scrivere su \"%s\": %s"
@@ -2565,7 +2576,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Impossibile scrivere il file chiave: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Impossibile scrivere nel file locale"
 
@@ -2575,39 +2586,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Impossibile scrivere nel file log: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Impossibile scrivere nel socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Nazione:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Manda FileZilla in crash all'istante. Utilizzato solamente per fare il debug "
 "del gestore delle eccezioni"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Crea &un nuovo file"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Creare una nuova sottocartella nella cartella attuale"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Crea un nuovo file vuoto nelal libreria attuale"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Nuova cartella"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Crea un file vuoto"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Creazione della cartella in corso"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Creazione cartella '%s' in corso..."
@@ -2625,7 +2648,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2647,52 +2670,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Trasferimento corrente impostato su trasferimento binario."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "&Personalizza"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Set di filtri personalizzato"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Server personalizzato"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tipo &trasferimento"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Prefissi &decimali utilizzando i simboli SI (es. 1KB = 1000 byte)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Pred&efinita"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "&Elimina"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "D&isabilita tutto"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "N&on salvare la password"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Azione d&oppio clic sulle cartelle:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplica"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Tipo DOS con percorso virtuale"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "File pericoloso"
 
@@ -2700,16 +2727,16 @@
 msgid "Data"
 msgstr "data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Data socket chiuso troppo presto."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Data"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Formato data"
 
@@ -2728,11 +2755,11 @@
 msgid "Debug"
 msgstr "Debug"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Impostazioni di debug"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Cartella &locale predefinita:"
 
@@ -2740,19 +2767,19 @@
 msgid "Default (Autodetect)"
 msgstr "Predefinito (rilevamento automatico)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "L'editor predefinito non è stato specificato correttamente."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Imposta azione predefinita per i file esistenti"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Cartella r&emota predefinita:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2764,15 +2791,15 @@
 msgid "Default system language"
 msgstr "Lingua di sistema predefinita"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Modalità di trasferimento predefinita:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Tipo di trasferimento predefinito:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Predefinito: http://ip.filezilla-project.org/ip.php"
 
@@ -2798,57 +2825,57 @@
 "Ritardo di connessione di %d secondi dovuto a precedenti tentativi di "
 "connessione non riusciti..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Elimina le voci della Gestione Siti"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Elimina le cartelle selezionate"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Elimina i file e cartelle selezionate"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Eliminazione cartelle"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Eliminazione di cartelle multiple non dipendenti non supportato"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Elimina collegamento simbolico"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Desktop"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Dettagli"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Dettagli per la nuova chiave:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "&Cartelle"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Direzione"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Cartella"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Comparazione cartelle"
 
@@ -2868,11 +2895,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Lettura cartella annullata dall'utente"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Lettura cartella non riuscita"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtri di lettura contenuto cartella"
 
@@ -2880,18 +2907,18 @@
 msgid "Directory listing successful"
 msgstr "Contenuto cartella letto con successo"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Disa&bilita tutto"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2899,50 +2926,49 @@
 "Disabilitare questa opzione se non si riesce più a vedere i contenuti della "
 "cartella."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Disconnetti dal server"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Disconnesso dal server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Disconnesso dal server: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Disconnessione dal server precedente"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Disconnette dal server attualmente visibile"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Visualizza la finestra informazioni"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Non usare il programma predefinito"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "&Non fare niente"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2951,8 +2977,8 @@
 "A meno che non si intenda testare nuove funzionalità, continuare ad usare le "
 "versioni stabili."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Si è sicuri di voler chiudere FileZilla?"
 
@@ -2967,7 +2993,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Si è sicuri di voler eliminare tutte le voci della Gestione Siti?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Si è sicuri di voler eliminare le voci selezionate?"
 
@@ -2975,32 +3001,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Si è sicuri di voler svuotare la coda di trasferimento?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Si è sicuri di voler inviare '%s' al server?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentazione"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Non utilizzare l'indirizzo IP esterno per le connessioni &locali."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "I file punto sono i file che iniziano con un punto, es. .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Azione doppio clic"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Download"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Limite di &download:"
 
@@ -3013,41 +3039,50 @@
 msgid "Download limit: none"
 msgstr "Limite di download: nessuno"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Download risultati ricerca"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Scarica le cartelle selezionate"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Scarica file e cartelle selezionate"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Velocità download: %s/s\n"
+"Velocità upload: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Download in corso"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Download in corso di %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Download di cartelle multiple non dipendenti non supportato"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Download risultati ricerca"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3056,60 +3091,64 @@
 "La funzione &Trascina e rilascia tra diverse istanze di FileZilla non è "
 "stata ancora implementata."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "La funzione &Trascina e rilascia tra diversi server non è stata ancora "
 "implementata."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&ica"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "A&bilita tutto"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "I&nserire cartella"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "Ese&cuzione"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Esci"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Ogni filtro richiede almeno una condizione."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Modifica filtri"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Modifica il file nell'editor predefinito e carica le modifiche sul server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Modifica non riuscita"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Comando vuoto"
 
@@ -3117,7 +3156,7 @@
 msgid "Empty command."
 msgstr "Comando vuoto."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Elenco cartella vuoto"
 
@@ -3129,102 +3168,113 @@
 msgid "Empty file extension."
 msgstr "File senza estensione."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Nomi di filtro vuoti non sono ammessi."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nome vuoto"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Stringa vuota."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "&Abilita tutto"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Abiliita &filtro caratteri non validi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Cifrato"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Cifratura"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Dettagli di cifratura"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Fine comparazione e cambio ordine visualizzazione?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Esegui comando personalizzato..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Inserire 0 per velocità illimitata."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Inserisci comando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Inserisci comando personalizzato"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Inserire cartella"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Inserire il nome filtro"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Inserisci il nome per il set di filtri"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Inserisci il nome per il gruppo di filtri"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Inserisci password"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Inserire la cartella selezionata"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Inserire l'indirizzo del server.\n"
 "Per specificare il protocollo del server, anteporre all'host "
 "l'identificatore del protocollo. Se nessun protocollo è specificato, sarà "
 "utilizzato il protocollo predefinito (ftp://).\n"
-"È possibile anche inserire qui URL completi nella forma protocollo://utente:"
-"password@host:porta , i valori negli altri campi saranno sovrascritti."
+"È possibile anche inserire qui URL completa nella forma protocollo://utente:"
+"password@host:porta , i valori negli altri campi saranno sovrascritti.\n"
+"I protocolli supportati sono:\n"
+"- ftp:// per FTP normale,\n"
+"- sftp:// per protocollo trasferimento file SSH,\n"
+"- ftps:// per FTP su TLS (implicito) e\n"
+"- ftpes:// per FTP su TLS (esplicito)."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3235,7 +3285,7 @@
 "Inserire la password per il file '%s'.\n"
 "I file convertiti non saranno protetti da password."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3257,7 +3307,7 @@
 msgid "Error importing"
 msgstr "Errore di importazione"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Errore nel caricamento della coda"
 
@@ -3266,27 +3316,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Errore di caricamento file xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Errore nel salvataggio della coda"
 
@@ -3297,74 +3347,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Errore di scrittura file xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Errore il nome file non può essere analizzato."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Errore il file locale esiste e non può essere rimosso"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Errore:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Stabilisci connessione in una nuova scheda"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Ogni mese"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Ogni due settimane"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Esempio: png \"C:\\Programmi\\Paint\\Paint.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Esempi"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Esecu&zione"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Eseguibile"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Il file eseguibile non contiene informazioni sulla versione, non è possibile "
 "verificare gli aggiornamenti."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorer"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "&Coda di esportazione"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Impostazioni di e&sportazione"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Impostazioni di esportazione"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Nome f&iltro:"
 
@@ -3372,7 +3430,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocollo trasferimento file"
 
@@ -3384,25 +3442,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocollo trasferimento file non sicuro"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Il motore FTP non è stato inizializzato, impossibile connettersi"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Mantieni attiva connessione FTP"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "URL FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3418,26 +3476,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP su TLS/SSL implicito"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Non è stato possibile cambiare la cartella"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Errore durante il cambio di lingua"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Controllo di una versione di FileZilla più recente non riuscito."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Impossibile copiare o spostare siti"
 
@@ -3445,48 +3503,48 @@
 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:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr ""
 "Non è stato possibile creare il socket di ascolto, connessione terminata"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Download dell'ultima versione di FileZilla non riuscito."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Non è possibile recuperare il percorso \"Documenti\""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Non è stato possibile recuperare il percorso del desktop"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Non è stato possibile avviare il motore FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Non è stato possibile inizializzare TLS."
@@ -3500,24 +3558,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Impossibile caricare chiave privata: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Non è stato possibile aprire \"%s\" in aggiunta/scrittura"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Non è stato possibile aprire \"%s\" in lettura"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Non è stato possibile aprire \"%s\" in scrittura"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Impossibile analizzare il percorso ritornato."
 
@@ -3525,7 +3583,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Impossibile analizzare certificato principale autorizzato."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Non è stato possibile ricevere i dati"
 
@@ -3539,13 +3597,13 @@
 "Non è stato possibile recuperare l'indirizzo IP esterno, connessione "
 "terminata"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Non è stato possibile leggere l'indirizzo IP locale."
 
@@ -3562,14 +3620,14 @@
 msgid "Failed to send command."
 msgstr "Non è stato possibile inviare il comando."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3577,14 +3635,14 @@
 "Non è stato possibile impostare la lingua su %s (%s), sarà utilizzata la "
 "lingua di sistema predefinita %s (%s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3592,14 +3650,14 @@
 "Non è stato possibile impostare la lingua su %s, sarà utilizzata la lingua "
 "predefinita"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3610,7 +3668,7 @@
 msgid "Failed to validate settings"
 msgstr "Verifica delle impostazioni non riuscita"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Impossibile verificare il certificato connessione"
 
@@ -3627,21 +3685,19 @@
 msgid "Failed transfers"
 msgstr "Trasferimenti non completati"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Prova la modalità attiva"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Fil&e:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fil&e"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "File"
 
@@ -3657,7 +3713,7 @@
 msgid "File editing"
 msgstr "Modifica file"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Il file esiste"
 
@@ -3665,7 +3721,7 @@
 msgid "File exists action"
 msgstr "Azione per file esistenti"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "File modificato"
 
@@ -3673,14 +3729,14 @@
 msgid "File lists"
 msgstr "Elenchi file"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "File non trovato"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Ricerca file"
 
@@ -3716,25 +3772,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Trasferimento file completato; trasferiti %s in %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Trasferimento file ancora in corso."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Il file dovrebbe essere trasferito in modo ASCII."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Il file dovrebbe essere trasferito in modo binario."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Errore di FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3742,78 +3798,78 @@
 "FileZilla può testare le impostazioni per assicurare che tutto sia "
 "configurato in modo corretto."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla è già connesso a un server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla è in esecuzione in modalità \"Chiosco\".\n"
-"I tipi di logon 'Normale' e 'Utente' non saranno disponibili in questa "
-"modalità."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 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."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Aggironamenti Filezilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Barra stato elenco file"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nome file"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtri nome file..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Nome file non valido"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Il nome del file non può contenere caratteri quali: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nome file non modificato"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nome file:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Il nome del file non può contenere caratteri quali: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Il nome del file non può contenere caratteri quali: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "File in corso di modifica"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Dimensione file"
@@ -3822,70 +3878,70 @@
 msgid "Filesize format"
 msgstr "Dimensione file"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tipo file"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Associazioni tipi di file"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Il filtro si applica a:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtro caratteri non validi nel nome file"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Un filtro con questo nome è già presente"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr ""
 "Nessuna corrispondenza trovata per tutti gli elementi filtrati seguenti"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr ""
 "Nessuna corrispondenza trovata per tutti gli elementi filtrati seguenti"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Nessuna corrispondenza trovata per gli elementi filtrati seguenti"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Un set di filtri con questo nome è già presente"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtra il contenuto della cartella"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Validazione filtri non riuscita"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Fingerprint (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Fingerprint (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Impronta:"
 
@@ -3893,7 +3949,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Configurazione guidata firewall e router"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3901,13 +3957,13 @@
 "Per avere maggiori informazioni sul significato delle varie opzioni, avviare "
 "la configurazione guidata rete."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Per motivi di affidabilità, sarebbe preferibile inserire un intervallo di "
 "almeno 10 porte."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3915,32 +3971,32 @@
 "Per questa sessione, saranno utilizzate le impostazioni predefinite. "
 "Qualsiasi cambiamento alle impostazioni non sarà memorizzato."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forza &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Visualizza file &nascosti"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Visualizza file nascosti"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Specifiche formato:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formato: estensione seguita da comando e parametri correttamente specificati."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Altra documentazione"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Generale"
 
@@ -3948,21 +4004,21 @@
 msgid "General SOCKS server failure"
 msgstr "Errore generico server SOCKS"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy generico"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Ottieni l'indirizzo IP esterno dall'URL seguente:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Ottieni aiuto"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Un set di filtri con questo nome è già presente, sovrascrivere?"
 
@@ -3970,15 +4026,15 @@
 msgid "Global bookmarks"
 msgstr "Segnalibri globali"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permessi di gruppo"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "&Alto"
 
@@ -3986,21 +4042,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP su TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Nascosto"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Alto"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Superiore"
 
@@ -4009,26 +4065,26 @@
 msgstr ""
 "La massima porta disponibile deve essere un numero compreso tra 1024 e 65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Tenere premuto il tasto FISSA MAIUSC per cambiare lo stato del filtro da "
 "entrambe le parti simultaneamente."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Sito web:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Chiave impronta:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "La chiave dell'host non corrisponde"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 "Il nome computer inizia con \"[\" ma non c'è la parentesi quadra di chiusura."
@@ -4037,20 +4093,20 @@
 msgid "Host unreachable"
 msgstr "Host non raggiungibile"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Host:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Ore,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (esempio: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4060,13 +4116,13 @@
 "dell'intervallo specificato, il collegamento sarà chiuso e FileZilla proverà "
 "a ricollegarsi."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Quando si segnalano errori di funzionamento è opportuno fornire registri con "
 "livello di informazioni di debug \"Verbose\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4079,7 +4135,7 @@
 "Nella Gestione Siti è possibile impostare la modalità di trasferimento in "
 "modo personalizzato per ogni server."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4087,7 +4143,7 @@
 "Se l'opzione di fallback è abilitata, è possibile connettersi a server mal "
 "configurati che rifiutano la modalità di trasferimento selezionata."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4108,7 +4164,7 @@
 msgstr ""
 "Se il problema persiste, alcuni router o firewall impediscono la connessione."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4118,7 +4174,7 @@
 "aggiungendo \".1\" alla fine del nome file (possibilmente sovrascrivendo i "
 "vecchi file di Log) e un nuovo file verrà creato."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4138,7 +4194,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Se il problema persiste, contattare il produttore del vostro router."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4148,7 +4204,7 @@
 "sistema sia sincronizzato con il server. Se l'ora differisce (es. fusi orari "
 "diversi), specificare l'offset del fuso orario in Gestione Siti."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4156,11 +4212,11 @@
 "Se si usa il confronto basato sulla data, considerare due file uguali se la "
 "differenza di data non supera questa soglia."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Dopo aver cambiato lingua è necessario riavviare il programma."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4168,11 +4224,11 @@
 "Facendo clic su 'Test', FileZilla si connetterà a probe.filezilla-project."
 "org ed effettuerà alcuni semplici test."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Se FileZilla verrà chiuso, i cambiamenti andranno persi."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4180,11 +4236,11 @@
 "Se si inseriscono tipi di file non corretti, è possibile che i file vengano "
 "alterati durante la trasmissione."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "In caso di errori, la configurazione non è corretta."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4204,7 +4260,7 @@
 "utilizzare la modalità passiva e contattare l'amministratore del server per "
 "ricevere assistenza."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4213,7 +4269,7 @@
 "positivo, eventuali firewall e router presenti sulla rete dovrebbero essere "
 "configurati correttamente."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4221,7 +4277,7 @@
 "Se si utilizza un firewall, assicurarsi che FileZilla sia in autorizzato ad "
 "accettare connessioni in ingresso sulle porte indicate."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4240,7 +4296,7 @@
 msgid "Import data from older version"
 msgstr "Importa i dati da una versione precedente"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importa configurazione"
 
@@ -4254,7 +4310,7 @@
 msgid "Improperly quoted association."
 msgstr "Associazioni personalizzate non corrette. Controllare la sintassi."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4263,7 +4319,7 @@
 "il trasferimento dei dati. Bisogna specificare quali porte saranno usate da "
 "FileZilla."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4271,7 +4327,7 @@
 "Se si dispone di un router, bisogna inoltrare tutte le porte disponibili, in "
 "quanto FileZilla non può indicare al sistema quali porte scegliere."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4280,7 +4336,7 @@
 "È possibile abilitare il controllo automatico degli aggiornamenti nella "
 "finestra delle impostazioni."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4288,7 +4344,7 @@
 "Per l'utilizzo della modalità attiva, FileZilla deve conoscere l'indirizzo "
 "IP esterno."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4298,7 +4354,7 @@
 "FileZilla chiede una porta al server e si connette alla porta indicata. Non "
 "sono richieste altre configurazioni speciali."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4306,20 +4362,20 @@
 "Segmento incompleto, il certificato principale non è un certificato auto "
 "firmato da una autorità di certificazione"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Password non corretta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Inizializzazione TLS in corso..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Server non sicuro, non supporta FTP su TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interattivo"
@@ -4329,8 +4385,8 @@
 msgstr "Interfaccia"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Interrotto dall'utente"
 
@@ -4342,8 +4398,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Risposta HTTP non valida"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4366,12 +4422,13 @@
 msgid "Invalid date"
 msgstr "Data non valida"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nome file non valido"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Nome computer non valido, dopo parentesi quadra di chiusura ci possono "
@@ -4381,30 +4438,37 @@
 msgid "Invalid input"
 msgstr "Input non valido"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Porta fornita non valida. La porta deve avere un valore compreso tra 1 e "
 "65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Protocollo non valido. Protocolli validi sono:\n"
+"Protocollo non valido. I protocolli validi sono:\n"
 "ftp:// per FTP normale,\n"
 "sftp:// per protocollo trasferimento file SSH,\n"
-"ftps:// per FTP su SSL (implicito) e\n"
-"ftpes:// per FTP su SSL (esplicito)."
+"ftps:// per FTP su TLS (implicito) e\n"
+"ftpes:// per FTP su TLS (esplicito)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Espressione non valida nelle condizioni di ricerca."
 
@@ -4412,7 +4476,7 @@
 msgid "Invalid response code"
 msgstr "Codice di risposta non valido"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Condizioni non valide di ricerca: %s"
@@ -4424,38 +4488,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Percorso sito non valido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Dimensione non valida nella condizione"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nome utente fornito non valido."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Nazione giurisdizione:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Località giurisdizione:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Provincia giurisdizione:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Mantieni le cartelle in cima"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4466,50 +4530,54 @@
 "Anche se FileZilla effettua alcune verifiche per vedere se il server "
 "supporta questa funzionalità, la prova potrebbe non avere successo."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Scambio chiave"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Scambio chiave:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Inferi&ore"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Lingua"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Lingua modificata"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Ultima modifica"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Disposizione"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Limite per &download concorrenti:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Limite per &upload concorrenti:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limita le porte locali"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Dimensione limite file Log"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limite:"
 
@@ -4517,7 +4585,7 @@
 msgid "Line length exceeded"
 msgstr "Lunghezza riga in eccesso"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Collegato contro"
 
@@ -4526,21 +4594,21 @@
 msgstr "Socket di ascolto chiuso"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Elenco:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "P&orta più bassa disponibile:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Locale"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "File locale"
 
@@ -4556,7 +4624,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Il file locale non ha un nome file valido."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtri locali:"
 
@@ -4564,7 +4632,7 @@
 msgid "Local site:"
 msgstr "Sito locale:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Località:"
 
@@ -4572,16 +4640,16 @@
 msgid "Log file"
 msgstr "File log"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Registro del controllo aggiornamenti:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Connessione"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4590,7 +4658,7 @@
 "essere compatibile UTF-8. Impossibile fallback con set caratteri locale "
 "usando il proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4598,17 +4666,17 @@
 "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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Sequenza di login eseguita completamente ma impossibile connetersi. "
 "Interruzione."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "Logontype deve essere o 'ask' o 'interactive' (senza le virgolette)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4617,13 +4685,13 @@
 "Logontype può essere usato insieme ad una URL FTP. L'argomento deve essere o "
 "'%s' o '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Basso"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Minimo"
 
@@ -4632,11 +4700,11 @@
 msgstr ""
 "La minima porta disponibile deve essere un numero compreso tra 1024 e 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 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."
 
@@ -4659,7 +4727,7 @@
 "Risposta non corretta, il server non sta inviando terminazioni di riga "
 "corrette"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4670,58 +4738,58 @@
 msgid "Manual transfer"
 msgstr "Trasferimento manuale"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Accetta tutti i seguenti"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Corrispondenza trovata per tutti i seguenti"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Nessuna corrispondenza trovata per i seguenti"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "&Trasferimenti massimi simultanei:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Registro messaggi"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Posizione registro messaggi"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minuti"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Sposta &giù"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Sposta &su"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Risorse del computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Documenti"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "I miei siti"
 
@@ -4730,33 +4798,33 @@
 msgid "N/a"
 msgstr "N/d"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nome"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Nome già presente"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Nome del segnalibro già presente."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Deve essere inserito il nome del filtro"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "È necessario inserire un percorso remoto valido"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Deve essere specificata la codifica del caratteri"
 
@@ -4764,19 +4832,23 @@
 msgid "Network unreachable"
 msgstr "Rete non raggiungibile"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Mai"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Nuova &cartella"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Nuova &scheda"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Nuovo &preferito"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4789,41 +4861,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nuovo preferito"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nuova cartella"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nuove funzionalità e miglioramenti in %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nuovo filtro"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nuova cartella"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nuovo sito"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Prossimo nella coda trasferimento"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "No"
 
@@ -4831,25 +4903,25 @@
 msgid "No category to export selected"
 msgstr "Nessuna categoria da esportare selezionata"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Nessun comando ottenuto, annullamento in corso."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Nessun IP esterno impostato, sarà provato quello predefinito."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Non sono in corso modifiche a file."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Nessun nome filtro fornito"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Nessun host fornito, inserire un host."
 
@@ -4857,27 +4929,27 @@
 msgid "No images available"
 msgstr "Nessuna immagine disponibile"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Nessun file nella coda!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Nessun nome è stato fornito per il gruppo di filtri."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Nessun programma associato con il tipo di file"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Nessun risultato della ricerca"
 
@@ -4895,23 +4967,23 @@
 msgid "No username given."
 msgstr "Nessun nome fornito."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Nessuno"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Nessun elemento selezionato"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normale"
 
@@ -4923,15 +4995,15 @@
 "modifica."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Non connesso"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Nessun server collegato"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Nessun server collegato."
 
@@ -4939,23 +5011,23 @@
 msgid "Not connected."
 msgstr "Non connesso."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Attenzione che questa caratteristica è supportata solo utilizzando il "
 "protocollo FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Nota: funziona solo con connessioni FTP non cifrate."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Nota: usando un proxy generico si forza la modalità passiva nelle "
 "connessioni FTP."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Numero di punti decimali:"
 
@@ -4963,21 +5035,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Il numero di nuovi tentativi deve essere compreso tra 0 e 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "A&pri file"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4985,120 +5057,124 @@
 "Nelle pagine seguenti, sarà configurata la modalità di trasferimento "
 "selezionata, così come la modalità di fallback, se abilitata."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Una volta"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Verranno inviate al server solo informazioni sulla versioni di FileZilla e "
-"del sistema operativo."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Una volta la settimana"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Apri cartella nel gestore file di sistema"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Apri Gestore siti"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Apri il Gestore siti."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Apri il Gestore siti - Clic destro per un elenco di siti."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Apri file."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Apri la finestra impostazioni di FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Aperto come:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Apertura non riuscita"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Apri una nuova scheda"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Apri Gestore siti"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Apri la finestra di dialogo elenco cartella. Clic tasto destro per "
 "abilitazione/disabilitazione filtri."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Rilevato problema del sistema operativo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organizzazione:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Altro:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Descrizione generale"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Sovrascr&ivi se più recente"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Sovrascrivi file"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Sovrascrivi file se la dimensione è differente"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Sovrascrivi file se la dimensione è differente o il sorgente più recente"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Sovrascrivi file se il sorgente è più recente"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Sovrascrivi se &dimensione differente"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Sovrascrivi se dimensione dif&ferente o sorgente più recente"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permessi proprietario"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Proprietario/gruppo"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5106,7 +5182,7 @@
 "E&vita che il sistema vada in stato di standby durante il trasferimento o "
 "altre operazioni"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Host p&roxy:"
@@ -5115,27 +5191,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Comando PORT corrotto dal router."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssiva (consigliata)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pacchetto"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Il parametro non è una URL valida"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Pass&word:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passiva (consigliata)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Modalità passiva"
@@ -5152,43 +5228,47 @@
 msgid "Password required"
 msgstr "È richiesta la password"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Percorso"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Percorso non trovato"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Percorso"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "In attesa di rimozione"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Permesso"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permessi"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Piattaforma:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5204,7 +5284,7 @@
 "Controllare su http://filezilla-project.org/probe.php che il server sia in "
 "esecuzione e ricontrollare con attenzione le impostazioni."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5213,7 +5293,7 @@
 "aggiornato o visitare http://filezilla-project.org per scaricare il codice "
 "sorgente di FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5241,7 +5321,7 @@
 msgid "Please enter a custom time format."
 msgstr "Inserire un formato ora personalizzato."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Inserire una data nella forma AAAA-MM-GG come ade sempio 2010-07-18."
@@ -5253,20 +5333,20 @@
 msgstr ""
 "Inserire un limite di velocità per il download superiore o pari a 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Inserire un nome per il nuovo filtro."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Inserire un nuovo nome per il filtro copiato."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Inserire un nuovo nome per il gruppo di filtri \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Inserire un nuovo nome per il filtro."
 
@@ -5288,11 +5368,11 @@
 msgstr ""
 "Inserire un numero tra 1 e 10 per il numero di trasferimenti concorrenti."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Inserire una password per questo server:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5308,11 +5388,11 @@
 msgstr ""
 "Inserire una scadenza tra 5 e 9999 secondi o 0 per disabilitare la scadenza."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Inserire un nome univoco per questo set di filtri"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Inserire un nome utente per questo server:"
 
@@ -5324,17 +5404,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Inserire l'URL da cui ricavare l'indirizzo IP esterno"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Inserire un intervallo di aggiornamento di almeno 7 giorni"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Inserire un limite di velocità per l'upload superiore o pari a 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5342,14 +5418,18 @@
 "Inserire un comando FTP.\n"
 "L'utilizzo di comandi ftp personalizzati svuoterà la cache delle cartelle."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Inserire il nome della cartella che deve essere creata:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Insersci il nome del file che deve essere creato:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Inserire nome utente e password per questo server:"
 
@@ -5368,7 +5448,7 @@
 "di questa procedura guidata. Se l'indirizzo è dinamico o non lo conosci, usa "
 "l'opzione del risolutore esterno."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5384,7 +5464,7 @@
 "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:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Assicuratevi che la lingua richiesta sia installata nel vostro sistema."
@@ -5401,7 +5481,7 @@
 "forwarding dovrà essere effettuata manualmente. Non utilizzare il router "
 "nelle modalità comunemente chiamate 'DMZ mode' o 'game mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5413,7 +5493,7 @@
 "usata da virus o altro malware. Eventuali falsi allarmi di questo tipo "
 "possono essere ignorati senza problemi."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5421,7 +5501,7 @@
 "Notare che il mantenimento di data e ora dei file in upload funziona solo "
 "con server FTP, FTPS e FTPES (non SFTP) che supportano il comando MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5429,7 +5509,7 @@
 "NOTA: alcuni server potrebbero bloccare i client se i tentativi di "
 "riconnessione sono troppi o gli intervalli tra i tentativi troppo brevi."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5438,7 +5518,7 @@
 "Maggiori informazioni sono disponibili all'indirizzo http://filezilla-"
 "project.org/wiki/index.php/Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5456,38 +5536,38 @@
 "variazioni della configurazione di rete o al verificarsi di problemi su "
 "server precedentemente funzionanti."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Selezionare un'azione:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Selezionare le categorie da importare."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Seleziona la modalità di trasferimento predefinita."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Selezionare i nuovi attributi per la cartella \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Selezionare i nuovi attributi per il file \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Impostare i nuovi attributi per le cartelle selezionate."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Impostare i nuovi attributi per le cartelle e i file selezionati."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Impostare i nuovi attributi per i file selezionati."
 
@@ -5506,32 +5586,32 @@
 "chiamata'modo DMZ' o 'modo game'. Cose come analisi del protocollo or "
 "specifichefixups del protocollo devono essere disabilitati"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
 "Visitare http://filezilla-project.org per maggiori informazioni su FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 "Visitare http://filezilla-project.org per scaricare la versione più recente."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "CAP:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Siti Predefiniti"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Preserva data e ora file"
 
@@ -5539,49 +5619,61 @@
 msgid "Preview:"
 msgstr "Anteprima:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "I certificati della connessione primaria e della connessione dati non "
 "coincidono."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Stampa informazioni diagnostiche relative all'avvio di Filezilla."
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Invia informazioni versione a stdout e esci"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Cartelle prioritizzate (predefinito)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Priorità"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Normative relative alla privacy:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Policy privacy: verranno inviate al server solo informazioni sulla versione "
+"di FileZilla, del sistema operativo e dell'architettura della CPU."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Chiavi &private:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tocollo:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Password pro&xy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Elabora co&da"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocollo:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Porta proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Utente proxy:"
 
@@ -5589,12 +5681,18 @@
 msgid "Proxy authentication failed"
 msgstr "Autenticazione proxy non riuscita"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Handshake proxy non riuscito: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5611,23 +5709,23 @@
 "Richiesta proxy non riuscita: tipo di indirizzo sconosciuto nella risposta "
 "CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy impostato ma proxy o porta proxy non validi"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Autenticazione con chiave pubblica"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritmo chiave pubblica:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permessi pubblici"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Coda elaborata completamente"
 
@@ -5646,39 +5744,39 @@
 msgid "Queue: empty"
 msgstr "Coda: vuota"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "File in coda"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "In coda:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "&Riavvia il sistema"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Struttura cartella r&emota"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "Ripristina e m&etti in coda i file selezionati"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Comando FTP"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Le&ttura"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Aggio&rna"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Ri&nomina"
 
@@ -5690,65 +5788,73 @@
 "Riavviare la configurazione e verificare attentamente le impostazioni e "
 "configurare in accordo tutti i router/firewall."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Lettur&a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Sola lettura"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Si è sicuri di voler annullare l'operazione attiva?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Sicuri di voler cancellare %d cartella e il suo contenuto?"
-msgstr[1] "Sicuri di voler cancellare %d cartelle e il loro contenuto?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Sicuri di voler cancellare %d file?"
-msgstr[1] "Sicuri di voler cancellare %d file?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Sicuri di voler cancellare %s e %s?"
+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] "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:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Eliminare %s e %s nel server?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Si è sicuri di voler eliminare tutti i file e/o cartelle selezionati?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Riavvia adesso"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "&Includi sottocartelle"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Ricevuta una linea eccedente i 10000 caratteri, interruzione."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Ricevuti dati corrotti"
 
@@ -5761,11 +5867,11 @@
 "connessi ad un server.\n"
 "Se si procede, la connessione sarà terminata."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Impostazioni di riconnessione"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Riconnetti all'ultimo server utilizzato"
 
@@ -5773,34 +5879,38 @@
 msgid "Redirection to invalid address"
 msgstr "Redirezione ad un indirizzo non valido"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Aggiorna l'elenco file e cartelle"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Memorizzare la password?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Certificato remoto non sicuro."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "File remoto"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Ricerca file remota"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "File remoti:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Percorso remoto"
 
@@ -5814,7 +5924,7 @@
 "sia un percorso assoluto valido e supportato dal tipo di server (%s) "
 "attualmente attivo."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5825,7 +5935,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Il percorso remoto non può essere analizzato. Assicurarsi che sia un "
@@ -5835,11 +5945,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Il percorso remoto non ha potuto essere analizzato."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Gestione percorso remoto:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Percorso remoto:"
 
@@ -5847,76 +5957,76 @@
 msgid "Remote site:"
 msgstr "Sito remoto:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Rimuovi &tutto"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Rimuovi gli elementi &selezionati"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Rinomina file"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Rinomina le cartelle selezionate"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Rinomina i file e cartelle selezionate"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Rinomina da '%s' a '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Segnalazione bug e richieste di nuove funzionalità"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Richiedi FTP esplicito su TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Richiedi FTP implicito su TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Ripristina e rimetti in cod&a tutti i file"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Risoluzione dell'indirizzo IP %s in corso"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Risoluzione del nome host"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Risposta:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Risultati:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Riprendi trasferimento file"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5924,38 +6034,38 @@
 "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:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Lettura elenco cartelle..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "È in corso la lettura dell'indirizzo IP esterno da %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Certificato principale non garantito"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Visualizza i file &su cui sono in corso modifiche..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "&Visualizza Gestore siti all'avvio"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "&Arresta il sistema"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Ferma"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Navigazione s&incronizzata"
 
@@ -5963,31 +6073,46 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Salvare le impostazioni?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Il salvataggio password è stato disabilitato dall'utente."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Cerca file da aggiungere alla coda"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Ricerca dei file da inviare in corso"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Cerca &condizioni:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Cerca &cartella:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Ricerca ricorsiva file."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Cerca nei server i file"
 
@@ -6000,25 +6125,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Vedi anche: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Sele&ziona server"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Seleziona &pagina:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Seleziona tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Imposta l'azione da eseguire se il file di destinazione esiste già."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Seleziona l'editor predefinito"
 
@@ -6038,7 +6163,7 @@
 "Seleziona azione predefinita file esistente solo per i file attualmente "
 "selezionati nella coda."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Seleziona il percorso di download per il pacchetto"
 
@@ -6059,7 +6184,7 @@
 msgstr "Selezionare il file per l'esportazione delle impostazioni"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Selezionare il file per l'esportazione dei siti"
 
@@ -6075,12 +6200,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Selezionare il nome file per il file chiave convertito"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Seleziona come questi file devono essere aperti."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Seleziona cartella per il download"
 
@@ -6088,15 +6213,15 @@
 msgid "Select target filename"
 msgstr "Selezionare il nome file destinazione"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Selezionare le categorie da esportare:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Selezionare gli elementi privati da eliminare."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6110,7 +6235,7 @@
 msgstr[0] "Selezionata %d cartella."
 msgstr[1] "Selezionate %d cartelle."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6131,7 +6256,7 @@
 msgstr[0] "Selezionato %d file. Dimensione totale: almeno %s"
 msgstr[1] "Selezionati %d file. Dimensione totale: almeno %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Selezionati %s e %s per il trasferimento."
@@ -6146,13 +6271,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Selezionati %s e %s. Dimensione totale: almeno %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Il programma selezionato non esiste."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Si sta già modificando il file selezionato"
 
@@ -6160,15 +6285,15 @@
 msgid "Selected file is already loaded"
 msgstr "Il file selezionato è già stato caricato"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Il file selezionato è già aperto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Si sta ancora modificando il file selezionato"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Il filtro selezionato opera solo su file locali."
 
@@ -6186,37 +6311,42 @@
 msgstr ""
 "La porta selezionata di solito viene utilizzata da un protocollo diverso."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Invia coman&di FTP per mantenere attiva la connessione"
 
-#: resources.h:543
+#: resources.h:560
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Invia comando per mantenere connessione attiva"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Numero seriale:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Tipo di server:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Il server non ha correttamente chiuso la connessione TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Il server non supporta caratteri non ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6225,15 +6355,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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Il server non supporta il ripristino di file > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Il server non supporta il ripristino di file > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6242,7 +6372,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6250,11 +6380,11 @@
 "Il server richiede un account. Specificare un account utilizzando il Gestore "
 "siti"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Il server ha ritornato un percorso vuoto."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6262,13 +6392,13 @@
 "Il server ha inviato una richiesta addizionale di login. È necessario usare "
 "un tipo di login interattivo."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6288,102 +6418,113 @@
 msgid "Server sent unexpected reply."
 msgstr "Il server ha inviato una risposta non prevista."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Server a client MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Server a client cipher:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Tipo di server:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "File server/locale"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Dettagli sessione"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Imposta &priorità"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Imposta permessi di '%s' a '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "Chiamata SetSocketBufferSize senza socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Impostazioni"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Most&ra elenco cartelle"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Visualizza finestra di &benvenuto..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 "Visualizzare entrambi gli alberi delle cartelle e continuare la comparazione?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Visualizza crittografie TLS disponibili"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Visualizza questa finestra di aiuto"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Arresta il sistema"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Algoritmo firma:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Voci del &Gestore siti"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Gestore siti"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gestore siti - non memorizzare le passwor&d"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Gestore siti - dati non validi"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Gestore siti già aperto"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Il sito non esiste."
 
@@ -6393,8 +6534,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Percorso sito non valido."
 
@@ -6413,11 +6554,11 @@
 "Gestore siti.\n"
 "Aggiungere la connessione corrente al gestore siti?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Dimensione"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Formato Dimensione"
 
@@ -6426,33 +6567,33 @@
 msgid "Size unknown"
 msgstr "Dimensione sconosciuta"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Ignora file"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Salta il download di %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Salta l'invio di %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 "Sono in corso modifiche ad alcuni file remoti oppure dei file hanno bisogno "
 "di essere inviati al server."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6460,21 +6601,21 @@
 "Alcuni server remoti mal configurati, connessi a internet tramite un router "
 "potrebbero rispondere con il loro indirizzo IP locale."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Ordina le cartelle"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "L'ordine di visualizzazione non può essere modificato se si stanno "
 "comparando le cartelle."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Ordinamento"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Modalità di ordinamento:"
 
@@ -6486,20 +6627,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Sorgente e destinazione non possono essere lo stesso"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Sorgente e destinazione dell'operazione trascina e rilascia coincidono"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "File sorgente:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limiti di velocità"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Limiti di velocità"
 
@@ -6511,7 +6652,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Limiti di velocità abilitati, fare clic per modficarli."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versioni stabili e beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Solo versioni stabili"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Avvia &immediatamente il trasferimento"
 
@@ -6519,43 +6668,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Avvia aprendo Gestore siti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Avvio download di %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Avvio upload di %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Avvia il sito locale nel percorso indicato"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Provincia:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Stato"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Stato:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Ferm&a e rimuovi tutto"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Via:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Soggetto del certificato"
 
@@ -6563,11 +6716,11 @@
 msgid "Successful transfers"
 msgstr "Trasferimenti riusciti"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Riepilogo dei risultati del test:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6575,44 +6728,45 @@
 "I collegamenti simbolici non sono affetti dalla selezione, così i "
 "collegamenti simbolici saranno eliminati."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Navigazione sincronizzata"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "La navigazione sincronizzata è stata disabilitata."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Errore di sintassi"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Errore di sintassi nella linea di comando"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistema"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "&Barra strumenti"
 
@@ -6620,11 +6774,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Connessione TSL/SSL stabilita, invio richiesta HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Connessione TLS/SSL stabilita, in attesa del messaggio di benvenuto..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Connessione TLS/SSL stabilita."
 
@@ -6632,27 +6786,31 @@
 msgid "TTL expired"
 msgstr "TTL scaduto"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Il file destinazione esiste già"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "File destinazione:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Il file destinazione esiste già!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Il file destinazione esiste già, continuare?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Risultati del test"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Verifica del supporto al ripristino trasferimenti sul server"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6670,7 +6828,7 @@
 "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/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Il documento non è un documento XML valido: %s"
@@ -6681,11 +6839,11 @@
 msgstr "L'indirizzo inserito è: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Il preferito non può essere aggiunto."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "I segnalibri non possono essere azzerati."
 
@@ -6697,19 +6855,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "La sequenza personale di login non può essere vuota."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "La connessione dati non può essere stabilita. %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Il programma predefinito per i file di testo non è disponibile."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Il programma predefinito per i file di testo è '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Il nome filtro inserito esiste già. Scegliere un nome differente."
 
@@ -6728,9 +6891,9 @@
 "Il file %s esiste già.\n"
 "Inserire un nuovo nome:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6748,14 +6911,14 @@
 "Non è stato possibile caricare il file '%s' o non contiene una chiave "
 "privata."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Impossibile caricare il file '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6764,8 +6927,8 @@
 "Non è stato possibile aprire il file '%s':\n"
 "Nessun programma è stato associato sul vostro sistema con questo file."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6807,7 +6970,7 @@
 "attualmente supportati da FileZilla.\n"
 "Volete convertirlo in un file non protetto?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Il programma selezionato come editor predefinito non esiste."
 
@@ -6843,11 +7006,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "I seguenti caratteri saranno sostituiti: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Sono in corso modifiche ai seguenti file remoti:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "La soluzione FTP open source gratuita"
 
@@ -6855,7 +7018,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "I segnalibri globali non possono essere salvati."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6888,7 +7051,7 @@
 "La porta minima disponibile deve essere minore o uguale alla massima "
 "disponibile."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6896,7 +7059,7 @@
 "La nuova versione è stata scaricata. Fare clic su 'Termina' per chiudere "
 "FileZilla e per avviare l'installazione."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6904,11 +7067,11 @@
 "La nuova versione è stata scaricata. Installare con la stessa procedura "
 "adottata per la versione attuale."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "La coda non verrà salvata."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6923,23 +7086,23 @@
 msgid "The selected categories have been imported."
 msgstr "Le categorie selezionate sono state importate."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Il file selezionato contiene dati importabili per le seguenti categorie:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Si sta già modificando il file selezionato:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Il file selezionato è in uso da un'altra applicazione."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6957,7 +7120,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Il server ha inviato una risposta inaspettata o sconosciuta."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Il server utilizza la seguente codifica per i nomi di file:"
 
@@ -6969,7 +7132,7 @@
 "Il certificato del server è sconosciuto. Esaminare attentamente il "
 "certificato per assicurarsi che il server sia affidabile."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6979,7 +7142,7 @@
 "Questo può verificarsi se la chiave è stata modificata dall'amministratore o "
 "se si è collegati a un computer che finge di essere il server."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6995,15 +7158,15 @@
 "Le impostazioni sono state importate. FileZilla deve essere riavviato per "
 "rendere effettive le nuove impostazioni."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 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:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Il sistema si chiuderà a meno che non fate clic su Annulla."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -7011,7 +7174,7 @@
 "Il file destinazione esiste già.\n"
 "Scegliere un'azione."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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?"
 
@@ -7019,11 +7182,11 @@
 msgid "Themes"
 msgstr "Temi"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Questo gruppo di filtri non può essere eliminato."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Questo gruppo di filtri non può essere rinominato."
 
@@ -7035,7 +7198,7 @@
 "Questo significa che alcuni router/firewall stanno interferendo con "
 "FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7044,7 +7207,7 @@
 "(senza router), in caso contrario il valore restituito sarà l'indirizzo di "
 "rete interno."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7052,25 +7215,25 @@
 "Questa procedura guidata vi aiuterà a configurare correttamente router e "
 "firewall e a testare le nuove impostazioni di connessione."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Ora"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Formato ora"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Timeout in sec&ondi:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7079,22 +7242,22 @@
 "Differenza di fuso orario: Server: %d secondi. Locale: %d secondi. "
 "Differenza: %d secondi."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titolo:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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 "
 "nascosti."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7102,7 +7265,7 @@
 "Per il supporto dell'autenticazione con chiave pubblica, FileZilla deve "
 "conoscere le chiavi private da usare."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7119,7 +7282,7 @@
 "Verde: il file è più recente del file non selezionato nell'altro lato\n"
 "Rosso: dimensione file differente"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7129,24 +7292,24 @@
 "Se abilitata, la navigazione nella gerarchia della cartella locale "
 "modificherà in accordo la cartella nel server e viceversa."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Attiva o disattiva l'elaborazione della coda di trasferimento"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr ""
 "Attiva o disattiva la visualizzazione dell'albero delle cartelle locali"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Visualizza o nasconde la finestra del registro messaggi"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Visualizza o nasconde l'albero delle cartelle remote"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Visualizza o nasconde la finestra della coda di trasferimento"
 
@@ -7159,37 +7322,37 @@
 msgstr "Troppi re-indirizzamenti"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Trace:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Trasferisci"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Direzione trasferimento"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Modalità di &trasferimento"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Modalità di trasferimento"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Coda di trasferimento"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Impostazioni di trasferimento"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Connessione interrotta: %s"
@@ -7198,8 +7361,8 @@
 msgid "Transferred data got tainted."
 msgstr "I dati trasferiti sono stati alterati."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Trasferimento in corso"
 
@@ -7207,74 +7370,74 @@
 msgid "Transfers"
 msgstr "Trasferimenti"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Trasferimenti completati"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "&I file senza estensione saranno interpretati come file ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "I seguenti tipi di &file saranno interpretati come file ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Conferma chiave host modificata:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Conferma nuova chiave host:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr ""
 "Considerare come attendibile la nuova chiave e procedere con la connessione?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr ""
 "Considerare come attendibile questo certificato e procedere con la "
 "connessione?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr ""
 "Considerare come attendibile questo computer e procedere con la connessione?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tipo"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Tipo proxy FTP:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Tipo di proxy generico:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "&Invia"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limite di &upload:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr ""
 "U&sa il programma associato dal sistema al tipo di file (se disponibile)"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "U&sa le impostazioni predefinite del sistema"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7283,16 +7446,16 @@
 msgid "Unassigned error code %d"
 msgstr "Codice errore non assegnato %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unità:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Sconosciuto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Tipo proxy FTP sconosciuto, impossibile generare sequenza login."
 
@@ -7305,7 +7468,7 @@
 msgid "Unknown certificate"
 msgstr "Certificato sconosciuto"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7313,7 +7476,7 @@
 "Errore sconosciuto nell'apertura del file. Assicurarsi che il file sia "
 "accessibile e sia un documento XML corretto."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Chiave host sconosciuta"
 
@@ -7325,7 +7488,7 @@
 msgstr ""
 "Versione sconosciuta protocollo della negoziazione utente/password SOCKS: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "Elemento root sconosciuto, il file non sembra generato da FileZilla."
@@ -7347,7 +7510,7 @@
 "Finché non sarà risolto questo problema, la modalità FTP attiva non "
 "funzionerà e dovrà essere utilizzata la modalità passiva."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Tipo certificato non supportato"
 
@@ -7355,25 +7518,24 @@
 msgid "Unsupported redirect"
 msgstr "Redirezione non supportata"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Invia e annulla le modifi&che"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Aggiornamenti automatici"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Aggiornamento software"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Aggiornamenti"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Invia"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Invio non riuscito"
 
@@ -7386,100 +7548,100 @@
 msgid "Upload limit: none"
 msgstr "Limite di upload: nessuno"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Invia le cartelle selezionate"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Invia file e cartelle selezionate"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Inviare il file modificato al server?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Inviare questo file al server?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Invio in corso"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Invio in corso e in attesa di rimozione"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Invia e annulla le modifiche"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Utilizza un set di &caratteri personalizzato"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Usa &programma personalizzato:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Usa programma pre&definito per i file di testo"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Usa navigazione &sincronizzata"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Usa UTF-8 se il server lo supporta, altrimenti usa il set di caratteri "
 "locale."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Usa azione predefinita"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Usa FTP semplice"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Usa il server attualmente connesso"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Usa server dal Gestore siti"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Usa le impostazioni pre&definite del sistema"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Usa il seguente indirizzo IP:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Usa il seguente intervallo di porte:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Usa l'indirizzo IP esterno del server"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Selezionare questa opzione se la connessione a internet avviene tramite un "
 "router con un indirizzo IP esterno di tipo statico."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7490,86 +7652,86 @@
 "sarà richiesta una connessione in modalità attiva. L'unica informazione che "
 "viene trasmessa è la versione di FileZilla."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Utente:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Il nome utente non può essere una serie di spazi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Utilizzare il proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "NOTA: utilizzando un set di caratteri non corretto, è possibile avere "
 "problemi nella visualizzazione dei nomi di file."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Utilizzando questa procedura guidata è possibile controllare la "
 "disponibilità di nuovi aggiornamenti per FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Valido dal:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Valido fino al:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Messaggi dettagliati log di wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Verifica del certificato in corso..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versione:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Molto alto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "L'opzione 'visualizza file nascosti' non è supportata dal server"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Visualizza/modifica"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Colonne visibili"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "S&crittura"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "In attesa"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "In attesa di connessione"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "In attesa della password"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "In attesa che il trasferimento venga annullato"
 
@@ -7577,7 +7739,7 @@
 msgid "Waiting to retry..."
 msgstr "In attesa di un nuovo tentativo..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7607,11 +7769,11 @@
 "Gateway,\n"
 "FileZilla andrà in timeout nei trasferimenti di grandi dimensioni."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Avvertimento, connessione dati da IP sbagliato ignorata."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7626,23 +7788,31 @@
 "\n"
 "Si è sicuri di voler includere le nightly build?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Attenzione: Potenziale falla di sicurezza!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "benvenuti in FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Novità"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Novità:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Filezilla può memorizzare le password in modo da potersi riconenttersi senza "
+"dove reinserire la password dopo aver riavviato Filezilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7651,11 +7821,15 @@
 "operativo locale per i nomi file saranno sostituiti se lo scaricherete come "
 "file."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Widescreen"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Filezilla deve memorizzare la password?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Scr&ittura"
 
@@ -7668,11 +7842,19 @@
 msgid "Wrong line endings"
 msgstr "Terminazioni di riga non corrette"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Sì"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Sembra che tu stia usando un host solo IPv6. Questa procedura guidata non "
+"supporta questa configurazione."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7680,17 +7862,17 @@
 "Si sta già utilizzando la versione più recente di FileZilla. Controllare di "
 "nuovo in futuro."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 "E' possibile aprire questa finestra di dialogo dal menu della Guida in linea."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Potete lasciare vuoto il valore della porta per usare la porta predefinita."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7714,18 +7896,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?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "È necessario selezionare almeno un collegamento simbolico."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 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:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7734,11 +7916,11 @@
 "continuare?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Inserire un nome host."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Inserire il nome di una cartella locale."
 
@@ -7747,17 +7929,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Inserire un indirizzo IP valido."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Inserire il nome di una cartella locale scrivibile."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Inserire un nome account"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Specificare un nome utente"
 
@@ -7776,22 +7958,22 @@
 msgid "You need to enter a name for the log file."
 msgstr "Inserire un nome per il nuovo file del log."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Inserire un appropriato comando quotato."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Inserire il nome di un host proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Inserire un valore nell'intervallo 1-65535 per la porta proxy"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "È necessario inserire almeno un percorso, i segnalibri vuoti non sono "
@@ -7799,7 +7981,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7807,7 +7989,7 @@
 "Inserire sia il percorso locale che quello remoto per abilitare la "
 "navigazione sincronizzata per questo preferito."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7839,44 +8021,49 @@
 "Non si dovrebbero avere problemi di connessione ad altri server, i "
 "trasferimenti dei file dovrebbero funzionare correttamente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "dopo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "prima"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "inizia con"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "contiene"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "non contiene"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "non è uguale"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "termina con"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "uguale a"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "file"
 
@@ -7895,82 +8082,130 @@
 "Assicurarsi che l'eseguibile di fzputtyget sia presente nella stessa "
 "cartella dell'eseguibile di FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "non è stato possibile avviare fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers ha ritornato nessun certificato"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "maggiore di"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "eseguibile per il gruppo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "leggibile per il gruppo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "scrivibile per il gruppo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "è uguale a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "è impostato"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "non è impostato"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "minore di"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "corrisponde all'espressione regolare"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "eseguibile per il proprietario"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "leggibile per il proprietario"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "scrivibile per il proprietario"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "sconosciuto"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "eseguibile per gli altri"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "leggibile per gli altri"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "scrivibile per gli altri"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Copia"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Abilita controllo automatico degli aggiornamenti"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Numero giorni tra ogni controllo aggiornamenti:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "giorni (almeno 7)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Aggiornamenti automatici"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Controllo versioni &beta e release candidate"
+
+#~ msgid "Cop&y"
+#~ msgstr "Cop&ia"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Inserire un intervallo di aggiornamento di almeno 7 giorni"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Normative relative alla privacy:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s byte (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s byte (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "Memo&rizza questa e le future password"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "opState errato: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Duplica nome filtro"
 
diff -Nru filezilla-3.5.3/locales/ja_JP.po filezilla-3.7.3~precise/locales/ja_JP.po
--- filezilla-3.5.3/locales/ja_JP.po	2010-11-07 22:03:14.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ja_JP.po	2012-10-21 20:00:08.000000000 +0000
@@ -4,18 +4,20 @@
 # Toshiyuki Tega <tega at softgate dot jp>,
 # Kazunari INOUE <inoue at jseek.org>, 2009.
 # Tadashi Jokagi <elf@elf.no-ip.org>, 2010.
-# 
+# Yuki Shira <shirayuking@gmail.com>, 2011-2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla trunk\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 22:34+0100\n"
-"PO-Revision-Date: 2010-11-03 12:13+0900\n"
-"Last-Translator: Tadashi Jokagi <elf@elf.no-ip.org>\n"
-"Language-Team: Tadashi Jokagi <elf@elf.no-ip.org>\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
+"PO-Revision-Date: 2012-01-12 11:00+0900\n"
+"Last-Translator: Yuki Shira <shirayuking@gmail.com>\n"
+"Language-Team: Yuki Shira <shirayuking@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: ja_JP\n"
 "X-Poedit-Language: Japanese\n"
 "X-Poedit-Country: JAPAN\n"
 "X-Poedit-Bookmarks: 466,471,-1,-1,-1,-1,-1,-1,-1,-1\n"
@@ -30,16 +32,14 @@
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
 #: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
-msgstr "%H:%M:%S 残り"
+msgstr "残り %H:%M:%S"
 
-#: resources.h:774
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
-msgstr ""
-"%a - アカウント (ログイン種類として アカウント を選択されていない場合は省略さ"
-"れます)"
+msgstr "%a - アカウント (ログオン種類がアカウントではない場合は省略されます)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
@@ -47,21 +47,21 @@
 #, c-format
 msgid "%d directory"
 msgid_plural "%d directories"
-msgstr[0] "%d 個のディレクトリー"
+msgstr[0] "%d 個のディレクトリ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
-msgstr[0] ""
+msgstr[0] "%d 個の空ではないディレクトリ"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -71,18 +71,18 @@
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] "%d ファイル。合計サイズ: %s"
+msgstr[0] "%d 個のファイル. 合計サイズ: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] "%d ファイル。合計サイズ: 少なくとも %s"
+msgstr[0] "%d 個のファイル. 合計サイズ: %s 以上"
 
-#: ../../locales/../src/interface/QueueView.cpp:2833
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
-msgstr "%d 個のファイルをキューへ追加"
+msgstr "%d 個のファイルをキューに追加しました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:104
 #, c-format
@@ -90,11 +90,11 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: resources.h:771
+#: resources.h:785
 msgid "%h - Host"
 msgstr "%h - ホスト"
 
-#: resources.h:773
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - パスワード"
@@ -102,22 +102,22 @@
 #: ../../locales/../src/interface/statuslinectrl.cpp:181
 #, c-format
 msgid "%s (%d B/s)"
-msgstr "%s バイト (%d バイト/秒)"
+msgstr "%s (%d バイト/秒)"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:179
 #, c-format
 msgid "%s (%d.%d KB/s)"
-msgstr "%s バイト (%d.%d KB/秒)"
+msgstr "%s (%d.%d KB/秒)"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:177
 #, c-format
 msgid "%s (%d.%d MB/s)"
-msgstr "%s バイト (%d.%d MB/秒)"
+msgstr "%s (%d.%d MB/秒)"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:184
 #, c-format
 msgid "%s (? B/s)"
-msgstr "%s バイト (? バイト/秒)"
+msgstr "%s (? バイト/秒)"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
@@ -129,20 +129,20 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - まだ有効ではありません!"
 
-#: resources.h:775
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
-msgstr "%s - プロキシー ユーザー名"
+msgstr "%s - プロキシ ユーザ"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
-msgstr "%s と %s。合計サイズ: %s"
+msgstr "%s と %s. 合計サイズ: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
-msgstr "%s と %s。合計サイズ: 少なくとも %s"
+msgstr "%s と %s. 合計サイズ: 少なくとも %s"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:31
 #, c-format
@@ -158,7 +158,7 @@
 #: ../../locales/../src/interface/updatewizard.cpp:888
 #, c-format
 msgid "%s bytes (%d B/s)"
-msgstr "%s バイト (%d B/s)"
+msgstr "%s バイト (%d バイト/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:886
 #, c-format
@@ -179,11 +179,11 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
-"%s を見つけられませんでした。FileZillaのこのコンポーネント無しに,SFTPは動作し"
-"ません。\n"
+"%s が見つかりませんでした. FileZilla のこのコンポーネントなしに SFTP は動作し"
+"ません.\n"
 "\n"
-"FileZillaをもう一度ダウンロードしてください。 もし問題が続くようであれば, バ"
-"グ報告を提出してください。"
+"FileZilla を再度ダウンロードしてください. 問題が続く場合はバグ報告を提出して"
+"ください."
 
 #: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
@@ -195,466 +195,474 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"%s は見つかりません。FileZillaのこのコンポーネントなしにSFTPは働きません。\n"
+"%s が見つかりませんでした. FileZilla のこのコンポーネントなしに SFTP は動作し"
+"ません.\n"
 "\n"
-"可能な解決法:\n"
-"- %sが環境変数PATHに含まれるディレクトリーにあるか確認する\n"
-"- 環境変数FZ_FZSFTPに%sへのフルパスを設定する"
+"解決法の候補:\n"
+"- %s が環境変数 PATH に含まれるディレクトリにあるか確認する.\n"
+"- 環境変数 FZ_FZSFTP に %s へのフルパスを設定する."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s - %d ビット"
 
-#: resources.h:772
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
-msgstr "%u - ユーザー名"
+msgstr "%u - ユーザ名"
 
-#: resources.h:776
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
-msgstr "%w - プロキシーのパスワード"
+msgstr "%w - プロキシのパスワード"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
-msgstr "FileZillaについて(&A)..."
+msgstr "FileZilla のバージョン情報(&A)..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "アカウント(&A):"
 
-#: resources.h:100 resources.h:676 resources.h:740
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "アクティブ(&A)"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
-msgstr "ブックマークに追加(&A)..."
+msgstr "ブックマークを追加(&A)..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "ファイルをキューに追加(&A)"
 
-#: resources.h:784
+#: resources.h:798
 msgid "&Add keyfile..."
-msgstr "鍵ファイルの追加(&A)..."
+msgstr "鍵ファイルを追加(&A)..."
 
-#: resources.h:626 resources.h:645
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
 msgstr "キューに追加(&A)"
 
-#: resources.h:94
+#: resources.h:95
 msgid "&Adjust server timezone offset:"
-msgstr "サーバーのタイムゾーンオフセットの調整(&A):"
+msgstr "サーバのタイムゾーン オフセットの調整(&A):"
 
 #: resources.h:23
 msgid "&Always trust certificate in future sessions."
 msgstr "今後もこの証明書を常に信用する(&A)"
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
-msgstr "常にこのホストを信用し、この鍵をキャッシュに加える(&A)"
+msgstr "常にこのホストを信用し, この鍵をキャッシュに追加(&A)"
 
-#: resources.h:934
+#: resources.h:950
 msgid "&Always use default editor"
-msgstr "常に標準のエディタを利用する(&A)"
+msgstr "常に既定のエディタを使用(&A)"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
-msgstr "選択されたプログラムを関連付けのないファイルに使用(&A)"
+msgstr "関連付けされていないファイルには常にこの選択を使用(&A)"
 
 #: resources.h:65
 msgid "&Always use this action"
-msgstr "常にこの動作を利用する(&A)"
+msgstr "常にこの動作を利用(&A)"
 
-#: resources.h:752
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
-msgstr "オペレーティングシステムに外部IPアドレスを尋ねる(&A)"
+msgstr "オペレーティング システムに外部 IP アドレスを尋ねる(&A)"
 
-#: resources.h:526 resources.h:656 resources.h:821
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "自動(&A)"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
-msgstr "自動判別(&A)"
+msgstr "自動検出(&A)"
 
-#: resources.h:528 resources.h:658 resources.h:823
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
-msgstr "バイナリー(&B)"
+msgstr "バイナリ(&B)"
 
-#: resources.h:894
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
-msgstr "SI 2進数 接頭辞 (例: 1 KB = 1024 Bytes)(&B)"
+msgstr "SI 接頭辞(2進数) (例: 1 K&B = 1024 バイト)"
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr "ブックマーク(&B)"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:931 resources.h:953
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "参照(&B)..."
 
-#: resources.h:811
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "バースト耐性(&B):"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:724
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "キャンセル(&C)"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
-msgstr "FileZilla のベータ バージョンを確認する(&C)"
+msgstr "FileZilla のベータ版をチェック(&C)"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
-msgstr "個人情報のクリア(&C)..."
+msgstr "個人情報をクリア(&C)..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "FileZilla を閉じる(&C)"
 
-#: resources.h:666
+#: resources.h:680
 msgid "&Configure speed limits..."
 msgstr "速度制限の設定(&C)..."
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
 msgstr "設定(&C)..."
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "接続(&C)"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "コピー(&C)"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
-msgstr "サイト マネージャーに現在の設定をコピーする(&C)..."
+msgstr "現在の接続をサイト マネージャにコピー(&C)..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "クリップボードにコピー(&C)"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr "クラッシュ(&C)"
 
-#: resources.h:565 resources.h:579 resources.h:628 resources.h:649
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
-msgstr "ディレクトリーを作る(&C)"
+msgstr "ディレクトリを作成(&C)"
 
-#: resources.h:661
+#: resources.h:675
 msgid "&Create new tab"
-msgstr "タブを作る(&C)"
+msgstr "新規タブを作成(&C)"
 
-#: ../../locales/../src/interface/menu_bar.cpp:71
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "デバッグ(&D)"
 
-#: resources.h:961
+#: resources.h:977
 msgid "&Debug information in message log:"
-msgstr "メッセージログのデバッグ情報(&D):"
+msgstr "メッセージ ログのデバッグ情報(&D):"
 
-#: resources.h:927
+#: resources.h:943
 msgid "&Default editor:"
-msgstr "標準のエディタ(&D):"
+msgstr "既定のエディタ(&D):"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
-msgstr "ファイル存在時の標準動作..."
+msgstr "ファイル存在時の既定の動作(&D)..."
 
-#: resources.h:734
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
 msgstr "ログイン失敗時の待ち時間(&D):"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:651
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "削除(&D)"
 
-#: resources.h:456
+#: resources.h:458
 msgid "&Delete symlink"
-msgstr "シンボリックリンクの削除(&D)"
+msgstr "シンボリックリンクを削除(&D)"
 
-#: resources.h:510
+#: resources.h:519
 msgid "&Directory comparison"
-msgstr "ディレクトリー比較(&D)"
+msgstr "ディレクトリを比較(&D)"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
-msgstr ""
-"ローカルのファイルを破棄し、新しいファイルをダウンロードして編集する(&D)"
+msgstr "ローカル ファイルを破棄してから新たにファイルをダウンロード/編集(&D)"
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "切断(&D)"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
-msgstr "サーバーから切断(&D)"
+msgstr "サーバから切断(&D)"
 
-#: resources.h:870
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr "平均速度の代わりに瞬間的な転送速度を表示する(&D)"
+msgstr "平均速度の代わりに瞬間的な転送速度を表示(&D)"
 
-#: resources.h:892
+#: resources.h:908
 msgid "&Display size in bytes"
-msgstr "ファイルの大きさをバイトで表示する(&D)"
+msgstr "サイズをバイトで表示(&D)"
+
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "パスワードを保存しない(&O)"
 
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "このダイアログを今後表示しない(&D)"
 
-#: resources.h:757
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
-msgstr "ローカル接続に外部 IP アドレスを使用しない(&D)"
+msgstr "ローカル接続に外部 IP アドレスを使用しません(&D)"
 
-#: resources.h:914
+#: resources.h:930
 msgid "&Double-click action on files:"
-msgstr "ファイルのダブルクリック操作(&D):"
+msgstr "ファイルのダブルクリック時の動作(&D):"
 
-#: resources.h:572 resources.h:624
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "ダウンロード(&D)"
 
-#: resources.h:442
-#, fuzzy
+#: resources.h:444
 msgid "&Download to:"
-msgstr "ダウンロード(&D)"
+msgstr "ダウンロード先(&D):"
 
-#: resources.h:659
+#: resources.h:673
 msgid "&Download..."
 msgstr "ダウンロード(&D)..."
 
-#: resources.h:256 resources.h:833
+#: resources.h:258 resources.h:847
 msgid "&Downloads:"
 msgstr "ダウンロード(&D):"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "編集(&E)"
 
-#: resources.h:209
+#: resources.h:211
 msgid "&Edit filter rules..."
-msgstr "フィルター ルールの編集(&E)..."
+msgstr "フィルタ ルールを編集(&E)..."
 
-#: resources.h:511 resources.h:530 resources.h:639 resources.h:665
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
-msgstr "有効(&E)"
+msgstr "有効にする(&E)"
 
-#: resources.h:942
+#: resources.h:958
 msgid "&Enable automatic update check"
-msgstr "自動的なアップデート確認を有効にする(&E)"
+msgstr "自動的な更新チェックを有効にする(&E)"
 
-#: resources.h:480 resources.h:806
+#: resources.h:482 resources.h:820
 msgid "&Enable speed limits"
 msgstr "速度制限を有効にする(&E)"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr "エンコーディング(&E):"
 
-#: resources.h:609
+#: resources.h:82
+msgid "&Encryption:"
+msgstr "暗号化(&E)"
+
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "カスタム コマンドを入力(&E)..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "実行(&E)"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
-msgstr "サイト マネージャー エントリの書き出し(&E)"
+msgstr "サイト マネージャのエントリをエクスポート(&E)"
 
-#: resources.h:497 resources.h:655
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "エクスポート(&E)..."
 
-#: resources.h:762
+#: resources.h:776
 msgid "&Fall back to active mode"
-msgstr "アクティブモードに戻る(&F)"
+msgstr "アクティブ モードに戻る(&F)"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "ファイル(&F)"
 
-#: resources.h:636
+#: resources.h:650
 msgid "&File Attributes..."
-msgstr "ファイル属性(&F)..."
+msgstr "ファイルの属性(&F)..."
 
-#: resources.h:588
+#: resources.h:600
 msgid "&File permissions..."
-msgstr "ファイル パーミッション(&F)..."
+msgstr "ファイルのパーミッション(&F)..."
 
-#: resources.h:364
+#: resources.h:366
 msgid "&File:"
 msgstr "ファイル(&F):"
 
-#: resources.h:219
+#: resources.h:221
 msgid "&Filter conditions:"
-msgstr "フィルター条件(&F):"
+msgstr "フィルタの条件(&F):"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
-msgstr "フィルター設定(&F):"
+msgstr "フィルタ セット(&F):"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
-msgstr "フィルター(&F):"
+msgstr "フィルタ(&F):"
 
 #: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "&Finish"
-msgstr "編集の終了(&F)"
+msgstr "完了(&F)"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
-msgstr "編集を終了しローカルファイルを削除(&F)"
+msgstr "編集を終了してローカル ファイルを削除(&F)"
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
+"リモート パスをフラットにして、含まれるすべてのファイルを対象ディレクトリへ直"
+"接ダウンロード(&F)"
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
-msgstr ""
-"ディレクトリーを含むターゲットを削除するとき、シンボリックリンクを追跡する"
-"(&F)"
+msgstr "シンボリックリンクを追跡して、対象ディレクトリの内容を削除(&F)"
 
-#: resources.h:755
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
-msgstr "以下の URL から外部 IP アドレスを取得する(&G):"
+msgstr "以下の URL から外部 IP アドレスを取得(&G):"
 
-#: resources.h:551
+#: resources.h:561
 msgid "&Getting help..."
-msgstr "ヘルプを取得する[英文サイト](&G)..."
+msgstr "ヘルプを取得(英語)(&G)..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr "グローバル ブックマーク(&G)"
 
-#: resources.h:791
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
-msgstr "HTTP/1.1 CONNECT メソッドの使用(&H)"
+msgstr "CONNECT メソッドを使用して &HTTP/1.1"
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "ヘルプ(&H)"
 
-#: resources.h:514 resources.h:642
+#: resources.h:523 resources.h:656
 msgid "&Hide identical files"
 msgstr "同一のファイルを隠す(&H)"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "最高(&H)"
 
-#: resources.h:750
+#: resources.h:764
 msgid "&Highest available port:"
-msgstr "使用するポート番号の上限値(&H):"
+msgstr "利用できるポートの最大値(&H):"
 
-#: resources.h:79 resources.h:377 resources.h:714
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
 msgstr "ホスト(&H):"
 
-#: resources.h:893
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
-msgstr "IEC 接頭辞 (例: 1 KiB = 1024 bytes)(&I)"
+msgstr "&IEC 2進接頭辞 (例: 1 KiB = 1024 バイト)"
 
-#: resources.h:881
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
-msgstr "ISO 8601 (例: 2007-09-15)(&I)"
+msgstr "&ISO 8601 (例: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
 msgstr "インポート(&I)..."
 
-#: resources.h:936
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
-msgstr "システムのファイルの種類への関連付けを継承する(&I)"
+msgstr "システムのファイルの種類の関連付けを継承(&I)"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
-msgstr ""
+msgstr "リモート パス構造を検索ルートに対して相対的に保つ(&K)"
 
-#: resources.h:856
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
-msgstr "ファイルとディレクトリー枠のレイアウト(&L):"
+msgstr "ファイルとディレクトリ枠のレイアウト(&L):"
 
-#: resources.h:747
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
-msgstr "FileZilla が使用するローカルのポート番号を制限する(&L)"
+msgstr "FileZilla が使用するローカル ポートを制限(&L)"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
-msgstr "同時接続数の制限(&L)"
+msgstr "同時接続の数を制限(&L)"
 
-#: resources.h:519
+#: resources.h:529
 msgid "&Local directory tree"
-msgstr "ローカル ディレクトリーツリー(&L)"
+msgstr "ローカル ディレクトリ ツリー(&L)"
 
-#: resources.h:401 resources.h:407
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
-msgstr "ローカル ディレクトリー(&L):"
+msgstr "ローカル ディレクトリ(&L):"
 
-#: resources.h:951
+#: resources.h:967
 msgid "&Log to file"
-msgstr "ログ ファイル(&L)"
+msgstr "ファイルにログを記録(&L)"
 
-#: resources.h:82
+#: resources.h:83
 msgid "&Logon Type:"
 msgstr "ログオンの種類(&L):"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "ログオンの種類(&L):"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
-msgstr "低い(&L)"
+msgstr "低(&L)"
 
-#: resources.h:545
+#: resources.h:555
 msgid "&Manage bookmarks..."
-msgstr "ブックマークの管理(&M)..."
+msgstr "ブックマークを管理(&M)..."
 
-#: resources.h:533
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "手動転送(&M)..."
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "最大接続数(&M):"
 
-#: resources.h:732
+#: resources.h:746
 msgid "&Maximum number of retries:"
 msgstr "最大再試行回数(&M):"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
 msgstr "メッセージ ログ(&M)"
 
-#: resources.h:868
+#: resources.h:883
 msgid "&Minimize to tray"
 msgstr "トレイに最小化(&M)"
 
-#: resources.h:399
+#: resources.h:401
 msgid "&Name:"
 msgstr "名前(&N):"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "ネットワーク設定ウィザード(&N)..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
 msgstr "新規(&N)"
 
@@ -664,41 +672,41 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:1043
 msgid "&New version available!"
-msgstr "新バージョンがあります!(&N)"
+msgstr "新バージョンを利用できます!(&N)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:27
 msgid "&Next >"
 msgstr "次へ(&N) >"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "いいえ(&N)"
 
-#: resources.h:765 resources.h:790
+#: resources.h:779 resources.h:804
 msgid "&None"
 msgstr "なし(&N)"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "通常(&N)"
 
-#: resources.h:943
+#: resources.h:959
 msgid "&Number of days between update checks:"
-msgstr "アップデートチェックの日数間隔(&N):"
+msgstr "更新チェックの日数間隔(&N):"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
 msgstr "数値(&N):"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:768
+#: resources.h:782
 msgid "&OPEN"
-msgstr "OPEN コマンド(&O)"
+msgstr "&OPEN"
 
-#: resources.h:561 resources.h:647
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr "開く(&O)"
 
@@ -706,329 +714,331 @@
 msgid "&Overwrite"
 msgstr "上書き(&O)"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "パッシブ(&P)"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "パスワード(&P):"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "音を鳴らす(&P)"
 
-#: resources.h:80 resources.h:378 resources.h:718
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "ポート(&P):"
 
-#: resources.h:862
+#: resources.h:876
 msgid "&Position of the message log:"
-msgstr "メッセージログの位置(&P):"
+msgstr "メッセージ ログの位置(&P):"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
-msgstr "転送したファイルのタイムスタンプを維持する(&P)"
+msgstr "転送したファイルのタイムスタンプを維持(&P)"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
 msgstr "キュー(&Q)"
 
-#: resources.h:720
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "クイック接続(&Q)"
 
-#: resources.h:517
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "クイック接続バー(&Q)"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
-msgstr "読む(&R)"
+msgstr "読み込む(&R)"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "再接続(&R)"
 
-#: resources.h:508 resources.h:664
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
 msgstr "更新(&R)"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
-msgstr "このセッションのパスワードを記録する(&R)"
+msgstr "このセッションのパスワードを記憶(&R)"
 
-#: resources.h:403 resources.h:409
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
-msgstr "リモート ディレクトリー(&R):"
+msgstr "リモート ディレクトリ(&R):"
 
-#: resources.h:367
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "リモート パス(&R):"
 
-#: resources.h:827
+#: resources.h:841
 msgid "&Remove"
 msgstr "削除(&R)"
 
-#: resources.h:785
+#: resources.h:799
 msgid "&Remove key"
-msgstr "鍵の削除(&R)"
+msgstr "鍵を削除(&R)"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
-msgstr "選択の削除(&R)"
+msgstr "選択されたものを削除(&R)"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:632 resources.h:653
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "名前の変更(&R)"
 
-#: resources.h:200
+#: resources.h:202
 msgid "&Rename..."
 msgstr "名前の変更(&R)..."
 
-#: resources.h:323
+#: resources.h:325
 msgid "&Reopen local file"
-msgstr "ローカルファイルを再オープン(&R)"
+msgstr "ローカル ファイルを再び開く(&R)"
 
-#: resources.h:818
+#: resources.h:832
 msgid "&Replace invalid characters with:"
-msgstr "不正文字の置換(&R):"
+msgstr "正しくない文字を置換(&R):"
 
-#: resources.h:552
+#: resources.h:562
 msgid "&Report a bug..."
-msgstr "バグの報告[英文サイト](&R)..."
+msgstr "バグを報告(英語)(&R)..."
 
-#: resources.h:616
-#, fuzzy
+#: resources.h:630
 msgid "&Reset and requeue all"
-msgstr "リセットして選択したファイルを再びキューに入れます"
+msgstr "すべてリセットして再びキューに入れる(&R)"
 
-#: resources.h:713
+#: resources.h:727
 msgid "&Restart Wizard"
-msgstr "ウィザードの再起動(&F)"
+msgstr "ウィザードを再起動(&F)"
 
 #: resources.h:62
 msgid "&Resume"
-msgstr "転送再開(&R)"
+msgstr "再開(&R)"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
-msgstr "コマンドの実行(&R)..."
+msgstr "コマンドを実行(&R)..."
 
-#: resources.h:727
+#: resources.h:741
 msgid "&Run configuration wizard now..."
-msgstr "今すぐ設定ウィザードを起動(&R)..."
+msgstr "今すぐ設定ウィザードを実行(&R)..."
 
-#: resources.h:945
+#: resources.h:961
 msgid "&Run update check now..."
-msgstr "今すぐアップデートの確認を実行する(&R)..."
+msgstr "今すぐ更新チェックを実行(&R)..."
 
-#: resources.h:767
+#: resources.h:781
 msgid "&SITE"
-msgstr "SITE コマンド(&S)"
+msgstr "&SITE"
 
-#: resources.h:792
+#: resources.h:806
 msgid "&SOCKS 5"
-msgstr "SOCKS 5(&S)"
+msgstr "&SOCKS 5"
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
-msgstr "名前をつけて保存(&S)..."
+msgstr "名前を付けて保存(&S)..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
 msgstr "検索(&S)"
 
-#: resources.h:538
+#: resources.h:548
 msgid "&Search remote files..."
-msgstr "リモートファイルの検索(&S)..."
+msgstr "リモート ファイルを検索(&S)..."
 
 #: resources.h:71
 msgid "&Select Entry:"
-msgstr "エントリーの選択(&S):"
+msgstr "エントリを選択(&S):"
 
-#: resources.h:925
+#: resources.h:941
 msgid "&Select language:"
 msgstr "言語の選択(&S):"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "表示する列を選択(&S):"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
-msgstr "サーバー(&S)"
+msgstr "サーバ(&S)"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "設定(&S)..."
 
-#: resources.h:960
+#: resources.h:976
 msgid "&Show debug menu"
-msgstr "デバッグ メニューの表示(&S)"
+msgstr "デバッグ メニューを表示(&S)"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
-msgstr "メッセージの表示(&S)"
+msgstr "メッセージを表示(&S)"
 
-#: resources.h:950
+#: resources.h:966
 msgid "&Show timestamps in message log"
-msgstr "メッセージログのタイムスタンプを表示(&S)"
+msgstr "メッセージ ログのタイムスタンプを表示(&S)"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
-msgstr "サイト マネージャー(&S)..."
+msgstr "サイト マネージャ(&S)..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr "サイト別ブックマーク(&S)"
 
 #: resources.h:64
 msgid "&Skip"
-msgstr "スキップ (転送しない)(&S)"
+msgstr "スキップ(&S)"
 
-#: resources.h:532
+#: resources.h:542
 msgid "&Speed limits"
 msgstr "速度制限(&S)"
 
-#: resources.h:448
+#: resources.h:450
 msgid "&Start transfer immediately"
-msgstr "今すぐ転送の開始(&S)"
+msgstr "今すぐ転送を開始(&S)"
 
-#: resources.h:861
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr "ローカルとリモートのパネルを入れ替える(&S)"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
-msgstr "テスト(&T)"
+msgstr "テスト(&R)"
 
-#: resources.h:873
+#: resources.h:889
 msgid "&Theme:"
 msgstr "テーマ(&T):"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
 msgstr "転送(&T)"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
 msgstr "転送モード(&T):"
 
-#: resources.h:521
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "転送キュー(&T)"
 
-#: resources.h:830
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
-msgstr "ドットファイルをアスキーファイルとして扱う(&T)"
+msgstr "ドットファイルを ASCII ファイルとして扱う(&T)"
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
-msgstr "編集状態の解除(&U)"
+msgstr "編集中を解除(&U)"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr "このホストのキャッシュされた鍵を更新(&U)"
 
-#: resources.h:555 resources.h:643
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "アップロード(&U)"
 
-#: resources.h:266 resources.h:842
+#: resources.h:268 resources.h:856
 msgid "&Uploads:"
 msgstr "アップロード(&U):"
 
-#: resources.h:424
+#: resources.h:426
 msgid "&Use custom program"
-msgstr "カスタムプログラムを使う(&U)"
+msgstr "カスタム プログラムを使用(&U)"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
-msgstr "同期ブラウズの有効化(&S)"
+msgstr "同期ブラウジングを使用(&U)"
 
-#: resources.h:929
+#: resources.h:945
 msgid "&Use system's default editor for text files"
-msgstr "テキストファイル用にシステム標準のエディタを使う(&U)"
+msgstr "テキスト ファイルの編集にシステム既定のエディタを使用(&U)"
 
-#: resources.h:753
+#: resources.h:767
 msgid "&Use the following IP address:"
-msgstr "以下のIPアドレスを使う(&U):"
+msgstr "以下の IP アドレスを使用(&U):"
 
-#: resources.h:761
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
-msgstr "代わりにサーバーの外部IPアドレスを使う(&U)"
+msgstr "代わりにサーバの外部 IP アドレスを使用(&U)"
 
-#: resources.h:896
+#: resources.h:912
 msgid "&Use thousands separator"
-msgstr "桁区切りを表示(&U)"
+msgstr "桁区切りを使用(&U)"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
-msgstr "ユーザー(&U):"
+msgstr "ユーザ(&U):"
 
-#: resources.h:716
+#: resources.h:730
 msgid "&Username:"
-msgstr "ユーザー名(&U):"
+msgstr "ユーザ名(&U):"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1039
 #, c-format
 msgid "&Version %s"
 msgstr "バージョン %s(&V)"
 
-#: resources.h:507
+#: resources.h:516
 msgid "&View"
 msgstr "表示(&V)"
 
-#: resources.h:578
+#: resources.h:588
 msgid "&View/Edit"
 msgstr "表示/編集(&V)"
 
-#: resources.h:935
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr ""
+msgstr "ローカルで編集されたファイルを監視して修正のアップロードを促す(&W)"
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
-msgstr "書き込み(&W)"
+msgstr "書き込む(&W)"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "はい(&Y)"
 
-#: ../../locales/../src/engine/local_path.cpp:442
-#: ../../locales/../src/engine/local_path.cpp:492
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "「%s」は存在しないかアクセスすることができません。"
+msgstr "'%s' は存在しないかアクセスできません."
 
-#: ../../locales/../src/engine/local_path.cpp:458
-#: ../../locales/../src/engine/local_path.cpp:479
-#: ../../locales/../src/engine/local_path.cpp:486
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "「%s」はディレクトリーではありません。"
+msgstr "'%s' はディレクトリではありません."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1060
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr ""
-"選択されたプロトコルでは'アカウント'ログオン種別はサポートされていません"
+msgstr "ログオンの種類 'アカウント' は選択されたプロトコルには対応していません"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'クオート'は通常引数を伴った'クオート'をサーバーに送るためにコマンドラインク"
-"ライアントによって使われるローカルコマンドです。あなたは主要な'クオート'なし"
-"にそのままのコマンドを入力したくなるでしょう。"
+"'クオート' は通常引数を伴った 'クオート' をサーバに送信するためにコマンドライ"
+"ン クライアントによって使われるローカル コマンドです. あなたは主要な 'クオー"
+"ト' なしにそのままのコマンドを入力したくなるでしょう."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
@@ -1037,168 +1047,167 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d 個の項目が非表示)"
 
-#: resources.h:802 resources.h:804
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr "(0 は無制限)"
 
-#: resources.h:733
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:735
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 秒)"
 
-#: resources.h:800
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:729
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
-msgstr "(5-9999、0 は無効)"
+msgstr "(5-9999, 0 は無効)"
 
-#: resources.h:944
+#: resources.h:960
 msgid "(At least 7 days)"
-msgstr "(最少7日間)"
+msgstr "(最少 7 日間)"
 
-#: resources.h:889
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(例: %H:%M)"
 
-#: resources.h:883
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr "(例: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:808 resources.h:810
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
 #, c-format
 msgid "(in %s/s)"
-msgstr ""
+msgstr "(%s/秒で)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:896
 msgid ", %H:%M:%S left"
-msgstr ", %H:%M:%S 残り"
+msgstr ", 残り %H:%M:%S"
 
 #: ../../locales/../src/interface/updatewizard.cpp:900
 msgid ", --:--:-- left"
-msgstr ", --:--:-- 残り"
+msgstr ", 残り --:--:--"
 
-#: resources.h:701
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
-msgstr "- ルーターかファイアウォールが壊れています"
+msgstr "- 壊れたルータ/ファイアウォール"
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
-msgstr "- ミラー上のファイルがおかしいです"
+msgstr "- ミラーするときにファイルが破損"
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
-msgstr "- システムにマルウェア"
+msgstr "- あなたのシステムにマルウェアが存在"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
-msgstr "--:--:-- 残り"
+msgstr "残り --:--:--"
 
 #: ../../locales/../src/interface/cmdline.cpp:80
 msgid "-c cannot be used together with an FTP URL."
-msgstr "-c は FTP URL と同時には使用できません。"
+msgstr "-c は FTP URL と同時には使用できません."
 
 #: ../../locales/../src/interface/cmdline.cpp:89
 msgid "-l can only be used together with an FTP URL."
-msgstr "-l は FTP URL と同時限定で使用できます。"
+msgstr "-l は FTP URL と同時には使用できません."
 
 #: ../../locales/../src/interface/cmdline.cpp:68
 msgid "-s and -c cannot be present at the same time."
-msgstr "-s と -c は同時に使用できません。"
+msgstr "-s と -c は同時に使用できません."
 
 #: ../../locales/../src/interface/cmdline.cpp:74
 msgid "-s cannot be used together with an FTP URL."
-msgstr "-s は FTP URL と同時には使用できません。"
+msgstr "-s は FTP URL と同時には使用できません."
 
-#: resources.h:962
+#: resources.h:978
 msgid "0 - None"
 msgstr "0 - なし"
 
-#: resources.h:963
+#: resources.h:979
 msgid "1 - Warning"
 msgstr "1 - 警告"
 
-#: resources.h:964
+#: resources.h:980
 msgid "2 - Info"
 msgstr "2 - 情報"
 
-#: resources.h:965
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr "3 - 詳細"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 ビット システム"
 
-#: resources.h:966
+#: resources.h:982
 msgid "4 - Debug"
 msgstr "4 - デバッグ"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 ビット システム"
 
 #: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "< &Back"
-msgstr "< 前へ(&B)"
+msgstr "< 戻る(&B)"
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:106
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
-msgstr "同じ名前のブックマークが既に存在します。違う名前を入力してください。"
+msgstr ""
+"入力された名前のブックマークは既に存在します. 未使用の名前を入力してください."
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
 msgid "A default editor needs to be set."
-msgstr "標準のエディタを設定する必要があります。"
+msgstr "既定のエディタを設定する必要があります."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
+#: ../../locales/../src/interface/RemoteListView.cpp:155
 #: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
-msgstr ""
-"自身のサブディレクトリーの中にディレクトリーをドラッグすることはできません。"
+msgstr "ディレクトリを自身のサブディレクトリにドラッグすることはできません."
 
-#: resources.h:673
+#: resources.h:687
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
-"いくつかのサーバーはパッシブモードを認めていないか設定が間違っています。その"
-"ような場合アクティブモードを使うべきです。アクティブモードにおいて、FileZilla"
-"はポートを開いてサーバーに接続を要求します。"
+"いくつかのサーバはパッシブ モードを許可していないか設定が間違っています. その"
+"ような場合アクティブ モードを使用するべきです. アクティブ モードでは, "
+"FileZilla はポートを開いてサーバからの接続を受け付けます."
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
-msgstr "以前開いたファイルは変更されています。"
+msgstr "以前開かれたファイルは変更されています."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2081
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
-msgstr "その名前のファイルはすでに編集中です。'%s' を開き直しますか?"
+msgstr "その名前のファイルは既に編集されました. '%s' を再び開きたいですか?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2077
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
-msgstr "その名前のファイルはすでに転送されています。"
+msgstr "その名前のファイルは既に転送されています."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2666
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
-msgstr ""
-"その名前のファイルはすでに編集中です。閉じてから再度試してみてください。"
+msgstr "その名前のファイルはまだ編集中です. 閉じてから再度試してください."
 
 #: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
@@ -1208,109 +1217,108 @@
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
-"ローカルファイル名はデコードできませんでした。\n"
-"環境変数LC_CTYPE(もしくは LC_ALL)が正しく設定されているか確認してください。\n"
-"この問題を解決するまで, ファイル一覧表示においてファイルは見えないでしょ"
-"う。\n"
-"これ以上の警告はこのセッションでは表示されないでしょう。"
+"ローカルファイル名をデコードできませんでした.\n"
+"環境変数 LC_CTYPE (または LC_ALL) が正しく設定されているか確認してください.\n"
+"この問題を修正するまで, ファイル一覧表示にファイルが表示されないかもしれませ"
+"ん.\n"
+"このセッションではこれ以上の警告は表示しません."
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
-msgstr "より新しいバージョンの FileZilla が利用できます:"
+msgstr "新しいバージョンの FileZilla を利用できます:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
-"適切なサーバーは全てのファイルを常に表示しますが, 問題のあるサーバーはファイ"
-"ルを隠します。 このオプションを使用するは全てのファイルを表示するようサーバー"
-"に強制します。"
+"適切なサーバはすべてのファイルを常に表示しますが, 問題のあるサーバはファイル"
+"を隠します. このオプションを使用するはすべてのファイルを表示するようサーバに"
+"強制します."
 
-#: resources.h:745
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
 msgstr ""
-"適切なサーバーはこれを必要としません。これを必要とするならサーバー管理者に連"
-"絡してください。"
+"これは適切なサーバでは不要です. これが必要な場合はサーバ管理者に連絡してくだ"
+"さい."
 
 #: ../../locales/../src/interface/state.cpp:284
 msgid ""
 "A remote operation is in progress and synchronized browsing is enabled.\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"リモート処理が進行中で同期ブラウズが有効です。\n"
-"同期ブラウズを無効にしてローカルディレクトリーを変更しますか?"
+"リモート操作が進行中で同期ブラウジングが有効です.\n"
+"同期ブラウジングを無効にしてローカル ディレクトリの変更を継続しますか?"
 
-#: resources.h:527 resources.h:657 resources.h:822
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
-msgstr "アスキー(&S)"
+msgstr "A&SCII"
 
-#: resources.h:826
+#: resources.h:840
 msgid "A&dd"
-msgstr "加える(&D)"
+msgstr "追加(&D)"
 
-#: resources.h:853
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
-msgstr "アスキーファイルの転送再開を認める(&L)"
+msgstr "ASCII ファイルの再開を許可(&L)"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
-msgstr "ダウンロードにだけ適用(&P)"
+msgstr "ダウンロードのみに適用(&P)"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "アップロードにだけ適用(&P)"
+msgstr "アップロードのみに適用(&P)"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
-msgstr "すべてのファイルとディレクトリーに適用(&P)"
+msgstr "すべてのファイルとディレクトリに適用(&P)"
 
-#: resources.h:623
-#, fuzzy
+#: resources.h:637
 msgid "A&utomatically remove successful transfers"
-msgstr "成功した転送を自動的に削除(&A)"
+msgstr "成功した転送を自動的に削除(&U)"
 
-#: resources.h:388
+#: resources.h:390
 msgid "ASCII"
-msgstr "アスキー"
+msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
-msgstr "前の接続を切断し、現在のタブで開いて接続します"
+msgstr "以前の接続を中止して現在のタブで接続"
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
-msgstr "FileZilla について"
+msgstr "FileZilla のバージョン情報"
 
-#: resources.h:863
+#: resources.h:877
 msgid "Above the file lists"
-msgstr "ファイル一覧の上"
+msgstr "ファイル一覧の上に"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/manual_transfer.cpp:554
-#: ../../locales/../src/interface/sitemanager.cpp:1395
-#: ../../locales/../src/interface/sitemanager.cpp:1396
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "アカウント"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr "キュー完了後の動作(&C)"
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "選択されたファイルの操作:"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
-msgstr "操作を選択:"
+msgstr "実行する動作:"
 
 #: resources.h:57
 msgid "Action:"
@@ -1325,16 +1333,16 @@
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
 msgstr ""
-"アクティブモードFTPのテストに失敗しました。FileZillaは正しい外部IPアドレスを"
-"知りません。"
+"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド"
+"レスを知りません."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:592
 msgid ""
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address. In addition to that, your router has modified the sent address."
 msgstr ""
-"アクティブモードFTPのテストに失敗しました。FileZillaは正しい外部IPアドレスを"
-"知りません。加えてルータはアドレスの修正を行っています。"
+"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド"
+"レスを知りません. 加えてルータはアドレスの修正を行っています."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:580
 msgid ""
@@ -1342,188 +1350,198 @@
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
-"アクティブモードFTPのテストに失敗しました。FileZillaは正しい外部IPアドレスを"
-"知っていますが, ルータかファイヤウォールが語弊のある送信アドレスに修正してい"
-"ます。"
+"アクティブ モード FTP のテストに失敗しました. FileZilla は正しい外部 IP アド"
+"レスを知っていますが, ルータかファイアウォールが語弊のある送信アドレスに修正"
+"しています."
 
-#: resources.h:758
+#: resources.h:772
 msgid "Active mode IP"
-msgstr "アクティブモードIP"
+msgstr "アクティブ モード IP"
 
-#: resources.h:449
+#: resources.h:451
 msgid "Add files to &queue only"
-msgstr "キューにのみファイルを追加する(&Q)"
+msgstr "すべてのファイルをキューのみに追加(&Q)"
 
-#: resources.h:627 resources.h:646
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
-msgstr "選択されたディレクトリーを転送キューへ追加"
+msgstr "選択されたディレクトリを転送キューへ追加"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
-msgstr "選択されたファイルとフォルダーを転送キューへ追加"
+msgstr "選択されたファイルとフォルダを転送キューへ追加"
 
-#: resources.h:916 resources.h:922
+#: resources.h:932 resources.h:938
 msgid "Add to queue"
-msgstr "キューに追加(&A)"
+msgstr "キューに追加"
 
 #: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
-msgstr "このアドレス形式には対応していません"
+msgstr "未対応のアドレスの種類"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "詳細"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
-msgstr "高度な設定:"
+msgstr "詳細設定:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "アルゴリズム:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3035
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "All files have been successfully transferred"
-msgstr "全ファイルの転送に成功しました"
+msgstr "すべてのファイルを正しく転送しました"
 
-#: resources.h:702
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "すべてのポート範囲は1024から65535の間でなければならない."
+msgstr ""
+"入力されたすべてのポート範囲は 1024 から 65535 の範囲である必要があります."
 
-#: ../../locales/../src/interface/QueueView.cpp:3031
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "すべての転送を終了しました。%d 個のファイルは転送できませんでした。"
 
-#: resources.h:741
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr "失敗時に他の転送モードへのフォールバックを認める(&F)"
+msgstr "失敗時に他の転送モードへのフォール バックを許可(&F)"
 
-#: resources.h:677
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
-msgstr "失敗時に他の転送モードへのフォールバックを認める"
+msgstr "失敗時に他の転送モードへのフォール バックを許可"
 
-#: resources.h:475
+#: resources.h:477
 msgid "Already connected"
-msgstr "既に接続済み"
+msgstr "既に接続されています"
 
-#: resources.h:786
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
-"かわりに PuTTY の Pageant ツールを使用して鍵を管理することができます, "
-"FileZilla は Pageant を認識します。"
+"代わりに PuTTY の Pageant ツールを使用して鍵を管理できます, FileZilla は "
+"Pageant を認識します."
 
-#: resources.h:787
-#, fuzzy
+#: resources.h:801
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
 msgstr ""
-"かわりにあなたのシステムの SSH エージェントを使用できます。そのためには, "
-"SSH&AUTH&SOCK 環境変数を設定してください。"
+"あなたのシステムの SSH エージェントを代わりに使用できます. そのためには "
+"SSH_AUTH_SOCK 環境変数を設定してください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1097
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
-"選択的に最新バージョンをダウンロードするには http://filezilla-project.org を"
-"訪問してください。"
+"最新版をダウンロードするには http://filezilla-project.org を訪問してください."
+
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+"\"%s\" からの転送キュー読み込み時にエラーが発生しました.\n"
+"復元できなかったキュー項目があるかもしれません."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2312
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"\"%s\" への転送キュー保存時にエラーが発生しました.\n"
+"保存できなかったキュー項目があるかもしれません."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
-"目的の場所にはすでにドラッグされたアイテムと同じ名前のアイテムがあります。"
+"目的の場所には既にドラッグされたアイテムと同じ名前のアイテムがあります."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:552
-#: ../../locales/../src/interface/sitemanager.cpp:1394
-#: ../../locales/../src/interface/sitemanager.cpp:1636
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "匿名"
 
 #: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
-msgstr "別のリモート処理が進行中のため、今はディレクトリーを変更できません。"
+msgstr "他のリモート操作が既に進行中のため現在はディレクトリを変更できません."
 
-#: ../../locales/../src/interface/sitemanager.cpp:888
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
-msgstr ""
-"\"%s\"に書くことができず,サイト マネージャーへの変更は保存されませんでした: %"
-"s"
+msgstr "サイト マネージャでの変更を保存できませんでした."
 
-#: ../../locales/../src/interface/sitemanager.cpp:735
+#: ../../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 ""
-"ファイルを修復しない限りはサイト マネージャーに対する変更は保存されません。"
+msgstr "ファイルを修復しない場合, サイト マネージャでの変更は保存されません."
 
-#: ../../locales/../src/interface/filter.cpp:210
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
-msgstr ""
-"\"%s\"に書くことができず,サイト マネージャーへの変更は保存されませんでした: %"
-"s"
+msgstr "フィルタへの変更を保存できませんでした."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
-msgstr "フィルターに加えた変更は保存されません。"
+msgstr "フィルタへの変更は保存されません."
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
-msgstr "ディレクトリーのみに適用(&l)"
+msgstr "ディレクトリのみに適用(&L)"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
 msgstr "適用"
 
 #: resources.h:66
 msgid "Apply to &current queue only"
-msgstr "現在のキューだけに適用(&c)"
+msgstr "現在のキューのみに適用(&C)"
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
-msgstr "ファイルにのみ適用(&f)"
+msgstr "ファイルのみに適用(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "アーカイブ"
 
-#: resources.h:865
+#: resources.h:879
 msgid "As tab in the transfer queue pane"
-msgstr "転送キューのタブとして表示"
+msgstr "転送キュー ペイン内のタブとして"
 
-#: resources.h:258 resources.h:268 resources.h:834 resources.h:843
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 msgid "Ask for action"
-msgstr "操作を尋ねる"
+msgstr "動作を尋ねる"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "パスワードを尋ねる"
 
-#: resources.h:698
+#: resources.h:712
 msgid "Ask operating system for a port."
-msgstr "オペレーティングシステムにポートを尋ねる."
+msgstr "オペレーティング システムにポートを尋ねる."
 
-#: resources.h:688
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
-msgstr "オペレーティングシステムに外部IPアドレスを尋ねる"
+msgstr "オペレーティング システムに外部 IP アドレスを尋ねる"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr "FileZilla フォーラムでの質問と回答"
 
@@ -1533,147 +1551,151 @@
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
-msgstr "少なくとも一つのフィルターの状態は不完全です"
+msgstr "少なくとも一つのフィルタの状態は不完全です"
 
-#: resources.h:707
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
-msgstr "いまのところ, すべての必要情報は集まっています。"
+msgstr "いまのところ, すべての必要情報は集まっています."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:136
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
 msgstr "属性"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 msgid "Authentication failed."
-msgstr "認証に失敗しました。"
+msgstr "認証に失敗しました."
 
-#: resources.h:874
+#: resources.h:890
 msgid "Author:"
 msgstr "著者:"
 
-#: resources.h:385
+#: resources.h:387
 msgid "Auto"
 msgstr "自動"
 
-#: resources.h:824
+#: resources.h:838
 msgid "Automatic file type classification"
-msgstr "自動的にファイルの種類を判別する"
+msgstr "自動的にファイルの種類を判別"
 
-#: resources.h:941
+#: resources.h:957
 msgid "Automatic update check"
-msgstr "自動アップデートチェック"
+msgstr "自動更新チェック"
 
-#: resources.h:878
+#: resources.h:894
 msgid "Available sizes"
-msgstr "可能なサイズ"
+msgstr "利用できるサイズ"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:129
 #: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
-msgstr "B"
+msgstr "B <バイトの単位文字。先頭の文字のみが翻訳されます>"
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
-msgstr "プロキシーを無視(&Y)"
+msgstr "プロキシを無視(&Y)"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
-msgstr "基本的な使い方の手順"
+msgstr "基本的な使用手順"
 
-#: resources.h:867
+#: resources.h:881
 msgid "Behaviour"
 msgstr "動作"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
-msgstr "編集中です"
+msgstr "編集中"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr "string coalescer をベンチマーク"
+
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
-msgstr "注意! 証明書が無効になりました"
+msgstr "注意! 証明書は失効しています"
 
-#: resources.h:389
+#: resources.h:391
 msgid "Binary"
-msgstr "バイナリー"
+msgstr "バイナリ"
 
-#: resources.h:860
+#: resources.h:874
 msgid "Blackboard"
 msgstr "黒板"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:267
-#: ../../locales/../src/interface/menu_bar.cpp:310
-#: ../../locales/../src/interface/sitemanager.cpp:393
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "ブックマーク"
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
 msgstr "ブックマーク:"
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
 msgstr "ブックマーク"
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
-msgstr "ビルドした日:"
+msgstr "ビルド日:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
 msgstr "ビルド情報"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
-msgstr "ビジネス カテゴリー:"
+msgstr "ビジネス カテゴリ:"
 
-#: resources.h:748
+#: resources.h:762
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"標準ではアクティブモードにおいて転送を確立するために利用可能なローカルポート"
-"を使います。もし FileZilla に限られた範囲のポート番号だけを使わせたい場合は, "
-"ポート範囲を指定してください。"
+"既定ではアクティブ モードで転送を確立するのに利用できるローカル ポートを使用"
+"します. FileZilla が使用するポート範囲を狭く制限したい場合は, 下にポート範囲"
+"を入力してください."
 
-#: resources.h:535
+#: resources.h:545
 msgid "C&ancel current operation"
-msgstr "現在の操作をキャンセルする(&C)"
+msgstr "現在の操作をキャンセル(&A)"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "FileZilla の nightly build もチェック(&H)"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
-msgstr "すべてクリア(&l)"
+msgstr "すべてクリア(&L)"
 
-#: resources.h:586 resources.h:634
+#: resources.h:598 resources.h:648
 msgid "C&opy URL(s) to clipboard"
-msgstr "クリップボードに URL をコピーする(&O)"
+msgstr "URL をクリップボードにコピー(&O)"
 
-#: resources.h:882
+#: resources.h:898
 msgid "C&ustom"
 msgstr "カスタム(&U)"
 
-#: resources.h:937
+#: resources.h:953
 msgid "C&ustom filetype associations:"
-msgstr "カスタム ファイルの種類への関連付け(&U):"
+msgstr "カスタム ファイルの種類の関連付け(&U):"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1269
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
-msgstr "サーバーのタイムゾーン オフセットを計算しています..."
+msgstr "サーバのタイムゾーン オフセットを計算しています..."
 
 #: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
-msgstr "ファイルから読めません。"
+msgstr "ファイルから読み取れません"
 
 #: ../../locales/../src/engine/transfersocket.cpp:712
 #: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
-msgstr "ファイルにデータを書けません。"
+msgstr "ファイルにデータを書き込めません."
 
 #: ../../locales/../src/engine/transfersocket.cpp:710
 #: ../../locales/../src/engine/transfersocket.cpp:784
@@ -1681,137 +1703,137 @@
 msgid "Can't write data to file: %s"
 msgstr "ファイル %s にデータを書き込めません"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
-msgstr "取り消し"
+msgstr "キャンセル"
 
-#: resources.h:984
+#: resources.h:1000
 msgid "Cancel current operation"
-msgstr "現在の操作をキャンセルする"
+msgstr "現在の操作をキャンセル"
 
-#: resources.h:985
+#: resources.h:1001
 msgid "Cancels the current operation"
-msgstr "現在の操作をキャンセルする"
+msgstr "現在の操作をキャンセル"
 
-#: ../../locales/../src/engine/local_path.cpp:452
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
 "'%s' にアクセスできません, メディアが挿入されていないかドライブの準備ができて"
-"いません。"
+"いません."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:560
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
-msgstr "サイト マネージャーに追加できません"
+msgstr "サイト マネージャにサーバを追加できません"
 
 #: ../../locales/../src/interface/context_control.cpp:345
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
 msgstr ""
-"処理中のため、タブを閉じることができません。\n"
-"現在の処理をキャンセルし、タブを閉じますか?"
+"処理中のためタブを閉じることができません\n"
+"現在の処理をキャンセルしてタブを閉じますか?"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
-"ローカルとリモートのディレクトリーに異なるフィルターが設定されているため,ディ"
-"レクトリを比較できません。"
+"ローカルとリモートのディレクトリに異なるフィルタが有効になっているため, ディ"
+"レクトリを比較できません."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2764
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
-msgstr "サーバーに接続していないため、ディレクトリーを比較できません。"
+msgstr "サーバに接続されていないため, ディレクトリを比較できません."
 
 #: ../../locales/../src/interface/filteredit.cpp:141
 msgid "Cannot create new filter"
-msgstr "新しいフィルターを作成することができません"
+msgstr "新しいフィルタを作成できません"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2059
-#: ../../locales/../src/interface/LocalListView.cpp:2190
-#: ../../locales/../src/interface/RemoteListView.cpp:2595
-#: ../../locales/../src/interface/RemoteListView.cpp:2641
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "ファイルを編集できません"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1975
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 msgid "Cannot edit file, not connected to any server."
-msgstr "いずれのサーバーにも接続していないため、ファイルを編集できません。"
+msgstr "ファイルを編集できません, どのサーバにも接続されていません."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1986
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
-msgstr "リモートのパスが不明なため、ファイルを編集できません。"
+msgstr "ファイルを編集できません, リモート パスが不明です."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
-"SFTP サーバーに対して FTP 接続を確立できません。適切なプロトコルを選択してく"
-"ださい。"
+"SFTP サーバに対して FTP 接続を確立できません, 適切なプロトコルを選択してくだ"
+"さい."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr "リソースファイルからクイック接続バーをロードできません"
+msgstr "リソース ファイルからクイック接続バーをロードできません"
 
 #: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr "適切な XML ファイルではないため、ファイルが読み込めません。"
+msgstr "適切な XML ファイルではないため, ファイルが読み込めません."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Cannot load keyfile"
 msgstr "鍵ファイルを読み込めません"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1033
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
-msgstr "リソースファイルからツールバーをロードできません"
+msgstr "リソース ファイルからツールバーをロードできません"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:708
-#: ../../locales/../src/interface/sitemanager.cpp:1288
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
-msgstr "エントリーの名前を変えることができません"
+msgstr "エントリの名前を変更できません"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1860
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
-msgstr "ファイルの名前を変えることができません"
+msgstr "ファイル名を変更できません"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
-msgstr "フィルター セットを保存できません"
+msgstr "フィルタ セットを保存できません"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
-msgstr "フィルターを選択できません"
+msgstr "フィルタを選択できません"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
 msgstr "ファイルの関連付けを設定できません"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "ダイアログを表示できません"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2077
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
-msgstr "選択したファイルの表示/編集ができません"
+msgstr "選択されたファイルは表示/編集できません"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
-msgstr "カテゴリー"
+msgstr "カテゴリ"
 
 #: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
-msgstr "証明書とセッションデータがまだ利用できません。"
+msgstr "証明書とセッション データがまだ利用できません."
 
 #: resources.h:26
 msgid "Certificate details"
@@ -1819,77 +1841,77 @@
 
 #: resources.h:3 resources.h:27
 msgid "Certificate in chain:"
-msgstr ""
+msgstr "認証パス"
 
 #: resources.h:13 resources.h:37
 msgid "Certificate issuer"
-msgstr "証明書の発行者"
+msgstr "証明書発行者"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
 msgstr "チャレンジ:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
-msgstr "ファイルの属性を変更する"
+msgstr "ファイルの属性を変更"
 
-#: resources.h:589 resources.h:637
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
-msgstr "ファイルのパーミッションを選択する"
+msgstr "ファイルのパーミッションを変更します."
 
-#: resources.h:958
+#: resources.h:974
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "ログ ファイル設定の変更には FileZilla の再起動が必要です。"
+msgstr "ログファイルの設定の変更には FileZilla の再起動が必要です。"
 
 #: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
 msgstr "文字エンコーディングの問題"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr "文字セット"
 
-#: resources.h:946
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
-msgstr "ベータ版 や RC 版 もチェック(&C)"
+msgstr "ベータ版や RC 版もチェック(&B)"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
-msgstr "アップデートの確認(&U)..."
+msgstr "更新をチェック(&U)..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
-msgstr "FileZilla の新しいバージョンを確認する"
+msgstr "FileZilla の新しいバージョンをチェック"
 
 #: ../../locales/../src/interface/updatewizard.cpp:163
 msgid "Check for updates"
-msgstr "更新を確認する"
+msgstr "更新をチェック"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1749
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
-msgstr "最新版の確認に失敗しました"
+msgstr "更新チェックに失敗しました"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
-msgstr "正しい外部 IP アドレスを調べています"
+msgstr "正しい外部 IP アドレスをチェック中"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
-msgstr "更新を確認しています。"
+msgstr "更新をチェック中"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1241
 msgid "Checksum mismatch of downloaded file."
-msgstr "ダウンロード ファイルのチェックサムが一致しません。"
+msgstr "ダウンロードしたファイルのチェックサムが一致しません。"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1566
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
-msgstr "標準のローカルディレクトリーを選択"
+msgstr "既定のローカル ディレクトリを選択"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:128
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:373
-#: ../../locales/../src/interface/sitemanager.cpp:2718
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
-msgstr "ローカル ディレクトリーの選択"
+msgstr "ローカル ディレクトリを選択"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
@@ -1899,72 +1921,76 @@
 msgid "Cipher:"
 msgstr "暗号化方式:"
 
-#: resources.h:495 resources.h:662
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
 msgstr "タブを閉じる(&O)"
 
-#: resources.h:857
+#: resources.h:871
 msgid "Classic"
 msgstr "クラシック"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
-msgstr "サイト マネージャー エントリーをクリアする(&S)"
+msgstr "サイト マネージャのエントリをクリア(&S)"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
-msgstr "レイアウト キャッシュをクリアする(&l)"
+msgstr "レイアウト キャッシュをクリア(&L)"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
-msgstr "クイック接続履歴を除去する(&Q)"
+msgstr "クイック接続の履歴をクリア(&Q)"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
-msgstr "再接続情報を消去(&R)"
+msgstr "再接続の情報をクリア(&R)"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
-msgstr "転送キューを消去(&T)"
+msgstr "転送キューをクリア(&T)"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
-msgstr "履歴の消去"
+msgstr "履歴をクリア"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
 #: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
-msgstr "個人情報のクリア"
+msgstr "個人情報をクリア"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
-msgstr "クイック接続バー"
+msgstr "クイック接続バーをクリア"
+
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr "string coalescer を消去"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr "設定を保存し終了するにはクリックしてください。"
+msgstr "設定を保存するには完了をクリックしてください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1096
 msgid "Click on next to download the new version."
-msgstr "最新バージョンをダウンロードするために次へをクリックしてください。"
+msgstr "最新版をダウンロードするには次へをクリックしてください."
 
-#: resources.h:346
+#: resources.h:348
 msgid "Client to server MAC:"
-msgstr "クライアント -> サーバー MAC:"
+msgstr "クライアント -> サーバ MAC:"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
-msgstr "クライアント -> サーバー 暗号化方式:"
+msgstr "クライアント -> サーバ 暗号化方式:"
 
-#: resources.h:663
+#: resources.h:677
 msgid "Close &all other tabs"
-msgstr "その他の全タブを閉じる(&A)"
+msgstr "他のタブをすべて閉じる(&A)"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1105
-#: ../../locales/../src/interface/Mainfrm.cpp:1128
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "FileZilla を閉じる"
 
@@ -1972,25 +1998,25 @@
 msgid "Close all running instances of FileZilla"
 msgstr "すべての実行中の FileZilla インスタンスを終了"
 
-#: resources.h:496
+#: resources.h:505
 msgid "Closes current tab"
 msgstr "現在のタブを閉じる"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "コメント(&M):"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
-msgstr "列の設定"
+msgstr "列のプロパティ"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
 msgstr "列の設定"
 
-#: resources.h:932
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
-msgstr "コマンドと引数は適切な引用符で囲んでください。"
+msgstr "コマンドと引数は引用符で適切に囲む必要があります."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
@@ -2004,11 +2030,11 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr "このプロトコルではコマンドをサポートしていません。"
+msgstr "このプロトコルではコマンドをサポートしていません."
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "コマンド:"
@@ -2024,169 +2050,169 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:426
 #: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
-msgstr "ルータまたはファイヤウォールによって通信を失いました"
+msgstr "ルータまたはファイアウォールによって通信を失いました"
 
-#: resources.h:513 resources.h:641
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
-msgstr "タイムスタンプで比較する(&M)"
+msgstr "修正日時で比較(&M)"
 
-#: resources.h:512 resources.h:640
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
-msgstr "ファイルの大きさで比較する(&S)"
+msgstr "ファイルサイズで比較(&S)"
 
-#: resources.h:912
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
-msgstr "(分ごとの)比較閾値(&T):"
+msgstr "比較の閾値(分)(&T):"
 
 #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
-msgstr "比較閾値は、0から1440分の間にある必要があります。"
+msgstr "比較の閾値は 0 から 1440 分の範囲である必要があります."
 
-#: resources.h:159
+#: resources.h:160
 msgid "Compiled for:"
 msgstr "コンパイル対象:"
 
-#: resources.h:160
+#: resources.h:161
 msgid "Compiled on:"
 msgstr "コンパイル環境:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
-msgstr "コンパイラー:"
+msgstr "コンパイラ:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
-msgstr "コンパイラー フラグ:"
+msgstr "コンパイラ フラグ:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr "圧縮された"
 
-#: resources.h:798
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr "同時転送"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
-msgstr "大文字と小文字を区別する(&A)"
+msgstr "大文字と小文字を区別(&A)"
 
-#: resources.h:706
+#: resources.h:720
 msgid "Configuration test"
 msgstr "設定テスト"
 
-#: resources.h:680
+#: resources.h:694
 msgid "Configure passive mode"
-msgstr "パッシブモードに設定する"
+msgstr "パッシブ モードを設定"
 
-#: resources.h:696
+#: resources.h:710
 msgid "Configure port range"
-msgstr "ポート範囲設定"
+msgstr "ポート範囲を設定"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr "FileZilla とネットワークの設定"
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1033
 msgid "Confirm deletion"
 msgstr "削除の確認"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2030
-#: ../../locales/../src/interface/LocalListView.cpp:2150
-#: ../../locales/../src/interface/RemoteListView.cpp:1666
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1124
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "必要な確認"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:567
 msgid "Congratulations, your configuration seems to be working."
-msgstr "おめでとうございます。設定は正しく機能しているようです。"
+msgstr "おめでとうございます. 設定は正しく機能しているようです."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr "プロキシー設定を無視して接続"
+msgstr "プロキシ設定を無視して接続"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr "指定されたサイト マネージャー サイトに接続"
+msgstr "指定されたサイト マネージャ サイトに接続"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "接続されました"
 
-#: ../../locales/../src/interface/QueueView.cpp:1436
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
-msgstr "接続しています"
+msgstr "接続中"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
 #: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
-msgstr "%s に接続しています"
+msgstr "%s に接続中"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1163
 #, c-format
 msgid "Connecting to %s through proxy"
-msgstr "プロキシー経由で %s に接続しています"
+msgstr "プロキシを通して %s に接続中"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1034
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
-msgstr "%s に接続しています..."
+msgstr "%s に接続中..."
 
 #: ../../locales/../src/interface/updatewizard.cpp:424
 #: ../../locales/../src/interface/updatewizard.cpp:998
 msgid "Connecting to server"
-msgstr "サーバーに接続しています"
+msgstr "サーバに接続中"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:116
 msgid "Connection"
 msgstr "接続"
 
-#: ../../locales/../src/interface/QueueView.cpp:1054
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
-msgstr "接続を試みましたが失敗しました"
+msgstr "接続の試行が失敗しました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1039
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "\"%s\" への接続に失敗しました, 次のアドレスを試します。"
+msgstr "接続の試行が失敗しました: \"%s\", 次のアドレスを試しています."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1044
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "\"%s\" への接続に失敗しました,"
+msgstr "接続の試行が失敗しました: \"%s\"."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
-msgstr "ユーザーによって切断された接続を試みる"
+msgstr "接続の試行がユーザにより中断されました"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:543
 msgid "Connection closed"
-msgstr "接続が閉じました。"
+msgstr "接続が閉じられました."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
-msgstr "サーバーから接続が閉じられました。"
+msgstr "サーバによって接続が閉じられました"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
-msgstr "接続を確立しました, TLS初期化中..."
+msgstr "接続を確立しました, TLS を初期化中..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
-msgstr "接続が確立されました, HTTPリクエストを送っています"
+msgstr "接続を確立しました, HTTP リクエストを送信中です"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
-msgstr "接続が確立されました, ウェルカム メッセージを待っています..."
+msgstr "接続を確立しました, ウェルカム メッセージを待っています..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
@@ -2194,11 +2220,11 @@
 
 #: ../../locales/../src/engine/proxy.cpp:433
 msgid "Connection not allowed by ruleset"
-msgstr "ルール設定により接続が許可されていません"
+msgstr "接続がルールセットにより許可されていません"
 
 #: ../../locales/../src/engine/proxy.cpp:442
 msgid "Connection refused"
-msgstr "接続は拒否されました"
+msgstr "接続が拒否されました."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:681
 msgid "Connection timed out"
@@ -2206,99 +2232,99 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:1070
 msgid "Connection timed out."
-msgstr "接続がタイムアウトしました。"
+msgstr "接続がタイムアウトしました."
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:676
 msgid "Connection to server lost."
-msgstr "サーバーへの接続が切れました。"
+msgstr "サーバへの接続が失われました."
 
 #: ../../locales/../src/engine/proxy.cpp:188
 msgid "Connection with proxy established, performing handshake..."
-msgstr "プロキシーへの接続を確立し、ハンドシェイクを行います..."
+msgstr "プロキシとの接続を確立しました. ハンドシェイクを行っています..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
-msgstr "早々にサーバーとの接続を切断されました。"
+msgstr "サーバとの接続が早々に閉じられました."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:552
 msgid "Connection with the test server failed."
-msgstr "テストサーバーへの接続に失敗しました。"
+msgstr "テスト サーバへの接続に失敗しました."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
 msgstr "鍵ファイルの変換"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "コピー(&Y)"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:646
-#: ../../locales/../src/interface/sitemanager.cpp:1866
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
-msgstr "複製 (%d) 元の %s"
+msgstr "%2$s - コピー (%1$d)"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:623
-#: ../../locales/../src/interface/sitemanager.cpp:1843
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
-msgstr "%s の複製"
+msgstr "%s - コピー"
 
-#: resources.h:587 resources.h:635
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr "選択された項目の URL をクリップボードにコピー."
+msgstr "選択された項目の URL をクリップボードにコピーしてください."
 
 #: ../../locales/../src/engine/transfersocket.cpp:207
 #, c-format
 msgid "Could not accept connection: %s"
-msgstr "接続を受け付けることができません: %s"
+msgstr "接続を受理できませんでした: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:97
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:546
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "サイト マネージャーに追加できません"
+msgstr "サイト マネージャに接続を追加できませんでした"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
-msgstr "サーバーに接続することができませんでした"
+msgstr "サーバに接続できませんでした"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1205
 #, c-format
 msgid "Could not connect to server: %s"
-msgstr "サーバーに接続することができませんでした: %s"
+msgstr "サーバに接続できませんでした: %s"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 msgid "Could not convert command to server encoding"
-msgstr "コマンドをサーバーエンコーディングに変換できません"
+msgstr "コマンドをサーバエンコーディングに変換できません"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 msgid "Could not convert private key"
 msgstr "秘密鍵を変換できません"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3065
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1453
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not copy URLs"
-msgstr "URL をコピーできません"
+msgstr "URL をコピーできませんでした"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
-msgstr "データをコピーできません"
+msgstr "データをコピーできませんでした"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2515
-#: ../../locales/../src/interface/RemoteTreeView.cpp:898
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
-"ドラッグ アンド ドロップ操作の相手を決定することができません。\n"
-"シェル拡張が適切にインストールされいない, またはエクスプローラーのウィンドウ"
-"にファイルをドロップできませんでした。"
+"ドラッグ & ドロップ操作の対象を決定できません.\n"
+"シェル拡張が適切にインストールされてない, またはエクスプローラのウィンドウに"
+"ファイルをドロップできませんでした."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
-msgstr "サーバーとの接続を確立できませんでした"
+msgstr "サーバとの接続を確立できませんでした"
 
 #: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
@@ -2307,51 +2333,52 @@
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"FileZillaのリソースファイルを見つけることができませんでしたので, FileZillaを"
-"終了します。\n"
-"コマンドラインオプション '--datadir <custompath>'を使うか環境変数FZ_DATADIRを"
-"設定することによってFileZillaのデータディレクトリーを設定することができます。"
+"FileZilla のリソース ファイルを見つけられなかったため, FileZilla を終了しま"
+"す.\n"
+"コマンドライン オプション '--datadir <custompath>' を使用するか環境変数 "
+"FZ_DATADIR を設定することで FileZilla のデータ ディレクトリを設定できます."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 msgid "Could not generate custom login sequence."
-msgstr "カスタムログインシーケンスを生成できませんでした。"
+msgstr "カスタムログインシーケンスを生成できませんでした."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 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:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
+"証明書のサブジェクトの識別名を取得できず, gnutls_x509_get_dn に失敗しました"
 
 #: ../../locales/../src/interface/state.cpp:1015
 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:170
 msgid "Could not get reply from fzputtygen."
-msgstr "fzputtygen からの結果を取得できません。"
+msgstr "fzputtygen からの結果を取得できません."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2595
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr ""
-"ダウンロードファイルを入れるためのテンポラリのディレクトリーを取得できませ"
-"ん。"
+"ダウンロードファイルを入れるためのテンポラリのディレクトリを取得できません."
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
-msgstr ""
+msgstr "ピア証明書をインポートできず, gnutls_x509_crt_import に失敗しました"
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
-msgstr ""
+msgstr "ピア証明書の構造を初期化できず, gnutls_x509_crt_init に失敗しました"
 
 #: ../../locales/../src/interface/import.cpp:119
 #: ../../locales/../src/interface/import.cpp:310
@@ -2361,9 +2388,9 @@
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"\"%s\" を読み込むことができませんでしたので, ファイルが適当なものでアクセスで"
-"きることを確認してください。\n"
-"サイト マネージャーで行われた変更は保存されません。"
+"\"%s\" を読み込めなかったため, ファイルが適当なものでアクセスできることを確認"
+"してください.\n"
+"サイト マネージャで行われた変更は保存されません."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
@@ -2380,9 +2407,9 @@
 "s'.\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
-"リモートディレクトリー '%s' に対応するローカルディレクトリーが取得できません"
-"でした.\n"
-"同期ブラウズを無効にしてリモートディレクトリーを変更しますか?"
+"リモート ディレクトリ '%s' に対応するローカル ディレクトリを取得できませんで"
+"した.\n"
+"同期ブラウジングを無効にしてリモート ディレクトリの変更を継続しますか?"
 
 #: ../../locales/../src/interface/state.cpp:381
 #, c-format
@@ -2391,9 +2418,9 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"リモートディレクトリー '%s' に対応するローカルディレクトリーを取得できません"
-"でした.\n"
-"同期ブラウズは無効にされました。"
+"リモート ディレクトリ '%s' に対応するローカル ディレクトリを取得できませんで"
+"した.\n"
+"同期ブラウジングを無効にしました."
 
 #: ../../locales/../src/interface/state.cpp:295
 #, c-format
@@ -2402,172 +2429,191 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"ローカルディレクトリー '%s' に対応するリモートディレクトリーを取得できません"
-"でした.\n"
-"同期ブラウズは無効にされました。"
-
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3065
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1453
+"ローカル ディレクトリ '%s' に対応するリモート ディレクトリを取得できませんで"
+"した.\n"
+"同期ブラウジングを無効にしました."
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not open clipboard"
-msgstr "クリップボードを開けません"
+msgstr "クリップボードを開くことができませんでした"
 
 #: ../../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 "ログ ファイルを開けません: %s"
+msgstr "ログ ファイルを開くことができませんでした: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:67
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
-msgstr "リモートパスを解釈できませんでした。"
+msgstr "リモート パスを構文解析できませんでした."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
-msgstr "サーバーアドレスを解釈できませんでした:"
+msgstr "サーバのアドレスを構文解析できませんでした:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
 #, c-format
 msgid "Could not read from socket: %s"
-msgstr "ソケットからの読み込みができませんでした: %s"
+msgstr "ソケットから読み取ることができませんでした: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2637
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
-msgstr "サーバー アイテムを読み込むことができませんでした。"
+msgstr "サーバの項目を読み取ることができませんでした."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "ファイル内のオフセット %s を探し出せませんでした"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
 msgstr "ファイルの終わりを見つけられませんでした"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
-msgstr "fzputtygen にコマンドを送信できませんでした。"
+msgstr "fzputtygen にコマンドを送信できませんでした."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
-msgstr "IOスレッドを作成できません"
+msgstr "IO スレッドを作成できません"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1178
 #, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "プロキシーハンドシェイクを開始できません: %s"
+msgstr "プロキシ ハンドシェイクを開始できませんでした: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1105
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
-msgstr "転送を始めることができません"
+msgstr "転送を開始できません"
 
-#: ../../locales/../src/interface/sitemanager.cpp:912
-#: ../../locales/../src/interface/sitemanager.cpp:2934
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
-"「%s」に書き込めなかったので、サイト マネージャーはいくつかの変更を保存できま"
-"せん: %s"
+"\"%s\" に書き込むことができず, サイト マネージャへの変更は保存されませんでし"
+"た: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:853
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "「%s」に書き込めなかったので、ブックマークを保存できません: %s"
+msgstr "\"%s\" を書き込めなかったため, ブックマークを追加できませんでした: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:325
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr ""
-"「%s」に書き込めなかったので、グローバル ブックマークを保存できません: %s"
+"\"%s\" を書き込めなかったため, グローバル ブックマークを保存できませんでし"
+"た: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1946
-#: ../../locales/../src/interface/QueueView.cpp:1982
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, 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:2699
-#: ../../locales/../src/interface/sitemanager.cpp:3061
-#: ../../locales/../src/interface/sitemanager.cpp:3123
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr "「%s」に書き込めないので、選択したサイトをエクスポートできません: %s"
+msgstr ""
+"\"%s\" を書き込めなかったため, 選択されたサイトをエクスポートできませんでし"
+"た: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr "「%s」に書き込めません: %s"
+msgstr "\"%s\" を書き込めませんでした: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
-msgstr "鍵ファイルに書き込めません: %s"
+msgstr "鍵ファイルに書き込めませんでした: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1099
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
-msgstr "ローカルのファイルへの書き込みができません"
+msgstr "ローカル ファイルに書き込めませんでした"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
 #, c-format
 msgid "Could not write to log file: %s"
-msgstr "ログ ファイルへの書き込みができません: %s"
+msgstr "ログ ファイルに書き込めませんでした: %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:999
 #: ../../locales/../src/engine/ControlSocket.cpp:1097
 #, c-format
 msgid "Could not write to socket: %s"
-msgstr "ソケットへの書き込みができませんでした: %s"
+msgstr "ソケットに書き込めませんでした: %s"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr "国:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
-msgstr "例外ハンドラをデバックするためだけにFileZillaは即座にクラッシュします"
+msgstr ""
+"FileZilla は即座にクラッシュします. 例外ハンドラをデバッグするためだけに使わ"
+"れます"
 
-#: resources.h:566 resources.h:580 resources.h:629 resources.h:650
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "新しいフィルタを作成できません"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
-msgstr "現在のディレクトリーに新しいサブディレクトリーを作成する"
+msgstr "現在のディレクトリに新しいサブディレクトリを作成"
+
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "現在のディレクトリに新しいサブディレクトリを作成"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1184
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1570
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1275
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
-msgstr "ディレクトリーの作成"
+msgstr "ディレクトリを作成"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "ファイルを編集できません"
 
-#: ../../locales/../src/interface/QueueView.cpp:1509
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
-msgstr "ディレクトリーを作成しています"
+msgstr "ディレクトリを作成しています"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2046
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "ディレクトリー「%s」を作成しています..."
+msgstr "ディレクトリ '%s' を作成中..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
-msgstr "重大なエラー"
+msgstr "致命的なエラー"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:137
 msgid "Critical file transfer error"
-msgstr "重大なファイル転送エラー"
+msgstr "ファイル転送での致命的なエラー"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:120
 #, c-format
 msgid "Critical file transfer error after transferring %s in %s"
-msgstr ""
+msgstr "%s (%s) の転送後にファイル転送の致命的なエラーが発生しました"
 
 #: ../../locales/../src/interface/state.cpp:370
 #, c-format
@@ -2575,63 +2621,68 @@
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"現在のリモートディレクトリー (%s) は同期ルート (%s) の下にありません。\n"
-"同期ブラウズは無効にされました。"
+"現在のリモート ディレクトリ (%s) は同期されるルート (%s) の配下ではありませ"
+"ん.\n"
+"同期ブラウジングを無効にしました."
 
 #: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
-msgstr "現在の転送モードは アスキー に設定されています。"
+msgstr "現在の転送モードは ASCII に設定されています."
 
 #: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
-msgstr "現在の転送モードは 自動認識 に設定されています。"
+msgstr "現在の転送モードは自動検出に設定されています."
 
 #: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
-msgstr "現在の転送モードは バイナリー に設定されています。"
+msgstr "現在の転送モードはバイナリに設定されています."
 
-#: resources.h:769 resources.h:888
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr "カスタム(&T)"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
-msgstr "カスタム フィルター セット"
+msgstr "カスタム フィルタ セット"
 
-#: resources.h:375 resources.h:376
+#: resources.h:377 resources.h:378
 msgid "Custom server"
-msgstr "カスタム サーバー"
+msgstr "カスタム サーバ"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
 msgstr "データの種類(&A)"
 
-#: resources.h:895
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
-msgstr "SI 接頭辞 (例: 1 KB = 1000 Bytes)(&E)"
+msgstr "SI 接頭辞(10進数) (例: 1 KB = 1000 バイト)(&E)"
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
-msgstr "標準(&E)"
+msgstr "既定値(&E)"
 
-#: resources.h:582 resources.h:630 resources.h:660
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "削除(&E)"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
 msgstr "すべて無効にする(&I)"
 
-#: resources.h:919
+#: resources.h:882
+msgid "D&o not save passwords"
+msgstr "パスワードを保存しない(&O)"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
-msgstr "ディレクトリーのダブルクリック(&O):"
+msgstr "ディレクトリをダブルクリックしたときの動作(&O):"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr "DOS形式の仮想パス"
+msgstr "DOS 風の仮想パス"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "危険なファイルの種類"
 
@@ -2642,13 +2693,13 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:985
 #: ../../locales/../src/interface/netconfwizard.cpp:1051
 msgid "Data socket closed too early."
-msgstr "早々にデータソケットは切断されました。"
+msgstr "データ ソケットは早々に閉じられました."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:151
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
 msgid "Date"
 msgstr "日付"
 
-#: resources.h:879
+#: resources.h:895
 msgid "Date formatting"
 msgstr "日付の書式"
 
@@ -2661,65 +2712,64 @@
 #: ../../locales/../src/interface/fileexistsdlg.cpp:134
 #: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
-msgstr "不明な日付/時刻"
+msgstr "日付/時刻 不明"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:141
 msgid "Debug"
 msgstr "デバッグ"
 
-#: resources.h:959
+#: resources.h:975
 msgid "Debugging settings"
 msgstr "デバッグの設定"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
-msgstr "標準のローカル ディレクトリー(&L):"
+msgstr "既定のローカル ディレクトリ(&L):"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
-msgstr "標準 - 自動判別(&A)"
+msgstr "既定値 (自動検出)"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
 msgid "Default editor not properly quoted."
-msgstr "標準のエディターが適切にクォートされていません。"
+msgstr "既定のエディタが引用符で適切に囲まれていません."
 
-#: resources.h:254 resources.h:276 resources.h:851
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
-msgstr "ファイル存在時の標準動作"
+msgstr "既定のファイルが存在したときの動作"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
-msgstr "標準のリモートディレクトリー(&E):"
+msgstr "既定のリモート ディレクトリ(&E):"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1159
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 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:78
 msgid "Default system language"
-msgstr "システムの標準言語"
+msgstr "既定のシステム言語"
 
-#: resources.h:674
+#: resources.h:688
 msgid "Default transfer mode:"
-msgstr "標準転送モード:"
+msgstr "既定の転送モード:"
 
-#: resources.h:820
+#: resources.h:834
 msgid "Default transfer type:"
-msgstr "標準の転送モード:"
+msgstr "既定の転送の種類:"
 
-#: resources.h:693 resources.h:756
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
-msgstr "標準: http://ip.filezilla-project.org/ip.php"
+msgstr "既定値: http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
-msgstr "接続再試行失敗している間の遅れは1から999秒の間になります。"
+msgstr "接続の試行に失敗している間の遅延は 1 から 999 秒の範囲になります."
 
 #: ../../locales/../src/engine/engineprivate.cpp:630
 #, c-format
@@ -2729,143 +2779,144 @@
 msgid_plural ""
 "Delaying connection for %d seconds due to previously failed connection "
 "attempt..."
-msgstr[0] "前回の接続失敗から %d 秒間再接続を遅らせています..."
+msgstr[0] "前回の接続失敗から %d 秒間再接続を遅延させています..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1321
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
-msgstr "サイト マネージャーをエントリーを削除する"
+msgstr "サイト マネージャのエントリを削除"
 
-#: resources.h:631 resources.h:652
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
-msgstr "選択されたディレクトリーを削除"
+msgstr "選択されたディレクトリを削除"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
-msgstr "選択されたファイルとフォルダーを削除"
+msgstr "選択されたファイルとフォルダを削除"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting directories"
-msgstr "ディレクトリーを削除しています"
+msgstr "ディレクトリを削除中"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
-msgstr "無関係な複数ディレクトリーの削除はまだサポートしていません"
+msgstr "関連しない複数のディレクトリの削除には未対応です"
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
-msgstr "シンボリック リンクを削除しています"
+msgstr "シンボリック リンクを削除中"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1055
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "デスクトップ"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "詳細"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "新しい鍵の詳細:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
-msgstr "ディレクトリー(&C)"
+msgstr "ディレクトリ(&C)"
 
-#: ../../locales/../src/interface/queue.cpp:1194
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "方向"
 
 #: ../../locales/../src/interface/filelistctrl.cpp:523
 msgid "Directory"
-msgstr "ディレクトリー"
+msgstr "ディレクトリ"
 
-#: resources.h:638 resources.h:910 resources.h:993
+#: resources.h:652 resources.h:926 resources.h:1009
 #: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2313
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
-msgstr "ディレクトリーの比較"
+msgstr "ディレクトリを比較"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 #: ../../locales/../src/interface/listingcomparison.cpp:82
 #: ../../locales/../src/interface/listingcomparison.cpp:88
 msgid "Directory comparison failed"
-msgstr "ディレクトリーの比較に失敗しました"
+msgstr "ディレクトリの比較に失敗しました"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr "ログ ファイルは存在しないかファイル名が不正です。"
+msgstr ""
+"ログファイルを含むディレクトリが存在しないかファイル名が正しくありません."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "ディレクトリー一覧の表示はユーザーにより中断されました"
+msgstr "ディレクトリ一覧の表示はユーザにより中断されました"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2315
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
-msgstr "ディレクトリー一覧取得に失敗しました"
+msgstr "ディレクトリ一覧取得に失敗しました"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
-msgstr "ディレクトリーリスト フィルター"
+msgstr "ディレクトリ一覧フィルタ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "ディレクトリー一覧の表示成功"
+msgstr "ディレクトリ一覧の表示成功"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "すべて無効にする(&B)"
 
 #: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
-msgstr "同期ブラウズを無効にしてリモートディレクトリーを変更しますか?"
+msgstr "同期ブラウジングを無効にしてリモート ディレクトリの変更を継続しますか?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
-"ファイルが正しく表示されない場合は、このオプションを無効にしてください。"
+"ファイルが正しく表示されない場合は, このオプションを無効にしてください."
 
-#: resources.h:986
+#: resources.h:1002
 msgid "Disconnect from server"
-msgstr "サーバーからの切断"
+msgstr "サーバから切断"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1052
-#: ../../locales/../src/interface/QueueView.cpp:1096
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
-msgstr "サーバーから切断されました"
+msgstr "サーバから切断されました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1134
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
-msgstr "サーバーから切断されました: %s"
+msgstr "サーバから切断されました: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1411
+#: ../../locales/../src/interface/QueueView.cpp:1429
 #: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
-msgstr "以前のサーバーから切断しています"
+msgstr "以前のサーバから切断しています"
 
-#: resources.h:987
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
-msgstr "現在見えているサーバーから切断"
+msgstr "現在表示されているサーバから切断"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "ダイアログについて表示"
 
-#: resources.h:928
+#: resources.h:944
 msgid "Do &not use default editor"
-msgstr "標準のエディタを利用しない(&N)"
+msgstr "既定のエディタを使用しない(&N)"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "何もしない(&N)"
 
@@ -2875,60 +2926,59 @@
 "Do you really want to check for beta versions?\n"
 "Unless you want to test new features, keep using stable versions."
 msgstr ""
-"本当にベータバージョンが欲しいですか？\n"
-"新機能をテストしたいのでなければ,安定バージョンを使い続けてください。"
+"本当にベータ版をチェックしますか?\n"
+"新機能をテストしたい場合以外は, 安定版の使用を継続してください."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
-msgstr "本当に 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 "本当にすべてのサイト マネージャー エントリを削除してもいいですか?"
+msgstr "サイト マネージャのすべてのエントリを本当に削除しますか?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1323
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
-msgstr "本当に選択されたエントリを削除してもいいですか?"
+msgstr "選択されたエントリを本当に削除しますか?"
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
-msgstr "本当に転送キューを削除しますか？"
+msgstr "転送キューを本当に削除しますか?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr "本当に' %s 'をサーバーに送りますか?"
+msgstr "'%s' をサーバに本当に送信しますか?"
 
-#: resources.h:465
+#: resources.h:467
 msgid "Documentation"
 msgstr "ドキュメント"
 
-#: resources.h:695
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
-msgstr "ローカル接続には外部 IP アドレスを使用しない(&L)"
+msgstr "ローカル接続に外部 IP アドレスを使用しません(&L)"
 
-#: resources.h:831
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr ""
-"ドットファイルとはファイル名が . で始まっているものです (例: .htaccess)。"
+msgstr "ドット ファイルはファイル名がドットで始まっているもの, 例: .htaccess"
 
-#: resources.h:913
+#: resources.h:929
 msgid "Double-click action"
 msgstr "ダブルクリック時の動作"
 
-#: resources.h:361
+#: resources.h:363
 msgid "Download"
 msgstr "ダウンロード"
 
-#: resources.h:481 resources.h:807
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
-msgstr "ダウンロード制限(&L)"
+msgstr "ダウンロード制限(&L):"
 
 #: ../../locales/../src/interface/statusbar.cpp:604
 #, c-format
@@ -2939,130 +2989,121 @@
 msgid "Download limit: none"
 msgstr "ダウンロード制限: なし"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 msgid "Download search results"
-msgstr "検索結果のダウンロード"
+msgstr "検索結果をダウンロード"
 
-#: resources.h:625
+#: resources.h:639
 msgid "Download selected directory"
-msgstr "選択したディレクトリーをダウンロード"
+msgstr "選択したディレクトリをダウンロード"
 
-#: resources.h:573
+#: resources.h:583
 msgid "Download selected files and directories"
-msgstr "選択したファイルとディレクトリーをダウンロード"
+msgstr "選択したファイルとディレクトリをダウンロード"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
-msgstr "ダウンロードしています"
+msgstr "ダウンロード中"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
 #: ../../locales/../src/interface/updatewizard.cpp:415
 #, c-format
 msgid "Downloading %s"
-msgstr "%s をダウンロードしています"
+msgstr "%s をダウンロード中"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
-msgstr "無関係な複数ディレクトリーのダウンロードはまだサポートしていません"
+msgstr "関連しない複数のディレクトリのダウンロードには未対応です"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading search results"
-msgstr "検索結果をダウンロードしています"
+msgstr "検索結果をダウンロード中"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
-msgstr ""
-"FileZillaの違うインスタンス間でのドラッグ アンド ドロップはまだ実装されていま"
-"せん."
+msgstr "FileZilla の異なるインスタンス間でのドラッグ & ドロップは未実装です."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
-msgstr "違うサーバー間でのドラッグ アンド ドロップはまだ実装されていません。"
-
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "フィルター名が重複しています"
+msgstr "異なるサーバ間でのドラッグ & ドロップは未実装です."
 
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "すべて有効にする(&N)"
 
-#: resources.h:559 resources.h:576
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
-msgstr "ディレクトリーに入る(&N)"
+msgstr "ディレクトリを入力(&N)"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "実行(&X)"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "終了(&X)"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "E-Mail:"
-msgstr "電子メール:"
+msgstr "メール:"
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
-msgstr "それぞれのフィルターは少なくとも1つの条件を必要とします。"
+msgstr "各フィルタは少なくとも 1 つの条件を必要とします."
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
-msgstr "フィルターを編集"
+msgstr "フィルタを編集"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
-msgstr ""
-"設定されたエディタでファイルを編集しサーバーに変更をアップロードします。"
+msgstr "設定されたエディタでファイルを編集しサーバに変更をアップロードします."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1975
-#: ../../locales/../src/interface/LocalListView.cpp:1986
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Editing failed"
-msgstr "編集に失敗しました"
+msgstr "編集に失敗"
 
-#: resources.h:876
+#: resources.h:892
 msgid "Email:"
-msgstr "電子メール:"
+msgstr "メール:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2221
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
 msgstr "空コマンド"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
 msgid "Empty command."
-msgstr "空コマンドです。"
+msgstr "コマンドが空です."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2317
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
-msgstr "空のディレクトリー一覧取得"
+msgstr "空のディレクトリ一覧"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:26
 msgid "Empty directory."
-msgstr "空のディレクトリー"
+msgstr "ディレクトリが空です."
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
-msgstr "ファイルの拡張子を空にする"
+msgstr "ファイルの拡張子を空です."
 
 #: ../../locales/../src/interface/filteredit.cpp:206
 #: ../../locales/../src/interface/filteredit.cpp:248
 msgid "Empty filter names are not allowed."
-msgstr "空のフィルター名は認められていません。"
+msgstr "空のフィルタ名は認められていません."
 
 #: ../../locales/../src/interface/filteredit.cpp:206
 #: ../../locales/../src/interface/filteredit.cpp:248
@@ -3071,76 +3112,76 @@
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
 msgid "Empty quoted string."
-msgstr "空は文字を囲む。"
+msgstr "引用符で囲まれた文字列を空にします."
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "すべて有効にする(&A)"
 
-#: resources.h:816
+#: resources.h:830
 msgid "Enable invalid character &filtering"
-msgstr "不正な文字のフィルタリングを有効にする(&F)"
+msgstr "正しくない文字のフィルタリングを有効にする(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr "暗号化された"
 
-#: resources.h:343
+#: resources.h:345
 msgid "Encryption"
 msgstr "暗号化"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
 msgstr "暗号化の詳細"
 
 #: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
-msgstr "比較を終了して、ソート順を変更しますか？"
+msgstr "比較を終了してソート順を変更しますか?"
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
-msgstr "カスタム コマンドの入力(&C)..."
+msgstr "カスタム コマンドを入力(&C)..."
 
-#: resources.h:485
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
-msgstr "0 を入力すると速度無制限です。"
+msgstr "速度を無制限にするには 0 を入力してください."
 
-#: ../../locales/../src/interface/QueueView.cpp:2210
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
-msgstr "コマンドの入力"
+msgstr "コマンドを入力"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:572
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
-msgstr "カスタム コマンドの入力"
+msgstr "カスタム コマンドを入力"
 
-#: resources.h:920
+#: resources.h:936
 msgid "Enter directory"
-msgstr "ディレクトリーに入る"
+msgstr "ディレクトリに入る"
 
 #: ../../locales/../src/interface/filteredit.cpp:134
 #: ../../locales/../src/interface/filteredit.cpp:194
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Enter filter name"
-msgstr "フィルター名を入力してください"
+msgstr "フィルタ名を入力"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
-msgstr "フィルター セットの名前を入力してください"
+msgstr "フィルタ セット名を入力"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
-msgstr "新しいフィルター セットの名前を入力してください"
+msgstr "フィルタ セットの新しい名前を入力"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
-msgstr "パスワードの入力"
+msgstr "パスワードを入力"
 
-#: resources.h:560 resources.h:577
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
-msgstr "選択されたディレクトリーに入る"
+msgstr "選択されたディレクトリに入る"
 
-#: resources.h:715
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3149,12 +3190,11 @@
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
 "here, the values in the other fields will be overwritten then."
 msgstr ""
-"サーバーのアドレスを入力してください。\n"
-"サーバープロトコルを特定するためにプロトコル識別子のついたホストを追加して下"
-"さい.もしプロトコルが特定されていなければ, 標準プロトコル(ftp://) が使用され"
-"ます。\n"
-"ここではフォームの中に完全なURL protocol://user:pass@host:port も入力すること"
-"ができ, その時は他のフィールドの値は書き換えられます。"
+"サーバのアドレスを入力してください.\n"
+"サーバ プロトコルを指定するにはホストの前にプロトコル識別子を追加してくださ"
+"い. プロトコルを指定しない場合は既定のプロトコル (ftp://) を使用します.\n"
+"ここではフォームに protocol://user:pass@host:port 形式の完全な URL も入力で"
+"き, その場合は他の欄の値が上書きされます."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3162,103 +3202,109 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
-"'%s' のパスワードを入力してください。\n"
-"変換後のファイルはパスワード保護されない事にご注意ください。"
+"ファイル '%s' のパスワードを入力してください.\n"
+"変換後のファイルはパスワード保護されないことにご注意ください."
 
-#: resources.h:719
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
 msgstr ""
-"サーバーの受け付けているポートを入力してください。\n"
-"FTPの標準は21番で、SFTPの標準は22番です。"
+"サーバが待ち受けているポートを入力してください.\n"
+"FTP の既定値は 21, SFTP の既定値は 22 です."
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
 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:38
 #: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
-msgstr "取り込みエラー"
+msgstr "インポート エラー"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:167
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:294
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:726
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:767
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:816
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/QueueView.cpp:2052
+msgid "Error loading queue"
+msgstr "キューの読み込みエラー"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
 #: ../../locales/../src/interface/import.cpp:120
 #: ../../locales/../src/interface/import.cpp:311
-#: ../../locales/../src/interface/Options.cpp:212
-#: ../../locales/../src/interface/QueueView.cpp:1936
-#: ../../locales/../src/interface/QueueView.cpp:1963
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:736
-#: ../../locales/../src/interface/sitemanager.cpp:889
-#: ../../locales/../src/interface/sitemanager.cpp:2100
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2774
-#: ../../locales/../src/interface/sitemanager.cpp:2880
-#: ../../locales/../src/interface/sitemanager.cpp:3000
-#: ../../locales/../src/interface/sitemanager.cpp:3087
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
-msgstr "xmlファイルの読み込みエラー"
+msgstr "xml ファイルの読み込みエラー"
+
+#: ../../locales/../src/interface/QueueView.cpp:1951
+msgid "Error saving queue"
+msgstr "キューの保存エラー"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
-msgstr "プログラム起動エラー"
+msgstr "プログラムの開始エラー"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:326
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:854
-#: ../../locales/../src/interface/QueueView.cpp:1947
-#: ../../locales/../src/interface/QueueView.cpp:1983
-#: ../../locales/../src/interface/sitemanager.cpp:913
-#: ../../locales/../src/interface/sitemanager.cpp:2700
-#: ../../locales/../src/interface/sitemanager.cpp:2935
-#: ../../locales/../src/interface/sitemanager.cpp:3062
-#: ../../locales/../src/interface/sitemanager.cpp:3124
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
-msgstr "xmlファイルの書き込みエラー"
+msgstr "xml ファイルの書き込みエラー"
 
 #: ../../locales/../src/interface/updatewizard.cpp:335
 msgid "Error, file name cannot be parsed."
-msgstr "エラーです。ファイル名を解析できませんでした。"
+msgstr "エラー, ファイル名を構文解析できません."
 
 #: ../../locales/../src/interface/updatewizard.cpp:351
 msgid "Error, local file exists but cannot be removed"
-msgstr "エラーです。ローカルにファイルは存在しますが、削除できません"
+msgstr "エラー, ローカル ファイルは存在しますが削除できません"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "エラー:"
 
-#: resources.h:477
+#: resources.h:479
 msgid "Establish connection in a new tab"
-msgstr "新しいタブで接続を確立する"
+msgstr "新規タブで接続を確立"
 
-#: resources.h:939
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "例: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:898
+#: resources.h:914
 msgid "Examples"
 msgstr "例"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "実行(&C)"
 
@@ -3266,78 +3312,88 @@
 msgid "Executable"
 msgstr "実行可能"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1749
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
-"実行可能なものはバージョン情報を含んでおらず, アップデートをチェックできませ"
-"ん."
+"実行ファイルがバージョン情報を含んでいないため更新をチェックできません."
 
-#: resources.h:858
+#: resources.h:872
 msgid "Explorer"
-msgstr "エクスプローラー"
+msgstr "エクスプローラ"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
-msgstr "キューの書き出し(&Q)"
+msgstr "キューをエクスポート(&Q)"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
-msgstr "設定を書き出します(&S)"
+msgstr "設定をエクスポート(&S)"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
-msgstr "設定を書き出します"
+msgstr "設定をエクスポート"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
-msgstr "フィルター名(&I):"
+msgstr "フィルタ名(&I):"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1634
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - ファイル転送プロトコル"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - ファイル転送プロトコル (任意の暗号化付き)"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - セキュアではないファイル転送プロトコル"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
-msgstr "FTPエンジンは初期化されておらず,接続できません"
+msgstr "FTP エンジンが初期化されていないため接続できません"
 
-#: resources.h:743
+#: resources.h:757
 msgid "FTP Keep-alive"
-msgstr "FTP キープアライブ"
+msgstr "FTP キープ アライブ"
 
-#: resources.h:763
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
-msgstr "FTP プロキシー"
+msgstr "FTP プロキシ"
 
 #: ../../locales/../src/interface/cmdline.cpp:19
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:671
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
-"FTPはデータ転送において２次的に使われます。この付加的接続は２通りで確立するこ"
-"とができます。"
+"FTP はデータ転送に二次的な接続を使用します. これらの付加的な接続は 2 通りの方"
+"法で確立できます."
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
-msgstr "FTPES - 明示的なTLS/SSL上のFTP"
+msgstr "FTPES - 明示的な TLS/SSL 上の FTP"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr "FTPS - 暗黙のTLS/SSL上のFTP"
+msgstr "FTPS - 暗黙の TLS/SSL 上の FTP"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:615
-#: ../../locales/../src/interface/LocalListView.cpp:2271
-#: ../../locales/../src/interface/LocalTreeView.cpp:913
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
-msgstr "ディレクトリー変更に失敗しました"
+msgstr "ディレクトリ変更に失敗しました"
 
 #: ../../locales/../src/interface/FileZilla.cpp:259
 #: ../../locales/../src/interface/FileZilla.cpp:267
@@ -3348,182 +3404,186 @@
 
 #: ../../locales/../src/interface/updatewizard.cpp:453
 msgid "Failed to check for newer version of FileZilla."
-msgstr "FileZillaの新しいバージョンのチェックに失敗しました。"
+msgstr "FileZilla の新しいバージョンのチェックに失敗しました."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
 msgstr "サイトのコピーまたは移動に失敗しました"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:511
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr "xmlファイルの複製の作成に失敗しました"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:791
 msgid "Failed to create listen socket, aborting"
-msgstr "リッスンソケットの生成に失敗しました。中止しています。"
+msgstr "リッスン ソケットの生成に失敗しました. 中止しています."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "アクティブモード転送のためのリスニングソケット生成に失敗しました。"
+msgstr "アクティブ モード転送のためのリスニング ソケット生成に失敗しました."
 
 #: ../../locales/../src/interface/updatewizard.cpp:455
 msgid "Failed to download the latest version of FileZilla."
-msgstr "最新バージョンのFileZillaのダウンロードに失敗しました。"
+msgstr "最新版の FileZilla のダウンロードに失敗しました."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:667
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
-msgstr "'マイ ドキュメント'のパス取得に失敗しました"
+msgstr "'マイ ドキュメント' のパス取得に失敗しました"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:653
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
 msgstr "デスクトップへのパスの取得に失敗しました"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:950
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
-"コントロール接続のピアアドレスの取得に失敗しましたので, 接続を閉じました。"
+"コントロール接続のピアアドレスの取得に失敗しましたので, 接続を閉じました."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:958
 msgid "Failed to get peer address of data connection, connection closed."
-msgstr "データ接続のピアアドレスの取得に失敗しましたので, 接続を閉じました。"
+msgstr "データ接続のピアアドレスの取得に失敗しましたので, 接続を閉じました."
 
 #: ../../locales/../src/interface/context_control.cpp:77
 msgid "Failed to initialize FTP engine"
-msgstr "FTPエンジンの初期化に失敗しました。"
+msgstr "FTPエンジンの初期化に失敗しました."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
-msgstr "TLSの初期化に失敗しました。"
+msgstr "TLS の初期化に失敗しました."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
-msgstr "パネルのロードに失敗しました。リソースファイルが不適切ですか？"
+msgstr "パネルのロードに失敗しました. リソース ファイルが正しくありませんか?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
 msgstr "秘密鍵の読み込みに失敗しました: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr "追加/編集用に「%s」を開けませんでした。"
+msgstr "追加/書き込み用に \"%s\" を開くのに失敗しました"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "読み込み用に「%s」を開けませんでした"
+msgstr "読み取り用に \"%s\" を開くのに失敗しました"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "書き込み用に「%s」を開けませんでした"
+msgstr "書き込み用に \"%s\" を開くのに失敗しました"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+msgid "Failed to parse returned path."
+msgstr "返されたパスの構文解析に失敗しました."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
-msgstr "震災されたルート証明書の解析に失敗しました。"
+msgstr "信用されたルート証明書の構文解析に失敗しました."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:1014
 msgid "Failed to receive data"
-msgstr "データの受信に失敗しました。"
+msgstr "データの受信に失敗しました."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
-msgstr "ディレクトリー一覧表示の取得に失敗しました。"
+msgstr "ディレクトリ一覧表示の取り出しに失敗しました"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "外部IPアドレスの取得に失敗しました。中止しています。"
+msgstr "外部 IP アドレスの取得に失敗しました. 中止しています"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
-msgstr "外部 IP アドレスの取得に失敗しました。ローカルのアドレスを使用します"
+msgstr ""
+"外部 IP アドレスの取得に失敗しましたので, ローカル アドレスを使用しています"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
-msgstr "ローカルの IP アドレスの取得に失敗しました。"
+msgstr "ローカル IP アドレスの取得に失敗しました."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "ローカル IP アドレスの取得に失敗しました。中止しています。"
+msgstr "ローカル IP アドレスの取得に失敗しました. 中止しています"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
-msgstr "外部 IP アドレスの取得に失敗しました。"
+msgstr "外部 IP アドレスの取得に失敗しました."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
-msgstr "コマンドの送信に失敗しました。"
+msgstr "コマンドの送信に失敗しました."
 
 #: ../../locales/../src/interface/FileZilla.cpp:267
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
-msgstr "%s (%s) への言語設定に失敗しました, 標準のシステム言語を利用します"
+msgstr "%s (%s) への言語設定に失敗しました, 既定のシステム言語を使用します"
 
 #: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr ""
-"%s (%s) への言語設定に失敗しました, 標準のシステム言語 (%s, %s) を利用します"
+"%s (%s) への言語設定に失敗しました, 既定のシステム言語 (%s, %s) を使用します."
 
 #: ../../locales/../src/interface/FileZilla.cpp:240
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
-msgstr "%s (%s) への言語設定に失敗しました, 標準のシステム言語を利用します。"
+msgstr "%s (%s) への言語設定に失敗しました, 既定のシステム言語を利用します."
 
 #: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
-msgstr "%s への言語設定に失敗しました, 標準のシステム言語を利用します"
+msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します"
 
 #: ../../locales/../src/interface/FileZilla.cpp:248
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
-msgstr "%s への言語設定に失敗しました, 標準のシステム言語を利用します (%s, %s)"
+msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します (%s, %s)"
 
 #: ../../locales/../src/interface/FileZilla.cpp:237
 #, c-format
 msgid "Failed to set language to %s, using default system language."
-msgstr "%s への言語設定に失敗しました, 標準のシステム言語を利用します。"
+msgstr "%s への言語設定に失敗しました, 既定のシステム言語を使用します."
 
 #: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
 msgstr "設定を有効にするのに失敗しました"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:896
 msgid "Failed to verify peer certificate"
-msgstr "データの受信に失敗しました。"
+msgstr "ピア証明書の検証に失敗しました"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
 msgstr "ファイル %s への書き込みに失敗しました"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:529
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "xmlファイルへの書き込みに失敗しました"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
-msgstr "転送失敗"
+msgstr "失敗した転送"
 
-#: resources.h:686
+#: resources.h:700
 msgid "Fall back to active mode"
-msgstr "アクティブモードに戻る"
+msgstr "アクティブ モードに戻る"
 
-#: resources.h:368
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "ファイル(&E):"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "ファイル(&E)"
 
@@ -3539,13 +3599,13 @@
 
 #: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr "ファイルは取り込み可能なデータを含んでいません。"
+msgstr "ファイルはインポートできるデータを含んでいません."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
-msgstr "ファイル編集"
+msgstr "ファイルの編集"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1874
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "ファイルが存在します"
 
@@ -3553,7 +3613,7 @@
 msgid "File exists action"
 msgstr "ファイル存在時の動作"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
 msgstr "ファイルは変更されています"
 
@@ -3561,263 +3621,272 @@
 msgid "File lists"
 msgstr "ファイル一覧"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/FileZilla.cpp:702
 #: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "ファイルが見つかりません"
 
-#: resources.h:997
+#: resources.h:1013
 msgid "File search"
 msgstr "ファイル検索"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
 msgid "File transfer aborted by user"
-msgstr "転送はユーザーにより中断されました"
+msgstr "ファイル転送はユーザによって中断されました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
-msgstr "%2$s に対し、%1$s バイトの転送後、ユーザーの操作により中止しました。"
+msgstr "%s (%s) の転送後にユーザによりファイル転送が中止されました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
-msgstr "ファイルの転送が失敗しました"
+msgstr "ファイル転送に失敗しました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
-msgstr "%2$s に対し、%1$s バイトの転送後、失敗しました。"
+msgstr "%s (%s) の転送後にファイル転送が失敗しました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
 msgid "File transfer skipped"
-msgstr "ファイルの転送を飛ばしました。"
+msgstr "ファイル転送はスキップされました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
-msgstr "ファイルの転送が成功しました。"
+msgstr "ファイル転送が成功しました"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:115
 #, c-format
 msgid "File transfer successful, transferred %s in %s"
-msgstr "%2$s に対して %1$s バイト転送し、ファイルの転送が成功しました。"
+msgstr "%s (%s) のファイル転送に成功しました"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1107
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
-msgstr "ファイル転送の途中です。"
+msgstr "ファイル転送はまだ進行中です."
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
-msgstr "ファイルはアスキー形式で転送されます。"
+msgstr "ファイルはデータの種類 ASCII で転送されます."
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
-msgstr "ファイルはバイナリー形式で転送されます。"
+msgstr "ファイルはデータの種類バイナリで転送されます."
 
 #: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
-msgstr "FileZilla エラー"
+msgstr "Filezilla エラー"
 
-#: resources.h:708
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
+msgstr "FileZilla ではすべての設定が適切か確認するために設定をテストできます."
+
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
 msgstr ""
-"すべてが適切に設定されていることを保障するために今すぐFileZillaは設定をテスト"
-"することができる。"
 
-#: resources.h:476
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
-msgstr "FileZilla は既にサーバーへ接続しています。"
+msgstr "FileZilla は既にサーバに接続されています."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:446
-#: ../../locales/../src/interface/sitemanager.cpp:1069
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
 msgstr ""
-"FileZilla は キオスクモードで動作しています。\n"
-"'通常' と 'アカウント' のログオン種類はこのモードでは使用できません。"
+"FileZilla はキオスク モードで動作しています.\n"
+"ログオンの種類 '通常' と 'アカウント' はこのモードでは利用できません."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1494
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
-msgstr "言語設定を反映するには FileZilla を再起動する必要があります。"
+msgstr "言語設定を有効にするには, FileZilla を再起動する必要があります."
 
-#: resources.h:516
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "ファイル一覧のステータス バー(&B)"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:126
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "ファイル名"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
-msgstr "ファイル名のフィルター(&F)..."
+msgstr "ファイル名のフィルタ(&F)..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2309
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
-"ファイル名にはディレクトリー %s と ファイル名 %s を含めることはできません"
+"ファイル名にはディレクトリ %s とファイル名 %s を含めることはできません."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1860
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "ファイル名が不正です"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "ファイル名には次の文字は使用できません: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "ファイル名は変更されませんでした"
 
-#: resources.h:306 resources.h:952
+#: resources.h:308 resources.h:968
 msgid "Filename:"
 msgstr "ファイル名:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1363
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
-msgstr "ファイル名に次の文字は使えません: / * ? < > |"
+msgstr "ファイル名には次の文字は使用できません: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1338
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
-msgstr "ファイル名に次の文字は使えません: / \\ : * ? \" < > |"
+msgstr "ファイル名には次の文字は使用できません: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "編集中のファイルがあります"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:131
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
-msgstr "ファイルの大きさ"
+msgstr "ファイルサイズ"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
 msgid "Filesize format"
-msgstr "ファイルの大きさの書式"
+msgstr "ファイルサイズの書式"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "ファイルの種類"
 
-#: resources.h:940
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr "ファイルの種類関連付け"
+msgstr "ファイルの種類の関連付け"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
-msgstr "フィルター適用先:"
+msgstr "フィルタの適用先:"
 
-#: resources.h:815
+#: resources.h:829
 msgid "Filter invalid characters in filenames"
-msgstr "ファイル名の不正文字フィルタリング"
+msgstr "ファイル名の不正な文字をフィルタ"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
-msgstr "フィルター名はすでに存在しています"
+msgstr "フィルタ名は既に存在しています"
 
-#: resources.h:220
+#: resources.h:222
 msgid "Filter out items matching all of the following"
-msgstr "次の全項目に一致したものを除外する"
+msgstr "以下のすべてに一致する項目を非表示"
 
-#: resources.h:221
+#: resources.h:223
 msgid "Filter out items matching any of the following"
-msgstr "次の項目のいずれかに一致したものを除外する"
+msgstr "以下のいずれかに一致する項目を非表示"
 
-#: resources.h:222
+#: resources.h:224
 msgid "Filter out items matching none of the following"
-msgstr "次の項目のいずれかに一致したものを除外する"
+msgstr "以下のどれにも一致しない項目を非表示"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
-msgstr "フィルター セットはすでに存在しています"
+msgstr "フィルタ セットは既に存在しています"
 
-#: resources.h:990
+#: resources.h:1006
 msgid "Filter the directory listings"
-msgstr "ディレクトリー一覧表示フィルター"
+msgstr "ディレクトリ一覧をフィルタ"
 
 #: ../../locales/../src/interface/filteredit.cpp:338
 #: ../../locales/../src/interface/filteredit.cpp:347
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter validation failed"
-msgstr "フィルターの検証に失敗しました"
+msgstr "フィルタの検証に失敗しました"
 
 #: resources.h:9 resources.h:33
 msgid "Fingerprint (MD5):"
-msgstr "指紋(MD5):"
+msgstr "拇印 (MD5):"
 
 #: resources.h:10 resources.h:34
 msgid "Fingerprint (SHA-1):"
-msgstr "指紋(SHA-1):"
+msgstr "拇印 (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
-msgstr "指紋:"
+msgstr "拇印:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
 msgstr "ファイアウォールとルータ設定ウィザード"
 
-#: resources.h:726
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
-"これらのオプション設定に関するより詳細な情報のためにネットワーク接続ウィザー"
-"ドを起動してください。"
+"これらのオプションについての詳細情報を得るには, ネットワーク設定ウィザードを"
+"起動してください."
 
-#: resources.h:703
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr "信頼性確保のために、少なくとも10ポートの範囲指定が必要です。"
+msgstr "信頼性確保のために, 少なくとも 10 ポートの範囲指定が必要です."
 
-#: ../../locales/../src/interface/Options.cpp:211
-#, fuzzy
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
-msgstr ""
-"\"%s\"が読み込めません。ファイルが適当か確認してください。 \n"
-"このセッションにおいては, 標準設定が利用され変更された設定については持続され"
-"ません。"
+msgstr "このセッションでは既定の設定を使用します. 設定の変更は保存されません."
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
-msgstr "UTF-8 を強制する(&U)"
+msgstr "&UTF-8 を強制"
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
-msgstr "強制的に隠しファイルの表示(&H)"
+msgstr "強制的に隠しファイルを表示(&H)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:652
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
-msgstr "強制的に隠しファイルの表示"
+msgstr "強制的に隠しファイルを表示"
 
-#: resources.h:770
+#: resources.h:784
 msgid "Format specifications:"
-msgstr "フォーマット仕様:"
+msgstr "書式の仕様:"
 
-#: resources.h:938
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
-msgstr "書式: 拡張子は適切に引用されるコマンドおよび引数に依ります。"
+msgstr "書式: 拡張子の後に適切に引用符で囲まれたコマンドと引数が続きます."
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
-msgstr "更に詳しいドキュメント"
+msgstr "さらに詳しいドキュメント"
 
 #: resources.h:78
 msgid "General"
@@ -3825,248 +3894,248 @@
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
-msgstr "一般的な SOCKS サーバーの問題"
+msgstr "SOCKS サーバの一般エラー"
 
-#: resources.h:788
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr "一般プロキシー"
+msgstr "汎用プロキシ"
 
-#: resources.h:692
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
-msgstr "以下の URL から外部 IP アドレスを取得する:"
+msgstr "以下の URL から外部 IP アドレスを取得:"
 
-#: resources.h:469
+#: resources.h:471
 msgid "Getting help"
-msgstr "ヘルプを得る"
+msgstr "ヘルプを取得"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
-"指定のフィルター セット名は既に存在します。フィルターセットを上書きしますか?"
+"入力されたフィルタ セット名は既に存在しています. フィルタ セットを上書きしま"
+"すか?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:253
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr "グローバル ブックマーク"
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "グループ パーミッション"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
-msgstr "高い(&I)"
+msgstr "高(&I)"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP over TLS"
 
-#: resources.h:339
+#: resources.h:341
 msgid "Hash:"
 msgstr "ハッシュ:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr "隠された"
 
-#: resources.h:813 ../../locales/../src/interface/queue.cpp:901
-#: ../../locales/../src/interface/queue.cpp:982
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "高い"
 
-#: ../../locales/../src/interface/queue.cpp:903
-#: ../../locales/../src/interface/queue.cpp:984
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "最高"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 msgid "Highest available port has to be a number between 1024 and 65535."
-msgstr ""
-"使用するポート番号の上限値は 1024 番から 65535 番の間の数でなければいけませ"
-"ん。"
+msgstr "利用できるポートの最大値は 1024 から 65535 の範囲である必要があります."
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
-"シフトキーを押しながらチェック状態を切り替えると、両方同時に変更されます。"
+"フィルタの状態を両側同時に切り替えるには, Shift キーを押したままにしてくださ"
+"い."
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr "ホームページ:"
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
-msgstr "ホスト鍵の指紋:"
+msgstr "ホスト鍵の拇印:"
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "ホスト鍵が一致しません"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
-msgstr "ホスト名が '[' で始まっていますが閉じられていません。"
+msgstr "ホストが '[' で始まっていますが閉じ括弧がありません."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr "ホストへ到達できません"
+msgstr "ホストに到達できません"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "ホスト:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
-msgstr "時間、"
+msgstr "時間,"
 
-#: resources.h:887
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
-msgstr "I&SO 8601 (例: 15:47)(&S)"
+msgstr "I&SO 8601 (例: 15:47)"
 
-#: resources.h:730
-#, fuzzy
+#: resources.h:744
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
-"この時間の間にデータが送受信されていないのであれば,接続が閉じておりFileZilla"
-"は再接続するでしょう。"
+"操作中に指定された時間を超えてもデータが送受信されない場合は, 接続が切断され"
+"て FileZilla は再接続を試みます."
 
-#: resources.h:968
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
-"バグを報告していただく場合は,\"詳細\"ロギングレベルのログ提供をお願いします。"
+"バグを報告していただく場合は, ログ レベル \"詳細\" のログ提供をお願いします."
 
-#: resources.h:683
+#: resources.h:697
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
 "you should try active mode. You can set the transfer mode on a per-server "
 "basis in the Site Manager."
 msgstr ""
-"もしウィザードの最後で自動テストが成功していて特定のサーバーに対してファイル"
-"を転送できないのであれば,サーバーの設定が間違っているかもしれませんのでアク"
-"ティブモードで試行してみてください。サイト マネージャーのサーバーごとの基本設"
-"定で転送モードを設定することができます。"
+"ウィザードの最後で自動テストが成功していて特定のサーバに対してファイルを転送"
+"できない場合は, サーバの設定が間違っているかもしれないためアクティブ モードを"
+"試してください. サイト マネージャのサーバごとの基本設定で転送モードを設定でき"
+"ます."
 
-#: resources.h:678
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
-"フォールバックオプションを有効にするなら, 選択された転送モードを拒否する設定"
-"の間違ったサーバーに接続することができるでしょう。"
+"フォールバック オプションを有効にすれば, 選択された転送モードを拒否する設定の"
+"間違ったサーバに接続できるでしょう."
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
-msgstr ""
+msgstr "予期せずホスト鍵が変更された場合は, サーバの管理者に連絡してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:554
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"あるルーター、またはファイアウォールが FileZilla をブロックし続け、その問題が"
-"継続する場合。"
+"問題が続く場合は, ルータ/ファイアウォールが FileZilla をブロックしているかも"
+"しれません."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"あるルーター、またはファイアウォールが接続に割り込み続け、その問題が継続する"
-"場合。"
+"問題が続く場合は, ルータ/ファイアウォールが接続を中断しているかもしれません."
 
-#: resources.h:957
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
-"ログ ファイルのサイズが制限値に達したら, 末尾に \".1\" を追加したファイル名に"
-"変更して新しいファイルを作ります。(古いログ ファイルは上書きされる可能性があ"
-"ります)"
+"ログファイルのサイズが制限に達した場合は, ファイル名の末尾に \".1\" を追加し"
+"た名前に変更 (古いログファイルを上書きするかもしれません) して新規ファイルを"
+"作成します."
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
+"シンボリックリンクがディレクトリを指している場合, FileZilla はシンボリックリ"
+"ンクまたはリンクされたディレクトリの内容のどちらかを削除できます."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:624
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
 msgstr ""
-"この問題が出続けるのであれば,解決のためにルータもしくはファイアウォールの製造"
-"者に連絡してください。"
+"この問題が続く場合は, 解決のためにルータまたはファイアウォールの製造者に連絡"
+"してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr "この問題が残る場合、ルーター製造者に連絡してください。"
+msgstr "この問題が残るようであれば, ルータの製造者に連絡を取ってください."
 
-#: resources.h:277 resources.h:852
+#: resources.h:279 resources.h:866
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
-"'新しければ上書き'を使う場合は, システム時刻はサーバーと同期していなければい"
-"けません。もし時刻が異なっている(たとえばタイムゾーン)なら, サイト マネー"
-"ジャーでタイムゾーンのオフセットを明確にしてください。"
+"'新しければ上書き' を使用する場合は, システム時刻はサーバと同期している必要が"
+"あります. 時刻が異なっている場合 (例: 異なるタイムゾーン) は, サイト マネー"
+"ジャでタイムゾーンのオフセットを指定してください."
 
-#: resources.h:911
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
-"タイムスタンプベースの比較を使う時に, これらのタイムスタンプの違いが閾値未満"
-"であれば2つのファイルは同一であると見なします。"
+"タイムスタンプに基づいた比較を行う場合, タイムスタンプの差分がこの閾値を超え"
+"ない場合は 2 つのファイルが同一と見なします."
 
-#: resources.h:926
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
-msgstr "言語を変更した場合、FileZilla の再起動が必要です。"
+msgstr "言語を変更すると, FileZilla の再起動が必要です."
 
-#: resources.h:709
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
-"テストをクリックしたら,FileZillaはprobe.filezilla-project.orgに接続し簡単なテ"
-"ストを実施します。"
+"テストをクリックすると, FileZilla は probe.filezilla-project.org に接続して簡"
+"単なテストを行います."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
-msgstr "FileZilla を終了すると、変更内容は破棄されます。"
+msgstr "FileZilla を終了すると, 変更内容は破棄されます."
 
-#: resources.h:828
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
-"間違ったファイルの種類を入力すると、転送時にファイルを破損してしまうかもしれ"
-"ません。"
+"間違ったファイルの種類を入力すると, 転送時にファイルを破損してしまうかもしれ"
+"ません."
 
-#: resources.h:710
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
-msgstr "もし、いくつかのエラーが出るなら設定は正しくありません。"
+msgstr "エラーが出る場合は, 設定が正しくありません."
 
-#: resources.h:742
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"ディレクトリー一覧取得もしくはファイル転送に問題があるなら, 標準の転送モード"
-"に切り替えてみます。"
+"ディレクトリ一覧取得またはファイル転送に問題があれば, 既定の転送モードへの変"
+"更を試してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:569
 msgid ""
@@ -4074,117 +4143,125 @@
 "remote router or firewall might be misconfigured. In this case try to toggle "
 "passive mode and contact the server administrator for help."
 msgstr ""
-"特定のサーバーに問題がおき続けているなら,サーバー自身もしくはリモートルータ, "
-"ファイヤウォールの設定に間違いがあるかも知れません。この場合,パッシブモードへ"
-"の切り替えを試みたり、サーバー管理者に問い合わせてみてください。"
+"特定のサーバでの問題が続く場合は, サーバ自身またはリモート ルータ, ファイア"
+"ウォールの設定が間違っているかもしれません. この場合, パッシブ モードへの切り"
+"替えを試したり, サーバ管理者に問い合わせてみてください."
 
-#: resources.h:669
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"ウィザードがうまく完了しテストが最終テストが成功したなら, あなたのルータや"
-"ファイアウォールは適切に設定されていると思われます。"
+"ウィザードを正しく完了して最終テストに成功すると, お持ちのあらゆるファイア"
+"ウォール/ルータが正しく設定されているはずです."
 
-#: resources.h:705
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
-"もしファイアウォールを利用しているなら,もちろんFileZillaはすべてのポートにお"
-"いて接続を受けることを認めます。"
+"ファイアウォールを利用している場合は, FileZilla が入力されたすべてのポートで"
+"の接続の受理を許可することを確認してください."
 
-#: resources.h:704
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"もしルータを利用しているなら,もちろん全てのポートはFileZillaの動いているマシ"
-"ンに転送されます。"
+"ルータを利用している場合は, すべてのポートが FileZilla が動作しているマシンに"
+"転送されることを確認してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
 msgstr ""
-"ルータのIPアドレスがコロコロからるなら,ルータの製造者に連絡を取ってください。"
+"ルータの IP アドレスが変化し続けるのであれば, ルータの製造者に連絡を取ってく"
+"ださい."
 
 #: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
-msgstr "古いバージョンからデータを取り込みます"
+msgstr "古いバージョンからデータをインポート"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
-msgstr "取り込み設定"
+msgstr "設定をインポート"
 
 #: ../../locales/../src/interface/import.cpp:81
 #: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
-msgstr "取り込み成功"
+msgstr "インポート成功"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
 msgid "Improperly quoted association."
-msgstr "不適切に引用された関連付け."
+msgstr "引用符で不適切に囲まれた関連付け."
 
-#: resources.h:697
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
-"アクティブモードで,FileZillaはデータ転送のためにポートを開かなければいけませ"
-"ん.FileZillaの使うポートを指定しなければいけません。"
+"アクティブ モードで, FileZilla はデータ転送のためにポートを開く必要がありま"
+"す. FileZilla が使用するポートを指定する必要があります."
 
-#: resources.h:699
+#: resources.h:713
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
-"ルータがある場合は,システムの選んだポートにFileZillaは影響を持たないものとし"
-"て,すべての可能なすべてのポートに転送すべきでしょう。"
+"ルータがある場合は, システムが選択したポートに FileZilla は関与しないものとし"
+"て, すべての利用できるポートに転送すべきでしょう."
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
-"自動的にアップデートを参照したい時は, 設定ダイアログの自動アップデートチェッ"
-"クを有効にしてください。"
+"自動的に更新を参照したい時は, 設定ダイアログの自動更新チェックを有効にしてく"
+"ださい."
 
-#: resources.h:687 resources.h:751
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
-"アクティブモードを使うために, FileZillaは外部IPアドレスを知る必要があります。"
+"パッシブ モードを使用するために FileZilla は外部 IP アドレスを知る必要があり"
+"ます."
 
-#: resources.h:672
+#: resources.h:686
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
-"多くのユーザーに推奨されるパッシブモードでFileZillaはサーバーにポートを要求"
-"し,与えられたポートに接続します。ほとんどの設定はこのために行われなければいけ"
-"ません."
+"大部分のユーザに推奨のパッシブ モードでは, FileZilla はサーバにポートを要求し"
+"て入力されたポートに接続します. ほとんどの設定はこのために行われる必要があり"
+"ます."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
+"不完全な証明書パスです, top certificate is not self-signed certificate "
+"authority certificate"
 
-#: ../../locales/../src/interface/QueueView.cpp:1048
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
-msgstr "パスワードが間違っています"
+msgstr "パスワードが正しくありません"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr "TLS を初期化しています..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "FTP over TLS に未対応のセキュアではないサーバです."
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "インタラクティブ"
 
@@ -4193,18 +4270,18 @@
 msgstr "インタフェース"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1005
-#: ../../locales/../src/interface/QueueView.cpp:1579
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
-msgstr "ユーザーにより中断されました"
+msgstr "ユーザにより中断されました"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
-msgstr "不適切なコンテンツ長"
+msgstr "正しくないコンテンツ長"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:623
 msgid "Invalid HTTP Response"
-msgstr "不適切なHTTPレスポンス"
+msgstr "正しくない HTTP レスポンス"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:544
 #: ../../locales/../src/engine/ControlSocket.cpp:604
@@ -4212,47 +4289,49 @@
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
-"UTF-8を無効にした不適切な文字列を受信しました。サイト マネージャーでUTF-8を選"
-"択して強制的にUTF-8にしてください。"
+"正しくない文字シーケンスを受信したため, UTF-8 を無効にしました. UTF-8 を強制"
+"するにはサイト マネージャで UTF-8 オプションを選択してください."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
-msgstr "不適切なチャンクサイズ"
+msgstr "正しくないチャンク サイズ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:353
 #: ../../locales/../src/interface/netconfwizard.cpp:363
 #: ../../locales/../src/interface/netconfwizard.cpp:372
 msgid "Invalid data received"
-msgstr "不適切なデータを受信しました。"
+msgstr "正しくないデータを受信しました."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:32
 #: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
-msgstr "不適切な日付"
+msgstr "正しくない日付"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1338
-#: ../../locales/../src/interface/LocalListView.cpp:1363
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "ファイル名が適切ではありません"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
-msgstr "不正なホスト, 閉じ括弧の後は ':' とポート番号が続きます。"
+msgstr ""
+"正しくないホストです, after closing bracket only colon and port may follow."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
-msgstr "不正な入力"
+msgstr "正しくない入力"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
-"不適切なポートが与えられました。ポートは1から65535の間の値でなくてはいけませ"
-"ん."
+"正しくないポートが入力されました. ポートは 1 から 65535 の範囲である必要があ"
+"ります."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4260,170 +4339,176 @@
 "ftps:// for FTP over SSL (implicit) and\n"
 "ftpes:// for FTP over SSL (explicit)."
 msgstr ""
-"不適切なプロトコルが指定されています。適切なプロトコルは:\n"
-"普通のFTPでは ftp:// ,\n"
-"SSHを用いたファイル転送プロトコルでは sftp:// ,\n"
-"FTP over SSL（明示）では ftps:// ,\n"
-"FTP over SSL(暗黙）では ftpes:// ."
+"正しくないプロトコルが指定されています. 正しいプロトコルは:\n"
+"通常の FTP では ftp:// ,\n"
+"SSH を用いたファイル転送プロトコルでは sftp:// ,\n"
+"FTP over SSL (明示的) では ftps:// ,\n"
+"FTP over SSL (暗黙) では ftpes:// ."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"正しくないホストです, after closing bracket only colon and port may follow."
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Invalid regular expression in search conditions."
-msgstr "検索条件の正規表現が正しくありません。"
+msgstr "検索条件内に正しくない正規表現があります."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
-msgstr "不適切な応答コード"
+msgstr "正しくないレスポンス コード"
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:692
 #, c-format
 msgid "Invalid search conditions: %s"
-msgstr "検索条件が正しくありません: %s"
+msgstr "正しくない検索条件: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2569
-#: ../../locales/../src/interface/sitemanager.cpp:2589
-#: ../../locales/../src/interface/sitemanager.cpp:2606
-#: ../../locales/../src/interface/sitemanager.cpp:2613
-#: ../../locales/../src/interface/sitemanager.cpp:2620
-#: ../../locales/../src/interface/sitemanager.cpp:2637
-#: ../../locales/../src/interface/sitemanager.cpp:2786
-#: ../../locales/../src/interface/sitemanager.cpp:3012
-#: ../../locales/../src/interface/sitemanager.cpp:3019
-#: ../../locales/../src/interface/sitemanager.cpp:3099
-#: ../../locales/../src/interface/sitemanager.cpp:3106
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
-msgstr "サイト パスが正しくありません"
+msgstr "正しくないサイト パス"
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
-msgstr "サイズの条件が正しくありません"
+msgstr "状態におけるサイズが正しくありません"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
-msgstr "指定のユーザー名は正しくありません。"
+msgstr "正しくないユーザ名が入力されました."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Jurisdiction country:"
-msgstr "管轄の国籍"
+msgstr "管轄する国:"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction locality:"
-msgstr "管轄の所在:"
+msgstr "管轄する地方:"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
-msgstr "管轄州または行政区:"
+msgstr "管轄する都道府県:"
 
-#: resources.h:908
+#: resources.h:924
 msgid "Keep directories on top"
-msgstr "ディレクトリーは常に先頭"
+msgstr "ディレクトリを常に先頭に"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"もしこのオプションを有効にしているなら全てのサーバーがこの機能をサポートして"
-"いるわけではなく誤った一覧を返すかもしれないことに留意してください。FileZilla"
-"はこの機能をサポートするサーバーでテストとチェックを行っていますが,テストは失"
-"敗するかもしれません。"
+"このオプションを有効にするとすべてのサーバがこの機能をサポートしているわけで"
+"はなく誤った一覧を返すかもしれないことに留意してください. FileZilla はサーバ"
+"がこの機能に対応しているか確認するテストを行っていますが, テストは失敗するか"
+"もしれません."
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
 msgstr "鍵交換"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "最低(&O)"
 
-#: resources.h:924
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "言語"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1494
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
-msgstr "言語設定が変更されました"
+msgstr "言語が変更されました"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
-msgstr "最終修正日"
+msgstr "最終更新日時"
 
-#: resources.h:855
+#: resources.h:869
 msgid "Layout"
 msgstr "レイアウト"
 
-#: resources.h:801
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
-msgstr "同時ダウンロード数上限(&D):"
+msgstr "同時ダウンロード数の上限(&D):"
 
-#: resources.h:803
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
-msgstr "同時アップロード数上限(&U):"
+msgstr "同時アップロード数の上限(&U):"
 
-#: resources.h:746
+#: resources.h:760
 msgid "Limit local ports"
-msgstr "ローカルポートを制限する"
+msgstr "ローカル ポートを制限"
 
-#: resources.h:954
+#: resources.h:970
 msgid "Limit size of logfile"
-msgstr "ログ ファイルのサイズ制限"
+msgstr "ログファイルの制限サイズ"
 
-#: resources.h:955
+#: resources.h:971
 msgid "Limit:"
 msgstr "制限:"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
-msgstr "行の長さを上回りました"
+msgstr "行の長さを超えました"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
-msgstr "リンクされているライブラリー"
+msgstr "リンクされたもの"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:267
 msgid "Listen socket closed"
-msgstr "リッスンソケットを閉じました"
+msgstr "リッスン ソケットが閉じました"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "リスト:"
 
-#: resources.h:749
+#: resources.h:763
 msgid "Lo&west available port:"
-msgstr "使用するポート番号の下限値(&W):"
+msgstr "利用できるポートの最小値(&W):"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "ローカル"
 
-#: resources.h:363
+#: resources.h:365
 msgid "Local file"
-msgstr "ローカル ファイル:"
+msgstr "ローカル ファイル"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
-msgstr "ローカル ファイルが存在しません。"
+msgstr "ローカル ファイルが存在しません."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
-msgstr "ローカル ファイルはファイルではなくディレクトリーです。"
+msgstr "ローカル ファイルが通常ファイルではなくディレクトリです."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:365
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:369
 msgid "Local file is not a valid filename."
-msgstr "適切な XML ファイルではないため、ファイルが読み込めません。"
+msgstr "ローカル ファイルが正しいファイル名ではありません."
 
-#: resources.h:202
+#: resources.h:204
 msgid "Local filters:"
-msgstr "ローカル フィルター:"
+msgstr "ローカル フィルタ:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "ローカル サイト:"
 
@@ -4435,39 +4520,42 @@
 msgid "Log file"
 msgstr "ログ ファイル"
 
-#: resources.h:250
+#: resources.h:252
 msgid "Log of update check:"
-msgstr "更新ログの確認:"
+msgstr "更新チェックのログ:"
 
-#: resources.h:949
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
-msgstr "ログ記録"
+msgstr "ログ記録中"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
-"ログインデータには非アスキー文字が含まれており,サーバーはUTF-8に気付かないか"
-"も知れません。プロキシーを使用しているためローカル文字セットに戻せません。"
+"ログイン データが非 ASCII 文字を含んでいて, サーバは UTF-8 に気付かないかも知"
+"れません. プロキシを使用しているためローカル文字セットに戻せません."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
-"ログインデータには非アスキー文字が含まれていてサーバーはUTF-8に気付かないかも"
-"知れません。ローカル文字セットをタイプしてください。"
+"ログイン データが非 ASCII 文字を含んでいて, サーバは UTF-8 に気付かないかも知"
+"れません. ローカル文字セットを試しています."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
-"ログイン シーケンス は完了しましたが,ログインしていません。中止しています。"
+"ログイン シーケンスは完了しましたが, まだログインしていません. 中止していま"
+"す."
 
 #: ../../locales/../src/interface/cmdline.cpp:95
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
-msgstr "ログオンの種類は「ask」か「interactive」のどちらかです。"
+msgstr ""
+"ログオンの種類は '尋ねる' または 'インタラクティブ' (引用符なし) である必要が"
+"あります."
 
 #: ../../locales/../src/interface/cmdline.cpp:10
 #, c-format
@@ -4475,31 +4563,31 @@
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
+"ログオンの種類は FTP URL と同時に指定する必要があります. 引数は '%s' と '%s' "
+"のどちらかである必要があります."
 
-#: ../../locales/../src/interface/queue.cpp:896
-#: ../../locales/../src/interface/queue.cpp:977
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "低い"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "最低"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 msgid "Lowest available port has to be a number between 1024 and 65535."
-msgstr ""
-"使用するポート番号の下限値は1024番から65535の間の数でなければいけません。"
+msgstr "利用できるポートの最小値は 1024 から 65535 の範囲である必要があります."
 
 #: resources.h:20 resources.h:44
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
-"ファイルがアクセス可能で整形された XML ドキュメントであることを確認してくださ"
-"い."
+"ファイルにアクセスでき, それが整形式の XML 文書であることを確認してください."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
@@ -4507,178 +4595,178 @@
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 #, c-format
 msgid "Malformed chunk data: %s"
-msgstr "不正なチャンク データ: %s"
+msgstr "正しくないチャンクデータ: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 #, c-format
 msgid "Malformed header: %s"
-msgstr "不正なヘッダー: %s"
+msgstr "正しくないヘッダ: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:593
 msgid "Malformed reply, server not sending proper line endings"
-msgstr "不適切な応答, サーバーは適切な改行を送っていません。"
+msgstr "正しくない応答です, サーバが適切な改行文字を送信しません"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#: ../../locales/../src/interface/manual_transfer.cpp:365
+#: resources.h:395 ../../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
 msgid "Manual transfer"
 msgstr "手動転送"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
-msgstr "すべての条件に一致する"
+msgstr "すべての条件に一致"
 
-#: resources.h:434
+#: resources.h:436
 msgid "Match any of the following"
-msgstr "いずれかに一致する"
+msgstr "いずれかの条件に一致"
 
-#: resources.h:435
+#: resources.h:437
 msgid "Match none of the following"
-msgstr "一致しない"
+msgstr "どの条件にも一致しない"
 
-#: resources.h:799
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr "最大同時転送数(&T):"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1826
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
 msgstr "メッセージ ログ"
 
-#: resources.h:866
+#: resources.h:880
 msgid "Message log position"
 msgstr "メッセージ ログの位置"
 
-#: resources.h:956
+#: resources.h:972
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "分"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
-msgstr "下へ移動(&D)"
+msgstr "下に移動(&D)"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
-msgstr "上へ移動(&U)"
+msgstr "上に移動(&U)"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1074
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "マイ コンピュータ"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1064
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "マイ ドキュメント"
 
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:725
-#: ../../locales/../src/interface/sitemanager.cpp:2140
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "自分のサイト"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
 msgid "N/a"
-msgstr "何もありません"
+msgstr "利用不可"
 
-#: resources.h:398
+#: resources.h:400
 msgid "Name"
 msgstr "名前"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:708
-#: ../../locales/../src/interface/sitemanager.cpp:1288
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
-msgstr "その名前はすでに存在しています"
+msgstr "名前は既に存在しています"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:831
-#: ../../locales/../src/interface/sitemanager.cpp:3036
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
-msgstr "その名前のブックマークはすでに存在しています。"
+msgstr "ブックマーク名は既に存在しています."
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "名前:"
 
 #: ../../locales/../src/interface/filteredit.cpp:347
 msgid "Need to enter filter name"
-msgstr "フィルター名を入力する必要があります"
+msgstr "フィルタ名を入力する必要があります"
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:682
 msgid "Need to enter valid remote path"
-msgstr "正しいリモートパスを入力する必要があります"
+msgstr "正しいリモート パスを入力する必要があります"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1103
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
-msgstr "文字エンコーディングを明確にする必要があります"
+msgstr "文字エンコーディングを指定する必要があります"
 
 #: ../../locales/../src/engine/proxy.cpp:436
 msgid "Network unreachable"
-msgstr "ネットワークへ到達できません"
+msgstr "ネットワークに到達できません"
 
 #: resources.h:73
 msgid "New &Folder"
-msgstr "新しいフォルダー(&F)"
+msgstr "新規フォルダ(&F)"
 
-#: resources.h:493
+#: resources.h:502
 msgid "New &tab"
 msgstr "新規タブ(&T)"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
-msgstr "新しいブックマーク(&M)"
+msgstr "新規ブックマーク(&M)"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:53
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:67
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:74
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:81
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:91
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:97
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:106
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:448
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:540
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:546
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:552
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:575
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:831
-#: ../../locales/../src/interface/sitemanager.cpp:2477
-#: ../../locales/../src/interface/sitemanager.cpp:3036
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
-msgstr "新しいブックマーク"
+msgstr "新規ブックマーク"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1192
-#: ../../locales/../src/interface/RemoteListView.cpp:1584
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1289
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
-msgstr "新しいディレクトリー"
+msgstr "新規ディレクトリ"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
-msgstr "%s の新機能と改善点"
+msgstr "%s での新機能と改善点"
 
 #: ../../locales/../src/interface/filteredit.cpp:129
 msgid "New filter"
-msgstr "新規フィルター"
+msgstr "新規フィルタ"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1017
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
-msgstr "新規フォルダー"
+msgstr "新規フォルダ"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2453
-#: ../../locales/../src/interface/sitemanager.cpp:2899
-#: ../../locales/../src/interface/sitemanager.cpp:2913
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "新規サイト"
 
-#: resources.h:864
+#: resources.h:878
 msgid "Next to the transfer queue"
 msgstr "転送キューの隣"
 
@@ -4688,217 +4776,215 @@
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "No category to export selected"
-msgstr "選択されたものを書き出すーカテゴリがありません"
+msgstr "選択されたものをエクスポートするカテゴリがありません"
 
-#: ../../locales/../src/interface/QueueView.cpp:2221
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
-msgstr "コマンドが指定されていないため、中止します。"
+msgstr "コマンドが入力されていません. 中止しています."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
-msgstr "外部IPアドレスが設定されていないため、標準設定で試みます。"
+msgstr "外部 IP アドレスが設定されていないため, 既定値を試しています."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "現在編集中のファイルはありません"
 
 #: ../../locales/../src/interface/filteredit.cpp:141
 msgid "No filter name given"
-msgstr "フィルター名が入力されていません"
+msgstr "フィルタ名が入力されていません"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
-msgstr "ホストが与えられませんでした。ホストを入力してください。"
+msgstr "ホストが入力されていません. ホストを入力してください."
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
-msgstr "利用可能なイメージがありません"
+msgstr "利用できる画像はありません"
 
-#: ../../locales/../src/interface/QueueView.cpp:3064
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
-msgstr "キューにファイルはありません！"
+msgstr "キューにファイルはありません!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
-msgstr "フィルター セットの名前がありません。"
+msgstr "フィルタ セット名が入力されていません."
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
-msgstr "ファイルの種類にプログラムが関連付けられていません"
+msgstr "ファイルの種類に関連付けられたプログラムがありません"
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
-msgstr "拡張子 '%s' に関連付けられたプログラムがありません。"
+msgstr "拡張子 '%s' のファイルの編集に関連付けられたプログラムはありません."
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:540
 msgid "No search results"
-msgstr "検索結果がありません"
+msgstr "検索結果なし"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2106
-#: ../../locales/../src/interface/sitemanager.cpp:2118
-#: ../../locales/../src/interface/sitemanager.cpp:2149
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
-msgstr "利用可能なサイトがありません"
+msgstr "利用できるサイトがありません"
 
 #: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
-msgstr "対応していない SOCKS5 認証メソッドです"
+msgstr "対応した SOCKS5 認証メソッドがありません"
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr "ユーザー名が入力されていません。"
+msgstr "ユーザ名が入力されていません."
 
-#: resources.h:918 resources.h:923
+#: resources.h:934 resources.h:939
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "なし"
 
-#: resources.h:373
+#: resources.h:375
 msgid "None selected yet"
-msgstr "何も選択されていません"
+msgstr "まだ何も選択されていません"
 
-#: resources.h:812 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/queue.cpp:899
-#: ../../locales/../src/interface/queue.cpp:980
-#: ../../locales/../src/interface/sitemanager.cpp:1395
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "通常"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:323
-#: ../../locales/../src/interface/queueview_failed.cpp:348
-#, fuzzy
+#: ../../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 "すべての項目は表示/編集を必要とすることはありません。"
+msgstr "表示/編集のキューに再び入れられない項目がありました."
 
 #: ../../locales/../src/interface/state.cpp:199
 #: ../../locales/../src/interface/state.cpp:504
 msgid "Not connected"
-msgstr "接続していません"
+msgstr "未接続"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2313
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
-msgstr "どのサーバーにも接続されていません"
+msgstr "どのサーバにも接続されていません"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:560
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
-msgstr "どのサーバーにも接続されていません"
+msgstr "どのサーバにも接続されていません."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:27
 msgid "Not connected."
-msgstr "接続していません。"
+msgstr "未接続です."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:654
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
-msgstr ""
-"この特徴はFTPプロトコルの利用のみがサポートされているということを知らせていま"
-"す。"
+msgstr "この機能は FTP プロトコルのみに対応していることにご注意ください."
 
-#: resources.h:780
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
-msgstr "注意: これは暗号化されていないFTP接続つまり,平文でのみ機能します。"
+msgstr "注意: これは平文 (暗号化されていない FTP 接続) のみで機能します."
 
-#: resources.h:797
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
-msgstr "注意: 一般プロキシー使用時は強制的にパッシブモードFTP接続になります。"
+msgstr ""
+"注意: 汎用プロキシを使用すると FTP 接続でパッシブ モードが強制されます."
 
-#: resources.h:897
+#: resources.h:913
 msgid "Number of decimal places:"
-msgstr "小数点以下の表示桁数:"
+msgstr "小数点以下の桁数:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
-msgstr "再試行回数は0から99になります。"
+msgstr "再試行回数は 0 から 99 になります."
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "ファイルを開く(&P)"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:723
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:679
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
-"有効になっている場合, 次のページで選択された転送モードはフォールバックモード"
-"として設定されます。"
+"有効になっている場合, 次のページで選択された転送モードはフォールバック モード"
+"として設定されます."
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 msgid "Once"
 msgstr "一度だけ"
 
-#: resources.h:948
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
-msgstr "FileZilla と お使いの OS のバージョンだけがサーバーに送信されます。"
+msgstr "FileZilla とご使用の OS のバージョンだけがサーバに送信されます."
 
-#: resources.h:648
+#: resources.h:662
 msgid "Open directory in system's file manager"
-msgstr "システムのファイル マネージャーのディレクトリーを開く"
+msgstr "システムのファイル マネージャのディレクトリを開く"
 
-#: resources.h:970 resources.h:971
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
-msgstr "サイト マネージャーを開く"
+msgstr "サイト マネージャを開く"
 
-#: resources.h:562
+#: resources.h:572
 msgid "Open the file."
-msgstr "ファイルを開きます。"
+msgstr "ファイルを開きます."
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
-msgstr "FileZillaの設定ダイアログを開く"
+msgstr "FileZilla の設定ダイアログを開く"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
 msgstr "開かれています:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2052
-#: ../../locales/../src/interface/LocalListView.cpp:2097
-#: ../../locales/../src/interface/LocalListView.cpp:2184
-#: ../../locales/../src/interface/LocalListView.cpp:2197
-#: ../../locales/../src/interface/RemoteListView.cpp:2634
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
-msgstr "ファイルが開けません"
+msgstr "開くのに失敗"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr "新規タブで開く"
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
-msgstr "サイト マネージャーを開く"
+msgstr "サイト マネージャを開く"
 
-#: resources.h:991
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
-"ディレクトリー一覧のフィルターダイアログを開きます。右クリックでフィルターを"
-"切り替えられます。"
+"ディレクトリ一覧のフィルタ ダイアログを開きます. 右クリックでフィルタの ON/"
+"OFF を切り替えます."
 
-#: resources.h:170
+#: resources.h:172
 msgid "Operating system"
 msgstr "オペレーティング システム"
 
 #: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
-msgstr "オペレーティングシステムの問題が検知されました"
+msgstr "オペレーティング システムの問題が検知されました"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
@@ -4908,63 +4994,63 @@
 msgid "Other:"
 msgstr "その他:"
 
-#: resources.h:725
+#: resources.h:739
 msgid "Overview"
 msgstr "概要"
 
 #: resources.h:59
 msgid "Overwrite &if source newer"
-msgstr "転送元が新しい場合は上書きする(&I)"
+msgstr "新しいければ上書き(&I)"
 
-#: resources.h:259 resources.h:269 resources.h:835 resources.h:844
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 msgid "Overwrite file"
-msgstr "ファイルを上書きする"
+msgstr "ファイルに上書き"
 
-#: resources.h:261 resources.h:271 resources.h:837 resources.h:846
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 msgid "Overwrite file if size differs"
-msgstr "ファイルの大きさが異なる場合は上書きする"
+msgstr "サイズが異なればファイルに上書き"
 
-#: resources.h:262 resources.h:272 resources.h:838 resources.h:847
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 msgid "Overwrite file if size differs or source file is newer"
-msgstr "転送元が新しいかファイルの大きさが異る場合は上書きする"
+msgstr "サイズが異なるか元のファイルが新しければファイルに上書き"
 
-#: resources.h:260 resources.h:270 resources.h:836 resources.h:845
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 msgid "Overwrite file if source file newer"
-msgstr "転送元ファイルが新しい場合は上書きする"
+msgstr "元のファイルが新しければファイルに上書き"
 
 #: resources.h:60
 msgid "Overwrite if &different size"
-msgstr "大きさが異なる場合は上書きする"
+msgstr "サイズが異なる場合は上書き(&D)"
 
 #: resources.h:61
 msgid "Overwrite if different si&ze or source newer"
-msgstr "大きさが異なるか、転送元が新しい場合は上書きする(&Z)"
+msgstr "サイズが異なるか元のファイルが新しければ上書き(&Z)"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
-msgstr "所有者権限"
+msgstr "所有者のパーミッション"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
-msgstr "オーナ/グループ"
+msgstr "所有者/グループ"
 
-#: resources.h:869
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
-msgstr ""
+msgstr "転送中や他の操作中にシステムがアイドル スリープに入るのを回避(&R)"
 
-#: resources.h:777 resources.h:793
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
-msgstr "プロキシー ホスト(&R):"
+msgstr "プロキシ ホスト(&R):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
-msgstr "ルータまたはファイヤウォールによってPORTコマンドは失われました。"
+msgstr "ルータまたはファイアウォールによって PORT コマンドは失われました."
 
-#: resources.h:739
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
 msgstr "パッシブ(推奨)(&S)"
 
@@ -4972,240 +5058,240 @@
 msgid "Package"
 msgstr "パッケージ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2458
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
-msgstr "パラメータは有効な URL ではない"
+msgstr "パラメータは有効な URL ではありません"
 
-#: resources.h:84 resources.h:382 resources.h:717
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
 msgstr "パスワード(&W):"
 
-#: resources.h:675
+#: resources.h:689
 msgid "Passive (recommended)"
-msgstr "パッシブ(推奨)"
+msgstr "パッシブ (推奨)"
 
-#: resources.h:759
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
-msgstr "パッシブモード"
+msgstr "パッシブ モード"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:588
 #: ../../locales/../src/interface/netconfwizard.cpp:601
 #: ../../locales/../src/interface/netconfwizard.cpp:612
 msgid "Passive mode has been set as default transfer mode."
-msgstr "パッシブモードが標準の転送モードとして設定されています。"
+msgstr "パッシブ モードが既定の転送モードとして設定されています."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
 msgstr "パスワードが必要"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:146
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "パス"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2354
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
-msgstr ""
-"パス名には、ディレクトリー %s と サブディレクトリー %s を含めることはできませ"
-"ん"
+msgstr "パスにはディレクトリ %s とサブディレクトリ %s を含めることはできません"
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
 msgstr "パス"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
-msgstr "中断を削除する"
+msgstr "保留を取り除く"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:141
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "パーミッション"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "パーミッション"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
 msgstr "プラットフォーム:"
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
 msgstr ""
-"FileZillaの最新バージョンをhttp://filezilla-project.orgでチェックしてくださ"
-"い."
+"FileZilla の最新版を http://filezilla-project.org でチェックしてください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
 "Please check on http://filezilla-project.org/probe.php that the server is "
 "running and carefully check your settings again."
 msgstr ""
-"http://filezilla-project.org/probe.php 上でサーバーの挙動をチェックし再度注意"
-"深く設定をチェックしてください。"
+"http://filezilla-project.org/probe.php 上でサーバの挙動をチェックして再度注意"
+"深く設定をチェックしてください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1076
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
-"パッケージの更新のためにシステムのパッケージマネージャーをチェックするか"
-"FileZillaのソースコードをダウンロードするために http://filezilla-project.org "
-"を訪問してください。"
+"パッケージの更新のためにシステムのパッケージ マネージャをチェックするか "
+"FileZilla のソース コードをダウンロードするために http://filezilla-project."
+"org を訪問してください."
 
-#: resources.h:681
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
-"ファイアウォールとルータを設定してください。するとFileZillaは任意のポートに対"
-"して対外的な接続を確立します。"
+"FileZilla が任意のポートに対して対外的な接続を確立できるように, ファイア"
+"ウォールやルータを設定してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
 msgstr ""
-"ルータ上の'DMZモード'や'ゲームモード'のような設定を無効にしてください。"
+"ルータ上の 'DMZ モード' や 'ゲーム モード' のような設定を無効にしてください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
-#, fuzzy
 msgid ""
 "Please ensure you have a stable internet connection and carefully check your "
 "settings again."
 msgstr ""
-"安定したインターネット接続を保証し http://filezilla-project.org/probe.php 上"
-"でサーバーの挙動をチェックしてください。"
+"安定したインターネット接続があることを確認して設定を再度注意深く確認してくだ"
+"さい."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
 msgid "Please enter a custom date format."
-msgstr "カスタムの日時書式を入力してください"
+msgstr "日付のカスタム書式を入力してください."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
-msgstr "カスタムの時刻書式を入力してください"
+msgstr "時刻のカスタム書式を入力してください."
 
 #: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
-msgstr ""
+msgstr "日付を YYYY-MM-DD の形式で入力してください. 例: 2010-07-18"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../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:134
 msgid "Please enter a name for the new filter."
-msgstr "新しいフィルターの名前を入力してください。"
+msgstr "新しいフィルタの名前を入力してください."
 
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Please enter a new name for the copied filter."
-msgstr "複製されたフィルターの新しい名前を入力してください。"
+msgstr "複製されたフィルタの新しい名前を入力してください."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
-msgstr "フィルター セット「%s」の新しい名前を入力してください。"
+msgstr "フィルタ セット \"%s\" の新しい名前を入力してください"
 
 #: ../../locales/../src/interface/filteredit.cpp:194
 msgid "Please enter a new name for the filter."
-msgstr "フィルターの新しい名前を入力してください。"
+msgstr "フィルタの新しい名前を入力してください."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
 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:105
 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:97
 msgid ""
 "Please enter a number between 1 and 10 for the number of concurrent "
 "transfers."
-msgstr "同時転送の上限数として1から10の間の数字を入力してください。"
+msgstr "同時転送の上限数として 1 から 10 の数字を入力してください."
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
-msgstr "このサーバーのパスワードを入力してください:"
+msgstr "このサーバのパスワードを入力してください:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2210
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
 "You can also optionally specify program arguments."
 msgstr ""
-"実行可能なパスを入力してください。\n"
-"たとえばMS Windows環境ではc:\\somePath\\file.exe UNIX環境では/somePath/"
-"file.\n"
-"また，特定のプログラム引数を追加することができます。"
+"実行するパスと実行ファイル名を入力してください.\n"
+"例えば MS Windows では c:\\somePath\\file.exe, UNIX では /somePath/file .\n"
+"また，プログラム引数を指定することもできます."
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
-"5から9999秒の間でタイムアウトを入力してください。0はタイムアウトを無効にしま"
-"す。"
+"タイムアウトを入力してください (5 から 9999 秒. 0 はタイムアウトを無効にしま"
+"す)."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
-msgstr "このフィルター セットに一意の名前を入力してください。"
+msgstr "このフィルタ セットに一意の名前を入力してください."
 
-#: resources.h:117
+#: resources.h:118
 msgid "Please enter a username for this server:"
-msgstr "このサーバーのユーザー名を入力してください:"
+msgstr "このサーバのユーザ名を入力してください:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
-msgstr "適当なポートの範囲を入力してください。"
+msgstr "正しいポートの範囲を入力してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr "外部アドレスを取得するためにURLを入力してください。"
+msgstr "外部アドレスを取得するための URL を入力してください"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
 msgid "Please enter an update interval of at least 7 days"
-msgstr "少なくとも7日間隔で最新情報を入力してください。"
+msgstr "7 日以上の更新間隔を入力してください"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../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:572
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
-"生のFTPコマンドを入力してください。\n"
-"生のftpコマンドを使うことによりディレクトリーのキャッシュを消せるでしょう。"
+"生の FTP コマンドを入力してください.\n"
+"生の ftp コマンドを使用するとディレクトリのキャッシュをクリアできるでしょう."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1184
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1570
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1275
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
-msgstr "作成しようとするディレクトリーの名前を入力してください:"
+msgstr "作成するディレクトリ名を入力してください:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "作成するディレクトリ名を入力してください:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
-msgstr "このサーバーのユーザー名とパスワードを入力してください:"
+msgstr "このサーバのユーザ名とパスワードを入力してください:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
-msgstr "外部IPアドレスを入力してください。"
+msgstr "外部 IP アドレスを入力してください"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:593
 #: ../../locales/../src/interface/netconfwizard.cpp:606
@@ -5214,30 +5300,30 @@
 "wizard. In case you have a dynamic address or don't know your external "
 "address, use the external resolver option."
 msgstr ""
-"このウィザードのアクティブモードのページで外部IPアドレスを入力してください。"
-"動的アドレスを利用していたり外部アドレスがわからない場合は,外部リゾルバオプ"
-"ションを使ってください。"
+"このウィザードのアクティブ モードのページで外部 IP アドレスを入力してくださ"
+"い. 動的アドレスを使用していたり外部アドレスが分からない場合は, 外部リゾルバ "
+"オプションを使用してください."
 
-#: resources.h:668
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
 msgstr ""
-"誤った設定を防ぎFTP接続を成功させるために,注意深く指示に従ってください。"
+"誤った設定を防ぎ FTP 接続を成功させるために, 注意深く指示に従ってください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:617
 msgid ""
 "Please make sure FileZilla is allowed to establish outgoing connections and "
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
-"FileZillaが外部に接続確立することを許可されていることと,アドレスリゾルバのア"
-"ドレスが正しくタイプされていることを確認してください。"
+"FileZilla が外部に接続確立するのを許可されていることと, アドレス リゾルバのア"
+"ドレスが正しく入力されていることを確認してください."
 
 #: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
-"要求されたロケールがあなたのシステムにインストールされていることを確認して下"
-"さい."
+"要求されたロケールがあなたのシステムにインストールされていることを確認してく"
+"ださい."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:594
 msgid ""
@@ -5246,52 +5332,54 @@
 "manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
 "'game mode'."
 msgstr ""
-"ルータの利用可能な最新のファームウェアを確認してください。その上で,ルータを適"
-"切に設定すべきです。手動ポート転送を利用すべきでしょう。'DMZモード' や 'ゲー"
-"ムモード'と呼ばれるものをルータで起動してはいけません。"
+"ルータの利用できる最新のファームウェアを確認してください. その上で, ルータを"
+"適切に設定すべきです. 手動ポート転送を利用すべきでしょう. 'DMZ モード' や "
+"'ゲーム モード' と呼ばれるもののルータでの起動はできません."
 
-#: resources.h:682
+#: resources.h:696
 msgid ""
 "Please note that FileZilla has no influence on the port the server chooses. "
 "So the server might choose a port which your firewall thinks is only used by "
 "trojans or other malware. This might raise a false alarm you can safely "
 "discard."
 msgstr ""
-"サーバーが選んだポートで影響を持たないものをFileZillaに教えてください。すると"
-"サーバはファイアウォールがトロイやその他の破壊工作ソフトウェアに利用されるだ"
-"けと考えているポートを選ぶかもしれません。これはあなたが安全を放棄する失敗の"
-"警告を取り上げるかもしれません。"
+"FileZilla はサーバが選択したポートに関与しないことにご注意ください. このため"
+"ファイアウォールがトロイの木馬やその他のマルウェアのみに利用されると考えられ"
+"るポートをサーバが選ぶかもしれません. これはあなたが安全を放棄する失敗の警告"
+"を取り上げるかもしれません."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
-"MFMTコマンドをサポートしているならFTP, FTPSとFTPESサーバーが動作するだけの時"
-"にアップロードしたタイムスタンプを保持することを知らせてください。"
+"MFMT コマンドに対応している場合は、FTP, FTPS と FTPES サーバへのアップロード"
+"でのみタイムスタンプを保持することにご注意ください."
 
-#: resources.h:736
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
-"あまりにも多かったり, あまりにも短い間隔で再接続しようとするとサーバーは接続"
-"を切るかもしれないことに注意してください。"
+"あまりにも頻繁に/あまりにも短い間隔で再接続を試みると、サーバが接続を禁止する"
+"かもしれないことにご注意ください."
 
-#: resources.h:884 resources.h:890
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
-"詳しくは http://wiki.filezilla-project.org/Date_and_Time_formatting を読んで"
-"ください"
+"詳細は http://wiki.filezilla-project.org/Date_and_Time_formatting をお読みく"
+"ださい"
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
+"更新のダウンロードを再試行してください. 問題が続く場合の理由の候補 (可能性が"
+"大きい順):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5299,43 +5387,43 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
-"ネットワークの設定を変更したり,以前に動いていたサーバーで突然問題に遭遇した場"
-"合は再度このウィザードを起動してください。"
+"ネットワークの設定を変更したり, 以前に動いていたサーバで突然問題に遭遇した場"
+"合は再度このウィザードを起動してください."
 
-#: resources.h:455
+#: resources.h:457
 msgid "Please select an action:"
-msgstr "アクションを選択してください:"
+msgstr "動作を選択してください:"
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
-msgstr "取り込みたいカテゴリーを選択してください。"
+msgstr "インポートしたいカテゴリを選択してください."
 
-#: resources.h:670
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
-msgstr "標準で利用したい転送モードを選択してください。"
+msgstr "利用したい既定の転送モードを選択してください."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:38
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr "ディレクトリー \"%s\" の新しい属性を選んでください"
+msgstr "ディレクトリ \"%s\" の新しい属性を選択してください."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:27
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr "ファイル \"%s\" の新しい属性を選んでください"
+msgstr "ファイル \"%s\" の新しい属性を選択してください."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:41
 msgid "Please select the new attributes for the selected directories."
-msgstr "選択されたディレクトリーの新しい属性を選んでください。"
+msgstr "選択されたディレクトリの新しい属性を選択してください."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:44
 msgid ""
 "Please select the new attributes for the selected files and directories."
-msgstr "選択されたファイルとディレクトリーの新しい属性を選んでください。"
+msgstr "選択されたファイルとディレクトリの新しい属性を選択してください."
 
 #: ../../locales/../src/interface/chmoddialog.cpp:30
 msgid "Please select the new attributes for the selected files."
-msgstr "選択されたファイルの新しい属性を選んでください。"
+msgstr "選択されたファイルの新しい属性を選択してください."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:581
 msgid ""
@@ -5345,19 +5433,19 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
-"ファイアウォールをアップデートしてあなたのルータが最新の利用可能なファーム"
-"ウェアを使っているか確認してください。その上でルータが適切に設定されていなけ"
-"ればいけません。あなたは手動でポート転送を使う必要があります。'DMZモード'もし"
-"くは'ゲームモード'でルータを運用しないでください。プロトコル検知もしくはプロ"
-"トコルの特殊な'fixups'は無効にうする必要があります。"
+"ファイアウォールを更新してあなたのルータが最新の利用できるファームウェアを使"
+"用しているか確認してください. その上でルータが適切に設定されている必要があり"
+"ます. あなたは手動でポート転送を使用する必要があります. 'DMZ モード' または "
+"'ゲーム モード' でルータを運用しないでください. プロトコル検知またはプロトコ"
+"ルの特殊な 'fixups' は無効にする必要があります."
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
-"FileZillaについてのより多くの情報のためには http://filezilla-project.org を訪"
-"問してください。"
+"FileZilla についてのより多くの情報は http://filezilla-project.org を訪問して"
+"ください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:1074
 #: ../../locales/../src/interface/updatewizard.cpp:1090
@@ -5365,98 +5453,107 @@
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
-"最新バージョンをダウンロードするには http://filezilla-project.org を訪問して"
-"ください。"
+"最新版をダウンロードするには http://filezilla-project.org を訪問してください."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:184
 #: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
 msgstr "郵便番号:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1921
-#: ../../locales/../src/interface/sitemanager.cpp:2139
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr "所定のサイト"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:703
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
-msgstr "ファイルのタイムスタンプを保持する"
+msgstr "ファイルのタイムスタンプを保持"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
 msgid "Preview:"
 msgstr "プレビュー:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
-msgstr "プライマリ接続とデータ接続証明は一致しません。"
+msgstr "プライマリ接続とデータ接続証明は一致しません."
 
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "バージョン情報を標準出力に表示して終了"
 
-#: resources.h:907
+#: resources.h:923
 msgid "Prioritize directories (default)"
-msgstr "ディレクトリーを優先（標準）"
+msgstr "ディレクトリを先頭に(既定値)"
 
-#: ../../locales/../src/interface/queue.cpp:1197
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "優先度"
 
-#: resources.h:947
+#: resources.h:963
 msgid "Privacy policy:"
 msgstr "個人情報について:"
 
-#: resources.h:783
+#: resources.h:797
 msgid "Private &keys:"
 msgstr "秘密鍵(&K):"
 
-#: resources.h:779 resources.h:796
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr "プロトコル(&T)"
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
-msgstr "プロキシー パスワード(&X):"
+msgstr "プロキシ パスワード(&X):"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
-msgstr "キューを処理する(&Q)"
+msgstr "キューを処理(&Q)"
 
-#: resources.h:794
+#: resources.h:808
 msgid "Proxy &port:"
-msgstr "プロキシー ポート(&P):"
+msgstr "プロキシ ポート(&P):"
 
-#: resources.h:778 resources.h:795
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
-msgstr "プロキシー ユーザー(&U):"
+msgstr "プロキシ ユーザ(&U):"
 
 #: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
-msgstr "プロキシーでの認証に失敗"
+msgstr "プロキシ認証に失敗しました"
 
 #: ../../locales/../src/engine/transfersocket.cpp:132
 #: ../../locales/../src/engine/transfersocket.cpp:146
 #, c-format
 msgid "Proxy handshake failed: %s"
-msgstr "プロキシーとのハンドシェイクに失敗: %s"
+msgstr "プロキシ ハンドシェイクに失敗しました: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "ホストが '[' で始まっていますが閉じ括弧がありません."
 
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr "プロキシーからの応答: %s"
+msgstr "プロキシの返答: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr "プロキシー要求に失敗: %s"
+msgstr "プロキシ リクエストに失敗しました: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
-"プロキシー要求に失敗: CONNECT に対して不明なアドレスの種類が応答されました"
+"プロキシ リクエストに失敗しました: CONNECT の応答に不明なアドレスの種類があり"
+"ました"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
-"プロキシーは設定されていますがプロキシー ホストもしくはポートが不適切です"
+"プロキシは設定されていますがプロキシホストまたはポートが正しくありません"
 
-#: resources.h:781
+#: resources.h:795
 msgid "Public Key Authentication"
 msgstr "公開鍵認証"
 
@@ -5464,11 +5561,11 @@
 msgid "Public key algorithm:"
 msgstr "公開鍵アルゴリズム:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "公開パーミッション"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
 msgstr "キューの処理が完了しました"
 
@@ -5487,105 +5584,108 @@
 msgid "Queue: empty"
 msgstr "キュー: ありません"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "キュー ファイル"
 
-#: resources.h:447
+#: resources.h:449
 msgid "Queueing:"
-msgstr "キュー:"
+msgstr "待機中:"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
-msgstr "システムの再起動(&E)"
+msgstr "システムを再起動(&E)"
 
-#: resources.h:520
+#: resources.h:530
 msgid "R&emote directory tree"
-msgstr "リモート ディレクトリーツリー(&E)"
+msgstr "リモート ディレクトリ ツリー(&E)"
 
-#: resources.h:618 resources.h:622
-#, fuzzy
+#: resources.h:632 resources.h:636
 msgid "R&eset and requeue selected files"
-msgstr "リセットして選択したファイルを再びキューに入れます"
+msgstr "選択されたファイルをリセットして再度キューに入れる(&E)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:588
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
-msgstr "純粋なFTPコマンド"
+msgstr "生の FTP コマンド"
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
-msgstr "読み込み(&A)"
+msgstr "読み込む(&A)"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
-msgstr "更新(&R)"
+msgstr "更新(&F)"
 
 #: resources.h:63
 msgid "Re&name"
-msgstr "名前の変更(&N)"
+msgstr "名前を変更(&N)"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:576
 msgid ""
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"ウィザードを再度実行して、FileZilla やルータまたはファイアウォールを正しく設"
-"定してください。"
+"ウィザードを再実行して設定を注意深く確認し, すべてのルータ/ファイアウオールを"
+"正しく設定してください."
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
-msgstr "読み込み(&D)"
+msgstr "読み込む(&D)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
 msgstr "読み取り専用"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1062
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
-msgstr "本当に現在の操作を中止しますか?"
+msgstr "現在の操作を本当に中止しますか?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1658
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "本当に %d 個のディレクトリーとその中身を削除しますか?"
+msgstr[0] "%d 個のディレクトリとその中身を本当に削除しますか?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1656
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
-msgstr[0] "本当に %d 件を削除しますか?"
+msgstr[0] "%d 個のファイルを本当に削除しますか?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1663
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
-msgstr "本当に %s と %s を削除しますか?"
+msgstr "%s と %s を本当に削除しますか?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1124
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
-msgstr "本当に選択された全てのファイルとディレクトリーを削除しますか?"
+msgstr "選択されたすべてのファイル/ディレクトリを本当に削除しますか?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:18
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "理由"
 
-#: ../../locales/../src/interface/QueueView.cpp:3127
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
 msgstr "今すぐ再起動"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
-msgstr "サブディレクトリーの中の再帰(&U)"
+msgstr "サブディレクトリの中の再帰(&U)"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2107
-#: ../../locales/../src/engine/directorylistingparser.cpp:2122
-msgid "Received a line exceeding 10000 characters, aborting."
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
 msgstr ""
 
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "10000 文字を超える行を受信したため中止しています."
+
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
 #: ../../locales/../src/interface/netconfwizard.cpp:1031
@@ -5597,137 +5697,145 @@
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
-"サーバーに接続している間は再接続情報を除去することはできません。\n"
-"もし続けるなら接続は切断されます。"
+"サーバへの接続中は再接続情報を消去できません.\n"
+"継続すると接続は切断されます."
 
-#: resources.h:737
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr "再接続設定"
 
-#: resources.h:988 resources.h:989
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
-msgstr "最後に使ったサーバーに再接続"
+msgstr "最後に使用したサーバに再接続"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:715
 msgid "Redirection to invalid address"
-msgstr "不適切なアドレスへの出力先変更"
+msgstr "正しくないアドレスへのリダイレクト"
 
-#: resources.h:980 resources.h:981
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
-msgstr "ファイルとフォルダーの一覧を更新する"
+msgstr "ファイルとフォルダの一覧を更新"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "パスワードを入力"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "リモート"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
-msgstr "リモート証明書は信用されていません。"
+msgstr "リモート証明書は信用されていません."
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1195
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
-msgstr "リモートファイル"
+msgstr "リモート ファイル"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Remote file search"
 msgstr "リモートのファイル検索"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
-msgstr "リモート フィルター:"
+msgstr "リモート フィルタ:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "リモート パス"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:425
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the current site's servertype (%s)."
 msgstr ""
-"標準のリモートパスが解釈できませんでした。絶対パスで正しく入力されているか、"
-"またサーバー種類が正しく選択されているかを確認してください。 (現在のサーバー"
-"種類: %s)"
+"リモート パスを構文解析できません. 正しい絶対パスであること, 現在のサイトの"
+"サーバの種類 (%s) が対応していることを確認してください."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1192
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, 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)"
-
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:427
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:431
-#: ../../locales/../src/interface/sitemanager.cpp:1194
+"リモート パスを構文解析できません. 正しい絶対パスであること, 親サイトで選択さ"
+"れたサーバの種類 (%s) が対応していることを確認してください."
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
-msgstr ""
-"リモートパスが解釈できませんでした。絶対パスで正しく入力されているか確認して"
-"ください。"
+msgstr "リモート パスを構文解析できません. 正しい絶対パスか確認してください."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "リモートパスを解釈できませんでした"
+msgstr "リモート パスを構文解析できませんでした."
 
-#: resources.h:444
+#: resources.h:446
 msgid "Remote path handling:"
-msgstr "リモート パスの扱い:"
+msgstr "リモート パスの処理:"
 
-#: resources.h:312
+#: resources.h:314
 msgid "Remote path:"
 msgstr "リモート パス:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "リモート サイト:"
 
-#: resources.h:615 resources.h:619
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
 msgstr "すべて削除(&A)"
 
-#: resources.h:617 resources.h:621
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
-msgstr "選択されてたものを削除(&S)"
+msgstr "選択されているものを削除(&S)"
 
-#: resources.h:264 resources.h:274 resources.h:840 resources.h:849
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "ファイル名の変更"
 
-#: resources.h:633 resources.h:654
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
-msgstr "選択されたディレクトリーの名前を変えます"
+msgstr "選択されたディレクトリの名前を変更"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
-msgstr "選択されたファイルとディレクトリーの名前を変更"
+msgstr "選択されたファイルとディレクトリの名前を変更"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2556
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
-msgstr "「%s」の名前を「%s」に変更しています"
+msgstr "名前を '%s' から '%s' に変更中"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
-msgstr "不都合の報告と機能の要望"
+msgstr "不具合の報告と機能の要望"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "明示的な FTP over TLS が必要"
 
-#: resources.h:620
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "暗黙の FTP over TLS が必要"
+
+#: resources.h:634
 msgid "Reset and requeue &all"
-msgstr "リセットして選択したファイルを再びキューに入れます"
+msgstr "すべてリセットして再度キューに入れる(&A)"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
-msgstr "%s のアドレスを解決しています"
+msgstr "%s のアドレスを解決中"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1159
 msgid "Resolving hostname"
@@ -5735,90 +5843,99 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
-msgstr "応答:"
+msgstr "レスポンス:"
 
-#: resources.h:438
+#: resources.h:440
 msgid "Results:"
 msgstr "結果:"
 
-#: resources.h:263 resources.h:273 resources.h:839 resources.h:848
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 msgid "Resume file transfer"
-msgstr "ファイル転送の再開"
+msgstr "ファイル転送を再開"
 
-#: resources.h:854
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
-"アスキーファイルの転送再開は、サーバーとクライアントが異なる改行コードを使っ"
-"ている場合に問題が発生する可能性があります。"
+"ASCII ファイルの再開ではサーバがクライアントと異なる改行コードを使用している"
+"場合に問題が発生するかもしれません."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:954
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
-msgstr "ディレクトリーの一覧を読み出しています..."
+msgstr "ディレクトリ一覧を取得中..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
-msgstr "%s から外部IPアドレスを取得しています"
+msgstr "%s から外部 IP アドレスを取得中"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:917
 msgid "Root certificate is not trusted"
-msgstr "ルート証明書は信用されていません。"
+msgstr "ルート証明書は信用されていません"
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "現在編集中のファイルを表示(&H)..."
 
-#: resources.h:607
+#: resources.h:885
+msgid "S&how the Site Manager on startup"
+msgstr "開始時にサイト マネージャを表示(&H)"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "システムのシャットダウン(&H)"
 
-#: resources.h:436
+#: resources.h:438
 msgid "S&top"
 msgstr "停止(&T)"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
-msgstr "同期ブラウズ(&Y)"
+msgstr "同期ブラウジング(&Y)"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:121
 msgid "SFTP"
 msgstr "SFTP"
 
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "制限:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "設定を保存しますか?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1813
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
-msgstr "キューに加えるファイルをスキャンしています"
+msgstr "キューに追加するファイルをスキャン中"
 
-#: ../../locales/../src/interface/QueueView.cpp:1815
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
-msgstr "アップロードするファイルをスキャンしています"
+msgstr "アップロードするファイルをスキャン中"
 
-#: resources.h:432
+#: resources.h:434
 msgid "Search &conditions:"
 msgstr "検索条件(&C):"
 
-#: resources.h:430
+#: resources.h:432
 msgid "Search &directory:"
-msgstr "検索ディレクトリー(&D):"
+msgstr "検索するディレクトリ(&D):"
 
-#: resources.h:996
+#: resources.h:1012
 msgid "Search for files recursively."
-msgstr "再帰的にファイルを検索します。"
+msgstr "再帰的にファイルを検索します."
 
-#: resources.h:539
+#: resources.h:549
 msgid "Search server for files"
-msgstr "ファイルのサーバー検索"
+msgstr "サーバでファイルを検索"
 
 #: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
@@ -5827,49 +5944,50 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:564
 #: ../../locales/../src/interface/netconfwizard.cpp:577
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
-msgstr "参照: http://wiki.filezilla-project.org/Network_Configuration"
+msgstr "ご覧ください: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
+#: resources.h:376
 msgid "Sele&ct server"
-msgstr "サーバーの選択(&C)"
+msgstr "サーバを選択(&C)"
 
-#: resources.h:722
+#: resources.h:736
 msgid "Select &page:"
-msgstr "ページの選択(&P)"
+msgstr "ページを選択(&P):"
 
-#: resources.h:872
+#: resources.h:888
 msgid "Select Theme"
-msgstr "テーマの選択"
+msgstr "テーマを選択"
 
-#: resources.h:832
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
-msgstr "転送対象のファイルがすでに存在していた時の動作を選択してください。"
+msgstr ""
+"転送対象のファイルが既に存在するとき行うべき既定の動作を選択してください."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
-msgstr "標準エディタの選択"
+msgstr "既定のエディタを選択"
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
 msgid ""
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
-"転送対象のファイルがすでに存在していた時の動作を選択してください。 この選択は"
-"現在のセッションにおいてのみ有効です。"
+"対象が既に存在している時の既定のファイルが存在する時の動作を選択してくださ"
+"い. この選択は現在のセッションのみで適切です."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
 msgid ""
 "Select default file exists action only for the currently selected files in "
 "the queue."
 msgstr ""
-"キューにおいて現在選択されているファイルのためだけにファイル存在時の標準動作"
-"を選んでください。"
+"キューにおいて現在選択されているファイルのためだけにファイル存在時の既定の動"
+"作を選択してください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Select download location for package"
-msgstr "パッケージをダウンロードする場所を選んでください"
+msgstr "パッケージをダウンロードする場所を選択してください"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
@@ -5877,71 +5995,71 @@
 
 #: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
-msgstr "エクスポートされたファイルを選択"
+msgstr "エクスポートしたデータのファイルを選択"
 
 #: ../../locales/../src/interface/export.cpp:34
 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.cpp:2681
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
-msgstr "エクスポートされたサイトのファイルを選択"
+msgstr "エクスポートしたサイトのファイルを選択"
 
 #: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
-msgstr "設定を取り込むためにファイルを選択してください"
+msgstr "設定をインポートするファイルを選択"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "アップロードするファイルの選択"
+msgstr "アップロードするファイルを選択"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
-msgstr "変換後の鍵ファイルの名前を選択"
+msgstr "変換後の鍵ファイル名を選択"
 
-#: resources.h:420
-#, fuzzy, no-c-format
+#: resources.h:422
+#, no-c-format
 msgid "Select how these files should be opened."
-msgstr "選択されたファイルはすでに開いています。"
+msgstr "これらのファイルをどのように開くか選択してください."
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:805
 msgid "Select target download directory"
-msgstr "ダウンロード先ディレクトリーの選択"
+msgstr "対象のダウンロード ディレクトリを選択"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
-msgstr "対象ファイルメイを選択"
+msgstr "対象のファイル名を選択"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
-msgstr "書き出すためにカテゴリを選択してください:"
+msgstr "エクスポートするカテゴリを選択:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
-msgstr "削除したい個人データを選択してください。"
+msgstr "削除したい個人データを選択してください."
 
-#: ../../locales/../src/interface/search.cpp:798
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:772
+#, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
-msgstr[0] "選択されたディレクトリーを転送キューへ追加"
+msgstr[0] "転送する %d 個のディレクトリ (空ではない) を選択しました."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:51
 #, c-format
 msgid "Selected %d directory."
 msgid_plural "Selected %d directories."
-msgstr[0] "%d 個のディレクトリーを選択."
+msgstr[0] "%d 個のディレクトリを選択."
 
-#: ../../locales/../src/interface/search.cpp:796
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:770
+#, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
-msgstr[0] "%d 個のファイルを選択. 合計サイズ: %s"
+msgstr[0] "転送する %d 個のファイルを選択しました."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:58
 #, c-format
@@ -5955,10 +6073,10 @@
 msgid_plural "Selected %d files. Total size: At least %s"
 msgstr[0] "%d 個のファイルを選択. 合計サイズ: 少なくとも %s"
 
-#: ../../locales/../src/interface/search.cpp:803
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:777
+#, c-format
 msgid "Selected %s and %s for transfer."
-msgstr "%s と %s を選択. 合計サイズ: %s"
+msgstr "転送する %s と %s を選択しました."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
@@ -5970,135 +6088,133 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s と %s を選択. 合計サイズ: 少なくとも %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "Selected editor does not exist."
-msgstr "選択したエディタは存在しません。"
+msgstr "選択されたエディタは存在しません."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2081
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
-msgstr "選択したファイルはすでに編集中です"
+msgstr "選択されたファイルは既に編集中です"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
-msgstr "選択したファイルはすでに読み込まれています。"
+msgstr "選択されたファイルは既に読み込まれています"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2666
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid "Selected file is already opened"
-msgstr "選択したファイルはすでに開いています。"
+msgstr "選択されたファイルは既に開かれています"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2694
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid "Selected file is still being edited"
-msgstr "選択したファイルはまだ編集中です。"
+msgstr "選択されたファイルはまだ編集中です"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr "選択したフィルターはローカル ファイルにのみ処理します。"
+msgstr "選択されたフィルタはローカルファイルのみに働きます."
 
-#: ../../locales/../src/interface/menu_bar.cpp:310
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
-"選択されたグローバルブックマークと現在のサーバーは異なるサーバー種類を使用し"
-"ています。\n"
-"このサーバーでは サイト別 ブックマーク を使用してください。"
+"選択されたグローバル ブックマークと現在のサーバはサーバの種類が異なります.\n"
+"このサーバにはサイト別ブックマークを使用してください."
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr "選択されたポートは通常違うプロトコルによって利用されています。"
+msgstr "選択されたポートは通常違うプロトコルによって利用されています."
 
-#: resources.h:744
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
-msgstr "FTP のキープ アライブ コマンドを送る(&K)"
+msgstr "FTP のキープ アライブ コマンドを送信(&K)"
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
-msgstr "不可能でなければサーバーにカスタムコマンドを送る"
+msgstr "不可能でなければサーバにカスタム コマンドを送信"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
-msgstr "キープアライブ コマンドを送信しています"
+msgstr "キープ アライブ コマンドを送信中"
 
 #: resources.h:7 resources.h:31
 #: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
-msgstr "シリアルナンバー:"
+msgstr "シリアル番号:"
 
-#: resources.h:81 resources.h:88
+#: resources.h:89
 msgid "Server &Type:"
-msgstr "サーバーの種類(&T):"
+msgstr "サーバの種類(&T):"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
-msgstr "サーバーは TLS 接続を正しく終了しませんでした"
+msgstr "サーバは TLS 接続を適切にシャットダウンしませんでした."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr ""
-"サーバーは %d GB を超えるファイルの大きさの転送再開をサポートしていません。"
+msgstr "サーバは %d GB を超えるファイルの再開に対応していません."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"サーバーは %d GB を超えるファイルの大きさの転送再開をサポートしていません。"
-"ファイルの大きさが一致したら転送を終了します。"
+"サーバは %d GB を超えるファイルの再開に対応していません. ファイル サイズが一"
+"致しないため転送を終了します."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
-msgstr ""
-"サーバーは 2GB を超えるファイルの大きさの転送再開をサポートしていません。"
+msgstr "サーバは 2GB を超えるファイルの再開に対応していません."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
-msgstr ""
-"サーバーは 4GB を超えるファイルの大きさの転送再開をサポートしていません。"
+msgstr "サーバは 4GB を超えるファイルの再開に対応していません."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"サーバーは %d GB を超えるファイルの大きさの転送再開をサポートしていない可能性"
-"があります。ファイルの大きさが一致したら転送を終了します。"
+"サーバは %d GB を超えるファイルの再開に対応していないかもしれません. ファイ"
+"ル サイズが一致しないため転送を終了します."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
-"サーバーにはアカウントが必要なのかもしれません。サイト マネージャーを使ってア"
-"カウントを指定してください。"
+"サーバにアカウントが必要かもしれません. サイト マネージャを使ってアカウントを"
+"指定してみてください."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr "サーバが空のパスを返しました."
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
-"サーバーは追加のログインプロンプトを要求しました。ログイン種類として インタラ"
-"クティブ を使用する必要があります。"
+"サーバは追加のログイン プロンプトを送信しました. ログイン種類としてインタラク"
+"ティブを使用する必要があります."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
-"サーバーはルーティング経路設定できないアドレスに受動的な返信を送信しました。"
-"パッシブモードは失敗しました。"
+"サーバはルーティング経路設定できないアドレスに受動的な返信を送信しました. "
+"パッシブ モードは失敗しました."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
 msgstr ""
-"サーバーは経路設定できないアドレスで受動的な返信を送信しました。代わりにサー"
-"バーのアドレスを使っています。"
+"サーバは経路設定できないアドレスで受動的な返信を送信しました. 代わりにサーバ"
+"のアドレスを使っています."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:403
 #: ../../locales/../src/interface/netconfwizard.cpp:410
@@ -6110,148 +6226,148 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:510
 #: ../../locales/../src/interface/netconfwizard.cpp:521
 msgid "Server sent unexpected reply."
-msgstr "サーバーが予期せぬ応答を送信しました。"
+msgstr "サーバは予期しない返答を送信しました."
 
-#: resources.h:350
+#: resources.h:352
 msgid "Server to client MAC:"
-msgstr "サーバー -> クライアント MAC:"
+msgstr "サーバ -> クライアント MAC:"
 
-#: resources.h:348
+#: resources.h:350
 msgid "Server to client cipher:"
-msgstr "サーバー -> クライアント 暗号化方式:"
+msgstr "サーバ -> クライアント 暗号化方式:"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
-msgstr "サーバーの種類(&T):"
+msgstr "サーバの種類(&T):"
 
-#: ../../locales/../src/interface/queue.cpp:1193
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
-msgstr "サーバー/ローカル ファイル"
+msgstr "サーバ/ローカル ファイル"
 
-#: resources.h:310 resources.h:372
+#: resources.h:312 resources.h:374
 msgid "Server:"
-msgstr "サーバー:"
+msgstr "サーバ:"
 
 #: resources.h:15 resources.h:39
 msgid "Session details"
 msgstr "セッション詳細"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "優先度の設定(&P)"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2434
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
-msgstr "'%s'のパーミッションを'%s'に設定"
+msgstr "'%s' のパーミッションを '%s' に設定"
 
 #: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
-msgstr "SetSocketBufferSizeはソケット無しで呼び出される"
+msgstr "SetSocketBufferSize はソケットなしで呼び出される"
 
-#: resources.h:721
+#: resources.h:735
 msgid "Settings"
 msgstr "設定"
 
-#: resources.h:969
+#: resources.h:985
 msgid "Show &raw directory listing"
-msgstr "そのままのディレクトリー一覧を表示(&R)"
+msgstr "そのままのディレクトリ一覧を表示(&R)"
 
-#: resources.h:550
+#: resources.h:560
 msgid "Show &welcome dialog..."
-msgstr "挨拶ダイアログの表示(&W)..."
+msgstr "ようこそダイアログを表示(&W)..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2316
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
-msgstr "両方のディレクトリーツリーを表示して,比較を続けますか?"
+msgstr "両方のディレクトリ ツリーを表示して, 比較を継続しますか?"
 
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
-msgstr "このヘルプダイアログを表示"
+msgstr "このヘルプ ダイアログを表示"
 
-#: ../../locales/../src/interface/QueueView.cpp:3129
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
 msgstr "今すぐシャットダウン"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
-msgstr "サイト マネージャー エントリ(&M)"
+msgstr "サイト マネージャのエントリ(&M)"
 
 #: resources.h:70
 msgid "Site Manager"
-msgstr "サイト マネージャー"
+msgstr "サイト マネージャ"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1048
-#: ../../locales/../src/interface/sitemanager.cpp:1060
-#: ../../locales/../src/interface/sitemanager.cpp:1069
-#: ../../locales/../src/interface/sitemanager.cpp:1086
-#: ../../locales/../src/interface/sitemanager.cpp:1103
-#: ../../locales/../src/interface/sitemanager.cpp:1116
-#: ../../locales/../src/interface/sitemanager.cpp:1135
-#: ../../locales/../src/interface/sitemanager.cpp:1145
-#: ../../locales/../src/interface/sitemanager.cpp:1159
-#: ../../locales/../src/interface/sitemanager.cpp:1170
-#: ../../locales/../src/interface/sitemanager.cpp:1195
-#: ../../locales/../src/interface/sitemanager.cpp:1205
-#: ../../locales/../src/interface/sitemanager.cpp:1214
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "Site Manager - Invalid data"
-msgstr "サイト マネージャー - 不正なデータ"
+msgstr "サイト マネージャ - 正しくないデータ"
 
-#: ../../locales/../src/interface/sitemanager.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
-msgstr "サイト マネージャーはすでに開いています"
+msgstr "サイト マネージャは既に開かれています"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2589
-#: ../../locales/../src/interface/sitemanager.cpp:2606
-#: ../../locales/../src/interface/sitemanager.cpp:2620
-#: ../../locales/../src/interface/sitemanager.cpp:3019
-#: ../../locales/../src/interface/sitemanager.cpp:3106
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
-msgstr "サイトは存在しません。"
+msgstr "サイトは存在しません."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2569
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
-msgstr "サイトパスは 0 か 1 で始まっている必要があります。"
+msgstr "サイト パスは 0 か 1 で始まっている必要があります."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2613
-#: ../../locales/../src/interface/sitemanager.cpp:2786
-#: ../../locales/../src/interface/sitemanager.cpp:3012
-#: ../../locales/../src/interface/sitemanager.cpp:3099
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
-msgstr "サイトパスが不正です。"
+msgstr "サイト パスが正しくありません."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
-msgstr "サイト別 ブックマーク"
+msgstr "サイト別ブックマーク"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:91
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:540
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
-"サイト別 ブックマーク を利用するには、サーバーが サイト マネージャー に登録さ"
-"れている必要があります。\n"
-"現在の接続を サイト マネージャー に追加しますか？"
+"サイト別ブックマークではサーバがサイト マネージャに登録されている必要がありま"
+"す.\n"
+"現在の接続をサイト マネージャに追加しますか?"
 
-#: ../../locales/../src/interface/queue.cpp:1196
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
-msgstr "容量"
+msgstr "サイズ"
 
-#: resources.h:891
+#: resources.h:907
 msgid "Size formatting"
-msgstr "容量の書式"
+msgstr "サイズの書式"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:62
 #: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
-msgstr "不明な大きさ"
+msgstr "サイズ不明"
 
-#: resources.h:265 resources.h:275 resources.h:841 resources.h:850
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 msgid "Skip file"
-msgstr "ファイルを飛ばす"
+msgstr "ファイルをスキップ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1270
 #: ../../locales/../src/engine/ControlSocket.cpp:1289
@@ -6259,7 +6375,7 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:1380
 #, c-format
 msgid "Skipping download of %s"
-msgstr "%sのダウンロードをスキップしています"
+msgstr "%s のダウンロードをスキップしています"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1274
 #: ../../locales/../src/engine/ControlSocket.cpp:1293
@@ -6267,35 +6383,35 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:1384
 #, c-format
 msgid "Skipping upload of %s"
-msgstr "%sのアップロードをスキップしています"
+msgstr "%s のアップロードをスキップしています"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1130
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
-msgstr "いくつかのファイルが編集中, またはアップロードの必要があります。"
+msgstr "編集中またはアップロードの必要があるファイルがあります."
 
-#: resources.h:684 resources.h:760
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
-"ルータの下にある間違った設定をされたリモートサーバーはローカルIPアドレスを返"
-"すかもしれません。"
+"ルータの下にある間違った設定をされたリモートサーバはローカル IP アドレスを返"
+"すかもしれません."
 
-#: resources.h:909
+#: resources.h:925
 msgid "Sort directories inline"
-msgstr "ディレクトリーも含めてソートする"
+msgstr "ディレクトリをインラインでソート"
 
 #: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
-msgstr "ディレクトリー比較中はソート順を変更することができません。"
+msgstr "ディレクトリ比較中はソート順を変更できません."
 
-#: resources.h:905
+#: resources.h:921
 msgid "Sorting"
-msgstr "並び替えています"
+msgstr "ソート中"
 
-#: resources.h:906
+#: resources.h:922
 msgid "Sorting &mode:"
-msgstr "並べ換え方法(&M):"
+msgstr "ソートのモード(&M):"
 
 #: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
@@ -6305,7 +6421,7 @@
 msgid "Source and target file may not be the same"
 msgstr "元のファイルと対象のファイルは同じではないようです"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "ドロップの元と先が同一です"
 
@@ -6313,62 +6429,62 @@
 msgid "Source file:"
 msgstr "元ファイル:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "速度制限"
 
-#: resources.h:805
+#: resources.h:819
 msgid "Speed limits"
 msgstr "速度制限"
 
 #: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr "速度制限は無効です。クリックで変更できます。"
+msgstr "速度制限は無効です. 変更するにはクリックしてください."
 
 #: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr "速度制限は有効です。クリックで変更できます。"
+msgstr "速度制限は有効です. 変更するにはクリックしてください."
 
-#: resources.h:390
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "今すぐ転送を開始(&I)"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
 msgid "Start with opened Site Manager"
-msgstr "サイト マネージャーを開いた状態で起動"
+msgstr "サイト マネージャを開いた状態で起動"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1632
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
-msgstr "%sのダウンロードを始めています"
+msgstr "%s のダウンロードを開始しています"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1636
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
-msgstr "%sのアップロードを始めています"
+msgstr "%s のアップロードを開始しています"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
-msgstr "州か行政区"
+msgstr "都道府県:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "状態"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "状態:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
-msgstr "すべてを停止し削除します(&A)"
+msgstr "すべてを停止して削除(&A)"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
@@ -6376,23 +6492,25 @@
 
 #: resources.h:11 resources.h:35
 msgid "Subject of certificate"
-msgstr "証明書の対象"
+msgstr "証明書のサブジェクト"
 
 #: ../../locales/../src/interface/queueview_successful.cpp:12
 msgid "Successful transfers"
 msgstr "転送成功"
 
-#: resources.h:712
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr "テスト結果の概要:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
+"この選択はファイルへのシンボリックリンクには影響しません. このようなシンボ"
+"リックリンクは常に削除されます."
 
-#: resources.h:995 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../locales/../src/interface/state.cpp:249
 #: ../../locales/../src/interface/state.cpp:278
 #: ../../locales/../src/interface/state.cpp:285
 #: ../../locales/../src/interface/state.cpp:297
@@ -6405,14 +6523,14 @@
 #: ../../locales/../src/interface/state.cpp:1043
 #: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
-msgstr "同期ブラウズ"
+msgstr "同期ブラウジング"
 
 #: ../../locales/../src/interface/state.cpp:391
 msgid "Synchronized browsing has been disabled."
-msgstr "同期ブラウズは無効にされました。"
+msgstr "同期ブラウジングを無効にしました."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "構文エラー"
 
@@ -6421,115 +6539,124 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2460
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
-msgstr "コマンドライン構文に誤りがあります"
+msgstr "コマンド ラインでの構文エラー"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr "システム"
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "ツールバー(&O)"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
-msgstr "TLS/SSL 接続を確立しました。HTTP リクエストを送信しています。"
+msgstr "TLS/SSL 接続が確立されました, HTTP リクエストを送っています"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr "TLS/SSL 接続を確立しました。ウェルカム メッセージを待っています..."
+msgstr "TLS/SSL 接続が確立されました, ようこそメッセージを待っています..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
-msgstr "TLS/SSL 接続を確立しました。"
+msgstr "TLS/SSL 接続が確立されました."
 
 #: ../../locales/../src/engine/proxy.cpp:445
 msgid "TTL expired"
-msgstr "TTL 期限切れ"
+msgstr "TTL の期限が切れました"
 
 #: resources.h:47
 msgid "Target file already exists"
-msgstr "対象のファイルはすでに存在しています"
+msgstr "対象のファイルは既に存在しています"
 
 #: resources.h:53
 msgid "Target file:"
-msgstr "目的のファイル:"
+msgstr "対象のファイル:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "対象のファイルは既に存在しています"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1874
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
-msgstr "対象のファイルはすでに存在しています, 本当に続けますか?"
+msgstr "対象のファイル名は既に存在しています, 本当に続けますか?"
 
-#: resources.h:711
+#: resources.h:725
 msgid "Test results"
 msgstr "テスト結果"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
-msgstr "サーバーの転送再開について互換性をテストしています。"
+msgstr "サーバの再開の互換性をテストしています."
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"サイト マネージャーはFileZilla 3の別のインスタンスで開かれています。\n"
-"続けますか? この時, なんらかの変更はサイト マネージャーにおいて保存されないか"
-"もしれません。"
+"サイト マネージャは FileZilla 3 の別のインスタンスで開かれています.\n"
+"続けますか? この時, なんらかの変更はサイト マネージャにおいて保存されないかも"
+"しれません."
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
-"サイト マネージャーはFileZilla 3の別のインスタンスで開かれています。\n"
-"それを閉じてないとデータの削除ができません。"
+"サイト マネージャは FileZilla 3 の別のインスタンスで開かれています.\n"
+"それを閉じてないとデータの削除ができません."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:421
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
-msgstr "XML ドキュメントは整形されていません: %s"
+msgstr "XML 文書は整形式ではありません: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:618
 #, c-format
 msgid "The address you entered was: %s"
 msgstr "入力されたアドレス: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:815
-#: ../../locales/../src/interface/sitemanager.cpp:2999
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
-msgstr "ブックマークを追加できませんでした。"
+msgstr "ブックマークを追加できませんでした."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3086
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
-msgstr "ブックマークを消去できませんでした。"
+msgstr "ブックマークを消去できませんでした."
 
 #: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr "接続は暗号化されています。詳細はアイコンをクリックしてください。"
+msgstr "接続は暗号化されています. 詳細はアイコンをクリックしてください."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
-msgstr "カスタム ログインシーケンス は空にできません。"
+msgstr "カスタム ログイン シーケンスは空にできません."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
-msgstr "テキスト ファイル用の標準エディターが見つかりません。"
+msgstr "テキスト ファイルを編集する既定のエディタがありません."
 
-#: resources.h:422
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
-msgstr "テキスト ファイル用の標準エディターは「%s」です。"
+msgstr "テキスト ファイルを編集する既定のエディタは '%s' です."
 
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "入力されたフィルター名はすでに存在しています。"
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "入力されたフィルタ名は既に存在しています. 他の名前を選択してください."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
-msgstr "拡張子「%s」はすでにリストに存在しません"
+msgstr "拡張子 '%s' は既に一覧に存在しません"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:246
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:253
@@ -6538,52 +6665,52 @@
 "The file %s already exists.\n"
 "Please enter a new name:"
 msgstr ""
-"ファイル %s はすでに存在しています。\n"
+"ファイル %s は既に存在しています.\n"
 "新しい名前を入力してください:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
-"ファイル '%s' は開けません:\n"
-"関連付けられたプログラム (%s) が見つかりません。\n"
-"ファイルの種類への関連付けを確認してください。"
+"ファイル '%s' を開くことができません:\n"
+"関連付けられたプログラム (%s) が見つかりませんでした.\n"
+"ファイルの種類の関連付けを確認してください."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "ファイル '%s' を開けないか, 正しい秘密鍵ではありません。"
+msgstr "ファイル '%s' を読み込めないか, 秘密鍵を含んでいません."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:59
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
-msgstr "ファイル「%s」を読み込めません。"
+msgstr "ファイル '%s' を読み込めませんでした."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2052
-#: ../../locales/../src/interface/LocalListView.cpp:2184
-#: ../../locales/../src/interface/RemoteListView.cpp:2634
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
-"ファイル '%s' を開けませんでした:\n"
-"あなたのシステムではこのファイルの種類にプログラムが関連付けられていません。"
+"ファイル '%s' を開くことができませんでした:\n"
+"あなたのシステムではこのファイルの種類にプログラムが関連付けられていません."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2097
-#: ../../locales/../src/interface/LocalListView.cpp:2197
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
-"ファイル '%s' を開けませんでした:\n"
-"関連付けコマンドは失敗しました。"
+"ファイル '%s' を開くことができませんでした:\n"
+"関連付けられたコマンドが失敗しました"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
 #, c-format
@@ -6593,10 +6720,10 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
-"FileZilla は '%s' の形式に対応していません。\n"
-"また, このファイルはパスワードで保護されていますが, FileZilla はまだ対応して"
-"いません。\n"
-"FileZilla で使用するために, 保護解除されたファイルに変換しますか?"
+"FileZilla はファイル '%s' の形式に対応していません.\n"
+"このファイルはパスワードで保護されていますが FileZilla はまだ対応していませ"
+"ん.\n"
+"FileZilla に対応した保護解除された形式に変換しますか?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
 #, c-format
@@ -6604,7 +6731,7 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
-"FileZilla は '%s' の形式に対応していません。\n"
+"FileZilla はファイル '%s' の形式に対応していません.\n"
 "FileZilla に対応した形式に変換しますか?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
@@ -6614,12 +6741,12 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
-"'%s' はパスワードで保護されていますが, FileZilla はまだ対応していません。\n"
+"'%s' はパスワードで保護されていますが, FileZilla はまだ対応していません.\n"
 "FileZilla で使用するために, 保護解除されたファイルに変換しますか?"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "The file selected as default editor does not exist."
-msgstr "選択された標準のエディタは存在しません"
+msgstr "既定のエディタとして選択されたファイルが存在しません."
 
 #: ../../locales/../src/interface/import.cpp:95
 msgid ""
@@ -6629,54 +6756,54 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"あなたの選択しているファイルは以前のバージョンのFileZillaからサイト マネー"
-"ジャ データを含んでいます。\n"
-"記憶フォーマットが異なっているために、ホスト名だけでなく、ポート、ユーザー"
-"名、パスワードも取り込まれます。\n"
-"取り込みを続けますか?"
+"選択されたファイルは以前のバージョンの FileZilla からのサイト マネージャ デー"
+"タを含んでいます.\n"
+"記憶形式が異なるため, ホストだけでなく, ポート, ユーザ名, パスワードもイン"
+"ポートされます.\n"
+"インポートを継続しますか?"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr "ファイル名の列は非表示や移動ができません。"
+msgstr "ファイル名の列は非表示や移動ができません."
 
 #: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
-msgstr "ファイル名の列は非表示にできません。"
+msgstr "ファイル名の列は非表示にできません."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
-msgstr "次の文字は置換されるでしょう: %s"
+msgstr "以下の文字は置換されます: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
-msgstr "次の文字は置換されるでしょう: %s"
+msgstr "以下の文字は置換されます: %s"
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "以下のファイルが現在編集中です:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
-msgstr "フリーでオープンソースの FTP ソリューション"
+msgstr "無料でオープン ソースの FTP ソリューション"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:293
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
-msgstr "グローバル ブックマークを保存できませんでした。"
+msgstr "グローバル ブックマークを保存できませんでした."
 
-#: resources.h:967
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
 "performance."
 msgstr ""
-"最も高いデバッグレベルはメッセージログにおいてより多くの情報を表示します。デ"
-"バッグ情報の表示はパフォーマンスに重大な影響を及ぼします。"
+"最も高いデバッグレベルはメッセージ ログにおいてより多くの情報を表示します. デ"
+"バッグ情報の表示はパフォーマンスに重大な影響を及ぼします."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr "制限値は 1から 2000MB の間で設定してください"
+msgstr "制限は 1 から 2000 MiB にしてください"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6684,37 +6811,34 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"ローカルディレクトリー '%s' は同期ルート (%s) の下にありません。\n"
-"同期ブラウズを無効にしてローカルディレクトリーを変更しますか?"
+"ローカル ディレクトリ '%s' は同期ルート (%s) の配下ではありません.\n"
+"同期ブラウジングを無効にしてローカル ディレクトリの変更を継続しますか?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
 msgid ""
 "The lowest available port has to be less or equal than the highest available "
 "port."
-msgstr "使用するポート番号の下限値は上限値以下でなければいけません。"
+msgstr "利用できるポートの最小値は最大値以下である必要があります."
 
 #: ../../locales/../src/interface/updatewizard.cpp:607
 msgid ""
 "The most recent version has been downloaded. Click on Finish to close "
 "FileZilla and to start the installation."
 msgstr ""
-"最新バージョンはすでにダウンロードされています。インストールを開始するために"
-"終了をクリックしてFileZillaを終了させてください。"
+"最新版は既にダウンロードされています. インストールを開始するために終了をク"
+"リックして FileZilla を終了させてください."
 
 #: ../../locales/../src/interface/updatewizard.cpp:609
-#, fuzzy
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
 msgstr ""
-"最新バージョンはすでにダウンロードされています。このバージョンをインストール"
-"した時のようにインストールしてください。"
+"最新バージョンはダウンロード済みです. このバージョンと同じ方法でインストール"
+"してください."
 
-#: ../../locales/../src/interface/QueueView.cpp:1935
-#: ../../locales/../src/interface/QueueView.cpp:1962
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1964
 msgid "The queue will not be saved."
-msgstr "\"%s\"が書けませんでしたので, キューは保存されません。"
+msgstr "キューは保存されません."
 
 #: ../../locales/../src/interface/state.cpp:1022
 #, c-format
@@ -6722,188 +6846,192 @@
 "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:84
 msgid "The selected categories have been imported."
-msgstr "選択されたカテゴリは取り込まれています。"
+msgstr "選択されたカテゴリをインポートしました."
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
-"次のカテゴリにおける取り込み可能なデータを含むファイルが選択されています。"
+"選択されたファイルは以下のカテゴリでのインポートできるデータを含んでいます:"
 
-#: resources.h:320
+#
+#: resources.h:322
 msgid "The selected file is already being edited:"
-msgstr "選択されたファイルはすでに編集中です:"
+msgstr "選択されたファイルは既に編集中です:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2694
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "選択されたファイルは他の何らかのプログラムに開かれていますので, それを閉じて"
-"ください。"
+"ください."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
-"選択されたファイルは直接実行されるでしょう。\n"
-"これは危険になり得る上システムにダメージを与えることができます。\n"
+"選択されたファイルは直接実行されるでしょう.\n"
+"これは危険になり得る上システムにダメージを与えるかもしれません.\n"
 "本当に続けますか?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2879
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
-msgstr "サーバーを追加できませんでした。"
+msgstr "サーバを追加できませんでした."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
 msgid "The server sent an unexpected or unrecognized reply."
-msgstr "サーバーは認識できない、または予期しない応答を送信しました。"
+msgstr "サーバが予期しないまたは認識できない返信を送信しました."
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
-msgstr "このサーバーはファイル名に次の文字セットエンコーディングを使います:"
+msgstr "このサーバはファイル名に次の文字セット エンコーディングを使用します:"
 
 #: resources.h:2
 msgid ""
 "The server's certificate is unknown. Please carefully examine the "
 "certificate to make sure the server can be trusted."
 msgstr ""
-"サーバーの証明書は不明です。信用できるサーバーか確認するために注意深く証明書"
-"を調べてください。"
+"サーバの証明書は不明です. 信用できるサーバか確認するために注意深く証明書を調"
+"べてください."
 
-#: resources.h:186
+#: resources.h:188
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
-"サーバーのホスト鍵とキャッシュ済みの鍵が一致しません。これは管理者がホスト鍵"
-"を変更したか、サーバーと偽った別のコンピューターに接続しようとしていることを"
-"意味します。"
+"サーバのホスト鍵がキャッシュされた鍵と一致しません. これは管理者がホスト鍵を"
+"変更したか, サーバになりすました他のコンピュータに接続しようとしていることを"
+"意味します."
 
-#: resources.h:174
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
-"サーバーのホスト鍵が不明です。そのサーバーはあなたが知っているコンピューター"
-"という保証はありません。"
+"サーバのホスト鍵は不明です. サーバがあなたが考えているコンピュータだという保"
+"障はありません."
 
 #: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
-"設定をインポートしました。すべての設定を反映するには FileZilla を再起動してく"
-"ださい。"
+"設定をインポートしました. FileZilla を再起動するまで設定は有効になりません."
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon reboot unless you click Cancel."
-msgstr "キャンセルをクリックしなければ、まもなくシステムは再起動するでしょう。"
+msgstr "キャンセルをクリックしない場合は, システムはまもなく再起動されます."
 
-#: ../../locales/../src/interface/QueueView.cpp:3115
+#: ../../locales/../src/interface/QueueView.cpp:3220
 msgid "The system will soon shut down unless you click Cancel."
-msgstr "キャンセルをクリックしなければ、まもなくシステムは停止するでしょう。"
+msgstr ""
+"キャンセルをクリックしない場合は, システムはまもなくシャットダウンされます."
 
 #: resources.h:48
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
-"目的のファイルはすでに存在しています。\n"
-"動作を選択してください。"
+"対象のファイルは既に存在しています.\n"
+"動作を選択してください:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "The test did not succeed. Do you really want to save the settings?"
-msgstr "テストは成功しませんでした。本当に設定を保存しますか?"
+msgstr "テストは成功しませんでした. 設定を本当に保存しますか?"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
 msgstr "テーマ"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
-msgstr "このフィルター設定は削除することができません。"
+msgstr "このフィルタ セットは名前を変更できません."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
-msgstr "このフィルター設定の名前を変更することができません。"
+msgstr "このフィルタ セットは削除できません."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:575
 msgid ""
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
 msgstr ""
-"ルータまたはファイアウォールが FileZilla の動作に干渉していることを意味しま"
-"す。"
+"これはルータ/ファイアウォールがまだ FileZilla に干渉していることを意味します."
 
-#: resources.h:689
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
-"もしルータの下にいないなら,これは動作するだけで,そうでなければシステムは内部"
-"アドレスを返します。"
+"これはルータの下ではない場合のみ動作します, そうでない場合はシステムは内部ア"
+"ドレスを返します."
 
-#: resources.h:667
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
-"このウィザードはあなたのもつルータやファイアウォールを適切に設定しテストする"
-"のを手助けします。"
+"このウィザードはお持ちのルータやファイアウォールを適切な設定/テストをお手伝い"
+"します."
 
-#: resources.h:885
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "日時"
+
+#: resources.h:901
 msgid "Time formatting"
-msgstr "時刻書式"
+msgstr "時刻の書式"
 
-#: resources.h:728
+#: resources.h:742
 msgid "Time&out in seconds:"
-msgstr "タイムアウト時間(&O) :"
+msgstr "タイムアウト(秒)(&O):"
 
-#: resources.h:731 ../../locales/../src/interface/QueueView.cpp:1050
-#: ../../locales/../src/interface/QueueView.cpp:1094
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
 msgstr "タイムアウト"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1078
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
-msgstr "タイムゾーン オフセット: %d 秒 / ローカル: %d 秒/ 差異 %d 秒"
+msgstr "タイムゾーン オフセット: %d 秒, ローカル: %d 秒, 差分 %d 秒."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Title:"
 msgstr "タイトル:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2314
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
-"ディレクトリーを比較するには,両方のファイルリストの位置合わせをする必要があり"
-"ます。"
+"ディレクトリを比較するには, 両方のファイル リストの位置合わせをする必要があり"
+"ます."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2315
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
-"これを行うためには,両方のディレクトリーツリーはともに表示または非表示になる必"
-"要があります。"
+"これを行うには, 両方のディレクトリ ツリーはともに表示または非表示である必要が"
+"あります."
 
-#: resources.h:782
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
-"公開鍵認証を行うには FileZilla に使用する秘密鍵を認識させる必要があります。"
+"公開鍵認証を行うには, FileZilla に使用する秘密鍵を指示する必要があります."
 
-#: resources.h:992
+#: resources.h:1008
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6912,42 +7040,42 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
-"ディレクトリー比較の切り替え。右クリックで比較方法を変更できます。\n"
+"ディレクトリ比較の切り替えです. 右クリックで比較モードを変更します.\n"
 "\n"
-"色の説明:\n"
-"黄: 片方だけに存在するファイル\n"
-"緑: 反対側より新しいファイル\n"
-"赤: ファイル サイズが異なる"
+"色:\n"
+"黄: 片方のみに存在するファイル\n"
+"緑: 他方より新しいファイル\n"
+"赤: サイズが異なるファイル"
 
-#: resources.h:994
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
-"同期ブラウズを切り替え.\n"
-"同期ブラウズが有効なとき, ローカルでディレクトリー移動するとサーバーでも同じ"
-"ように移動します。逆も同様です。"
+"同期ブラウジングを切り替えます.\n"
+"有効の場合, ローカル ディレクトリを移動するとサーバでも同様に移動します. 逆も"
+"同様です."
 
-#: resources.h:982 resources.h:983
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
-msgstr "転送キューの処理"
+msgstr "転送キューの処理を切り替える"
 
-#: resources.h:974 resources.h:975
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
-msgstr "ローカルディレクトリーツリーの表示"
+msgstr "ローカル ディレクトリ ツリーの表示を切り替える"
 
-#: resources.h:972 resources.h:973
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
-msgstr "メッセージログの表示"
+msgstr "メッセージ ログの表示を切り替える"
 
-#: resources.h:976 resources.h:977
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
-msgstr "リモートディレクトリーツリーの表示"
+msgstr "リモート ディレクトリ ツリーの表示を切り替える"
 
-#: resources.h:978 resources.h:979
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
-msgstr "転送キューの表示"
+msgstr "転送キューの表示を切り替える"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:605
 msgid "Too long header line"
@@ -6955,35 +7083,35 @@
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:666
 msgid "Too many redirects"
-msgstr "リダイレクトが多すぎる"
+msgstr "リダイレクトが多すぎます"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "トレース:"
 
-#: resources.h:915 resources.h:921
+#: resources.h:931 resources.h:937
 msgid "Transfer"
 msgstr "転送"
 
-#: resources.h:360
+#: resources.h:362
 msgid "Transfer &direction"
-msgstr "転送方向(&D)"
+msgstr "転送の方向(&D)"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
-msgstr "転送モード(&T)"
+msgstr "転送の種類(&T)"
 
-#: resources.h:738
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "転送モード"
 
-#: resources.h:871
+#: resources.h:887
 msgid "Transfer Queue"
 msgstr "転送キュー"
 
-#: resources.h:97
+#: resources.h:98
 msgid "Transfer Settings"
 msgstr "転送設定"
 
@@ -6991,13 +7119,13 @@
 #: ../../locales/../src/engine/transfersocket.cpp:522
 #, c-format
 msgid "Transfer connection interrupted: %s"
-msgstr "転送が中断されました: %s"
+msgstr "転送の接続が中断されました: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
-msgstr "転送データは失われました。"
+msgstr "転送したデータは失われました."
 
-#: ../../locales/../src/interface/QueueView.cpp:1473
+#: ../../locales/../src/interface/QueueView.cpp:1491
 #: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "転送中"
@@ -7006,110 +7134,108 @@
 msgid "Transfers"
 msgstr "転送"
 
-#: ../../locales/../src/interface/QueueView.cpp:3032
-#: ../../locales/../src/interface/QueueView.cpp:3035
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "Transfers finished"
-msgstr "転送終了"
+msgstr "転送完了"
 
-#: resources.h:829
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
-msgstr "拡張子無しのファイルをアスキーファイルとして扱う(&W)"
+msgstr "拡張子なしのファイルを ASCII ファイルとして扱う(&W)"
 
-#: resources.h:825
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "以下の拡張子のファイルをアスキーファイルとして扱う(&F)"
+msgstr "以下の拡張子のファイルを ASCII ファイルとして扱う(&F):"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-#, fuzzy
 msgid "Trust changed Hostkey:"
-msgstr "変更されたホスト鍵を信用する: "
+msgstr "変更されたホスト鍵を信用:"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
-#, fuzzy
 msgid "Trust new Hostkey:"
-msgstr "新しいホスト鍵を信用する: "
+msgstr "新規ホスト鍵を信用:"
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
-msgstr "新しい鍵を信用して接続しますか?"
+msgstr "新しい鍵を信用して接続を実行しますか?"
 
 #: resources.h:22
 msgid "Trust this certificate and carry on connecting?"
-msgstr "この証明書を信用して接続しますか？"
+msgstr "この証明書を信用して接続を実行しますか?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
-msgstr "このホストを信用し接続しますか?"
+msgstr "このホストを信用して接続を実行しますか?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "種類"
 
-#: resources.h:764
+#: resources.h:778
 msgid "Type of FTP Proxy:"
-msgstr "FTP プロキシーの種類:"
+msgstr "FTP プロキシの種類:"
 
-#: resources.h:789
+#: resources.h:803
 msgid "Type of generic proxy:"
-msgstr "一般プロキシーの種類:"
+msgstr "汎用プロキシの種類:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
 msgstr "アップロード(&P)"
 
-#: resources.h:483 resources.h:809
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "アップロード制限(&P):"
 
-#: resources.h:933
+#: resources.h:949
 msgid "U&se filetype associations if available"
-msgstr "もし可能ならファイルの種類への関連付けを使う(&S)"
+msgstr "可能ならファイルの種類の関連付けを使用(&S)"
 
-#: resources.h:886
+#: resources.h:902
 msgid "U&se system defaults"
-msgstr "システム標準を使う(&S)"
+msgstr "システム既定値を使用(&S)"
 
-#: resources.h:766
+#: resources.h:780
 msgid "USER@&HOST"
-msgstr "ユーザー@ホスト(&H)"
+msgstr "ユーザ@ホスト(&H)"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
-msgstr "未定義のエラーコード %d"
+msgstr "関連付けられていないエラー コード %d"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Unit:"
 msgstr "ユニット:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "不明"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
-msgstr "不明な FTP プロキシーの種類です,ログインシーケンスを生成できません。"
+msgstr "不明な FTP プロキシの種類です, ログイン シーケンスを生成できません."
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr "不明な SOCKS プロトコルバージョン: %d"
+msgstr "不明な SOCKS プロトコル バージョン: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
 msgstr "不明な証明書"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:409
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
-"不明なエラーによりファイルが開けません, ファイルがアクセス可能で整形された "
-"XML ドキュメントであることを確認してください。"
+"ファイルを開く際の不明なエラーです. ファイルにアクセスできるか整形式の XML 文"
+"書かを確認してください."
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "不明なホスト鍵"
 
@@ -7118,14 +7244,16 @@
 msgid ""
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
-msgstr "不明なバージョンの SOCKS ユーザー認証. サブネゴシエーション: %d"
+msgstr ""
+"SOCKS ユーザ名/パスワード認証サブネゴシエーションの不明なプロトコル バージョ"
+"ン: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:454
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
-"不明なルート要素です, ファイルは FileZilla が作成したものではない可能性があり"
-"ます。"
+"不明なルート要素です, ファイルは FileZilla が生成したものではないかもしれませ"
+"ん."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:596
 #: ../../locales/../src/interface/netconfwizard.cpp:607
@@ -7133,32 +7261,32 @@
 "Unless these problems get fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
-"これらの問題を解決するまでアクティブモードFTPは機能せずパッシブモードが使われ"
-"ます。"
+"これらの問題を解決するまでアクティブ モード FTP は機能せずパッシブ モードが使"
+"われます."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:583
 msgid ""
 "Unless this problem gets fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
-"この問題を解決するまでアクティブモードFTPは機能せずパッシブモードが使われま"
-"す。"
+"この問題を解決するまでアクティブ モード FTP は機能せずパッシブ モードが使われ"
+"ます."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:888
 msgid "Unsupported certificate type"
-msgstr "サポートしていない証明書の種類"
+msgstr "未対応の証明書の種類"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:650
 msgid "Unsupported redirect"
-msgstr "サポートしていないリダイレクト"
+msgstr "未対応のリダイレクト"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
-msgstr "アップロードと編集状態解除(&L)"
+msgstr "アップロードして編集中を解除(&L)"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:137
 msgid "Update Check"
-msgstr "更新の確認"
+msgstr "更新チェック"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
 #: ../../locales/../src/interface/updatewizard.cpp:251
@@ -7166,11 +7294,11 @@
 msgid "Update wizard"
 msgstr "更新ウィザード"
 
-#: resources.h:362
+#: resources.h:364
 msgid "Upload"
 msgstr "アップロード"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "アップロード失敗"
 
@@ -7183,128 +7311,131 @@
 msgid "Upload limit: none"
 msgstr "アップロード制限: なし"
 
-#: resources.h:644
+#: resources.h:658
 msgid "Upload selected directory"
-msgstr "選択したディレクトリーをアップロード"
+msgstr "選択したディレクトリをアップロード"
 
-#: resources.h:556
+#: resources.h:566
 msgid "Upload selected files and directories"
-msgstr "選択されたファイルとフォルダーをアップロード"
+msgstr "選択されたファイルとディレクトリをアップロード"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
-msgstr "このファイルをサーバーへ戻すためにアップロードしますか?"
+msgstr "このファイルをサーバに戻すためにアップロードしますか?"
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
-msgstr "このファイルをサーバーにアップロードしますか？"
+msgstr "このファイルをサーバにアップロードしますか?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
-msgstr "アップロードしています"
+msgstr "アップロード中"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
-msgstr "アップロードして未解決状態を取り除く"
+msgstr "アップロード中と未解決を取り除く"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
-msgstr "アップロードと編集状態解除"
+msgstr "アップロード/編集解除中"
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
-msgstr "カスタム文字セットを使う(&C)"
+msgstr "カスタム文字セットを使用(&C)"
 
-#: resources.h:930
+#: resources.h:946
 msgid "Use &custom editor:"
-msgstr "カスタムエディターを使う(&C)"
+msgstr "カスタム エディタを使用(&C):"
 
-#: resources.h:421
+#: resources.h:423
 msgid "Use &default editor for text files"
-msgstr "テキストファイルの標準エディターを使う(&D)"
+msgstr "テキスト ファイルに既定のエディタを使用(&D)"
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
-msgstr "同期ブラウズを有効化(&S)"
+msgstr "同期ブラウジングを使用(&S)"
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
-"サーバーが対応していればUTF-8を使い、そうでなければローカル文字セットを使いま"
-"す。"
+"サーバが対応していれば UTF-8 を使用し, そうでなければローカル文字セットを使用"
+"します."
 
-#: resources.h:257 resources.h:267
+#: resources.h:259 resources.h:269
 msgid "Use default action"
-msgstr "標準の動作を使用する"
+msgstr "既定の動作を使用"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "平文 FTP を使用"
+
+#: resources.h:372
 msgid "Use server currently connected to"
-msgstr "現在接続しているサーバーを使用"
+msgstr "現在接続しているサーバを使用"
 
-#: resources.h:371
+#: resources.h:373
 msgid "Use server from site manager"
-msgstr "サイト マネージャーのサーバーを使用"
+msgstr "サイト マネージャからサーバを使用"
 
-#: resources.h:880
+#: resources.h:896
 msgid "Use system &defaults"
-msgstr "システム標準を使う(&D)"
+msgstr "システムの既定値を使用(&D)"
 
-#: resources.h:690
+#: resources.h:704
 msgid "Use the following IP address:"
-msgstr "以下のIPアドレスを使う:"
+msgstr "以下の IP アドレスを使用:"
 
-#: resources.h:700
+#: resources.h:714
 msgid "Use the following port range:"
-msgstr "以下のポート範囲を使う:"
+msgstr "以下のポート範囲を使用:"
 
-#: resources.h:685
+#: resources.h:699
 msgid "Use the server's external IP address instead"
-msgstr "代わりにサーバーの外部IPアドレスを使用します"
+msgstr "代わりにサーバの外部 IP アドレスを使用"
 
-#: resources.h:691 resources.h:754
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
-msgstr ""
-"もしルータの内側にいて固定外部IPアドレスを持っていれば, これを利用します。"
+msgstr "ルータの下にいて静的な外部 IP アドレスを持つ場合はこれを使用します."
 
-#: resources.h:694
+#: resources.h:708
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
-"もし動的IPアドレスもつこのオプションを使うなら,FileZillaは最初にアクティブ"
-"モードを利用してすぐに,サーバー上のそれぞれのセッションと一度だけコンタクトす"
-"るあなたの利用しているFileZillaのバージョンだけがサーバーに認められています。"
+"動的 IP アドレスを持つ場合はこのオプションを使用します. あなたが初めてアク"
+"ティブ モードを使用するとすぐに, FileZilla は各セッションについて一度上位サー"
+"バと通信します. ご使用の FileZilla のバージョンだけがサーバに送信されます."
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
-msgstr "ユーザー:"
+msgstr "ユーザ:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:502
-#: ../../locales/../src/interface/sitemanager.cpp:1135
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
-msgstr "ユーザー名はスペースの連続であってはなりません"
+msgstr "ユーザ名は空白の連続であってはなりません"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
-msgstr "プロキシー %s を使います"
+msgstr "プロキシ %s を使用中"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
-msgstr "間違った文字セットを設定するとファイル名が正しく表示されません。"
+msgstr ""
+"間違った文字セットを使用すると結果的にファイル名が正しく表示されません."
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
-"このウィザードを使うことによりFileZillaの利用可能なアップデートをチェックする"
-"ことができます。"
+"このウィザードを使用することで FileZilla の利用できる更新をチェックできます."
 
 #: resources.h:5 resources.h:29
 msgid "Valid from:"
@@ -7316,57 +7447,55 @@
 
 #: ../../locales/../src/interface/cmdline.cpp:16
 msgid "Verbose log messages from wxWidgets"
-msgstr "wxWidgets からのメッセージ"
+msgstr "wxWidgets からの詳細ログ メッセージ"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
 msgstr "証明書を検証中..."
 
-#: resources.h:168
+#: resources.h:170
 msgid "Version:"
 msgstr "バージョン:"
 
-#: resources.h:814
+#: resources.h:828
 msgid "Very high"
 msgstr "非常に高い"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
-msgstr ""
-"隠しファイルオプションの設定が見受けられますが, サーバー側でサポートされてい"
-"ません"
+msgstr "隠しオプション セット (サーバが未対応) を表示"
 
-#: resources.h:917
+#: resources.h:933
 msgid "View/Edit"
-msgstr "表示/編集（&V）"
+msgstr "表示/編集"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
-msgstr "表示列"
+msgstr "表示する列"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
-msgstr "書き込み(&R)"
+msgstr "書き込む(&R)"
 
-#: ../../locales/../src/interface/QueueView.cpp:1772
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
-msgstr "待っています"
+msgstr "待機中"
 
-#: ../../locales/../src/interface/QueueView.cpp:1380
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
 msgstr "接続一覧を待っています"
 
-#: ../../locales/../src/interface/QueueView.cpp:1423
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
 msgstr "パスワードを待っています"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Waiting for transfer to be cancelled"
-msgstr "転送が中止されるのを待っています"
+msgstr "転送がキャンセルされるのを待機中"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
-msgstr "再試行をまっています..."
+msgstr "再試行を待機中..."
 
 #: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
@@ -7386,20 +7515,21 @@
 msgstr ""
 "警告\n"
 "\n"
-"WindowsのバグはFileZillaに関する問題を引き起こしました\n"
+"Windows のバグが FileZilla での問題を引き起こしました\n"
 "\n"
-"バグを引き起こすのは次のような場合で- Windows Server 2003 or XP 64\n"
-"- Windowsファイアウォールが有効になっている\n"
-"- アプリケーション層のゲートウェイサービスが有効になっている\n"
-"http://support.microsoft.com/kb/931130 の参考資料をご覧ください。\n"
+"バグを引き起こすのは次のような場合です\n"
+"- Windows Server 2003 または XP 64\n"
+"- Windows ファイアウォールが有効になっている\n"
+"- アプリケーション層のゲートウェイ サービスが有効になっている\n"
+"http://support.microsoft.com/kb/931130 の参考資料をご覧ください.\n"
 "\n"
-"Windowsファイアウォールもアプリケーション層のゲートウェイサービスも無効になっ"
-"ていなければ\n"
-"FileZillaは大きな転送においてタイムアウトします。"
+"Windows ファイアウォールとアプリケーション層のゲートウェイ サービスが無効でな"
+"い場合は,\n"
+"FileZilla は大容量の転送でタイムアウトします."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:966
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr "警告です。間違ったIPからのデータ接続を無視しています。"
+msgstr "警告, 間違った IP からのデータ接続を無視しています."
 
 #: ../../locales/../src/interface/updatewizard.cpp:264
 msgid ""
@@ -7409,249 +7539,254 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"警告, 自己責任にてnightly buildsを使用してください。\n"
-"nightly buildsにはサポートはありません。\n"
-"nightly buildsは期待道理に動かなかったりシステムにダメージを与えるかもしれま"
-"せん。\n"
-"本当にnightly buildsをチェックしたいですか?"
+"警告, nightly builds は自己責任で使用してください.\n"
+"nightly builds にはサポートはありません.\n"
+"nightly builds は期待通りに動かなかったりシステムにダメージを与えるかもしれま"
+"せん.\n"
+"\n"
+"nightly builds を本当にチェックしますか?"
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "警告: セキュリティ違反の可能性!"
 
-#: resources.h:474
+#: resources.h:476
 msgid "Welcome to FileZilla"
-msgstr "ようこそ FileZilla へ"
+msgstr "FileZilla にようこそ"
 
-#: resources.h:463
+#: resources.h:465
 msgid "What's new"
-msgstr "What's new"
+msgstr "新着情報"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
-msgstr "What's new:"
+msgstr "最新情報:"
 
-#: resources.h:817
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
+"有効にすると, ファイルをダウンロードするときに, ファイル名に含まれるローカル "
+"オペレーティング システムが未対応の文字を置換します."
 
-#: resources.h:859
+#: resources.h:873
 msgid "Widescreen"
 msgstr "ワイドスクリーン"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
-msgstr "書き込み(&I)"
+msgstr "書き込む(&R)"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:433
 #: ../../locales/../src/interface/netconfwizard.cpp:440
 msgid "Wrong external IP address"
-msgstr "間違った外部IPアドレス"
+msgstr "間違った外部 IP アドレス"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 msgid "Wrong line endings"
-msgstr "間違った改行"
+msgstr "間違った改行文字"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr "はい"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
-msgstr ""
-"すでに最新のFileZillaを利用しています。いずれまたチェックをしてください。"
+msgstr "既に最新の FileZilla を利用しています. あとで再度チェックしてください."
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
-msgstr ""
+msgstr "このダイアログはいつでもヘルプ メニューから開くことができます."
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
-msgstr ""
+msgstr "既定のポートを使用するにはポート欄を空欄のままにしてください."
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
 msgstr ""
-"オリジナルファイルの持っているバーミッションを維持するには任意の位置でxを使う"
-"ことができます"
+"任意の位置で x を使用することで, 元のファイルのパーミッションを維持できます."
 
 #: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
-msgstr "FileZilla自身の設定ディレクトリーから設定を取り込むことができません。"
+msgstr "FileZilla 自身の設定ディレクトリから設定をインポートできません."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
 msgid ""
 "You cannot replace an invalid character with another invalid character. "
 "Please enter a character that is allowed in filenames."
 msgstr ""
+"正しくない文字を他の正しくない文字に置換することはできません. ファイル名に使"
+"用できる文字を入力してください."
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr ""
-"ファイルの新しい名前を入力しませんでした。その代わりにファイルを上書きします"
+"ファイルの新しい名前を入力しませんでした. その代わりにファイルを上書きします"
 "か?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
-msgstr "少なくともひとつシンボリックリンクを選択しなければなりません。"
+msgstr "少なくとも 1 つのシンボリックリンクを選択する必要があります."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2031
-#: ../../locales/../src/interface/RemoteListView.cpp:2613
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
-msgstr ""
-"11 個以上のファイル／ディレクトリーを選択していますが本当に編集しますか?"
+msgstr "10 個以上のファイルを選択していますが, 本当に編集しますか?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2151
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
-msgstr "11 個以上のファイル／ディレクトリーを選択していますが本当に開きますか?"
+msgstr "10 個以上のファイル/ディレクトリを選択していますが, 本当に開きますか?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:426
-#: ../../locales/../src/interface/sitemanager.cpp:1048
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
-msgstr "ホスト名を入力しなければなりません。"
+msgstr "ホスト名を入力する必要があります."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:817
 msgid "You have to enter a local directory."
-msgstr "ローカルのディレクトリーを入力してください。"
+msgstr "ローカル ディレクトリを入力する必要があります."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:149
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
-msgstr "適切なIPアドレスを入力しなければなりません。"
+msgstr "適切な IP アドレスを入力する必要があります."
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:823
 msgid "You have to enter a writable local directory."
-msgstr "書き込みできるローカルのディレクトリーを入力してください。"
+msgstr "書き込めるローカル ディレクトリを入力する必要があります."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:513
-#: ../../locales/../src/interface/sitemanager.cpp:1145
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
-msgstr "アカウント名を入力しなければなりません。"
+msgstr "アカウント名を入力する必要があります."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:483
-#: ../../locales/../src/interface/sitemanager.cpp:1116
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
-msgstr "ユーザー名を明確にしなければいけません。"
+msgstr "ユーザ名を明確にする必要があります."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
 msgid ""
 "You likely have a router or firewall which erroneously modified the "
 "transferred data."
-msgstr ""
-"転送データを誤って変更したルータもしくはファイアウォールがあるようです。"
+msgstr "転送されたデータを誤って変更したルータ/ファイアウォールがあるようです."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:53
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 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 "ログ ファイルの名前を入力する必要があります。"
+msgstr "ログ ファイル名を入力する必要があります."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1640
 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:70
 msgid "You need to enter a proxy host."
-msgstr "プロキシーのホストを入力しなければなりません。"
+msgstr "プロキシのホストを入力する必要があります."
 
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
 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:74
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:441
-#: ../../locales/../src/interface/sitemanager.cpp:1205
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
-"少なくとも一つのパスを入力する必要があります。空のブックマークはサポートされ"
-"ていません。"
+"少なくとも 1 つのパスを入力する必要があります. 空のブックマークには未対応で"
+"す."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:81
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:448
-#: ../../locales/../src/interface/sitemanager.cpp:1214
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
-"このブックマークで同期ブラウズを有効にするにはローカルパスとリモートパスを両"
-"方設定してください。"
+"このブックマークで同期ブラウジングを有効にするにはローカル パスとリモート パ"
+"スの両方を入力する必要があります."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1170
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 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:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
-msgstr "ローカルファイル名を指定する必要があります。"
+msgstr "ローカル ファイルを指定する必要があります."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
-msgstr "リモートファイル名を指定する必要があります。"
+msgstr "リモート ファイルを指定する必要があります."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
-msgstr "リモートパスを指定する必要があります。"
+msgstr "リモート パスを指定する必要があります."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
-msgstr "サーバーを指定する必要があります。"
+msgstr "サーバを指定する必要があります."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:568
 msgid ""
 "You should have no problems connecting to other servers, file transfers "
 "should work properly."
 msgstr ""
-"他のサーバーへの接続に問題が無いようでしたら,ファイル転送は適切に動作していま"
-"す。"
+"他のサーバへの接続に問題がないようでしたら, ファイル転送は適切に動作していま"
+"す."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "after"
-msgstr "後に"
+msgstr "後"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "before"
-msgstr "前に"
+msgstr "前"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "先頭一致"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "部分一致"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
 msgstr "含まない"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
 msgid "does not equal"
-msgstr "一致しない"
+msgstr "等しくない"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
 msgstr "後方一致"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
 msgstr "完全一致"
 
@@ -7664,7 +7799,7 @@
 
 #: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
-msgstr "fz3temp-lockfile"
+msgstr "fz3temp ロックファイル"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
@@ -7673,320 +7808,82 @@
 "Please make sure this executable exists in the same directory as the main "
 "FileZilla executable."
 msgstr ""
-"fzputtygen を起動できませんでした。\n"
-"この実行ファイルが FileZilla の実行ファイルと同じディレクトリーにあることを確"
-"認してください。"
+"fzputtygen を起動できませんでした.\n"
+"この実行ファイルが FileZilla の実行ファイルと同じディレクトリにあることを確認"
+"してください."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1557
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
 msgid "fzsftp could not be started"
 msgstr "fzsftp を起動できませんでした"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
-msgstr ""
+msgstr "gnutls_certificate_get_peers が証明書を返しませんでした"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr "より大きい"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
 msgstr "グループは実行可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr "グループは読み取り可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr "グループは書き込み可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr "等しい"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr "セットされている"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr "セットされていない"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "より小さい"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
-msgstr "正規表現一致"
+msgstr "正規表現に一致"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
-msgstr "オーナは実行可能"
+msgstr "所有者は実行可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
-msgstr "オーナは読み取り可能"
+msgstr "所有者は読み取り可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
-msgstr "オーナは書き込み可能"
+msgstr "所有者は書き込み可能"
 
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "不明"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
 msgstr "誰でも実行可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr "誰でも読み取り可能"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr "誰でも書き込み可能"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
-
-#~ msgid ";1"
-#~ msgstr ";1"
-
-#~ msgid "A&sk for action"
-#~ msgstr "動作を尋ねる(&s)"
-
-#~ msgid "Add &more"
-#~ msgstr "さらに追加(&m)"
-
-#~ msgid "Any of the following"
-#~ msgstr "いずれかに一致"
-
-#~ msgid "Break current connection?"
-#~ msgstr "現在の接続を切断しますか?"
-
-#~ msgid "Cannot load main menu from resource file"
-#~ msgstr "リソースファイルからツールバーをロードできません"
-
-#~ msgid "Connecting to %s:%d..."
-#~ msgstr "%s:%d に接続しています..."
-
-#~ msgid "Downloads"
-#~ msgstr "ダウンロード"
-
-#~ msgid "Filter &out all files that:"
-#~ msgstr "これらのファイルを除外する:(&O)"
-
-#, fuzzy
-#~ msgid "Invalid filter: %s"
-#~ msgstr "ファイル名が適切ではありません"
-
-#~ msgid "None of the following"
-#~ msgstr "条件に一致しないもの"
-
-#~ msgid "O&verwrite"
-#~ msgstr "上書き(&v)"
-
-#~ msgid "Over&write if source newer"
-#~ msgstr "新しいければ上書き(&w)"
-
-#~ msgid "Queue: %s%d bytes"
-#~ msgstr "キュー: %s%d bytes"
-
-#~ msgid "Rena&me"
-#~ msgstr "名前の変更(&m)"
-
-#~ msgid "Res&ume"
-#~ msgstr "リジューム (続きから転送)(&u)"
-
-#~ msgid "S&kip"
-#~ msgstr "スキップ (転送しない)(&k)"
-
-#~ msgid "Sk&ip"
-#~ msgstr "スキップ (転送しない)(&i)"
-
-#~ msgid "State:"
-#~ msgstr "状態:"
-
-#~ msgid "Uploads"
-#~ msgstr "アップロード"
-
-#~ msgid "Use d&efault"
-#~ msgstr "標準を使う(&E)"
-
-#~ msgid "bytes"
-#~ msgstr "バイト"
-
-#~ msgid "CSftpControlSocket::ChangeDirSend()"
-#~ msgstr "CSftpControlSocket::ChangeDirSend()"
-
-#~ msgid "CSftpControlSocket::ChangeDirSubcommandResult()"
-#~ msgstr "CSftpControlSocket::ChangeDirSubcommandResult()"
-
-#~ msgid ""
-#~ "Could not load \"%s\", please make sure the file is valid and can be "
-#~ "accessed."
-#~ msgstr ""
-#~ "\"%s\" を読む込むことができませんでしたので, ファイルが適当なものでアクセ"
-#~ "スできることを確認してください。"
-
-#~ msgid ""
-#~ "Could not load \"%s\", please make sure the file is valid and can be "
-#~ "accessed.\n"
-#~ "Any changes made in the Site Manager could not be saved."
-#~ msgstr ""
-#~ "\"%s\" を読み込めませんでしたので, ファイルが適当なものでアクセスできるこ"
-#~ "とを確認してください。 \n"
-#~ "サイト マネージャーで行われた変更は保存することができませんでした。"
-
-#~ msgid ""
-#~ "Could not load \"%s\", please make sure the file is valid and can be "
-#~ "accessed.\n"
-#~ "The queue will not be saved."
-#~ msgstr ""
-#~ "\"%s\" を読む込むことができませんでしたので, ファイルが適当なものでアクセ"
-#~ "スできることを確認してください。\n"
-#~ "キューは保存されません。"
-
-#~ msgid "Directory comparison."
-#~ msgstr "ディレクトリーを比較"
-
-#~ msgid "Example:"
-#~ msgstr "例:"
-
-#~ msgid "FileZilla does not support the HTTP protocol"
-#~ msgstr "FileZillaはHTTPプロトコルをサポートしていません"
-
-#~ msgid ""
-#~ "Please make sure you are running the latest version of FileZilla. Visit "
-#~ "http://filezilla-project.org for details."
-#~ msgstr ""
-#~ "あなたの使っている最新のFileZillaを確認してください。詳細はhttp://"
-#~ "filezilla-project.org を訪問してください。"
-
-#~ msgid ""
-#~ "Selected file cannot be opened.\n"
-#~ "No default editor has been set or filetype association is missing or "
-#~ "incorrect."
-#~ msgstr ""
-#~ "選択されたファイルは開かれることができません。\n"
-#~ "標準ではないエディタは設定されているもしくはファイルの種類への関連付けがな"
-#~ "いもしくは誤っています。"
-
-#~ msgid ""
-#~ "Submit a bug report if this problem persists even with the latest version "
-#~ "of FileZilla."
-#~ msgstr ""
-#~ "FilaZillaの最新バージョンでもこの問題が出続けるならバグ報告を出してくださ"
-#~ "い。"
-
-#~ msgid "&Local path:"
-#~ msgstr "ローカル パス(&L):"
-
-#~ msgid "Trace"
-#~ msgstr "トレース"
-
-#~ msgid "D&iscard"
-#~ msgstr "破棄する(&i)"
-
-#~ msgid "Folder"
-#~ msgstr "フォルダー"
-
-#~ msgid "Generic Proxy"
-#~ msgstr "一般プロキシー"
-
-#~ msgid "Updatecheck failed"
-#~ msgstr "アップデートチェックに失敗しました"
-
-#~ msgid "No pending connection"
-#~ msgstr "待ち状態の接続はありません"
-
-#~ msgid "Error %d writing to socket"
-#~ msgstr "エラー %d ソケットへの書き込み"
-
-#~ msgid "Invalid hostname or host not found"
-#~ msgstr "適当ではないホスト名もしくはホストが見つからない"
-
-#~ msgid "Default"
-#~ msgstr "標準"
-
-#~ msgid "Queue: %s%d KB"
-#~ msgstr "キュー: %s%d KB"
-
-#~ msgid "Could not get replyfrom fzputtygen."
-#~ msgstr "fzputtygen からの結果を取得できません。"
-
-#~ msgid "No themes in themes.xml"
-#~ msgstr "themes.xmlにテーマがありません"
-
-#~ msgid "Theme error"
-#~ msgstr "テーマ エラー"
-
-#~ msgid "themes.xml missing, can not get theme data"
-#~ msgstr "themes.xml がありません, テーマデータを取得できません"
-
-#~ msgid ""
-#~ "Some misconfigured remote servers which are behind a router, may reply "
-#~ "with their local ip address."
-#~ msgstr ""
-#~ "ルータの下にある間違った設定をされたリモートサーバーはローカルIPアドレスを"
-#~ "返すかもしれません。"
-
-#~ msgid "A&scii"
-#~ msgstr "アスキー(&A)"
-
-#~ msgid "Large icons"
-#~ msgstr "大きいアイコン"
-
-#~ msgid "Medium icons"
-#~ msgstr "中サイズのアイコン"
-
-#~ msgid "Small icons"
-#~ msgstr "小さいアイコン"
-
-#~ msgid ""
-#~ "The target file already exists.\n"
-#~ "Would you like to replace the file"
-#~ msgstr ""
-#~ "ターゲットのファイルはすでに存在しています。\n"
-#~ "このファイルを置き換えますか"
-
-#~ msgid "with the following file?"
-#~ msgstr "以下のファイルと…"
-
-#~ msgid "Can't write data to file, disk is full."
-#~ msgstr "ディスクが一杯でファイルにデータを書けません"
-
-#~ msgid "Failed to get data peer address, connection closed."
-#~ msgstr "データに対するアドレス取得に失敗しましたので,接続を切断しました。"
-
-#~ msgid ""
-#~ "Please make sure your router is using the latest available firmware. "
-#~ "Furthermore, your router has to be configured properly. You will have to "
-#~ "manual port forwarding. Don't run your router in the so called 'DMZ mode' "
-#~ "or 'game mode'."
-#~ msgstr ""
-#~ "ルータの利用可能な最新のファームウェアを確認してください。その上で,ルータ"
-#~ "を適切に設定すべきです。手動ポート転送が必要になるでしょう。'DMZモード' "
-#~ "や 'ゲームモード'と呼ばれるものをルータで起動してはいけません。"
-
-#~ msgid "item not found"
-#~ msgstr "項目が見つかりません"
-
-#~ msgid "Ok"
-#~ msgstr "了解"
-
-#~ msgid ""
-#~ "Click on next to download the new version.\n"
-#~ "Alternatively, visit http://filezilla-project.org to download the most "
-#~ "recent version."
-#~ msgstr ""
-#~ "新しいバージョンをダウンロードするには次へをクリックしてください。その他の"
-#~ "方法としては, 最新バージョンをダウンロードするために http://filezilla-"
-#~ "project.org を訪問してください。"
-
-#~ msgid "(0-99, -1 for infinite retries)"
-#~ msgstr "(0-99, -1で無制限試行)"
diff -Nru filezilla-3.5.3/locales/ku.po filezilla-3.7.3~precise/locales/ku.po
--- filezilla-3.5.3/locales/ku.po	2010-06-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ku.po	2012-10-21 20:00:08.000000000 +0000
@@ -2,12 +2,12 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-#
+# 
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
 "PO-Revision-Date: 2005-07-27 11:26+0200\n"
 "Last-Translator: rezan <rtovjin@kovaraw.com>\n"
 "Language-Team: Kurdish\n"
@@ -17,16 +17,16 @@
 "Plural-Forms: nplurals=2; plural=(n!= 1);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:225
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S derbas bû"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S maye"
 
-#: resources.h:772
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -42,9 +42,9 @@
 msgstr[0] "Peldankekê çêke"
 msgstr[1] "Peldankekê çêke"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -53,9 +53,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
 #, fuzzy, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -76,7 +76,7 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d dosya kete dorê"
@@ -88,46 +88,46 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:769
+#: resources.h:785
 msgid "%h - Host"
 msgstr ""
 
-#: resources.h:771
+#: resources.h:787
 #, fuzzy, no-c-format
 msgid "%p - Password"
 msgstr "N&asnav:"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:181
 #, fuzzy, c-format
 msgid "%s (%d B/s)"
 msgstr "%s bayt (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
+#: ../../locales/../src/interface/statuslinectrl.cpp:179
 #, fuzzy, c-format
 msgid "%s (%d.%d KB/s)"
 msgstr "%s bayt (%d.%d KB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
+#: ../../locales/../src/interface/statuslinectrl.cpp:177
 #, fuzzy, c-format
 msgid "%s (%d.%d MB/s)"
 msgstr "%s bayt (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
 #, fuzzy, c-format
 msgid "%s (? B/s)"
 msgstr "%s bayt (? B/s)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr ""
 
-#: resources.h:773
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr ""
@@ -169,7 +169,7 @@
 msgid "%s bytes (%d.%d MB/s)"
 msgstr "%s bayt (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -179,7 +179,7 @@
 "bug report."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -190,51 +190,51 @@
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr ""
 
-#: resources.h:770
+#: resources.h:786
 #, fuzzy, no-c-format
 msgid "%u - Username"
 msgstr "&Navê Bikarhêner:"
 
-#: resources.h:774
+#: resources.h:790
 #, fuzzy, no-c-format
 msgid "%w - Proxy password"
 msgstr "Nasnavê bipirse"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
 msgstr "&Der barê de..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr ""
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "&Çalak e"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr ""
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "&Dosiyan têxe dorê"
 
-#: resources.h:782
+#: resources.h:798
 msgid "&Add keyfile..."
 msgstr ""
 
-#: resources.h:624 resources.h:643
+#: resources.h:640 resources.h:659
 #, fuzzy
 msgid "&Add to queue"
 msgstr "&Dosiyan têxe dorê"
 
-#: resources.h:94
+#: resources.h:95
 #, fuzzy
 msgid "&Adjust server timezone offset:"
 msgstr "Cudahiya herêma demî ya pêşkêşker bipergalîne:"
@@ -243,16 +243,16 @@
 msgid "&Always trust certificate in future sessions."
 msgstr ""
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
 
-#: resources.h:932
+#: resources.h:950
 #, fuzzy
 msgid "&Always use default editor"
 msgstr "&Her demê vê kirinê bi kar bîne"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr ""
 
@@ -260,269 +260,275 @@
 msgid "&Always use this action"
 msgstr "&Her demê vê kirinê bi kar bîne"
 
-#: resources.h:750
+#: resources.h:766
 #, fuzzy
 msgid "&Ask your operating system for the external IP address"
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "&Bixweber"
 
-#: resources.h:106
+#: resources.h:107
 #, fuzzy
 msgid "&Autodetect"
 msgstr "&Bixweber"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr ""
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "&Dubendî"
 
-#: resources.h:892
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr ""
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "&Ger..."
 
-#: resources.h:809
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr ""
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "&Betal"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr ""
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr ""
 
-#: resources.h:601
+#: resources.h:613
 #, fuzzy
 msgid "&Close FileZilla"
 msgstr "FileZilla'yê bigire"
 
-#: resources.h:664
+#: resources.h:680
 msgid "&Configure speed limits..."
 msgstr ""
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
 msgstr ""
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "&Girêde"
 
-#: resources.h:217
+#: resources.h:219
 #, fuzzy
 msgid "&Copy"
 msgstr "&Ji Ber Bigire"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr ""
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "&Têxe panoyê"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr ""
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
 msgstr "&Peldankê çêke"
 
-#: resources.h:659
+#: resources.h:675
 #, fuzzy
 msgid "&Create new tab"
 msgstr "&Peldankê çêke"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr ""
 
-#: resources.h:959
+#: resources.h:977
 msgid "&Debug information in message log:"
 msgstr ""
 
-#: resources.h:925
+#: resources.h:943
 #, fuzzy
 msgid "&Default editor:"
 msgstr "Peldanka &dûr a wekî heyî:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr ""
 
-#: resources.h:732
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
 msgstr ""
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "&Jê bibe"
 
-#: resources.h:456
+#: resources.h:458
 #, fuzzy
 msgid "&Delete symlink"
 msgstr "&Jê bibe"
 
-#: resources.h:510
+#: resources.h:519
 #, fuzzy
 msgid "&Directory comparison"
 msgstr "Berêvekirin"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
 
-#: resources.h:537
+#: resources.h:547
 #, fuzzy
 msgid "&Disconnect"
 msgstr "&Zû Girêde"
 
-#: resources.h:602
+#: resources.h:614
 #, fuzzy
 msgid "&Disconnect from server"
 msgstr "Têkiliya bi pêşkêşker de tê birrîn"
 
-#: resources.h:868
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 
-#: resources.h:890
+#: resources.h:908
 msgid "&Display size in bytes"
 msgstr ""
 
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "Nasnavê binivîse"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr ""
 
-#: resources.h:755
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
 msgstr ""
 
-#: resources.h:912
+#: resources.h:930
 msgid "&Double-click action on files:"
 msgstr ""
 
-#: resources.h:572 resources.h:622
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "&Daxe"
 
-#: resources.h:442
+#: resources.h:444
 #, fuzzy
 msgid "&Download to:"
 msgstr "&Daxe"
 
-#: resources.h:657
+#: resources.h:673
 #, fuzzy
 msgid "&Download..."
 msgstr "&Daxe"
 
-#: resources.h:256 resources.h:831
+#: resources.h:258 resources.h:847
 #, fuzzy
 msgid "&Downloads:"
 msgstr "&Daxe"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "&Bipergalîne"
 
-#: resources.h:209
+#: resources.h:211
 #, fuzzy
 msgid "&Edit filter rules..."
 msgstr "&Taybetiyên Dosiyê"
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 #, fuzzy
 msgid "&Enable"
 msgstr "H&emûyî jê bibe"
 
-#: resources.h:940
+#: resources.h:958
 msgid "&Enable automatic update check"
 msgstr ""
 
-#: resources.h:480 resources.h:804
+#: resources.h:482 resources.h:820
 msgid "&Enable speed limits"
 msgstr ""
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr ""
 
-#: resources.h:609
+#: resources.h:82
+#, fuzzy
+msgid "&Encryption:"
+msgstr "Têkilî pêk tê"
+
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "&Fermaneke şexsî binivîse..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "&Bixebitîne"
 
-#: resources.h:291
+#: resources.h:293
 #, fuzzy
 msgid "&Export Site Manager entries"
 msgstr "&Gerînendeyê Malperê"
 
-#: resources.h:497 resources.h:653
+#: resources.h:506 resources.h:669
 #, fuzzy
 msgid "&Export..."
 msgstr "&Der barê de..."
 
-#: resources.h:760
+#: resources.h:776
 msgid "&Fall back to active mode"
 msgstr ""
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "&Dosya"
 
-#: resources.h:634
+#: resources.h:650
 #, fuzzy
 msgid "&File Attributes..."
 msgstr "&Taybetiyên Dosiyê"
 
-#: resources.h:588
+#: resources.h:600
 #, fuzzy
 msgid "&File permissions..."
 msgstr "Xwediyên destûrê"
 
-#: resources.h:364
+#: resources.h:366
 #, fuzzy
 msgid "&File:"
 msgstr "&Dosya"
 
-#: resources.h:219
+#: resources.h:221
 #, fuzzy
 msgid "&Filter conditions:"
 msgstr "Dosya hene"
 
-#: resources.h:198
+#: resources.h:200
 #, fuzzy
 msgid "&Filter sets:"
 msgstr "Dosya hene"
 
-#: resources.h:213
+#: resources.h:215
 #, fuzzy
 msgid "&Filters:"
 msgstr "&Dosya"
@@ -531,159 +537,159 @@
 msgid "&Finish"
 msgstr ""
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr ""
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 
-#: resources.h:753
+#: resources.h:769
 #, fuzzy
 msgid "&Get external IP address from the following URL:"
 msgstr "&Navnîşana IP ya Derve:"
 
-#: resources.h:551
+#: resources.h:561
 #, fuzzy
 msgid "&Getting help..."
 msgstr "&Mîheng"
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr ""
 
-#: resources.h:789
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr ""
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "&Alîkarî"
 
-#: resources.h:514 resources.h:640
+#: resources.h:523 resources.h:656
 #, fuzzy
 msgid "&Hide identical files"
 msgstr "Pêşkêşker / Dosiya herêmî"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "&Herî Bilind"
 
-#: resources.h:748
+#: resources.h:764
 msgid "&Highest available port:"
 msgstr "&Port a herî pir bikêrhatî:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
 msgstr "&Komputera Sereke:"
 
-#: resources.h:891
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:879
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr ""
 
-#: resources.h:498
+#: resources.h:507
 #, fuzzy
 msgid "&Import..."
 msgstr "&Der barê de..."
 
-#: resources.h:934
+#: resources.h:952
 #, fuzzy
 msgid "&Inherit system's filetype associations"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 
-#: resources.h:854
+#: resources.h:870
 #, fuzzy
 msgid "&Layout of file and directory panes:"
 msgstr "Tu dixwazî dosya an jî peldanka hilbijartî jê bibî?"
 
-#: resources.h:745
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Portên herêmê yên ji aliyê FileZilla ve tê bikaranîn bi sînor bike"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
 msgstr "&Hejmara girêdanên hevdem bi sînor bike"
 
-#: resources.h:519
+#: resources.h:529
 #, fuzzy
 msgid "&Local directory tree"
 msgstr "Peldanka &herêmî ya wekî heyî:"
 
-#: resources.h:401 resources.h:407
+#: resources.h:403 resources.h:409
 #, fuzzy
 msgid "&Local directory:"
 msgstr "Peldanka &herêmî ya wekî heyî:"
 
-#: resources.h:949
+#: resources.h:967
 #, fuzzy
 msgid "&Log to file"
 msgstr "Dosiya dûr"
 
-#: resources.h:82
+#: resources.h:83
 #, fuzzy
 msgid "&Logon Type:"
 msgstr "&Cureyê têketinê:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&Cureyê têketinê:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "&Nizim"
 
-#: resources.h:545
+#: resources.h:555
 #, fuzzy
 msgid "&Manage bookmarks..."
 msgstr "&Gerînendeyê Malperê"
 
-#: resources.h:533
+#: resources.h:543
 #, fuzzy
 msgid "&Manual transfer..."
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "&Hejmara herî zêde ya têkiliyan:"
 
-#: resources.h:730
+#: resources.h:746
 #, fuzzy
 msgid "&Maximum number of retries:"
 msgstr "&Hejmara herî zêde ya têkiliyan:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
 msgstr ""
 
-#: resources.h:866
+#: resources.h:883
 msgid "&Minimize to tray"
 msgstr ""
 
-#: resources.h:399
+#: resources.h:401
 #, fuzzy
 msgid "&Name:"
 msgstr "Nav:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr ""
 
-#: resources.h:214
+#: resources.h:216
 #, fuzzy
 msgid "&New"
 msgstr "&Malpereke Nû"
@@ -702,37 +708,37 @@
 msgid "&Next >"
 msgstr "&Malpereke Nû"
 
-#: resources.h:318
+#: resources.h:320
 #, fuzzy
 msgid "&No"
 msgstr "&Asayî"
 
-#: resources.h:763 resources.h:788
+#: resources.h:779 resources.h:804
 #, fuzzy
 msgid "&None"
 msgstr "&Asayî"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "&Asayî"
 
-#: resources.h:941
+#: resources.h:959
 msgid "&Number of days between update checks:"
 msgstr ""
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
 msgstr "&Nirxa hejmarî:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&Temam"
 
-#: resources.h:766
+#: resources.h:782
 msgid "&OPEN"
 msgstr ""
 
-#: resources.h:561 resources.h:645
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr ""
 
@@ -740,111 +746,119 @@
 msgid "&Overwrite"
 msgstr "&Li Ser Binivîse"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "&Ne Çalak"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "&Nasnav:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr ""
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:860
+#: resources.h:876
 #, fuzzy
 msgid "&Position of the message log:"
 msgstr "Destûra dîtinê ya tomariya peyaman biguherîne"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr ""
 
-#: resources.h:300
+#: resources.h:302
 #, fuzzy
 msgid "&Queue"
 msgstr "&Bidomîne"
 
-#: resources.h:718
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "&Zû Girêde"
 
-#: resources.h:517
+#: resources.h:527
 #, fuzzy
 msgid "&Quickconnect bar"
 msgstr "&Zû Girêde"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "&Bixwîne"
 
-#: resources.h:536
+#: resources.h:546
 #, fuzzy
 msgid "&Reconnect"
 msgstr "&Girêde"
 
-#: resources.h:508 resources.h:662
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
 msgstr ""
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
 msgstr "&Nasnava danişîne bi bîr bîne"
 
-#: resources.h:403 resources.h:409
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 #, fuzzy
 msgid "&Remote directory:"
 msgstr "&Peldankê çêke"
 
-#: resources.h:367
+#: resources.h:369
 #, fuzzy
 msgid "&Remote path:"
 msgstr "Malpera dûr:"
 
-#: resources.h:825
+#: resources.h:841
 msgid "&Remove"
 msgstr "&Rake"
 
-#: resources.h:783
+#: resources.h:799
 #, fuzzy
 msgid "&Remove key"
 msgstr "&Rake"
 
-#: resources.h:592
+#: resources.h:604
 #, fuzzy
 msgid "&Remove selected"
 msgstr "Malpera dûr:"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "&Ji Nû Ve Bi Nav Bike"
 
-#: resources.h:200
+#: resources.h:202
 #, fuzzy
 msgid "&Rename..."
 msgstr "&Ji Nû Ve Bi Nav Bike"
 
-#: resources.h:323
+#: resources.h:325
 #, fuzzy
 msgid "&Reopen local file"
 msgstr "Pêşkêşker / Dosiya herêmî"
 
-#: resources.h:816
+#: resources.h:832
 msgid "&Replace invalid characters with:"
 msgstr ""
 
-#: resources.h:552
+#: resources.h:562
 #, fuzzy
 msgid "&Report a bug..."
 msgstr "&Der barê de..."
 
-#: resources.h:711
+#: resources.h:630
+msgid "&Reset and requeue all"
+msgstr ""
+
+#: resources.h:727
 msgid "&Restart Wizard"
 msgstr ""
 
@@ -852,36 +866,36 @@
 msgid "&Resume"
 msgstr "&Bidomîne"
 
-#: resources.h:603
+#: resources.h:615
 #, fuzzy
 msgid "&Run command..."
 msgstr "Fer&mana şexsî binivîse..."
 
-#: resources.h:725
+#: resources.h:741
 msgid "&Run configuration wizard now..."
 msgstr ""
 
-#: resources.h:943
+#: resources.h:961
 msgid "&Run update check now..."
 msgstr ""
 
-#: resources.h:765
+#: resources.h:781
 msgid "&SITE"
 msgstr ""
 
-#: resources.h:790
+#: resources.h:806
 msgid "&SOCKS 5"
 msgstr ""
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr ""
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
 msgstr ""
 
-#: resources.h:538
+#: resources.h:548
 #, fuzzy
 msgid "&Search remote files..."
 msgstr "Dosiyên dê herin hember tên dîtin"
@@ -891,45 +905,45 @@
 msgid "&Select Entry:"
 msgstr "Têketinê hilbijêre:"
 
-#: resources.h:923
+#: resources.h:941
 msgid "&Select language:"
 msgstr "&Peymanê hilbijêre:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr ""
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&Pêşkêşker"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "&Mîheng"
 
-#: resources.h:505
+#: resources.h:514
 #, fuzzy
 msgid "&Settings..."
 msgstr "&Mîheng"
 
-#: resources.h:958
+#: resources.h:976
 msgid "&Show debug menu"
 msgstr ""
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr ""
 
-#: resources.h:948
+#: resources.h:966
 msgid "&Show timestamps in message log"
 msgstr ""
 
-#: resources.h:490
+#: resources.h:499
 #, fuzzy
 msgid "&Site Manager..."
 msgstr "&Gerînendeyê Malperê"
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr ""
 
@@ -937,16 +951,16 @@
 msgid "&Skip"
 msgstr "&Derbas be"
 
-#: resources.h:532
+#: resources.h:542
 msgid "&Speed limits"
 msgstr ""
 
-#: resources.h:448
+#: resources.h:450
 #, fuzzy
 msgid "&Start transfer immediately"
 msgstr "Cureyê ragihandinê ya wekî heyî:"
 
-#: resources.h:859
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr ""
 
@@ -955,78 +969,78 @@
 msgid "&Test"
 msgstr "H&erî Nizm"
 
-#: resources.h:871
+#: resources.h:889
 msgid "&Theme:"
 msgstr "&Dirb:"
 
-#: resources.h:522
+#: resources.h:532
 #, fuzzy
 msgid "&Transfer"
 msgstr "Tê ragihandin"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
 msgstr "&Mod a ragihandinê:"
 
-#: resources.h:521
+#: resources.h:531
 #, fuzzy
 msgid "&Transfer queue"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:828
+#: resources.h:844
 #, fuzzy
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Van cureyên dosiyan wekî Ascii têbigihîje:"
 
-#: resources.h:329
+#: resources.h:331
 #, fuzzy
 msgid "&Unedit"
 msgstr "Unix"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr ""
 
-#: resources.h:555 resources.h:641
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "&Bar ke"
 
-#: resources.h:266 resources.h:840
+#: resources.h:268 resources.h:856
 #, fuzzy
 msgid "&Uploads:"
 msgstr "&Bar ke"
 
-#: resources.h:424
+#: resources.h:426
 msgid "&Use custom program"
 msgstr ""
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
 msgstr ""
 
-#: resources.h:927
+#: resources.h:945
 #, fuzzy
 msgid "&Use system's default editor for text files"
 msgstr "&Wekî Heyî"
 
-#: resources.h:751
+#: resources.h:767
 #, fuzzy
 msgid "&Use the following IP address:"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:759
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
 msgstr ""
 
-#: resources.h:894
+#: resources.h:912
 msgid "&Use thousands separator"
 msgstr ""
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "&Bikarhêner:"
 
-#: resources.h:714
+#: resources.h:730
 msgid "&Username:"
 msgstr "&Navê Bikarhêner:"
 
@@ -1035,48 +1049,48 @@
 msgid "&Version %s"
 msgstr "Destûr"
 
-#: resources.h:507
+#: resources.h:516
 #, fuzzy
 msgid "&View"
 msgstr "&Malpereke Nû"
 
-#: resources.h:578
+#: resources.h:588
 #, fuzzy
 msgid "&View/Edit"
 msgstr "&Bipergalîne"
 
-#: resources.h:933
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "&Binivîse"
 
-#: resources.h:317
+#: resources.h:319
 #, fuzzy
 msgid "&Yes"
 msgstr "H&erî Nizm"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr ""
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, fuzzy, c-format
 msgid "'%s' is not a directory."
 msgstr "Peldankekê çêke"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1091,39 +1105,39 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: resources.h:800 resources.h:802
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr ""
 
-#: resources.h:731
+#: resources.h:747
 msgid "(0-99)"
 msgstr ""
 
-#: resources.h:733
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr ""
 
-#: resources.h:798
+#: resources.h:814
 msgid "(1-10)"
 msgstr ""
 
-#: resources.h:727
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
 msgstr ""
 
-#: resources.h:942
+#: resources.h:960
 msgid "(At least 7 days)"
 msgstr ""
 
-#: resources.h:887
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr ""
 
-#: resources.h:881
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr ""
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
 #, c-format
 msgid "(in %s/s)"
 msgstr ""
@@ -1138,23 +1152,23 @@
 msgid ", --:--:-- left"
 msgstr "--:--:-- maye"
 
-#: resources.h:699
+#: resources.h:715
 msgid "-"
 msgstr ""
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr ""
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr ""
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr ""
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
 msgstr "--:--:-- maye"
 
@@ -1174,32 +1188,32 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr ""
 
-#: resources.h:960
+#: resources.h:978
 msgid "0 - None"
 msgstr ""
 
-#: resources.h:961
+#: resources.h:979
 msgid "1 - Warning"
 msgstr ""
 
-#: resources.h:962
+#: resources.h:980
 msgid "2 - Info"
 msgstr ""
 
-#: resources.h:963
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 #, fuzzy
 msgid "32 bit system"
 msgstr "Malpera dûr:"
 
-#: resources.h:964
+#: resources.h:982
 msgid "4 - Debug"
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 #, fuzzy
 msgid "64 bit system"
 msgstr "Malpera dûr:"
@@ -1208,11 +1222,11 @@
 msgid "< &Back"
 msgstr ""
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 #, fuzzy
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
@@ -1224,39 +1238,39 @@
 msgid "A default editor needs to be set."
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr ""
 
-#: resources.h:671
+#: resources.h:687
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1265,17 +1279,17 @@
 "No further warning will be displayed this session."
 msgstr ""
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
 
-#: resources.h:743
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1287,69 +1301,74 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr ""
 
-#: resources.h:824
+#: resources.h:840
 msgid "A&dd"
 msgstr "&Têxê"
 
-#: resources.h:851
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
 msgstr ""
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "B&i tenê ji bo daxistinan bisepîne"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "Bi &tenê ji bo barkirinan bisepîne"
 
-#: resources.h:148
+#: resources.h:149
 #, fuzzy
 msgid "A&pply to all files and directories"
 msgstr "Tu dixwazî dosya an jî peldanka hilbijartî jê bibî?"
 
-#: resources.h:388
+#: resources.h:637
+#, fuzzy
+msgid "A&utomatically remove successful transfers"
+msgstr "Cureyê ragihandinê ya wekî heyî:"
+
+#: resources.h:390
 msgid "ASCII"
 msgstr ""
 
-#: resources.h:478
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
 msgstr ""
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
 msgstr "Der barê FileZilla de"
 
-#: resources.h:861
+#: resources.h:877
 #, fuzzy
 msgid "Above the file lists"
 msgstr "Lîsteya dosya û peldanka nû dike"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr ""
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr ""
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr ""
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
 msgstr ""
 
@@ -1382,25 +1401,25 @@
 "address."
 msgstr ""
 
-#: resources.h:756
+#: resources.h:772
 msgid "Active mode IP"
 msgstr "IP ya mod a çalak"
 
-#: resources.h:449
+#: resources.h:451
 #, fuzzy
 msgid "Add files to &queue only"
 msgstr "&Dosiyan têxe dorê"
 
-#: resources.h:625 resources.h:644
+#: resources.h:641 resources.h:660
 #, fuzzy
 msgid "Add selected directory to the transfer queue"
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
 
-#: resources.h:914 resources.h:920
+#: resources.h:932 resources.h:938
 #, fuzzy
 msgid "Add to queue"
 msgstr "&Dosiyan têxe dorê"
@@ -1409,29 +1428,29 @@
 msgid "Address type not supported"
 msgstr ""
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "Pêşketî"
 
-#: resources.h:233
+#: resources.h:235
 #, fuzzy
 msgid "Advanced options:"
 msgstr "Pêşketî"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "All files have been successfully transferred"
 msgstr ""
 
-#: resources.h:700
+#: resources.h:716
 #, fuzzy
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Port a herî nizm a tê bikaranîn divê di navbera 1 û 65535'an de be."
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, fuzzy, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
@@ -1442,26 +1461,26 @@
 "\"%s\" nayê nivîsîn, guhertinên di Gerînendeyê Malperê de dê neyên "
 "tomarkiirin."
 
-#: resources.h:739
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr ""
 
-#: resources.h:675
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
 msgstr ""
 
-#: resources.h:475
+#: resources.h:477
 #, fuzzy
 msgid "Already connected"
 msgstr "Têkilî pêk hat"
 
-#: resources.h:784
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
 
-#: resources.h:785
+#: resources.h:801
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1473,57 +1492,71 @@
 "recent version."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Nenas"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 #, fuzzy
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "\"%s\" nayê nivîsîn, guhertinên di Gerînendeyê Malperê de dê neyên "
 "tomarkiirin."
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../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 ""
 
-#: ../../locales/../src/interface/filter.cpp:194
+#: ../../locales/../src/interface/filter.cpp:209
 #, fuzzy
 msgid "Any changes made to the filters could not be saved."
 msgstr ""
 "\"%s\" nayê nivîsîn, guhertinên di Gerînendeyê Malperê de dê neyên "
 "tomarkiirin."
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr ""
 
-#: resources.h:150
+#: resources.h:151
 #, fuzzy
 msgid "App&ly to directories only"
 msgstr "Bi tenê ji &bo dora derbasdar bisepîne"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
 msgstr ""
 
@@ -1531,42 +1564,42 @@
 msgid "Apply to &current queue only"
 msgstr "Bi tenê ji &bo dora derbasdar bisepîne"
 
-#: resources.h:149
+#: resources.h:150
 #, fuzzy
 msgid "Apply to &files only"
 msgstr "Bi tenê ji &bo dora derbasdar bisepîne"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 #, fuzzy
 msgid "Archive"
 msgstr "&Çalak e"
 
-#: resources.h:863
+#: resources.h:879
 #, fuzzy
 msgid "As tab in the transfer queue pane"
 msgstr "Dê destûra dîtinê ya dora ragihandinê biguhere"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 #, fuzzy
 msgid "Ask for action"
 msgstr "Nasnavê bipirse"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Nasnavê bipirse"
 
-#: resources.h:696
+#: resources.h:712
 msgid "Ask operating system for a port."
 msgstr ""
 
-#: resources.h:686
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
 msgstr ""
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr ""
 
@@ -1574,108 +1607,112 @@
 msgid "Associated program not found:"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
 msgstr ""
 
-#: resources.h:705
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 #, fuzzy
 msgid "Attribute"
 msgstr "&Taybetiyên Dosiyê"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 #, fuzzy
 msgid "Authentication failed."
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:872
+#: resources.h:890
 msgid "Author:"
 msgstr "Nivîskar:"
 
-#: resources.h:385
+#: resources.h:387
 #, fuzzy
 msgid "Auto"
 msgstr "&Bixweber"
 
-#: resources.h:822
+#: resources.h:838
 msgid "Automatic file type classification"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: resources.h:939
+#: resources.h:957
 msgid "Automatic update check"
 msgstr ""
 
-#: resources.h:876
+#: resources.h:894
 #, fuzzy
 msgid "Available sizes"
 msgstr "Mezinahiya dosiyê"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
 msgstr ""
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr ""
 
-#: resources.h:865
+#: resources.h:881
 msgid "Behaviour"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
 msgstr ""
 
-#: resources.h:389
+#: resources.h:391
 #, fuzzy
 msgid "Binary"
 msgstr "&Dubendî"
 
-#: resources.h:858
+#: resources.h:874
 msgid "Blackboard"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr ""
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
 msgstr ""
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
 msgstr ""
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
 msgstr "Dîroka hilberînê:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
 msgstr "Agahiya hilberînê"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
 msgstr ""
 
-#: resources.h:746
+#: resources.h:762
 #, fuzzy
 msgid ""
 "By default uses any available local port to establish transfers in active "
@@ -1687,76 +1724,76 @@
 "sînorkirî \n"
 " bi kar bîne, vê navberê bîne jêr."
 
-#: resources.h:535
+#: resources.h:545
 #, fuzzy
 msgid "C&ancel current operation"
 msgstr "Xebata derbasdar betal bike"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr ""
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
 msgstr "H&emûyî jê bibe"
 
-#: resources.h:586 resources.h:632
+#: resources.h:598 resources.h:648
 #, fuzzy
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Têxe panoyê"
 
-#: resources.h:880
+#: resources.h:898
 #, fuzzy
 msgid "C&ustom"
 msgstr "&Bixweber"
 
-#: resources.h:935
+#: resources.h:953
 #, fuzzy
 msgid "C&ustom filetype associations:"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
 msgstr ""
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
 msgstr "Dosya nayê xwendin"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:712
+#: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
 msgstr "Dane li dosiyê nayê nivîsîn."
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
 #, fuzzy, c-format
 msgid "Can't write data to file: %s"
 msgstr "Dane li dosiyê nayê nivîsîn."
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Betal"
 
-#: resources.h:982
+#: resources.h:1000
 msgid "Cancel current operation"
 msgstr "Xebata derbasdar betal bike"
 
-#: resources.h:983
+#: resources.h:1001
 msgid "Cancels the current operation"
 msgstr "Dê xebata derbasdar betal bike"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 #, fuzzy
 msgid "Cannot add server to Site Manager"
 msgstr "Gerînendeyê Malperê veke"
@@ -1773,7 +1810,7 @@
 "directories are enabled"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 #, fuzzy
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Bi pêşkêşker re têkilî çênabe"
@@ -1783,35 +1820,35 @@
 msgid "Cannot create new filter"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 #, fuzzy
 msgid "Cannot edit file"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 #, fuzzy
 msgid "Cannot edit file, not connected to any server."
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Ji dosiya çavkaniyê darikê Zûgirêde nayê barkirin"
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
 msgstr ""
 
@@ -1820,53 +1857,53 @@
 msgid "Cannot load keyfile"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
 msgstr "Ji dosya çavkaniyê darikê amûran nayê barkirin"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 #, fuzzy
 msgid "Cannot rename entry"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 #, fuzzy
 msgid "Cannot save filterset"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 #, fuzzy
 msgid "Cannot select filter"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 #, fuzzy
 msgid "Cannot set file association"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 #, fuzzy
 msgid "Cannot view/edit selected file"
 msgstr "Dosya ji nû ve nayê bi navkirin"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
 msgstr ""
 
@@ -1882,40 +1919,40 @@
 msgid "Certificate issuer"
 msgstr ""
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
 msgstr "Nasnameyê Bipirse:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
 msgstr "Taybetiyên dosiyê biguhere"
 
-#: resources.h:589 resources.h:635
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
 msgstr "Destûrên dosiyê biguhere."
 
-#: resources.h:956
+#: resources.h:974
 #, fuzzy
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Paceya mîhengan a FileZilla'yê veke"
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
 msgstr ""
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr ""
 
-#: resources.h:944
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
 msgstr ""
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr ""
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr ""
 
@@ -1923,7 +1960,7 @@
 msgid "Check for updates"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 #, fuzzy
 msgid "Check for updates failed"
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
@@ -1932,7 +1969,7 @@
 msgid "Checking for correct external IP address"
 msgstr ""
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
 msgstr ""
 
@@ -1940,13 +1977,13 @@
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
 msgstr "Peldanka herêmî ya wekî heyî hilbijêre"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 #, fuzzy
 msgid "Choose the local directory"
 msgstr "Peldanka herêmî ya wekî heyî hilbijêre"
@@ -1960,55 +1997,59 @@
 msgid "Cipher:"
 msgstr "Nivîskar:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
 msgstr ""
 
-#: resources.h:855
+#: resources.h:871
 msgid "Classic"
 msgstr ""
 
-#: resources.h:285
+#: resources.h:287
 #, fuzzy
 msgid "Clear &Site Manager entries"
 msgstr "&Gerînendeyê Malperê"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
 msgstr ""
 
-#: resources.h:283
+#: resources.h:285
 #, fuzzy
 msgid "Clear &quickconnect history"
 msgstr "&Zû Girêde"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr ""
 
-#: resources.h:286
+#: resources.h:288
 #, fuzzy
 msgid "Clear &transfer queue"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 #, fuzzy
 msgid "Clear history"
 msgstr "Peldankekê çêke"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 #, fuzzy
 msgid "Clear quickconnect bar"
 msgstr "&Zû Girêde"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr ""
@@ -2017,21 +2058,21 @@
 msgid "Click on next to download the new version."
 msgstr ""
 
-#: resources.h:346
+#: resources.h:348
 #, fuzzy
 msgid "Client to server MAC:"
 msgstr "Dest bi %s'e tê kirin"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr ""
 
-#: resources.h:661
+#: resources.h:677
 msgid "Close &all other tabs"
 msgstr ""
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "FileZilla'yê bigire"
 
@@ -2039,23 +2080,23 @@
 msgid "Close all running instances of FileZilla"
 msgstr ""
 
-#: resources.h:496
+#: resources.h:505
 msgid "Closes current tab"
 msgstr ""
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "Şî&rove:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr ""
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
 msgstr ""
 
-#: resources.h:930
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 
@@ -2075,8 +2116,8 @@
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Ferman:"
@@ -2086,7 +2127,7 @@
 msgid "Comment"
 msgstr "Şî&rove:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
 #, fuzzy
 msgid "Common name:"
 msgstr "Ferman:"
@@ -2097,15 +2138,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
 
-#: resources.h:513 resources.h:639
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
 msgstr ""
 
-#: resources.h:512 resources.h:638
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
 msgstr ""
 
-#: resources.h:910
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
 msgstr ""
 
@@ -2113,65 +2154,65 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr ""
 
-#: resources.h:159
+#: resources.h:160
 #, fuzzy
 msgid "Compiled for:"
 msgstr "Berhevkar:"
 
-#: resources.h:160
+#: resources.h:161
 #, fuzzy
 msgid "Compiled on:"
 msgstr "Berhevkar:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
 msgstr "Berhevkar:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
 msgstr "Alên Berhevkaran:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr ""
 
-#: resources.h:796
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr ""
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr ""
 
-#: resources.h:704
+#: resources.h:720
 #, fuzzy
 msgid "Configuration test"
 msgstr "Erêkirin pêwist e"
 
-#: resources.h:678
+#: resources.h:694
 #, fuzzy
 msgid "Configure passive mode"
 msgstr "&Mod a neçalak bi kar bîne"
 
-#: resources.h:694
+#: resources.h:710
 msgid "Configure port range"
 msgstr ""
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1033
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Erêkirin pêwist e"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Erêkirin pêwist e"
 
@@ -2179,7 +2220,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr ""
 
@@ -2187,16 +2228,16 @@
 msgid "Connect to specified Site Manager site"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "Têkilî pêk hat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "Têkilî pêk tê"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
 msgstr "Dest bi %s'e tê kirin"
@@ -2224,7 +2265,7 @@
 msgid "Connection"
 msgstr "Têkilî pêk tê"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1070
 #, fuzzy
 msgid "Connection attempt failed"
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
@@ -2252,12 +2293,12 @@
 msgstr "Dest bi %s'e tê kirin"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 #, fuzzy
 msgid "Connection closed by server"
 msgstr "Dest bi %s'e tê kirin"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 #, fuzzy
 msgid "Connection established, initializing TLS..."
@@ -2268,7 +2309,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Têkilî çêbû, peyama xêrhatinê tê hêvîkirin..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
 msgstr "Têkilî çêbû, peyama xêrhatinê tê hêvîkirin..."
 
@@ -2297,7 +2338,7 @@
 msgid "Connection timed out."
 msgstr "Dest bi %s'e tê kirin"
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:676
 #, fuzzy
 msgid "Connection to server lost."
 msgstr "Dest bi %s'e tê kirin"
@@ -2320,23 +2361,23 @@
 msgid "Convert keyfile"
 msgstr ""
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "&Ji Ber Bigire"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr ""
 
-#: resources.h:587 resources.h:633
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr ""
 
@@ -2345,8 +2386,8 @@
 msgid "Could not accept connection: %s"
 msgstr "Bi pêşkêşker re têkilî pêk nayê"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 #, fuzzy
 msgid "Could not add connection to Site Manager"
 msgstr "Bi pêşkêşker re têkilî pêk nayê"
@@ -2360,7 +2401,7 @@
 msgid "Could not connect to server: %s"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 #, fuzzy
 msgid "Could not convert command to server encoding"
 msgstr "Bi pêşkêşker re têkilî çênabe"
@@ -2371,30 +2412,30 @@
 msgid "Could not convert private key"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not copy URLs"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 #, fuzzy
 msgid "Could not copy data"
 msgstr "Navnîşana pêşkêşker nayê xebitandin:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
 msgstr "Bi pêşkêşker re têkilî pêk nayê"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2405,24 +2446,24 @@
 " Peldanka daneyê ya FileZilla'yê '--datadir <custompath>' vebijêrka rêzika "
 "fermanê an jî guherbara cih a FZ_DATADIR biguherîne û çêke."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 #, fuzzy
 msgid "Could not generate custom login sequence."
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1015
 msgid "Could not get full remote path."
 msgstr ""
 
@@ -2431,22 +2472,22 @@
 msgid "Could not get reply from fzputtygen."
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
@@ -2466,7 +2507,7 @@
 msgid "Could not load private key"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1041
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2490,9 +2531,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not open clipboard"
 msgstr "&Têxe panoyê"
@@ -2504,31 +2545,31 @@
 msgid "Could not open log file: %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #, fuzzy
 msgid "Could not parse remote path."
 msgstr "Navnîşana pêşkêşker nayê xebitandin:"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Navnîşana pêşkêşker nayê xebitandin:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
 #, fuzzy, c-format
 msgid "Could not read from socket: %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
+#: ../../locales/../src/interface/sitemanager.cpp:487
 #, fuzzy
 msgid "Could not read server item."
 msgstr "Navnîşana pêşkêşker nayê xebitandin:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Di dosiyê de gihaştina dûriya %s pêk nayê"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 #, fuzzy
 msgid "Could not seek to the end of the file"
 msgstr "Çûna dawiya dosiyê pêk nayê"
@@ -2538,7 +2579,7 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 #, fuzzy
 msgid "Could not spawn IO thread"
 msgstr "Navnîşana pêşkêşker nayê xebitandin:"
@@ -2548,14 +2589,14 @@
 msgid "Could not start proxy handshake: %s"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 #, fuzzy
 msgid "Could not start transfer"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, fuzzy, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2564,32 +2605,31 @@
 "\"%s\" nayê nivîsîn, guhertinên di Gerînendeyê Malperê de dê neyên "
 "tomarkiirin."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
 msgstr "\"%s\" nayê nivîsîn, dor nayê tomarkirin."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "\"%s\" nayê nivîsîn, dor nayê tomarkirin."
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, fuzzy, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
 msgstr "\"%s\" nayê nivîsîn, dor nayê tomarkirin."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "\"%s\" nayê nivîsîn, dor nayê tomarkirin."
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr ""
@@ -2599,7 +2639,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
+#: ../../locales/../src/interface/QueueView.cpp:1115
 #, fuzzy
 msgid "Could not write to local file"
 msgstr "Derbasdariya mîhengan pêk nehat"
@@ -2616,32 +2656,47 @@
 msgid "Could not write to socket: %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr ""
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "Dosya ji nû ve nayê bi navkirin"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
 msgstr "Di peldanka heyî de bin peldankekê çêke"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Di peldanka heyî de bin peldankekê çêke"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "Peldankekê çêke"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "Dosya ji nû ve nayê bi navkirin"
+
+#: ../../locales/../src/interface/QueueView.cpp:1527
 #, fuzzy
 msgid "Creating directory"
 msgstr "Peldankekê çêke"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Peldanka '%s' tê çêkirin..."
@@ -2667,19 +2722,19 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr ""
 
-#: resources.h:767 resources.h:886
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr ""
 
@@ -2687,42 +2742,47 @@
 msgid "Custom filter set"
 msgstr ""
 
-#: resources.h:375 resources.h:376
+#: resources.h:377 resources.h:378
 #, fuzzy
 msgid "Custom server"
 msgstr "Têkiliya bi pêşkêşker de tê birrîn"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
 msgstr ""
 
-#: resources.h:893
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "&Wekî Heyî"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "Jê &Bibe"
 
-#: resources.h:204
+#: resources.h:206
 #, fuzzy
 msgid "D&isable all"
 msgstr "H&emûyî jê bibe"
 
-#: resources.h:917
+#: resources.h:882
+#, fuzzy
+msgid "D&o not save passwords"
+msgstr "Nasnavê binivîse"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr ""
 
@@ -2736,7 +2796,12 @@
 msgid "Data socket closed too early."
 msgstr ""
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#, fuzzy
+msgid "Date"
+msgstr "Dîrok"
+
+#: resources.h:895
 msgid "Date formatting"
 msgstr ""
 
@@ -2745,10 +2810,10 @@
 msgid "Date/time format"
 msgstr "Dîrok/dem nayê zanîn"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Dîrok/dem nayê zanîn"
 
@@ -2756,15 +2821,15 @@
 msgid "Debug"
 msgstr ""
 
-#: resources.h:957
+#: resources.h:975
 msgid "Debugging settings"
 msgstr ""
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
 msgstr "Peldanka &herêmî ya wekî heyî:"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 #, fuzzy
 msgid "Default (Autodetect)"
 msgstr "&Bixweber"
@@ -2773,15 +2838,15 @@
 msgid "Default editor not properly quoted."
 msgstr ""
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
 msgstr ""
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
 msgstr "Peldanka &dûr a wekî heyî:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2792,16 +2857,16 @@
 msgid "Default system language"
 msgstr "&Peymanê hilbijêre:"
 
-#: resources.h:672
+#: resources.h:688
 #, fuzzy
 msgid "Default transfer mode:"
 msgstr "Cureyê ragihandinê ya wekî heyî:"
 
-#: resources.h:818
+#: resources.h:834
 msgid "Default transfer type:"
 msgstr "Cureyê ragihandinê ya wekî heyî:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr ""
 
@@ -2810,7 +2875,7 @@
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
 msgstr ""
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2821,63 +2886,63 @@
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 #, fuzzy
 msgid "Delete Site Manager entry"
 msgstr "&Gerînendeyê Malperê"
 
-#: resources.h:629 resources.h:650
+#: resources.h:645 resources.h:666
 #, fuzzy
 msgid "Delete selected directory"
 msgstr "Peldanka &dûr a wekî heyî:"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 #, fuzzy
 msgid "Delete selected files and directories"
 msgstr "Peldank û dosiyên hilbijartî jê bibe"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 #, fuzzy
 msgid "Deleting directories"
 msgstr "Peldankekê çêke"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr ""
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Hûragahî"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr ""
 
-#: resources.h:226
+#: resources.h:228
 #, fuzzy
 msgid "Dire&ctories"
 msgstr "Berêvekirin"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Berêvekirin"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
+#: ../../locales/../src/interface/filelistctrl.cpp:523
 #, fuzzy
 msgid "Directory"
 msgstr "Berêvekirin"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
+#: resources.h:652 resources.h:926 resources.h:1009
+#: ../../locales/../src/interface/filelistctrl.cpp:445
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 #, fuzzy
 msgid "Directory comparison"
 msgstr "Berêvekirin"
@@ -2898,12 +2963,12 @@
 msgid "Directory listing aborted by user"
 msgstr "Lîstekirina peldanka serkeftî ye"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 #, fuzzy
 msgid "Directory listing failed"
 msgstr "Lîstekirina peldanka serkeftî ye"
 
-#: resources.h:197
+#: resources.h:199
 #, fuzzy
 msgid "Directory listing filters"
 msgstr "Lîstekirina peldanka serkeftî ye"
@@ -2912,34 +2977,34 @@
 msgid "Directory listing successful"
 msgstr "Lîstekirina peldanka serkeftî ye"
 
-#: resources.h:207
+#: resources.h:209
 #, fuzzy
 msgid "Disa&ble all"
 msgstr "H&emûyî jê bibe"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 
-#: resources.h:984
+#: resources.h:1002
 msgid "Disconnect from server"
 msgstr "Têkiliya bi pêşkêşker de tê birrîn"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "Têkiliya bi pêşkêşker re qut bû"
 
@@ -2949,25 +3014,25 @@
 msgid "Disconnected from server: %s"
 msgstr "Têkiliya bi pêşkêşker re qut bû"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1429
+#: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
 msgstr "Bi pêşkêşkera borî re têkilî tê birrîn"
 
-#: resources.h:985
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
 msgstr "Dê têkiliya bi pêşkêşkera niha dixuye re bibirre"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "Paceya Der Barê de veke"
 
-#: resources.h:926
+#: resources.h:944
 #, fuzzy
 msgid "Do &not use default editor"
 msgstr "&Her demê vê kirinê bi kar bîne"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr ""
 
@@ -2978,92 +3043,92 @@
 "Unless you want to test new features, keep using stable versions."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 #, fuzzy
 msgid "Do you really want to close FileZilla?"
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 #, fuzzy
 msgid "Do you really want to delete selected entry?"
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 #, fuzzy
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr ""
 
-#: resources.h:465
+#: resources.h:467
 msgid "Documentation"
 msgstr ""
 
-#: resources.h:693
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
 msgstr ""
 
-#: resources.h:829
+#: resources.h:845
 #, fuzzy
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Dosiyên bi xal (dosiyên navê wan bi xalekê dest pê dikin) wekî Ascii bi kar "
 "bîne"
 
-#: resources.h:911
+#: resources.h:929
 msgid "Double-click action"
 msgstr ""
 
-#: resources.h:361
+#: resources.h:363
 #, fuzzy
 msgid "Download"
 msgstr "&Daxe"
 
-#: resources.h:481 resources.h:805
+#: resources.h:483 resources.h:821
 #, fuzzy
 msgid "Download &limit:"
 msgstr "&Daxe"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
+#: ../../locales/../src/interface/statusbar.cpp:604
 #, fuzzy, c-format
 msgid "Download limit: %s/s"
 msgstr "&Daxe"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
+#: ../../locales/../src/interface/statusbar.cpp:606
 #, fuzzy
 msgid "Download limit: none"
 msgstr "&Daxe"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 #, fuzzy
 msgid "Download search results"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: resources.h:623
+#: resources.h:639
 #, fuzzy
 msgid "Download selected directory"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: resources.h:573
+#: resources.h:583
 #, fuzzy
 msgid "Download selected files and directories"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
+#: ../../locales/../src/interface/edithandler.cpp:1247
 #, fuzzy
 msgid "Downloading"
 msgstr "&Daxe"
@@ -3074,86 +3139,80 @@
 msgid "Downloading %s"
 msgstr "&Daxe"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 #, fuzzy
 msgid "Downloading search results"
 msgstr "&Daxe"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr ""
-
-#: resources.h:203
+#: resources.h:205
 #, fuzzy
 msgid "E&nable all"
 msgstr "H&emûyî jê bibe"
 
-#: resources.h:559 resources.h:576
+#: resources.h:569 resources.h:586
 #, fuzzy
 msgid "E&nter directory"
 msgstr "&Peldankê çêke"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "B&ixebitîne"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "D&erkeve"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 #, fuzzy
 msgid "E-Mail:"
 msgstr "Epeyam:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
 msgstr ""
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
 msgstr ""
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 #, fuzzy
 msgid "Editing failed"
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:874
+#: resources.h:892
 msgid "Email:"
 msgstr "Epeyam:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 #, fuzzy
 msgid "Empty command"
 msgstr "Fermana şexsî binivîse"
@@ -3163,7 +3222,7 @@
 msgid "Empty command."
 msgstr "Fermana şexsî binivîse"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 #, fuzzy
 msgid "Empty directory listing"
 msgstr "Lîsteya peldankê tê standin..."
@@ -3192,51 +3251,51 @@
 msgid "Empty quoted string."
 msgstr "Lîsteya peldankê tê standin..."
 
-#: resources.h:206
+#: resources.h:208
 #, fuzzy
 msgid "En&able all"
 msgstr "H&emûyî jê bibe"
 
-#: resources.h:814
+#: resources.h:830
 msgid "Enable invalid character &filtering"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr ""
 
-#: resources.h:343
+#: resources.h:345
 #, fuzzy
 msgid "Encryption"
 msgstr "Têkilî pêk tê"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
 msgstr ""
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
 msgstr ""
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "Fer&mana şexsî binivîse..."
 
-#: resources.h:485
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 #, fuzzy
 msgid "Enter command"
 msgstr "Fermana şexsî binivîse"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
 msgstr "Fermana şexsî binivîse"
 
-#: resources.h:918
+#: resources.h:936
 #, fuzzy
 msgid "Enter directory"
 msgstr "Peldankekê çêke"
@@ -3248,25 +3307,25 @@
 msgid "Enter filter name"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr ""
 
-#: ../../locales/../src/interface/filter.cpp:390
+#: ../../locales/../src/interface/filter.cpp:405
 #, fuzzy
 msgid "Enter new name for filterset"
 msgstr "Ji bo dosiya \"%s\" taybetiyên nû hilbijêre."
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
 msgstr "Nasnavê binivîse"
 
-#: resources.h:560 resources.h:577
+#: resources.h:570 resources.h:587
 #, fuzzy
 msgid "Enter selected directory"
 msgstr "Peldanka &dûr a wekî heyî:"
 
-#: resources.h:713
+#: resources.h:729
 #, fuzzy
 msgid ""
 "Enter the address of the server.\n"
@@ -3291,7 +3350,7 @@
 "Please note that the converted file will not be password protected."
 msgstr ""
 
-#: resources.h:717
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3309,53 +3368,61 @@
 msgid "Error exporting settings"
 msgstr "%d çewtiya lênivîsandina soketê"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
+#: ../../locales/../src/interface/QueueView.cpp:2052
+#, fuzzy
+msgid "Error loading queue"
+msgstr "Di xwendina dosiya XML'ê de çewtî"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "Di xwendina dosiya XML'ê de çewtî"
 
+#: ../../locales/../src/interface/QueueView.cpp:1951
+#, fuzzy
+msgid "Error saving queue"
+msgstr "Di xwendina dosiya XML'ê de çewtî"
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "Di nivîsandina dosiya XML'ê de çewtî"
 
@@ -3368,27 +3435,27 @@
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Çewtî:"
 
-#: resources.h:477
+#: resources.h:479
 #, fuzzy
 msgid "Establish connection in a new tab"
 msgstr "Bi pêşkêşker re têkilî pêk nayê"
 
-#: resources.h:937
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr ""
 
-#: resources.h:896
+#: resources.h:914
 #, fuzzy
 msgid "Examples"
 msgstr "Nav:"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "Bi&xebitîne"
 
@@ -3397,48 +3464,59 @@
 msgid "Executable"
 msgstr "&Bixebitîne"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 
-#: resources.h:856
+#: resources.h:872
 msgid "Explorer"
 msgstr ""
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
 msgstr ""
 
-#: resources.h:292
+#: resources.h:294
 #, fuzzy
 msgid "Export &Settings"
 msgstr "&Mîheng"
 
-#: resources.h:289
+#: resources.h:291
 #, fuzzy
 msgid "Export settings"
 msgstr "Mîhengên ragihandinê"
 
-#: resources.h:218
+#: resources.h:220
 #, fuzzy
 msgid "F&ilter name:"
 msgstr "Navê Dosiyê"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr ""
 
-#: resources.h:741
+#: resources.h:757
 msgid "FTP Keep-alive"
 msgstr ""
 
-#: resources.h:761
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr ""
@@ -3448,32 +3526,32 @@
 msgid "FTP URL"
 msgstr "FTP"
 
-#: resources.h:669
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 #, fuzzy
 msgid "Failed to change directory"
 msgstr "Guherandina peymanê ne serkeftî ye"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 msgid "Failed to change language"
 msgstr "Guherandina peymanê ne serkeftî ye"
@@ -3482,12 +3560,12 @@
 msgid "Failed to check for newer version of FileZilla."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 #, fuzzy
 msgid "Failed to copy or move sites"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr ""
 
@@ -3496,8 +3574,8 @@
 msgid "Failed to create listen socket, aborting"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 #, fuzzy
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
@@ -3508,11 +3586,11 @@
 msgid "Failed to download the latest version of FileZilla."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:665
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:651
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 #, fuzzy
 msgid "Failed to get desktop path"
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
@@ -3530,8 +3608,8 @@
 msgid "Failed to initialize FTP engine"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr ""
@@ -3546,23 +3624,28 @@
 msgid "Failed to load private key: %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "\"%s\" lêzêdekirin / ji bo nivîsê venabe"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "\"%s\" ji bo xwendinê nayê venabe"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "\"%s\" ji bo nivîsandinê venabe"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+#, fuzzy
+msgid "Failed to parse returned path."
+msgstr "Navnîşana pêşkêşker nayê xebitandin:"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr ""
@@ -3581,11 +3664,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 #, fuzzy
 msgid "Failed to retrieve local ip address."
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
@@ -3604,34 +3687,34 @@
 msgid "Failed to send command."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
+#: ../../locales/../src/interface/FileZilla.cpp:267
 #, fuzzy, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, fuzzy, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
+#: ../../locales/../src/interface/FileZilla.cpp:240
 #, fuzzy, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:248
 #, fuzzy, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:237
 #, fuzzy, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Ziman wekî %s nayê guherandin, pergal dê zimanê heyî bi kar bîne."
@@ -3640,7 +3723,7 @@
 msgid "Failed to validate settings"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:896
 #, fuzzy
 msgid "Failed to verify peer certificate"
 msgstr "Guherandina peymanê ne serkeftî ye"
@@ -3650,33 +3733,33 @@
 msgid "Failed to write to file %s"
 msgstr "Derbasdariya mîhengan pêk nehat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 #, fuzzy
 msgid "Failed to write xml file"
 msgstr "Di nivîsandina dosiya XML'ê de çewtî"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 #, fuzzy
 msgid "Failed transfers"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:684
+#: resources.h:700
 msgid "Fall back to active mode"
 msgstr ""
 
-#: resources.h:368
+#: resources.h:370
 #, fuzzy
 msgid "Fil&e:"
 msgstr "Dosya"
 
-#: resources.h:225
+#: resources.h:227
 #, fuzzy
 msgid "Fil&es"
 msgstr "Dosya"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:500
+#: ../../locales/../src/interface/filelistctrl.cpp:518
+#: ../../locales/../src/interface/filelistctrl.cpp:527
 msgid "File"
 msgstr "Dosya"
 
@@ -3684,7 +3767,7 @@
 msgid "File Types"
 msgstr "Cureyên Dosiyan"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
 msgstr ""
 
@@ -3693,7 +3776,7 @@
 msgid "File editing"
 msgstr "Dosiya dûr"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "Dosya hene"
 
@@ -3702,7 +3785,7 @@
 msgid "File exists action"
 msgstr "Dosya hene"
 
-#: resources.h:304
+#: resources.h:306
 #, fuzzy
 msgid "File has changed"
 msgstr "Navê dosiyê neguherî"
@@ -3712,14 +3795,14 @@
 msgid "File lists"
 msgstr "Dosya hene"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr ""
 
-#: resources.h:995
+#: resources.h:1013
 #, fuzzy
 msgid "File search"
 msgstr "Mezinahiya dosiyê"
@@ -3758,104 +3841,116 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 #, fuzzy
 msgid "File transfers still in progress."
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr ""
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Çewtiya FileZilla"
 
-#: resources.h:706
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 
-#: resources.h:476
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 #, fuzzy
 msgid "FileZilla is already connected to a server."
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 
-#: resources.h:516
+#: resources.h:525
 #, fuzzy
 msgid "Filelist status &bars"
 msgstr "Dosya hene"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Navê Dosiyê"
 
-#: resources.h:509
+#: resources.h:518
 #, fuzzy
 msgid "Filename &filters..."
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "Navê nederbasdar ê dosiyê"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Navê dosiyan van curetîpan nahundirîne: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Navê dosiyê neguherî"
 
-#: resources.h:306 resources.h:950
+#: resources.h:308 resources.h:968
 #, fuzzy
 msgid "Filename:"
 msgstr "Navê Dosiyê"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Navê dosiyan van curetîpan nahundirîne: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Navê dosiyan van curetîpan nahundirîne: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 #, fuzzy
 msgid "Files currently being edited"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "Mezinahiya dosiyê"
 
@@ -3864,53 +3959,56 @@
 msgid "Filesize format"
 msgstr "Mezinahiya dosiyê"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Cureê dosiyê"
 
-#: resources.h:938
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 #, fuzzy
 msgid "Filetype associations"
 msgstr "Dosya hene"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr ""
 
-#: resources.h:813
+#: resources.h:829
 msgid "Filter invalid characters in filenames"
 msgstr ""
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 #, fuzzy
 msgid "Filter name already exists"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:220
+#: resources.h:222
 #, fuzzy
 msgid "Filter out items matching all of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:221
+#: resources.h:223
 #, fuzzy
 msgid "Filter out items matching any of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:222
+#: resources.h:224
 #, fuzzy
 msgid "Filter out items matching none of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 #, fuzzy
 msgid "Filter set already exists"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:988
+#: resources.h:1006
 #, fuzzy
 msgid "Filter the directory listings"
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
@@ -3929,7 +4027,7 @@
 msgid "Fingerprint (SHA-1):"
 msgstr ""
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr ""
 
@@ -3937,17 +4035,17 @@
 msgid "Firewall and router configuration wizard"
 msgstr ""
 
-#: resources.h:724
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
 
-#: resources.h:701
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 
-#: ../../locales/../src/interface/Options.cpp:194
+#: ../../locales/../src/interface/Options.cpp:215
 #, fuzzy
 msgid ""
 "For this session the default settings will be used. Any changes to the "
@@ -3957,28 +4055,28 @@
 "Di vê danişînê de mîhengên heyî dê werin bikaranîn û guhertinên pêkhatî dê "
 "ne mayinde bin."
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
 msgstr ""
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
 msgstr ""
 
-#: resources.h:768
+#: resources.h:784
 #, fuzzy
 msgid "Format specifications:"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: resources.h:936
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
 msgstr ""
 
@@ -3990,62 +4088,62 @@
 msgid "General SOCKS server failure"
 msgstr ""
 
-#: resources.h:786
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr ""
 
-#: resources.h:690
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
 msgstr ""
 
-#: resources.h:469
+#: resources.h:471
 #, fuzzy
 msgid "Getting help"
 msgstr "&Mîheng"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 #, fuzzy
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Dosiya armanckirî jixwe heye, bila bidomîne?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr ""
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
 msgstr ""
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "Desturên koman"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
 msgstr "Bi&lind"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr ""
 
-#: resources.h:339
+#: resources.h:341
 #, fuzzy
 msgid "Hash:"
 msgstr "Komputera Navendî:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr ""
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Bilind"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Herî Bilind"
 
@@ -4054,24 +4152,24 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Port a herî bilind divê di navbera 1 û 65535 'an de be."
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr "Rûpela Têketinê:"
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr ""
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 
@@ -4079,31 +4177,31 @@
 msgid "Host unreachable"
 msgstr ""
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "Komputera Navendî:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "Saet,"
 
-#: resources.h:885
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr ""
 
-#: resources.h:728
+#: resources.h:744
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
 
-#: resources.h:966
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 
-#: resources.h:681
+#: resources.h:697
 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 "
@@ -4111,13 +4209,13 @@
 "basis in the Site Manager."
 msgstr ""
 
-#: resources.h:676
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4135,14 +4233,14 @@
 "connection."
 msgstr ""
 
-#: resources.h:955
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4158,34 +4256,34 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
 
-#: resources.h:277 resources.h:850
+#: resources.h:279 resources.h:866
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
 
-#: resources.h:909
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
 
-#: resources.h:924
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Heke tu ziman biguherî divê tu FileZilla'yê ji nû ve vekî."
 
-#: resources.h:707
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
 msgstr ""
 
-#: resources.h:826
+#: resources.h:842
 #, fuzzy
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
@@ -4195,11 +4293,11 @@
 "dê ev dosî di dema ragihandinê de\n"
 "xira bibin."
 
-#: resources.h:708
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 
-#: resources.h:740
+#: resources.h:756
 #, fuzzy
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
@@ -4216,19 +4314,19 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 
-#: resources.h:667
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
 
-#: resources.h:703
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
 
-#: resources.h:702
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4240,17 +4338,17 @@
 "manufacturer."
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr ""
 
-#: resources.h:296
+#: resources.h:298
 #, fuzzy
 msgid "Import settings"
 msgstr "Mîhengên ragihandinê"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 #, fuzzy
 msgid "Import successful"
 msgstr "Lîstekirina peldanka serkeftî ye"
@@ -4260,55 +4358,59 @@
 msgid "Improperly quoted association."
 msgstr ""
 
-#: resources.h:695
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
 
-#: resources.h:697
+#: resources.h:713
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
 
-#: resources.h:685 resources.h:749
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 
-#: resources.h:670
+#: resources.h:686
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
+#: ../../locales/../src/interface/QueueView.cpp:1064
 #, fuzzy
 msgid "Incorrect password"
 msgstr "Nasnavê binivîse"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Înteraktîf"
 
@@ -4318,8 +4420,8 @@
 msgstr "Înteraktîf"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
 
@@ -4349,34 +4451,35 @@
 msgid "Invalid data received"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 #, fuzzy
 msgid "Invalid date"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 #, fuzzy
 msgid "Invalid input"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Porta têketinê çewte. Nirxa portê divê di navbera 1 û 65535'an de be."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4385,7 +4488,12 @@
 "ftpes:// for FTP over SSL (explicit)."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Invalid regular expression in search conditions."
 msgstr ""
 
@@ -4393,102 +4501,102 @@
 msgid "Invalid response code"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:692
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 #, fuzzy
 msgid "Invalid site path"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
 msgstr "Navê bikarhêner nederbasdar e."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Jurisdiction country:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction locality:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
 msgstr ""
 
-#: resources.h:906
+#: resources.h:924
 msgid "Keep directories on top"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
 msgstr ""
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "H&erî Nizm"
 
-#: resources.h:922
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Ziman"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 #, fuzzy
 msgid "Language changed"
 msgstr "Ziman"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Serastkirina dawî"
 
-#: resources.h:853
+#: resources.h:869
 msgid "Layout"
 msgstr ""
 
-#: resources.h:799
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
 msgstr ""
 
-#: resources.h:801
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
 msgstr ""
 
-#: resources.h:744
+#: resources.h:760
 msgid "Limit local ports"
 msgstr "Portên herêmî bi sînor bike"
 
-#: resources.h:952
+#: resources.h:970
 msgid "Limit size of logfile"
 msgstr ""
 
-#: resources.h:953
+#: resources.h:971
 msgid "Limit:"
 msgstr ""
 
@@ -4496,7 +4604,7 @@
 msgid "Line length exceeded"
 msgstr ""
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
 msgstr ""
 
@@ -4505,46 +4613,51 @@
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "Rêzkirin:"
 
-#: resources.h:747
+#: resources.h:763
 #, fuzzy
 msgid "Lo&west available port:"
 msgstr "P&ort a heyî ya herî nizm"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 #, fuzzy
 msgid "Local"
 msgstr "Malpera herêmî:"
 
-#: resources.h:363
+#: resources.h:365
 #, fuzzy
 msgid "Local file"
 msgstr "Malpera herêmî:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 #, fuzzy
 msgid "Local file does not exist."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr ""
 
-#: resources.h:202
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+#, fuzzy
+msgid "Local file is not a valid filename."
+msgstr "Dosiya armanckirî jixwe heye"
+
+#: resources.h:204
 #, fuzzy
 msgid "Local filters:"
 msgstr "Malpera herêmî:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Malpera herêmî:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 #, fuzzy
 msgid "Locality:"
 msgstr "Malpera herêmî:"
@@ -4554,28 +4667,28 @@
 msgid "Log file"
 msgstr "dosya"
 
-#: resources.h:250
+#: resources.h:252
 msgid "Log of update check:"
 msgstr ""
 
-#: resources.h:947
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 
@@ -4590,13 +4703,13 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Nizm"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Herî nizm"
 
@@ -4609,7 +4722,7 @@
 msgid "MAC:"
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4630,72 +4743,73 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr ""
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: resources.h:395 ../../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
 #, fuzzy
 msgid "Manual transfer"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:433
+#: resources.h:435
 #, fuzzy
 msgid "Match all of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:434
+#: resources.h:436
 #, fuzzy
 msgid "Match any of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:435
+#: resources.h:437
 #, fuzzy
 msgid "Match none of the following"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:797
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
 msgstr ""
 
-#: resources.h:864
+#: resources.h:880
 msgid "Message log position"
 msgstr ""
 
-#: resources.h:954
+#: resources.h:972
 msgid "MiB"
 msgstr ""
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "Xulke"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
 msgstr ""
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Malperên Min"
 
@@ -4704,24 +4818,24 @@
 msgid "N/a"
 msgstr "Nîn e"
 
-#: resources.h:398
+#: resources.h:400
 #, fuzzy
 msgid "Name"
 msgstr "Nav:"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 #, fuzzy
 msgid "Name already exists"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 #, fuzzy
 msgid "Name of bookmark already exists."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Nav:"
 
@@ -4729,12 +4843,12 @@
 msgid "Need to enter filter name"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:682
 #, fuzzy
 msgid "Need to enter valid remote path"
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr ""
 
@@ -4746,41 +4860,41 @@
 msgid "New &Folder"
 msgstr "Pel&danka Nû"
 
-#: resources.h:493
+#: resources.h:502
 #, fuzzy
 msgid "New &tab"
 msgstr "Malpera Nû"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr ""
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 #, fuzzy
 msgid "New directory"
 msgstr "Peldankekê çêke"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr ""
@@ -4790,22 +4904,22 @@
 msgid "New filter"
 msgstr "Peldanka Nû"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Peldanka Nû"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Malpera Nû"
 
-#: resources.h:862
+#: resources.h:878
 #, fuzzy
 msgid "Next to the transfer queue"
 msgstr "Dê destûra dîtinê ya dora ragihandinê biguhere"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
 msgid "No"
 msgstr ""
 
@@ -4813,15 +4927,15 @@
 msgid "No category to export selected"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 #, fuzzy
 msgid "No files are currently being edited."
 msgstr "Dosiya armanckirî jixwe heye"
@@ -4831,9 +4945,9 @@
 msgid "No filter name given"
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
@@ -4841,33 +4955,33 @@
 msgid "No images available"
 msgstr "Qet wêne nîn e"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
+#: ../../locales/../src/interface/QueueView.cpp:3168
 #, fuzzy
 msgid "No more files in the queue!"
 msgstr "&Dosiyan têxe dorê"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr ""
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr ""
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:540
 #, fuzzy
 msgid "No search results"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 #, fuzzy
 msgid "No sites available"
 msgstr "Qet wêne nîn e"
@@ -4876,33 +4990,34 @@
 msgid "No supported SOCKS5 auth method"
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 #, fuzzy
 msgid "No username given."
 msgstr "Navê nederbasdar ê dosiyê"
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:934 resources.h:939
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr ""
 
-#: resources.h:373
+#: resources.h:375
 #, fuzzy
 msgid "None selected yet"
 msgstr "Malpera dûr:"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Asayî"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../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 ""
 
@@ -4912,12 +5027,12 @@
 msgid "Not connected"
 msgstr "Têkilî pêk hat"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 #, fuzzy
 msgid "Not connected to any server"
 msgstr "Bi pêşkêşker re têkilî çênabe"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 #, fuzzy
 msgid "Not connected to any server."
 msgstr "Bi pêşkêşker re têkilî çênabe"
@@ -4927,19 +5042,19 @@
 msgid "Not connected."
 msgstr "Têkilî pêk hat"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 
-#: resources.h:778
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 
-#: resources.h:795
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 
-#: resources.h:895
+#: resources.h:913
 msgid "Number of decimal places:"
 msgstr ""
 
@@ -4947,100 +5062,100 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr ""
 
-#: resources.h:332
+#: resources.h:334
 #, fuzzy
 msgid "O&pen file"
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "Temam"
 
-#: resources.h:677
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 #, fuzzy
 msgid "Once"
 msgstr "Betal"
 
-#: resources.h:946
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
 msgstr ""
 
-#: resources.h:646
+#: resources.h:662
 msgid "Open directory in system's file manager"
 msgstr ""
 
-#: resources.h:968 resources.h:969
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "Gerînendeyê Malperê veke"
 
-#: resources.h:562
+#: resources.h:572
 #, fuzzy
 msgid "Open the file."
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "Paceya mîhengan a FileZilla'yê veke"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, fuzzy
 msgid "Opening failed"
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr ""
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "Gerînendeyê Malperê veke"
 
-#: resources.h:989
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 
-#: resources.h:170
+#: resources.h:172
 #, fuzzy
 msgid "Operating system"
 msgstr "Malpera dûr:"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
 #, fuzzy
 msgid "Other:"
 msgstr "Nivîskar:"
 
-#: resources.h:723
+#: resources.h:739
 #, fuzzy
 msgid "Overview"
 msgstr "Pêşdîtin"
@@ -5050,22 +5165,22 @@
 msgid "Overwrite &if source newer"
 msgstr "Heke &nû be jê bibe"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 #, fuzzy
 msgid "Overwrite file"
 msgstr "&Li Ser Binivîse"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 #, fuzzy
 msgid "Overwrite file if size differs"
 msgstr "Heke &nû be jê bibe"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 #, fuzzy
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Heke &nû be jê bibe"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 #, fuzzy
 msgid "Overwrite file if source file newer"
 msgstr "Heke &nû be jê bibe"
@@ -5080,23 +5195,23 @@
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Heke &nû be jê bibe"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
 msgstr "Xwediyên destûrê"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 #, fuzzy
 msgid "Owner/Group"
 msgstr "Xwedî / Kom"
 
-#: resources.h:867
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 
-#: resources.h:775 resources.h:791
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
 msgstr ""
@@ -5106,7 +5221,7 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
 
-#: resources.h:737
+#: resources.h:753
 #, fuzzy
 msgid "Pa&ssive (recommended)"
 msgstr "Mod a Neçalak"
@@ -5115,20 +5230,20 @@
 msgid "Package"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
 msgstr ""
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
 msgstr "N&asnav:"
 
-#: resources.h:673
+#: resources.h:689
 #, fuzzy
 msgid "Passive (recommended)"
 msgstr "Mod a Neçalak"
 
-#: resources.h:757
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 #, fuzzy
 msgid "Passive mode"
@@ -5144,43 +5259,43 @@
 msgid "Password required"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr ""
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 #, fuzzy
 msgid "Permission"
 msgstr "Destûr"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Destûr"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
 msgstr ""
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5198,7 +5313,7 @@
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 
-#: resources.h:679
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5224,6 +5339,11 @@
 msgid "Please enter a custom time format."
 msgstr "Ji bo dosiya \"%s\" taybetiyên nû hilbijêre."
 
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr ""
+
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
@@ -5240,7 +5360,7 @@
 msgid "Please enter a new name for the copied filter."
 msgstr "Taybetiyên dosiyên hilbijartî hilbijêre."
 
-#: ../../locales/../src/interface/filter.cpp:388
+#: ../../locales/../src/interface/filter.cpp:403
 #, fuzzy, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Ji bo dosiya \"%s\" taybetiyên nû hilbijêre."
@@ -5267,11 +5387,11 @@
 "transfers."
 msgstr ""
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
 msgstr "Ji bo vê pêşkêşkerê nasnavekê binivîse:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
@@ -5283,12 +5403,12 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 #, fuzzy
 msgid "Please enter a unique name for this filter set"
 msgstr "Ji bo vê pêşkêşkerê nasnavekê binivîse:"
 
-#: resources.h:117
+#: resources.h:118
 #, fuzzy
 msgid "Please enter a username for this server:"
 msgstr "Ji bo vê pêşkêşkerê nasnavekê binivîse:"
@@ -5312,7 +5432,7 @@
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5320,14 +5440,19 @@
 "Fermana saf a FTP'ê binivîse.\n"
 "Bikaranîna fermanên saf ên ftp pêşbîra peldankê jê dibe."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Navê peldanka dê çêbibe binivîse:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Navê peldanka dê çêbibe binivîse:"
+
+#: resources.h:119
 #, fuzzy
 msgid "Please enter username and password for this server:"
 msgstr "Ji bo vê pêşkêşkerê nasnavekê binivîse:"
@@ -5345,7 +5470,7 @@
 "address, use the external resolver option."
 msgstr ""
 
-#: resources.h:666
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5357,7 +5482,7 @@
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 
@@ -5369,7 +5494,7 @@
 "'game mode'."
 msgstr ""
 
-#: resources.h:680
+#: resources.h:696
 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 "
@@ -5377,26 +5502,26 @@
 "discard."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
 
-#: resources.h:734
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
 
-#: resources.h:882 resources.h:888
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5409,17 +5534,17 @@
 "previously."
 msgstr ""
 
-#: resources.h:455
+#: resources.h:457
 #, fuzzy
 msgid "Please select an action:"
 msgstr "Xebatekê binivîse:"
 
-#: resources.h:301
+#: resources.h:303
 #, fuzzy
 msgid "Please select the categories you would like to import."
 msgstr "Taybetiyên peldan û dosiyên hilbijartî hilbijêre."
 
-#: resources.h:668
+#: resources.h:684
 #, fuzzy
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Ji bo peldanka \"%s\" taybetiyên nû hilbijêre."
@@ -5456,7 +5581,7 @@
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5469,16 +5594,17 @@
 "version."
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
 msgstr ""
 
@@ -5487,7 +5613,7 @@
 msgid "Preview:"
 msgstr "Pêşdîtin"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 
@@ -5495,37 +5621,41 @@
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:905
+#: resources.h:923
 msgid "Prioritize directories (default)"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Pêşî"
 
-#: resources.h:945
+#: resources.h:963
 msgid "Privacy policy:"
 msgstr ""
 
-#: resources.h:781
-msgid "Private &keys:"
+#: resources.h:797
+msgid "Private &keys:"
+msgstr ""
+
+#: resources.h:81
+msgid "Pro&tocol:"
 msgstr ""
 
-#: resources.h:777 resources.h:794
+#: resources.h:793 resources.h:810
 #, fuzzy
 msgid "Pro&xy password:"
 msgstr "&Nasnav:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "Bila Dor &Pêk Bê"
 
-#: resources.h:792
+#: resources.h:808
 #, fuzzy
 msgid "Proxy &port:"
 msgstr "&Nasnav:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
 msgstr ""
 
@@ -5540,6 +5670,10 @@
 msgid "Proxy handshake failed: %s"
 msgstr ""
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5554,11 +5688,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
 
-#: resources.h:779
+#: resources.h:795
 msgid "Public Key Authentication"
 msgstr ""
 
@@ -5566,58 +5700,63 @@
 msgid "Public key algorithm:"
 msgstr ""
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "Destûrên giştî"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:458
+#: ../../locales/../src/interface/statusbar.cpp:462
 #, fuzzy, c-format
 msgid "Queue: %s MiB"
 msgstr "Dor: %s%d MB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:392
 #, fuzzy, c-format
 msgid "Queue: %s%s"
 msgstr "Dor: %s%d MB"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Dor: vala"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 #, fuzzy
 msgid "Queued files"
 msgstr "Dor: %s%d bayt"
 
-#: resources.h:447
+#: resources.h:449
 #, fuzzy
 msgid "Queueing:"
 msgstr "&Bidomîne"
 
-#: resources.h:606
+#: resources.h:618
 #, fuzzy
 msgid "R&eboot system"
 msgstr "Malpera dûr:"
 
-#: resources.h:520
+#: resources.h:530
 #, fuzzy
 msgid "R&emote directory tree"
 msgstr "&Peldankê çêke"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: resources.h:632 resources.h:636
+#, fuzzy
+msgid "R&eset and requeue selected files"
+msgstr "Dosya ji nû ve nayê bi navkirin"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr ""
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
 msgstr "Bi&xwîne"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
 msgstr ""
 
@@ -5631,76 +5770,85 @@
 "routers and firewalls accordingly."
 msgstr ""
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "Bi&xwîne"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 #, fuzzy
 msgid "Read-only"
 msgstr "Bersîv:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
 msgstr "Tu dixwazî xebata derbasdar bi dawî bînî?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
 msgstr[0] ""
 msgstr[1] ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
 msgstr ""
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
 msgstr "Tu dixwazî dosya an jî peldanka hilbijartî jê bibî?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 #, fuzzy
 msgid "Reason"
 msgstr "Bersîv:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
 msgstr ""
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
 msgstr "Di Binpeldankê Paşde Here"
 
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
 #: ../../locales/../src/interface/netconfwizard.cpp:1031
 msgid "Received data tainted"
 msgstr ""
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
 
-#: resources.h:735
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr ""
 
-#: resources.h:986 resources.h:987
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
 msgstr "Dê dîsa bi pêşkêşkera dawî re têkeve têkiliyê"
 
@@ -5708,116 +5856,129 @@
 msgid "Redirection to invalid address"
 msgstr ""
 
-#: resources.h:978 resources.h:979
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
 msgstr "Lîsteya dosya û peldanka nû dike"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "Nasnavê binivîse"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 #, fuzzy
 msgid "Remote"
 msgstr "&Rake"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
 msgstr ""
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Dosiya dûr"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 #, fuzzy
 msgid "Remote file search"
 msgstr "Dosiya dûr"
 
-#: resources.h:205
+#: resources.h:207
 #, fuzzy
 msgid "Remote filters:"
 msgstr "Dosiya dûr"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1234
 #, fuzzy
 msgid "Remote path"
 msgstr "&Rake"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the current site's servertype (%s)."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the servertype (%s) selected on the parent site."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
 msgstr ""
 
-#: resources.h:444
+#: resources.h:446
 #, fuzzy
 msgid "Remote path handling:"
 msgstr "Malpera dûr:"
 
-#: resources.h:312
+#: resources.h:314
 #, fuzzy
 msgid "Remote path:"
 msgstr "Malpera dûr:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Malpera dûr:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:629 resources.h:633
 #, fuzzy
 msgid "Remove &all"
 msgstr "&Rake"
 
-#: resources.h:616 resources.h:619
+#: resources.h:631 resources.h:635
 #, fuzzy
 msgid "Remove &selected"
 msgstr "Malpera dûr:"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Dosiyê ji nû ve bi nav bike"
 
-#: resources.h:631 resources.h:652
+#: resources.h:647 resources.h:668
 #, fuzzy
 msgid "Rename selected directory"
 msgstr "Dosya û peldankên hilbijartî ji nû ve bi nav bike"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 #, fuzzy
 msgid "Rename selected files and directories"
 msgstr "Dosya û peldankên hilbijartî ji nû ve bi nav bike"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Navê '%s' wekî '%s' tê guhertin"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr ""
+
+#: resources.h:634
+msgid "Reset and requeue &all"
 msgstr ""
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
@@ -5832,57 +5993,62 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Bersîv:"
 
-#: resources.h:438
+#: resources.h:440
 msgid "Results:"
 msgstr ""
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 #, fuzzy
 msgid "Resume file transfer"
 msgstr "Dosiya dûr"
 
-#: resources.h:852
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
 msgstr "Lîsteya peldankê tê standin..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, fuzzy, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "&Navnîşana IP ya Derve:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:917
 msgid "Root certificate is not trusted"
 msgstr ""
 
-#: resources.h:499
+#: resources.h:508
 #, fuzzy
 msgid "S&how files currently being edited..."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:607
+#: resources.h:885
+#, fuzzy
+msgid "S&how the Site Manager on startup"
+msgstr "&Gerînendeyê Malperê"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr ""
 
-#: resources.h:436
+#: resources.h:438
 #, fuzzy
 msgid "S&top"
 msgstr "&Bixweber"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr ""
 
@@ -5891,39 +6057,44 @@
 msgid "SFTP"
 msgstr "FTP"
 
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "dosya"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 #, fuzzy
 msgid "Save settings?"
 msgstr "Mîheng"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
 msgstr "Dosiyên dê têkevin dorê tên dîtin"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
 msgstr "Dosiyên dê herin hember tên dîtin"
 
-#: resources.h:432
+#: resources.h:434
 #, fuzzy
 msgid "Search &conditions:"
 msgstr "Peldankekê çêke"
 
-#: resources.h:430
+#: resources.h:432
 #, fuzzy
 msgid "Search &directory:"
 msgstr "Peldankekê çêke"
 
-#: resources.h:994
+#: resources.h:1012
 msgid "Search for files recursively."
 msgstr ""
 
-#: resources.h:539
+#: resources.h:549
 #, fuzzy
 msgid "Search server for files"
 msgstr "Dosiyên dê herin hember tên dîtin"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 #, fuzzy
 msgid "Security information"
 msgstr "Agahiya hilberînê"
@@ -5933,25 +6104,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr ""
 
-#: resources.h:374
+#: resources.h:376
 #, fuzzy
 msgid "Sele&ct server"
 msgstr "Dirb hilbijêre"
 
-#: resources.h:720
+#: resources.h:736
 msgid "Select &page:"
 msgstr "Rûpelê &hilbijêre:"
 
-#: resources.h:870
+#: resources.h:888
 msgid "Select Theme"
 msgstr "Dirb hilbijêre"
 
-#: resources.h:830
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 #, fuzzy
 msgid "Select default editor"
@@ -5992,16 +6163,16 @@
 msgstr ""
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2673
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 #, fuzzy
 msgid "Select file for exported sites"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 #, fuzzy
 msgid "Select file to upload"
 msgstr "Dosiyên dê herin hember tên dîtin"
@@ -6010,29 +6181,29 @@
 msgid "Select filename for converted keyfile"
 msgstr ""
 
-#: resources.h:420
+#: resources.h:422
 #, fuzzy, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Jixwe Gerînendeyê Malperê vekirî ye"
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:805
 #, fuzzy
 msgid "Select target download directory"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr ""
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr ""
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:798
+#: ../../locales/../src/interface/search.cpp:772
 #, fuzzy, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6046,7 +6217,7 @@
 msgstr[0] "Dosya û peldankên hilbijartî daxîne"
 msgstr[1] "Dosya û peldankên hilbijartî daxîne"
 
-#: ../../locales/../src/interface/search.cpp:796
+#: ../../locales/../src/interface/search.cpp:770
 #, fuzzy, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6067,7 +6238,7 @@
 msgstr[0] "Dosiya armanckirî jixwe heye"
 msgstr[1] "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/search.cpp:803
+#: ../../locales/../src/interface/search.cpp:777
 #, fuzzy, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Dosî û peldankê hilbijartî têxe dora ragihandinê"
@@ -6082,38 +6253,39 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 #, fuzzy
 msgid "Selected editor does not exist."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 #, fuzzy
 msgid "Selected file already being edited"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 #, fuzzy
-msgid "Selected file already opened."
+msgid "Selected file is already loaded"
 msgstr "Jixwe Gerînendeyê Malperê vekirî ye"
 
-#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 #, fuzzy
-msgid "Selected file is already loaded"
+msgid "Selected file is already opened"
 msgstr "Jixwe Gerînendeyê Malperê vekirî ye"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
-msgstr ""
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+#, fuzzy
+msgid "Selected file is still being edited"
+msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 #, fuzzy
 msgid "Selected filter only works for local files."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6123,75 +6295,80 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr ""
 
-#: resources.h:742
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
 msgstr ""
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr "Fermaneke şexsî bişîne ji pêşkêşker re, heke na naxebite"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr ""
 
 #: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
 msgstr ""
 
-#: resources.h:81 resources.h:88
+#: resources.h:89
 #, fuzzy
 msgid "Server &Type:"
 msgstr "Cureyê &Pêşkêşker:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6209,26 +6386,26 @@
 msgid "Server sent unexpected reply."
 msgstr ""
 
-#: resources.h:350
+#: resources.h:352
 #, fuzzy
 msgid "Server to client MAC:"
 msgstr "Pêşkêşker / Dosiya herêmî"
 
-#: resources.h:348
+#: resources.h:350
 #, fuzzy
 msgid "Server to client cipher:"
 msgstr "Pêşkêşker / Dosiya herêmî"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
 msgstr "Cureyê &Pêşkêşker:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
+#: ../../locales/../src/interface/queue.cpp:1225
 #, fuzzy
 msgid "Server/Local file"
 msgstr "Pêşkêşker / Dosiya herêmî"
 
-#: resources.h:310 resources.h:372
+#: resources.h:312 resources.h:374
 #, fuzzy
 msgid "Server:"
 msgstr "&Pêşkêşker"
@@ -6237,34 +6414,34 @@
 msgid "Session details"
 msgstr ""
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "Y&a Pêşî Belî Bike"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Destûrên '%s' bide '%s' ê"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
 msgstr ""
 
-#: resources.h:719
+#: resources.h:735
 msgid "Settings"
 msgstr "Mîheng"
 
-#: resources.h:967
+#: resources.h:985
 #, fuzzy
 msgid "Show &raw directory listing"
 msgstr "Xebata standina listeya peldankan ne serkeftî ye"
 
-#: resources.h:550
+#: resources.h:560
 msgid "Show &welcome dialog..."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
 msgstr ""
 
@@ -6272,11 +6449,11 @@
 msgid "Shows this help dialog"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
 msgstr ""
 
-#: resources.h:298
+#: resources.h:300
 #, fuzzy
 msgid "Site &Manager entries"
 msgstr "Gerînendeyê Malperê"
@@ -6285,74 +6462,74 @@
 msgid "Site Manager"
 msgstr "Gerînendeyê Malperê"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 #, fuzzy
 msgid "Site Manager - Invalid data"
 msgstr "Jixwe Gerînendeyê Malperê vekirî ye"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Jixwe Gerînendeyê Malperê vekirî ye"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 #, fuzzy
 msgid "Site does not exist."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Mezinahî"
 
-#: resources.h:889
+#: resources.h:907
 #, fuzzy
 msgid "Size formatting"
 msgstr "Agahiya hilberînê"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Mezinahî nayê zanîn"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 #, fuzzy
 msgid "Skip file"
 msgstr "Dosiyê ji nû ve bi nav bike"
@@ -6373,34 +6550,34 @@
 msgid "Skipping upload of %s"
 msgstr "Barkirina %s ya hember derbas bibe"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 
-#: resources.h:682 resources.h:758
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
 
-#: resources.h:907
+#: resources.h:925
 msgid "Sort directories inline"
 msgstr ""
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 
-#: resources.h:903
+#: resources.h:921
 #, fuzzy
 msgid "Sorting"
 msgstr "Mîheng"
 
-#: resources.h:904
+#: resources.h:922
 msgid "Sorting &mode:"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
 msgstr ""
 
@@ -6408,7 +6585,7 @@
 msgid "Source and target file may not be the same"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr ""
 
@@ -6417,24 +6594,24 @@
 msgid "Source file:"
 msgstr "Malpera herêmî:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr ""
 
-#: resources.h:803
+#: resources.h:819
 msgid "Speed limits"
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr ""
 
-#: resources.h:390
+#: resources.h:392
 #, fuzzy
 msgid "Start transfer &immediately"
 msgstr "Cureyê ragihandinê ya wekî heyî:"
@@ -6444,39 +6621,39 @@
 msgid "Start with opened Site Manager"
 msgstr "Gerînendeyê Malperê veke"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "Dest bi daxistina %s dike"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Barkirina hember a %s dest pê dibe"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Rewş"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Rewş:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
 msgstr ""
 
@@ -6489,28 +6666,28 @@
 msgid "Successful transfers"
 msgstr "Cureyê ragihandinê ya wekî heyî:"
 
-#: resources.h:710
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr ""
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../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:373
 #: ../../locales/../src/interface/state.cpp:383
 #: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
 msgstr ""
 
@@ -6518,8 +6695,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 #, fuzzy
 msgid "Syntax error"
 msgstr "Çewtiyeke xetere"
@@ -6529,26 +6706,30 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 #, fuzzy
 msgid "Syntax error in command line"
 msgstr "Çewtiyeke xetere"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr ""
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr ""
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 #, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Têkilî çêbû, peyama xêrhatinê tê hêvîkirin..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 #, fuzzy
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Têkilî çêbû, peyama xêrhatinê tê hêvîkirin..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
 msgstr ""
 
@@ -6565,19 +6746,24 @@
 msgid "Target file:"
 msgstr "Dosiya dûr"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "Dosiya armanckirî jixwe heye"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "Dosiya armanckirî jixwe heye, bila bidomîne?"
 
-#: resources.h:709
+#: resources.h:725
 msgid "Test results"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6586,7 +6772,7 @@
 "Gerînendeyê Malperê di danişîneke din a FileZilla 3'yê de vekirî ye.\n"
 "Tu dixwazî bidomînî? Dê guhertinên li Gerînendeyê Malperê neyên tomarkirin."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 #, fuzzy
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
@@ -6595,7 +6781,7 @@
 "Gerînendeyê Malperê di danişîneke din a FileZilla 3'yê de vekirî ye.\n"
 "Tu dixwazî bidomînî? Dê guhertinên li Gerînendeyê Malperê neyên tomarkirin."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr ""
@@ -6605,16 +6791,16 @@
 msgid "The address you entered was: %s"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
 msgstr ""
 
@@ -6622,12 +6808,12 @@
 msgid "The custom login sequence cannot be empty."
 msgstr ""
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr ""
 
-#: resources.h:422
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr ""
@@ -6636,7 +6822,7 @@
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
 #, fuzzy
-msgid "The entered filter name already exists."
+msgid "The entered filter name already exists, please choose a different name."
 msgstr "Dosiya armanckirî jixwe heye"
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
@@ -6654,9 +6840,9 @@
 "Dosya %s jixwe heye.\n"
 "Navekî nû binivîse:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6669,22 +6855,22 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6720,7 +6906,7 @@
 msgid "The file selected as default editor does not exist."
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6729,11 +6915,11 @@
 "Continue with the import?"
 msgstr ""
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
 msgstr ""
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
 msgstr ""
 
@@ -6747,20 +6933,20 @@
 msgid "The following characters will be replaced: %s"
 msgstr ""
 
-#: resources.h:327
+#: resources.h:329
 #, fuzzy
 msgid "The following files are currently being edited:"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
 msgstr ""
 
-#: resources.h:965
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6798,47 +6984,46 @@
 "you installed this version."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
+#: ../../locales/../src/interface/QueueView.cpp:1964
 #, fuzzy
 msgid "The queue will not be saved."
 msgstr "\"%s\" nayê nivîsîn, dor nayê tomarkirin."
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1022
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr ""
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 
-#: resources.h:320
+#: resources.h:322
 #, fuzzy
 msgid "The selected file is already being edited:"
 msgstr "Dosiya armanckirî jixwe heye"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
 msgstr ""
 
@@ -6846,7 +7031,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr ""
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 
@@ -6856,30 +7041,30 @@
 "certificate to make sure the server can be trusted."
 msgstr ""
 
-#: resources.h:186
+#: resources.h:188
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
 
-#: resources.h:174
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3220
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 
@@ -6900,11 +7085,11 @@
 msgid "Themes"
 msgstr "Hemû Dirb"
 
-#: ../../locales/../src/interface/filter.cpp:447
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr ""
 
-#: ../../locales/../src/interface/filter.cpp:382
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr ""
 
@@ -6914,34 +7099,39 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:687
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 
-#: resources.h:665
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+#, fuzzy
+msgid "Time"
+msgstr "Dem"
+
+#: resources.h:901
 #, fuzzy
 msgid "Time formatting"
 msgstr "Agahiya hilberînê"
 
-#: resources.h:726
+#: resources.h:742
 msgid "Time&out in seconds:"
 msgstr ""
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 #, fuzzy
 msgid "Timeout"
 msgstr "Dem"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
@@ -6949,26 +7139,26 @@
 "seconds."
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 #, fuzzy
 msgid "Title:"
 msgstr "dosya"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 
-#: resources.h:780
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
 
-#: resources.h:990
+#: resources.h:1008
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6978,30 +7168,30 @@
 "Red: File sizes different"
 msgstr ""
 
-#: resources.h:992
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
 
-#: resources.h:980 resources.h:981
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
 msgstr "Xebatên dora ragihandinê biguhere"
 
-#: resources.h:972 resources.h:973
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
 msgstr "Destûra dîtinê ya dara peldankên herêmî biguhere"
 
-#: resources.h:970 resources.h:971
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
 msgstr "Destûra dîtinê ya tomariya peyaman biguherîne"
 
-#: resources.h:974 resources.h:975
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
 msgstr "Dê dîtina dara peldanka dûr veke û bigire"
 
-#: resources.h:976 resources.h:977
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
 msgstr "Dê destûra dîtinê ya dora ragihandinê biguhere"
 
@@ -7014,42 +7204,42 @@
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "Riyê Bişopîne:"
 
-#: resources.h:913 resources.h:919
+#: resources.h:931 resources.h:937
 #, fuzzy
 msgid "Transfer"
 msgstr "Tê ragihandin"
 
-#: resources.h:360
+#: resources.h:362
 #, fuzzy
 msgid "Transfer &direction"
 msgstr "Mîhengên ragihandinê"
 
-#: resources.h:525
+#: resources.h:535
 #, fuzzy
 msgid "Transfer &type"
 msgstr "Mod a Ragihandinê"
 
-#: resources.h:736
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "Mod a Ragihandinê"
 
-#: resources.h:869
+#: resources.h:887
 #, fuzzy
 msgid "Transfer Queue"
 msgstr "Ragihandina dosiyan serkeftî ye"
 
-#: resources.h:97
+#: resources.h:98
 #, fuzzy
 msgid "Transfer Settings"
 msgstr "Mîhengên ragihandinê"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
+#: ../../locales/../src/engine/transfersocket.cpp:498
+#: ../../locales/../src/engine/transfersocket.cpp:522
 #, fuzzy, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Ji aliyê bikarhêner ve hate rawestandin"
@@ -7058,8 +7248,8 @@
 msgid "Transferred data got tainted."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1491
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "Tê ragihandin"
 
@@ -7068,31 +7258,31 @@
 msgid "Transfers"
 msgstr "Tê ragihandin"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, fuzzy
 msgid "Transfers finished"
 msgstr "Mîhengên ragihandinê"
 
-#: resources.h:827
+#: resources.h:843
 #, fuzzy
 msgid "Treat files &without extension as ASCII file"
 msgstr "Dosiyên cureyê &wan tunebin wekî Ascii têbigihîje"
 
-#: resources.h:823
+#: resources.h:839
 #, fuzzy
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Van cureyên dosiyan wekî Ascii têbigihîje:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+msgid "Trust changed Hostkey:"
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+msgid "Trust new Hostkey:"
 msgstr ""
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr ""
 
@@ -7100,43 +7290,43 @@
 msgid "Trust this certificate and carry on connecting?"
 msgstr ""
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr ""
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr ""
 
-#: resources.h:762
+#: resources.h:778
 msgid "Type of FTP Proxy:"
 msgstr ""
 
-#: resources.h:787
+#: resources.h:803
 msgid "Type of generic proxy:"
 msgstr ""
 
-#: resources.h:330
+#: resources.h:332
 #, fuzzy
 msgid "U&pload"
 msgstr "&Bar ke"
 
-#: resources.h:483 resources.h:807
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr ""
 
-#: resources.h:931
+#: resources.h:949
 #, fuzzy
 msgid "U&se filetype associations if available"
 msgstr "Dabeşkirina bixweber a cureyên dosiyan"
 
-#: resources.h:884
+#: resources.h:902
 #, fuzzy
 msgid "U&se system defaults"
 msgstr "&Wekî Heyî"
 
-#: resources.h:764
+#: resources.h:780
 msgid "USER@&HOST"
 msgstr ""
 
@@ -7145,18 +7335,18 @@
 msgid "Unassigned error code %d"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 #, fuzzy
 msgid "Unit:"
 msgstr "Unix"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 #, fuzzy
 msgid "Unknown"
 msgstr "Mezinahî nayê zanîn"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 
@@ -7169,13 +7359,13 @@
 msgid "Unknown certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr ""
 
@@ -7186,7 +7376,7 @@
 "subnegotiation: %d"
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7204,7 +7394,7 @@
 "mode has to be used."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:888
 msgid "Unsupported certificate type"
 msgstr ""
 
@@ -7212,7 +7402,7 @@
 msgid "Unsupported redirect"
 msgstr ""
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr ""
 
@@ -7226,148 +7416,152 @@
 msgid "Update wizard"
 msgstr ""
 
-#: resources.h:362
+#: resources.h:364
 #, fuzzy
 msgid "Upload"
 msgstr "&Bar ke"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1256
 #, fuzzy
 msgid "Upload failed"
 msgstr "&Bar ke"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
+#: ../../locales/../src/interface/statusbar.cpp:609
 #, fuzzy, c-format
 msgid "Upload limit: %s/s"
 msgstr "&Daxe"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
+#: ../../locales/../src/interface/statusbar.cpp:611
 #, fuzzy
 msgid "Upload limit: none"
 msgstr "&Daxe"
 
-#: resources.h:642
+#: resources.h:658
 #, fuzzy
 msgid "Upload selected directory"
 msgstr "Dosya û peldankên hilbijartî daxîne"
 
-#: resources.h:556
+#: resources.h:566
 #, fuzzy
 msgid "Upload selected files and directories"
 msgstr "Dosî û peldankên hilbijartî ragihîne hember"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr ""
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 #, fuzzy
 msgid "Uploading"
 msgstr "&Bar ke"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr ""
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
 msgstr ""
 
-#: resources.h:928
+#: resources.h:946
 #, fuzzy
 msgid "Use &custom editor:"
 msgstr "Peldanka &dûr a wekî heyî:"
 
-#: resources.h:421
+#: resources.h:423
 msgid "Use &default editor for text files"
 msgstr ""
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr ""
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 
-#: resources.h:257 resources.h:267
+#: resources.h:259 resources.h:269
 #, fuzzy
 msgid "Use default action"
 msgstr "&Wekî Heyî"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr ""
+
+#: resources.h:372
 #, fuzzy
 msgid "Use server currently connected to"
 msgstr "Tu dixwazî dosiya derbasdar bibirrî?"
 
-#: resources.h:371
+#: resources.h:373
 #, fuzzy
 msgid "Use server from site manager"
 msgstr "Gerînendeyê Malperê veke"
 
-#: resources.h:878
+#: resources.h:896
 #, fuzzy
 msgid "Use system &defaults"
 msgstr "&Wekî Heyî"
 
-#: resources.h:688
+#: resources.h:704
 #, fuzzy
 msgid "Use the following IP address:"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:698
+#: resources.h:714
 #, fuzzy
 msgid "Use the following port range:"
 msgstr "ma bi vê dosiyê?"
 
-#: resources.h:683
+#: resources.h:699
 msgid "Use the server's external IP address instead"
 msgstr ""
 
-#: resources.h:689 resources.h:752
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 
-#: resources.h:692
+#: resources.h:708
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "Bikarhêner:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
 msgstr ""
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 
@@ -7383,49 +7577,49 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
 msgstr ""
 
-#: resources.h:168
+#: resources.h:170
 #, fuzzy
 msgid "Version:"
 msgstr "Destûr"
 
-#: resources.h:812
+#: resources.h:828
 msgid "Very high"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 
-#: resources.h:915
+#: resources.h:933
 msgid "View/Edit"
 msgstr ""
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
 msgstr ""
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "Binivîse:"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
 msgstr "Li hêviyê ye"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
+#: ../../locales/../src/interface/QueueView.cpp:1441
 #, fuzzy
 msgid "Waiting for password"
 msgstr "Nasnavê bipirse"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 #, fuzzy
 msgid "Waiting for transfer to be cancelled"
 msgstr "Li hêviyê ye ku ragihandin raweste"
@@ -7435,7 +7629,7 @@
 msgid "Waiting to retry..."
 msgstr "Peldanka '%s' tê çêkirin..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
 "Warning!\n"
 "\n"
@@ -7465,34 +7659,38 @@
 "Do you really want to check for nightly builds?"
 msgstr ""
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr ""
 
-#: resources.h:474
+#: resources.h:476
 #, fuzzy
 msgid "Welcome to FileZilla"
 msgstr "FileZilla'yê bigire"
 
-#: resources.h:463
+#: resources.h:465
 msgid "What's new"
 msgstr ""
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
 msgstr ""
 
-#: resources.h:815
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 
-#: resources.h:857
+#: resources.h:873
 msgid "Widescreen"
 msgstr ""
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "Bi&nivîse"
 
@@ -7506,32 +7704,32 @@
 msgid "Wrong line endings"
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr ""
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
 msgstr ""
 "Ji bo parastina destûra dosiya orjînal tu dikarî x texî pozisyoneke ji rêzê."
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr ""
 
@@ -7546,30 +7744,30 @@
 msgstr ""
 "Ji bo dosiyê te navekî nû nenivîsî. Di şûna wê de tu dixwazî dosiyê jê bibî?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 #, fuzzy
 msgid "You have to enter a hostname."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:817
 #, fuzzy
 msgid "You have to enter a local directory."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
@@ -7579,18 +7777,18 @@
 msgid "You have to enter a valid IP address."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:823
 #, fuzzy
 msgid "You have to enter a writable local directory."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr ""
 
@@ -7600,7 +7798,7 @@
 "transferred data."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #, fuzzy
 msgid "You need to enter a name for the bookmark."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
@@ -7610,7 +7808,7 @@
 msgid "You need to enter a name for the log file."
 msgstr "Ji bo vê pêşkêşkerê nasnavekê binivîse:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
+#: ../../locales/../src/interface/edithandler.cpp:1640
 #, fuzzy
 msgid "You need to enter a properly quoted command."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
@@ -7626,41 +7824,41 @@
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 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:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 #, fuzzy
 msgid "You need to specify a remote file."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 #, fuzzy
 msgid "You need to specify a remote path."
 msgstr "Komputera navîn nehate dayin, komputera navîn belî bike."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 #, fuzzy
 msgid "You need to specify a server."
 msgstr "Bi pêşkêşker re têkilî çênabe"
@@ -7671,36 +7869,51 @@
 "should work properly."
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#, fuzzy
+msgid "after"
+msgstr "Tê ragihandin"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 #, fuzzy
 msgid "ends with"
 msgstr "Berhevkar:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 #, fuzzy
 msgid "equals"
 msgstr "Hûragahî"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:497
+#: ../../locales/../src/interface/filelistctrl.cpp:515
+#: ../../locales/../src/interface/filelistctrl.cpp:540
+#: ../../locales/../src/interface/filelistctrl.cpp:556
 msgid "file"
 msgstr "dosya"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr ""
 
@@ -7716,57 +7929,57 @@
 msgid "fzsftp could not be started"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 #, fuzzy
 msgid "group executable"
 msgstr "&Bixebitîne"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 #, fuzzy
 msgid "owner executable"
 msgstr "&Bixebitîne"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
 msgstr ""
 
@@ -7775,19 +7988,19 @@
 msgid "unknown"
 msgstr "Mezinahî nayê zanîn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 #, fuzzy
 msgid "world executable"
 msgstr "&Bixebitîne"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr ""
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
 msgstr ""
diff -Nru filezilla-3.5.3/locales/ky.po filezilla-3.7.3~precise/locales/ky.po
--- filezilla-3.5.3/locales/ky.po	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ky.po	2012-11-18 12:16:45.000000000 +0000
@@ -0,0 +1,7456 @@
+# Kyrgyz translation of Filezilla.
+# Copyright (C) 2012 THE Filezilla'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the Filezilla package.
+# Chynggyz Jumaliev <translatorky@lavabit.com>, 2012.
+# 
+msgid ""
+msgstr ""
+"Project-Id-Version: Filezilla pot\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2012-11-18 11:42+0100\n"
+"PO-Revision-Date: 2012-11-14 23:21+0600\n"
+"Last-Translator: Chynggyz Jumaliev <translatorky@lavabit.com>\n"
+"Language-Team: Kirghiz <ky@li.org>\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Language: \n"
+"Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Gtranslator 2.91.5\n"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:65
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
+msgid "%H:%M:%S elapsed"
+msgstr "%H:%M:%S өттү"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:69
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
+msgid "%H:%M:%S left"
+msgstr "%H:%M:%S калды"
+
+#: resources.h:790
+#, no-c-format
+msgid ""
+"%a - Account (Lines containing this will be omitted if not using Account "
+"logontype)"
+msgstr ""
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:63
+#: ../../locales/../src/interface/filelist_statusbar.cpp:74
+#: ../../locales/../src/interface/filelist_statusbar.cpp:86
+#, c-format
+msgid "%d directory"
+msgid_plural "%d directories"
+msgstr[0] "%d каталог"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
+#, c-format
+msgid "%d directory with its contents"
+msgid_plural "%d directories with their contents"
+msgstr[0] "%d каталог мазмуну менен кошо"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:62
+#: ../../locales/../src/interface/filelist_statusbar.cpp:85
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
+#, c-format
+msgid "%d file"
+msgid_plural "%d files"
+msgstr[0] "%d файл"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:81
+#, c-format
+msgid "%d file. Total size: %s"
+msgid_plural "%d files. Total size: %s"
+msgstr[0] "%d файл. Жалпы өлчөмү: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:79
+#, c-format
+msgid "%d file. Total size: At least %s"
+msgid_plural "%d files. Total size: At least %s"
+msgstr[0] "%d файл. Жалпы өлчөмү: эң азы %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:2939
+#, c-format
+msgid "%d files added to queue"
+msgstr "%d файл кезекке кошулду"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:104
+#, c-format
+msgid "%d second"
+msgid_plural "%d seconds"
+msgstr[0] "%d секунда"
+
+#: resources.h:787
+msgid "%h - Host"
+msgstr "%h - Хост"
+
+#: resources.h:789
+#, no-c-format
+msgid "%p - Password"
+msgstr "%p - Сырсөз"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, fuzzy, c-format
+msgid "%s (%s/s)"
+msgstr "%s (%d Б/сек)"
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
+#, c-format
+msgid "%s (? B/s)"
+msgstr "%s (? Б/сек)"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
+#, c-format
+msgid "%s - Certificate expired!"
+msgstr "%s - Сертификаттын мөөнөтү өттү!"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
+#, c-format
+msgid "%s - Not yet valid!"
+msgstr ""
+
+#: resources.h:791
+#, no-c-format
+msgid "%s - Proxy user"
+msgstr "%s - Прокси колдонуучусу"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:91
+#, c-format
+msgid "%s and %s. Total size: %s"
+msgstr "%s жана %s. Жалпы өлчөмү: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:89
+#, c-format
+msgid "%s and %s. Total size: At least %s"
+msgstr "%s жана %s. Жалпы өлчөмү: эң азы %s"
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:31
+#, c-format
+msgid "%s byte"
+msgid_plural "%s bytes"
+msgstr[0] "%s байт"
+
+#: ../../locales/../src/interface/updatewizard.cpp:908
+#, c-format
+msgid "%s bytes"
+msgstr "%s байт"
+
+#: ../../locales/../src/interface/updatewizard.cpp:892
+#, fuzzy, c-format
+msgid "%s bytes (%s/s)"
+msgstr "%s байт (%d Б/сек)"
+
+#: ../../locales/../src/interface/FileZilla.cpp:701
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Please download FileZilla again. If this problem persists, please submit a "
+"bug report."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:795
+#, c-format
+msgid ""
+"%s could not be found. Without this component of FileZilla, SFTP will not "
+"work.\n"
+"\n"
+"Possible solutions:\n"
+"- Make sure %s is in a directory listed in your PATH environment variable.\n"
+"- Set the full path to %s in the FZ_FZSFTP environment variable."
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
+#, c-format
+msgid "%s with %d bits"
+msgstr ""
+
+#: resources.h:788
+#, no-c-format
+msgid "%u - Username"
+msgstr "%u - Колдонуучу аты"
+
+#: resources.h:792
+#, no-c-format
+msgid "%w - Proxy password"
+msgstr "%w - Прокси сырсөзү"
+
+#: resources.h:563
+msgid "&About..."
+msgstr "Программа &жөнүндө..."
+
+#: resources.h:86 resources.h:385
+msgid "&Account:"
+msgstr "&Эсеп жазуусу:"
+
+#: resources.h:101 resources.h:692 resources.h:756
+msgid "&Active"
+msgstr "&Активдүү"
+
+#: resources.h:554
+msgid "&Add bookmark..."
+msgstr "&Чөп кат кошуу..."
+
+#: resources.h:567 resources.h:584
+msgid "&Add files to queue"
+msgstr "Файлдарды кезекке &кошуу"
+
+#: resources.h:800
+msgid "&Add keyfile..."
+msgstr "Ачкыч файлын &кошуу..."
+
+#: resources.h:642 resources.h:661
+msgid "&Add to queue"
+msgstr "Кезекке &кошуу"
+
+#: resources.h:95
+msgid "&Adjust server timezone offset:"
+msgstr "Сервер саат алкагынын жылышын &ырастоо:"
+
+#: resources.h:23
+msgid "&Always trust certificate in future sessions."
+msgstr "Эмдиги сессиялардан &дайыма сертификаттарга ишенүү."
+
+#: resources.h:183
+msgid "&Always trust this host, add this key to the cache"
+msgstr ""
+
+#: resources.h:952
+msgid "&Always use default editor"
+msgstr "Жарыяланбас редакторун &дайыма колдонуу"
+
+#: resources.h:428
+msgid "&Always use selection for unassociated files"
+msgstr ""
+
+#: resources.h:65
+msgid "&Always use this action"
+msgstr "&Дайыма ушул аракетти колдонуу"
+
+#: resources.h:768
+msgid "&Ask your operating system for the external IP address"
+msgstr ""
+
+#: resources.h:536 resources.h:672 resources.h:837
+msgid "&Auto"
+msgstr "&Авто"
+
+#: resources.h:107
+msgid "&Autodetect"
+msgstr "&Автоаныктоо"
+
+#: resources.h:538 resources.h:674 resources.h:839
+msgid "&Binary"
+msgstr "&Экилик"
+
+#: resources.h:912
+msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
+msgstr ""
+
+#: resources.h:553
+msgid "&Bookmarks"
+msgstr "&Чөп каттар"
+
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:949 resources.h:971
+msgid "&Browse..."
+msgstr "&Сереп..."
+
+#: resources.h:827
+#, no-c-format
+msgid "&Burst tolerance:"
+msgstr ""
+
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:740
+msgid "&Cancel"
+msgstr "&Айнуу"
+
+#: resources.h:236
+msgid "&Check for beta versions of FileZilla"
+msgstr "FileZilla'нын бета-версияларын &текшерүү"
+
+#: resources.h:513
+msgid "&Clear private data..."
+msgstr "Өздүк маалыматтарды &өчүрүү..."
+
+#: resources.h:613
+msgid "&Close FileZilla"
+msgstr "FileZilla'ны &жабуу"
+
+#: resources.h:682
+msgid "&Configure speed limits..."
+msgstr "Ылдамдыктын чектөөсүн &ырастоо..."
+
+#: resources.h:541
+msgid "&Configure..."
+msgstr "&Ырастоо..."
+
+#: resources.h:113
+msgid "&Connect"
+msgstr "&Туташуу"
+
+#: resources.h:219
+msgid "&Copy"
+msgstr "&Копиялоо"
+
+#: resources.h:501
+msgid "&Copy current connection to Site Manager..."
+msgstr "Кезектеги туташууну сайт менеджерине &копиялоо..."
+
+#: resources.h:173 resources.h:622
+msgid "&Copy to clipboard"
+msgstr "Алмашуу буферине &копиялоо"
+
+#: resources.h:627
+msgid "&Crash"
+msgstr ""
+
+#: resources.h:575 resources.h:589 resources.h:644 resources.h:665
+msgid "&Create directory"
+msgstr "Каталог &жаратуу"
+
+#: resources.h:677
+msgid "&Create new tab"
+msgstr "Жаңы салманы &жаратуу"
+
+#: ../../locales/../src/interface/menu_bar.cpp:72
+msgid "&Debug"
+msgstr "&Оңдоо"
+
+#: resources.h:979
+msgid "&Debug information in message log:"
+msgstr ""
+
+#: resources.h:945
+msgid "&Default editor:"
+msgstr "&Жарыяланбас редактору:"
+
+#: resources.h:534 resources.h:605
+msgid "&Default file exists action..."
+msgstr ""
+
+#: resources.h:750
+msgid "&Delay between failed login attempts:"
+msgstr ""
+
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:667
+msgid "&Delete"
+msgstr "&Өчүрүү"
+
+#: resources.h:458
+msgid "&Delete symlink"
+msgstr "Символдук шилтемени &өчүрүү"
+
+#: resources.h:519
+msgid "&Directory comparison"
+msgstr "&Каталогдорду салыштыруу"
+
+#: resources.h:326
+msgid "&Discard local file then download and edit file anew"
+msgstr ""
+
+#: resources.h:547
+msgid "&Disconnect"
+msgstr "&Үзүү"
+
+#: resources.h:614
+msgid "&Disconnect from server"
+msgstr "Серверден &өчүрүлүү"
+
+#: resources.h:888
+msgid "&Display momentary transfer speed instead of average speed"
+msgstr ""
+
+#: resources.h:910
+msgid "&Display size in bytes"
+msgstr "Өлчөмдү байт менен &көрсөтүү"
+
+#: resources.h:494
+msgid "&Do not remember passwords"
+msgstr "Сырсөздөрдү эске &сактабоо"
+
+#: ../../locales/../src/interface/conditionaldialog.cpp:25
+msgid "&Don't show this dialog again."
+msgstr "Бул терезени кайтадан &көрсөтпөө."
+
+#: resources.h:773
+msgid "&Don't use external IP address on local connections."
+msgstr ""
+
+#: resources.h:932
+msgid "&Double-click action on files:"
+msgstr ""
+
+#: resources.h:582 resources.h:640
+msgid "&Download"
+msgstr "&Жүктөп алуу"
+
+#: resources.h:444
+msgid "&Download to:"
+msgstr ""
+
+#: resources.h:675
+msgid "&Download..."
+msgstr "&Жүктөп алуу..."
+
+#: resources.h:258 resources.h:849
+msgid "&Downloads:"
+msgstr "&Жүктөөлөр:"
+
+#: resources.h:511 resources.h:573
+msgid "&Edit"
+msgstr "&Оңдоо"
+
+#: resources.h:211
+msgid "&Edit filter rules..."
+msgstr "Фильтрдөө эрежелерин &оңдоо..."
+
+#: resources.h:520 resources.h:540 resources.h:655 resources.h:681
+msgid "&Enable"
+msgstr "&Күйгүзүү"
+
+#: resources.h:960
+msgid "&Enable automatic update check"
+msgstr ""
+
+#: resources.h:482 resources.h:822
+msgid "&Enable speed limits"
+msgstr "Ылдамдыктын чектөөсүн &күйгүзүү"
+
+#: resources.h:111
+msgid "&Encoding:"
+msgstr "&Кодировка:"
+
+#: resources.h:82
+msgid "&Encryption:"
+msgstr "&Шифрдөө:"
+
+#: resources.h:621
+msgid "&Enter custom command..."
+msgstr "Тапшырылма команданы &киргүзүү..."
+
+#: resources.h:137
+msgid "&Execute"
+msgstr "&Аткаруу"
+
+#: resources.h:293
+msgid "&Export Site Manager entries"
+msgstr "Сайт менеджеринин жазууларын &экспорттоо"
+
+#: resources.h:506 resources.h:671
+msgid "&Export..."
+msgstr "&Экспорт..."
+
+#: resources.h:778
+msgid "&Fall back to active mode"
+msgstr ""
+
+#: resources.h:498
+msgid "&File"
+msgstr "&Файл"
+
+#: resources.h:652
+msgid "&File Attributes..."
+msgstr "&Файл атрибуттары..."
+
+#: resources.h:600
+msgid "&File permissions..."
+msgstr "&Файл укутары..."
+
+#: resources.h:366
+msgid "&File:"
+msgstr "&Файл:"
+
+#: resources.h:221
+msgid "&Filter conditions:"
+msgstr ""
+
+#: resources.h:200
+msgid "&Filter sets:"
+msgstr ""
+
+#: resources.h:215
+msgid "&Filters:"
+msgstr "&Фильтрлер:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:30
+msgid "&Finish"
+msgstr "&Бүтүрүү"
+
+#: resources.h:318
+msgid "&Finish editing and delete local file"
+msgstr ""
+
+#: resources.h:448
+msgid ""
+"&Flatten remote paths, download all contained files directly into target "
+"directory"
+msgstr ""
+
+#: resources.h:459
+msgid "&Follow symlink, delete target directory contents"
+msgstr ""
+
+#: resources.h:771
+msgid "&Get external IP address from the following URL:"
+msgstr ""
+
+#: resources.h:561
+msgid "&Getting help..."
+msgstr "Жардам &алуу..."
+
+#: resources.h:398
+msgid "&Global bookmark"
+msgstr "&Жалпы чөп кат"
+
+#: resources.h:807
+msgid "&HTTP/1.1 using CONNECT method"
+msgstr "&HTTP/1.1 CONNECT методун колдонуп"
+
+#: resources.h:557
+msgid "&Help"
+msgstr "&Жардам"
+
+#: resources.h:523 resources.h:658
+msgid "&Hide identical files"
+msgstr "Окшош файлдарды &жашыруу"
+
+#: resources.h:607
+msgid "&Highest"
+msgstr "&Эң чоң"
+
+#: resources.h:766
+msgid "&Highest available port:"
+msgstr "&Эң чоң колго жетердик порт:"
+
+#: resources.h:79 resources.h:379 resources.h:730
+msgid "&Host:"
+msgstr "&Хост:"
+
+#: resources.h:911
+msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
+msgstr "&IEC экилик префикстери (мисалы, 1 KiB = 1024 байт)"
+
+#: resources.h:899
+msgid "&ISO 8601 (example: 2007-09-15)"
+msgstr "&ISO 8601 (мисалы: 2007-09-15)"
+
+#: resources.h:507
+msgid "&Import..."
+msgstr "&Импорт..."
+
+#: resources.h:954
+msgid "&Inherit system's filetype associations"
+msgstr ""
+
+#: resources.h:447
+msgid "&Keep remote path structure relative to search root"
+msgstr ""
+
+#: resources.h:872
+msgid "&Layout of file and directory panes:"
+msgstr ""
+
+#: resources.h:763
+msgid "&Limit local ports used by FileZilla"
+msgstr "FileZilla колдонгон жердик портторду &чектөө"
+
+#: resources.h:103
+msgid "&Limit number of simultaneous connections"
+msgstr ""
+
+#: resources.h:529
+msgid "&Local directory tree"
+msgstr "&Жердик каталог багы"
+
+#: resources.h:403 resources.h:409
+msgid "&Local directory:"
+msgstr "&Жердик каталог:"
+
+#: resources.h:969
+msgid "&Log to file"
+msgstr "Лог-файлга &жаздыруу"
+
+#: resources.h:83
+msgid "&Logon Type:"
+msgstr "&Кирүү түрү:"
+
+#: resources.h:382
+msgid "&Logontype:"
+msgstr "&Кирүү түрү:"
+
+#: resources.h:610
+msgid "&Low"
+msgstr "&Аз"
+
+#: resources.h:555
+msgid "&Manage bookmarks..."
+msgstr "&Чөп каттарды оңдоо..."
+
+#: resources.h:543
+msgid "&Manual transfer..."
+msgstr "&Кол менен берүү..."
+
+#: resources.h:104
+msgid "&Maximum number of connections:"
+msgstr "Туташтыруулардын &жогорчек саны:"
+
+#: resources.h:748
+msgid "&Maximum number of retries:"
+msgstr "Аракеттердин &жогорчек саны:"
+
+#: resources.h:528
+msgid "&Message log"
+msgstr "&Билдирме журналы"
+
+#: resources.h:885
+msgid "&Minimize to tray"
+msgstr "&Трейге түрүү"
+
+#: resources.h:401
+msgid "&Name:"
+msgstr "&Ат:"
+
+#: resources.h:512
+msgid "&Network configuration wizard..."
+msgstr "&Тармакты ырастоочу мастер..."
+
+#: resources.h:216
+msgid "&New"
+msgstr "&Жаңы"
+
+#: resources.h:72
+msgid "&New Site"
+msgstr "&Жаңы сайт"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1047
+msgid "&New version available!"
+msgstr "&Жаңы версия колго жетердик!"
+
+#: ../../locales/../src/interface/updatewizard.cpp:28
+msgid "&Next >"
+msgstr "&Алга >"
+
+#: resources.h:320
+msgid "&No"
+msgstr "&Жок"
+
+#: resources.h:781 resources.h:806
+msgid "&None"
+msgstr "&Эчтеке"
+
+#: resources.h:609
+msgid "&Normal"
+msgstr "&Нормалдуу"
+
+#: resources.h:961
+msgid "&Number of days between update checks:"
+msgstr ""
+
+#: resources.h:146
+msgid "&Numeric value:"
+msgstr "&Сан чоңдугу:"
+
+#: resources.h:114 resources.h:127 resources.h:419
+msgid "&OK"
+msgstr "&OK"
+
+#: resources.h:784
+msgid "&OPEN"
+msgstr "&АЧУУ"
+
+#: resources.h:571 resources.h:663
+msgid "&Open"
+msgstr "&Ачуу"
+
+#: resources.h:58
+msgid "&Overwrite"
+msgstr "&Кайтадан жаздыруу"
+
+#: resources.h:102
+msgid "&Passive"
+msgstr "&Пассивдүү"
+
+#: resources.h:125
+msgid "&Password:"
+msgstr "&Сырсөз:"
+
+#: resources.h:617
+msgid "&Play sound"
+msgstr "Үн &ойнотуу"
+
+#: resources.h:80 resources.h:380 resources.h:734
+msgid "&Port:"
+msgstr "&Порт:"
+
+#: resources.h:878
+msgid "&Position of the message log:"
+msgstr ""
+
+#: resources.h:539
+msgid "&Preserve timestamps of transferred files"
+msgstr "Файлдардын убактылуу белгилерин &сактоо"
+
+#: resources.h:302
+msgid "&Queue"
+msgstr "&Кезек"
+
+#: resources.h:736
+msgid "&Quickconnect"
+msgstr "&Тез туташтыруу"
+
+#: resources.h:527
+msgid "&Quickconnect bar"
+msgstr "&Тез туташтыруу панели"
+
+#: resources.h:135
+msgid "&Read"
+msgstr "&Окуу"
+
+#: resources.h:546
+msgid "&Reconnect"
+msgstr "&Кайта туташуу"
+
+#: resources.h:517 resources.h:680
+msgid "&Refresh"
+msgstr "&Жаңыртуу"
+
+#: resources.h:126
+msgid "&Remember password for this session"
+msgstr ""
+
+#: resources.h:493
+msgid "&Remember passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
+msgid "&Remote directory:"
+msgstr "&Алыскы каталог:"
+
+#: resources.h:369
+msgid "&Remote path:"
+msgstr "&Алыскы жол:"
+
+#: resources.h:843
+msgid "&Remove"
+msgstr "&Өчүрүү"
+
+#: resources.h:801
+msgid "&Remove key"
+msgstr "Ачкычты &өчүрүү"
+
+#: resources.h:604
+msgid "&Remove selected"
+msgstr "Тандалганды &өчүрүү"
+
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:648 resources.h:669
+msgid "&Rename"
+msgstr "Атын &өзгөртүү"
+
+#: resources.h:202
+msgid "&Rename..."
+msgstr "Атын &өзгөртүү..."
+
+#: resources.h:325
+msgid "&Reopen local file"
+msgstr "Жердик файлды &кайта ачуу"
+
+#: resources.h:834
+msgid "&Replace invalid characters with:"
+msgstr ""
+
+#: resources.h:562
+msgid "&Report a bug..."
+msgstr "Ката жөнүндө &маалымдоо..."
+
+#: resources.h:632
+msgid "&Reset and requeue all"
+msgstr ""
+
+#: resources.h:729
+msgid "&Restart Wizard"
+msgstr "Мастерди &кайтадан жүргүзүү"
+
+#: resources.h:62
+msgid "&Resume"
+msgstr ""
+
+#: resources.h:615
+msgid "&Run command..."
+msgstr "Команданы &жүргүзүү..."
+
+#: resources.h:743
+msgid "&Run configuration wizard now..."
+msgstr "Ырастоо мастерин азыр &жүргүзүү..."
+
+#: resources.h:963
+msgid "&Run update check now..."
+msgstr "Жаңыртууга &текшерүү..."
+
+#: resources.h:783
+msgid "&SITE"
+msgstr "&САЙТ"
+
+#: resources.h:808
+msgid "&SOCKS 5"
+msgstr "&SOCKS 5"
+
+#: resources.h:201
+msgid "&Save as..."
+msgstr ""
+
+#: resources.h:433
+msgid "&Search"
+msgstr "&Издөө"
+
+#: resources.h:548
+msgid "&Search remote files..."
+msgstr "Сервердеги файлдарды &издөө..."
+
+#: resources.h:71
+msgid "&Select Entry:"
+msgstr "Жазууну &тандаңыз:"
+
+#: resources.h:943
+msgid "&Select language:"
+msgstr "Тилди &тандоо:"
+
+#: resources.h:357
+msgid "&Select the columns that should be displayed:"
+msgstr ""
+
+#: resources.h:371 resources.h:544
+msgid "&Server"
+msgstr "&Сервер"
+
+#: resources.h:301
+msgid "&Settings"
+msgstr "&Ырастоолор"
+
+#: resources.h:514
+msgid "&Settings..."
+msgstr "&Ырастоолор..."
+
+#: resources.h:978
+msgid "&Show debug menu"
+msgstr ""
+
+#: resources.h:616
+msgid "&Show message"
+msgstr "Билдирмени &көрсөтүү"
+
+#: resources.h:968
+msgid "&Show timestamps in message log"
+msgstr ""
+
+#: resources.h:499
+msgid "&Site Manager..."
+msgstr "&Сайт менеджери..."
+
+#: resources.h:399
+msgid "&Site-specific bookmark"
+msgstr "&Өзүнчө чөп кат"
+
+#: resources.h:64
+msgid "&Skip"
+msgstr "&Өткөрүү"
+
+#: resources.h:542
+msgid "&Speed limits"
+msgstr "&Ылдамдыкты чектөө"
+
+#: resources.h:450
+msgid "&Start transfer immediately"
+msgstr ""
+
+#: resources.h:877
+msgid "&Swap local and remote panes"
+msgstr ""
+
+#: resources.h:629
+msgid "&TLS Ciphers"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:228
+msgid "&Test"
+msgstr ""
+
+#: resources.h:891
+msgid "&Theme:"
+msgstr "&Тема:"
+
+#: resources.h:532
+msgid "&Transfer"
+msgstr "&Берүү"
+
+#: resources.h:99
+msgid "&Transfer mode:"
+msgstr "&Берүү режими"
+
+#: resources.h:531
+msgid "&Transfer queue"
+msgstr "&Берүү кезеги"
+
+#: resources.h:846
+msgid "&Treat dotfiles as ASCII files"
+msgstr ""
+
+#: resources.h:331
+msgid "&Unedit"
+msgstr ""
+
+#: resources.h:196
+msgid "&Update cached key for this host"
+msgstr ""
+
+#: resources.h:565 resources.h:659
+msgid "&Upload"
+msgstr "&Жүктөө"
+
+#: resources.h:268 resources.h:858
+msgid "&Uploads:"
+msgstr "&Жүктөөлөр:"
+
+#: resources.h:426
+msgid "&Use custom program"
+msgstr ""
+
+#: resources.h:94
+msgid "&Use synchronized browsing"
+msgstr ""
+
+#: resources.h:947
+msgid "&Use system's default editor for text files"
+msgstr ""
+
+#: resources.h:769
+msgid "&Use the following IP address:"
+msgstr ""
+
+#: resources.h:777
+msgid "&Use the server's external IP address instead"
+msgstr ""
+
+#: resources.h:914
+msgid "&Use thousands separator"
+msgstr ""
+
+#: resources.h:84 resources.h:124 resources.h:383
+msgid "&User:"
+msgstr "&Колдонуучу:"
+
+#: resources.h:732
+msgid "&Username:"
+msgstr "&Колдонуучу аты:"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1043
+#, c-format
+msgid "&Version %s"
+msgstr "&Версия %s"
+
+#: resources.h:516
+msgid "&View"
+msgstr "&Көрүнүш"
+
+#: resources.h:588
+msgid "&View/Edit"
+msgstr "&Көрүү/Оңдоо"
+
+#: resources.h:953
+msgid "&Watch locally edited files and prompt to upload modifications"
+msgstr ""
+
+#: resources.h:136
+msgid "&Write"
+msgstr "&Жазуу"
+
+#: resources.h:319
+msgid "&Yes"
+msgstr "&Ооба"
+
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
+#, c-format
+msgid "'%s' does not exist or cannot be accessed."
+msgstr ""
+
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
+msgid "'%s' is not a directory."
+msgstr "'%s' каталог эмес."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+msgid "'Account' logontype not supported by selected protocol"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:594
+msgid ""
+"'quote' is usually a local command used by commandline clients to send the "
+"arguments following 'quote' to the server. You might want to enter the raw "
+"command without the leading 'quote'."
+msgstr ""
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:96
+#: ../../locales/../src/interface/filelist_statusbar.cpp:105
+#, c-format
+msgid "(%d object filtered)"
+msgid_plural "(%d objects filtered)"
+msgstr[0] ""
+
+#: resources.h:818 resources.h:820
+msgid "(0 for no limit)"
+msgstr ""
+
+#: resources.h:749
+msgid "(0-99)"
+msgstr "(0-99)"
+
+#: resources.h:751
+msgid "(0-999 seconds)"
+msgstr "(0-999 сек.)"
+
+#: resources.h:816
+msgid "(1-10)"
+msgstr "(1-10)"
+
+#: resources.h:745
+msgid "(5-9999, 0 to disable)"
+msgstr ""
+
+#: resources.h:962
+msgid "(At least 7 days)"
+msgstr ""
+
+#: resources.h:907
+msgid "(example: %H:%M)"
+msgstr "(мисалы: %H:%M)"
+
+#: resources.h:901
+msgid "(example: %Y-%m-%d)"
+msgstr "(мисалы: %Y-%m-%d)"
+
+#: resources.h:484 resources.h:486 resources.h:824 resources.h:826
+#, c-format
+msgid "(in %s/s)"
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:900
+msgid ", %H:%M:%S left"
+msgstr ", %H:%M:%S калды"
+
+#: ../../locales/../src/interface/updatewizard.cpp:904
+msgid ", --:--:-- left"
+msgstr ", --:--:-- калды"
+
+#: resources.h:717
+msgid "-"
+msgstr "-"
+
+#: resources.h:249
+msgid "- Broken router and/or firewall"
+msgstr ""
+
+#: resources.h:250
+msgid "- File corrupted on mirror"
+msgstr ""
+
+#: resources.h:248
+msgid "- Malware on your system"
+msgstr ""
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
+msgid "--:--:-- left"
+msgstr "--:--:-- калды"
+
+#: ../../locales/../src/interface/cmdline.cpp:80
+msgid "-c cannot be used together with an FTP URL."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:89
+msgid "-l can only be used together with an FTP URL."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:68
+msgid "-s and -c cannot be present at the same time."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:74
+msgid "-s cannot be used together with an FTP URL."
+msgstr ""
+
+#: resources.h:980
+msgid "0 - None"
+msgstr "0 - Эчтеке"
+
+#: resources.h:981
+msgid "1 - Warning"
+msgstr ""
+
+#: resources.h:982
+msgid "2 - Info"
+msgstr ""
+
+#: resources.h:983
+msgid "3 - Verbose"
+msgstr ""
+
+#: ../../locales/../src/interface/aboutdialog.cpp:152
+msgid "32 bit system"
+msgstr "32-биттик система"
+
+#: resources.h:984
+msgid "4 - Debug"
+msgstr ""
+
+#: ../../locales/../src/interface/aboutdialog.cpp:150
+msgid "64 bit system"
+msgstr "64-биттик система"
+
+#: ../../locales/../src/interface/updatewizard.cpp:29
+msgid "< &Back"
+msgstr "< &Артка"
+
+#: resources.h:556
+msgid "?"
+msgstr "?"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+msgid ""
+"A bookmark with the entered name already exists. Please enter an unused name."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+msgid "A default editor needs to be set."
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+msgid "A directory cannot be dragged into one of its subdirectories."
+msgstr ""
+
+#: resources.h:689
+msgid ""
+"A few servers don't allow passive mode or are misconfigured. In such cases "
+"you would have to use active mode. In active mode, FileZilla opens a port "
+"and asks the server to connect to it."
+msgstr ""
+
+#: resources.h:307
+msgid "A file previously opened has been changed."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2071
+#, c-format
+msgid ""
+"A file with that name is already being edited. Do you want to reopen '%s'?"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2067
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
+msgid "A file with that name is already being transferred."
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+msgid ""
+"A file with that name is still being edited. Please close it and try again."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:681
+msgid ""
+"A local filename could not be decoded.\n"
+"Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
+"correctly.\n"
+"Unless you fix this problem, files might be missing in the file listings.\n"
+"No further warning will be displayed this session."
+msgstr ""
+
+#: resources.h:238
+msgid "A newer version of FileZilla is available:"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:677
+msgid ""
+"A proper server always shows all files, but some broken servers hide files "
+"from the user. Use this option to force the server to show all files."
+msgstr ""
+
+#: resources.h:761
+msgid ""
+"A proper server does not require this. Contact the server administrator if "
+"you need this."
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:284
+msgid ""
+"A remote operation is in progress and synchronized browsing is enabled.\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+
+#: resources.h:537 resources.h:673 resources.h:838
+msgid "A&SCII"
+msgstr "A&SCII"
+
+#: resources.h:842
+msgid "A&dd"
+msgstr "&Кошуу"
+
+#: resources.h:869
+msgid "A&llow resume of ASCII files"
+msgstr ""
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
+msgid "A&pply only to downloads"
+msgstr ""
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
+msgid "A&pply only to uploads"
+msgstr ""
+
+#: resources.h:149
+msgid "A&pply to all files and directories"
+msgstr ""
+
+#: resources.h:639
+msgid "A&utomatically remove successful transfers"
+msgstr ""
+
+#: resources.h:390
+msgid "ASCII"
+msgstr "ASCII"
+
+#: resources.h:480
+msgid "Abort previous connection and connect in current tab"
+msgstr ""
+
+#: resources.h:154
+msgid "About FileZilla"
+msgstr "FileZilla жөнүндө"
+
+#: resources.h:879
+msgid "Above the file lists"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
+msgid "Account"
+msgstr "Эсеп жазуусу"
+
+#: resources.h:612
+msgid "Action after queue &completion"
+msgstr ""
+
+#: resources.h:330
+msgid "Action on selected file:"
+msgstr ""
+
+#: resources.h:324
+msgid "Action to perform:"
+msgstr ""
+
+#: resources.h:57
+msgid "Action:"
+msgstr "Аракет:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:118
+msgid "Active mode"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:605
+msgid ""
+"Active mode FTP test failed. FileZilla does not know the correct external IP "
+"address."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:592
+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 ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:580
+msgid ""
+"Active mode FTP test failed. FileZilla knows the correct external IP "
+"address, but your router or firewall has misleadingly modified the sent "
+"address."
+msgstr ""
+
+#: resources.h:774
+msgid "Active mode IP"
+msgstr ""
+
+#: resources.h:451
+msgid "Add files to &queue only"
+msgstr ""
+
+#: resources.h:643 resources.h:662
+msgid "Add selected directory to the transfer queue"
+msgstr ""
+
+#: resources.h:568 resources.h:585
+msgid "Add selected files and folders to the transfer queue"
+msgstr ""
+
+#: resources.h:934 resources.h:940
+msgid "Add to queue"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:451
+msgid "Address type not supported"
+msgstr ""
+
+#: resources.h:88
+msgid "Advanced"
+msgstr "Кошумча"
+
+#: resources.h:235
+msgid "Advanced options:"
+msgstr "Кошумча ырастоолор:"
+
+#: resources.h:339
+msgid "Algorithm:"
+msgstr "Алгоритм:"
+
+#: ../../locales/../src/interface/QueueView.cpp:3141
+msgid "All files have been successfully transferred"
+msgstr ""
+
+#: resources.h:718
+msgid "All ports in the given range have to be between 1024 and 65535."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:3137
+#, c-format
+msgid "All transfers have finished. %d file could not be transferred."
+msgid_plural "All transfers have finished. %d files could not be transferred."
+msgstr[0] ""
+
+#: resources.h:757
+msgid "Allow &fall back to other transfer mode on failure"
+msgstr ""
+
+#: resources.h:693
+msgid "Allow fallback to other transfer mode on failure"
+msgstr ""
+
+#: resources.h:477
+msgid "Already connected"
+msgstr ""
+
+#: resources.h:802
+msgid ""
+"Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
+"FileZilla does recognize Pageant."
+msgstr ""
+
+#: resources.h:803
+msgid ""
+"Alternatively you can use your system's SSH agent. To do so, make sure the "
+"SSH_AUTH_SOCK environment variable is set."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:1101
+msgid ""
+"Alternatively, visit http://filezilla-project.org to download the most "
+"recent version."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:2053
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1952
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+msgid ""
+"An item with the same name as the dragged item already exists at the target "
+"location."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
+msgid "Anonymous"
+msgstr "Анонимдик"
+
+#: ../../locales/../src/interface/state.cpp:1031
+msgid ""
+"Another remote operation is already in progress, cannot change directory now."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
+msgid "Any changes made in the Site Manager could not be saved."
+msgstr ""
+
+#: ../../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 ""
+
+#: ../../locales/../src/interface/filter.cpp:209
+msgid "Any changes made to the filters could not be saved."
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:1044
+msgid "Any changes made to the filters will not be saved."
+msgstr ""
+
+#: resources.h:151
+msgid "App&ly to directories only"
+msgstr ""
+
+#: resources.h:214
+msgid "Apply"
+msgstr "Колдонуу"
+
+#: resources.h:66
+msgid "Apply to &current queue only"
+msgstr ""
+
+#: resources.h:150
+msgid "Apply to &files only"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/updatewizard.cpp:323
+msgid "Archive"
+msgstr "Архив"
+
+#: resources.h:881
+msgid "As tab in the transfer queue pane"
+msgstr ""
+
+#: resources.h:260 resources.h:270 resources.h:850 resources.h:859
+msgid "Ask for action"
+msgstr "Аракет жөнүндө суроо"
+
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
+msgid "Ask for password"
+msgstr "Сырсөздү суроо"
+
+#: resources.h:714
+msgid "Ask operating system for a port."
+msgstr "Операциялык системадан порт суроо."
+
+#: resources.h:704
+msgid "Ask your operating system for the external IP address"
+msgstr ""
+
+#: resources.h:472
+msgid "Asking questions in the FileZilla forums"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
+msgid "Associated program not found:"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+msgid "At least one filter condition is incomplete"
+msgstr ""
+
+#: resources.h:723
+msgid "At this point, all required information has been gathered."
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+msgid "Attribute"
+msgstr "Атрибут"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
+msgid "Authentication failed."
+msgstr "Аутентификация оңунан чыккан жок."
+
+#: resources.h:892
+msgid "Author:"
+msgstr "Автор:"
+
+#: resources.h:387
+msgid "Auto"
+msgstr "Авто"
+
+#: resources.h:840
+msgid "Automatic file type classification"
+msgstr ""
+
+#: resources.h:959
+msgid "Automatic update check"
+msgstr ""
+
+#: resources.h:896
+msgid "Available sizes"
+msgstr ""
+
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
+msgid "B <Unit symbol for bytes. Only translate first letter>"
+msgstr ""
+
+#: resources.h:90
+msgid "B&ypass proxy"
+msgstr ""
+
+#: resources.h:468
+msgid "Basic usage instructions"
+msgstr ""
+
+#: resources.h:883
+msgid "Behaviour"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
+msgid "Being edited"
+msgstr ""
+
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:924
+msgid "Beware! Certificate has been revoked"
+msgstr ""
+
+#: resources.h:391
+msgid "Binary"
+msgstr "Экилик"
+
+#: resources.h:876
+msgid "Blackboard"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
+msgid "Bookmark"
+msgstr "Чөп кат"
+
+#: resources.h:414
+msgid "Bookmark:"
+msgstr "Чөп кат:"
+
+#: resources.h:413
+msgid "Bookmarks"
+msgstr "Чөп каттар:"
+
+#: resources.h:162
+msgid "Build date:"
+msgstr "Чогултуу датасы:"
+
+#: resources.h:159
+msgid "Build information"
+msgstr "Чогултуу жөнүндө маалымат"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
+msgid "Business category:"
+msgstr ""
+
+#: resources.h:764
+msgid ""
+"By default uses any available local port to establish transfers in active "
+"mode. If you want to limit FileZilla to use only a small range of ports, "
+"please enter the port range below."
+msgstr ""
+
+#: resources.h:545
+msgid "C&ancel current operation"
+msgstr "Кезектеги операцияны ж&окко чыгаруу"
+
+#: resources.h:237
+msgid "C&heck for nightly builds of FileZilla"
+msgstr ""
+
+#: resources.h:623
+msgid "C&lear all"
+msgstr "Баарын ө&чүрүү"
+
+#: resources.h:598 resources.h:650
+msgid "C&opy URL(s) to clipboard"
+msgstr "Дарект(ерд)и алмашуу буферине к&опиялоо"
+
+#: resources.h:900
+msgid "C&ustom"
+msgstr ""
+
+#: resources.h:955
+msgid "C&ustom filetype associations:"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1642
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
+msgid "Calculating timezone offset of server..."
+msgstr ""
+
+#: ../../locales/../src/engine/transfersocket.cpp:731
+msgid "Can't read from file"
+msgstr "Файлдан окууга мүмкүн эмес"
+
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
+msgid "Can't write data to file."
+msgstr "Маалыматты файлга жазууга мүмкүн эмес."
+
+#: ../../locales/../src/engine/transfersocket.cpp:708
+#: ../../locales/../src/engine/transfersocket.cpp:782
+#, c-format
+msgid "Can't write data to file: %s"
+msgstr "Маалыматты файлга жазууга мүмкүн эмес: %s"
+
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
+msgid "Cancel"
+msgstr "Айнуу"
+
+#: resources.h:1002
+msgid "Cancel current operation"
+msgstr "Кезектеги операцияны жокко чыгаруу"
+
+#: resources.h:1003
+msgid "Cancels the current operation"
+msgstr "Кезектеги операцияны жокко чыгарат"
+
+#: ../../locales/../src/engine/local_path.cpp:471
+#, c-format
+msgid "Cannot access '%s', no media inserted or drive not ready."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:564
+msgid "Cannot add server to Site Manager"
+msgstr "Сайт менеджерине серверди кошууга мүмкүн эмес"
+
+#: ../../locales/../src/interface/context_control.cpp:345
+msgid ""
+"Cannot close tab while busy.\n"
+"Cancel current operation and close tab?"
+msgstr ""
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+msgid ""
+"Cannot compare directories, different filters for local and remote "
+"directories are enabled"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
+msgid "Cannot compare directories, not connected to a server."
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "Cannot create new filter"
+msgstr "Жаңы фильтрди жаратууга мүмкүн эмес"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/LocalListView.cpp:2180
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
+msgid "Cannot edit file"
+msgstr "Файлды оңдоого мүмкүн эмес"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1965
+msgid "Cannot edit file, not connected to any server."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:1976
+msgid "Cannot edit file, remote path unknown."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+msgid ""
+"Cannot establish FTP connection to an SFTP server. Please select proper "
+"protocol."
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
+msgid "Cannot load Quickconnect bar from resource file"
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:38
+msgid "Cannot load file, not a valid XML file."
+msgstr "Файлды жүктөөгө мүмкүн эмес, туура эмес XML файл."
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Cannot load keyfile"
+msgstr "Ачкыч файлын жүктөөгө мүмкүн эмес"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+msgid "Cannot load toolbar from resource file"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+msgid "Cannot rename entry"
+msgstr "Жазуунун атын өзгөртүүгө мүмкүн эмес"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
+msgid "Cannot rename file"
+msgstr "Файлдын атын өзгөртүүгө мүмкүн эмес"
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "Cannot save filterset"
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Cannot select filter"
+msgstr "Фильтрди тандоого мүмкүн эмес"
+
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
+msgid "Cannot set file association"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1221
+msgid "Cannot show dialog"
+msgstr "Диалог терезесин көрсөтүүгө мүмкүн эмес"
+
+#: ../../locales/../src/interface/LocalListView.cpp:2067
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
+msgid "Cannot view/edit selected file"
+msgstr ""
+
+#: resources.h:284
+msgid "Categories"
+msgstr "Категориялар"
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Certificate and session data are not available yet."
+msgstr ""
+
+#: resources.h:26
+msgid "Certificate details"
+msgstr "Сертификат жөнүндө маалымат"
+
+#: resources.h:3 resources.h:27
+msgid "Certificate in chain:"
+msgstr ""
+
+#: resources.h:13 resources.h:37
+msgid "Certificate issuer"
+msgstr ""
+
+#: resources.h:123
+msgid "Challenge:"
+msgstr ""
+
+#: resources.h:132
+msgid "Change file attributes"
+msgstr ""
+
+#: resources.h:601 resources.h:653
+msgid "Change the file permissions."
+msgstr ""
+
+#: resources.h:976
+msgid "Changing logfile settings requires restart of FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:681
+msgid "Character encoding issue"
+msgstr ""
+
+#: resources.h:105
+msgid "Charset"
+msgstr "Кодировка"
+
+#: resources.h:964
+msgid "Check for &beta versions and release candidates"
+msgstr ""
+
+#: resources.h:558
+msgid "Check for &updates..."
+msgstr "&Жаңыртууларга текшерүү..."
+
+#: resources.h:559
+msgid "Check for newer versions of FileZilla"
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:164
+msgid "Check for updates"
+msgstr "Жаңыртууларга текшерүү"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1807
+msgid "Check for updates failed"
+msgstr "Жаңыртууларга текшерүү оңунан чыккан жок"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:765
+msgid "Checking for correct external IP address"
+msgstr "Тышкы IP даректи тууралыгына текшерүү"
+
+#: resources.h:233
+msgid "Checking for updates"
+msgstr "Жаңыртууларды бар болгонуна текшерүү"
+
+#: ../../locales/../src/interface/updatewizard.cpp:1245
+msgid "Checksum mismatch of downloaded file."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
+msgid "Choose the default local directory"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
+msgid "Choose the local directory"
+msgstr "Жердик каталогду тандоо"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+msgid "Chunk data improperly terminated"
+msgstr ""
+
+#: resources.h:18 resources.h:42
+msgid "Cipher:"
+msgstr "Шифр:"
+
+#: resources.h:504 resources.h:678
+msgid "Cl&ose tab"
+msgstr "Салманы &жабуу"
+
+#: resources.h:873
+msgid "Classic"
+msgstr "Классикалык"
+
+#: resources.h:287
+msgid "Clear &Site Manager entries"
+msgstr "&Сайт менеджеринин жазууларын тазалоо"
+
+#: resources.h:624
+msgid "Clear &layout cache"
+msgstr "&Жайылматүр кэшин тазалоо"
+
+#: resources.h:285
+msgid "Clear &quickconnect history"
+msgstr "&Тез туташтыруу тарыхын тазалоо"
+
+#: resources.h:286
+msgid "Clear &reconnect information"
+msgstr "&Кайта туташтыруу жөнүндө маалыматты тазалоо"
+
+#: resources.h:288
+msgid "Clear &transfer queue"
+msgstr "&Берүү кезегин тазалоо"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
+msgid "Clear history"
+msgstr "Тарыхты тазалоо"
+
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
+msgid "Clear private data"
+msgstr "Өздүк маалыматты өчүрүү"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
+msgid "Clear quickconnect bar"
+msgstr "Тез туташтыруу панелин тазалоо"
+
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:571
+msgid "Click on Finish to save your configuration."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:1100
+msgid "Click on next to download the new version."
+msgstr ""
+
+#: resources.h:348
+msgid "Client to server MAC:"
+msgstr ""
+
+#: resources.h:346
+msgid "Client to server cipher:"
+msgstr ""
+
+#: resources.h:679
+msgid "Close &all other tabs"
+msgstr ""
+
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1219
+#: ../../locales/../src/interface/Mainfrm.cpp:1242
+msgid "Close FileZilla"
+msgstr "FileZilla'ны жабуу"
+
+#: ../../locales/../src/interface/cmdline.cpp:14
+msgid "Close all running instances of FileZilla"
+msgstr ""
+
+#: resources.h:505
+msgid "Closes current tab"
+msgstr ""
+
+#: resources.h:87
+msgid "Co&mments:"
+msgstr "Ко&мментарийлер:"
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "Column properties"
+msgstr ""
+
+#: resources.h:355
+msgid "Column setup"
+msgstr ""
+
+#: resources.h:950
+msgid "Command and its arguments should be properly quoted."
+msgstr ""
+
+#: ../../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
+msgid "Command failed"
+msgstr "Команда оңунан чыккан жок"
+
+#: ../../locales/../src/engine/proxy.cpp:448
+msgid "Command not supported"
+msgstr "Команда колдолбойт"
+
+#: ../../locales/../src/engine/engineprivate.cpp:183
+msgid "Command not supported by this protocol"
+msgstr "Бул протокол менен команда колдолбойт"
+
+#: ../../locales/../src/engine/logging.cpp:214
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:542
+msgid "Command:"
+msgstr "Команда:"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
+msgid "Comment"
+msgstr "Комментарий"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
+msgid "Common name:"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:426
+#: ../../locales/../src/interface/netconfwizard.cpp:441
+msgid "Communication tainted by router or firewall"
+msgstr ""
+
+#: resources.h:522 resources.h:657
+msgid "Compare &modification time"
+msgstr "&Модификация убагын салыштыруу"
+
+#: resources.h:521 resources.h:656
+msgid "Compare file&size"
+msgstr "Файл &өлчөмүн салыштыруу"
+
+#: resources.h:930
+msgid "Comparison &threshold (in minutes):"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
+msgid "Comparison threshold needs to be between 0 and 1440 minutes."
+msgstr ""
+
+#: resources.h:160
+msgid "Compiled for:"
+msgstr "Максат:"
+
+#: resources.h:161
+msgid "Compiled on:"
+msgstr "Система:"
+
+#: resources.h:163
+msgid "Compiled with:"
+msgstr "Компилятор:"
+
+#: resources.h:164
+msgid "Compiler flags:"
+msgstr "Желектер:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+msgid "Compressed"
+msgstr ""
+
+#: resources.h:814
+msgid "Concurrent transfers"
+msgstr ""
+
+#: resources.h:225 resources.h:439
+msgid "Conditions are c&ase sensitive"
+msgstr ""
+
+#: resources.h:722
+msgid "Configuration test"
+msgstr ""
+
+#: resources.h:696
+msgid "Configure passive mode"
+msgstr ""
+
+#: resources.h:712
+msgid "Configure port range"
+msgstr ""
+
+#: resources.h:469
+msgid "Configuring FileZilla and your network"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:1034
+msgid "Confirm deletion"
+msgstr "Өчүрүүнү аныктаңыз"
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+#: ../../locales/../src/interface/LocalListView.cpp:2020
+#: ../../locales/../src/interface/LocalListView.cpp:2140
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+msgid "Confirmation needed"
+msgstr "Аныктоо керек"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:567
+msgid "Congratulations, your configuration seems to be working."
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
+msgid "Connect bypassing proxy settings"
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:8
+msgid "Connect to specified Site Manager site"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:936
+msgid "Connected"
+msgstr "Туташтырылды"
+
+#: ../../locales/../src/interface/QueueView.cpp:1456
+msgid "Connecting"
+msgstr "Туташтыруу"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:207
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
+#, c-format
+msgid "Connecting to %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1166
+#, c-format
+msgid "Connecting to %s through proxy"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/proxy.cpp:172
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
+#, c-format
+msgid "Connecting to %s..."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:425
+#: ../../locales/../src/interface/updatewizard.cpp:1002
+msgid "Connecting to server"
+msgstr "Серверге туташтыруу"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:116
+msgid "Connection"
+msgstr "Туташтыруу"
+
+#: ../../locales/../src/interface/QueueView.cpp:1072
+msgid "Connection attempt failed"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/proxy.cpp:176
+#, c-format
+msgid "Connection attempt failed with \"%s\", trying next address."
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#, c-format
+msgid "Connection attempt failed with \"%s\"."
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:186
+#: ../../locales/../src/engine/engineprivate.cpp:320
+msgid "Connection attempt interrupted by user"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:543
+msgid "Connection closed"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1132
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+msgid "Connection closed by server"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:305
+msgid "Connection established, initializing TLS..."
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:340
+msgid "Connection established, sending HTTP request"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+msgid "Connection established, waiting for welcome message..."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:338
+msgid "Connection lost"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:433
+msgid "Connection not allowed by ruleset"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:442
+msgid "Connection refused"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:681
+msgid "Connection timed out"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
+msgid "Connection timed out."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:677
+msgid "Connection to server lost."
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:188
+msgid "Connection with proxy established, performing handshake..."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:561
+msgid "Connection with server got closed prematurely."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:552
+msgid "Connection with the test server failed."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
+msgid "Convert keyfile"
+msgstr ""
+
+#: resources.h:77 resources.h:418
+msgid "Cop&y"
+msgstr "Копи&ялоо"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
+#, c-format
+msgid "Copy (%d) of %s"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
+#, c-format
+msgid "Copy of %s"
+msgstr ""
+
+#: resources.h:599 resources.h:651
+msgid "Copy the URLs of the selected items to clipboard."
+msgstr ""
+
+#: ../../locales/../src/engine/transfersocket.cpp:206
+#, c-format
+msgid "Could not accept connection: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+msgid "Could not add connection to Site Manager"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:188
+msgid "Could not connect to server"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1208
+#, c-format
+msgid "Could not connect to server: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
+msgid "Could not convert command to server encoding"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+msgid "Could not convert private key"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+msgid "Could not copy URLs"
+msgstr "Даректерди копиялоого мүмкүн эмес"
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+msgid "Could not copy data"
+msgstr "Маалыматтарды копиялоого мүмкүн эмес"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+msgid ""
+"Could not determine the target of the Drag&Drop operation.\n"
+"Either the shell extension is not installed properly or you didn't drop the "
+"files into an Explorer window."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4276
+msgid "Could not establish connection to server"
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:486
+msgid ""
+"Could not find the resource files for FileZilla, closing FileZilla.\n"
+"You can set the data directory of FileZilla using the '--datadir "
+"<custompath>' commandline option or by setting the FZ_DATADIR environment "
+"variable."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+msgid "Could not generate custom login sequence."
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:1054
+msgid ""
+"Could not get distinguished name of certificate issuer, "
+"gnutls_x509_get_issuer_dn failed"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:1029
+msgid ""
+"Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
+"failed"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:1015
+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:170
+msgid "Could not get reply from fzputtygen."
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+msgid "Could not get temporary directory to download file into."
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:982
+msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:975
+msgid ""
+"Could not initialize structure for peer certificates, gnutls_x509_crt_init "
+"failed"
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
+#, c-format
+msgid ""
+"Could not load \"%s\", please make sure the file is valid and can be "
+"accessed.\n"
+"Any changes made in the Site Manager will not be saved."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
+msgid "Could not load keyfile"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
+msgid "Could not load private key"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:1041
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:381
+#, c-format
+msgid ""
+"Could not obtain corresponding local directory for the remote directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:295
+#, c-format
+msgid ""
+"Could not obtain corresponding remote directory for the local directory '%"
+"s'.\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+msgid "Could not open clipboard"
+msgstr "Алмашуу буферин ачууга мүмкүн эмес"
+
+#: ../../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 ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+msgid "Could not parse remote path."
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
+msgid "Could not parse server address:"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#, c-format
+msgid "Could not read from socket: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:487
+msgid "Could not read server item."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2714
+#, c-format
+msgid "Could not seek to offset %s within file"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2647
+msgid "Could not seek to the end of the file"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
+msgid "Could not send command to fzputtygen."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2745
+msgid "Could not spawn IO thread"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1181
+#, c-format
+msgid "Could not start proxy handshake: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1123
+#: ../../locales/../src/interface/QueueView.cpp:1128
+msgid "Could not start transfer"
+msgstr "Берүүнү баштоого мүмкүн эмес"
+
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
+#, c-format
+msgid ""
+"Could not write \"%s\", any changes to the Site Manager could not be saved: %"
+"s"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
+#, c-format
+msgid "Could not write \"%s\", the bookmark could not be added: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
+#, c-format
+msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1987
+#, c-format
+msgid ""
+"Could not write \"%s\", the queue could not be saved.\n"
+"%s"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
+#, c-format
+msgid "Could not write \"%s\", the selected sites could not be exported: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/wrapengine.cpp:1136
+#, c-format
+msgid "Could not write \"%s\": %s"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
+#, c-format
+msgid "Could not write keyfile: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1117
+msgid "Could not write to local file"
+msgstr ""
+
+#: ../../locales/../src/engine/logging.cpp:315
+#: ../../locales/../src/engine/logging.cpp:386
+#, c-format
+msgid "Could not write to log file: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:999
+#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#, c-format
+msgid "Could not write to socket: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
+msgid "Country:"
+msgstr "Өлкө:"
+
+#: resources.h:628
+msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
+msgstr ""
+
+#: resources.h:591
+msgid "Crea&te new file"
+msgstr ""
+
+#: resources.h:576 resources.h:590 resources.h:645 resources.h:666
+msgid "Create a new subdirectory in the current directory"
+msgstr ""
+
+#: resources.h:592
+msgid "Create a new, empty file in the current directory"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:1196
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+msgid "Create directory"
+msgstr "Каталогду жаратуу"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+msgid "Create empty file"
+msgstr "Бош файл жаратуу"
+
+#: ../../locales/../src/interface/QueueView.cpp:1529
+msgid "Creating directory"
+msgstr "Каталог жаратуу"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3319
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
+#, c-format
+msgid "Creating directory '%s'..."
+msgstr "'%s' каталогун жаратуу..."
+
+#: ../../locales/../src/engine/ControlSocket.cpp:174
+msgid "Critical error"
+msgstr "Сын ката"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:137
+msgid "Critical file transfer error"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:120
+#, c-format
+msgid "Critical file transfer error after transferring %s in %s"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:370
+#, c-format
+msgid ""
+"Current remote directory (%s) is not below the synchronization root (%s).\n"
+"Synchronized browsing has been disabled."
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:423
+msgid "Current transfer type is set to ASCII."
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:433
+msgid "Current transfer type is set to automatic detection."
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:428
+msgid "Current transfer type is set to binary."
+msgstr ""
+
+#: resources.h:785 resources.h:906
+msgid "Cus&tom"
+msgstr "&Тапшырылма"
+
+#: ../../locales/../src/interface/filter.cpp:98
+msgid "Custom filter set"
+msgstr ""
+
+#: resources.h:377 resources.h:378
+msgid "Custom server"
+msgstr "Тапшырылма сервер"
+
+#: resources.h:386
+msgid "D&ata type"
+msgstr "М&аалымат түрү"
+
+#: resources.h:913
+msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
+msgstr ""
+
+#: resources.h:100
+msgid "D&efault"
+msgstr "Жа&рыяланбасча"
+
+#: resources.h:594 resources.h:646 resources.h:676
+msgid "D&elete"
+msgstr "Ө&чүрүү"
+
+#: resources.h:206
+msgid "D&isable all"
+msgstr ""
+
+#: resources.h:884
+msgid "D&o not save passwords"
+msgstr "Сырсөздөрдү &сактабоо"
+
+#: resources.h:937
+msgid "D&ouble-click action on directories:"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:34
+msgid "DOS-like with virtual paths"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
+msgid "Dangerous filetype"
+msgstr "Кооптуу файл түрлөрү"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
+msgid "Data"
+msgstr "Маалымат"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
+msgid "Data socket closed too early."
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+msgid "Date"
+msgstr "Дата"
+
+#: resources.h:897
+msgid "Date formatting"
+msgstr "Дата форматы"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:128
+msgid "Date/time format"
+msgstr "Дата/убакыт форматы"
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
+msgid "Date/time unknown"
+msgstr "Дата/убакыт белгисиз"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:141
+msgid "Debug"
+msgstr "Оңдоо"
+
+#: resources.h:977
+msgid "Debugging settings"
+msgstr "Оңдоо ырастоолору"
+
+#: resources.h:91
+msgid "Default &local directory:"
+msgstr "Жарыяланбас &жердик каталогу:"
+
+#: ../../locales/../src/engine/server.cpp:26
+msgid "Default (Autodetect)"
+msgstr "Жарыяланбасча (Автоаныктоо)"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+msgid "Default editor not properly quoted."
+msgstr ""
+
+#: resources.h:256 resources.h:278 resources.h:867
+msgid "Default file exists action"
+msgstr ""
+
+#: resources.h:93
+msgid "Default r&emote directory:"
+msgstr "Жарыяланбас а&лыскы каталогу:"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+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:78
+msgid "Default system language"
+msgstr "Жарыяланбас системалык тили"
+
+#: resources.h:690
+msgid "Default transfer mode:"
+msgstr "Жарыяланбас берүү режими:"
+
+#: resources.h:836
+msgid "Default transfer type:"
+msgstr "Жарыяланбас берүү түрү:"
+
+#: resources.h:709 resources.h:772
+msgid "Default: http://ip.filezilla-project.org/ip.php"
+msgstr "Жарыяланбасча: http://ip.filezilla-project.org/ip.php"
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
+msgid ""
+"Delay between failed connection attempts has to be between 1 and 999 seconds."
+msgstr ""
+
+#: ../../locales/../src/engine/engineprivate.cpp:630
+#, c-format
+msgid ""
+"Delaying connection for %d second due to previously failed connection "
+"attempt..."
+msgid_plural ""
+"Delaying connection for %d seconds due to previously failed connection "
+"attempt..."
+msgstr[0] ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
+msgid "Delete Site Manager entry"
+msgstr "Сайт менеджеринин жазуусун өчүрүү"
+
+#: resources.h:647 resources.h:668
+msgid "Delete selected directory"
+msgstr "Тандалган каталогду өчүрүү"
+
+#: resources.h:579 resources.h:595
+msgid "Delete selected files and directories"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting directories"
+msgstr "Каталогдорду өчүрүү"
+
+#: ../../locales/../src/interface/search.cpp:1018
+msgid "Deleting multiple unrelated directories is not yet supported"
+msgstr ""
+
+#: resources.h:454
+msgid "Deleting symbolic link"
+msgstr "Символдук шилтемени өчүрүү"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+msgid "Desktop"
+msgstr "Иш столу"
+
+#: resources.h:4 resources.h:28 resources.h:177
+msgid "Details"
+msgstr "Деталдар"
+
+#: resources.h:190
+msgid "Details for new key:"
+msgstr "Жаңы ачкычтын деталдары:"
+
+#: resources.h:228
+msgid "Dire&ctories"
+msgstr "&Каталогдор"
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Direction"
+msgstr "Багыт"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:283
+msgid "Directory"
+msgstr "Каталог"
+
+#: resources.h:654 resources.h:928 resources.h:1011
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2370
+msgid "Directory comparison"
+msgstr "Каталогдорду салыштыруу"
+
+#: ../../locales/../src/interface/listingcomparison.cpp:74
+#: ../../locales/../src/interface/listingcomparison.cpp:82
+#: ../../locales/../src/interface/listingcomparison.cpp:88
+msgid "Directory comparison failed"
+msgstr "Каталогдорду салыштыруу оңунан чыккан жок"
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
+msgid "Directory containing the logfile does not exist or filename is invalid."
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:192
+msgid "Directory listing aborted by user"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
+msgid "Directory listing failed"
+msgstr "Каталог тизмесин көрсөтүү оңунан чыккан жок"
+
+#: resources.h:199
+msgid "Directory listing filters"
+msgstr "Каталог тизмесинин фильтрлери"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:196
+msgid "Directory listing successful"
+msgstr "Каталог тизмесин көрсөтүү ийгиликтүү"
+
+#: resources.h:209
+msgid "Disa&ble all"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:1049
+msgid ""
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:679
+msgid ""
+"Disable this option again if you will not be able to see the correct "
+"directory contents anymore."
+msgstr ""
+
+#: resources.h:1004
+msgid "Disconnect from server"
+msgstr "Серверден өчүрүлүү"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:82
+#: ../../locales/../src/engine/ControlSocket.cpp:1000
+#: ../../locales/../src/engine/ControlSocket.cpp:1099
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:936
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:938
+#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
+msgid "Disconnected from server"
+msgstr "Серверден өчүрүлдү"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:953
+#, c-format
+msgid "Disconnected from server: %s"
+msgstr "Серверден өчүрүлдү: %s"
+
+#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
+msgid "Disconnecting from previous server"
+msgstr ""
+
+#: resources.h:1005
+msgid "Disconnects from the currently visible server"
+msgstr ""
+
+#: resources.h:564
+msgid "Display about dialog"
+msgstr "'Программа жөнүндө' терезесин көрсөтүү"
+
+#: resources.h:946
+msgid "Do &not use default editor"
+msgstr "Жарыяланбас редакторун &колдонбоо"
+
+#: resources.h:620
+msgid "Do &nothing"
+msgstr "&Эчтеке кылбоо"
+
+#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
+#: ../../locales/../src/interface/updatewizard.cpp:252
+msgid ""
+"Do you really want to check for beta versions?\n"
+"Unless you want to test new features, keep using stable versions."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
+#: ../../locales/../src/interface/Mainfrm.cpp:1246
+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 ""
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+msgid "Do you really want to delete all Site Manager entries?"
+msgstr "Сиз чын эле сайт менеджеринин жазууларын өчүргүңүз келеби?"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
+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 "Сиз чын эле берүү кезегин өчүргүңүз келеби?"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:595
+#, c-format
+msgid "Do you really want to send '%s' to the server?"
+msgstr ""
+
+#: resources.h:467
+msgid "Documentation"
+msgstr "Документация"
+
+#: resources.h:711
+msgid "Don't use external IP address on &local connections."
+msgstr ""
+
+#: resources.h:847
+msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
+msgstr ""
+
+#: resources.h:931
+msgid "Double-click action"
+msgstr ""
+
+#: resources.h:363
+msgid "Download"
+msgstr "Жүктөп алуу"
+
+#: resources.h:483 resources.h:823
+msgid "Download &limit:"
+msgstr "Жүктөп алуу &лимити:"
+
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
+msgid "Download limit: %s/s"
+msgstr "Жүктөп алуу лимити: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:606
+msgid "Download limit: none"
+msgstr "Жүктөп алуу лимити: жок"
+
+#: resources.h:442 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
+msgid "Download search results"
+msgstr ""
+
+#: resources.h:641
+msgid "Download selected directory"
+msgstr ""
+
+#: resources.h:583
+msgid "Download selected files and directories"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1247
+msgid "Downloading"
+msgstr "Жүктөө"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:358
+#: ../../locales/../src/interface/updatewizard.cpp:416
+#, c-format
+msgid "Downloading %s"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading multiple unrelated directories is not yet supported"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:927
+msgid "Downloading search results"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:104
+#: ../../locales/../src/interface/LocalTreeView.cpp:104
+#: ../../locales/../src/interface/QueueView.cpp:83
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
+msgid ""
+"Drag&drop between different instances of FileZilla has not been implemented "
+"yet."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:110
+#: ../../locales/../src/interface/LocalTreeView.cpp:110
+#: ../../locales/../src/interface/QueueView.cpp:96
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
+msgid "Drag&drop between different servers has not been implemented yet."
+msgstr ""
+
+#: resources.h:205
+msgid "E&nable all"
+msgstr ""
+
+#: resources.h:569 resources.h:586
+msgid "E&nter directory"
+msgstr "Каталогго &кирүү"
+
+#: resources.h:141
+msgid "E&xecute"
+msgstr "А&ткаруу"
+
+#: resources.h:509
+msgid "E&xit"
+msgstr "&Чыгуу"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+msgid "E-Mail:"
+msgstr "E-Mail:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+msgid "Each filter needs at least one condition."
+msgstr ""
+
+#: resources.h:231
+msgid "Edit filters"
+msgstr "Фильтрлерди оңдоо"
+
+#: resources.h:574
+msgid ""
+"Edit the file with the configured editor and upload changes to the server."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:1965
+#: ../../locales/../src/interface/LocalListView.cpp:1976
+msgid "Editing failed"
+msgstr "Оңдоо оңунан чыккан жок"
+
+#: resources.h:894
+msgid "Email:"
+msgstr "Email:"
+
+#: ../../locales/../src/interface/QueueView.cpp:2299
+msgid "Empty command"
+msgstr "Бош команда"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
+msgid "Empty command."
+msgstr "Бош команда."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
+msgid "Empty directory listing"
+msgstr "Бош каталог тизмеси"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:26
+msgid "Empty directory."
+msgstr "Бош каталог."
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
+msgid "Empty file extension."
+msgstr "Бош файл кеңейтүүсү."
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty filter names are not allowed."
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
+msgid "Empty name"
+msgstr "Бош ат"
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+msgid "Empty quoted string."
+msgstr ""
+
+#: resources.h:208
+msgid "En&able all"
+msgstr ""
+
+#: resources.h:832
+msgid "Enable invalid character &filtering"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+msgid "Encrypted"
+msgstr "Шифрделген"
+
+#: resources.h:345
+msgid "Encryption"
+msgstr "Шифрдөө"
+
+#: resources.h:337
+msgid "Encryption details"
+msgstr "Шифрдөө деталдары"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:451
+msgid "End comparison and change sorting order?"
+msgstr ""
+
+#: resources.h:550
+msgid "Enter &custom command..."
+msgstr "&Тапшырылма команданы киргизиңиз..."
+
+#: resources.h:487
+#, no-c-format
+msgid "Enter 0 for unlimited speed."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:2288
+msgid "Enter command"
+msgstr "Команданы киргизиңиз"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:576
+msgid "Enter custom command"
+msgstr "Тапшырылма команданы киргизиңиз"
+
+#: resources.h:938
+msgid "Enter directory"
+msgstr "Каталогго кирүү"
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Enter filter name"
+msgstr "Фильтр атын киргизиңиз"
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Enter name for filterset"
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:405
+msgid "Enter new name for filterset"
+msgstr ""
+
+#: resources.h:116
+msgid "Enter password"
+msgstr "Сырсөздү киргизиңиз"
+
+#: resources.h:570 resources.h:587
+msgid "Enter selected directory"
+msgstr "Тандалган каталогго кирүү"
+
+#: resources.h:731
+msgid ""
+"Enter the address of the server.\n"
+"To specify the server protocol, prepend the host with the protocol "
+"identifier. If no protocol is specified, the default protocol (ftp://) will "
+"be used.\n"
+"You can also enter complete URLs in the form protocol://user:pass@host:port "
+"here, the values in the other fields will be overwritten then."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
+#, c-format
+msgid ""
+"Enter the password for the file '%s'.\n"
+"Please note that the converted file will not be password protected."
+msgstr ""
+
+#: resources.h:735
+msgid ""
+"Enter the port on which the server listens.\n"
+"The default for FTP is 21, the default for SFTP is 22."
+msgstr ""
+
+#: ../../locales/../src/interface/loginmanager.cpp:63
+msgid "Enter username and password"
+msgstr "Колдонуучу атын жана сырсөздү киргизиңиз"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "Error exporting settings"
+msgstr "Ырастоолорду экспорттоо катасы"
+
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
+msgid "Error importing"
+msgstr "Импорт катасы"
+
+#: ../../locales/../src/interface/QueueView.cpp:2054
+msgid "Error loading queue"
+msgstr "Кезекти жүктөө катасы"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1967
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
+msgid "Error loading xml file"
+msgstr "xml файлын жүктөө катасы"
+
+#: ../../locales/../src/interface/QueueView.cpp:1953
+msgid "Error saving queue"
+msgstr "Кезекти сактоо катасы"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid "Error starting program"
+msgstr "Программаны жүргүзүү катасы"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1988
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
+msgid "Error writing xml file"
+msgstr "xml файлын жаздыруу катасы"
+
+#: ../../locales/../src/interface/updatewizard.cpp:336
+msgid "Error, file name cannot be parsed."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:352
+msgid "Error, local file exists but cannot be removed"
+msgstr ""
+
+#: ../../locales/../src/engine/logging.cpp:213
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:536
+msgid "Error:"
+msgstr "Ката:"
+
+#: resources.h:479
+msgid "Establish connection in a new tab"
+msgstr ""
+
+#: resources.h:957
+msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
+msgstr ""
+
+#: resources.h:916
+msgid "Examples"
+msgstr "Мисалдар"
+
+#: resources.h:145
+msgid "Exe&cute"
+msgstr "&Аткаруу"
+
+#: ../../locales/../src/interface/updatewizard.cpp:321
+msgid "Executable"
+msgstr "Аткарылуучу"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1807
+msgid "Executable contains no version info, cannot check for updates."
+msgstr ""
+
+#: resources.h:874
+msgid "Explorer"
+msgstr "Узаткыч"
+
+#: resources.h:295
+msgid "Export &Queue"
+msgstr "&Кезекти экспорттоо"
+
+#: resources.h:294
+msgid "Export &Settings"
+msgstr "&Ырастоолорду экспорттоо"
+
+#: resources.h:291
+msgid "Export settings"
+msgstr "Ырастоолорду экспорттоо"
+
+#: resources.h:220
+msgid "F&ilter name:"
+msgstr "Ф&ильтр аты:"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:117
+msgid "FTP"
+msgstr "FTP"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Файл берүү протоколу"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Файл берүү протоколу кошумча шифрдөөсү менен"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Коопсуз эмес файл берүү протоколу"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FTP Engine not initialized, can't connect"
+msgstr ""
+
+#: resources.h:759
+msgid "FTP Keep-alive"
+msgstr ""
+
+#: resources.h:779
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:120
+msgid "FTP Proxy"
+msgstr "FTP прокси"
+
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "FTP URL"
+msgstr ""
+
+#: resources.h:687
+msgid ""
+"FTP uses secondary connections for data transfers. These additional "
+"connections can be established in two ways."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:20
+msgid "FTPES - FTP over explicit TLS/SSL"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:19
+msgid "FTPS - FTP over implicit TLS/SSL"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2261
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
+msgid "Failed to change directory"
+msgstr "Каталогду өзгөртүү оңунан чыккан жок"
+
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:53
+msgid "Failed to change language"
+msgstr "Тилди өзгөртүү оңунан чыккан жок"
+
+#: ../../locales/../src/interface/updatewizard.cpp:454
+msgid "Failed to check for newer version of FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+msgid "Failed to copy or move sites"
+msgstr "Сайттарды копиялоо же көчүрүү оңунан чыккан жок"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
+msgid "Failed to create backup copy of xml file"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:797
+msgid "Failed to create listen socket, aborting"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4252
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4256
+msgid "Failed to create listening socket for active mode transfer"
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:456
+msgid "Failed to download the latest version of FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
+msgid "Failed to get 'My Documents' path"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
+msgid "Failed to get desktop path"
+msgstr "Иш столуна жолду алуу оңунан чыккан жок"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:956
+msgid "Failed to get peer address of control connection, connection closed."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:964
+msgid "Failed to get peer address of data connection, connection closed."
+msgstr ""
+
+#: ../../locales/../src/interface/context_control.cpp:77
+msgid "Failed to initialize FTP engine"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:313
+msgid "Failed to initialize TLS."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:173
+msgid "Failed to load panels, invalid resource files?"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
+#, c-format
+msgid "Failed to load private key: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2636
+#, c-format
+msgid "Failed to open \"%s\" for appending/writing"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2698
+#, c-format
+msgid "Failed to open \"%s\" for reading"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:391
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:448
+#, c-format
+msgid "Failed to open \"%s\" for writing"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+msgid "Failed to parse returned path."
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:321
+msgid "Failed to parse trusted root cert."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
+msgid "Failed to receive data"
+msgstr "Маалымат алуу файлын жазуу оңунан чыккан жок"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:194
+msgid "Failed to retrieve directory listing"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:719
+msgid "Failed to retrieve external ip address, aborting"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3950
+msgid "Failed to retrieve external ip address, using local address"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3972
+msgid "Failed to retrieve local ip address."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:688
+msgid "Failed to retrieve local ip address. Aborting"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:616
+msgid "Failed to retrieve the external IP address."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:307
+msgid "Failed to send command."
+msgstr "Команданы жөнөтүү файлын жазуу оңунан чыккан жок."
+
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language"
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:252
+#, c-format
+msgid ""
+"Failed to set language to %s (%s), using default system language (%s, %s)."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:240
+#, c-format
+msgid "Failed to set language to %s (%s), using default system language."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/settings/optionspage_language.cpp:53
+#, c-format
+msgid "Failed to set language to %s, using default system language"
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:248
+#, c-format
+msgid "Failed to set language to %s, using default system language (%s, %s)."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:237
+#, c-format
+msgid "Failed to set language to %s, using default system language."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage.cpp:215
+msgid "Failed to validate settings"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:917
+msgid "Failed to verify peer certificate"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:566
+#, c-format
+msgid "Failed to write to file %s"
+msgstr "%s файлына жазуу оңунан чыккан жок"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
+msgid "Failed to write xml file"
+msgstr "xml файлына жазуу оңунан чыккан жок"
+
+#: ../../locales/../src/interface/queueview_failed.cpp:16
+msgid "Failed transfers"
+msgstr "Оңунан чыкпаган берүүлөр"
+
+#: resources.h:702
+msgid "Fall back to active mode"
+msgstr ""
+
+#: resources.h:370
+msgid "Fil&e:"
+msgstr "Фай&л:"
+
+#: resources.h:227
+msgid "Fil&es"
+msgstr "Фай&лдар"
+
+#: ../../locales/../src/interface/filelistctrl.cpp:282
+msgid "File"
+msgstr "Файл"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:124
+msgid "File Types"
+msgstr "Файл түрлөрү"
+
+#: ../../locales/../src/interface/import.cpp:108
+msgid "File does not contain any importable data."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:132
+msgid "File editing"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
+msgid "File exists"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:125
+msgid "File exists action"
+msgstr ""
+
+#: resources.h:306
+msgid "File has changed"
+msgstr "Файл өзгөртүлдү"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:130
+msgid "File lists"
+msgstr "Файл тизмелери"
+
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+msgid "File not found"
+msgstr "Файл табылган жок"
+
+#: resources.h:1015
+msgid "File search"
+msgstr "Файл издөө"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:128
+msgid "File transfer aborted by user"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:118
+#, c-format
+msgid "File transfer aborted by user after transferring %s in %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:139
+msgid "File transfer failed"
+msgstr "Файл берүү оңунан чыккан жок"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:122
+#, c-format
+msgid "File transfer failed after transferring %s in %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:134
+msgid "File transfer skipped"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:132
+msgid "File transfer successful"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:115
+#, c-format
+msgid "File transfer successful, transferred %s in %s"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
+msgid "File transfers still in progress."
+msgstr ""
+
+#: resources.h:388
+msgid "File would transfer with ASCII data type."
+msgstr ""
+
+#: resources.h:389
+msgid "File would transfer with binary data type."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+msgid "FileZilla Error"
+msgstr "FileZilla катасы"
+
+#: resources.h:724
+msgid ""
+"FileZilla can now test your configuration to ensure everything is configured "
+"properly."
+msgstr ""
+
+#: resources.h:478
+msgid "FileZilla is already connected to a server."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+msgid ""
+"FileZilla is running in kiosk mode.\n"
+"'Normal' and 'Account' logontypes are not available in this mode."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1556
+msgid "FileZilla needs to be restarted for the language change to take effect."
+msgstr ""
+
+#: resources.h:525
+msgid "Filelist status &bars"
+msgstr "Файл тизмесинин абал &панелдери"
+
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
+msgid "Filename"
+msgstr "Файл аты"
+
+#: resources.h:518
+msgid "Filename &filters..."
+msgstr "Файл аты боюнча &фильтрлер..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3116
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
+#, c-format
+msgid "Filename cannot be constructed for directory %s and filename %s"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
+msgid "Filename invalid"
+msgstr "Файл аты туура эмес"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "Filename unchanged"
+msgstr ""
+
+#: resources.h:308 resources.h:970
+msgid "Filename:"
+msgstr "Файл аты:"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1375
+msgid "Filenames may not contain any of the following characters: / * ? < > |"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:1350
+msgid ""
+"Filenames may not contain any of the following characters: / \\ : * ? \" < > "
+"|"
+msgstr ""
+
+#: resources.h:336
+msgid "Files currently being edited"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
+msgid "Filesize"
+msgstr "Өлчөм"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:129
+msgid "Filesize format"
+msgstr "Файл өлчөмүнүн форматы"
+
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
+msgid "Filetype"
+msgstr "Файл түрү"
+
+#: resources.h:958
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:133
+msgid "Filetype associations"
+msgstr ""
+
+#: resources.h:226
+msgid "Filter applies to:"
+msgstr ""
+
+#: resources.h:831
+msgid "Filter invalid characters in filenames"
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter name already exists"
+msgstr ""
+
+#: resources.h:222
+msgid "Filter out items matching all of the following"
+msgstr ""
+
+#: resources.h:223
+msgid "Filter out items matching any of the following"
+msgstr ""
+
+#: resources.h:224
+msgid "Filter out items matching none of the following"
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Filter set already exists"
+msgstr ""
+
+#: resources.h:1008
+msgid "Filter the directory listings"
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
+msgid "Filter validation failed"
+msgstr ""
+
+#: resources.h:9 resources.h:33
+msgid "Fingerprint (MD5):"
+msgstr ""
+
+#: resources.h:10 resources.h:34
+msgid "Fingerprint (SHA-1):"
+msgstr ""
+
+#: resources.h:180 resources.h:193
+msgid "Fingerprint:"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:42
+msgid "Firewall and router configuration wizard"
+msgstr ""
+
+#: resources.h:742
+msgid ""
+"For more detailed information about what these options do, please run the "
+"network configuration wizard."
+msgstr ""
+
+#: resources.h:719
+msgid "For reliability you should specify a range of at least 10 ports."
+msgstr ""
+
+#: ../../locales/../src/interface/Options.cpp:215
+msgid ""
+"For this session the default settings will be used. Any changes to the "
+"settings will not be saved."
+msgstr ""
+
+#: resources.h:109
+msgid "Force &UTF-8"
+msgstr "&UTF-8 мажбур түрүндө"
+
+#: resources.h:552
+msgid "Force showing &hidden files"
+msgstr "&Жашырылган файлдарды мажбур түрүндө көрсөтүү"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:674
+msgid "Force showing hidden files"
+msgstr "Жашырылган файлдарды мажбур түрүндө көрсөтүү"
+
+#: resources.h:786
+msgid "Format specifications:"
+msgstr "Формат спецификациясы:"
+
+#: resources.h:956
+msgid "Format: Extension followed by properly quoted command and arguments."
+msgstr ""
+
+#: resources.h:470
+msgid "Further documentation"
+msgstr ""
+
+#: resources.h:78
+msgid "General"
+msgstr "Жалпы"
+
+#: ../../locales/../src/engine/proxy.cpp:430
+msgid "General SOCKS server failure"
+msgstr ""
+
+#: resources.h:804
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:122
+msgid "Generic proxy"
+msgstr "Базалык прокси"
+
+#: resources.h:708
+msgid "Get external IP address from the following URL:"
+msgstr ""
+
+#: resources.h:471
+msgid "Getting help"
+msgstr "Жардам алуу"
+
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
+msgid "Given filterset name already exists, overwrite filter set?"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
+msgid "Global bookmarks"
+msgstr "Жалпы чөп каттар"
+
+#: resources.h:166
+msgid "GnuTLS:"
+msgstr "GnuTLS:"
+
+#: resources.h:138
+msgid "Group permissions"
+msgstr "Топтук укуктар"
+
+#: resources.h:608
+msgid "H&igh"
+msgstr "Ч&оң"
+
+#: ../../locales/../src/engine/server.cpp:18
+msgid "HTTPS - HTTP over TLS"
+msgstr "HTTPS - HTTP TLS аркылуу"
+
+#: resources.h:341
+msgid "Hash:"
+msgstr "Хэш:"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+msgid "Hidden"
+msgstr "Жашырылган"
+
+#: resources.h:829 ../../locales/../src/interface/queue.cpp:921
+#: ../../locales/../src/interface/queue.cpp:1008
+msgid "High"
+msgstr "Чоң"
+
+#: ../../locales/../src/interface/queue.cpp:923
+#: ../../locales/../src/interface/queue.cpp:1010
+msgid "Highest"
+msgstr "Эң чоң"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
+msgid "Highest available port has to be a number between 1024 and 65535."
+msgstr ""
+
+#: resources.h:210
+msgid ""
+"Hold the shift key to toggle the filter state on both sides simultaneously."
+msgstr ""
+
+#: resources.h:157
+msgid "Homepage:"
+msgstr "Үйбарак:"
+
+#: resources.h:343
+msgid "Host key fingerprint:"
+msgstr ""
+
+#: resources.h:186
+msgid "Host key mismatch"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:166
+msgid "Host starts with '[' but no closing bracket found."
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:439
+msgid "Host unreachable"
+msgstr ""
+
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
+msgid "Host:"
+msgstr "Хост:"
+
+#: resources.h:96
+msgid "Hours,"
+msgstr "Саат,"
+
+#: resources.h:905
+msgid "I&SO 8601 (example: 15:47)"
+msgstr "I&SO 8601 (мисалы: 15:47)"
+
+#: resources.h:746
+msgid ""
+"If no data is sent or received during an operation for longer than the "
+"specified time, the connection will be closed and FileZilla will try to "
+"reconnect."
+msgstr ""
+
+#: resources.h:986
+msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
+msgstr ""
+
+#: resources.h:699
+msgid ""
+"If the automatic test at the end of this wizard succeeds, but you cannot "
+"transfer files to a particular server, the server might be misconfigured and "
+"you should try active mode. You can set the transfer mode on a per-server "
+"basis in the Site Manager."
+msgstr ""
+
+#: resources.h:694
+msgid ""
+"If the fallback option is enabled, you will be able to connect to "
+"misconfigured servers which reject the selected transfer mode."
+msgstr ""
+
+#: resources.h:189
+msgid ""
+"If the host key change was not expected, please contact the server "
+"administrator."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:554
+msgid ""
+"If the problem persists, some router and/or firewall keeps blocking "
+"FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:563
+msgid ""
+"If the problem persists, some router and/or firewall keeps interrupting the "
+"connection."
+msgstr ""
+
+#: resources.h:975
+msgid ""
+"If the size of the logfile reaches the limit, it gets renamed by adding \".1"
+"\" to the end of the filename (possibly overwriting older logfiles) and a "
+"new file gets created."
+msgstr ""
+
+#: resources.h:456
+msgid ""
+"If the symlink points to a directory, FileZilla can either delete the "
+"symbolic link or remove the contents of the linked directory."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:624
+msgid ""
+"If this problem persists, please contact your router or firewall "
+"manufacturer for a solution."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:582
+msgid "If this problem stays, please contact your router manufacturer."
+msgstr ""
+
+#: resources.h:279 resources.h:868
+msgid ""
+"If using 'overwrite if newer', your system time has to be synchronized with "
+"the server. If the time differs (e.g. different timezone), specify a "
+"timezone offset in the site manager."
+msgstr ""
+
+#: resources.h:929
+msgid ""
+"If using timestamp based comparison, consider two files equal if their "
+"timestamp difference does not exceed this threshold."
+msgstr ""
+
+#: resources.h:944
+msgid "If you change the language, you should restart FileZilla."
+msgstr ""
+
+#: resources.h:725
+msgid ""
+"If you click on test, FileZilla will connect to probe.filezilla-project.org "
+"and will perform some simple tests."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1245
+msgid "If you close FileZilla, your changes will be lost."
+msgstr ""
+
+#: resources.h:844
+msgid ""
+"If you enter the wrong filetypes, those files may get corrupted when "
+"transferred."
+msgstr ""
+
+#: resources.h:726
+msgid "If you get any errors, your configuration is not correct."
+msgstr ""
+
+#: resources.h:758
+msgid ""
+"If you have problems to retrieve directory listings or to transfer files, "
+"try to change the default transfer mode."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:569
+msgid ""
+"If you keep having problems with a specific server, the server itself or a "
+"remote router or firewall might be misconfigured. In this case try to toggle "
+"passive mode and contact the server administrator for help."
+msgstr ""
+
+#: resources.h:685
+msgid ""
+"If you successfully complete the wizard and the final test succeeds, any "
+"firewalls and routers you have should be configured properly."
+msgstr ""
+
+#: resources.h:721
+msgid ""
+"If you use a firewall, make sure FileZilla is allowed to accept connection "
+"on all given ports."
+msgstr ""
+
+#: resources.h:720
+msgid ""
+"If you use a router, make sure all these ports are forwarded to the machine "
+"you're running FileZilla on."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:595
+msgid ""
+"If your router keeps changing the IP address, please contact your router "
+"manufacturer."
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:96
+msgid "Import data from older version"
+msgstr ""
+
+#: resources.h:298
+msgid "Import settings"
+msgstr "Ырастоолорду импорттоо"
+
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
+msgid "Import successful"
+msgstr "Импорт ийгиликтүү бүттү"
+
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
+#: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
+msgid "Improperly quoted association."
+msgstr ""
+
+#: resources.h:713
+msgid ""
+"In active mode, FileZilla has to listen on a port for data transfers. You "
+"have to specify which ports FileZilla will use."
+msgstr ""
+
+#: resources.h:715
+msgid ""
+"In case you have a router, you will have to forward all available ports, as "
+"FileZilla has no influence on the ports your system chooses."
+msgstr ""
+
+#: resources.h:255
+msgid ""
+"In case you prefer automatic updates, you can enable automatic update checks "
+"in the settings dialog."
+msgstr ""
+
+#: resources.h:703 resources.h:767
+msgid ""
+"In order to use active mode, FileZilla needs to know your external IP "
+"address."
+msgstr ""
+
+#: resources.h:688
+msgid ""
+"In passive mode, which is recommended for most users, FileZilla asks the "
+"server for a port and connects to the given port. Not much configuration has "
+"to be done for this."
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:931
+msgid ""
+"Incomplete chain, top certificate is not self-signed certificate authority "
+"certificate"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1066
+msgid "Incorrect password"
+msgstr "Туура эмес сырсөз"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+msgid "Initializing TLS..."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
+msgid "Interactive"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:126
+msgid "Interface"
+msgstr "Интерфейс"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:219
+#: ../../locales/../src/interface/QueueView.cpp:1023
+#: ../../locales/../src/interface/QueueView.cpp:1599
+msgid "Interrupted by user"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+msgid "Invalid Content-Length"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:623
+msgid "Invalid HTTP Response"
+msgstr "Туура эмес HTTP жооп"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:544
+#: ../../locales/../src/engine/ControlSocket.cpp:604
+msgid ""
+"Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
+"site manager to force UTF-8."
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+msgid "Invalid chunk size"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:353
+#: ../../locales/../src/interface/netconfwizard.cpp:363
+#: ../../locales/../src/interface/netconfwizard.cpp:372
+msgid "Invalid data received"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
+msgid "Invalid date"
+msgstr "Туура эмес дата"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1350
+#: ../../locales/../src/interface/LocalListView.cpp:1375
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+msgid "Invalid filename"
+msgstr "Туура эмес файл аты"
+
+#: ../../locales/../src/engine/server.cpp:173
+msgid "Invalid host, after closing bracket only colon and port may follow."
+msgstr ""
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "Invalid input"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
+msgid "Invalid port given. The port has to be a value from 1 to 65535."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+msgid ""
+"Invalid protocol specified. Valid protocols are:\n"
+"ftp:// for normal FTP,\n"
+"sftp:// for SSH file transfer protocol,\n"
+"ftps:// for FTP over SSL (implicit) and\n"
+"ftpes:// for FTP over SSL (explicit)."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4403
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Invalid regular expression in search conditions."
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:633
+msgid "Invalid response code"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:693
+#, c-format
+msgid "Invalid search conditions: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Invalid site path"
+msgstr "Туура эмес сайт жолу"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+msgid "Invalid size in condition"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:136
+msgid "Invalid username given."
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
+msgid "Jurisdiction country:"
+msgstr "Юрисдикция өлкөсү:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
+msgid "Jurisdiction locality:"
+msgstr "Юрисдикция жери:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
+msgid "Jurisdiction state or province:"
+msgstr ""
+
+#: resources.h:926
+msgid "Keep directories on top"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:678
+msgid ""
+"Keep in mind that not all servers support this feature and may return "
+"incorrect listings if this option is enabled. Although FileZilla performs "
+"some tests to check if the server supports this feature, the test may fail."
+msgstr ""
+
+#: resources.h:338
+msgid "Key exchange"
+msgstr ""
+
+#: resources.h:611
+msgid "L&owest"
+msgstr "Эң &аз"
+
+#: resources.h:942
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:131
+msgid "Language"
+msgstr "Тил"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1556
+msgid "Language changed"
+msgstr "Тил өзгөртүлдү"
+
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
+msgid "Last modified"
+msgstr "Соңку өзгөртүү"
+
+#: resources.h:871
+msgid "Layout"
+msgstr "Жайылматүр"
+
+#: resources.h:817
+msgid "Limit for concurrent &downloads:"
+msgstr ""
+
+#: resources.h:819
+msgid "Limit for concurrent &uploads:"
+msgstr ""
+
+#: resources.h:762
+msgid "Limit local ports"
+msgstr ""
+
+#: resources.h:972
+msgid "Limit size of logfile"
+msgstr ""
+
+#: resources.h:973
+msgid "Limit:"
+msgstr "Лимит:"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+msgid "Line length exceeded"
+msgstr ""
+
+#: resources.h:168
+msgid "Linked against"
+msgstr "Байланыштуу болгондор"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:267
+msgid "Listen socket closed"
+msgstr ""
+
+#: ../../locales/../src/engine/logging.cpp:220
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
+msgid "Listing:"
+msgstr ""
+
+#: resources.h:765
+msgid "Lo&west available port:"
+msgstr "Эң &аз болгон колго жетердик порту:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
+msgid "Local"
+msgstr "Жердик"
+
+#: resources.h:365
+msgid "Local file"
+msgstr "Жердик файл"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:328
+msgid "Local file does not exist."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:323
+msgid "Local file is a directory instead of a regular file."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr ""
+
+#: resources.h:204
+msgid "Local filters:"
+msgstr ""
+
+#: ../../locales/../src/interface/viewheader.cpp:360
+msgid "Local site:"
+msgstr "Жердик сайт:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
+msgid "Locality:"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
+msgid "Log file"
+msgstr "Журнал файлы"
+
+#: resources.h:252
+msgid "Log of update check:"
+msgstr ""
+
+#: resources.h:967
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:140
+msgid "Logging"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+msgid ""
+"Login data contains non-ASCII characters and server might not be UTF-8 "
+"aware. Cannot fall back to local charset since using proxy."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+msgid ""
+"Login data contains non-ASCII characters and server might not be UTF-8 "
+"aware. Trying local charset."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+msgid "Login sequence fully executed yet not logged in. Aborting."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:95
+msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:10
+#, c-format
+msgid ""
+"Logontype, can only be used together with FTP URL. Argument has to be either "
+"'%s' or '%s'"
+msgstr ""
+
+#: ../../locales/../src/interface/queue.cpp:916
+#: ../../locales/../src/interface/queue.cpp:1003
+msgid "Low"
+msgstr "Аз"
+
+#: ../../locales/../src/interface/queue.cpp:914
+#: ../../locales/../src/interface/queue.cpp:1001
+msgid "Lowest"
+msgstr "Эң аз"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
+msgid "Lowest available port has to be a number between 1024 and 65535."
+msgstr ""
+
+#: resources.h:20 resources.h:44
+msgid "MAC:"
+msgstr "MAC:"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
+msgid "Make sure the file can be accessed and is a well-formed XML document."
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:896
+#, c-format
+msgid "Malformed chunk data: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:772
+#, c-format
+msgid "Malformed header: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:593
+msgid "Malformed reply, server not sending proper line endings"
+msgstr ""
+
+#: resources.h:395 ../../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
+msgid "Manual transfer"
+msgstr "Кол менен берүү"
+
+#: resources.h:435
+msgid "Match all of the following"
+msgstr ""
+
+#: resources.h:436
+msgid "Match any of the following"
+msgstr ""
+
+#: resources.h:437
+msgid "Match none of the following"
+msgstr ""
+
+#: resources.h:815
+msgid "Maximum simultaneous &transfers:"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1884
+msgid "Message log"
+msgstr "Билдирме журналы"
+
+#: resources.h:882
+msgid "Message log position"
+msgstr ""
+
+#: resources.h:974
+msgid "MiB"
+msgstr "Мб"
+
+#: resources.h:97
+msgid "Minutes"
+msgstr "Мүнөт"
+
+#: resources.h:359
+msgid "Move &down"
+msgstr "Ө&йдө жылдыруу"
+
+#: resources.h:358
+msgid "Move &up"
+msgstr "&Ылдый жылдыруу"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+msgid "My Computer"
+msgstr "Менин компьютерим"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+msgid "My Documents"
+msgstr "Менин документтерим"
+
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
+msgid "My Sites"
+msgstr "Менин сайттарым"
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
+msgid "N/a"
+msgstr ""
+
+#: resources.h:400
+msgid "Name"
+msgstr "Ат"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+msgid "Name already exists"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+msgid "Name of bookmark already exists."
+msgstr ""
+
+#: resources.h:120 resources.h:169
+msgid "Name:"
+msgstr "Ат:"
+
+#: ../../locales/../src/interface/filteredit.cpp:349
+msgid "Need to enter filter name"
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:683
+msgid "Need to enter valid remote path"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+msgid "Need to specify a character encoding"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:436
+msgid "Network unreachable"
+msgstr ""
+
+#: resources.h:73
+msgid "New &Folder"
+msgstr "Жаңы &каталог"
+
+#: resources.h:502
+msgid "New &tab"
+msgstr "Жаңы &салма"
+
+#: resources.h:74 resources.h:415
+msgid "New Book&mark"
+msgstr "Жаңы &чөп кат"
+
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
+msgid "New bookmark"
+msgstr "Жаңы чөп кат"
+
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+msgid "New directory"
+msgstr "Жаңы каталог"
+
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
+#, c-format
+msgid "New features and improvements in %s"
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:131
+msgid "New filter"
+msgstr "Жаңы фильтр"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
+msgid "New folder"
+msgstr "Жаңы каталог"
+
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
+msgid "New site"
+msgstr "Жаңы сайт"
+
+#: resources.h:880
+msgid "Next to the transfer queue"
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+msgid "No"
+msgstr "Жок"
+
+#: ../../locales/../src/interface/export.cpp:26
+msgid "No category to export selected"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:2299
+msgid "No command given, aborting."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3917
+msgid "No external IP address set, trying default."
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1221
+msgid "No files are currently being edited."
+msgstr "Бир да файл азыр оңдолуп жаткан жок."
+
+#: ../../locales/../src/interface/filteredit.cpp:143
+msgid "No filter name given"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
+msgid "No host given, please enter a host."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
+msgid "No images available"
+msgstr "Колго жетердик сүрөттөр жок"
+
+#: ../../locales/../src/interface/QueueView.cpp:3170
+msgid "No more files in the queue!"
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
+msgid "No name for the filterset given."
+msgstr ""
+
+#: resources.h:431
+msgid "No program associated with filetype"
+msgstr ""
+
+#: resources.h:421
+#, c-format
+msgid "No program has been associated to edit files with the extension '%s'."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:541
+msgid "No search results"
+msgstr "Издөө натыйжалары жок"
+
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
+msgid "No sites available"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:404
+msgid "No supported SOCKS5 auth method"
+msgstr ""
+
+#: ../../locales/../src/interface/loginmanager.cpp:104
+msgid "No username given."
+msgstr "Колдонуучу аты аныкталган жок."
+
+#: resources.h:936 resources.h:941
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
+msgid "None"
+msgstr "Жок"
+
+#: resources.h:375
+msgid "None selected yet"
+msgstr ""
+
+#: resources.h:828 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+msgid "Normal"
+msgstr "Нормалдуу"
+
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
+msgid "Not all items could be requeued for viewing/editing."
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:199
+#: ../../locales/../src/interface/state.cpp:504
+msgid "Not connected"
+msgstr "Туташтырылган жок"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
+msgid "Not connected to any server"
+msgstr "Серверге туташтырылган жок"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:564
+msgid "Not connected to any server."
+msgstr "Серверге туташтырылган жок."
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:27
+msgid "Not connected."
+msgstr "Туташтырылган жок."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:676
+msgid "Note that this feature is only supported using the FTP protocol."
+msgstr ""
+
+#: resources.h:796
+msgid "Note: This only works with plain, unencrypted FTP connections."
+msgstr ""
+
+#: resources.h:813
+msgid "Note: Using a generic proxy forces passive mode on FTP connections."
+msgstr ""
+
+#: resources.h:915
+msgid "Number of decimal places:"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
+msgid "Number of retries has to be between 0 and 99."
+msgstr ""
+
+#: resources.h:334
+msgid "O&pen file"
+msgstr "Файлды &ачуу"
+
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:739
+msgid "OK"
+msgstr "OK"
+
+#: resources.h:695
+msgid ""
+"On the following pages, the selected transfer mode will be configured, as "
+"well as the fallback mode if enabled."
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+msgid "Once"
+msgstr "Бир жолу"
+
+#: resources.h:966
+msgid ""
+"Only the versions of FileZilla and the operating system you are using will "
+"be submitted to the server."
+msgstr ""
+
+#: resources.h:664
+msgid "Open directory in system's file manager"
+msgstr "Каталогду системалык файл менеджеринен ачуу"
+
+#: resources.h:988 resources.h:989
+msgid "Open the Site Manager"
+msgstr "Сайт менеджерин ачуу"
+
+#: resources.h:572
+msgid "Open the file."
+msgstr "Файлды ачуу."
+
+#: resources.h:515
+msgid "Open the settings dialog of FileZilla"
+msgstr "FileZilla'нын ырастоо терезесин ачуу"
+
+#: resources.h:310
+msgid "Opened as:"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2042
+#: ../../locales/../src/interface/LocalListView.cpp:2087
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2187
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
+msgid "Opening failed"
+msgstr "Ачуу оңунан чыккан жок"
+
+#: resources.h:503
+msgid "Opens a new tab"
+msgstr "Жаңы салманы ачуу"
+
+#: resources.h:500
+msgid "Opens the Site Manager"
+msgstr "Сайт менеджерин ачат"
+
+#: resources.h:1009
+msgid ""
+"Opens the directory listing filter dialog. Right-click to toggle filters."
+msgstr ""
+
+#: resources.h:172
+msgid "Operating system"
+msgstr "Операциялык система"
+
+#: ../../locales/../src/interface/FileZilla.cpp:306
+msgid "Operating system problem detected"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
+msgid "Organization:"
+msgstr "Уюм:"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
+msgid "Other:"
+msgstr "Башка:"
+
+#: resources.h:741
+msgid "Overview"
+msgstr ""
+
+#: resources.h:59
+msgid "Overwrite &if source newer"
+msgstr ""
+
+#: resources.h:261 resources.h:271 resources.h:851 resources.h:860
+msgid "Overwrite file"
+msgstr "Файлды кайтадан жаздыруу"
+
+#: resources.h:263 resources.h:273 resources.h:853 resources.h:862
+msgid "Overwrite file if size differs"
+msgstr ""
+
+#: resources.h:264 resources.h:274 resources.h:854 resources.h:863
+msgid "Overwrite file if size differs or source file is newer"
+msgstr ""
+
+#: resources.h:262 resources.h:272 resources.h:852 resources.h:861
+msgid "Overwrite file if source file newer"
+msgstr ""
+
+#: resources.h:60
+msgid "Overwrite if &different size"
+msgstr ""
+
+#: resources.h:61
+msgid "Overwrite if different si&ze or source newer"
+msgstr ""
+
+#: resources.h:134
+msgid "Owner permissions"
+msgstr "Ээсинин укуктары"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
+msgid "Owner/Group"
+msgstr "Ээ/Топ"
+
+#: resources.h:886
+msgid ""
+"P&revent system from entering idle sleep during transfers and other "
+"operations"
+msgstr ""
+
+#: resources.h:793 resources.h:809
+#, no-c-format
+msgid "P&roxy host:"
+msgstr "П&рокси хосту:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:488
+msgid "PORT command tainted by router or firewall."
+msgstr ""
+
+#: resources.h:755
+msgid "Pa&ssive (recommended)"
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:325
+msgid "Package"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2521
+msgid "Parameter not a valid URL"
+msgstr ""
+
+#: resources.h:85 resources.h:384 resources.h:733
+msgid "Pass&word:"
+msgstr "Сыр&сөз:"
+
+#: resources.h:691
+msgid "Passive (recommended)"
+msgstr "Пассивдүү (сунушталат)"
+
+#: resources.h:775
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:119
+msgid "Passive mode"
+msgstr "Пассивдүү режим"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:588
+#: ../../locales/../src/interface/netconfwizard.cpp:601
+#: ../../locales/../src/interface/netconfwizard.cpp:612
+msgid "Passive mode has been set as default transfer mode."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
+msgid "Password required"
+msgstr "Сырсөз керек болот"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
+msgid "Path"
+msgstr "Жол"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3204
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
+#, c-format
+msgid "Path cannot be constructed for directory %s and subdir %s"
+msgstr ""
+
+#: resources.h:402
+msgid "Paths"
+msgstr "Жолдор"
+
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
+msgid "Pending removal"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+msgid "Permission"
+msgstr "Укук"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
+msgid "Permissions"
+msgstr "Укуктар"
+
+#: resources.h:171
+msgid "Platform:"
+msgstr "Платформа:"
+
+#: resources.h:251
+msgid ""
+"Please check http://filezilla-project.org for the most recent version of "
+"FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:553
+msgid ""
+"Please check on http://filezilla-project.org/probe.php that the server is "
+"running and carefully check your settings again."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:1080
+msgid ""
+"Please check the package manager of your system for an updated package or "
+"visit http://filezilla-project.org to download the source code of FileZilla."
+msgstr ""
+
+#: resources.h:697
+msgid ""
+"Please configure any firewalls and routers so that FileZilla can establish "
+"outgoing connection to arbitrary ports."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:623
+msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:562
+msgid ""
+"Please ensure you have a stable internet connection and carefully check your "
+"settings again."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
+msgid "Please enter a custom date format."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
+msgid "Please enter a custom time format."
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#, c-format
+msgid "Please enter a download speed limit greater or equal to 0 %s/s."
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:136
+msgid "Please enter a name for the new filter."
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:243
+msgid "Please enter a new name for the copied filter."
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:403
+#, c-format
+msgid "Please enter a new name for the filter set \"%s\""
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:196
+msgid "Please enter a new name for the filter."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent "
+"downloads."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
+msgid ""
+"Please enter a number between 0 and 10 for the number of concurrent uploads."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
+msgid ""
+"Please enter a number between 1 and 10 for the number of concurrent "
+"transfers."
+msgstr ""
+
+#: resources.h:117
+msgid "Please enter a password for this server:"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:2288
+msgid ""
+"Please enter a path and executable to run.\n"
+"E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
+"You can also optionally specify program arguments."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
+msgid ""
+"Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:343
+msgid "Please enter a unique name for this filter set"
+msgstr ""
+
+#: resources.h:118
+msgid "Please enter a username for this server:"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:182
+msgid "Please enter a valid portrange."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:161
+msgid "Please enter an URL where to get your external address from"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
+msgid "Please enter an update interval of at least 7 days"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+#, c-format
+msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:576
+msgid ""
+"Please enter raw FTP command.\n"
+"Using raw ftp commands will clear the directory cache."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:1196
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+msgid "Please enter the name of the directory which should be created:"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+msgid "Please enter the name of the file which should be created:"
+msgstr ""
+
+#: resources.h:119
+msgid "Please enter username and password for this server:"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:142
+msgid "Please enter your external IP address"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:593
+#: ../../locales/../src/interface/netconfwizard.cpp:606
+msgid ""
+"Please enter your external IP address on the active mode page of this "
+"wizard. In case you have a dynamic address or don't know your external "
+"address, use the external resolver option."
+msgstr ""
+
+#: resources.h:684
+msgid ""
+"Please follow the instructions carefully, as wrong configuration will "
+"prevent successful FTP connections."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:617
+msgid ""
+"Please make sure FileZilla is allowed to establish outgoing connections and "
+"make sure you typed the address of the address resolver correctly."
+msgstr ""
+
+#: ../../locales/../src/interface/FileZilla.cpp:258
+msgid "Please make sure the requested locale is installed on your system."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:594
+msgid ""
+"Please make sure your router is using the latest available firmware. "
+"Furthermore, your router has to be configured properly. You will have to use "
+"manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
+"'game mode'."
+msgstr ""
+
+#: resources.h:698
+msgid ""
+"Please note that FileZilla has no influence on the port the server chooses. "
+"So the server might choose a port which your firewall thinks is only used by "
+"trojans or other malware. This might raise a false alarm you can safely "
+"discard."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:726
+msgid ""
+"Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
+"servers only works if they support the MFMT command."
+msgstr ""
+
+#: resources.h:752
+msgid ""
+"Please note that some servers might ban you if you try to reconnect too "
+"often or in too short intervals."
+msgstr ""
+
+#: resources.h:902 resources.h:908
+#, no-c-format
+msgid ""
+"Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
+"details"
+msgstr ""
+
+#: resources.h:247
+msgid ""
+"Please retry downloading the update. Possible reasons if the problem "
+"persists (listed in order of decreasing probability):"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:570
+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 ""
+
+#: resources.h:457
+msgid "Please select an action:"
+msgstr ""
+
+#: resources.h:303
+msgid "Please select the categories you would like to import."
+msgstr ""
+
+#: resources.h:686
+msgid "Please select the default transfer mode you would like to use."
+msgstr ""
+
+#: ../../locales/../src/interface/chmoddialog.cpp:51
+#, c-format
+msgid "Please select the new attributes for the directory \"%s\"."
+msgstr ""
+
+#: ../../locales/../src/interface/chmoddialog.cpp:40
+#, c-format
+msgid "Please select the new attributes for the file \"%s\"."
+msgstr ""
+
+#: ../../locales/../src/interface/chmoddialog.cpp:54
+msgid "Please select the new attributes for the selected directories."
+msgstr ""
+
+#: ../../locales/../src/interface/chmoddialog.cpp:57
+msgid ""
+"Please select the new attributes for the selected files and directories."
+msgstr ""
+
+#: ../../locales/../src/interface/chmoddialog.cpp:43
+msgid "Please select the new attributes for the selected files."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:581
+msgid ""
+"Please update your firewall and make sure your router is using the latest "
+"available firmware. Furthermore, your router has to be configured properly. "
+"You will have to use manual port forwarding. Don't run your router in the so "
+"called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
+"protocol specific 'fixups' have to be disabled"
+msgstr ""
+
+#: resources.h:254
+msgid ""
+"Please visit http://filezilla-project.org for more information about "
+"FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:1078
+#: ../../locales/../src/interface/updatewizard.cpp:1094
+msgid ""
+"Please visit http://filezilla-project.org to download the most recent "
+"version."
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
+msgid "Postal code:"
+msgstr "Почталык индекс:"
+
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
+msgid "Predefined Sites"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:725
+msgid "Preserving file timestamps"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
+msgid "Preview:"
+msgstr "Алдын ала көрсөтүү:"
+
+#: ../../locales/../src/engine/tlssocket.cpp:957
+msgid "Primary connection and data connection certificates don't match."
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:17
+msgid "Print version information to stdout and exit"
+msgstr ""
+
+#: resources.h:925
+msgid "Prioritize directories (default)"
+msgstr ""
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Priority"
+msgstr "Алгачкылык"
+
+#: resources.h:965
+msgid "Privacy policy:"
+msgstr "Коопсуздук саясаты:"
+
+#: resources.h:799
+msgid "Private &keys:"
+msgstr ""
+
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr "Про&токол:"
+
+#: resources.h:795 resources.h:812
+msgid "Pro&xy password:"
+msgstr "Про&кси сырсөзү:"
+
+#: resources.h:533 resources.h:602
+msgid "Process &Queue"
+msgstr "&Кезекти иштетүү"
+
+#: resources.h:810
+msgid "Proxy &port:"
+msgstr "Прокси &порту:"
+
+#: resources.h:794 resources.h:811
+msgid "Proxy &user:"
+msgstr "Прокси &колдонуучусу:"
+
+#: ../../locales/../src/engine/proxy.cpp:415
+msgid "Proxy authentication failed"
+msgstr ""
+
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
+#, c-format
+msgid "Proxy handshake failed: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4395
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:309
+#, c-format
+msgid "Proxy reply: %s"
+msgstr "Прокси жообу: %s"
+
+#: ../../locales/../src/engine/proxy.cpp:458
+#, c-format
+msgid "Proxy request failed: %s"
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:480
+msgid "Proxy request failed: Unknown address type in CONNECT reply"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4428
+msgid "Proxy set but proxy host or port invalid"
+msgstr ""
+
+#: resources.h:797
+msgid "Public Key Authentication"
+msgstr ""
+
+#: resources.h:8 resources.h:32
+msgid "Public key algorithm:"
+msgstr "Коомдук ачкычтын алгоритми:"
+
+#: resources.h:142
+msgid "Public permissions"
+msgstr "Коомдук укуктар"
+
+#: ../../locales/../src/interface/QueueView.cpp:3226
+msgid "Queue has been fully processed"
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
+msgid "Queue: %s MiB"
+msgstr "Кезек: %s Мб"
+
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
+msgid "Queue: %s%s"
+msgstr "Кезек: %s%s"
+
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
+msgid "Queue: empty"
+msgstr "Кезек: бош"
+
+#: ../../locales/../src/interface/QueueView.cpp:455
+msgid "Queued files"
+msgstr "Кезекте турган файлдар"
+
+#: resources.h:449
+msgid "Queueing:"
+msgstr ""
+
+#: resources.h:618
+msgid "R&eboot system"
+msgstr "Системаны &кайтадан жүктөө"
+
+#: resources.h:530
+msgid "R&emote directory tree"
+msgstr "А&лыскы каталог багы"
+
+#: resources.h:634 resources.h:638
+msgid "R&eset and requeue selected files"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:592
+msgid "Raw FTP command"
+msgstr "Raw FTP командасы"
+
+#: resources.h:139
+msgid "Re&ad"
+msgstr "&Окуу"
+
+#: resources.h:577 resources.h:593
+msgid "Re&fresh"
+msgstr "&Жаңыртуу"
+
+#: resources.h:63
+msgid "Re&name"
+msgstr "&Атын өзгөртүү"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:576
+msgid ""
+"Re-run the wizard and carefully check your settings and configure all "
+"routers and firewalls accordingly."
+msgstr ""
+
+#: resources.h:143
+msgid "Rea&d"
+msgstr "О&куу"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+msgid "Read-only"
+msgstr "Окуу гана"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1103
+msgid "Really cancel current operation?"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+
+#: ../../locales/../src/engine/local_filesys.cpp:136
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Reason"
+msgstr "Себеп"
+
+#: ../../locales/../src/interface/QueueView.cpp:3233
+msgid "Reboot now"
+msgstr "Азыр кайтадан жүктөө"
+
+#: resources.h:148
+msgid "Rec&urse into subdirectories"
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
+msgid "Received data tainted"
+msgstr ""
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+msgid ""
+"Reconnect information cannot be cleared while connected to a server.\n"
+"If you continue, your connection will be disconnected."
+msgstr ""
+
+#: resources.h:753
+msgid "Reconnection settings"
+msgstr ""
+
+#: resources.h:1006 resources.h:1007
+msgid "Reconnects to the last used server"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:715
+msgid "Redirection to invalid address"
+msgstr ""
+
+#: resources.h:998 resources.h:999
+msgid "Refresh the file and folder lists"
+msgstr ""
+
+#: resources.h:497
+msgid "Remember passwords?"
+msgstr "Сырсөздөрдү эске сактатасызбы?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
+msgid "Remote"
+msgstr "Алыскы"
+
+#: ../../locales/../src/engine/tlssocket.cpp:880
+msgid "Remote certificate not trusted."
+msgstr "Алыскы сервердин сертификаты ишеничтүү эмес."
+
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1222
+msgid "Remote file"
+msgstr "Сервердеги файл"
+
+#: resources.h:441 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
+msgid "Remote file search"
+msgstr ""
+
+#: resources.h:207
+msgid "Remote filters:"
+msgstr "Алыскы фильтрлер:"
+
+#: ../../locales/../src/interface/edithandler.cpp:1234
+msgid "Remote path"
+msgstr "Алыскы жол"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
+#, c-format
+msgid ""
+"Remote path cannot be parsed. Make sure it is a valid absolute path and is "
+"supported by the current site's servertype (%s)."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
+#, c-format
+msgid ""
+"Remote path cannot be parsed. Make sure it is a valid absolute path and is "
+"supported by the servertype (%s) selected on the parent site."
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:350
+msgid "Remote path could not be parsed."
+msgstr ""
+
+#: resources.h:446
+msgid "Remote path handling:"
+msgstr ""
+
+#: resources.h:314
+msgid "Remote path:"
+msgstr "Алыскы жол:"
+
+#: ../../locales/../src/interface/viewheader.cpp:560
+msgid "Remote site:"
+msgstr "Алыскы сайт:"
+
+#: resources.h:631 resources.h:635
+msgid "Remove &all"
+msgstr "&Баарын өчүрүү"
+
+#: resources.h:633 resources.h:637
+msgid "Remove &selected"
+msgstr ""
+
+#: resources.h:266 resources.h:276 resources.h:856 resources.h:865
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:256
+msgid "Rename file"
+msgstr "Файлдын атын өзгөртүү"
+
+#: resources.h:649 resources.h:670
+msgid "Rename selected directory"
+msgstr ""
+
+#: resources.h:581 resources.h:597
+msgid "Rename selected files and directories"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3550
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
+#, c-format
+msgid "Renaming '%s' to '%s'"
+msgstr ""
+
+#: resources.h:473
+msgid "Reporting bugs and feature requests"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr ""
+
+#: resources.h:636
+msgid "Reset and requeue &all"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1201
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:497
+#, c-format
+msgid "Resolving address of %s"
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:1163
+msgid "Resolving hostname"
+msgstr ""
+
+#: ../../locales/../src/engine/logging.cpp:215
+#: ../../locales/../src/interface/netconfwizard.cpp:395
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:545
+msgid "Response:"
+msgstr "Жооп:"
+
+#: resources.h:440
+msgid "Results:"
+msgstr "Натыйжалар:"
+
+#: resources.h:265 resources.h:275 resources.h:855 resources.h:864
+msgid "Resume file transfer"
+msgstr ""
+
+#: resources.h:870
+msgid ""
+"Resuming ASCII files can cause problems if server uses a different line "
+"ending format than the client."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1301
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
+msgid "Retrieving directory listing..."
+msgstr "Каталог тизмесин алуу..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3935
+#: ../../locales/../src/interface/netconfwizard.cpp:707
+#, c-format
+msgid "Retrieving external IP address from %s"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:938
+msgid "Root certificate is not trusted"
+msgstr ""
+
+#: resources.h:508
+msgid "S&how files currently being edited..."
+msgstr "Оңдолуп жаткан файлдарды &көрсөтүү..."
+
+#: resources.h:887
+msgid "S&how the Site Manager on startup"
+msgstr ""
+
+#: resources.h:619
+msgid "S&hutdown system"
+msgstr ""
+
+#: resources.h:438
+msgid "S&top"
+msgstr ""
+
+#: resources.h:524
+msgid "S&ynchronized browsing"
+msgstr "&Синхрондоштурулган көрүү"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:121
+msgid "SFTP"
+msgstr "SFTP"
+
+#: resources.h:167
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "Save settings?"
+msgstr "Ырастоолорду сактайсызбы?"
+
+#: ../../locales/../src/interface/QueueView.cpp:1833
+msgid "Scanning for files to add to queue"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
+msgid "Scanning for files to upload"
+msgstr ""
+
+#: resources.h:434
+msgid "Search &conditions:"
+msgstr ""
+
+#: resources.h:432
+msgid "Search &directory:"
+msgstr "&Каталогду издөө:"
+
+#: resources.h:1014
+msgid "Search for files recursively."
+msgstr ""
+
+#: resources.h:549
+msgid "Search server for files"
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:531
+msgid "Security information"
+msgstr "Коопсуздук жөнүндө маалымат"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:564
+#: ../../locales/../src/interface/netconfwizard.cpp:577
+msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
+msgstr ""
+
+#: resources.h:376
+msgid "Sele&ct server"
+msgstr "&Серверди тандаңыз"
+
+#: resources.h:738
+msgid "Select &page:"
+msgstr "&Баракты тандаңыз:"
+
+#: resources.h:890
+msgid "Select Theme"
+msgstr "Теманы тандоо"
+
+#: resources.h:848
+msgid ""
+"Select default action to perform if target file of a transfer already exists."
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1704
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+msgid "Select default editor"
+msgstr "Жарыяланбас редакторун тандоо"
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
+msgid ""
+"Select default file exists action if the target file already exists. This "
+"selection is valid only for the current session."
+msgstr ""
+
+#: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
+msgid ""
+"Select default file exists action only for the currently selected files in "
+"the queue."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:329
+msgid "Select download location for package"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
+msgid "Select file containing private key"
+msgstr ""
+
+#: ../../locales/../src/interface/export.cpp:38
+msgid "Select file for exported data"
+msgstr ""
+
+#: ../../locales/../src/interface/export.cpp:34
+msgid "Select file for exported queue"
+msgstr ""
+
+#: ../../locales/../src/interface/export.cpp:36
+msgid "Select file for exported settings"
+msgstr ""
+
+#: ../../locales/../src/interface/export.cpp:32
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
+msgid "Select file for exported sites"
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:15
+msgid "Select file to import settings from"
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:250
+msgid "Select file to upload"
+msgstr "Жүктөө үчүн файлды тандоо"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
+msgid "Select filename for converted keyfile"
+msgstr ""
+
+#: resources.h:422
+#, no-c-format
+msgid "Select how these files should be opened."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:806
+msgid "Select target download directory"
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:245
+msgid "Select target filename"
+msgstr ""
+
+#: resources.h:292
+msgid "Select the categories to export:"
+msgstr "Экспорт үчүн категорияларды тандаңыз:"
+
+#: resources.h:283
+msgid "Select the private data you would like to delete."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:773
+#, c-format
+msgid "Selected %d directory with its contents for transfer."
+msgid_plural "Selected %d directories with their contents for transfer."
+msgstr[0] ""
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:51
+#, c-format
+msgid "Selected %d directory."
+msgid_plural "Selected %d directories."
+msgstr[0] "%d каталог тандалды."
+
+#: ../../locales/../src/interface/search.cpp:771
+#, c-format
+msgid "Selected %d file for transfer."
+msgid_plural "Selected %d files for transfer."
+msgstr[0] ""
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:58
+#, c-format
+msgid "Selected %d file. Total size: %s"
+msgid_plural "Selected %d files. Total size: %s"
+msgstr[0] "%d файл тандалды. Жалпы өлчөмү: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:56
+#, c-format
+msgid "Selected %d file. Total size: At least %s"
+msgid_plural "Selected %d files. Total size: At least %s"
+msgstr[0] ""
+
+#: ../../locales/../src/interface/search.cpp:778
+#, c-format
+msgid "Selected %s and %s for transfer."
+msgstr ""
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:68
+#, c-format
+msgid "Selected %s and %s. Total size: %s"
+msgstr "%s жана %s тандалды. Жалпы өлчөмү: %s"
+
+#: ../../locales/../src/interface/filelist_statusbar.cpp:66
+#, c-format
+msgid "Selected %s and %s. Total size: At least %s"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+msgid "Selected editor does not exist."
+msgstr ""
+
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2071
+msgid "Selected file already being edited"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
+msgid "Selected file is already loaded"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+msgid "Selected file is already opened"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+msgid "Selected file is still being edited"
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:310
+msgid "Selected filter only works for local files."
+msgstr ""
+
+#: ../../locales/../src/interface/menu_bar.cpp:313
+msgid ""
+"Selected global bookmark and current server use a different server type.\n"
+"Use site-specific bookmarks for this server."
+msgstr ""
+
+#: ../../locales/../src/engine/engineprivate.cpp:281
+msgid "Selected port usually in use by a different protocol."
+msgstr ""
+
+#: resources.h:760
+msgid "Send FTP &keep-alive commands"
+msgstr ""
+
+#: resources.h:551
+msgid "Send custom command to the server otherwise not available"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4510
+msgid "Sending keep-alive command"
+msgstr ""
+
+#: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
+msgid "Serial number:"
+msgstr "Сериялык номер:"
+
+#: resources.h:89
+msgid "Server &Type:"
+msgstr "Сервер &түрү:"
+
+#: ../../locales/../src/engine/tlssocket.cpp:764
+msgid "Server did not properly shut down TLS connection"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:914
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:976
+msgid "Server does not support non-ASCII characters."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4334
+#, c-format
+msgid "Server does not support resume of files > %d GB."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4330
+#, c-format
+msgid ""
+"Server does not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2565
+msgid "Server does not support resume of files > 2GB."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2560
+msgid "Server does not support resume of files > 4GB."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
+#, c-format
+msgid ""
+"Server may not support resume of files > %d GB. End transfer since file "
+"sizes match."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+msgid ""
+"Server might require an account. Try specifying an account using the Site "
+"Manager"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
+msgid ""
+"Server sent an additional login prompt. You need to use the interactive "
+"login type."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3877
+msgid "Server sent passive reply with unroutable address. Passive mode failed."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3871
+msgid ""
+"Server sent passive reply with unroutable address. Using server address "
+"instead."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:403
+#: ../../locales/../src/interface/netconfwizard.cpp:410
+#: ../../locales/../src/interface/netconfwizard.cpp:449
+#: ../../locales/../src/interface/netconfwizard.cpp:458
+#: ../../locales/../src/interface/netconfwizard.cpp:470
+#: ../../locales/../src/interface/netconfwizard.cpp:494
+#: ../../locales/../src/interface/netconfwizard.cpp:501
+#: ../../locales/../src/interface/netconfwizard.cpp:510
+#: ../../locales/../src/interface/netconfwizard.cpp:521
+msgid "Server sent unexpected reply."
+msgstr ""
+
+#: resources.h:352
+msgid "Server to client MAC:"
+msgstr ""
+
+#: resources.h:350
+msgid "Server to client cipher:"
+msgstr ""
+
+#: resources.h:381
+msgid "Server&type:"
+msgstr "Сервер &түрү:"
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Server/Local file"
+msgstr "Сервер/Жердик файл"
+
+#: resources.h:312 resources.h:374
+msgid "Server:"
+msgstr "Сервер:"
+
+#: resources.h:15 resources.h:39
+msgid "Session details"
+msgstr "Сессия деталдары"
+
+#: resources.h:606
+msgid "Set &Priority"
+msgstr "&Алгачкылык орнотуу"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3702
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
+#, c-format
+msgid "Set permissions of '%s' to '%s'"
+msgstr ""
+
+#: ../../locales/../src/engine/transfersocket.cpp:858
+msgid "SetSocketBufferSize called without socket"
+msgstr ""
+
+#: resources.h:737
+msgid "Settings"
+msgstr "Ырастоолор"
+
+#: resources.h:987
+msgid "Show &raw directory listing"
+msgstr ""
+
+#: resources.h:560
+msgid "Show &welcome dialog..."
+msgstr "&Учурашуу терезесин көрсөтүү..."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2373
+msgid "Show both directory trees and continue comparing?"
+msgstr ""
+
+#: resources.h:630
+msgid "Shows available TLS ciphers"
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:6
+msgid "Shows this help dialog"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:3235
+msgid "Shutdown now"
+msgstr ""
+
+#: resources.h:300
+msgid "Site &Manager entries"
+msgstr ""
+
+#: resources.h:70
+msgid "Site Manager"
+msgstr "Сайт менеджери"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+msgid "Site Manager - Invalid data"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
+msgid "Site Manager already open"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
+msgid "Site does not exist."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:419
+msgid "Site path has to begin with 0 or 1."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
+msgid "Site path is malformed."
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
+msgid "Site-specific bookmarks"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+msgid ""
+"Site-specific bookmarks require the server to be stored in the Site "
+"Manager.\n"
+"Add current connection to the site manager?"
+msgstr ""
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Size"
+msgstr "Өлчөм"
+
+#: resources.h:909
+msgid "Size formatting"
+msgstr ""
+
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
+msgid "Size unknown"
+msgstr "Өлчөм белгисиз"
+
+#: resources.h:267 resources.h:277 resources.h:857 resources.h:866
+msgid "Skip file"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1273
+#: ../../locales/../src/engine/ControlSocket.cpp:1292
+#: ../../locales/../src/engine/ControlSocket.cpp:1317
+#: ../../locales/../src/engine/ControlSocket.cpp:1383
+#, c-format
+msgid "Skipping download of %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ControlSocket.cpp:1277
+#: ../../locales/../src/engine/ControlSocket.cpp:1296
+#: ../../locales/../src/engine/ControlSocket.cpp:1321
+#: ../../locales/../src/engine/ControlSocket.cpp:1387
+#, c-format
+msgid "Skipping upload of %s"
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1244
+msgid "Some files are still being edited or need to be uploaded."
+msgstr ""
+
+#: resources.h:700 resources.h:776
+msgid ""
+"Some misconfigured remote servers which are behind a router, may reply with "
+"their local IP address."
+msgstr ""
+
+#: resources.h:927
+msgid "Sort directories inline"
+msgstr ""
+
+#: ../../locales/../src/interface/filelistctrl.cpp:450
+msgid "Sort order cannot be changed if comparing directories."
+msgstr ""
+
+#: resources.h:923
+msgid "Sorting"
+msgstr "Сорттоо"
+
+#: resources.h:924
+msgid "Sorting &mode:"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
+msgid "Source and path of the drop operation are identical"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
+msgid "Source and target file may not be the same"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:141
+msgid "Source and target of the drop operation are identical"
+msgstr ""
+
+#: resources.h:49
+msgid "Source file:"
+msgstr "Баштапкы файл:"
+
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: ../../locales/../src/interface/speedlimits_dialog.cpp:62
+msgid "Speed Limits"
+msgstr "Ылдамдык лимити"
+
+#: resources.h:821
+msgid "Speed limits"
+msgstr "Ылдамдык лимити"
+
+#: ../../locales/../src/interface/statusbar.cpp:597
+msgid "Speed limits are disabled, click to change."
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:601
+msgid "Speed limits are enabled, click to change."
+msgstr ""
+
+#: resources.h:392
+msgid "Start transfer &immediately"
+msgstr "Берүүнү &дароо баштатуу"
+
+#: ../../locales/../src/interface/cmdline.cpp:7
+msgid "Start with opened Site Manager"
+msgstr "Ачык сайт менеджери менен жүргүзүү"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2244
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
+#, c-format
+msgid "Starting download of %s"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2248
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
+#, c-format
+msgid "Starting upload of %s"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
+msgid "State or province:"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Status"
+msgstr "Абал"
+
+#: ../../locales/../src/engine/logging.cpp:212
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:539
+msgid "Status:"
+msgstr "Абал:"
+
+#: resources.h:603
+msgid "Stop and remove &all"
+msgstr "Токтотуу жана &баарын өчүрүү"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+msgid "Street:"
+msgstr "Көчө:"
+
+#: resources.h:11 resources.h:35
+msgid "Subject of certificate"
+msgstr ""
+
+#: ../../locales/../src/interface/queueview_successful.cpp:12
+msgid "Successful transfers"
+msgstr "Ийгиликтүү берүүлөр"
+
+#: resources.h:728
+msgid "Summary of test results:"
+msgstr ""
+
+#: resources.h:460
+msgid ""
+"Symlinks to files are not affected by this choice, such symlinks are always "
+"deleted."
+msgstr ""
+
+#: resources.h:1013 ../../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:373
+#: ../../locales/../src/interface/state.cpp:383
+#: ../../locales/../src/interface/state.cpp:392
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
+msgid "Synchronized browsing"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:391
+msgid "Synchronized browsing has been disabled."
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
+msgid "Syntax error"
+msgstr "Синтаксис катасы"
+
+#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/Mainfrm.cpp:2523
+msgid "Syntax error in command line"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+msgid "System"
+msgstr "Система"
+
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "&Аспап панели"
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:332
+msgid "TLS/SSL connection established, sending HTTP request"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+msgid "TLS/SSL connection established, waiting for welcome message..."
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+msgid "TLS/SSL connection established."
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:445
+msgid "TTL expired"
+msgstr ""
+
+#: resources.h:47
+msgid "Target file already exists"
+msgstr ""
+
+#: resources.h:53
+msgid "Target file:"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+msgid "Target filename already exists!"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
+msgid "Target filename already exists, really continue?"
+msgstr ""
+
+#: resources.h:727
+msgid "Test results"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4351
+msgid "Testing resume capabilities of server"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Do you want to continue? Any changes made in the Site Manager won't be saved "
+"then."
+msgstr ""
+
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
+msgid ""
+"The Site Manager is opened in another instance of FileZilla 3.\n"
+"Please close it or the data cannot be deleted."
+msgstr ""
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
+#, c-format
+msgid "The XML document is not well-formed: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:618
+#, c-format
+msgid "The address you entered was: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
+msgid "The bookmark could not be added."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:805
+msgid "The bookmarks could not be cleared."
+msgstr ""
+
+#: ../../locales/../src/interface/statusbar.cpp:490
+msgid "The connection is encrypted. Click icon for details."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
+msgid "The custom login sequence cannot be empty."
+msgstr ""
+
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
+#, no-c-format
+msgid "The default editor for text files could not be found."
+msgstr ""
+
+#: resources.h:424
+#, c-format
+msgid "The default editor for text files is '%s'."
+msgstr ""
+
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
+#, c-format
+msgid "The extension '%s' does already exist in the list"
+msgstr ""
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:246
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:253
+#, c-format
+msgid ""
+"The file %s already exists.\n"
+"Please enter a new name:"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2048
+#: ../../locales/../src/interface/LocalListView.cpp:2179
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
+#, c-format
+msgid ""
+"The file '%s' cannot be opened:\n"
+"The associated program (%s) could not be found.\n"
+"Please check your filetype associations."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
+#, c-format
+msgid "The file '%s' could not be loaded or does not contain a private key."
+msgstr ""
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#, c-format
+msgid "The file '%s' could not be loaded."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2042
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"No program has been associated on your system with this file type."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2087
+#: ../../locales/../src/interface/LocalListView.cpp:2187
+#, c-format
+msgid ""
+"The file '%s' could not be opened:\n"
+"The associated command failed"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
+#, 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 ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
+#, c-format
+msgid ""
+"The file '%s' is not in a format supported by FileZilla.\n"
+"Would you like to convert it into a supported format?"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp: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 ""
+
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+msgid "The file selected as default editor does not exist."
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:95
+msgid ""
+"The file you have selected contains site manager data from a previous "
+"version of FileZilla.\n"
+"Due to differences in the storage format, only host, port, username and "
+"password will be imported.\n"
+"Continue with the import?"
+msgstr ""
+
+#: ../../locales/../src/interface/listctrlex.cpp:761
+msgid "The filename column can neither be hidden nor moved."
+msgstr ""
+
+#: ../../locales/../src/interface/listctrlex.cpp:811
+msgid "The filename column cannot be hidden."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
+#, c-format
+msgid "The following character will be replaced: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
+#, c-format
+msgid "The following characters will be replaced: %s"
+msgstr ""
+
+#: resources.h:329
+msgid "The following files are currently being edited:"
+msgstr ""
+
+#: resources.h:464
+msgid "The free open source FTP solution"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
+msgid "The global bookmarks could not be saved."
+msgstr ""
+
+#: resources.h:985
+msgid ""
+"The higher the debug level, the more information will be displayed in the "
+"message log. Displaying debug information has a negative impact on "
+"performance."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
+msgid "The limit needs to be between 1 and 2000 MiB"
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:275
+#, c-format
+msgid ""
+"The local directory '%s' is not below the synchronization root (%s).\n"
+"Disable synchronized browsing and continue changing the local directory?"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
+msgid ""
+"The lowest available port has to be less or equal than the highest available "
+"port."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:608
+msgid ""
+"The most recent version has been downloaded. Click on Finish to close "
+"FileZilla and to start the installation."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:610
+msgid ""
+"The most recent version has been downloaded. Please install it the same way "
+"you installed this version."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1966
+msgid "The queue will not be saved."
+msgstr ""
+
+#: ../../locales/../src/interface/state.cpp:1022
+#, c-format
+msgid ""
+"The remote directory '%s' is not below the synchronization root (%s).\n"
+"Disable synchronized browsing and continue changing the remote directory?"
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:84
+msgid "The selected categories have been imported."
+msgstr ""
+
+#: resources.h:299
+msgid ""
+"The selected file contains importable data for the following categories:"
+msgstr ""
+
+#: resources.h:322
+msgid "The selected file is already being edited:"
+msgstr ""
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+msgid ""
+"The selected file is still opened in some other program, please close it."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2054
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
+msgid ""
+"The selected file would be executed directly.\n"
+"This can be dangerous and damage your system.\n"
+"Do you really want to continue?"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager.cpp:602
+msgid "The server could not be added."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:574
+msgid "The server sent an unexpected or unrecognized reply."
+msgstr ""
+
+#: resources.h:106
+msgid "The server uses following charset encoding for filenames:"
+msgstr ""
+
+#: resources.h:2
+msgid ""
+"The server's certificate is unknown. Please carefully examine the "
+"certificate to make sure the server can be trusted."
+msgstr ""
+
+#: resources.h:188
+msgid ""
+"The server's host key does not match the key that has been cached. This "
+"means that either the administrator has changed the host key, or you are "
+"actually trying to connect to another computer pretending to be the server."
+msgstr ""
+
+#: resources.h:176
+msgid ""
+"The server's host key is unknown. You have no guarantee that the server is "
+"the computer you think it is."
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:81
+msgid ""
+"The settings have been imported. You have to restart FileZilla for all "
+"settings to have effect."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:3224
+msgid "The system will soon reboot unless you click Cancel."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:3222
+msgid "The system will soon shut down unless you click Cancel."
+msgstr ""
+
+#: resources.h:48
+msgid ""
+"The target file already exists.\n"
+"Please choose an action."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
+msgid "The test did not succeed. Do you really want to save the settings?"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:127
+msgid "Themes"
+msgstr "Темалар"
+
+#: ../../locales/../src/interface/filter.cpp:462
+msgid "This filter set cannot be removed."
+msgstr ""
+
+#: ../../locales/../src/interface/filter.cpp:397
+msgid "This filter set cannot be renamed."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:575
+msgid ""
+"This means that some router and/or firewall is still interfering with "
+"FileZilla."
+msgstr ""
+
+#: resources.h:705
+msgid ""
+"This only works if you are not behind a router, else your system would just "
+"return your internal address."
+msgstr ""
+
+#: resources.h:683
+msgid ""
+"This wizard will help you to properly configure any routers and firewalls "
+"you have and tests your configuration."
+msgstr ""
+
+#: ../../locales/../src/interface/queue.cpp:1222
+msgid "Time"
+msgstr "Убакыт"
+
+#: resources.h:903
+msgid "Time formatting"
+msgstr ""
+
+#: resources.h:744
+msgid "Time&out in seconds:"
+msgstr ""
+
+#: resources.h:747 ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
+msgid "Timeout"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1703
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
+#, c-format
+msgid ""
+"Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
+"seconds."
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
+msgid "Title:"
+msgstr "Ат:"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2371
+msgid "To compare directories, both file lists have to be aligned."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:2372
+msgid "To do this, the directory trees need to be both shown or both hidden."
+msgstr ""
+
+#: resources.h:798
+msgid ""
+"To support public key authentication, FileZilla needs to know the private "
+"keys to use."
+msgstr ""
+
+#: resources.h:1010
+msgid ""
+"Toggle directory comparison. Right-click to change comparison mode.\n"
+"\n"
+"Colors:\n"
+"Yellow: File only exists on one side\n"
+"Green: File is newer than the unmarked file on other side\n"
+"Red: File sizes different"
+msgstr ""
+
+#: resources.h:1012
+msgid ""
+"Toggle synchronized browsing.\n"
+"If enabled, navigating the local directory hierarchy will also change the "
+"directory on the server accordingly and vice versa."
+msgstr ""
+
+#: resources.h:1000 resources.h:1001
+msgid "Toggles processing of the transfer queue"
+msgstr ""
+
+#: resources.h:992 resources.h:993
+msgid "Toggles the display of the local directory tree"
+msgstr ""
+
+#: resources.h:990 resources.h:991
+msgid "Toggles the display of the message log"
+msgstr ""
+
+#: resources.h:994 resources.h:995
+msgid "Toggles the display of the remote directory tree"
+msgstr ""
+
+#: resources.h:996 resources.h:997
+msgid "Toggles the display of the transfer queue"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:605
+msgid "Too long header line"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:666
+msgid "Too many redirects"
+msgstr ""
+
+#: ../../locales/../src/engine/logging.cpp:216
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
+msgid "Trace:"
+msgstr ""
+
+#: resources.h:933 resources.h:939
+msgid "Transfer"
+msgstr "Берүү"
+
+#: resources.h:362
+msgid "Transfer &direction"
+msgstr "Берүү &багыты"
+
+#: resources.h:535
+msgid "Transfer &type"
+msgstr "Берүү &түрү"
+
+#: resources.h:754
+msgid "Transfer Mode"
+msgstr "Берүү режими"
+
+#: resources.h:889
+msgid "Transfer Queue"
+msgstr ""
+
+#: resources.h:98
+msgid "Transfer Settings"
+msgstr "Берүүнүн ырастоолору"
+
+#: ../../locales/../src/engine/transfersocket.cpp:497
+#: ../../locales/../src/engine/transfersocket.cpp:521
+#, c-format
+msgid "Transfer connection interrupted: %s"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:621
+msgid "Transferred data got tainted."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1493
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
+msgid "Transferring"
+msgstr "Берүү"
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:123
+msgid "Transfers"
+msgstr "Берүүлөр"
+
+#: ../../locales/../src/interface/QueueView.cpp:3138
+#: ../../locales/../src/interface/QueueView.cpp:3141
+msgid "Transfers finished"
+msgstr ""
+
+#: resources.h:845
+msgid "Treat files &without extension as ASCII file"
+msgstr ""
+
+#: resources.h:841
+msgid "Treat the &following filetypes as ASCII files:"
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
+msgid "Trust changed Hostkey:"
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
+msgid "Trust new Hostkey:"
+msgstr ""
+
+#: resources.h:195
+msgid "Trust the new key and carry on connecting?"
+msgstr ""
+
+#: resources.h:22
+msgid "Trust this certificate and carry on connecting?"
+msgstr ""
+
+#: resources.h:182
+msgid "Trust this host and carry on connecting?"
+msgstr ""
+
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
+msgid "Type"
+msgstr "Түр"
+
+#: resources.h:780
+msgid "Type of FTP Proxy:"
+msgstr "FTP проксинин түрү:"
+
+#: resources.h:805
+msgid "Type of generic proxy:"
+msgstr "Базалык проксинин түрү:"
+
+#: resources.h:332
+msgid "U&pload"
+msgstr "Жү&ктөө"
+
+#: resources.h:485 resources.h:825
+#, no-c-format
+msgid "U&pload limit:"
+msgstr ""
+
+#: resources.h:951
+msgid "U&se filetype associations if available"
+msgstr ""
+
+#: resources.h:904
+msgid "U&se system defaults"
+msgstr ""
+
+#: resources.h:782
+msgid "USER@&HOST"
+msgstr "КОЛДОНУУЧУ@&ХОСТ"
+
+#: ../../locales/../src/engine/proxy.cpp:454
+#, c-format
+msgid "Unassigned error code %d"
+msgstr ""
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
+msgid "Unit:"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
+msgid "Unknown"
+msgstr "Белгисиз"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+msgid "Unknown FTP proxy type, cannot generate login sequence."
+msgstr ""
+
+#: ../../locales/../src/engine/proxy.cpp:368
+#, c-format
+msgid "Unknown SOCKS protocol version: %d"
+msgstr ""
+
+#: resources.h:1
+msgid "Unknown certificate"
+msgstr "Белгисиз сертификат"
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
+msgid ""
+"Unknown error opening the file. Make sure the file can be accessed and is a "
+"well-formed XML document."
+msgstr ""
+
+#: resources.h:175
+msgid "Unknown host key"
+msgstr "Белгисиз хост ачкычы"
+
+#: ../../locales/../src/engine/proxy.cpp:378
+#, c-format
+msgid ""
+"Unknown protocol version of SOCKS Username/Password Authentication "
+"subnegotiation: %d"
+msgstr ""
+
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
+msgid ""
+"Unknown root element, the file does not appear to be generated by FileZilla."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:596
+#: ../../locales/../src/interface/netconfwizard.cpp:607
+msgid ""
+"Unless these problems get fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:583
+msgid ""
+"Unless this problem gets fixed, active mode FTP will not work and passive "
+"mode has to be used."
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:909
+msgid "Unsupported certificate type"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:650
+msgid "Unsupported redirect"
+msgstr ""
+
+#: resources.h:333
+msgid "Up&load and unedit"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Update Check"
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
+#: ../../locales/../src/interface/updatewizard.cpp:252
+#: ../../locales/../src/interface/updatewizard.cpp:265
+msgid "Update wizard"
+msgstr ""
+
+#: resources.h:364
+msgid "Upload"
+msgstr "Жүктөө"
+
+#: ../../locales/../src/interface/edithandler.cpp:1256
+msgid "Upload failed"
+msgstr "Жүктөө оңунан чыккан жок"
+
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
+msgid "Upload limit: %s/s"
+msgstr "Жүктөө лимити: %s/s"
+
+#: ../../locales/../src/interface/statusbar.cpp:611
+msgid "Upload limit: none"
+msgstr "Жүктөө лимити: жок"
+
+#: resources.h:660
+msgid "Upload selected directory"
+msgstr ""
+
+#: resources.h:566
+msgid "Upload selected files and directories"
+msgstr ""
+
+#: resources.h:317
+msgid "Upload this file back to the server?"
+msgstr ""
+
+#: resources.h:316
+msgid "Upload this file to the server?"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
+msgid "Uploading"
+msgstr "Жүктөө"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
+msgid "Uploading and pending removal"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
+msgid "Uploading and unediting"
+msgstr ""
+
+#: resources.h:110
+msgid "Use &custom charset"
+msgstr ""
+
+#: resources.h:948
+msgid "Use &custom editor:"
+msgstr ""
+
+#: resources.h:423
+msgid "Use &default editor for text files"
+msgstr ""
+
+#: resources.h:406 resources.h:412
+msgid "Use &synchronized browsing"
+msgstr "&Синхрондоштурулган көрүүнү колдонуу"
+
+#: resources.h:108
+msgid "Use UTF-8 if the server supports it, else use local charset."
+msgstr ""
+
+#: resources.h:259 resources.h:269
+msgid "Use default action"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Жөнөкөй FTP'ни колдонуу"
+
+#: resources.h:372
+msgid "Use server currently connected to"
+msgstr ""
+
+#: resources.h:373
+msgid "Use server from site manager"
+msgstr ""
+
+#: resources.h:898
+msgid "Use system &defaults"
+msgstr "&Жарыяланбас ырастоолорду колдонуу"
+
+#: resources.h:706
+msgid "Use the following IP address:"
+msgstr ""
+
+#: resources.h:716
+msgid "Use the following port range:"
+msgstr ""
+
+#: resources.h:701
+msgid "Use the server's external IP address instead"
+msgstr ""
+
+#: resources.h:707 resources.h:770
+msgid ""
+"Use this if you're behind a router and have a static external IP address."
+msgstr ""
+
+#: resources.h:710
+msgid ""
+"Use this option if you have a dynamic IP address. FileZilla will contact the "
+"above server once each session as soon as you use active mode for the first "
+"time. Only the version of FileZilla you're using is submitted to the server."
+msgstr ""
+
+#: resources.h:122
+msgid "User:"
+msgstr "Колдонуучу:"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+msgid "Username cannot be a series of spaces"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4433
+#, c-format
+msgid "Using proxy %s"
+msgstr "%s проксиси колдонулуп жатат"
+
+#: resources.h:112
+msgid ""
+"Using the wrong charset can result in filenames not displaying properly."
+msgstr ""
+
+#: resources.h:232
+msgid "Using this wizard you can check for available updates to FileZilla."
+msgstr ""
+
+#: resources.h:5 resources.h:29
+msgid "Valid from:"
+msgstr ""
+
+#: resources.h:6 resources.h:30
+msgid "Valid to:"
+msgstr ""
+
+#: ../../locales/../src/interface/cmdline.cpp:16
+msgid "Verbose log messages from wxWidgets"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:1099
+msgid "Verifying certificate..."
+msgstr "Сертификатты текшерүү..."
+
+#: resources.h:170
+msgid "Version:"
+msgstr "Версия:"
+
+#: resources.h:830
+msgid "Very high"
+msgstr ""
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1436
+msgid "View hidden option set, but unsupported by server"
+msgstr ""
+
+#: resources.h:935
+msgid "View/Edit"
+msgstr "Көрүү/Оңдоо"
+
+#: resources.h:356
+msgid "Visible columns"
+msgstr ""
+
+#: resources.h:140
+msgid "W&rite"
+msgstr "Ж&азуу"
+
+#: ../../locales/../src/interface/QueueView.cpp:1792
+msgid "Waiting"
+msgstr "Күтүү"
+
+#: ../../locales/../src/interface/QueueView.cpp:1400
+msgid "Waiting for browsing connection"
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1443
+msgid "Waiting for password"
+msgstr ""
+
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
+msgid "Waiting for transfer to be cancelled"
+msgstr ""
+
+#: ../../locales/../src/engine/engineprivate.cpp:203
+msgid "Waiting to retry..."
+msgstr "Кайталоону күтүүдө..."
+
+#: ../../locales/../src/interface/FileZilla.cpp:297
+msgid ""
+"Warning!\n"
+"\n"
+"A bug in Windows causes problems with FileZilla\n"
+"\n"
+"The bug occurs if you have\n"
+"- Windows Server 2003 or XP 64\n"
+"- Windows Firewall enabled\n"
+"- Application Layer Gateway service enabled\n"
+"See http://support.microsoft.com/kb/931130 for background information.\n"
+"\n"
+"Unless you either disable Windows Firewall or the Application Layer Gateway "
+"service,\n"
+"FileZilla will timeout on big transfers."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:972
+msgid "Warning, ignoring data connection from wrong IP."
+msgstr ""
+
+#: ../../locales/../src/interface/updatewizard.cpp:265
+msgid ""
+"Warning, use nightly builds at your own risk.\n"
+"No support is given for nightly builds.\n"
+"Nightly builds may not work as expected and might even damage your system.\n"
+"\n"
+"Do you really want to check for nightly builds?"
+msgstr ""
+
+#: resources.h:187
+msgid "Warning: Potential security breach!"
+msgstr ""
+
+#: resources.h:476
+msgid "Welcome to FileZilla"
+msgstr "FileZilla'га кош келиңиз"
+
+#: resources.h:465
+msgid "What's new"
+msgstr "Эмне жаңылык бар"
+
+#: resources.h:242
+msgid "What's new:"
+msgstr "Эмне жаңылык бар:"
+
+#: resources.h:492
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:833
+msgid ""
+"When enabled, characters that are not supported by the local operating "
+"system in filenames are replaced if downloading such a file."
+msgstr ""
+
+#: resources.h:875
+msgid "Widescreen"
+msgstr ""
+
+#: resources.h:491
+msgid "Would you like FileZilla to remember passwords?"
+msgstr ""
+
+#: resources.h:144
+msgid "Wr&ite"
+msgstr "Жа&зуу"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:433
+#: ../../locales/../src/interface/netconfwizard.cpp:440
+msgid "Wrong external IP address"
+msgstr ""
+
+#: ../../locales/../src/engine/httpcontrolsocket.cpp:827
+msgid "Wrong line endings"
+msgstr "Туура эмес сап аяктары"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+msgid "Yes"
+msgstr "Ооба"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+
+#: resources.h:253
+msgid ""
+"You are already using the most recent version of FileZilla. Please check "
+"again in future."
+msgstr ""
+
+#: resources.h:474
+msgid "You can always open this dialog again through the help menu."
+msgstr "Сиз дайыма бул терезени жардам менюсунан кайта ачсаңыз болот."
+
+#: ../../locales/../src/engine/server.cpp:63
+msgid "You can leave the port field empty to use the default port."
+msgstr ""
+
+#: resources.h:147
+msgid ""
+"You can use an x at any position to keep the permission the original files "
+"have."
+msgstr ""
+
+#: ../../locales/../src/interface/import.cpp:28
+msgid "You cannot import settings from FileZilla's own settings directory."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
+msgid ""
+"You cannot replace an invalid character with another invalid character. "
+"Please enter a character that is allowed in filenames."
+msgstr ""
+
+#: ../../locales/../src/interface/asyncrequestqueue.cpp:268
+msgid "You did not enter a new name for the file. Overwrite the file instead?"
+msgstr ""
+
+#: resources.h:455
+msgid "You have selected at least one symbolic link."
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2021
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+msgid ""
+"You have selected more than 10 files for editing, do you really want to "
+"continue?"
+msgstr ""
+
+#: ../../locales/../src/interface/LocalListView.cpp:2141
+msgid ""
+"You have selected more than 10 files or directories to open, do you really "
+"want to continue?"
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+msgid "You have to enter a hostname."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:818
+msgid "You have to enter a local directory."
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:149
+#: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
+msgid "You have to enter a valid IP address."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:824
+msgid "You have to enter a writable local directory."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+msgid "You have to enter an account name"
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+msgid "You have to specify a user name"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:622
+msgid ""
+"You likely have a router or firewall which erroneously modified the "
+"transferred data."
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
+msgid "You need to enter a name for the bookmark."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
+msgid "You need to enter a name for the log file."
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1640
+msgid "You need to enter a properly quoted command."
+msgstr ""
+
+#: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
+msgid "You need to enter a proxy host."
+msgstr "Прокси хостун киргизишиңиз керек."
+
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
+msgid "You need to enter a proxy port in the range from 1 to 65535"
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+msgid "You need to enter at least one path, empty bookmarks are not supported."
+msgstr ""
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+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:1063
+msgid ""
+"You need to enter both a local and a remote path to enable synchronized "
+"browsing for this site."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:316
+msgid "You need to specify a local file."
+msgstr "Жердик файлды көрсөтүүгө зарыл."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:336
+msgid "You need to specify a remote file."
+msgstr "Алыскы файлды көрсөтүүгө зарыл."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:343
+msgid "You need to specify a remote path."
+msgstr "Алыскы жолду көрсөтүүгө зарыл."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:309
+msgid "You need to specify a server."
+msgstr "Серверди көрсөтүүгө зарыл."
+
+#: ../../locales/../src/interface/netconfwizard.cpp:568
+msgid ""
+"You should have no problems connecting to other servers, file transfers "
+"should work properly."
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "after"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+msgid "begins with"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+msgid "contains"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+msgid "does not contain"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+msgid "ends with"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+msgid "equals"
+msgstr ""
+
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
+msgid "file"
+msgstr "файл"
+
+#: ../../locales/../src/interface/edithandler.cpp:88
+msgid "fz3temp-lockfile"
+msgstr "fz3temp-lockfile"
+
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
+#: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
+msgid ""
+"fzputtygen could not be started.\n"
+"Please make sure this executable exists in the same directory as the main "
+"FileZilla executable."
+msgstr ""
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
+msgid "fzsftp could not be started"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:947
+msgid "gnutls_certificate_get_peers returned no certificates"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+msgid "greater than"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+msgid "group executable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+msgid "group readable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+msgid "group writeable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+msgid "is equal to"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+msgid "is set"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+msgid "is unset"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+msgid "less than"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+msgid "matches regex"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+msgid "owner executable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+msgid "owner readable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+msgid "owner writeable"
+msgstr ""
+
+#: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
+msgid "unknown"
+msgstr "белгисиз"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+msgid "world executable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+msgid "world readable"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+msgid "world writeable"
+msgstr ""
+
+#: resources.h:165
+msgid "wxWidgets:"
+msgstr "wxWidgets:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d КБ/сек)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d МБ/сек)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s байт (%d.%d КБ/сек)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s байт (%d.%d МБ/сек)"
diff -Nru filezilla-3.5.3/locales/lt_LT.po filezilla-3.7.3~precise/locales/lt_LT.po
--- filezilla-3.5.3/locales/lt_LT.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/lt_LT.po	2013-04-29 03:30:05.000000000 +0000
@@ -1,42 +1,47 @@
 # translation of lt_LT_updated.po to Lithuanian
-# 
+#
 # Darius Žitkevičius <skystis@splius.lt>, 2006.
 # Tomas Jakstas <bizabrazija@gmail.com>, 2008.
 # Darius Žitkevičius <skystis@gmail.lt>, 2008.
+# Algimantas Margevičius <margevicius.algimantas@gmail.com>, 2012.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: lt_LT_updated\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2010-11-03 15:55+0200\n"
-"Last-Translator: \n"
-"Language-Team: Lithuanian <kde-i18n-doc@kde.org>\n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2012-10-27 11:37+0300\n"
+"Last-Translator: Algimantas Margevičius <margevicius.algimantas@gmail.com>\n"
+"Language-Team: Lietuvių <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Generator: Lokalize 1.0\n"
-"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
-"100<10 || n%100>=20) ? 1 : 2);\n"
+"Language: \n"
+"X-Poedit-Language: Lithuania\n"
+"X-Poedit-Country: LITHUANIA\n"
 "X-Poedit-SourceCharset: utf-8\n"
+"Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && (n%"
+"100<10 || n%100>=20) ? 1 : 2)\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S praėjo"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S liko"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
 msgstr ""
-"%a - Paskyra (Linijos turinčios šitai bus neįtrauktos jeigu nebus naudojamas "
-"Paskyros prisijungimo tipas)"
+"%a - Paskyra (Jei nebus naudojamas Paskyros prisijungimo tipas, eilutės "
+"turinčios tai nebus įtrauktos)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
@@ -46,47 +51,47 @@
 msgid_plural "%d directories"
 msgstr[0] "%d aplankas"
 msgstr[1] "%d aplankai"
-msgstr[2] "%d aplankai"
+msgstr[2] "%d aplankų"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
-msgstr[0] "%d katalogas su savo turiniu"
-msgstr[1] "%d katalogai su savo turiniu"
-msgstr[2] "%d katalogai su savo turiniu"
+msgstr[0] "%d aplankas su savo turiniu"
+msgstr[1] "%d aplankai su savo turiniu"
+msgstr[2] "%d aplankų su savo turiniu"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
 msgstr[0] "%d failas"
 msgstr[1] "%d failai"
-msgstr[2] "%d failai"
+msgstr[2] "%d failų"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] "%d failas. Visas dydis: %s"
-msgstr[1] "%d failai. Visas dydis: %s"
-msgstr[2] "%d failai. Visas dydis: %s"
+msgstr[0] "%d failas. Bendras dydis: %s"
+msgstr[1] "%d failai. Bendras dydis: %s"
+msgstr[2] "%d failų. Bendras dydis: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] "%d failas. Visas dydis: Bent %s"
-msgstr[1] "%d failai. Visas dydis: Bent %s"
-msgstr[2] "%d failai. Visas dydis: Bent %s"
+msgstr[0] "%d failas. Bendras dydis: Bent %s"
+msgstr[1] "%d failai. Bendras dydis: Bent %s"
+msgstr[2] "%d failų. Bendras dydis: Bent %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d failai pridėti į eilę"
@@ -99,31 +104,21 @@
 msgstr[1] "%d sekundės"
 msgstr[2] "%d sekundžių"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Serveris"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Slaptažodis"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, fuzzy, c-format
+msgid "%s (%s/s)"
 msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -138,20 +133,20 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Dar negalioja!"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
-msgstr "%s - Įgaliotasis vartotojas"
+msgstr "%s - Tarpinio serverio naudotojas"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
-msgstr "%s ir %s. Visas dydis: %s"
+msgstr "%s ir %s. Bendras dydis: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
-msgstr "%s ir %s. Visas dydis: Bent %s"
+msgstr "%s ir %s. Bendras dydis: Bent %s"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:31
 #, c-format
@@ -159,29 +154,19 @@
 msgid_plural "%s bytes"
 msgstr[0] "%s baitas"
 msgstr[1] "%s baitai"
-msgstr[2] "%s baitai"
+msgstr[2] "%s baitų"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s baitai"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
+#: ../../locales/../src/interface/updatewizard.cpp:902
+#, fuzzy, c-format
+msgid "%s bytes (%s/s)"
 msgstr "%s baitai (%d B/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s baitai (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s baitai (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -190,12 +175,12 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
-"%s nerastas. Be šito FileZilla komponento, SFTP neveiks.\n"
+"%s nerastas. Be šio FileZilla komponento, SFTP neveiks.\n"
 "\n"
-"Prašau atsisiųsti FileZilla dar karta. Jei ši problema kartosis,prašau "
-"pateikti klaidos pranešimą."
+"Prašau atsisiųsti FileZilla dar kartą. Jei ši problema kartosis, praneškite "
+"apie klaidą."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -205,815 +190,820 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"%s nerastas. Be šito FileZilla komponento, SFTP neveiks.\n"
+"%s nerastas. Be šio FileZilla komponento, SFTP neveiks.\n"
 "\n"
 "Galimi sprendimai:\n"
-"–Įsitikinkite, kad %s yra aplanke pažymėtame jūsų PATH aplinkos "
+"- Įsitikinkite, kad %s yra aplanke pažymėtame jūsų PATH aplinkos "
 "kintamajame.\n"
-"–Nustatykite visą kelią iki %s FZ_FZSFTP aplinkos kintamajame."
+"- Nustatykite visą kelią iki %s, FZ_FZSFTP aplinkos kintamajame."
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s su %d bitais"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
-msgstr "%u - Vartotojo vardas"
+msgstr "%u - Naudotojo vardas"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
-msgstr "%w - Įgaliotasis slaptažodis"
+msgstr "%w - Tarpinio serverio slaptažodis"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "&Apie..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
 msgstr "Pask&yra:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Aktyvi veiksena"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
-msgstr "&Pridėti žymeklį..."
+msgstr "&Pridėti žymelę..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "&Pridėti failus į eilę"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "&Pridėti raktinį failą..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "&Pridėti į eilę"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "&Pritaikyti serverio laiko juostos poslinkį:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "&Ateityje visada pasitikėti sertifikatu."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
-msgstr "&Visada pasitikėti šiuo serveriu, pridėti šį raktą į talpyklę"
+msgstr "&Visada pasitikėti šiuo serveriu, pridėti šį raktą į podėlį"
 
-#: resources.h:940
+#: resources.h:960
 msgid "&Always use default editor"
-msgstr "Visada n&audoti numatyt"
+msgstr "Visada n&audoti numatytąjį redaktorių"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
-msgstr "&Visada naudoti pasirinkimą neasocijuotiems failams"
+msgstr "&Nesusietiems failams, visada naudoti pasirinkimą"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "Visada n&audoti šį veiksmą"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
-msgstr "&Paprašyti operacinės sistemos, kad suteiktu išorinį IP adresą"
+msgstr "&Paprašyti operacinės sistemos, kad suteiktų išorinį IP adresą"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
-msgstr "&Autodetect"
+msgstr "Nustatyti &automatiškai"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Dvejetainis"
 
-#: resources.h:900
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 "&Dvejetainiai priešdėliai naudojant SI simbolius. (pvz. 1 KB = 1024 baitų)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
-msgstr "&Žymekliai"
+msgstr "Ž&ymelės"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Naršyti..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
-msgstr "&Išsiveržimų tolerancija:"
+msgstr "&Pliūpsnių tolerancija:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "&Atšaukti"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Tikrinti ar yra FileZilla beta versijų"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
-msgstr "&Pašalinti privačius duomenis..."
+msgstr "&Išvalyti privačius duomenis..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
-msgstr "&Uždaryti FileZilla"
+msgstr "&Užverti FileZilla"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
-msgstr "&Konfigūruoti greičio limitus..."
+msgstr "&Konfigūruoti greičio ribas..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Konfigūruoti..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Prisijungti"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "K&opijuoti"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopijuoti šį prisijungimą į Serverių tvarkyklę..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
-msgstr "&Kopijuoti į talpyklę"
+msgstr "&Kopijuoti į iškarpinę"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Lūžti"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "&Sukurti aplanką"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "&Sukurti naują kortelę"
 
 #: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
-msgstr "&Derinti"
+msgstr "&Derinimas"
 
-#: resources.h:967
+#: resources.h:991
 msgid "&Debug information in message log:"
-msgstr "&Derinimo informacija žinutės žurnale:"
+msgstr "&Derinimo informacija pranešimų žurnale:"
 
-#: resources.h:933
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Numatytasis redaktorius:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "&Numatytasis failo egzistavimo veiksmas..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Delsimas tarp nepavykusių prisijungimų:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
-msgstr "I&štrinti"
+msgstr "&Pašalinti"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
-msgstr "&Ištrinti simbolinę nuorodą"
+msgstr "&Pašalinti simbolinę nuorodą"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Aplankų palyginimai"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
-msgstr "&Atsikratyti lokalaus failo, tada atsisiųsti ir redaguoti iš naujo"
+msgstr "&Atsikratyti vietinio failo, tada atsisiųsti ir redaguoti iš naują"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "&Atsijungti"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "&Atsijungti nuo serverio"
 
-#: resources.h:876
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Rodyti trumpalaikį perdavimo greitį, užuot rodžius vidutinį greitį"
 
-#: resources.h:898
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Rodyti dydį baitais"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "&Neprisiminti slaptažodžių"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
-msgstr "&Daugiau nerodyti šito lango."
+msgstr "&Daugiau nerodyti šio lango."
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "&Nenaudoti išorinio IP adreso vietiniams prisijungimams."
 
-#: resources.h:920
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "&Dvigubo paspaudimo veiksmas failams:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
-msgstr "&Gauti"
+msgstr "&Atsisiųsti"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
-msgstr "&Gauti į:"
+msgstr "&Atsiųsti į:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
-msgstr "&Gauti..."
+msgstr "&Atsisiųsti..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
-msgstr "&Siuntiniai:"
+msgstr "&Atsiuntimai:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
-msgstr "&Redaguoti"
+msgstr "&Keisti"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
-msgstr "&Redaguoti filtrų taisykles..."
+msgstr "&Keisti filtrų taisykles..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Leisti"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Leisti automatiškai tikrinti atnaujimus"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "&Įjungti greičio ribas"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "&Koduotė:"
 
-#: resources.h:82
-#, fuzzy
+#: resources.h:90
 msgid "&Encryption:"
-msgstr "Kodavimas"
+msgstr "&Šifravimas:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
-msgstr "Į&vesti kitą komandą..."
+msgstr "Į&veskite pasirinktinę komandą..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
-msgstr "&Išimtis"
+msgstr "&Vykdyti"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Eksportuoti serverių įrašus"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "&Eksportuoti..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Sugrįžti į aktyvią veikseną"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Failas"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Failo atributai..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "&Failo prieigos teisės..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Failas:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "&Filtro sąlygos:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Paruošti filtrai:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Filtrai:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
-msgstr "&Užbaigti"
+msgstr "&Baigti"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
-msgstr "&Užbaigti redagavimą ir ištrinti lokalų failą"
+msgstr "&Užbaigti redagavimą ir ištrinti vietinį failą"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "&Išlyginti nuotolinius kelius, atsiųsti visus ten esančius failus tiesiai į "
-"paskirties vietos katalogą"
+"paskirties vietos aplanką"
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
-msgstr "&Sekti simbolinę nuorodą, ištrinti paskirties vietos katalogo turinius"
+msgstr "&Sekti simbolinę nuorodą, ištrinti paskirties vietos aplanko turinį"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
-msgstr "&Gauti išorinį IP adresą iš kito URL:"
+msgstr "&Gauti išorinį IP adresą iš šio URL:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Pagalba..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
-msgstr "&Bendrasis žymeklis"
+msgstr "&Bendroji žymelė"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 naudojant CONNECT metodą"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
-msgstr "&Pagalba"
+msgstr "&Žinynas"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Slėpti identiškus failus"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Didžiausias"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
-msgstr "&Didžiausias galimas prievadas:"
+msgstr "&Aukščiausias galimas prievadas:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Serveris:"
 
-#: resources.h:899
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC dvejetainiai priešdėliai (pvz. 1 KiB = 1024 baitų)"
 
-#: resources.h:887
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (pavyzdys: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Importuoti..."
 
-#: resources.h:942
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "&Paveldėti sistemos failų tipų susiejimus"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
-msgstr "&Išlaikyti nuotolinio kelio struktūrą susijusią su paieškos šaknimi"
+msgstr ""
+"&Išlaikyti nuotolinio kelio struktūrą atitinkamą paieškos šakniniam aplankui"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
-msgstr "&Failų ir apvalkų išdėstymo polangiai:"
+msgstr "&Failų ir aplankų išdėstymo polangiai:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
-msgstr "&Riboti vietinių FileZilla naudojamų prievadų skaičių"
+msgstr "&Riboti vietinių FileZilla prievadų skaičių"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "&Riboti lygiagrečių prisijungimų skaičių"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "&Vietinių aplankų medis"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
-msgstr "&Vietinis katalogas:"
+msgstr "&Vietinis aplankas:"
 
-#: resources.h:957
+#: resources.h:981
 msgid "&Log to file"
 msgstr "&Registruoti į failą"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
-msgstr "&Seanso pradžios tipas:"
+msgstr "&Prisijungimo tipas:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "&Prisijungimo tipas:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "Ž&emas"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
-msgstr "&Tvarkyti žymeklius..."
+msgstr "&Tvarkyti žymeles..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "&Rankinis siuntimas..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&Maksimalus prisijungimų skaičius:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Maksimalus bandymų skaičius:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
-msgstr "Ž&inutės registras"
+msgstr "&Pranešimų žurnalas"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Sumažinti į dėklą"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Pavadinimas:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
 msgstr "&Tinklo konfigūravimo vedlys..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "&Naujas"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "&Naujas serveris"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
-msgstr "&Nauja versija prieinama!"
+msgstr "&Prieinama nauja versija!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Kitas >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Ne"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Nėra"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "&Normalus"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Dienų skaičius tarp atnaujinimų patikrinimo:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Skaitinė reikšmė:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&Gerai"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&ATVERTI"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Atverti"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "Perra&šyti"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Pasyvus"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Slaptažodis:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "&Groti garsą"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "&Prievadas:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
-msgstr "&Žinutės registracijos vieta:"
+msgstr "P&ranešimų žurnalo vieta:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Išlaikyti failo laiko įspaudus"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "&Eilė"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
-msgstr "&Jungtis dabar"
+msgstr "&Greitas prisijungimas"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "&Greito prisijungimo juosta"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Skaityti"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
-msgstr "&Prisijungti"
+msgstr "Prisijungti iš &naujo"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
-msgstr "&Naujinti"
+msgstr "&Atnaujinti"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "&Atsiminti slaptažodį tik šiai sesijai"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+#, fuzzy
+msgid "&Remember passwords"
+msgstr "Prisiminti slaptažodį?"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
-msgstr "&Nutolęs katalogas:"
+msgstr "&Nutolęs aplankas:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Nutolęs kelias:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Pašalinti"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "&Pašalinti raktą"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
-msgstr "&Pažymėtus pašalinti"
+msgstr "&Pašalinti pažymėtus"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "Perva&dinti"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "&Pervardinti..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
-msgstr "&Atidaryti lokalų failą"
+msgstr "&Atverti vietinį failą"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
-msgstr "&Pakeisti netinkamus simbolius kartu su:"
+msgstr "&Pakeisti netinkamus simbolius į:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "Pranešti apie &klaidą..."
 
-#: resources.h:620
-#, fuzzy
+#: resources.h:640
 msgid "&Reset and requeue all"
-msgstr "Atstatyti pažymėtu failų būseną ir juos perkelti į eilę"
+msgstr "&Atstatyti ir visus perkelti į eilę"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "&Perkrauti konfigūravimo vedlį"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "&Tęsti"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "&Paleisti komandą..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
 msgstr "&Paleisti konfigūravimo vedlį..."
 
-#: resources.h:951
+#: resources.h:976
 msgid "&Run update check now..."
-msgstr "&Paleisti atnaujinimų patikrinimą dabar..."
+msgstr "&Paleisti atnaujinimų tikrinimą dabar..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&SERVERIS"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
-msgstr "&Įrašyti kaip..."
+msgstr "&Išsaugoti kaip..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
-msgstr "&Paieška"
+msgstr "&Ieškoti"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
-msgstr "Ieškoti nutolusių failų..."
+msgstr "&Ieškoti nutolusių failų..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
-msgstr "&Nurodykite elementą:"
+msgstr "&Pasirinkite elementą:"
 
-#: resources.h:931
+#: resources.h:951
 msgid "&Select language:"
 msgstr "&Pasirinkite kalbą:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "&Pasirinkite stulpelius kurie bus rodomi:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Serveris"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Nustatymai"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "&Nustatymai..."
 
-#: resources.h:966
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "&Rodyti derinimo meniu"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "&Rodyti pranešimą"
 
-#: resources.h:956
+#: resources.h:980
 msgid "&Show timestamps in message log"
-msgstr "&Rodyti žinutės registro laiko įspaudus"
+msgstr "&Pranešimų žurnale rodyti žinutės laiko įspaudus"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "&Serverių tvarkyklė..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
-msgstr "&Konkrečios vietos žymeklis"
+msgstr "&Konkrečios vietos žymelė"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "&Praleisti"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "&Greičio ribos"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "&Pradėti persiuntimą nedelsiant"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
-msgstr "&Sukeisti lokalius ir nuotolinius polangius"
+msgstr "&Sukeisti vietinius ir nuotolinius polangius"
+
+#: resources.h:637
+#, fuzzy
+msgid "&TLS Ciphers"
+msgstr "Šifras:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testas"
 
-#: resources.h:879
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
-msgstr "Siu&ntimas"
+msgstr "&Perdavimas"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
-msgstr "&Siuntimo būdas:"
+msgstr "P&erdavimo būdas:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
-msgstr "&Siuntimų eilė"
+msgstr "Perdavimų &eilė"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
-msgstr "&Taškinius failus interpretuoti kaip ASCII failus"
+msgstr "&Failus su tašku priekyje laikyti ASCII failais"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Atredaguoti"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Atnaujinti patalpintą šio serverio raktą"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Išsiųsti"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "&Išsiuntimai:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
-msgstr "&Naudoti pasirinktinę koduotę"
+msgstr "&Naudoti pasirinktinę programą"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "&Naudoti sinchronizuotą naršymą"
 
-#: resources.h:935
+#: resources.h:955
 msgid "&Use system's default editor for text files"
-msgstr "&Naudoti sistemos numatytąjį redaktorių tekstiniams failams."
+msgstr "&Tekstiniams failams naudoti sistemos numatytąjį redaktorių."
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
-msgstr "&Naudoti kitą IP adresą:"
+msgstr "&Naudoti šį IP adresą:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "&Vietoj to naudoti serverio išorinį IP adresą"
 
-#: resources.h:902
+#: resources.h:922
 msgid "&Use thousands separator"
-msgstr "&Naudoti skyriklį"
+msgstr "&Naudoti tūkstančių skirtuką"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
-msgstr "&Vartotojas:"
+msgstr "&Naudotojas:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
-msgstr "&Vartotojo vardas:"
+msgstr "&Naudotojo vardas:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versija %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "Ro&dymas"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Rodyti/Taisyti"
 
-#: resources.h:941
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr ""
-"&Peržiūrėti lokaliai redaguotus failus ir paraginti modifikacijų išsiuntimą"
+msgstr "&Peržiūrėti redaguotus failus ir paraginti išsiųsti keitimus"
 
-#: resources.h:136
+#: resources.h:972
+#, fuzzy
+msgid "&When checking for updates, check for:"
+msgstr "Ieškoma atnaujinimų"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Rašyti"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Taip"
 
@@ -1021,29 +1011,44 @@
 #: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "'%s' neegzistuoja ar negali būti prieitas."
+msgstr "„%s“ neegzistuoja arba neprieinamas."
 
 #: ../../locales/../src/engine/local_path.cpp:477
 #: ../../locales/../src/engine/local_path.cpp:498
 #: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' nėra katalogas."
+msgstr "„%s“ nėra aplankas."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "Prisiregistravimo tipas „Paskyra“ naudojant šį protokolą nepalaikomas"
+msgstr "Pasirinktas protokolas nepalaiko „Paskyros“ prisijungimo tipo"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+#, fuzzy
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"FileZilla paleista „kiosk“ veiksenoje.\n"
+"„Normali“ ir „Paskyra“ prisijungimo tipai nepalaikomi šioje veiksenoje."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"paprastai „citata“ yra vietinė komanda naudojama komandinės eilutės klientų, "
-"siųsti argumentus sekant \"citata\" serveriui. Jus galite norėti įvesti "
-"neapdorotą komandą be priekinių \"citatų\"."
+"paprastai „citata“ yra vietinė komanda, kurią naudojo komandinės eilutės "
+"klientai perduoti argumentus serveriui. Gali būti jog norėsite įvesti "
+"komandą be priekį esančio „citata“."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
@@ -1052,141 +1057,137 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d prafiltruotas objektas)"
 msgstr[1] "(%d prafiltruoti objektai)"
-msgstr[2] "(%d prafiltruoti objektai)"
+msgstr[2] "(%d prafiltruotų objektų)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
-msgstr "(0 nelimituojama)"
+msgstr "(0 be ribos)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekundės)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 neleisti)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Bent jau 7 dienas)"
-
-#: resources.h:895
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(pavyzdys: %H:%M)"
 
-#: resources.h:889
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(pavyzdys: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
-msgstr "(į %s/s)"
+msgstr "(%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S liko"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- liko"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
-msgstr "- Neveikia maršruto parinktuvas ir/ar užkarda"
+msgstr "- Neveikia maršrutizatorius ir/ar ugniasienė"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
-msgstr "- Failas pažeistas dėl atspindžio"
+msgstr "- Atspindyje failas pažeistas"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
-msgstr "- Kenkimo programinė įranga jūsų sistemoje"
+msgstr "- Jūsų sistemoje kenkėjiška įranga"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- liko"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c negali būti naudojamas kartu su FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
-msgstr "-Aš galiu būti naudojamas kartu tik su FTP URL."
+msgstr "-l gali būti naudojamas tik kartu su FTP URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s ir -c negali būti naudojami tuo pačiu metu."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s negali būti naudojamas kartu su FTP URL."
 
-#: resources.h:968
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Nėra"
 
-#: resources.h:969
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Įspėjimas"
 
-#: resources.h:970
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Informacija"
 
-#: resources.h:971
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Išsamesnė"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 bitų sistema"
 
-#: resources.h:972
+#: resources.h:996
 msgid "4 - Debug"
-msgstr "4 - Derinti"
+msgstr "4 - Derinimas"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 bitų sistema"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Atgal"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
-msgstr ""
-"Žymeklis su įvestu vardu jau yra. Prašome įvesti nepanaudotą pavadinimą:"
+msgstr "Žymelė su įvestu vardu jau yra. Prašome įvesti nenaudojamą pavadinimą:"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Reikia nustatyti numatytąjį redaktorių."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
-msgstr "Katalogas negali būti nutemptas į vieną iš savo pakatalogių."
+msgstr "Aplankas negali būti nutemptas į vieną iš savo poaplankių."
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1197,31 +1198,30 @@
 "veiksenoje, FileZilla atidaro prievadą ir prašo serverio prisijungti prie "
 "šio prievado."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Prieš tai atidarytas failas buvo pakeistas."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
-"Failas su tokiu pavadinimu jau redaguojamas. Ar norite iš naujo atidaryti '%"
-"s'?"
+"Failas su tokiu pavadinimu jau redaguojamas. Ar norite iš naujo atverti „%s“?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Failas su tokiu pavadinimu jau siunčiamas."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Failas su tokiu pavadinimu dar redaguojamas. Prašau jį uždaryti ir pabandyti "
-"vėliau."
+"dar kartą."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1229,26 +1229,26 @@
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
-"Lokalaus failo pavadinimas negali būti dešifruotas.\n"
-"Įsitikinkite kad LC_CTYPE (arba LC_ALL) aplinkos kintamieji nustatyti "
+"Vietinio failo pavadinimas negali būti dešifruotas.\n"
+"Įsitikinkite jog LC_CTYPE (arba LC_ALL) aplinkos kintamieji nustatyti "
 "teisingai.\n"
 "Kol neištaisysite šios problemos, failų sąrašuose gali trūkti elementų.\n"
 "Šioje sesijoje šis įspėjimas nebebus kartojamas."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Prieinama naujesnė FileZilla versija:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
-"Tinkamas serveris visada rodo visus failus, tačiau kai kurie sugede "
-"serveriai slepia failus nuo vartotojo. Šį punktą naudok norėdamas priversti "
-"serverį rodyti visus failus."
+"Tinkamas serveris visada rodo visus failus, tačiau kai kurie sugedę "
+"serveriai slepia failus nuo naudotojo. Šį punktą naudokite norėdami "
+"priversti serverį rodyti visus failus."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1262,78 +1262,77 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 "Nuotolinė operacija yra vykdoma ir įgalintas sinchronizuotasis naršymas.\n"
-"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio katalogo keitimą?"
+"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "P&ridėti"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "&Leisti atnaujinti ASCII failus"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
-msgstr "&Pritaikyti tik gavimams"
+msgstr "&Pritaikyti tik parsiuntimams"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "&Pritaikyti tik išsiuntimams"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "&Pritaikyti visiems failams ir aplankams"
 
-#: resources.h:627
-#, fuzzy
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "&Automatiškai pašalinti sėkmingus siuntimus"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
-msgstr "Nutraukiamas ankstesnis ryšys ir užmezgamas dabartinėje kortelėje."
+msgstr "Nutraukti ankstesnį ryšį ir užmegzti naują dabartinėje kortelėje"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "Apie FileZilla"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Virš failų sąrašo"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Paskyra"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Veiksmas po eilės &užbaigimo"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Veiksmas su pasirinktu failu:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Atlikti veiksmą:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "Veiksmas:"
 
@@ -1367,51 +1366,60 @@
 "adresą, tačiau jūsų maršrutizatorius ar ugniasienė klaidingai pakeitė "
 "išsiuntimo adresą."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "Aktyvios veiksenos IP"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "Pridėti failus tik į &eilę"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Pridėti pasirinktą aplanką į siuntimų eilę"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Pažymėtus failus ir aplankus pridėti į siuntimų eilę"
 
-#: resources.h:922 resources.h:928
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
-msgstr "Pridėti į &eilę"
+msgstr "Pridėti į eilę"
 
 #: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
 msgstr "Adreso tipas nepalaikomas"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Sudėtingiau"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Sudėtingesnės parinktys:"
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Algoritmas:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
-msgstr "Visi failai buvo sėkmingai perkelti"
+msgstr "Visi failai buvo sėkmingai perduoti"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "Visi portai turi būti tarp 1024 ir 65535."
+msgstr "Visi prievadai turi būti tarp 1024 ir 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, 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."
@@ -1419,145 +1427,147 @@
 msgstr[1] "Visi perdavimai buvo užbaigti. %d failai nebuvo perduoti."
 msgstr[2] "Visi perdavimai buvo užbaigti. %d failų nebuvo perduota."
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr "Leisti &sugrįžti į kitą siuntimo būdą įvykus klaidai"
+msgstr "Įvykus klaidai leisti &sugrįžti į kitą siuntimo būdą"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
-msgstr "Leisti sugrįžti į kitą siuntimo būdą įvykus klaidai"
+msgstr "Įvykus klaidai leisti sugrįžti į kitą siuntimo būdą"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Jau prisijungta"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
-"Alternatyvai jus galite naudotis Pageant įrankiu iš PuTTY, susikonfigūruoti "
-"savo raktus, FileZilla neatpažįsta Pageant."
+"FileZilla neapažįsta Pageant, bet raktų tvarkymui galite naudoti Pageant "
+"įrankį iš PuTTY."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
 msgstr ""
-"Alternatyviai jūs galite naudotis savo sistemos SSH agentu. Norėdami tai "
-"padaryti, įsitikinkite, kad SSH_AUTH_SOCK aplinkos kintamasis yra nustatytas."
+"Taipogi galite naudotis savo sistemos SSH agentu. Norėdami tai padaryti, "
+"įsitikinkite, kad SSH_AUTH_SOCK aplinkos kintamasis yra nustatytas."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
-"Alternatyvai, aplankykite http://filezilla-project.org atsisiųsti paskutinę "
-"versija."
+"Aplankykite http://filezilla-project.org ir atsisiųskite naujausią versiją."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
 "Some queue items might not have been restored."
 msgstr ""
+"Įkraunant perdavimų eilę iš „%s“ įvyko klaida.\n"
+"Kai kurių eilės elementų atstatyti nepavyko."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
 "Some queue items might not have been saved."
 msgstr ""
+"Saugant perdavimų eilę į „%s“ įvyko klaida.\n"
+"Kai kurių eilės elementų išsaugoti nepavyko."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
-msgstr ""
-"Elementas tokiu pat pavadinimu kaip vilktas elementas jau egzistuoja "
-"paskirties vietoje."
+msgstr "Elementas tokiu pavadinimu kaip atvilktas elementas jau egzistuoja."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonimiškai"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
-"Kita nuotolinė operacija jau yra vykdoma. Dabar negalima pakeisti katalogo."
+"Kita nuotolinė operacija jau yra vykdoma, šiuo metu pakeisti aplanko "
+"neįmanoma."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "Bet kokie pakeitimai padaryti serverių tvarkyklėje negali būti išsaugoti."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
 msgstr ""
-"Bet kokie pakeitimai padaryti \"Vietos tvarkytuvo\" nebus išsaugoti, nebent "
+"Bet kokie pakeitimai padaryti serverių tvarkyklėje nebus išsaugoti, nebent "
 "jūs pataisytumėte failą."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Bet kokie pakeitimai padaryti filtrams negali būti išsaugoti."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Bet kokia pakeitimai padaryti filtrams nebus išsaugoti."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "Pritaikyti &tik aplankams"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Pritaikyti"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Pritaikyti &tik šiai eilei"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "Pritaikyti &tik failams"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archyvas"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Kaip kortelė persiuntimų eilės langelyje"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
-msgstr "Klausti veiksmo"
+msgstr "Klausti ką daryti"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Klausti slaptažodžio"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
-msgstr "Paprašyti operacinės sistemos, kad suteiktu prievadą."
+msgstr "Paprašyti operacinės sistemos, kad suteiktų prievadą."
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
-msgstr "Paprašyti operacinės sistemos, kad suteiktu išorinį IP adresą"
+msgstr "Paprašyti operacinės sistemos, kad suteiktų išorinį IP adresą"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Klausti FileZilla forume"
 
@@ -1565,39 +1575,35 @@
 msgid "Associated program not found:"
 msgstr "Susieta programa nerasta:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Bent vienas sąlygos filtras yra neužbaigtas"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
-msgstr "Šioje vietoje visa konfigūracija buvo surinkta."
+msgstr "Šioje vietoje, visa konfigūracija buvo surinkta."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atributas"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
-msgstr "Patvirtinimas nepavyko."
+msgstr "Tapatybės patvirtinti nepavyko."
 
-#: resources.h:880
+#: resources.h:900
 msgid "Author:"
 msgstr "Autorius:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Automatinis failų tipų klasifikavimas"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Automatinis atnaujinimų patikrinimas"
-
-#: resources.h:884
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Prieinami dydžiai"
 
@@ -1606,242 +1612,247 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
-msgstr "A&peiti įgaliojimą"
+msgstr "A&peiti tarpinį serverį"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Pagrindinės naudojimo instrukcijos"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Elgsena"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Redaguojama"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
-msgstr ""
+msgstr "Lyginamoji „coalescer“ eilutė"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Saugokitės! Liudijimas buvo panaikintas"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "Dvejetainis"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Lenta"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
-msgstr "Žymeklis"
+msgstr "Žymelė"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
-msgstr "Žymeklis:"
+msgstr "Žymelė:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
-msgstr "Žymekliai"
+msgstr "Žymelės"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Sukūrimo data:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Sukūrimo informacija"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Verslo kategorija:"
 
-#: resources.h:752
+#: resources.h:772
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"Paprastai FileZilla naudoja bet kokį vidinį prievadą siuntimams esant "
-"aktyviai veiksenai. Jei norite naudoti tik mažą prievadų sritį, nurodykite "
-"ją žemiau."
+"Pagal nutylėjimą FileZilla, esant aktyviai veiksenai, siuntimams naudoja bet "
+"kokį prieinamą vidinį prievadą. Jei norite leisti naudoti tik mažą prievadų "
+"sritį, nurodykite ją žemiau."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "A&tšaukti dabartinę operaciją"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "T&ikrinti ar yra FileZilla nightly builds"
+msgstr "T&ikrinti ar yra FileZilla naktinių versijų"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
-msgstr "&Valyti viską"
+msgstr "&Išvalyti viską"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
-msgstr "K&opijuoti URL(us) į mainų sritį"
+msgstr "K&opijuoti URL į iškarpinę"
 
-#: resources.h:888
+#: resources.h:908
 msgid "C&ustom"
-msgstr "&Specifinis"
+msgstr "&Pasirinktas"
 
-#: resources.h:943
+#: resources.h:963
 msgid "C&ustom filetype associations:"
-msgstr "D&erintas failų tipų susiejimas:"
+msgstr "&Pasirinktas failų tipų susiejimas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Skaičiuojamas serverio laiko juostos poslinkis..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
-msgstr "Negaliu perskaityti failo"
+msgstr "Neįmanoma perskaityti failo"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
-msgstr "Negaliu įrašyti duomenų į failą."
+msgstr "Neįmanoma įrašyti duomenų į failą."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
-msgstr "Negaliu įrašyti duomenų į failą: %s"
+msgstr "Neįmanoma įrašyti duomenų į failą: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "Atšaukti"
 
-#: resources.h:990
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Atšaukti dabartinę operaciją"
 
-#: resources.h:991
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Atšaukia dabartinę operaciją"
 
 #: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
-msgstr "Negaliu prieiti '%s', laikmena neįdėta arba diskas neparuoštas."
+msgstr "Neįmanoma pasiekti „%s“, laikmena neįdėta arba diskas neparuoštas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
-msgstr "Negaliu pridėti serverio į Serverių tvarkyklę"
+msgstr "Neįmanoma pridėti serverio į Serverių tvarkyklę"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
 msgstr ""
-"Negalima užverti kortelės, kol užimta.\n"
-" Ar atšaukti dabartinę operaciją ir užverti kortelę?"
+"Kol kortelė užimta jos užverti neįmanoma.\n"
+"Atšaukti dabartinę operaciją ir užverti kortelę?"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
-"Negaliu palyginti aplankų, įgalinti skirtingi filtrai vietiniams ir "
+"Neįmanoma palyginti aplankų, įgalinti skirtingi filtrai vietiniams ir "
 "nuotoliniams aplankams"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
-msgstr "Negaliu palyginti aplankų, neprisijungta prie serverio."
+msgstr "Neįmanoma palyginti aplankų, neprisijungta prie serverio."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
-msgstr "Negaliu sukurti naujo filtro"
+msgstr "Neįmanoma sukurti naujo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
-msgstr "Negaliu redaguoti failo"
+msgstr "Neįmanoma redaguoti failo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
-msgstr "Negalima keisti failo, nėra ryšio su jokiu serveriu."
+msgstr "Neįmanoma keisti failo, neprisijungta prie jokio serverio."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
-msgstr "Negalima redaguoti failo, nes nuotolinis kelias nežinomas."
+msgstr "Neįmanoma redaguoti failo, nes nuotolinis kelias nežinomas."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
-"Negaliu sukurti FTP prisijungimo su SFTP serveriu. Prašau pasirinkti tinkamą "
+"Neįmanoma sukurti FTP prisijungimo su SFTP serveriu. Pasirinkite tinkamą "
 "protokolą."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr "Iš resursų failo negaliu pakrauti greito prisijungimo juostos"
+msgstr "Iš resursų failo neįmanoma įkrauti greito prisijungimo juostos"
 
 #: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr "Negaliu užkrauti failo, negaliojantis XML failas."
+msgstr "Neįmanoma įkrauti failo, netinkamas XML failas."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Cannot load keyfile"
-msgstr "Negaliu užkrauti raktinio failo"
+msgstr "Neįmanoma įkrauti raktinio failo"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
-msgstr "Iš resursų failo negaliu pakrauti įrankinės"
+msgstr "Iš resursų failo įkrauti įrankinės nepavyko"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+#, fuzzy
+msgid "Cannot remember password"
+msgstr "&Neprisiminti slaptažodžių"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
-msgstr "Negaliu pervadinti elemento"
+msgstr "Neįmanoma pervadinti elemento"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
-msgstr "Negaliu pervadinti failo"
+msgstr "Neįmanoma pervadinti failo"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
-msgstr "Negaliu išsaugoti filtrų"
+msgstr "Neįmanoma išsaugoti filtrų"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
-msgstr "Negaliu pasirinkti filtro"
+msgstr "Neįmanoma pasirinkti filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
-msgstr "Negalima nustatyti failo sąjungos"
+msgstr "Neįmanoma nustatyti failo susiejimo"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
-msgstr "Negaliu parodyti dialogo"
+msgstr "Neįmanoma parodyti dialogo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
-msgstr "Negalima peržiūrėti/keisti pasirinkto failo"
+msgstr "Neįmanoma peržiūrėti/keisti pasirinkto failo"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Kategorijos"
 
@@ -1849,59 +1860,61 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Sertifikatas ir sesijos duomenys dar nepasiekiami."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Sertifikato informacija"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Liudijimas grandinėje:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Sertifikato išdavėjas"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Iššūkis:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Keisti failo atributus"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Keisti failo prieigos teises."
 
-#: resources.h:964
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "Pakeistos logfile nuostatos reikalauja perkrauti FileZilla."
+msgstr ""
+"Pakeistos žurnalo failo nuostatos reikalauja įkelti FileZilla iš naujo."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Simbolių koduotės problema"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Koduotė"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Tikrinti &beta versijų ir išleistų kandidatų"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
 msgstr "Ieškoti atna&ujinimų..."
 
-#: resources.h:551
+#: resources.h:967
+#, fuzzy
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Atnaujinimų patikrinimas nepavyko"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
-msgstr "Tikrinti naujesnių FileZilla versijų"
+msgstr "Tikrinti ar yra naujesnių FileZilla versijų"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Tikrinti ar yra atnaujinimų"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Atnaujinimų patikrinimas nepavyko"
 
@@ -1909,65 +1922,65 @@
 msgid "Checking for correct external IP address"
 msgstr "Tikrinama ar teisingas išorinis adresas"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
-msgstr "Tikrinami atnaujinimai"
+msgstr "Ieškoma atnaujinimų"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Atsisiųsto failo kontrolinė suma nesutampa."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Nurodykite numatytą vietinį aplanką"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
-msgstr "Parinkite vietinį katalogą"
+msgstr "Pasirinkite aplanką"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
-msgstr "Duomenų gabalas neteisingai nutrauktas"
+msgstr "Duomenų fragmentas užbaigtas neteisingai"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Šifras:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
-msgstr "Už&versti kortelę"
+msgstr "Už&verti kortelę"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
-msgstr "Classic"
+msgstr "Klasikinis"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "Išvalyti &Serverio tvarkyklės įrašus"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "Išvalyti &išdėstymo atmintį"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "Išvalyti &greito prisijungimo istoriją"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "Išvalyti &prisijungimų informacija"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Išvalyti &siuntimų eilę"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
-msgstr "Pašalinti istorija"
+msgstr "Išvalyti istoriją"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1975,48 +1988,48 @@
 msgid "Clear private data"
 msgstr "Pašalinti privačius duomenis"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Išvalyti greitų prisijungimų juostą"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
-msgstr ""
+msgstr "Išvalyti „coalescer“ eilutę"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr "Spausti Baigti norėdami išsaugoti savo konfigūracija."
+msgstr "Norėdami išsaugoti savo konfigūraciją paspauskite „Baigti“."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
-msgstr "Kad atsisiųsti nauja versija, spausti sekantis."
+msgstr "Norėdami parsisiųsti naują versiją paspauskite „kitas“."
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "Iš kliento į serverį MAC:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Kliento serveriui šifras:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
-msgstr "Užversti &visas kitas korteles"
+msgstr "Užverti &visas kitas korteles"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
-msgstr "Uždaryti FileZilla"
+msgstr "Užverti FileZilla"
 
 #: ../../locales/../src/interface/cmdline.cpp:14
 msgid "Close all running instances of FileZilla"
-msgstr "Uždaryti visas paleistas FileZilla programas"
+msgstr "Uždaryti visas paleistas FileZilla kopijas"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
-msgstr "Uždaroma esama kortelė"
+msgstr "Užveriama esama kortelė"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "Ko&mentarai:"
 
@@ -2024,11 +2037,11 @@
 msgid "Column properties"
 msgstr "Stulpelio savybės"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Stulpelio nustatymai"
 
-#: resources.h:938
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Komanda ir jos argumentai turėtų būti tarp kabučių."
 
@@ -2044,12 +2057,12 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr "Komanda nepalaikoma šito protokolo"
+msgstr "Komanda nepalaikoma šio protokolo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Komanda:"
 
@@ -2057,7 +2070,7 @@
 msgid "Comment"
 msgstr "Komentaras"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Bendras pavadinimas:"
 
@@ -2066,15 +2079,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Susisiekimas sugadintas maršrutizatoriaus arba ugniasienės"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
-msgstr "Palyginti &modifikacijos laiką"
+msgstr "Palyginti &keitimų laiką"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Palyginti failo &dydį"
 
-#: resources.h:918
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Palyginimų &slenkstis (minutėmis):"
 
@@ -2082,60 +2095,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Palyginimų slenkstis turi būti tarp 0 ir 1440 minučių."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Sukompiliuota:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Sukompiliuota ant:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Kompiliuota su:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Kompiliatoriaus parametrai:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Suglaudintas"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Lygiagretūs siuntimai"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
-msgstr "Sąlygos &didžiosios/mažosios skiriamos"
+msgstr "Sąlygos jautrios raidžių &registrui"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Konfigūracijos testas"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Konfigūruoti pasyvią veikseną"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Konfigūruoti prievadų sritį"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "Konfigūruojama FileZilla ir tinklas"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Patvirtinti šalinimą"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Reikalingas patvirtinimas"
 
@@ -2143,42 +2156,42 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Sveikiname, jūsų konfigūracija veikia."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr "Prisijungti apeinant įgaliojimo nustatymus"
+msgstr "Prisijungti apeinant tarpinio serverio nustatymus"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
 msgstr "Prisijungti prie nurodyto Serverių tvarkyklės įrašo"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Prisijungta"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Jungiamasi"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
-msgstr "Jungiuosi prie: %s"
+msgstr "Jungiamasi prie %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
-msgstr "Jungiamasi prie %s per įgaliojimą"
+msgstr "Jungiamasi prie %s per tarpinį serverį"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Jungiamasi prie %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Jungiamasi prie serverio"
 
@@ -2186,75 +2199,75 @@
 msgid "Connection"
 msgstr "Prisijungimas"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
-msgstr "Prisijungimo bandymas nepavyko"
+msgstr "Prisijungti nepavyko"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "Prisijungimo bandymas su „%s“ nepavyko, bandau kitą adresą."
+msgstr "Prisijungti su „%s“ nepavyko, bandomas kitas adresas."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "Prisijungimo bandymas su \"%s\" nepavyko."
+msgstr "Prisijungimas su „%s“ nepavyko."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
-msgstr "Prisijungimo bandymą nutraukė vartotojas"
+msgstr "Prisijungimo bandymą nutraukė naudotojas"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:543
 msgid "Connection closed"
-msgstr "Prisijungimas uždarytas"
+msgstr "Prisijungimas baigtas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Prisijungimą nutraukė serveris"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Prisijungta, inicijuoju TLS..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
-msgstr "Prisijungta, siunčiu HTTP užklausą"
+msgstr "Prisijungta, siunčiama HTTP užklausa"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
-msgstr "Prisijungta, laukiu pasveikinimo pranešimo..."
+msgstr "Prisijungta, laukiama pasveikinimo pranešimo..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
-msgstr "Prisijungimas nutrauktas"
+msgstr "Ryšys nutrūko"
 
 #: ../../locales/../src/engine/proxy.cpp:433
 msgid "Connection not allowed by ruleset"
-msgstr "Prisijungimas negalimas pagal taisykles"
+msgstr "Prisijungimas neleidžiamas pagal taisykles"
 
 #: ../../locales/../src/engine/proxy.cpp:442
 msgid "Connection refused"
 msgstr "Prisijungimas atmestas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
-msgstr "Prisijungimo laikas baigėsi."
+msgstr "Prisijungimo laikas baigėsi"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Prisijungimo laikas baigėsi."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Ryšys su serveriu nutrūko."
 
 #: ../../locales/../src/engine/proxy.cpp:188
 msgid "Connection with proxy established, performing handshake..."
-msgstr "Prisijungta su įgaliojimu, atliekamas apsikeitimas..."
+msgstr "Prisijungta per tarpinį serverį, atliekamas rankos paspaudimas..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
@@ -2268,110 +2281,110 @@
 msgid "Convert keyfile"
 msgstr "Konvertuoti raktinį failą"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Kopijuot&i"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopijuoti (%d) iš %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "%s Kopija"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr "Kopijuoti pasirinktų elementų URL adresus į mainų sritį."
+msgstr "Kopijuoti pasirinktų elementų URL adresus į iškarpinę."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
-msgstr "Negaliu priimti jungties: %s"
+msgstr "Negaliu priimti prisijungimo: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:99
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "Nepavyko pridėti ryšio prie svetainės tvarkytuvės"
+msgstr "Nepavyko pridėti ryšio prie serverių tvarkyklės"
+
+#: ../../locales/../src/interface/state.cpp:842
+#, fuzzy
+msgid "Could not complete operation"
+msgstr "Nepavyko nukopijuoti duomenų"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
-msgstr "Negaliu prisijungti prie serverio"
+msgstr "Nepavyko prisijungti prie serverio"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
-msgstr "Negaliu prisijungti prie serverio: %s"
+msgstr "Nepavyko prisijungti prie serverio: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
-msgstr "Negaliu konvertuoti komandos į serverio kodą"
+msgstr "Nepavyko konvertuoti komandos į serverio koduotę"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 msgid "Could not convert private key"
-msgstr "Negaliu konvertuoti privataus rakto"
+msgstr "Nepavyko konvertuoti privataus rakto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
-msgstr "Nepavyko nukopijuoti URLs"
+msgstr "Nepavyko nukopijuoti URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Nepavyko nukopijuoti duomenų"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
-"Negaliu nustatyti operacijos Vilkti ir &Mesti taikinio.\n"
-"Arba apvalko (shell) plėtinys reikiamai neįdiegtas arba jus nenumėtėte failų "
-"į Naršymo langą."
+"Nepavyko nustatyti &nuvilkto failo paskirties.\n"
+"Arba apvalko (shell) plėtinys reikiamai neįdiegtas arba jūs nenumėtėte failų "
+"į naršyklės langą."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
-msgstr "Negaliu nustatyti ryšio su serveriu"
+msgstr "Nepavyko prisijungti prie serverio"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"Nerandu FileZilla resursų failų, FileZilla baigia darbą.\n"
-"FileZilla duomenų aplanką galima nurodyti pasinaudojant „--datadir "
+"FileZilla resursų failai nerasti, FileZilla baigia darbą.\n"
+"FileZilla duomenų aplanką galite nurodyti pasinaudojant „--datadir "
 "<custompath>“ komandinės eilutės nuostata arba nustatant FZ_DATADIR aplinkos "
 "kintamąjį."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
-msgstr "Negaliu sugeneruoti specialios prisijungimo sekos."
+msgstr "Nepavyko sugeneruoti pasirinktinės prisijungimo sekos."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
-"Nepavyko gauti unikaliojo vardo iš liudijimo išdavėjo, "
-"gnutls_x509_get_issuer_dn sutrikęs"
+"Nepavyko gauti liudijimo išdavėjo vardo, gnutls_x509_get_issuer_dn nepavyko"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
-"Nepavyko gauti liudijimo objekto unikalaus vardo, gnutls_x509_get_dn sutrikęs"
+"Nepavyko gauti liudijimo objekto unikalaus vardo, gnutls_x509_get_dn nepavyko"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Nepavyko gauti pilno nutolusio kelio."
 
@@ -2380,22 +2393,22 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Nepavyko gauti atsakymo iš fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
-msgstr "Negaliu gauti laikino aplanko į kurį būtų atsiunčiami failai."
+msgstr "Nepavyko gauti laikino aplanko į kurį būtų atsiunčiami failai."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
-"Nepavyko importuoti tokių pat liudijimų, gnutls_x509_crt_import sutrikęs"
+"Nepavyko importuoti tokių pat liudijimų, gnutls_x509_crt_import nepavyko"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
-"Nepavyko inicijuoti tokios pat struktūros liudijimų, gnutls_x509_crt_init "
-"sutriko"
+"Nepavyko inicijuoti tokių pat struktūros liudijimų, gnutls_x509_crt_init "
+"nepavyko"
 
 #: ../../locales/../src/interface/import.cpp:119
 #: ../../locales/../src/interface/import.cpp:310
@@ -2405,36 +2418,35 @@
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Negaliu pakrauti \"%s\", įsitikinkite, kad failas teisingas ir yra "
-"prieinamas.\n"
+"Negaliu įkrauti „%s“, įsitikinkite, kad failas tinkamas ir yra prieinamas.\n"
 "Bet kokie serverių tvarkyklės pakeitimai nebus išsaugoti."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
-msgstr "Nepavyko įkelti raktinio failo"
+msgstr "Nepavyko įkelti rakto failo"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
 msgid "Could not load private key"
 msgstr "Nepavyko įkelti privataus rakto"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
-"Negalima gauti atitinkamo vietinio katalogo nuotoliniam katalogui „%s“.\n"
-"Ar uždrausti sinchonizuotąjį naršymą ir pratęsti nuotolinio katalogo keitimą?"
+"Nepavyko gauti atitinkamo vietinio aplanko nuotoliniam aplankui „%s“.\n"
+"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"Negalima gauti atitinkamo vietinio katalogo nuotoliniam katalogui „%s“.\n"
+"Neįmanoma gauti atitinkamo vietinio aplanko nuotoliniam aplankui „%s“.\n"
 "Sinchronizuotasis naršymas buvo uždraustas."
 
 #: ../../locales/../src/interface/state.cpp:295
@@ -2444,12 +2456,12 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"Negalima gauti atitinkamo nuotolinio katalogo vietiniam katalogui „%s“.\n"
+"Nepavyko gauti atitinkamo nuotolinio aplanko vietiniam aplankui „%s“.\n"
 "Sinchronizuotasis naršymas buvo uždraustas."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Nepavyko atverti iškarpinės"
 
@@ -2462,70 +2474,69 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
-msgstr "Nepavyko išanalizuoti nuotolinio kelio."
+msgstr "Nuotolinio kelio apdoroti nepavyko."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
-msgstr "Negaliu interpretuoti serverio adreso:"
+msgstr "Serverio adreso apdoroti nepavyko:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
-msgstr "Nepavyko perskaityti iš jungties: %s"
+msgstr "Perskaityti iš jungties nepavyko: %s"
 
 #: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
 msgstr "Nepavyko perskaityti serverio elemento."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
-msgstr "Negaliu pasiekti pozicijos faile %s"
+msgstr "Nepavyko pasiekti pozicijos faile %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
-msgstr "Negaliu pereiti į failo pabaigą"
+msgstr "Nepavyko pereiti į failo pabaigą"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
 msgstr "Nepavyko nusiųsti komandos į fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
-msgstr "Negaliu interpretuoti IO srauto"
+msgstr "Nepavyko interpretuoti IO srauto"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "Nepavyko paleisti įgaliojimo pasveikinimo: %s"
+msgstr "Nepavyko paleisti tarpinio serverio pasveikinimo: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
-msgstr "Negaliu pradėti siuntimo"
+msgstr "Nepavyko pradėti siuntimo"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
-"Nepavyko įrašyti „%s“, bet kokie serverių tvarkyklės pakeitimai negali būti "
+"Nepavyko įrašyti „%s“, bet kokie serverių tvarkyklės pakeitimai nebus "
 "išsaugoti: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "Nepavyko įrašyti „%s“, nebuvo pridėtas adresyno įrašas: %s"
+msgstr "Nepavyko įrašyti „%s“, žymelė nebuvo pridėta: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr ""
-"Nepavyko įrašyti į „%s“, visuotinis adresynas negali būti išsaugotas: %s"
+msgstr "Nepavyko įrašyti į „%s“, visuotinės žymelės negali būti išsaugotos: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2534,26 +2545,26 @@
 "Nepavyko įrašyti į „%s“, eilė negali būti išsaugota.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Nepavyko įrašyti „%s“, pažymėti tinklapiai nebuvo eksportuoti: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr "Negaliu įrašyti „%s“: %s"
+msgstr "Nepavyko įrašyti „%s“: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
 msgstr "Nepavyko įrašyti į raktinį failą: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
-msgstr "Negaliu rašyti į lokalų failą"
+msgstr "Nepavyko įrašyti į vietinį failą"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
@@ -2561,37 +2572,49 @@
 msgid "Could not write to log file: %s"
 msgstr "Nepavyko įrašyti į žurnalo failą: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
-msgstr "Negaliu rašyti į jungtį: %s"
+msgstr "Negaliu įrašyti į lizdą: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Šalis:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
-msgstr "Nedelsiant nulaužia FileZilla. Naudojama tik klaidų paieškai"
+msgstr "FileZilla iškart nulūžta. Naudojama tik klaidų paieškai"
+
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "&Sukurti naują failą"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Sukurti aplanką šiame aplanke"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Šiame aplanke sukurti naują tuščią failą"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Sukurti aplanką"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Sukurti tuščią failą"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Kuriamas aplankas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Kuriamas aplankas „%s“..."
@@ -2609,13 +2632,14 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Kritinė failo perdavimo klaida po perdavimo %s į %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"Dabartinis nuotolinis katalogas (%s) nėra po sinchronizacijos šaknimi (%s).\n"
+"Dabartinis nuotolinis aplankas(%s) nėra po sinchronizacijos šakniniu aplanku "
+"(%s).\n"
 "Sinchronizuotasis naršymas buvo uždraustas."
 
 #: ../../locales/../src/interface/statusbar.cpp:423
@@ -2624,77 +2648,80 @@
 
 #: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
-msgstr "Dabartinis siuntimų tipas yra nustatytas į automatinį suradimą."
+msgstr "Dabartinis siuntimų tipas yra nustatytas į automatinį aptikimą."
 
 #: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr "Dabartinis prisijungimo tipas nustatytas dvejetainiui."
 
-#: resources.h:773 resources.h:894
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
-msgstr "Spe&cifinis"
+msgstr "&Pasirinktinis"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
-msgstr "Vartotojo paruoštas filtras"
+msgstr "Naudotojo paruoštas filtras"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
-msgstr "Vartotojo paruoštas serveris"
+msgstr "Naudotojo paruoštas serveris"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "D&uomenų tipas"
 
-#: resources.h:901
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 "D&ešimtainiai priešdėliai naudojant SI simbolius (pvz. 1 KB = 1000 baitų)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "N&umatytas"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "&Ištrinti"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "&Išjungti viską"
 
-#: resources.h:872
-#, fuzzy
+#: resources.h:892
 msgid "D&o not save passwords"
-msgstr "Įveskite slaptažodį"
+msgstr "&Nesaugoti slaptažodžių"
 
-#: resources.h:925
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
-msgstr "D&vigubo paspaudimo veiksmas katalogams:"
+msgstr "D&vigubo paspaudimo veiksmas aplankams:"
+
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr ""
 
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr "DOS-virtualus keliai"
+msgstr "Kaip DOS su virtualiais keliais"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
-msgstr "Pavojingas failo tipas"
+msgstr "Pavojingi failų tipai"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
 msgid "Data"
 msgstr "Duomenys"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Duomenų jungtis uždaryta per anksti."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Data"
 
-#: resources.h:885
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Datos formatavimas"
 
@@ -2711,13 +2738,13 @@
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:141
 msgid "Debug"
-msgstr "Derinti"
+msgstr "Derinimas"
 
-#: resources.h:965
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Derinimo nustatymai"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Numatytas &vietinis aplankas:"
 
@@ -2725,39 +2752,39 @@
 msgid "Default (Autodetect)"
 msgstr "Numatytasis (Automatinis aptikimas)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Neteisingos numatyto redaktoriaus kabutės."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Numatytasis failo egzistavimo veiksmas"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Numatytas nut&olęs aplankas:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
 msgstr ""
-"Numatytasis nuotolinis kelias negali būti išanalizuotas. Įsitikinkite, kad "
-"tai yra galiojantis absoliutus kelias pažymėtas serverio tipe."
+"Numatytasis nuotolinis kelias negali būti apdorotas. Įsitikinkite, kad tai "
+"yra tinkamas absoliutus kelias, šiam serverio tipui."
 
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:78
 msgid "Default system language"
 msgstr "Numatytoji sistemos kalba"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Numatytasis siuntimo būdas:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Numatytas perdavimo tipas:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Numatyta: http://ip.filezilla-project.org/ip.php"
 
@@ -2783,57 +2810,57 @@
 "Uždelsiamas ryšys %d sekundžių, dėl anksčiau sutrikusio bandymo "
 "prisijungti..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
-msgstr "Ištrinti serverių tvarkyklė įrašą"
+msgstr "Ištrinti serverių tvarkyklės įrašą"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Ištrinti pasirinktą aplanką"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Ištrinti pažymėtus failus ir aplankus"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
-msgstr "Šalinami katalogai"
+msgstr "Šalinami aplankai"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
-msgstr "Kelių nesusijusių katalogų naikinimas dar nėra palaikomas"
+msgstr "Kelių nesusijusių aplankų naikinimas dar nėra palaikomas"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Ištrinama simbolinė nuoroda"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Darbastalis"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Detalės"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Naujo rakto detalės:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "&Aplankai"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Kryptis"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Aplankas"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Aplankų palyginimas"
 
@@ -2846,96 +2873,94 @@
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
 msgstr ""
-"Katalogas turintis žurnalo failą neegzistuoja arba failo pavadinimas yra "
-"neleistinas."
+"Aplankas kuriame yra žurnalo failas neegzistuoja arba failo pavadinimas yra "
+"netinkamas."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "Aplankų sąrašo generavimą nutraukė vartotojas"
+msgstr "Aplankų sąrašo generavimą nutraukė naudotojas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Aplankų sąrašo sudarymas nepavyko"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Aplankų sąrašo filtrai"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "Aplankų sąrašas gautas"
+msgstr "Aplankų sąrašas sudarytas"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "&Išjungti viską"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
-"Ar uždrausti sinchronizuotajį naršymą ir pratęsti nuotolinio katalogo "
-"keitimą?"
+"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti nuotolinio aplanko keitimą?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
-"Išjunkite šį pasirinkimą jeigu negalėsite matyti tikslaus aplankų turinio."
+"Išjunkite šią parinktį jeigu negalėsite matyti teisingo aplankų turinio."
 
-#: resources.h:992
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Atsijungti nuo serverio"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Atsijungta nuo serverio"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Atsijungta nuo serverio: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Atsijungti nuo ankstesnio serverio"
 
-#: resources.h:993
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Atsijungia nuo šiuo metu matomo serverio"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
-msgstr "Rodyti apie dialogą"
+msgstr "Rodyti „apie“ dialogą"
 
-#: resources.h:934
+#: resources.h:954
 msgid "Do &not use default editor"
-msgstr "&Nenaudoti numatytosios rašyklės"
+msgstr "&Nenaudoti numatytojo redaktoriaus"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "Nieko &nedaryti"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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 ""
 "Ar tikrai norite patikrinti ar yra beta versija?\n"
-"Naudokite stabilią versija, nebent norite išbandyti naujas ypatybes."
+"Naudokite stabilią versija, nebent norite išbandyti naujas galimybes."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Ar tikrai norite uždaryti FileZilla?"
 
@@ -2949,7 +2974,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Ar tikrai norite ištrinti visus Serverių tvarkyklės įrašus?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Ar tikrai norite ištrinti pasirinktą įrašą?"
 
@@ -2957,35 +2982,36 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Ar tikrai norite ištrinti siuntimų eilę?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr "Ar tikrai norite išsiųsti %s' serveriui?"
+msgstr "Ar tikrai norite išsiųsti „%s“ serveriui?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Dokumentacija"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "&Vietiniams prisijungimams nenaudoti išorinio IP adreso."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
-"Taškiniai failai yra failai kurių pavadinimas prasideda tašku, pvz. .htaccess"
+"„Failai su tašku priekyje“ yra failai kurių pavadinimas prasideda tašku, "
+"pvz. .htaccess"
 
-#: resources.h:919
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Dvigubo paspaudimo veiksmas"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
-msgstr "Gauti"
+msgstr "Atsisiųsti"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
-msgstr "Atsisiuntimų &limitas:"
+msgstr "Atsisiuntimų &riba:"
 
 #: ../../locales/../src/interface/statusbar.cpp:604
 #, c-format
@@ -2996,101 +3022,112 @@
 msgid "Download limit: none"
 msgstr "Atsisiuntimo riba: nėra"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
-msgstr "Atsisiųsti radinius"
+msgstr "Atsisiųsti paieškos rezultatus"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Atsisiųsti pasirinktą aplanką"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Atsisiųsti pažymėtus failus ir aplankus"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Atsiunčiama"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Atsiunčiama %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
-msgstr "Kelių nesusijusių katalogų atsisiuntimas dar nėra palaikomas"
+msgstr "Kelių nesusijusių aplankų atsisiuntimas dar nėra palaikomas"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
-msgstr "Atsisiunčiami radiniai"
+msgstr "Atsisiunčiami paieškos rezultatai"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
-"Vilkti ir &mesti dar nėra įgyvendintas tarp skirtingų FileZilla programų."
+"&Vilkimas ir numetimas tarp skirtingų FileZilla kopijų dar nėra įgyvendintas."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
-msgstr "Vilkti ir &mesti dar nėra įgyvendintas tarp skirtingų serverių."
+msgstr "&Vilkimas ir numetimas tarp skirtingų serverių dar nėra įgyvendintas."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr ""
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "&Įjungti viską"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
-msgstr "Į&vesti katalogą"
+msgstr "Į&veskite aplanką"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "&Vykdyti"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "Iš&eiti"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "El. paštas:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Kiekvienam filtrui reikia bent vienos sąlygos."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Redaguoti filtrus"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Redaguokite failą su sukonfigūruotu redaktoriumi ir išsiųskite pakeitimus "
 "serveriui."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Redagavimas nepavyko"
 
-#: resources.h:882
+#: resources.h:902
 msgid "Email:"
 msgstr "El. paštas:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Tuščia komanda"
 
@@ -3098,7 +3135,7 @@
 msgid "Empty command."
 msgstr "Tuščia komanda."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Tuščių aplankų sąrašas"
 
@@ -3110,101 +3147,108 @@
 msgid "Empty file extension."
 msgstr "Tuščias failo plėtinys."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Tušti filtrų pavadinimai neleistini."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Tuščias pavadinimas"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Tuščia eilutė kabutėse."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "Įjun&gti viską"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
-msgstr "Įgalinti netinkamo rašmens &filtravimą"
+msgstr "Įgalinti netinkamo simbolio &filtravimą"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
-msgstr "Užšifruoti"
+msgstr "Užšifruotas"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
-msgstr "Kodavimas"
+msgstr "Šifravimas"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
-msgstr "Kodavimo informacija"
+msgstr "Šifravimo informacija"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Baigti palyginimą ir pakeisti rūšiavimo tvarką?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
-msgstr "Įveskite &savo komandą..."
+msgstr "Įveskite &pasirinktinę komandą..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
-msgstr "Įvesti 0 neribotam greičiui."
+msgstr "Įveskite 0 neribotam greičiui."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
-msgstr "Įvesti komandą"
+msgstr "Įveskite komandą"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
-msgstr "Įveskite savo komandą"
+msgstr "Įveskite pasirinktinę komandą"
 
-#: resources.h:926
+#: resources.h:946
 msgid "Enter directory"
-msgstr "Įvesti katalogą"
+msgstr "Įveskite aplanką"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Įveskite filtro pavadinimą"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Įveskite paruošto filtro pavadinimą"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
-msgstr "Įvesti naują pavadinimą dėl filtro pasirinkimo."
+msgstr "Įveskite naują filtrų rinkinio pavadinimą"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Įveskite slaptažodį"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
-msgstr "Įvesti pažymėtą katalogą"
+msgstr "Įveskite pasirinktą aplanką"
 
-#: resources.h:719
+#: resources.h:739
+#, fuzzy
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Įveskite serverio adresą.\n"
 "Norėdami nurodyti serverio protokolą, jį nurodykite prieš adresą. Jei joks "
 "protokolas nenurodomas, bus naudojamas numatytas protokolas (ftp://).\n"
 "Taip pat anketoje galite nurodyti pilną URL adresą protokolas://vartotojas:"
-"slaptažodis@ serveris:jungtis čia, tokiu atveju kitų laukų reikšmės bus "
+"slaptažodis@serveris:prievadas, tokiu atveju kitų laukų reikšmės bus "
 "ignoruojamos."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
@@ -3213,10 +3257,10 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
-"Įveskite failo '%s' slaptažodį.\n"
+"Įveskite failo „%s“ slaptažodį.\n"
 "Prašau įsidėmėti, kad konvertuotas failas nebus apsaugotas slaptažodžiu."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3226,7 +3270,7 @@
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
 msgid "Enter username and password"
-msgstr "Įveskite vartotojo vardą ir slaptažodį"
+msgstr "Įveskite naudotojo vardą ir slaptažodį"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
@@ -3236,118 +3280,124 @@
 #: ../../locales/../src/interface/import.cpp:38
 #: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
-msgstr "Importavimo klada"
+msgstr "Importavimo klaida"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
-msgstr "Klaida kraunant xml failą"
+msgstr "Klaida įkraunant eilę"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:172
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:299
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
-msgstr "Klaida kraunant xml failą"
+msgstr "Klaida įkraunant xml failą"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
-msgstr "Klaida kraunant xml failą"
+msgstr "Klaida saugant eilę"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
-msgstr "Klaida leidžiant programą"
+msgstr "Klaida paleidžiant programą"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Klaida rašant į xml failą"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
-msgstr "Klaida, failo pavadinimas negali būti išanalizuotas."
+msgstr "Klaida, failo pavadinimas negali būti apdorotas."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Klaida, vietinis failas yra, tačiau negalima jo pašalinti"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Klaida:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Užmegzti ryšį naujoje kortelėje"
 
-#: resources.h:945
+#: resources.h:971
+msgid "Every month"
+msgstr ""
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr ""
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
-msgstr "Pavyzdžiui: png „c:\\program files\\viewer\\viewer.exe“ -atverti"
+msgstr "Pavyzdžiui: png „c:\\program files\\viewer\\viewer.exe“ -open"
 
-#: resources.h:904
+#: resources.h:924
 msgid "Examples"
 msgstr "Pavyzdžiai"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "&Vykdyti"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Vykdomasis"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
-"Vykdomoji programa neturi versijos informacijos, negaliu patikrinti "
+"Vykdomoji programa neturi versijos informacijos, neįmanoma patikrinti ar yra "
 "atnaujinimų."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
-msgstr "Tyrinėtojas"
+msgstr "Naršyklė"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Eksportuoti &eilę"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
-msgstr "Eksportuoti &Nustatymus"
+msgstr "Eksportuoti &nustatymus"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Eksportavimo nustatymai"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "F&iltro pavadinimas:"
 
@@ -3355,37 +3405,37 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
-msgstr ""
+msgstr "FTP - Failų perdavimo protokolas"
 
 #: ../../locales/../src/engine/server.cpp:15
 msgid "FTP - File Transfer Protocol with optional encryption"
-msgstr ""
+msgstr "FTP - Failų perdavimo protokolas su nebūtinu šifravimu"
 
 #: ../../locales/../src/engine/server.cpp:21
 msgid "FTP - Insecure File Transfer Protocol"
-msgstr ""
+msgstr "FTP - Nesaugus failų perdavimo protokolas"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP varikliukas neinicijuotas, negalima prisijungti"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP Palaikyti-gyvą"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
-msgstr "FTP įgaliojimas"
+msgstr "FTP tarpinis serveris"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3395,116 +3445,116 @@
 
 #: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
-msgstr "FTPES - FTP over explicit TLS/SSL"
+msgstr "FTPES - FTP išskirtinai per TLS/SSL"
 
 #: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr "FTPS - FTP over implicit TLS/SSL"
+msgstr "FTPS - FTP jei įmanoma per TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Nepavyko pakeisti aplanko"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Nepavyko pakeisti kalbos"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
-msgstr "Nepavyko patikrinti naujesnės FileZilla versijos."
+msgstr "Nepavyko patikrinti ar yra naujesnė FileZilla versija."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
-msgstr "Nepavyko nukopijuoti ar perkelti įrašo"
+msgstr "Nepavyko nukopijuoti ar perkelti tinklalapio"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr "Nepavyko sukurti xml failo atsarginės kopijos"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
-msgstr "Nepavyko sukurti jungties, nutraukiama"
+msgstr "Nepavyko sukurti klausymo jungties, nutraukiama"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "Nepavyko sukurti jungties aktyviai failų perdavimo veiksenai"
+msgstr ""
+"Nepavyko sukurti klausymo jungties, aktyvios veiksenos failų perdavimui"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Nepavyko parsiųsti naujausios FileZilla versijos."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
-msgstr "Nepavyko gauti 'Mano Dokumentai' kelio"
+msgstr "Nepavyko gauti „Mano Dokumentai“ kelio"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Nepavyko gauti darbastalio kelio"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "Nepavyko gauti kliento adreso, prisijungimas uždarytas."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "Nepavyko gauti kliento adreso, prisijungimas uždarytas."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Nepavyko inicijuoti FTP variklio"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Nepavyko inicijuoti TLS."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
-msgstr "Nepavyko užkrauti langų, negaliojantys resursų failai?"
+msgstr "Nepavyko užkrauti skydelių, netinkami resursų failai?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
 msgstr "Nepavyko įkelti privataus rakto: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr "Nepavyko atidaryti „%s“ papildymui/įrašymui"
+msgstr "Nepavyko atverti „%s“ papildymui/įrašymui"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "Nepavyko atidaryti „%s“ skaitymui"
+msgstr "Nepavyko atverti „%s“ skaitymui"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "Nepavyko atidaryti „%s“ rašymui"
+msgstr "Nepavyko atverti „%s“ rašymui"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
-msgstr "Nepavyko išanalizuoti nuotolinio kelio."
+msgstr "Nepavyko apdoroti grąžinto kelio."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
-msgstr "Nepavyko išanalizuoti patikimo šaknies liudijimo."
+msgstr "Nepavyko apdoroti patikimo šakninio liudijimo."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
-msgstr "Nepavyko parsisiųsti duomenų"
+msgstr "Nepavyko gauti duomenų"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
@@ -3514,11 +3564,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Nepavyko gauti išorinio IP adreso, nutraukiama"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Nepavyko gauti išorinio IP adreso, naudojamas vidinis adresas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Nepavyko gauti vidinio IP adreso."
 
@@ -3534,13 +3584,13 @@
 msgid "Failed to send command."
 msgstr "Nepavyko išsiųsti komandos."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3548,25 +3598,25 @@
 "Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba (%"
 "s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Nepavyko nustatyti kalbos į %s (%s), naudojama numatytoji sistemos kalba."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Nepavyko nustatyti kalbos į %s, naudojama numatytoji sistemos kalba."
@@ -3575,9 +3625,9 @@
 msgid "Failed to validate settings"
 msgstr "Nepavyko patvirtini nuostatų"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
-msgstr "Nepavyko patikrinti panašaus liudijimo"
+msgstr "Nepavyko patikrinti siuntėjo liudijimo"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
@@ -3592,27 +3642,25 @@
 msgid "Failed transfers"
 msgstr "Nepavykę siuntimai"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "Sugrįžti į aktyvią veikseną"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "Fa&ilas:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "Fa&ilai"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Failas"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:124
 msgid "File Types"
-msgstr "Failo tipai"
+msgstr "Failų tipai"
 
 #: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
@@ -3622,7 +3670,7 @@
 msgid "File editing"
 msgstr "Failo redagavimas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Failas egzistuoja"
 
@@ -3630,42 +3678,42 @@
 msgid "File exists action"
 msgstr "Failo egzistavimo veiksmas"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Failas buvo pakeistas"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
 msgid "File lists"
-msgstr "Failo sąrašai"
+msgstr "Failų sąrašai"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Failas nerastas"
 
-#: resources.h:1003
+#: resources.h:1028
 msgid "File search"
 msgstr "Failo paieška"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
 msgid "File transfer aborted by user"
-msgstr "Failo perdavimą nutraukė vartotojas"
+msgstr "Failo perdavimą nutraukė naudotojas"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
-msgstr "Failo perdavimas nutrauktas vartotojo po perdavimo %s į %s"
+msgstr "Failo perdavimas nutrauktas naudotojas perdavus %s į %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
-msgstr "Sutriko failo perdavimas"
+msgstr "Failo perdavimas nepavyko"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
-msgstr "Failo perdavimas nepavyko po perdavimo %s į %s"
+msgstr "Failo perdavimas nepavyko perdavus %s į %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
 msgid "File transfer skipped"
@@ -3680,25 +3728,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Failo perdavimas pavyko, perduotas %s į %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Failų siuntimas vis dar vyksta."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Failas bus perduotas naudojant ASCII duomenų tipą."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Failas bus perduotas naudojant dvejetainį duomenų tipą."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla klaida"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3706,77 +3754,79 @@
 "FileZilla gali patikrinti jūsų konfigūraciją, kad įsitikintų jog viskas "
 "sukonfigūruota teisingai."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
-msgstr "FileZilla jau yra prisijungusi prie serverio"
-
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla paleista kiosk veiksenoje.\n"
-"„Normali“ ir „Paskyra“ prisijungimo tipai nepalaikomi šioje veiksenoje."
+msgstr "FileZilla jau yra prisijungusi prie serverio."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "FileZilla turi būti perkrauta, kad kalbos pakeitimas įsigaliotų."
 
-#: resources.h:517
+#: resources.h:978
+#, fuzzy
+msgid "FileZilla updates"
+msgstr "FileZilla klaida"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "Failų sąrašo būsenos &juosta"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Failo pavadinimas"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "Failo &filtrai..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "Failo pavadinimas negali būti sukurtas aplankui %s ir failo pavadinimui %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
-msgstr "Blogas failo pavadinimas"
+msgstr "Netinkamas failo pavadinimas"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Failų pavadinimai negali būti sudaryti iš šių simbolių: / \\ : * ? \" < > |"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Failo pavadinimas nepakeistas"
 
-#: resources.h:307 resources.h:958
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Failo pavadinimas:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Failų pavadinimai negali būti sudaryti iš šių simbolių: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Failų pavadinimai negali būti sudaryti iš šių simbolių: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Šiuo metu redaguojami failai"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Failo dydis"
@@ -3785,68 +3835,68 @@
 msgid "Filesize format"
 msgstr "Failo dydžio formatas"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Failo tipas"
 
-#: resources.h:946
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr "Failo tipo asociacijos"
+msgstr "Failų tipų susiejimai"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Filtras taikomas:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Netinkami simboliai filtro pavadinime"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Toks failas jau yra"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
-msgstr "Filtro elementai išjungti, kurie atitinka visus sekančius"
+msgstr "Išfiltruoti įrašus kurie atitinka visus šiuos"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
-msgstr "Filtro elementai išjungti, kurie atitinka bet kurį sekantį"
+msgstr "Išfiltruoti įrašus kurie atitinka bet kuriuos iš šių"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
-msgstr "Filtro elementai išjungti, kurie neatitinka sekančio"
+msgstr "Išfiltruoti įrašus kurie neatitinka jokio iš šių"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtras tokiu pavadinimu jau yra"
 
-#: resources.h:996
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Filtruoti aplankų sąrašus"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filtro patikrinimas nepavyko"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Antspaudas (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Antspaudas (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Antspaudas:"
 
@@ -3854,19 +3904,18 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Ugniasienės ir maršrutizatoriaus konfigūravimo vedlys"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
-"Išsamesnei pasirinkčių informacijai, prašau paleisti Tinklo konfigūracijos "
-"vedlį."
+"Išsamesnei pasirinkčių informacijai, paleiskite tinklo konfigūracijos vedlį."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr "Normaliam darbui reikia nustatyti bent 10-ties portų sritį."
+msgstr "Normaliam darbui reikia nustatyti bent 10-ties prievadų sritį."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3874,32 +3923,32 @@
 "Šiam seansui bus naudojamos numatytosios nuostatos. Bet kokie nuostatų "
 "pakeitimai nebus išsaugoti."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "Priverstinai &UTF-8"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "Priversti rodyti &paslėptus failus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Priversti rodyti paslėptus failus"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Formato nustatymai:"
 
-#: resources.h:944
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formatas: Plėtinys, po to seka tinkama komanda ir argumentai - tarp kabučių."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Papildoma dokumentacija"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Pagrindinis"
 
@@ -3907,107 +3956,107 @@
 msgid "General SOCKS server failure"
 msgstr "General SOCKS serverio klaida"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr "Bazinis įgaliotasis serveris"
+msgstr "Bazinis tarpinis serveris"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
-msgstr "Gaukite savo išorinį IP adresą iš kito URL:"
+msgstr "Gauti išorinį IP iš šio URL:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
-msgstr "&Naudojimasis žinynu"
+msgstr "Naudojimasis žinynu"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
-msgstr "Toks filtro pavadinimas jau yra, rašyti paruoštą filtrą ant kito?"
+msgstr "Toks filtrų rinkinys jau yra, perrašyti?"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
-msgstr "Bendrieji žymekliai"
+msgstr "Bendrosios žymelės"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Grupės prieigos teisės"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
-msgstr "Au&kštis"
+msgstr "Au&kštas"
 
 #: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP per TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Maiša:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Paslėpta"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
-msgstr "Aukštis"
+msgstr "Aukštas"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Aukščiausias"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 msgid "Highest available port has to be a number between 1024 and 65535."
-msgstr "Didžiausias galimas prievadas turi būti skaičius tarp 1 ir 65535."
+msgstr "Didžiausias galimas prievadas turi būti skaičius tarp 1024 ir 65535."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
-"Laikykite nuspaustą shift klavišą, kad pakaitomis keisti filtro būseną "
-"abiejose pusėse vienu metu."
+"Norėdami perjungti filtro būseną abiejose pusėse kartu, laikykite nuspaustą "
+"„shift“ klavišą."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
-msgstr "Svetainė:"
+msgstr "Namų puslapis:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Serverio rakto antspaudas:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Serverio raktas nesutampa"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
-msgstr "Rastas serveris su neuždarytu '['."
+msgstr "Rastas serveris prasideda „[“, bet nėra uždarančio skliausto."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
 msgstr "Serveris nepasiekiamas"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Serveris:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
-msgstr "Val,"
+msgstr "Valandos"
 
-#: resources.h:893
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (pavyzdys: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
@@ -4017,13 +4066,13 @@
 "numatytą laiką, ryšys bus nutrauktas ir FileZilla bandys prisijungti iš "
 "naujo."
 
-#: resources.h:974
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Pranešdami apie programos defektus, prašome pridėti žurnalą sukurtą esant "
 "įjungtam detaliam žurnalo pildymui."
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -4032,23 +4081,23 @@
 msgstr ""
 "Jei vedlio pabaigoje automatinis testas pavyko, tačiau vis tiek negalite "
 "dirbti su kažkuriuo serveriu, tuomet šis serveris gali būti tinkamai "
-"nesuderintas ir jums reikėtu išbandyti aktyvią veikseną. Serverių "
+"nesuderintas ir jums reikėtų išbandyti aktyvią veikseną. Serverių "
 "tvarkyklėje galima nustatyti veikseną kiekvienam serveriui atskirai."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
-"Jei sugrįžimo pasirinktis įgalinta, jus galėsite prisijungti prie blogai "
-"sukonfigūruotų serverių kurie atmetą pasirinktą siuntimo būdą."
+"Jei sugrįžimo pasirinktis įgalinta, jūs galėsite prisijungti prie blogai "
+"sukonfigūruotų serverių kurie atmeta pasirinktą siuntimo būdą."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
 msgstr ""
-"Jei kompiuterio rakto nesulaukėte, prašome susisiekti su serverio "
+"Jei serverio rakto pakeitimas buvo netikėtas, prašome susisiekti su serverio "
 "administratoriumi."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:554
@@ -4056,34 +4105,32 @@
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"Jei problema išlieka, tai tam tikras maršruto parinktuvas ir/ar užkarda "
-"blokuoja FileZilla."
+"Jei problema išlieka, tai maršrutizatorius ir/ar užkarda blokuoja FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"Jei problema išlieka, tai tam tikras maršruto parinktuvas ir/ar užkarda "
-"perdtraukia ryšį."
+"Jei problema išlieka, tai tam maršrutizatorius ir/ar užkarda pertraukia ryšį."
 
-#: resources.h:963
+#: resources.h:987
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
-"Jeigu žurnalo failo dydis pasiekia savo apribojimą, tai jis yra "
-"pervardinamas pridedant \".1\" prie failo pavadinimo pabaigos (galimas "
-"senesnių žurnalo failų pervardinimas) ir sukuriamas naujas failas."
+"Jeigu žurnalo failo dydis pasiekia savo apribojimą, tai jis yra pervadinamas "
+"pridedant „.1“ prie failo pavadinimo pabaigos (gali būti jog perrašomi seni "
+"žurnalo failai) ir sukuriamas naujas failas."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
-"Jeigu simbolinė nuoroda nurodo katalogą, FilleZilla gali: arba ištrinti "
-"simbolinę nuorodą, arba pašalinti susieto katalogo turinius."
+"Jeigu simbolinė nuoroda nurodo aplanką, FilleZilla gali arba ištrinti "
+"simbolinę nuorodą, arba pašalinti susieto aplanko turinį."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:624
 msgid ""
@@ -4091,7 +4138,7 @@
 "manufacturer for a solution."
 msgstr ""
 "Jei ši problema kartosis, prašau susisiekti su savo maršrutizatoriaus arba "
-"ugniasienės gamintoju dėl išeities."
+"ugniasienės gamintoju dėl sprendimo."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
@@ -4099,17 +4146,17 @@
 "Jei ši problema išliks, prašau susisiekti su savo maršrutizatoriaus "
 "gamintoju."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 ""
-"Jei naudositės 'perrašyti jei naujesnis', jūsų sistemos laikas turi būti "
+"Jei naudositės „pakeisti jei naujesnis“, jūsų sistemos laikas turi būti "
 "suderintas su serveriu. Jei laikas skirsis (pvz. skirtinga laiko zona), "
 "nurodykite laiko juostos poslinkį serverių tvarkyklėje."
 
-#: resources.h:917
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4117,11 +4164,11 @@
 "Jei naudojatės laiko įspaudais paremtu palyginimu, laikykite du failus "
 "lygiais, jei jų laiko įspaudų skirtumas neviršija šio slenksčio."
 
-#: resources.h:932
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
-msgstr "Pakeitę kalbą, turitumėte FileZilla paleisti iš naujo."
+msgstr "Pakeitę kalbą, turėtumėte FileZilla paleisti iš naujo."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4129,28 +4176,28 @@
 "Jei paspausite testas, tuomet FileZilla prisijungs prie serverio probe."
 "filezilla-project.org ir atliks keletą paprastų testų."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Jeigu užversite FileZilla, pakeitimai bus prarasti."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
 "Jei failų tipus nurodysite neteisingai, siunčiant jie gali būti sugadinti."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "Jei pamatysite pranešimų apie klaidas, tuomet jūsų konfigūracija neteisinga."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"Jei jums nepavyksta gauti aplankų sąrašo ar persiųsti failus,pamėginkite "
+"Jei jums nepavyksta gauti aplankų sąrašo ar persiųsti failus, pamėginkite "
 "pakeisti numatytąjį siuntimo būdą."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:569
@@ -4164,30 +4211,29 @@
 "pabandykite perjungti pasyvią veikseną ir susisiekite su serverio "
 "administratoriumi dėl pagalbos."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"Jei sėkmingai užbaigėte vedlį ir paskutinis testas bus sėkmingas, visos jūsų "
-"naudojamos ugniasienės ar maršrutizatoriai bus paruošti naudoti."
+"Jei sėkmingai užbaigėte vedlį ir paskutinis testas buvo sėkmingas, visos "
+"jūsų naudojamos ugniasienės ar maršrutizatoriai buvo paruošti naudoti."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
 "Jei naudojate ugniasienę, tuomet įsitikinkite, kad programai FileZilla "
-"leidžiama priimti prisijungimus prie nurodytų portų."
+"leidžiama priimti prisijungimus prie nurodytų prievadų."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"Jei jūs naudojate maršrutizatorių, tuomet įsitikinkite, kad visi portai, "
-"kuriuos naudoja FileZilla, yra perduodami (forwarded) kompiuteriui, kuriame "
-"veikia FileZilla."
+"Jei jūs naudojate maršrutizatorių, tuomet įsitikinkite, kad visi prievadai, "
+"kuriuos naudoja FileZilla, yra atidaryti (forwarded)."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
@@ -4201,7 +4247,7 @@
 msgid "Import data from older version"
 msgstr "Importuoti duomenis iš senesnės versijos"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Importuoti nustatymus"
 
@@ -4215,39 +4261,39 @@
 msgid "Improperly quoted association."
 msgstr "Neteisingai panaudotos kabutės susiejime."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
 "Esant aktyviai veiksenai, FileZilla duomenų perdavimui turi laukti užklausų "
-"tam tikrais portais. Reikia nurodyti, kokius prievadus naudos FileZilla."
+"tam tikrais prievadais. Reikia nurodyti, kokius prievadus naudos FileZilla."
 
-#: resources.h:703
+#: resources.h:723
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
-"Maršrutizatoriaus atveju, reikia perduoti visus turimus portus, kadangi "
+"Maršrutizatoriaus atveju, reikia atidaryti visus turimus prievadus, kadangi "
 "FileZilla neturi įtakos tam, kokius prievadus parinks sistema."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
-"Tuo atveju jei jus teikiate pirmenybę automatiniams atnaujinimams, jus "
+"Tuo atveju jei jūs teikiate pirmenybę automatiniams atnaujinimams, jūs "
 "galite įgalinti automatinių atnaujinimų patikrą nustatymų lange."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
-"Tam kad naudoti aktyvią veikseną, programai reikia žinoti jūsų išorinį IP "
+"Norint naudoti aktyvią veikseną, programai reikia žinoti jūsų išorinį IP "
 "adresą."
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4257,7 +4303,7 @@
 "serverio prievado ir prie jo prisijungs. Šiuo atveju daug konfigūracijos "
 "nereikia."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4265,20 +4311,20 @@
 "Neužbaigta grandinė, viršutinis liudijimas nėra savarankiškai "
 "prisijungiantis liudijimų įstaigos liudijimas"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Neteisingas slaptažodis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Inicijuojama TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
-msgstr ""
+msgstr "Nesaugus serveris, jis nepalaiko FTP per TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktyviai"
@@ -4288,10 +4334,10 @@
 msgstr "Sąsaja"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
-msgstr "Pertraukė vartotojas"
+msgstr "Pertraukė naudotojas"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
@@ -4301,8 +4347,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Netinkamas HTTP atsakymas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4312,7 +4358,7 @@
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
-msgstr "Netinkamas gabalo dydis"
+msgstr "Netinkamas fragmento dydis"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:353
 #: ../../locales/../src/interface/netconfwizard.cpp:363
@@ -4325,12 +4371,13 @@
 msgid "Invalid date"
 msgstr "Netinkama data"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
-msgstr "Blogas failo pavadinimas"
+msgstr "Netinkamas failo pavadinimas"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Netinkamas serveris, po uždarančio skliausto gali būti tik dvitaškis ir "
@@ -4340,20 +4387,21 @@
 msgid "Invalid input"
 msgstr "Netinkama įvestis"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Pateiktas netinkamas prievadas. Prievadas gali būti nuo 1 iki 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#, fuzzy
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Netinkamai nurodytas protokolas. Tinkami protokolai yra:\n"
 "ftp:// normaliam FTP,\n"
@@ -4361,18 +4409,25 @@
 "ftps:// FTP per SSL (implicit) ir\n"
 "ftpes:// FTP per SSL (explicit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Netinkamas serveris, po uždarančio skliausto gali būti tik dvitaškis ir "
+"prievadas."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
-msgstr "Negaliojantis reguliarusis reiškinys paieškos sąlygose."
+msgstr "Paieškos sąlygose yra netinkam reguliarioji išraiška."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
 msgstr "Netinkamas atsakymo kodas"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
-msgstr "Negaliojančios paieškos sąlygos: %s"
+msgstr "Netinkamos paieškos sąlygos: %s"
 
 #: ../../locales/../src/interface/sitemanager.cpp:419
 #: ../../locales/../src/interface/sitemanager.cpp:439
@@ -4381,100 +4436,105 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Netinkamas nuorodos kelias"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Sąlygoje netinkamas dydis"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
-msgstr "Netinkamas vartotojo vardas."
+msgstr "Netinkamas naudotojo vardas."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Jurisdikcijos šalis:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Jurisdikcijos vietovė:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Jurisdikcijos valstija arba provincija:"
 
-#: resources.h:914
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Laikyti aplankus viršuje"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"Turėkite omenyje, kad ne visi serveriai palaiko šią ypatybę ir gali gražinti "
-"neteisingą sąrašą jei ši pasirinktis įgalinta. Nors FileZilla atlieka kai "
-"kuriuos testus, kad įsitikintų jog serveris palaiko šią ypatybę, testas gali "
-"nepavykti."
+"Turėkite omenyje, kad ne visi serveriai palaiko šią galimybę ir gali "
+"grąžinti neteisingą sąrašą jei ši pasirinktis įgalinta. Nors FileZilla "
+"atlieka kai kuriuos testus, kad įsitikintų jog serveris palaiko šią ypatybę, "
+"testas gali nepavykti."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Rakto apsikeitimas"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Rakto apsikeitimas"
+
+#: resources.h:619
 msgid "L&owest"
-msgstr "M&ažiausias"
+msgstr "Že&miausias"
 
-#: resources.h:930
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Kalba"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Kalba pakeista"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Paskutinį kartą redaguotas"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Išdėstymas"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
-msgstr "Limituoti sutampančius &atsisiuntimus:"
+msgstr "Riboti vienu metu vykstančius &atsisiuntimus:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
-msgstr "Limituoti sutampančius &išsiuntimus:"
+msgstr "Riboti vienu metu vykstančius &išsiuntimus:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
 msgstr "Riboti vietinių prievadų naudojimą"
 
-#: resources.h:960
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Apriboti žurnalo failo dydį"
 
-#: resources.h:961
+#: resources.h:985
 msgid "Limit:"
-msgstr "Apribojimas:"
+msgstr "Riba:"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
-msgstr "Peržengtas linijos ilgis"
+msgstr "Viršytas eilutės ilgis"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Susijęs su"
 
@@ -4483,21 +4543,21 @@
 msgstr "Klausanti jungtis uždaryta"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Sąrašas:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
-msgstr "Maž&iausias galimas prievadas:"
+msgstr "Že&miausias galimas prievadas:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Vietinis"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Vietinis failas"
 
@@ -4507,21 +4567,21 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
-msgstr "Vietinis failas yra ne failas o aplankas."
+msgstr "Vietinis failas yra ne failas, o aplankas."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:369
 msgid "Local file is not a valid filename."
-msgstr "Vietinio failo yra negaliojantis pavadinimas."
+msgstr "Vietinio failo yra pavadinimas netinkamas."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
-msgstr "Vietinis filtras:"
+msgstr "Vietiniai filtrai:"
 
 #: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Vietinis serveris:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Lokalumas:"
 
@@ -4529,43 +4589,43 @@
 msgid "Log file"
 msgstr "Žurnalo failas"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Išjungti naujinimų tikrinimą:"
 
-#: resources.h:955
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Registruojama žurnalui"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 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 ""
-"Prisijungimo duomenis turi ne-ASCII simbolių ir serveris gali neatpažinti "
+"Prisijungimo duomenys turi ne-ASCII simbolių ir serveris gali neatpažinti "
 "UTF-8. Negaliu sugrįžti prie vietinės simbolių koduotės, nes naudojamas "
-"įgaliojimas."
+"tarpinis serveris."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
-"Prisijungimo duomenis turi ne-ASCII simbolių ir serveris gali neatpažinti "
-"UTF-8. Bandau lokalę simbolių koduotę."
+"Prisijungimo duomenys turi ne-ASCII simbolių ir serveris gali neatpažinti "
+"UTF-8. Bandoma vietinė simbolių koduotė."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Prisijungimo seka visiškai įvykdyta, tačiau vis dar neprisijungta. "
 "Nutraukiama."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
-"Prisijungimo tipas turi būti: arba 'ask'(klausiamasis) arba "
-"'interactive'(interaktyvus) (be kabučių)."
+"Prisijungimo tipas turi būti: arba „ask“(klausiamasis) arba "
+"„interactive“(interaktyvus) (be kabučių)."
 
 #: ../../locales/../src/interface/cmdline.cpp:10
 #, c-format
@@ -4574,30 +4634,30 @@
 "'%s' or '%s'"
 msgstr ""
 "Prisijungimo tipas gali būti naudojamas tik kartu su FTP URL. Argumentas "
-"turi būti vienas iš dviejų '%s' arba '%s'"
+"turi būti vienas iš dviejų „%s“ arba „%s“"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
-msgstr "Mažas"
+msgstr "Žemas"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
-msgstr "Mažiausias"
+msgstr "Žemiausias"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 msgid "Lowest available port has to be a number between 1024 and 65535."
-msgstr "Mažiausias galimas prievadas turi būti skaičius tarp 1 ir 65535."
+msgstr "Žemiausias galimas prievadas turi būti skaičius tarp 1024 ir 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
-"Įsitikinkite, kad failą galimą pasiekti ir jis yra gerai suformuotas XML "
+"Įsitikinkite, kad failą galima pasiekti ir jis yra gerai suformuotas XML "
 "dokumentas."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
@@ -4606,7 +4666,7 @@
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 #, c-format
 msgid "Malformed chunk data: %s"
-msgstr "Netinkamas duomenų gabalas: %s"
+msgstr "Netinkamas duomenų fragmentas: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 #, c-format
@@ -4615,9 +4675,9 @@
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:593
 msgid "Malformed reply, server not sending proper line endings"
-msgstr "Netaisyklingas atsakymas, serveris nesiunčia tinkamų linijos pabaigų"
+msgstr "Netaisyklingas atsakymas, serveris nesiunčia tinkamų eilučių pabaigų"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4628,58 +4688,58 @@
 msgid "Manual transfer"
 msgstr "Rankinis siuntimas"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Atitinka visi sekantys"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Atitinka bet kuris sekantis"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Neatitinka nei vienas sekantis"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "Maksimalus lygiagrečių &siuntimų skaičius:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
-msgstr "Žinutės žurnalas"
+msgstr "Pranešimų žurnalas"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
-msgstr "Žinutės žurnalo skiltis"
+msgstr "Pranešimų žurnalo vieta"
 
-#: resources.h:962
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "Minutės"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
-msgstr "Judėti &žemyn"
+msgstr "Perkelti ž&emyn"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
-msgstr "Judėti &aukštyn"
+msgstr "Perkelti &aukštyn"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
-msgstr "Mano Kompiuteris"
+msgstr "Mano kompiuteris"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
-msgstr "Mano Dokumentai"
+msgstr "Mano dokumentai"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Mano serveriai"
 
@@ -4688,33 +4748,33 @@
 msgid "N/a"
 msgstr "Nėra"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Pavadinimas"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Toks pavadinimas jau yra"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Pavadinimas iš adresyno jau egzistuoja."
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Pavadinimas:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Reikia įvesti failo pavadinimą"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Reikia įvesti galiojantį nuotolinį kelią"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Reikia nurodyti simbolių koduotę"
 
@@ -4722,19 +4782,23 @@
 msgid "Network unreachable"
 msgstr "Tinklas nepasiekiamas"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr ""
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "Naujas &aplankas"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Nauja &kortelė"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
-msgstr "Naujas žy&meklis"
+msgstr "Nauja žy&melė"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4747,41 +4811,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
-msgstr "Naujas žymeklis"
+msgstr "Nauja žymelė"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Naujas aplankas"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Naujos funkcijos ir patobulinimai yra čia %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Naujas filtras"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Naujas aplankas"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Naujas serveris"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
-msgstr "Toliau į perdavimo eilę"
+msgstr "Šalia perdavimo eilės"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Ne"
 
@@ -4789,25 +4853,25 @@
 msgid "No category to export selected"
 msgstr "Nepasirinkta kategorija eksportuoti"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Nenurodyta komanda, nutraukiama."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Nenustatytas išorinis IP adresas, bandau numatytąjį."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Šiuo metu nėra redaguojamų failų."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Nenurodytas filtro pavadinimas"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Nenurodytas serveris, prašau nurodyti serverį."
 
@@ -4815,27 +4879,27 @@
 msgid "No images available"
 msgstr "Nėra paveikslėlių"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
-msgstr "Nebėra failų eilėje!"
+msgstr "Eilėje nebėra failų!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
-msgstr "Neduotas vardas filtro koduotei."
+msgstr "Filtrų rinkinys nepavadintas."
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
-msgstr "Jokia programa neasocijuota su šiuo failo tipu"
+msgstr "Jokia programa nesusieta su šiuo failo tipu"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
-msgstr "Jokia programa nebuvo asocijuota failų su '%s' plėtiniu redagavimui."
+msgstr "Jokia programa, skirta redagavimui, nebuvo susieta su plėtiniu „%s“."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
-msgstr "Nėra radinio"
+msgstr "Rezultatų nėra"
 
 #: ../../locales/../src/interface/sitemanager.cpp:256
 #: ../../locales/../src/interface/sitemanager.cpp:268
@@ -4849,25 +4913,25 @@
 
 #: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr "Nepateiktas vartotojo vardas."
+msgstr "Nepateiktas naudotojo vardas."
 
-#: resources.h:924 resources.h:929
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Niekas"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Dar niekas nepažymėta"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normalus"
 
@@ -4879,15 +4943,15 @@
 "redagavimui."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Neprisijungta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Neprisijungta prie jokio serverio"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Neprisijungta prie jokio serverio."
 
@@ -4895,21 +4959,21 @@
 msgid "Not connected."
 msgstr "Neprisijungta."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Ši savybė veikia tik naudojant FTP protokolą."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Pastaba: Tai veikia tik su neužšifruotais FTP prisijungimais."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
-"Pastaba: Bazinio įgaliotojo serverio naudojimas priverstinai įjungia "
-"pasyvius FTP prisijungimus."
+"Pastaba: Bazinio tarpinio serverio naudojimas priverstinai įjungia pasyvius "
+"FTP prisijungimus."
 
-#: resources.h:903
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Dešimtainių pozicijų skaičius:"
 
@@ -4917,177 +4981,184 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Pakartotinų bandymų skaičius turi būti tarp 0 ir 99."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "&Atverti failą"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "Gerai"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
 "Sekančiuose puslapiuose bus sukonfigūruojamas pažymėtas perdavimo būdas, "
-"tokiu pat, kaip surogatinis būdas, jei jis įgalintas."
+"tokiu pat, kaip atsarginis būdas, jei jis įgalintas."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Kartą"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
+#: resources.h:969
+msgid "Once a week"
 msgstr ""
-"Serveriui bus nusiųsta informacija tik apie naudojamą operacinę sistemą ir "
-"apie naudojamą FileZilla versiją."
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
-msgstr "Atverti katalogą sistemų failo tvarkytuvėje"
+msgstr "Aplanką atverti sistemos failų tvarkyklėje"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1000
 msgid "Open the Site Manager"
-msgstr "Atidaryti serverių tvarkyklę"
+msgstr "Atverti serverių tvarkyklę"
 
-#: resources.h:564
+#: resources.h:1001
+#, fuzzy
+msgid "Open the Site Manager."
+msgstr "Atverti serverių tvarkyklę"
+
+#: resources.h:1002
+#, fuzzy
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Atveria aplankų sąrašo filtro dialogą. Dešinysis pelės mygtukas perjungia "
+"filtrus."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Atveriamas failas."
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
-msgstr "Atidaro FileZilla nuostatų dialogą"
+msgstr "Atveria FileZilla nuostatų dialogą"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
-msgstr "Atidarytas kaip:"
+msgstr "Atvertas kaip:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Atverti nepavyko"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
-msgstr "Atverta nauja kortelė"
+msgstr "Atveria naują kortelę"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
-msgstr "Atidaro serverių tvarkyklę"
+msgstr "Atveria serverių tvarkyklę"
 
-#: resources.h:997
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
-"Atveria aplankų sąrašo filtro dialogą. Dešinysis pelės mygtukas keičia "
+"Atveria aplankų sąrašo filtro dialogą. Dešinysis pelės mygtukas perjungia "
 "filtrus."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "Operacinė sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Aptikta operacinės sistemos problema"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Organizacija:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Kitas:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
-msgstr "Suvestinė"
+msgstr "Peržiūra"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Perrašyti je&i šaltinis naujesnis"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Pakeisti failą"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Pakeisti failą, jei skiriasi dydis"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Pakeisti failą, jei skiriasi dydis arba pradinis failas yra naujesnis"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Pakeisti failą, jei pradinis failas naujesnis"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Pakeisti, jei &skiriasi dydis"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
-msgstr "Pakeisti, jei skiriasi dy&dis arba pirminis tekstas naujesnis"
+msgstr "Pakeisti, jei skiriasi dy&dis arba šaltinis naujesnis"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
-msgstr "Sąvininko prieigos teisės"
+msgstr "Savininko prieigos teisės"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
-msgstr "Valdytojas/Grupė"
+msgstr "Savininkas/Grupė"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
-msgstr ""
-"S&utriko sistema nuo įvesto užmigimo laiko, perdavimų ir kitų operacijų metu"
+msgstr "&Neleisti sistemai užmigti, vykdant perdavimus ir kitas operacijas"
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
-msgstr "Į&galiotojo serverio adresas:"
+msgstr "&Tarpinio serverio adresas:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
 msgstr "Komandą PORT sugadino maršrutizatorius arba ugniasienė."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&syvus (rekomenduojamas)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paketas"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
-msgstr "Parametras nerinkamas interneto adresas"
+msgstr "Parametras yra netinkamas URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "Slap&tažodis:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "Pasyvi veiksena (rekomenduojama)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Pasyvi veiksena"
@@ -5102,42 +5173,42 @@
 msgid "Password required"
 msgstr "Reikalingas slaptažodis"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Kelias"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Aplankui %s ir %s negali būti sukonstruotas kelias"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Keliai"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
-msgstr "Eilėje pašalinimas"
+msgstr "Laukia pašalinimo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
-msgstr "Prieigos teisės"
+msgstr "Leidimas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
-msgstr "Prieigos teisės"
+msgstr "Leidimai"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5153,22 +5224,22 @@
 "Svetainėje http://filezilla-project.org/probe.php patikrinkite ar serveris "
 "veikia, tada dar kartą patikrinkite savo nustatymus."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 "Atnaujinto FileZilla paketo ieškokite savo sistemos paketų tvarkyklėje arba "
 "apsilankykite http://filezilla-project.org ir atsisiųskite programos "
-"FileZilla programos tekstus."
+"FileZilla programos pradinį kodą."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
-"Sukonfigūruokite ugniasienę ar maršrutizatorių taip, kad FileZilla galėtu "
-"sukurti išeinančius susijungimus prie sutartų portų."
+"Sukonfigūruokite ugniasienę ar maršrutizatorių taip, kad FileZilla galėtų "
+"sukurti išeinančius susijungimus prie sutartų prievadų."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
@@ -5186,38 +5257,37 @@
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
 msgid "Please enter a custom date format."
-msgstr "Įveskite derintą datos formatą."
+msgstr "Įveskite pasirinktinį datos formatą."
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
-msgstr "Įveskite derintą laiko formatą."
+msgstr "Įveskite pasirinktinį laiko formatą."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
-msgstr ""
-"Prašome įvesti datą iš formos YYYY-MM-DD, tokią kaip pavyzdys 2010-07-18."
+msgstr "Įveskite datą iš formos YYYY-MM-DD, tokią kaip pavyzdys 2010-07-18."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
-msgstr "Prašome įvesti atsisiuntimo greičio ribą didesnę arba lygią 0 %s/s."
+msgstr "Įveskite atsisiuntimo greičio ribą didesnę arba lygią 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Įveskite naujo filtro pavadinimą."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Įveskite naują nukopijuoto filtro pavadinimą."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
-msgstr "Prašome įvesti naują pavadinimą nustatytam filtrui „%s“"
+msgstr "Įveskite naują pavadinimą nustatytam filtrui „%s“"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Įveskite naują filtro pavadinimą."
 
@@ -5238,11 +5308,11 @@
 "transfers."
 msgstr "Įveskite lygiagrečių persiuntimų skaičių. Skaičius tarp 1 ir 10."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
-msgstr "Prašau įvesti šio serverio slaptažodį:"
+msgstr "Įveskite šio serverio slaptažodį:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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"
@@ -5257,51 +5327,51 @@
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr ""
-"Įveskite laiko ribą (tarp 5 ir 9999 sek.). Kad nenaudoti laiko ribos "
+"Įveskite laiko ribą (tarp 5 ir 9999 sek.). Norėdami nenaudoti laiko ribos "
 "įveskite 0."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Šiam filtrui įveskite unikalų pavadinimą"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Įveskite šio serverio prisijungimo vardą:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
-msgstr "Įveskite tinkamų portų sritį."
+msgstr "Įveskite tinkamų prievadų sritį."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
 msgstr "Nurodykite URL iš kurio gauti jūsų išorinį IP adresą"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Įveskite atnaujinimo intervalą (mažiausiai 7 dienos)"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Prašome įvesti išsiuntimo greičio ribą didesnę arba lygią 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
 "Įveskite gryną FTP komandą.\n"
-"Grynų ftp komandų naudojamas išvalo aplankų talpyklą (cache)."
+"Grynų ftp komandų naudojimas išvalo aplankų podėlį."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Nurodykite kuriamo aplanko pavadinimą:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Nurodykite kuriamo failo pavadinimą:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Įveskite šio serverio prisijungimo vardą ir slaptažodį:"
 
@@ -5320,24 +5390,23 @@
 "turite dinaminį adresą arba nežinote savo išorinio adreso, tuomet naudokitės "
 "išoriniu adresų nustatytuoju."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
 msgstr ""
 "Atidžiai sekite instrukcijas, esant blogai konfigūracijai bus neįmanoma "
-"sukurti FTP susijungimus."
+"sukurti FTP susijungimų."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:617
 msgid ""
 "Please make sure FileZilla is allowed to establish outgoing connections and "
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
-"Įsitikintite, kad FileZilla gali sukurti išeinančius prisijungimus. Taip pat "
-"įsitikinkite, kad teisingai įrašėte adresų nustatytojo (address resolver) "
-"adresą."
+"Įsitikinkite, kad FileZilla gali sukurti išeinančius prisijungimus. Taip pat "
+"įsitikinkite, kad teisingai įrašėte adresų nustatytojo adresą."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Įsitikinkite, kad nurodyta lokalė įdiegta jūsų sistemoje."
 
@@ -5354,19 +5423,19 @@
 "suderintas rankiniu būdu, nenaudokite maršrutizatoriaus naudojant "
 "„Demilitarizuotą zoną“ (DMZ mode) arba „game mode“."
 
-#: resources.h:686
+#: resources.h:706
 msgid ""
 "Please note that FileZilla has no influence on the port the server chooses. "
 "So the server might choose a port which your firewall thinks is only used by "
 "trojans or other malware. This might raise a false alarm you can safely "
 "discard."
 msgstr ""
-"Atkreipkite dėmesį, kad FileZilla neturi jokios įtakos tam, kokį portą "
-"parinks serveris. Todėl serveris gali parinkti tokį portą, kad jūsų "
+"Atkreipkite dėmesį, kad FileZilla neturi jokios įtakos tam, kokį prievadą "
+"pasirinks serveris. Todėl serveris gali parinkti tokį prievadą, kad jūsų "
 "ugniasienė manys kad jis yra naudojamas tik interneto šiukšlių ir kenkėjiškų "
 "programų. Tai gali sukelti saugumo aliarmą, kurį galite saugiai atmesti."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5374,7 +5443,7 @@
 "Įkeliant failus FTP, FTPS ir FTPES išsaugoti failų laiko žymes galima tik "
 "tuo atveju jei serveris palaiko komandą MFMT."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5383,7 +5452,7 @@
 "kas labai mažus intervalus, tuomet kai kurie serveriai gali jus įtraukti į "
 "juodus sąrašus ir nebeleisti prisijungti niekada."
 
-#: resources.h:890 resources.h:896
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5392,12 +5461,12 @@
 "Norėdami sužinoti daugiau apsilankykite http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting svetainėje"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
-"Prašome pakartoti naujinimų atsisiuntimą. Galimos priežastys, jei problema "
+"Prašome pakartoti atnaujinimų atsisiuntimą. Galimos priežastys, jei problema "
 "išlieka (išrikiuotos eilėje mažėjančia tikimybe):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
@@ -5410,38 +5479,38 @@
 "tinklo nustatymai ar staiga kyla problemos su serveriais, kurie anksčiau "
 "puikiai veikė."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
-msgstr "Prašome pasirinkti veiksmą:"
+msgstr "Pasirinkite veiksmą:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Nurodykite kurias kategorijas norite importuoti."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
-msgstr "Prašome pasirinkti numatytą perdavimo būseną, kurią norite naudoti."
+msgstr "Pasirinkite numatytąjį perdavimo režimą."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Aplankui „%s“ parinkite naujus atributus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Failui „%s“ parinkite naujus atributus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Pažymėtiems aplankams parinkite naujus atributus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Pažymėtiems failams ir aplankams parinkite naujus atributus."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Pažymėtiems failams parinkite naujus atributus."
 
@@ -5460,34 +5529,32 @@
 "„Demilitarizuotą zoną“ (DMZ mode) arba „game mode“. Tokie dalykai kaip "
 "protokolų inspekcija ar specifiniai protokolų „fixups“ turi būti išjungti"
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
-msgstr ""
-"Kad sužinoti daugiau apie FileZilla aplankykite http://filezilla-project.org "
-"svetainę."
+msgstr "Apie FileZilla galite sužinoti http://filezilla-project.org"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
-"Kad gauti naujausią FileZilla versiją apsilankykite http://filezilla-project."
-"org svetainę."
+"Norėdami gauti naujausią FileZilla versiją aplankykite http://filezilla-"
+"project.org svetainę."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Pašto kodas:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
-msgstr "Iš anksto nustatyti Saitai"
+msgstr "Iš anksto nustatyti tinklapiai"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Saugomos failų laiko žymės"
 
@@ -5495,97 +5562,114 @@
 msgid "Preview:"
 msgstr "Peržiūra:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Pirminio prisijungimo ir duomenų prisijungimo sertifikatai nesutampa."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
-msgstr "Spausdinamos versijos informacija stdout'inimui ir išėjimui"
+msgstr "Parodyti versijos informaciją ir išeiti"
 
-#: resources.h:913
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Aplankų prioritetai (numatyti)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritetas"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Privatumo politika:"
+#: resources.h:977
+#, fuzzy
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Serveriui bus nusiųsta informacija tik apie naudojamą operacinę sistemą ir "
+"apie naudojamą FileZilla versiją."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "Privatūs &raktai:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
-msgstr ""
+msgstr "Pro&tokolas:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
-msgstr "Įga&liotojo serverio slaptažodis:"
+msgstr "&Tarpinio serverio slaptažodis:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "Vykdyti &eilę"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "Pro&tokolas:"
+
+#: resources.h:818
 msgid "Proxy &port:"
-msgstr "Įgaliotojo serverio &prievadas:"
+msgstr "Tarpinio serverio &prievadas:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
-msgstr "Įgaliotojo serverio &vartotojas:"
+msgstr "Tarpinio serverio &naudotojas:"
 
 #: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
-msgstr "Įgaliotojo serverio autentikacija nepavyko"
+msgstr "Tarpinio serverio tapatybės patvirtinimas nepavyko"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
-msgstr "Nepavyko pasisveikinimas su įgaliotoju serveriu: %s"
+msgstr "Pasisveikinimas su tarpiniu serveriu nepavyko: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Serveris prasideda „[“, bet nėra uždarančio skliausto."
 
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr "Įgaliotojo serverio atsakymas: %s"
+msgstr "Tarpinio serverio atsakymas: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr "Įgaliotojo serverio užklausimas nepavyko: %s"
+msgstr "Tarpinio serverio užklausimas nepavyko: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
-"Įgaliotojo serverio užklausimas nepavyko: Nežinomas prieigos tipas atsakyme "
-"į komandą CONNECT"
+"Tarpinio serverio užklausimas nepavyko: CONNECT atsake nežinomas adreso tipas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
-"Įgaliotasis serveris nustatytas, bet nurodytas netinkamas serveris arba "
+"Tarpinis serveris nustatytas, bet nurodytas netinkamas serveris arba "
 "prievadas"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
-msgstr "Viešo rakto autentikacija"
+msgstr "Viešojo rakto tapatybės patikrinimas"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
-msgstr "Viešo rakto algoritmas:"
+msgstr "Viešojo rakto algoritmas:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Viešos prieigos teisės"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
-msgstr "Eilė pilnai apdorota"
+msgstr "Eilė pilnai įvykdyta"
 
 #: ../../locales/../src/interface/statusbar.cpp:462
 #, c-format
@@ -5602,40 +5686,39 @@
 msgid "Queue: empty"
 msgstr "Eilė: tuščia"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Failai eilėje"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
-msgstr "Eilių sudarymas:"
+msgstr "Eilės sudarymas:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "&Perkrauti sistemą"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "&Nutolęs aplankų medis"
 
-#: resources.h:622 resources.h:626
-#, fuzzy
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
-msgstr "Atstatyti pažymėtu failų būseną ir juos perkelti į eilę"
+msgstr "&Atstatyti pažymėtų failų būseną ir perkelti į eilę"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Gryna FTP komanda"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "&Skaityti"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "At&naujinti"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Pervadi&nti"
 
@@ -5644,70 +5727,80 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"Paleiskite iš naujo vedlį ir atidžiai patikrinkite savo nustatymus, ir "
+"Paleiskite iš naujo vedlį ir atidžiai patikrinkite savo nustatymus ir "
 "atitinkamai sukonfigūruokite visus maršrutizatorius, bei ugniasienes."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "&Skaityti"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Tik skaityti"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Tikrai atšaukti dabartinę operaciją?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Ar tikrai panaikinti %d aplanką su jo turiniu?"
-msgstr[1] "Ar tikrai panaikinti %d aplankus su jų turiniu?"
-msgstr[2] "Ar tikrai panaikinti %d aplankus su jų turiniu?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Ar tikrai panaikinti %d failą?"
-msgstr[1] "Ar tikrai panaikinti %d failus?"
-msgstr[2] "Ar tikrai panaikinti %d failus?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
+#, fuzzy, 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] "Ar tikrai pašalinti %d aplanką su jo turiniu?"
+msgstr[1] "Ar tikrai pašalinti %d aplankus su jų turiniu?"
+msgstr[2] "Ar tikrai pašalinti %d aplankų su jų turiniu?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, fuzzy, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Ar tikrai pašalinti %d failą?"
+msgstr[1] "Ar tikrai pašalinti %d failus?"
+msgstr[2] "Ar tikrai pašalinti %d failų?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, fuzzy, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Ar tikrai pašalinti %s ir %s?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
-#, c-format
-msgid "Really delete %s and %s?"
-msgstr "Ar tikrai panaikinti %s ir %s?"
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+#, fuzzy
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Ar tikrai pašalinti visus pažymėtus failus ir/ar aplankus?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Ar tikrai pašalinti visus pažymėtus failus ir aplankus?"
+#, fuzzy
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "Ar tikrai pašalinti visus pažymėtus failus ir/ar aplankus?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Priežastis"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Perkrauti sistemą dabar"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
-msgstr "Pereiti aplankus rek&ursiškai"
+msgstr "Taikyti &rekursiškai(ir poaplankiams)"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Gautas aplanko failų sąrašas kuris atrodo užkoduotas EBDIC."
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
-msgstr "Gauta eilutė didesnė nei 10000 rašmenų, nutraukiama"
+msgstr "Gauta eilutė didesnė nei 10000 simbolių, nutraukiama."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Gauti duomenys sugadinti"
 
@@ -5716,15 +5809,15 @@
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
-"Kol esate prisijungęs prie serverio negalite išvalyti prisijungimo iš naujo "
+"Kol esate prisijungę prie serverio negalima išvalyti prisijungimo iš naujo "
 "informacijos.\n"
 "Jei tęsite, jūsų prisijungimas bus nutrauktas."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Prisijungimo iš naujo nustatymai"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Prisijungs prie paskutinio naudoto serverio"
 
@@ -5732,34 +5825,39 @@
 msgid "Redirection to invalid address"
 msgstr "Peradresavimas į netinkamą adresą"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Atnaujinti failų ir aplankų sąrašą"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+#, fuzzy
+msgid "Remember passwords?"
+msgstr "Prisiminti slaptažodį?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Nutolęs"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Nutolusiu sertifikatu nėra pasitikima."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Nutolęs failas"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Nuotolinio failo paieška"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Nutolę filtrai:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Nutolęs kelias"
 
@@ -5773,7 +5871,7 @@
 "galiojantis absoliutus kelias ir jis palaikomas esamos svetainės serverio "
 "tipo (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5781,11 +5879,11 @@
 msgstr ""
 "Nuotolinis kelias negali būti išanalizuotas. Įsitikinkite, kad tai "
 "galiojantis absoliutus kelias ir jis palaikomas pažymėto serverio tipo (%s) "
-"virštinklavietėje."
+"aukštesniajame aplanke."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Nuotolinis kelias negali būti išanalizuotas. Įsitikinkite, kad tai "
@@ -5793,13 +5891,13 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "Nepavyko interpretuoti nutolusio kelio."
+msgstr "Nepavyko apdoroti nutolusio kelio."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Nuotolinio kelio dorojimas:"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Nutolęs kelias:"
 
@@ -5807,77 +5905,76 @@
 msgid "Remote site:"
 msgstr "Nutolęs serveris:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "Pašalinti &viską"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
-msgstr "Pažymėtus &pašalinti"
+msgstr "&Pašalinti pažymėtus"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Pervadinti failą"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Pervadinti pažymėtą aplanką"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Pervadinti pažymėtus failus ir aplankus"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Pervadinamas „%s“ į „%s“"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
-msgstr "Pranešti apie klaidas ir užklausų funkcijas"
+msgstr "Pranešimai apie klaidas ir naujų galimybių prašymas"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
-msgstr ""
+msgstr "Reikalauti išskirtinai FTP per TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
-msgstr ""
+msgstr "Reikalauti FTP per TLS(jei įmanoma)"
 
-#: resources.h:624
-#, fuzzy
+#: resources.h:644
 msgid "Reset and requeue &all"
-msgstr "Atstatyti pažymėtu failų būseną ir juos perkelti į eilę"
+msgstr "&Atstatyti pažymėtų failų būseną ir perkelti į eilę"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Nustatomas %s adresas"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Nustatomas serverio pavadinimas"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Atsakymas:"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Rezultatai:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Tęsti failo perdavimą"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5885,39 +5982,38 @@
 "Pratęsiant siuntimą ASCII failams gali kilti problemų, jei serveris naudoja "
 "kitokį eilutės pabaigos simbolį nei klientas."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
-msgstr "Gaunu aplankų sąrašą..."
+msgstr "Gaunamas aplankų sąrašas..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Gaunamas išorinis IP adresas iš %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
-msgstr "Šaknies liudijimas yra nepatikimas"
+msgstr "Šakninis liudijimas nepatikimas"
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
 msgstr "&Rodyti failus, kurie šiuo metu redaguojami..."
 
-#: resources.h:875
-#, fuzzy
+#: resources.h:895
 msgid "S&how the Site Manager on startup"
-msgstr "&Eksportuoti serverių įrašus"
+msgstr "&Paleidžiant rodyti serverių tvarkyklę"
 
-#: resources.h:609
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "&Išjungti sistemą"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "S&tabdyti"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "Sin&chronizuotasis naršymas"
 
@@ -5925,33 +6021,47 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Išsaugoti nustatymus?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
-msgstr "Ieškau failų, kurie bus pridėti į eilę"
+msgstr "Ieškomi failai, kurie bus pridėti į eilę"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
-msgstr "Ieškau failų išsiuntimui"
+msgstr "Ieškomi failai išsiuntimui"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
-msgstr "Ieškoma &sąlygų:"
+msgstr "Paieškos &sąlygos:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
-msgstr "Paieškos &katalogas:"
+msgstr "Paieškos &aplankas:"
 
-#: resources.h:1002
+#: resources.h:1027
 msgid "Search for files recursively."
-msgstr "Ieškoti failų pasikartojančiai."
+msgstr "Ieškoti failų rekursyviai."
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
-msgstr "Ieškoma serverio failų"
+msgstr "Ieškoti failų serveryje"
 
 #: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
@@ -5963,36 +6073,36 @@
 msgstr ""
 "Taip pat žiūrėkite: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Pasirin&kite serverį"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
-msgstr "Nurodykite &puslapį:"
+msgstr "Pasirinkite &puslapį:"
 
-#: resources.h:878
+#: resources.h:898
 msgid "Select Theme"
-msgstr "Nurodykite temą"
+msgstr "Pasirinkite temą"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
-"Nurodykite numatytą veiksmą, kuris bus atliekamas kai paskirties failas arba "
-"persiuntimas jau yra."
+"Pasirinkite numatytąjį veiksmą, kuris bus atliekamas kai paskirties failas "
+"arba persiuntimas jau yra."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
-msgstr "Nurodykite numatyta redagavimo programą"
+msgstr "Pasirinkite numatytąjį redaktorių"
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
 msgid ""
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
-"Nurodykite veiksmą atliekama, kai paskirties failas jau yra. Šis nustatymas "
+"Pasirinkite veiksmą atliekamą, kai paskirties failas jau yra. Šis nustatymas "
 "galios tik dabartinei sesijai."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
@@ -6000,12 +6110,12 @@
 "Select default file exists action only for the currently selected files in "
 "the queue."
 msgstr ""
-"Nurodykite ką daryti jei toks failas jau yra. Šis veiksmas galios tik tiems "
+"Pasirinkite ką daryti jei toks failas jau yra. Šis veiksmas galios tik tiems "
 "failas kurie šiuo metu yra eilėje."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
-msgstr "Nurodykite iš kur atsiųsti paketą"
+msgstr "Nurodykite iš kur atsisiųsti paketą"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
@@ -6013,20 +6123,20 @@
 
 #: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
-msgstr "Pažymėti failą eksportuojamiems duomenims"
+msgstr "Pasirinkite failą eksportuojamiems duomenims"
 
 #: ../../locales/../src/interface/export.cpp:34
 msgid "Select file for exported queue"
-msgstr "Pažymėti failą eksportuojamai eilei"
+msgstr "Pasirinkite failą eksportuojamai eilei"
 
 #: ../../locales/../src/interface/export.cpp:36
 msgid "Select file for exported settings"
-msgstr "Nurodykite failą į kurį eksportuosite nustatymus"
+msgstr "Pasirinkite failą į kurį eksportuosite nustatymus"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
-msgstr "Pažymėti failą eksportuojamiems tinklapiams"
+msgstr "Pasirinkite failą eksportuojamiems tinklapiams"
 
 #: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
@@ -6034,40 +6144,40 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "Pažymėti failą siuntimui"
+msgstr "Pasirinkite failą išsiuntimui"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
 msgstr "Nurodykite failo pavadinimą konvertuojamam raktui"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Pasirinkite, kaip šie failai bus atveriami."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
-msgstr "Pažymėti paskirtą atsisiuntimo katalogą"
+msgstr "Pasirinkite paskirties atsisiuntimo aplanką"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Pasirinkite gauto failo pavadinimą"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
-msgstr "Nurodykite eksportuojamas kategorijas:"
+msgstr "Pasirinkite eksportuojamas kategorijas:"
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
-msgstr "Nurodykite privačius duomenis, kuriuos norite pašalinti."
+msgstr "Pasirinkite privačius duomenis, kuriuos norite pašalinti."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
-msgstr[0] "Pažymėtas %d katalogas su jo turiniu perdavimui."
-msgstr[1] "Pažymėti %d katalogai su jų turiniu perdavimui."
-msgstr[2] "Pažymėta %d katalogų su jų turiniu perdavimui."
+msgstr[0] "Pasirinktas %d aplankas, su jo turiniu, perdavimui."
+msgstr[1] "Pasirinkti %d aplankai, su jų turiniu, perdavimui."
+msgstr[2] "Pasirinkta %d aplankų, su jų turiniu, perdavimui."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:51
 #, c-format
@@ -6075,9 +6185,9 @@
 msgid_plural "Selected %d directories."
 msgstr[0] "Pažymėtas %d aplankas."
 msgstr[1] "Pažymėti %d aplankai."
-msgstr[2] "Pažymėti %d aplankai."
+msgstr[2] "Pažymėta %d aplankų."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6089,19 +6199,19 @@
 #, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
-msgstr[0] "Parinktas %d failas. Viso dydis: %s"
-msgstr[1] "Parinkti %d failai. Viso dydis: %s"
-msgstr[2] "Parinkti %d failai. Viso dydis: %s"
+msgstr[0] "Pasirinktas %d failas. Bendras dydis: %s"
+msgstr[1] "Pasirinkti %d failai. Bendras dydis: %s"
+msgstr[2] "Pasirinkta %d failų. Bendras dydis: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:56
 #, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
-msgstr[0] "Parinktas %d failas. Viso dydis: mažiausiai %s"
-msgstr[1] "Pasirinkti %d failai. Viso dydis: mažiausiai %s"
-msgstr[2] "Pasirinkti %d failai. Viso dydis: mažiausiai %s"
+msgstr[0] "Parinktas %d failas. Bendras dydis: bent %s"
+msgstr[1] "Pasirinkti %d failai. Bendras dydis: bent %s"
+msgstr[2] "Pasirinkta %d failų. Bendras dydis: bent %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Pasirinktas %s ir %s perdavimui."
@@ -6109,85 +6219,89 @@
 #: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
 msgid "Selected %s and %s. Total size: %s"
-msgstr "Parinkti %s ir %s. Viso dydis: %s"
+msgstr "Parinkti %s ir %s. Bendras dydis: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:66
 #, c-format
 msgid "Selected %s and %s. Total size: At least %s"
-msgstr "Parinkti %s ir %s. Viso dydis: mažiausiai %s"
+msgstr "Parinkti %s ir %s. Bendras dydis: bent %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
-msgstr "Pažymėta rašyklė neegzistuoja."
+msgstr "Pasirinktas redaktorius neegzistuoja."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
-msgstr "Parinktas failas jau redaguojamas"
+msgstr "Pasirinktas failas jau redaguojamas"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
-msgstr "Parinktas failas jau įkeltas"
+msgstr "Pasirinktas failas jau įkeltas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
-msgstr "Parinktas failas jau atidarytas."
+msgstr "Parinktas failas jau atvertas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Pasirinktas failas vis dar redaguojamas"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr "Nurodytas filtras veikia tik vietiniams failams."
+msgstr "Pasirinktas filtras veikia tik su vietiniais failais."
 
 #: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
-"Pasirinktas bendrasis žymeklis ir dabartinis serveris naudoja skirtingą "
-"serverio tipą.\n"
-"Naudokite konkrečios vietos žymeklius šiam serveriui."
+"Pasirinkta bendroji žymelė ir dabartinis serveris naudoja skirtingą serverio "
+"tipą.\n"
+"Naudokite konkrečios vietos žymeles šiam serveriui."
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
 msgstr "Nurodytas prievadas paprastai naudojamas kitam protokolui."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
-msgstr "Siųsti FTP prisijungimo &palaikymo komandos"
+msgstr "Siųsti FTP &palikti-gyvą komandas"
 
-#: resources.h:543
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
-msgstr "Siųsti serveriui kitą komandą, priešingu atveju nėra"
+msgstr "Serveriui siųsti pasirinktinę komandą, kitu atveju neprieinama"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
-msgstr "Siunčiama prisijungimo palaikymo komanda"
+msgstr "Siunčiama palikti-gyvą komanda"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Serijos numeris:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "Serverio &tipas:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Serveris tinkamai neužbaigė TLS susijungimo"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+#, fuzzy
+msgid "Server does not support non-ASCII characters."
+msgstr "Serveris nepalaiko pratęsimo failams > 2GB."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Serveris nepalaiko pratęsimo failams > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6196,15 +6310,15 @@
 "Serveris nepalaiko pratęsimo failams > %d GB. Siuntimas užbaigtas, nes failų "
 "dydžiai sutampa."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Serveris nepalaiko pratęsimo failams > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Serveris nepalaiko pratęsimo failams > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6213,20 +6327,19 @@
 "Serveris gali nepalaikyti pratęsimo failams > %d GB. Siuntimas užbaigtas, "
 "nes failų dydžiai sutampa."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
-"Serveris reikalauja paskyros. Pabandykite nurodyti paskyrą Serverių "
+"Serveris reikalauja paskyros. Pabandykite nurodyti paskyrą serverių "
 "tvarkyklėje"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
-msgstr "Serveris perdavė netikėtą atsakymą."
+msgstr "Serveris grąžino tuščią kelią."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6234,13 +6347,13 @@
 "Serveris atsiuntė papildomą registravimosi užklausą. Jums reikia naudoti "
 "interaktyvų registravimosi būdą."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Serveris atsiuntė pasyvų atsakymą su nepasiekiamu adresu. Pasyvi veiksena "
 "nepavyko."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6260,101 +6373,110 @@
 msgid "Server sent unexpected reply."
 msgstr "Serveris perdavė netikėtą atsakymą."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "Iš serverio į klientą MAC:"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Šifras iš serverio į klientą:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "Serverio &tipas:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Serveris/Vietinis failas"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Serveris:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Sesijos detalės"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "Nustatyti &prioritetą"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "„%s“ prieigos teises nustatyti į „%s“"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize iškviestas be lizdo"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Nuostatos"
 
-#: resources.h:975
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "Rodyti &nepakeistą aplankų sąrašą"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
-msgstr "Rodyti &pasisveikinimo dialogo langą..."
+msgstr "Rodyti &pasisveikinimo langą..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Rodyti abu aplankų medžius ir tęsti palyginimą?"
 
+#: resources.h:638
+#, fuzzy
+msgid "Shows available TLS ciphers"
+msgstr "Že&miausias galimas prievadas:"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Rodyti šį pagalbos dialogą"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Išjungti dabar"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "Serverių &tvarkyklės įrašai"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Serverių tvarkyklė"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+#, fuzzy
+msgid "Site Manager - Cannot remember password"
+msgstr "&Neprisiminti slaptažodžių"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:991
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
-msgstr "Svetainės tvarkytuvas - netinkami duomenys"
+msgstr "Svetainės tvarkyklė - netinkami duomenys"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Serverių tvarkyklė jau atidaryta"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Serveris neegzistuoja."
 
@@ -6364,14 +6486,14 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
-msgstr "Vietos kelias blogai suformuotas."
+msgstr "Serverio kelias neteisingas."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
-msgstr "Konkrečios vietos žymekliai"
+msgstr "Konkrečios vietos žymelės"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:93
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:545
@@ -6380,15 +6502,15 @@
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
-"Konkrečios vietos žymekliams reikia, kad serveris būtų įrašytas į \"Vietos "
-"tvarkytuvą\".\n"
-"Ar pridėti dabartinį ryšį prie vietos tvarkytuvo?"
+"Konkrečios vietos žymelėms reikia, kad serveris būtų įrašytas į „Serverių "
+"tvarkyklę“.\n"
+"Ar pridėti dabartinį ryšį prie serverių tvarkyklės?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Dydis"
 
-#: resources.h:897
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Dydžio formatas"
 
@@ -6397,31 +6519,31 @@
 msgid "Size unknown"
 msgstr "Dydis nežinomas"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Praleisti failą"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Praleidžiamas failo %s gavimas"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Praleidžiamas failo %s siuntimas"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Kai kurie failai vis dar redaguojami arba juos reikia įkelti."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6429,56 +6551,64 @@
 "Netinkamai sukonfigūruoti serveriai, esantys už maršrutizatoriaus, gali "
 "nurodyti savo vietinio tinklo IP adresą."
 
-#: resources.h:915
+#: resources.h:935
 msgid "Sort directories inline"
-msgstr "Rikiuoti aplankus eilutėje"
+msgstr "Rikiuoti aplankus iš eilės"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Lyginant aplankus, rūšiavimo tvarka negali būti keičiama."
 
-#: resources.h:911
+#: resources.h:931
 msgid "Sorting"
 msgstr "Rikiavimas"
 
-#: resources.h:912
+#: resources.h:932
 msgid "Sorting &mode:"
-msgstr "Rūšiavimo &būdas:"
+msgstr "Rikiavimo &būdas:"
 
 #: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
-msgstr "Perkėlimo operacijoje identiški šaltinis ir kelias"
+msgstr "Perkėlimo operacijoje šaltinis ir kelias tokie pat"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 msgid "Source and target file may not be the same"
 msgstr "Šaltinio ir tikslo failai negali būti tie patys"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Pernešant failą šaltinio ir tikslo failas tas pats"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Šaltinio failas:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Greičio apribojimai"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Greičio apribojimai"
 
 #: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr "Greičio ribos yra įšungtos, spragtelėkite, kad pakeistumėte."
+msgstr "Greičio ribos yra išjungtos, spragtelėkite, kad pakeistumėte."
 
 #: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr "Greičio ribos yra įjungtos, spragtelėkite, kad pakeistumėte."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr ""
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr ""
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "Pradėti siuntimą &nedelsiant"
 
@@ -6486,55 +6616,55 @@
 msgid "Start with opened Site Manager"
 msgstr "Pradėti su atidaryta serverių tvarkykle"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
-msgstr "Pradedu failo %s gavimą"
+msgstr "Pradedamas failo %s gavimas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
-msgstr "Pradedu failo %s siuntimą"
+msgstr "Pradedamas failo %s siuntimas"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Valstija arba provincija:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Būsena"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Būsena:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
-msgstr "Sustoti ir &viską pašalinti"
+msgstr "Stabdyti ir &viską pašalinti"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Gatvė:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Sertifikato antraštė"
 
 #: ../../locales/../src/interface/queueview_successful.cpp:12
 msgid "Successful transfers"
-msgstr "Sėkmingi perdavimai"
+msgstr "Sėkmingi siuntimai"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Testo rezultatų suvestinė:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6542,56 +6672,56 @@
 "Simbolinės nuorodos į failus nėra paveiktos šiuo pasirinkimu, tokios "
 "simbolinės nuorodos visuomet ištrinamos."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Sinchronizuotasis naršymas"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Sinchronizuotasis naršymas buvo uždraustas."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Sintaksės klaida"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Komandų eilutės sintaksės klaida"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistema"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
-msgstr ""
+msgstr "&Įrankinė"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL ryšys užmegztas, siunčiama HTTP užklausa"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL prisijungimas sėkmingas, laukiama pasveikinimo pranešimo..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL prisijungimas sėkmingas."
 
@@ -6599,33 +6729,37 @@
 msgid "TTL expired"
 msgstr "TTL galiojimas pasibaigęs"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
-msgstr "Tikslo failas jau yra"
+msgstr "Paskirties failas jau yra"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
-msgstr "Nurodytas failas:"
+msgstr "Paskirties failas:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Paskirties failas jau yra!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
-msgstr "Tikslo failas jau yra, tikrai norite tęsti?"
+msgstr "Paskirties failas jau yra, tikrai norite tęsti?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Testo rezultatai"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Tikrinama ar serveris palaiko siuntimo pratęsimą"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"Serverių tvarkyklė jau atidaryta kitoje FileZilla 3 instancijoje.\n"
+"Serverių tvarkyklė jau atidaryta kitoje FileZilla kopijoje.\n"
 "Ar norite tęsti? Tokiu atveju bet kokie serverių tvarkyklės pakeitimai nebus "
 "išsaugoti."
 
@@ -6634,10 +6768,10 @@
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
-"Serverių tvarkyklė jau atidaryta kitoje FileZilla 3 instancijoje.\n"
+"Serverių tvarkyklė jau atidaryta kitoje FileZilla kopijoje.\n"
 "Uždarykite ją arba duomenys negalės būti ištrinti."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML dokumentas nėra gerai suformuotas: %s"
@@ -6648,38 +6782,38 @@
 msgstr "Įvestas adresas buvo: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
-msgstr "Adresynas nebuvo pridėtas."
+msgstr "Žymelė nebuvo pridėta."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
-msgstr "Adresynas nebuvo išvalytas."
+msgstr "Žymelės nebuvo išvalytos."
 
 #: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr "Susijungimas yra šifruotas. Daugiau detalių paspaudus ikoną."
+msgstr ""
+"Susijungimas yra šifruotas. Paspauskite piktogramą norėdami sužinoti daugiau."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
-msgstr "Derinta registravimosi seka negali būti tuščia."
+msgstr "Pasirinktinė registravimosi seka negali būti tuščia."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
-msgstr "Numatytosios rašyklės tekstų failams nepavyko rasti."
+msgstr "Numatytojo tekstinių failų redaktoriaus rasti nepavyko."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
-msgstr "Numatytoji rašyklė tekstų failams yra '%s'."
+msgstr "Numatytasis tekstinių failų redaktoriaus yra „%s“."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#, fuzzy
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
-msgstr "Įvestas filtro pavadinimas jau yra."
+msgstr "Filtras tokiu vardu jau yra, pasirinkite kitokį vardą."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6694,50 +6828,50 @@
 "Please enter a new name:"
 msgstr ""
 "Failas %s jau yra.\n"
-"Prašau nurodyti kitą pavadinimą:"
+"Nurodykite kitą pavadinimą:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
-"Failas „%s“ negali būti atidarytas:\n"
-"Asocijuota programa (%s) nerasta.\n"
-"Prašome patikrinti savo failo tipo asociacijas."
+"Failas „%s“ negali būti atvertas:\n"
+"Susieta programa (%s) nerasta.\n"
+"Patikrinkite savo failo tipo susiejimus."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "Failas „%s“ negali būtu įkeltas arba jame nėra privataus rakto."
+msgstr "Failas „%s“ negali būti įkeltas arba jame nėra privataus rakto."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Failas „%s“ negali būti įkeltas."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
-"Failas „%s“ negali būti atidarytas:\n"
-"Su šio tipo failas nesusieta jokia jūsų sistemos programa."
+"Failas „%s“ negali būti atvertas:\n"
+"Su šio tipo failu nesusieta jokia jūsų sistemos programa."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
-"Failas „%s“ negali būti atidarytas:\n"
+"Failas „%s“ negali būti atvertas:\n"
 "Susieta komanda neįvykdyta"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
@@ -6748,7 +6882,7 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
-"Failo „%s“ formatas yra nesuderinamo su FileZilla formato.\n"
+"Failo „%s“ formatas yra nesuderinamas su FileZilla.\n"
 "Failas taip pat apsaugotas slaptažodžiu. Slaptažodžiu apsaugoti raktai su "
 "FileZilla dar nesuderinami.\n"
 "Ar norite šį failą konvertuoti į palaikomą ir neapsaugotą formatą?"
@@ -6773,9 +6907,9 @@
 "FileZilla dar nepalaiko.\n"
 "Ar norėtumėte jį konvertuoti į neapsaugotą failą?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
-msgstr "Nurodyto numatyto failų redaktoriaus nėra."
+msgstr "Failas nurodytas kaip numatytasis redaktorius neegzistuoja."
 
 #: ../../locales/../src/interface/import.cpp:95
 msgid ""
@@ -6785,11 +6919,11 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"Pasirinktame faile yra senos FileZilla versijos Serverių tvarkyklės "
+"Pasirinktame faile yra senos FileZilla versijos serverių tvarkyklės "
 "duomenys.\n"
 "Kadangi senos versijos duomenų formatas skiriasi, bus importuoti tik "
-"serveris, prievadas, vartotojo vardas ir slaptažodis.\n"
-"Tęsti importą?"
+"serveris, prievadas, naudotojo vardas ir slaptažodis.\n"
+"Tęsti importavimą?"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
@@ -6802,38 +6936,38 @@
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
-msgstr "Sekantis simbolis bus pakeistas: %s"
+msgstr "Šis simbolis bus pakeistas: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
-msgstr "Sekantys simboliai bus pakeisti: %s"
+msgstr "Šie simboliai bus pakeisti: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
-msgstr "Kiti failai šiuo metu yra redaguojami:"
+msgstr "Šie failai šiuo metu yra redaguojami:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "Nemokamas atviro kodo FTP sprendimas"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
-msgstr "Visuotinis adresynas negali būti išsaugotas."
+msgstr "Visuotinės žymelės negali būti išsaugotos."
 
-#: resources.h:973
+#: resources.h:997
 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 ""
-"Kuo didesnis derinimo (debug) lygis, tuo daugiau informacijos bus rodoma "
-"pranešimų žurnale. Derinimo pranešimų informacija neigiamai atsiliepia "
-"programos greičiui."
+"Kuo aukštesnis derinimo lygis, tuo daugiau informacijos bus rodoma pranešimų "
+"žurnale. Derinimo pranešimų informacija neigiamai atsiliepia programos "
+"greičiui."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr "Riba, reikia kad būtų tarp 1 ir 2000 MiB"
+msgstr "Riba turi būti tarp 1 ir 2000 MiB"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6841,8 +6975,8 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"Vietinis katalogas '%s' nėra po sinchronizacijos šaknimi (%s).\n"
-"Ar uždrausti sinchronizuotajį naršymą ir pratęsti vietinio katalogo keitimą?"
+"Vietinis aplankas „%s“ nėra po sinchronizacijos šakniniu aplanku (%s).\n"
+"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
 msgid ""
@@ -6852,15 +6986,15 @@
 "Mažiausias galimas prievadas turi būti mažesnis arba lygus didžiausiam "
 "galimam prievadui."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 ""
-"Naujausia versija buvo atsiųsta. Spauskite „Pabaiga“, kad uždaryti FileZilla "
-"ir pradėti diegimą."
+"Naujausia versija buvo atsiųsta. Spauskite „Pabaiga“, norėdami užverti "
+"FileZilla ir pradėti diegimą."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6868,40 +7002,40 @@
 "Naujausia versija buvo atsiųsta. Prašome įdiegti ją taip, kaip įdiegėte šią "
 "versiją."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Eilė nebus išsaugota."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, 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 ""
-"Nuotolinis katalogas '%s' nėra po sinchronizacijos šaknimi (%s).\n"
-"Ar uždrausti sinchronizuotajį naršymą ir pratęsti vietinio katalogo keitimą?"
+"Nuotolinis aplankas „%s“ nėra po sinchronizacijos šakniniu aplanku (%s).\n"
+"Ar uždrausti sinchronizuotąjį naršymą ir pratęsti vietinio aplanko keitimą?"
 
 #: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr "Pažymėtos kategorijos buvo importuotos."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Pažymėto failo turinys importuoja duomenis į kitas kategorijas:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Pažymėtas failas jau redaguojamas:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Pažymėtas failas vis dar atidarytas kažkurioje programoje, uždarykite jį."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6913,15 +7047,15 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
-msgstr "Serveris nebus pridėtas."
+msgstr "Serveris nebuvo pridėtas."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Serveris perdavė netikėtą ar neatpažįstamą atsakymą."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
-msgstr "Serveris naudoja kitą ženklų rinkinio koduotę failų pavadinimams:"
+msgstr "Failų pavadinimams serveris naudoja kitą koduotę:"
 
 #: resources.h:2
 msgid ""
@@ -6929,20 +7063,19 @@
 "certificate to make sure the server can be trusted."
 msgstr ""
 "Serverio sertifikatas nežinomas. Atidžiai peržiūrėkite sertifikatą, kad "
-"įsitikintumėt jog serveriu galima pasitikėti."
+"įsitikintumėte jog serveriu galima pasitikėti."
 
-#: resources.h:187
+#: resources.h:196
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
-"Serverio kompiuterio raktas nesutampa su raktu, kuris paslėptas. Tai "
+"Serverio kompiuterio raktas nesutampa su raktu, kuris yra podėlyje. Tai "
 "reiškia, kad kažkuris administratorius pakeitė kompiuterio raktą, arba jūs "
-"esate faktiškai bandomas prijungti prie kito kompiuterio, kuris apsimeta "
-"serveriu."
+"bandote prisijungti prie kito kompiuterio, kuris apsimeta serveriu."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6955,25 +7088,25 @@
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
-"Nustatymai importuoti. Kad jie įsigalėtu reikia paleisti FileZilla iš naujo."
+"Nustatymai importuoti. Kad jie įsigalėtų reikia paleisti FileZilla iš naujo."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Sistema netrukus bus perkrauta, nebent, spragtelėsite Atsisakyti."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Sistema netrukus bus sustabdyta, nebent, spragtelėsite Atsisakyti."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
 "Paskirties failas jau egzistuoja.\n"
-"Prašome pasirinkti veiksmą."
+"Pasirinkite veiksmą."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testas nepavyko. Ar tikrai norite išsaugoti šiuos nustatymus?"
 
@@ -6981,11 +7114,11 @@
 msgid "Themes"
 msgstr "Temos"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Ši filtrų grupė negali būti pašalinta."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Šis parinktas filtras negali būti pervardytas."
 
@@ -6997,72 +7130,71 @@
 "Tai reiškia, kad dalis maršrutizatoriaus ir/arba ugniasienės vis dar kišasi "
 "į FileZilla."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
-"Tai veiks tik jei jūs esate ne už maršrutizatioriaus, priešingu atveju "
+"Tai veiks tik jei jūs esate ne už maršrutizatoriaus, priešingu atveju "
 "sistemą grąžins tik jūsų vidinį adresą."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
-"Šis vedlys padės teisingai sukonfigūruoti bet kokius jūsų nudojamus "
+"Šis vedlys padės teisingai sukonfigūruoti bet kokius jūsų naudojamus "
 "maršrutizatorius ar ugniasienes ir konfigūraciją išbandys."
 
-#: ../../locales/../src/interface/queue.cpp:1223
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
-msgstr "Laikas baigėsi"
+msgstr "Laikas"
 
-#: resources.h:891
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Laiko formatas"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Laiko &riba sekundėmis:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
-msgstr "Laikas baigėsi"
+msgstr "Laukimo laikas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr ""
-"Laiko juostos skirtumai: Serveris: %d sek. Vietinis: %d sek. Skirtumas: %d "
+"Laiko juostos poslinkis: Serveris: %d sek. Vietinis: %d sek. Skirtumas: %d "
 "sek."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Antraštė:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
-msgstr "Palyginti aplankus, abudu failų sąrašai turi buti išlyginti."
+msgstr "Palyginti aplankus, abu failų sąrašai turi būti išlyginti."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
-"Kad tai atlikti, aplankų medžiai turi būti abu rodomi arba abu paslėpti."
+"Norint tai atlikti, aplankų medžiai turi būti abu rodomi arba abu paslėpti."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
-"Kad naudoti viešo rakto autentikaciją FileZilla turi žinoti kuriuos "
+"Norint naudoti viešo rakto autentikaciją, FileZilla turi žinoti kuriuos "
 "privačius raktus naudoti."
 
-#: resources.h:998
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7071,7 +7203,7 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
-"Sukeistas katalogo palyginimas. Spragtelėkite dešinį pelės klavišą, kad "
+"Perjungti aplanko palyginimą. Spragtelėkite dešinį pelės klavišą, kad "
 "pakeistumėte palyginimo būdą.\n"
 "\n"
 "Spalvos:\n"
@@ -7079,33 +7211,33 @@
 "Žalia: Failas yra naujesnis už nepaženklintą failą kitoje pusėje\n"
 "Raudona: Skiriasi failo dydžiai"
 
-#: resources.h:1000
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
-"Sukeičiamas sinchronizuotas naršymas.\n"
-"Jei įjungtas, žvalgymasis vietinio katalogo hierarchijoje taip pat pakeis "
-"katalogą serveryje atitinkamai ir atvirkščiai."
+"Perjungiamas sinchronizuotas naršymas.\n"
+"Jei įjungtas, žvalgymasis vietinio aplanko hierarchijoje taip pat pakeis "
+"aplanką serveryje atitinkamai ir atvirkščiai."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Perjungia siuntimų eilės vykdymą"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Perjungia vietinio aplankų medžio rodymą"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Perjungia pranešimų žurnalo rodymą"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Perjungia nutolusio aplankų medžio rodymą"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Perjungia siuntimų sąrašo rodymą"
 
@@ -7118,47 +7250,47 @@
 msgstr "Per daug peradresavimų"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Pėdsakas:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Perdavimas"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "Siuntimo &kryptis"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "Siuntimo &būdas"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
 msgstr "Siuntimo būdas"
 
-#: resources.h:877
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Perdavimo eilė"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Perdavimo nuostatos"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Siuntimo prisijungimas nutrauktas: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
-msgstr "Persiųsti duomenys buvo užteršti."
+msgstr "Persiųsti duomenys buvo sugadinti."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Siunčiama"
 
@@ -7166,112 +7298,110 @@
 msgid "Transfers"
 msgstr "Siuntimai"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Perdavimai užbaigti"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "Failus &be plėtinio interpretuoti kaip ASCII failus"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "Traktuoti &kitus failų tipus kaip ASCII failus:"
+msgstr "Šiuos &failų tipus laikyti ASCII failais:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-#, fuzzy
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
-msgstr "Pasitikėti pasikeitusiu serverio raktu: "
+msgstr "Pasitikėti pasikeitusiu serverio raktu:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
-#, fuzzy
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
-msgstr "Pasitikėti nauju serverio raktu: "
+msgstr "Pasitikėti nauju serverio raktu:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Pasitikėti nauju raktu ir tęsti prisijungimą?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Pasitikėti šiuo sertifikatu ir tęsti prisijungimą?"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Pasitikėti serveriu ir tęsti prisijungimą?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tipas"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
-msgstr "FTP įgaliotojo serverio tipas:"
+msgstr "FTP tarpinio serverio tipas:"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
-msgstr "Bendro įgaliotojo serverio tipas:"
+msgstr "Bendro tarpinio serverio tipas:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "&Išsiųsti"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "I&šsiuntimo greičio riba:"
 
-#: resources.h:939
+#: resources.h:959
 msgid "U&se filetype associations if available"
-msgstr "Jei yra naudoti failų tipų &sąsajas"
+msgstr "Jei įmanoma, naudoti failų tipų &susiejimus"
 
-#: resources.h:892
+#: resources.h:912
 msgid "U&se system defaults"
-msgstr "Naudoti numatytas &sistemos reikšmes"
+msgstr "Naudoti &sistemos numatytuosius"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
-msgstr "VARTOTOJAS@&SERVERIS"
+msgstr "NAUDOTOJAS@&SERVERIS"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
 msgstr "Nepriskirtas klaidos kodas %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Vienetas:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Nežinomas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
-"Nežinomas FTP įgaliotojo serverio tipas, nepavyko sugeneruoti prisijungimo "
+"Nežinomas FTP tarpinio serverio tipas, nepavyko sugeneruoti prisijungimo "
 "sekos."
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr "Nežinomas SOCKS protokolo versija: %d"
+msgstr "Nežinoma SOCKS protokolo versija: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
 msgstr "Nežinomas sertifikatas"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
-"Nežinoma klaida atidarant failą. Įsitikinkite, kad failas gali būti "
-"pasiekiamas ir yra gerai suformuotas XML dokumentas."
+"Nežinoma klaida atveriant failą. Įsitikinkite, kad failas pasiekiamas ir yra "
+"gerai suformuotas XML dokumentas."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Nežinomas serverio raktas"
 
@@ -7281,15 +7411,13 @@
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
 msgstr ""
-"Nežinomas protokolo SOCKS versijos vartotojo/slaptažodžio tapatybės "
+"Nežinomas protokolo SOCKS versijos naudotojo/slaptažodžio tapatybės "
 "poinversija: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
-msgstr ""
-"Nežinomas šaknies elementas. Neatrodo, kad failas būtų sugeneruotas "
-"FileZilla'os."
+msgstr "Nežinomas šakninis elementas, nepanašu jog failą sugeneravo FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:596
 #: ../../locales/../src/interface/netconfwizard.cpp:607
@@ -7297,18 +7425,18 @@
 "Unless these problems get fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
-"Kol problemos nebus sutvarkytos aktyvi FTP veiksena neveiks, todėl naudokite "
-"pasyvią veikseną."
+"Kol problemos nebus sutvarkytos, aktyvi FTP veiksena neveiks, todėl "
+"naudokite pasyvią veikseną."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:583
 msgid ""
 "Unless this problem gets fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
-"Kol problema nebus sutvarkyta aktyvi FTP veiksena neveiks, todėl naudokite "
+"Kol problema nebus sutvarkyta, aktyvi FTP veiksena neveiks, todėl naudokite "
 "pasyvią veikseną."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Nepalaikomas tapatybės liudijimo tipas"
 
@@ -7316,25 +7444,25 @@
 msgid "Unsupported redirect"
 msgstr "Nepalaikomas peradresavimas"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "Į&kelti ir atšaukti redagavimą"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Atnaujinimų paieška"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Atnaujinimo vedlys"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+#, fuzzy
+msgid "Updates"
+msgstr "Atnaujinimų tikrinimas"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "Išsiųsti"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Išsiųsti nepavyko"
 
@@ -7347,100 +7475,98 @@
 msgid "Upload limit: none"
 msgstr "Išsiuntimo riba: nėra"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Įkelti pažymėtą aplanką"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Išsiųsti pažymėtus failus ir aplankus"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Įkelti šį failą atgal į serverį?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Įkelti šį failą į serverį?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Įkeliama"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Įkeliamas ir laukiama pašalinimo"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Įkeliama ir atšaukiamas redagavimas"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
-msgstr "Naudoti &derintą koduotę"
+msgstr "Naudoti &pasirinktąją koduotę"
 
-#: resources.h:936
+#: resources.h:956
 msgid "Use &custom editor:"
-msgstr "Naudoti &savitą redaktorių:"
+msgstr "Naudoti &pasirinktąjį redaktorių:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
-msgstr "Naudoti &numatytąjį redaktorių tekstiniams failams"
+msgstr "Tekstiniams failams naudoti &numatytąjį redaktorių"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Naudoti &sinchronizuotąjį naršymą"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
-msgstr ""
-"Naudokite UTF-8, jei serveris tai palaiko, priešingu atveju, naudokite "
-"vietinį ženklų rinkinį."
+msgstr "Jei serveris palaiko naudoti UTF-8, priešingu atveju naudoti koduotę."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Naudoti numatytąjį veiksmą"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
-msgstr ""
+msgstr "Naudoti paprastą FTP"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Naudoti serverį, prie kurio šiuo metu prisijungta"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Naudoti serverį iš serverių tvarkyklės"
 
-#: resources.h:886
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "Naudoti &numatytas sistemos reikšmes"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Naudoti kitą IP adresą:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "Naudoti šią prievadų sritį:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
-msgstr "Vietoj to naudoti serverio išorinį IP"
+msgstr "Naudoti serverio išorinį IP"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Naudokite šį nustatymą, jei jūs esate už maršrutizatoriaus ir turite statinį "
 "išorinį IP adresą."
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7451,37 +7577,37 @@
 "kartą bus panaudota aktyvi veiksena. Serveriui bus perduota tik jūsų "
 "naudojama FileZilla versija."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
-msgstr "Vartotojas:"
+msgstr "Naudotojas:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
-msgstr "Vartotojo varde negali būti iš eilės keli tarpai"
+msgstr "Naudotojo varde negali būti iš eilės keli tarpai"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
-msgstr "Naudojant įgaliotąjį serverį %s"
+msgstr "Naudojant tarpinį serverį %s"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Naudojant neteisingą koduotę, failų pavadinimai gali būti parodyti "
 "neteisingai."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
-"Šio vedlio pagalba galite patikrinti ar yra naujesnė FileZilla versija."
+"Šio vedlio pagalba galite patikrinti, ar yra naujesnė FileZilla versija."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Galioja nuo:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Galioja iki:"
 
@@ -7489,55 +7615,55 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Išsamūs wxWidgets pranešimai"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Tikrinamas sertifikatas..."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Versija:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Labai aukštas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Rodyti paslėptus nustatymus, kurie nesuderinami su serveriu"
 
-#: resources.h:923
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Peržiūrėti/Keisti"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
-msgstr "Matomi stulpeliai"
+msgstr "Rodomi stulpeliai"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "&Rašyti"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
-msgstr "Laukiu"
+msgstr "Laukiama"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
-msgstr "Laukiu naršymui skirto prisijungimo"
+msgstr "Laukiama naršymui skirto prisijungimo"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Laukiama slaptažodžio"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
-msgstr "Laukiu kol siuntimas bus atšauktas"
+msgstr "Laukiama, kol siuntimas bus atšauktas"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
 msgstr "Laukiama pakartoti..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7555,22 +7681,23 @@
 msgstr ""
 "Dėmesio!\n"
 "\n"
-"Windows defektas sukelia FileZilla problemas.\n"
+"Windows klaida sukelia FileZilla problemas.\n"
 "\n"
-"Defektas pasireiškia jei naudojate\n"
+"Klaida pasireiškia jei naudojate\n"
 "- Windows Server 2003 ar XP 64\n"
 "- Windows su įjungta ugniasiene\n"
-"- esant įjungtai Application Layer Gateway tarnybai\n"
+"- esant įjungtai „Application Layer Gateway“ tarnybai\n"
 "Daugiau informacijos rasite http://support.microsoft.com/kb/931130\n"
 "\n"
 "Siunčiant didelius failus FileZilla gali užstrigti,\n"
-"nebent išjungsite Windows ugniasienę arba Application Layer Gateway tarnybą."
+"nebent išjungsite Windows ugniasienę arba „Application Layer Gateway“ "
+"tarnybą."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr "Dėmesio, ignoruojamas dvejetainis prisijungimas ir netinkamo IP."
+msgstr "Dėmesio, iš netinkamo IP duomenų prisijungimas nepaisomas."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7585,35 +7712,49 @@
 "\n"
 "Tikrai norite ieškoti naktimis kompiliuotų versijų?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Dėmesio: Galima saugumo spraga!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Sveiki atvykę į FileZilla"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Kas naujo"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Kas naujo:"
 
-#: resources.h:821
+#: resources.h:500
+#, fuzzy
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"FileZilla gali prisiminti slaptažodžius ir jums kitą kart jungiantis "
+"nebereiks jų iš naujo vesti."
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
-"Kuomet įgalinta, rašmenys, kurie nėra palaikomi vietinės operacinės sistemos "
-"failo varduose yra pakeičiami, jei atsiunčiamas toks failas."
+"Kuomet įgalinta, simboliai kurie nėra palaikomi vietinės operacinės "
+"sistemos, failo varduose yra pakeičiami, jei atsiunčiamas toks failas."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Plačiaekranis"
 
-#: resources.h:144
+#: resources.h:499
+#, fuzzy
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Ar norite jog FileZilla prisimintų šį slaptažodį?"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "&Rašyti"
 
@@ -7626,27 +7767,32 @@
 msgid "Wrong line endings"
 msgstr "Blogas eilučių pabaigų formatas"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Taip"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "Jūs jau naudojate naujausią FileZilla versiją. Patikrinkite vėliau."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Jūs galite visuomet atverti šį dialogo langą vėl, per pagalbos meniu."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
-"Jūs galite palikti jungties laukelį tuščią, kad panaudotumėte numatytąją "
-"jungtį."
+"Prievado laukelį galite palikti tuščią, tada bus naudojamas numatytasis."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7663,19 +7809,19 @@
 "You cannot replace an invalid character with another invalid character. "
 "Please enter a character that is allowed in filenames."
 msgstr ""
-"Jūs negalite pakeisti netinkamo rašmens, kitu netinkamu rašmeniu. Prašome "
-"įvesti rašmenį, kuris yra leidžiamas failo varduose."
+"Jūs negalite pakeisti netinkamo simbolio kitu netinkamu simboliu. Prašome "
+"įvesti simbolį, kuris yra leidžiamas failo varduose."
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Jūs nenurodėte kitokio failo pavadinimo. Ar šį failą perrašyti?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "Jūs turite pasirinkti mažiausiai vieną simbolinę nuorodą."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7683,41 +7829,41 @@
 "Jūs pasirinkote daugiau negu 10 failų redagavimui. Ar jūs tikrai norite "
 "tęsti?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
-"Jūs pasirinkote daugiau negu 10 failų ar katalogų atidarymui. Ar jūs tikrai "
+"Jūs pasirinkote daugiau negu 10 failų ar aplankų atvėrimui. Ar jūs tikrai "
 "norite tęsti?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Reikia įvesti serverio pavadinimą."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
-msgstr "Jūs turite įvesti vietinį katalogą."
+msgstr "Jūs turite įvesti vietinį aplanką."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:149
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
-msgstr "Įveskite galiojantį IP adresą."
+msgstr "Įveskite tinkamą IP adresą."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
-msgstr "Jūs turite įvedę rašomą vietinį katalogą"
+msgstr "Turite įvesti vietinį aplanką, į kurį galima rašyti."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Reikia įvesti paskyros pavadinimą"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
-msgstr "Reikia nurodyti vartotojo vardą"
+msgstr "Reikia nurodyti naudotojo vardą"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
 msgid ""
@@ -7729,49 +7875,48 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
-msgstr "Jums reikia įvesti adresyno įrašo pavadinimą."
+msgstr "Jums reikia įvesti žymelės pavadinimą."
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:67
 msgid "You need to enter a name for the log file."
 msgstr "Jums reikia įvesti žurnalo failo pavadinimą."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Jums reikia įvesti tinkamą pacituotą komandą."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
-msgstr "Reikia nurodyti įgaliotąjį serverį."
+msgstr "Reikia nurodyti tarpinį serverį."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
-msgstr "Reikia įvesti įgaliotojo serverio jungtį į sritį nuo 1 iki 65535"
+msgstr "Reikia įvesti tarpinio serverio prievadą nuo 1 iki 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
-msgstr ""
-"Jums reikia įvesti mažiausiai vieną kelią. Tušti žymekliai nėra palaikomi."
+msgstr "Jums reikia įvesti bent vieną kelią. Tuščios žymelės nepalaikomos."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 "Jums reikia įvesti abu: vietinį ir nuotolinį kelią, kad įgalintumėte "
-"sinchronizuotąjį naršymą šiam žymekliui."
+"sinchronizuotąjį naršymą šiai žymelei."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
 msgstr ""
 "Jums reikia įvesti abu: vietinį ir nuotolinį kelią, kad įgalintumėte "
-"sinchronizuotąjį naršymą šiai vietai."
+"sinchronizuotąjį naršymą šiam serveriui."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
@@ -7794,47 +7939,53 @@
 "You should have no problems connecting to other servers, file transfers "
 "should work properly."
 msgstr ""
-"Prisijungiant prie kitų serverių neturėtu kilti problemų, failų perdavimas "
-"turėtu veikti tinkamai."
+"Prisijungiant prie kitų serverių neturėtų kilti problemų, failų perdavimas "
+"turėtų veikti tinkamai."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
-msgstr "paskui"
+msgstr "po"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
-msgstr "prieš tai"
+msgstr "prieš"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
-msgstr "prasideda su"
+msgstr "prasideda"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+#, fuzzy
+msgid "bytes"
+msgstr "%s baitai"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "turi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
-msgstr "Nėra talpos"
+msgstr "neturi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
-msgstr "Nėra lygus"
+msgstr "nelygus"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
-msgstr "baigiasi su"
+msgstr "baigiasi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "lygus"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "failas"
 
@@ -7849,85 +8000,127 @@
 "Please make sure this executable exists in the same directory as the main "
 "FileZilla executable."
 msgstr ""
-"fzputtygen negali būti paleistas.\n"
-"įsitikinkite, kad šis vykdomasis failas yra tame pačiame aplanke kaip ir "
+"Paleisti fzputtygen nepavyko\n"
+"Įsitikinkite, kad šis vykdomasis failas yra tame pačiame aplanke kaip ir "
 "pagrindinis FileZilla vykdomasis failas."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
-msgstr "fzsftp negali būti vykdomas"
+msgstr "Paleisti fzsftp nepavyko"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
-msgstr "gnutls_certificate_get_peers negražina liudijimų"
+msgstr "gnutls_certificate_get_peers negrąžino liudijimų"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "daugiau nei"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "vykdyti grupei"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "skaityti grupei"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "rašyti grupei"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
-msgstr "yra lygus"
+msgstr "yra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
-msgstr "yra įjungtas"
+msgstr "nustatytas"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
-msgstr "yra išjungtas"
+msgstr "nenustatytas"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
-msgstr "mažiau nei"
+msgstr "mažesnis nei"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "atitinka regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "vykdyti savininkui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "skaityti savininkui"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "rašyti savininkui"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "nežinomas"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "vykdyti visiems"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "skaityti visiems"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "rašyti visiems"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
-#~ msgid "Duplicate filter name"
-#~ msgstr "Dvigubas filtro pavadinimas"
+#~ msgid "&Copy"
+#~ msgstr "K&opijuoti"
+
+#~ msgid "Cop&y"
+#~ msgstr "Kopijuot&i"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s baitai (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s baitai (%d.%d MB/s)"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Leisti automatiškai tikrinti ar yra atnaujimų"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Dienų skaičius tarp naujų versijų ieškojimo:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Bent 7 dienos)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automatinis atnaujinimų tikrinimas"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Tikrinti ar yra &beta versijų ir leidimo kandidatų"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Įveskite atnaujinimo intervalą (mažiausiai 7 dienos)"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Privatumo politika:"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "&Prisiminti šį ir visus būsimus slaptažodžius"
diff -Nru filezilla-3.5.3/locales/lv_LV.po filezilla-3.7.3~precise/locales/lv_LV.po
--- filezilla-3.5.3/locales/lv_LV.po	2010-11-14 19:18:33.000000000 +0000
+++ filezilla-3.7.3~precise/locales/lv_LV.po	2012-10-21 20:00:08.000000000 +0000
@@ -7,9 +7,9 @@
 msgstr ""
 "Project-Id-Version: lv\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-11-07 22:34+0100\n"
-"PO-Revision-Date: 2010-11-10 17:06+0200\n"
-"Last-Translator: Ivo Simsons <ssimss@gmail.com>\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
+"PO-Revision-Date: 2012-03-26 19:33+0200\n"
+"Last-Translator: \n"
 "Language-Team: Latvian <ssimss@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -30,7 +30,7 @@
 msgid "%H:%M:%S left"
 msgstr "Palikušas %H:%M:%S"
 
-#: resources.h:774
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -47,9 +47,9 @@
 msgstr[1] "%d direktoriji"
 msgstr[2] "%d direktoriju"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -85,7 +85,7 @@
 msgstr[1] "%d datnes. Kopējais izmērs: Vismaz %s"
 msgstr[2] "%d datnes. Kopējais izmērs: Vismaz %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2833
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d datnes pievienotas rindai"
@@ -98,11 +98,11 @@
 msgstr[1] "%d sekundes"
 msgstr[2] "%d sekundes"
 
-#: resources.h:771
+#: resources.h:785
 msgid "%h - Host"
 msgstr "%h - Saimniekdators"
 
-#: resources.h:773
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Parole"
@@ -137,7 +137,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Vel nav derīgs!"
 
-#: resources.h:775
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Starpniekservera lietotājs"
@@ -206,45 +206,45 @@
 msgid "%s with %d bits"
 msgstr ""
 
-#: resources.h:772
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Lietotājvārds"
 
-#: resources.h:776
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Starpniekservera parole"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
 msgstr "&Par..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "&Konts:"
 
-#: resources.h:100 resources.h:676 resources.h:740
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "&Aktīvs"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr "&Pievieot grāmatzīmi..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "&Pievienot datnes rindai"
 
-#: resources.h:784
+#: resources.h:798
 msgid "&Add keyfile..."
 msgstr "&pievienot atslēgdatni..."
 
-#: resources.h:626 resources.h:645
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
 msgstr "&Pievienot rindai"
 
-#: resources.h:94
+#: resources.h:95
 msgid "&Adjust server timezone offset:"
 msgstr "&Uzstādiet servera laika joslas nobīdi:"
 
@@ -252,15 +252,16 @@
 msgid "&Always trust certificate in future sessions."
 msgstr "&Turpmāk vienmēr uzticēties sertifikātam."
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr ""
+"Vienmēr uzticēties šim saimniekdatoram, pievienot šo atslēgu kešatmiņai"
 
-#: resources.h:934
+#: resources.h:950
 msgid "&Always use default editor"
 msgstr "&Vienmēr lietot noklusējuma redaktoru"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr ""
 
@@ -268,243 +269,252 @@
 msgid "&Always use this action"
 msgstr "&Vienmēr lietot šo darbību"
 
-#: resources.h:752
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Jautāt operetājsistēmai pēc ārējās IP adreses"
 
-#: resources.h:526 resources.h:656 resources.h:821
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "&Automātiski"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
 msgstr "&Automātiski noteikt"
 
-#: resources.h:528 resources.h:658 resources.h:823
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "&Binārs"
 
-#: resources.h:894
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr "&Grāmatzīmes"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:931 resources.h:953
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "&Pārlūkot..."
 
-#: resources.h:811
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr ""
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:724
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "&Atcelt"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Meklēt FileZilla beta versijas"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "&Dzēst privātos datus..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&Aizvērt FileZilla"
 
-#: resources.h:666
+#: resources.h:680
 msgid "&Configure speed limits..."
 msgstr "&Konfigurēt ātruma ierobežojumus..."
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
 msgstr "&Konfigurēt..."
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "&Savienoties"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "&Kopēt"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopēt aktuālo savienojumu uz Vietņu pārvaldnieku..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "&Kopēt uz starpliktuvi"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr "&Avārija"
 
-#: resources.h:565 resources.h:579 resources.h:628 resources.h:649
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
 msgstr "&Izveidot direktoriju"
 
-#: resources.h:661
+#: resources.h:675
 msgid "&Create new tab"
 msgstr "&Izveidot jaunu cilni"
 
-#: ../../locales/../src/interface/menu_bar.cpp:71
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Atkļūdot"
 
-#: resources.h:961
+#: resources.h:977
 msgid "&Debug information in message log:"
 msgstr "&Atkļūdošanas informācija ziņojumu žurnālā:"
 
-#: resources.h:927
+#: resources.h:943
 msgid "&Default editor:"
 msgstr "&Noklusējuma redaktors:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr "&Noklusējuma datne eksistē darbība..."
 
-#: resources.h:734
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
 msgstr "&Aizkave starp neizdevušamies pieslēgšanās mēģinājumiem:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:651
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "&Dzēst"
 
-#: resources.h:456
+#: resources.h:458
 msgid "&Delete symlink"
 msgstr "&Dzēst simbolsaiti"
 
-#: resources.h:510
+#: resources.h:519
 msgid "&Directory comparison"
 msgstr "&Direktoriju salīdzināšana"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Izmest lokālo datni, tad lejupielādēt un rediģēt datni no jauna"
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "&Atvienoties"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "&Atvienoties no servera"
 
-#: resources.h:870
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr ""
+msgstr "&Rādīt momentāno pārsūtīšanas ātrumu vidējā ātruma vietā"
 
-#: resources.h:892
+#: resources.h:908
 msgid "&Display size in bytes"
 msgstr "&Rādīt izmēru baitos"
 
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "N&esaglabāt paroles"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Vairs nerādīt šo dialogu."
 
-#: resources.h:757
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
 msgstr "&Neizmantot ārējo IP adresi lokālajos savienojumos."
 
-#: resources.h:914
+#: resources.h:930
 msgid "&Double-click action on files:"
 msgstr "&Dubultklikšķa darbība ar datnēm:"
 
-#: resources.h:572 resources.h:624
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "&Lejupielādēt"
 
-#: resources.h:442
+#: resources.h:444
 msgid "&Download to:"
 msgstr "&Lejupielādēt uz:"
 
-#: resources.h:659
+#: resources.h:673
 msgid "&Download..."
 msgstr "&Lejupielādēt..."
 
-#: resources.h:256 resources.h:833
+#: resources.h:258 resources.h:847
 msgid "&Downloads:"
 msgstr "&Lejupielādes:"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "&Rediģēt"
 
-#: resources.h:209
+#: resources.h:211
 msgid "&Edit filter rules..."
 msgstr "&Rediģēt filtru noteikumus..."
 
-#: resources.h:511 resources.h:530 resources.h:639 resources.h:665
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
 msgstr "&Iespējot"
 
-#: resources.h:942
+#: resources.h:958
 msgid "&Enable automatic update check"
 msgstr "&Iespējot automātisko atjauninājumu pārbaudi"
 
-#: resources.h:480 resources.h:806
+#: resources.h:482 resources.h:820
 msgid "&Enable speed limits"
 msgstr "&Iespējot ātruma ierobežojumus"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr "&Kodējums:"
 
-#: resources.h:609
+#: resources.h:82
+msgid "&Encryption:"
+msgstr "&Šifrēšana:"
+
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "&Ievadīt pielāgotu komandu..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "&Izpildīt"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "&Eksportēt vietņu pārvaldnieka ierakstus"
 
-#: resources.h:497 resources.h:655
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "&Eksportēt..."
 
-#: resources.h:762
+#: resources.h:776
 msgid "&Fall back to active mode"
 msgstr "&Atkāpties uz aktīvo režīmu"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "&Datne"
 
-#: resources.h:636
+#: resources.h:650
 msgid "&File Attributes..."
 msgstr "&Datnes atribūti..."
 
-#: resources.h:588
+#: resources.h:600
 msgid "&File permissions..."
 msgstr "&Datnes atļaujas..."
 
-#: resources.h:364
+#: resources.h:366
 msgid "&File:"
 msgstr "&Datne:"
 
-#: resources.h:219
+#: resources.h:221
 msgid "&Filter conditions:"
 msgstr "&Filtru noteikumi:"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "&Filtru komplekti:"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&Filtri"
 
@@ -512,145 +522,145 @@
 msgid "&Finish"
 msgstr "&Beigt"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "&Beigt rediģēt un izdzēst lokālo datni"
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Sekot simbolsaitei, dzēst mērķa direktoriju saturu"
 
-#: resources.h:755
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
 msgstr "&Iegūt ārējo IP adresi no sekojošā URL:"
 
-#: resources.h:551
+#: resources.h:561
 msgid "&Getting help..."
 msgstr "&Iegūt palīdzību..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr "&Vispārējā grāmatzīme"
 
-#: resources.h:791
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr ""
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "&Palīdzība"
 
-#: resources.h:514 resources.h:642
+#: resources.h:523 resources.h:656
 msgid "&Hide identical files"
 msgstr "&Slēpt identiskās datnes"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "&Augstākā"
 
-#: resources.h:750
+#: resources.h:764
 msgid "&Highest available port:"
 msgstr "&Augstākā pieejamā pieslēgvieta:"
 
-#: resources.h:79 resources.h:377 resources.h:714
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
 msgstr "&Saimniekdators:"
 
-#: resources.h:893
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr ""
 
-#: resources.h:881
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (piemēram: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
 msgstr "&Importēt..."
 
-#: resources.h:936
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
 msgstr "&Mantot sistēmas datņu tipu asociācijas"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 
-#: resources.h:856
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
 msgstr "&Datņu un direktoriju paneļu izkārtojums:"
 
-#: resources.h:747
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Ierobežot FileZilla lietotās pieslēgvietas"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
 msgstr "&Ierobežot vienlaicīgo savienojumu skaitu"
 
-#: resources.h:519
+#: resources.h:529
 msgid "&Local directory tree"
 msgstr "&Lokālais direktoriju koks"
 
-#: resources.h:401 resources.h:407
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
 msgstr "&Lokālais direktorijs"
 
-#: resources.h:951
+#: resources.h:967
 msgid "&Log to file"
 msgstr "&Reģistrēt datnē"
 
-#: resources.h:82
+#: resources.h:83
 msgid "&Logon Type:"
 msgstr "&Pieteikšanās veids:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&Pieteikšanās veids:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "&Zema"
 
-#: resources.h:545
+#: resources.h:555
 msgid "&Manage bookmarks..."
 msgstr "&Pārvaldīt grāmatzīmes..."
 
-#: resources.h:533
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "&Manuāls pārsūtījums..."
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "&Maksimālais savienojumu skaits:"
 
-#: resources.h:732
+#: resources.h:746
 msgid "&Maximum number of retries:"
 msgstr "&Maksimālais atkārtošanu skaits:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
 msgstr "&Ziņojumu žurnāls"
 
-#: resources.h:868
+#: resources.h:883
 msgid "&Minimize to tray"
 msgstr "&Minimizēt uz uzdevumjoslu"
 
-#: resources.h:399
+#: resources.h:401
 msgid "&Name:"
 msgstr "&Vārds:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "&Tīkla konfigurācijas vednis..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
 msgstr "&Jauns"
 
@@ -666,35 +676,35 @@
 msgid "&Next >"
 msgstr "&Turpināt >"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "&Nē"
 
-#: resources.h:765 resources.h:790
+#: resources.h:779 resources.h:804
 msgid "&None"
 msgstr "&Neviens"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "&Normāla"
 
-#: resources.h:943
+#: resources.h:959
 msgid "&Number of days between update checks:"
 msgstr "&Dienu skaits starp jauninājumu pārbaudēm:"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
 msgstr "&Skaitliskā vērtība:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&Labi"
 
-#: resources.h:768
+#: resources.h:782
 msgid "&OPEN"
 msgstr "&ATVĒRT"
 
-#: resources.h:561 resources.h:647
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr "&Atvērt"
 
@@ -702,104 +712,108 @@
 msgid "&Overwrite"
 msgstr "&Pārrakstīt"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "&Pasīvs"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "&Parole:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "&Atskaņot skaņu"
 
-#: resources.h:80 resources.h:378 resources.h:718
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "&Pieslēgvieta:"
 
-#: resources.h:862
+#: resources.h:876
 msgid "&Position of the message log:"
 msgstr "Ziņojumu žurnāla &pozīcija:"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Saglabāt pārsūtīto datņu laikspiedolus"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
 msgstr "&Rindā"
 
-#: resources.h:720
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "&Ātrais savienojums"
 
-#: resources.h:517
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "&Ātrā savienojuma josla"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "&Lasīt"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "&Savienoties"
 
-#: resources.h:508 resources.h:664
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
 msgstr "&Atsvaidzināt"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
 msgstr "&Atcerēties paroli šai sesijai"
 
-#: resources.h:403 resources.h:409
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
 msgstr "&Attālais direktorijs:"
 
-#: resources.h:367
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "&Attālais ceļš:"
 
-#: resources.h:827
+#: resources.h:841
 msgid "&Remove"
 msgstr "&Aizvākt"
 
-#: resources.h:785
+#: resources.h:799
 msgid "&Remove key"
 msgstr "&Aizvākt atslēgu"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "&Aizvākt atlasītos"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:632 resources.h:653
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "&Pārdēvēt"
 
-#: resources.h:200
+#: resources.h:202
 msgid "&Rename..."
 msgstr "&Pārdēvēt..."
 
-#: resources.h:323
+#: resources.h:325
 msgid "&Reopen local file"
 msgstr "&Atvērt no jauna lokālo datni"
 
-#: resources.h:818
+#: resources.h:832
 msgid "&Replace invalid characters with:"
 msgstr "&Aizstāt nederīgas rakstzīmes ar:"
 
-#: resources.h:552
+#: resources.h:562
 msgid "&Report a bug..."
 msgstr "&Ziņot par kļūdu..."
 
-#: resources.h:616
+#: resources.h:630
 msgid "&Reset and requeue all"
 msgstr "&Atiestatīt un sarindot visu"
 
-#: resources.h:713
+#: resources.h:727
 msgid "&Restart Wizard"
 msgstr "&Restartēt vedni"
 
@@ -807,35 +821,35 @@
 msgid "&Resume"
 msgstr "&Turpināt"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
 msgstr "&Izpildīt komandu..."
 
-#: resources.h:727
+#: resources.h:741
 msgid "&Run configuration wizard now..."
 msgstr "&Palaist konfigurācijas vedni..."
 
-#: resources.h:945
+#: resources.h:961
 msgid "&Run update check now..."
 msgstr "&Palaist atjaunināšanas pārbaudi..."
 
-#: resources.h:767
+#: resources.h:781
 msgid "&SITE"
 msgstr "&VIETNE"
 
-#: resources.h:792
+#: resources.h:806
 msgid "&SOCKS 5"
 msgstr ""
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&Saglabāt kā..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
 msgstr "&Meklēt"
 
-#: resources.h:538
+#: resources.h:548
 msgid "&Search remote files..."
 msgstr "&Meklēt attālinātās datnes...."
 
@@ -843,43 +857,43 @@
 msgid "&Select Entry:"
 msgstr "&Izvēlieties ierakstu:"
 
-#: resources.h:925
+#: resources.h:941
 msgid "&Select language:"
 msgstr "&Izvēlieties valodu:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "&Atlasiet kolonnas, kas būtu redzamas:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&Serveris"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "Uzstādījumi"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "&Uzstādījumi..."
 
-#: resources.h:960
+#: resources.h:976
 msgid "&Show debug menu"
 msgstr "&Rādīt atkļūdošanas izvēlni"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr "&Rādīt ziņojumu"
 
-#: resources.h:950
+#: resources.h:966
 msgid "&Show timestamps in message log"
 msgstr "&Rādīt laikspiedolus ziņojumu žurnālā"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "&Vietņu pārvaldnieks..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr "&Vietnei specifiska grāmatzīme"
 
@@ -887,15 +901,15 @@
 msgid "&Skip"
 msgstr "&Izlaist"
 
-#: resources.h:532
+#: resources.h:542
 msgid "&Speed limits"
 msgstr "&Ātruma ierobežojumi"
 
-#: resources.h:448
+#: resources.h:450
 msgid "&Start transfer immediately"
 msgstr "&Sākt pārsūtīšanu tūlīt"
 
-#: resources.h:861
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr "&Apmainīt vietām lokālo un attālo paneli"
 
@@ -903,71 +917,71 @@
 msgid "&Test"
 msgstr "&Tests"
 
-#: resources.h:873
+#: resources.h:889
 msgid "&Theme:"
 msgstr "&Tēma:"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
 msgstr "&Pārsūtīšana"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
 msgstr "&Pārsūtīšanas režīms:"
 
-#: resources.h:521
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "&Pārsūtījumu rinda"
 
-#: resources.h:830
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
 msgstr ""
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
 msgstr "&Atrediģēt"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr ""
 
-#: resources.h:555 resources.h:643
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "&Augšupielādēt"
 
-#: resources.h:266 resources.h:842
+#: resources.h:268 resources.h:856
 msgid "&Uploads:"
 msgstr "&Augšupielādes:"
 
-#: resources.h:424
+#: resources.h:426
 msgid "&Use custom program"
 msgstr "&Lietot pielāgotu programmu"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
 msgstr "&Izmantot sinhonizēto pārlūkošanu"
 
-#: resources.h:929
+#: resources.h:945
 msgid "&Use system's default editor for text files"
 msgstr "&Lietot sistēmas noklusēto redaktoru teksta datnēm"
 
-#: resources.h:753
+#: resources.h:767
 msgid "&Use the following IP address:"
 msgstr "&Lietot sekojošo IP adresi:"
 
-#: resources.h:761
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
 msgstr "&Izmantot tās vietā servera ārējo IP adresi"
 
-#: resources.h:896
+#: resources.h:912
 msgid "&Use thousands separator"
 msgstr "&Lietot tūkstošu atdalītāju"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "&Lietotājs:"
 
-#: resources.h:716
+#: resources.h:730
 msgid "&Username:"
 msgstr "&Lietotājvārds:"
 
@@ -976,45 +990,45 @@
 msgid "&Version %s"
 msgstr "&Versija %s"
 
-#: resources.h:507
+#: resources.h:516
 msgid "&View"
 msgstr "&Skatīt"
 
-#: resources.h:578
+#: resources.h:588
 msgid "&View/Edit"
 msgstr "&Skatīt/Rediģēt"
 
-#: resources.h:935
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Sekot lokāli rediģēdātām datnēm un piedāvāt augšupielādēt izmaiņas"
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "&Rakstīt"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "&Jā"
 
-#: ../../locales/../src/engine/local_path.cpp:442
-#: ../../locales/../src/engine/local_path.cpp:492
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "'%s' neeksistē, vai arī tam nevar piekļūt."
 
-#: ../../locales/../src/engine/local_path.cpp:458
-#: ../../locales/../src/engine/local_path.cpp:479
-#: ../../locales/../src/engine/local_path.cpp:486
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' nav direktorijs."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1060
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1030,39 +1044,39 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: resources.h:802 resources.h:804
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr "(0 neierobežotam)"
 
-#: resources.h:733
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:735
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekundes)"
 
-#: resources.h:800
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:729
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 lai atslēgtu)"
 
-#: resources.h:944
+#: resources.h:960
 msgid "(At least 7 days)"
 msgstr "(Vismaz 7 dienas)"
 
-#: resources.h:889
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(piemēram: %H:%M)"
 
-#: resources.h:883
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr "(piemēram: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:808 resources.h:810
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
 #, c-format
 msgid "(in %s/s)"
 msgstr "(%s/s)"
@@ -1075,19 +1089,19 @@
 msgid ", --:--:-- left"
 msgstr "Palikušas --:--:--"
 
-#: resources.h:701
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr "- Salūzis maršrutētājs un/vai ugunsmūris"
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr "- Datne bojāta spoguļvietnē"
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr ""
 
@@ -1111,31 +1125,31 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr ""
 
-#: resources.h:962
+#: resources.h:978
 msgid "0 - None"
 msgstr "0 - Nekas"
 
-#: resources.h:963
+#: resources.h:979
 msgid "1 - Warning"
 msgstr "1 - Brīdinājums"
 
-#: resources.h:964
+#: resources.h:980
 msgid "2 - Info"
 msgstr "2 - Informācija"
 
-#: resources.h:965
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr "3 - Izplūdis"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 bitu sistēma"
 
-#: resources.h:966
+#: resources.h:982
 msgid "4 - Debug"
 msgstr "4 - Atkļūdot"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 bitu sistēma"
 
@@ -1143,11 +1157,11 @@
 msgid "< &Back"
 msgstr "< &Atpakaļ"
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:106
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
@@ -1157,34 +1171,34 @@
 msgid "A default editor needs to be set."
 msgstr "Jāiestata noklusējuma redaktors."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
+#: ../../locales/../src/interface/RemoteListView.cpp:155
 #: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Direktoriju nevar ievilkt vienā no tā apakšdirektorijiem."
 
-#: resources.h:673
+#: resources.h:687
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr "Iepriekš atvērta datne ir mainījusies."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2081
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2077
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "Datne ar šādu vārdu jau tiek pārsūtīta."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2666
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
@@ -1200,17 +1214,17 @@
 "No further warning will be displayed this session."
 msgstr ""
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr "Ir pieejama jaunāka FileZilla versija:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
 
-#: resources.h:745
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1222,15 +1236,15 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:527 resources.h:657 resources.h:822
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:826
+#: resources.h:840
 msgid "A&dd"
 msgstr "P&ievienot"
 
-#: resources.h:853
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
 msgstr "A&tļaut ASCII datņu turpināšanu"
 
@@ -1242,51 +1256,51 @@
 msgid "A&pply only to uploads"
 msgstr "P&ielietot tikai augšupielādēm"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
 msgstr "P&ielietot visām datnēm un direktorijām"
 
-#: resources.h:623
+#: resources.h:637
 msgid "A&utomatically remove successful transfers"
 msgstr "A&utomātiski aizvākt veiksmīgus pārsūtījumus"
 
-#: resources.h:388
+#: resources.h:390
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
 msgstr "Pārtrāukt iepriekšējo savienojumu un savienoties aktuālajā cilnē"
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
 msgstr "Par FileZilla"
 
-#: resources.h:863
+#: resources.h:877
 msgid "Above the file lists"
 msgstr "Virs datņu sarakstiem"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/manual_transfer.cpp:554
-#: ../../locales/../src/interface/sitemanager.cpp:1395
-#: ../../locales/../src/interface/sitemanager.cpp:1396
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "Konts"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr "Darbība pēc rindas &pabeigšanas"
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "Darbība ar atlasīto datni:"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
 msgstr "Veicamā darbība:"
 
@@ -1322,23 +1336,23 @@
 "Aktīvā režīma FTP tests neizdevās. FileZilla zin pareizu ārējo IP adresi, "
 "bet jūsu maršrutētājs vai ugunsmūris maldinoši modificējis nosūtīto adresi."
 
-#: resources.h:758
+#: resources.h:772
 msgid "Active mode IP"
 msgstr "Aktīvā režīma IP"
 
-#: resources.h:449
+#: resources.h:451
 msgid "Add files to &queue only"
 msgstr "Tikai pievienot datnes &rindai"
 
-#: resources.h:627 resources.h:646
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
 msgstr "Pievienot izvēlēto direktoriju pārsūtīšanas rinadai"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Pievienot izvēlētās datnes un direktoriji pārsūtīšanas rinadai"
 
-#: resources.h:916 resources.h:922
+#: resources.h:932 resources.h:938
 msgid "Add to queue"
 msgstr "Pievienot rindai"
 
@@ -1346,27 +1360,27 @@
 msgid "Address type not supported"
 msgstr "Neatbalstīts adreses veids"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "Izvērsts"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "Izvērstas opcijas:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "Algoritms:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3035
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "All files have been successfully transferred"
 msgstr "Visas datnes ir veiksmīgi pārsūtītas"
 
-#: resources.h:702
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr ""
+msgstr "Visām pieslēgvietām šajā diapazonā jābūt starp 1024 un 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3031
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, 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."
@@ -1374,25 +1388,25 @@
 msgstr[1] "Visi pārsūtijumi ir pabeigti. %d datnes nevarēja tikt pārsūtītas."
 msgstr[2] "Visi pārsūtijumi ir pabeigti. %d datņu nevarēja tikt pārsūtītas."
 
-#: resources.h:741
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Kļūmes gadījumā ļaut &atkāpties uz citu pārsūtīšanas režīmu"
 
-#: resources.h:677
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Kļūmes gadījumā ļaut atkāpties uz citu pārsūtīšanas režīmu"
 
-#: resources.h:475
+#: resources.h:477
 msgid "Already connected"
 msgstr "Jau savienots"
 
-#: resources.h:786
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
 
-#: resources.h:787
+#: resources.h:801
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1406,19 +1420,33 @@
 "Lūdzu apmeklējiet http://filezilla-project.org, lai lejupielādētu aktuālāko "
 "versiju."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2312
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:552
-#: ../../locales/../src/interface/sitemanager.cpp:1394
-#: ../../locales/../src/interface/sitemanager.cpp:1636
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Anonīms"
 
@@ -1427,11 +1455,11 @@
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:888
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Jebkādas izmaiņas, kas veiktas vietņu pārvaldniekā, nevar saglabāt."
 
-#: ../../locales/../src/interface/sitemanager.cpp:735
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1439,19 +1467,19 @@
 "Jebkādas izmaiņas, kas veiktas vietņu pārvaldniekā, netiks saglabātas, ja "
 "vien nesalabosiet datni."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Jebkādas izmaiņas, kas veiktas filtriem, nevar saglabāt."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr "Jebkādas izmaiņas, kas veiktas filtriem, netiks saglabātas."
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
 msgstr "Pieliet&ot tikai direktorijām"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
 msgstr "Pielietot"
 
@@ -1459,38 +1487,38 @@
 msgid "Apply to &current queue only"
 msgstr "Pielietot tikai aktuālajai rindai"
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
 msgstr "Pielietot tikai &datnēm"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "Arhīvs"
 
-#: resources.h:865
+#: resources.h:879
 msgid "As tab in the transfer queue pane"
 msgstr "Kā cilni pārsūtījumu rindas panelī"
 
-#: resources.h:258 resources.h:268 resources.h:834 resources.h:843
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 msgid "Ask for action"
 msgstr "Jautāt pēc darbības"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Jautāt paroli"
 
-#: resources.h:698
+#: resources.h:712
 msgid "Ask operating system for a port."
 msgstr "Jautāt operētājsistēmai pēc pieslēgvietas"
 
-#: resources.h:688
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
 msgstr "Jautāt operetājsistēmai pēc ārējās IP adreses"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr "Uzdodot jautājumus FileZilla forumos"
 
@@ -1502,11 +1530,11 @@
 msgid "At least one filter condition is incomplete"
 msgstr "Vismaz viens filtra nosacījums ir nederīgs"
 
-#: resources.h:707
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr "Uz doto brīdi visa nepieciešamā informācija ir savākta."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:136
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
 msgstr "Atribūti"
 
@@ -1514,23 +1542,23 @@
 msgid "Authentication failed."
 msgstr "Autentificēšana neizdevās."
 
-#: resources.h:874
+#: resources.h:890
 msgid "Author:"
 msgstr "Autors:"
 
-#: resources.h:385
+#: resources.h:387
 msgid "Auto"
 msgstr "Automātiski"
 
-#: resources.h:824
+#: resources.h:838
 msgid "Automatic file type classification"
 msgstr "Automātiska datnes tipa klasifikācija"
 
-#: resources.h:941
+#: resources.h:957
 msgid "Automatic update check"
 msgstr "Automātiskā atjauninājumu pārbaudīšana"
 
-#: resources.h:878
+#: resources.h:894
 msgid "Available sizes"
 msgstr "Pieejamie izmēri"
 
@@ -1539,54 +1567,58 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
 msgstr "A&piet starpniekserveri"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr "Pamata lietošanas instrukcijas"
 
-#: resources.h:867
+#: resources.h:881
 msgid "Behaviour"
 msgstr "Rīcība"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr "Tiek rediģēts"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
 msgstr "Uzmanieties! Sertifikāts ir ticis anulēts"
 
-#: resources.h:389
+#: resources.h:391
 msgid "Binary"
 msgstr "Binārs"
 
-#: resources.h:860
+#: resources.h:874
 msgid "Blackboard"
 msgstr "Tāfele"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:267
-#: ../../locales/../src/interface/menu_bar.cpp:310
-#: ../../locales/../src/interface/sitemanager.cpp:393
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Grāmatzīme"
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
 msgstr "Grāmatzīmes:"
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
 msgstr "Grāmatzīmes"
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
 msgstr "Būvējuma datums:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
 msgstr "Būvējuma informācija"
 
@@ -1594,39 +1626,39 @@
 msgid "Business category:"
 msgstr "Uzņēmējdarbības kategorija:"
 
-#: resources.h:748
+#: resources.h:762
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
 
-#: resources.h:535
+#: resources.h:545
 msgid "C&ancel current operation"
 msgstr "A&tcelt pašreizējo darbību"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "P&ārbaudīt FileZilla nakts būvējumus"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
 msgstr "Attīrīt visu"
 
-#: resources.h:586 resources.h:634
+#: resources.h:598 resources.h:648
 msgid "C&opy URL(s) to clipboard"
 msgstr "K&opēt URL uz starpliktuvi"
 
-#: resources.h:882
+#: resources.h:898
 msgid "C&ustom"
 msgstr "P&ielāgots"
 
-#: resources.h:937
+#: resources.h:953
 msgid "C&ustom filetype associations:"
 msgstr "P&ielāgotās datņu tipu asociācijas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1269
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
 msgstr "Aprēķina servera laika joslu nobīdi..."
 
@@ -1645,28 +1677,28 @@
 msgid "Can't write data to file: %s"
 msgstr "Nevar ierakstīt informāciju datnē: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Atcelt"
 
-#: resources.h:984
+#: resources.h:1000
 msgid "Cancel current operation"
 msgstr "Atcelt pašreizējo darbību"
 
-#: resources.h:985
+#: resources.h:1001
 msgid "Cancels the current operation"
 msgstr "Atceļ pašreizējo darbību"
 
-#: ../../locales/../src/engine/local_path.cpp:452
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:560
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
 msgstr "Nevar pievienot serveri Vietņu pārvaldniekam"
 
@@ -1683,8 +1715,10 @@
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
+"Nevar salīdzināt direktorijus, ir iespējoti dažādi filtri vietējiem un "
+"attālajiem direktorijiem"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2764
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Nevar salīdzināt direktorijus, nav savienojuma ar serveri."
 
@@ -1692,22 +1726,22 @@
 msgid "Cannot create new filter"
 msgstr "Nevar izveidot jaunu filtru"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2059
-#: ../../locales/../src/interface/LocalListView.cpp:2190
-#: ../../locales/../src/interface/RemoteListView.cpp:2595
-#: ../../locales/../src/interface/RemoteListView.cpp:2641
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "Nevar rediģēt datni"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1975
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 msgid "Cannot edit file, not connected to any server."
 msgstr "Nevar salīdzināt direktorijus, nav savienojuma ar serveri."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1986
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
 msgstr "Nevar rediģēt datni, nezināms attālais ceļš."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1715,8 +1749,8 @@
 "Nevar izveidot FTP savienojumu ar SFTP serveri. Lūdzu izvēlieties pareizu "
 "protokolu."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Nevar ielādēt ātrā savienojuma joslu no resursu datnes"
 
@@ -1728,44 +1762,44 @@
 msgid "Cannot load keyfile"
 msgstr "Nevar ielādēt atslēgdatni"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1033
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
-msgstr "Nevar ielādēt rīku joslu no resursu datnes"
+msgstr "Nevar ielādēt rīkjoslu no resursu datnes"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:708
-#: ../../locales/../src/interface/sitemanager.cpp:1288
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr "Nevar pārsaukt ierakstu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1860
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "Nevar pārsaukt datni"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Nevar saglabāt filtru komplektu"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Nevar atlasīt filtru"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
 msgstr "Nevar iestatīt datņu asociācijas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "Nevar parādīt dialogu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2077
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
 msgstr "Nevar parādīt/rediģēt atlasīto datni"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
 msgstr "Kategorijas"
 
@@ -1778,27 +1812,26 @@
 msgstr "Sertifikāta detaļas"
 
 #: resources.h:3 resources.h:27
-#, fuzzy
 msgid "Certificate in chain:"
-msgstr "Sertifikāta detaļas"
+msgstr "Sertifikāts ķēdē:"
 
 #: resources.h:13 resources.h:37
 msgid "Certificate issuer"
 msgstr "Sertifikāta izsniedzējs"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
 msgstr ""
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
 msgstr "Mainīt dates atribūtus"
 
-#: resources.h:589 resources.h:637
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
 msgstr "Mainīt datnes atļaujas"
 
-#: resources.h:958
+#: resources.h:974
 #, fuzzy
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Atver Filezilla uzstādījumu dialogu"
@@ -1807,19 +1840,19 @@
 msgid "Character encoding issue"
 msgstr "Rakstzīmju kodējuma problēma"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr "Rakstzīmju kopa"
 
-#: resources.h:946
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
 msgstr "Meklēt &beta versijas un laidiena kanditātus"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "Pārbaudīt &atjauninājumus..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "Meklēt jaunas Filezilla versijas"
 
@@ -1827,15 +1860,15 @@
 msgid "Check for updates"
 msgstr "Pārbaudīt atjauninājumus"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1749
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
 msgstr "Neizdevās pārbaudīt atjauninājumus"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
-msgstr ""
+msgstr "Pārbauda pareizu ārējo IP adresi"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "Pārbauda atjauninājumus"
 
@@ -1843,13 +1876,13 @@
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1566
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
 msgstr "Izvēlaties lokālo noklusējuma direktoriju"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:128
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:373
-#: ../../locales/../src/interface/sitemanager.cpp:2718
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
 msgstr "Izvēlaties lokālo direktoriju"
 
@@ -1861,39 +1894,39 @@
 msgid "Cipher:"
 msgstr "Šifrs:"
 
-#: resources.h:495 resources.h:662
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
 msgstr "Ai&zvērt cilni"
 
-#: resources.h:857
+#: resources.h:871
 msgid "Classic"
 msgstr "Klasiskais"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
 msgstr "Dzēst &vietņu pārvaldnieka ierakstus"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
-msgstr ""
+msgstr "Notīrīt &izkārtojuma kešatmiņu"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
 msgstr "Dzēst &ātrā savienojuma joslu"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "Dzēst &atkalsavienojuma informāciju"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "Dzēst &pārsūtījumu rindu"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Attīrīt vēsturi"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1901,10 +1934,14 @@
 msgid "Clear private data"
 msgstr "Dzēst privātos datus"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Attīrīt ātrā savienojuma joslu"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Nospiediet uz Beigt, lai saglabātu konfigurāciju."
@@ -1913,21 +1950,21 @@
 msgid "Click on next to download the new version."
 msgstr "Noklikšķiniet uz turpināt, lai lejupielādētu jauno versiju."
 
-#: resources.h:346
+#: resources.h:348
 #, fuzzy
 msgid "Client to server MAC:"
 msgstr "Savienojas ar serveri"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr ""
 
-#: resources.h:663
+#: resources.h:677
 msgid "Close &all other tabs"
 msgstr "Aizvērt &visas citas cilnes"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1105
-#: ../../locales/../src/interface/Mainfrm.cpp:1128
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "Aizvērt FileZilla"
 
@@ -1935,11 +1972,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr ""
 
-#: resources.h:496
+#: resources.h:505
 msgid "Closes current tab"
 msgstr "Aizver aktuālo cilni"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "Ko&mentāri:"
 
@@ -1947,11 +1984,11 @@
 msgid "Column properties"
 msgstr "Kolonnas īpašības"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
 msgstr "Kolonnas iestatīšana"
 
-#: resources.h:932
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 
@@ -1967,11 +2004,11 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr ""
+msgstr "Komandu neatbalsta šis protokols"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Komanda:"
@@ -1989,15 +2026,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr ""
 
-#: resources.h:513 resources.h:641
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
 msgstr "Salīdzināt &modifikācijas laiku"
 
-#: resources.h:512 resources.h:640
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
 msgstr "Salīdzināt datnes &izmēru"
 
-#: resources.h:912
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
 msgstr ""
 
@@ -2006,60 +2043,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Atkārtošanu skaitam jābūt starp 0 un 99."
 
-#: resources.h:159
+#: resources.h:160
 msgid "Compiled for:"
 msgstr "Kompilēts:"
 
-#: resources.h:160
+#: resources.h:161
 msgid "Compiled on:"
 msgstr "Kompilēts ar:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
 msgstr "Kompilēts ar:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
 msgstr "Kompilatora karodziņi:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr "Saspiests"
 
-#: resources.h:798
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr "Vienlaicīgie pārsūtījumi"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr "Nosacījumi ir &reģistrjutīgi"
 
-#: resources.h:706
+#: resources.h:720
 msgid "Configuration test"
 msgstr "Konfigurācijas tests"
 
-#: resources.h:680
+#: resources.h:694
 msgid "Configure passive mode"
 msgstr "Konfigurēt pasīvo režīmu"
 
-#: resources.h:696
+#: resources.h:710
 msgid "Configure port range"
 msgstr "Konfigurēt pieslēgvietu diapazonu"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
-msgstr ""
+msgstr "FileZilla un jūsu tīkla konfigurēšana"
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1033
 msgid "Confirm deletion"
 msgstr "Apstiprināt dzēšanu"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2030
-#: ../../locales/../src/interface/LocalListView.cpp:2150
-#: ../../locales/../src/interface/RemoteListView.cpp:1666
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1124
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Nepieciešams apstiprinājums"
 
@@ -2067,7 +2104,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Apsveicam, izskatās, ka jūsu konfigurācija darbojas."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Savienoties apejot starpniekservera iestatījumus"
 
@@ -2075,11 +2112,11 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Savienoties ar norādīto Vietņu pārvaldiena vietni"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "Savienots"
 
-#: ../../locales/../src/interface/QueueView.cpp:1436
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "Savienojas"
 
@@ -2110,7 +2147,7 @@
 msgid "Connection"
 msgstr "Savienojas"
 
-#: ../../locales/../src/interface/QueueView.cpp:1054
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
 msgstr "Savienošanās mēģinājums neizdevās"
 
@@ -2135,11 +2172,11 @@
 msgstr "Savienojums slēgts"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
 msgstr "Savienojumu slēdza serveris"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Nodibināts savienojums, inicializē TLS..."
@@ -2148,7 +2185,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Nodibināts savienojums, sūta HTTP pieprasījumu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
 msgstr "Nodibināts savienojums, gaida sagaidīšanas ziņojumu..."
 
@@ -2173,7 +2210,7 @@
 msgid "Connection timed out."
 msgstr "Savienojums noildzis."
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:676
 msgid "Connection to server lost."
 msgstr "Savienojums ar serveri pazudis."
 
@@ -2184,7 +2221,7 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
-msgstr ""
+msgstr "Savienojums ar serveri tika slēgts priekšlaicīgi."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:552
 msgid "Connection with the test server failed."
@@ -2194,23 +2231,23 @@
 msgid "Convert keyfile"
 msgstr "Konvertēt atslēgdatni"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "Kopē&t"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:646
-#: ../../locales/../src/interface/sitemanager.cpp:1866
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopēt (%d) no %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:623
-#: ../../locales/../src/interface/sitemanager.cpp:1843
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr "%s kopija"
 
-#: resources.h:587 resources.h:635
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Kopē atlasīto vienumu URL uz starpliktuvi."
 
@@ -2219,8 +2256,8 @@
 msgid "Could not accept connection: %s"
 msgstr "Nevar pieņemt savienojumu: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:97
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:546
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
 msgstr "Nevar pievienot savienojumu vietņu pārvaldniekam"
 
@@ -2243,24 +2280,24 @@
 msgid "Could not convert private key"
 msgstr "Nevar pārveidot privāto atslēgu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3065
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1453
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not copy URLs"
 msgstr "Nevar nokopēt URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Nevar nokopet datus"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2515
-#: ../../locales/../src/interface/RemoteTreeView.cpp:898
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
 msgstr "Nevar izveidot savienojumu ar serveri"
 
@@ -2272,18 +2309,18 @@
 "variable."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 #, fuzzy
 msgid "Could not generate custom login sequence."
 msgstr "Nevar savienoties ar serveri"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2299,15 +2336,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2595
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2354,9 +2391,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3065
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1453
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not open clipboard"
 msgstr "Neizdevās atvērt starpliktuvi"
 
@@ -2367,30 +2404,30 @@
 msgid "Could not open log file: %s"
 msgstr "Nevar atvērt žurnāla datni %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:67
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #, fuzzy
 msgid "Could not parse remote path."
 msgstr "Jānorāda lietotājvārds"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
 #, fuzzy, c-format
 msgid "Could not read from socket: %s"
 msgstr "Neizdevās rakstīt datni %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2637
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
 msgstr "Nevar nolasīt servera vienumu."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
 msgstr ""
 
@@ -2399,7 +2436,7 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Nevar savienoties ar serveri"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
 msgstr ""
 
@@ -2408,55 +2445,58 @@
 msgid "Could not start proxy handshake: %s"
 msgstr "Neizdevās uzsākt pārsūtījumu"
 
-#: ../../locales/../src/interface/QueueView.cpp:1105
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
 msgstr "Neizdevās uzsākt pārsūtījumu"
 
-#: ../../locales/../src/interface/sitemanager.cpp:912
-#: ../../locales/../src/interface/sitemanager.cpp:2934
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
+"Nevarēja rakstīt \"%s\", nekādas izmaiņas Vietņu pārvaldniekā nevar "
+"saglabāt: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:853
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr ""
+msgstr "Nevarēja rakstīt \"%s\", grāmatzīmi nevar pievienot: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:325
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr ""
+msgstr "Nevarēja rakstīt \"%s\", vispārējās grāmatzīmes nevar saglabāt: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1946
-#: ../../locales/../src/interface/QueueView.cpp:1982
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
 msgstr ""
+"Nevarēja rakstīt \"%s\", rindu nevar saglabāt.\n"
+"%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2699
-#: ../../locales/../src/interface/sitemanager.cpp:3061
-#: ../../locales/../src/interface/sitemanager.cpp:3123
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr ""
+msgstr "Nevarēja rakstīt \"%s\", atlasītās vietnes nevar eksportēt: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr ""
+msgstr "Nevarēja rakstīt \"%s\": %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
 msgstr "Neizdevās rakstīt atslēgdatni: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1099
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
 msgstr "Neizdevās rakstīt lokalo datni"
 
@@ -2476,27 +2516,42 @@
 msgid "Country:"
 msgstr "Valsts:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 
-#: resources.h:566 resources.h:580 resources.h:629 resources.h:650
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "Nevar izveidot jaunu filtru"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
 msgstr "Izveido jaunu apakšdirektoriju aktuālajā direktorijā"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1184
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1570
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1275
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Izveido jaunu apakšdirektoriju aktuālajā direktorijā"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "Izveido direktoriju"
 
-#: ../../locales/../src/interface/QueueView.cpp:1509
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "Nevar rediģēt datni"
+
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
 msgstr "Izveido direktoriju"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2046
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Izveido direktoriju '%s'..."
@@ -2533,48 +2588,52 @@
 msgid "Current transfer type is set to binary."
 msgstr "Aktuālais pārsūtījumu veids ir iestatīts uz bināro."
 
-#: resources.h:769 resources.h:888
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr "Pielā&gots"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Pielāgots filtru komplekts"
 
-#: resources.h:375 resources.h:376
+#: resources.h:377 resources.h:378
 msgid "Custom server"
 msgstr "Pielāgots serveris"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
 msgstr "D&atu veids"
 
-#: resources.h:895
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "N&oklusējums"
 
-#: resources.h:582 resources.h:630 resources.h:660
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "D&zēst"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
 msgstr "A&tslēgt visu"
 
-#: resources.h:919
+#: resources.h:882
+msgid "D&o not save passwords"
+msgstr "N&esaglabāt paroles"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
 msgstr "D&ubultklikšķa darbība ar direktorijiem:"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr ""
+msgstr "DOS-veidīgi ar virtuālajiem ceļiem"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "Bīstams datnes tips"
 
@@ -2587,11 +2646,11 @@
 msgid "Data socket closed too early."
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:151
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
 msgid "Date"
 msgstr "Datums"
 
-#: resources.h:879
+#: resources.h:895
 msgid "Date formatting"
 msgstr "Datuma formatēšana"
 
@@ -2610,15 +2669,15 @@
 msgid "Debug"
 msgstr "Atkļūdot"
 
-#: resources.h:959
+#: resources.h:975
 msgid "Debugging settings"
 msgstr "Atkļūdošanas uzstādījumi"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
 msgstr "Noklusējuma &lokālais direktorijs:"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
 msgstr "Noklusējuma (Automātiskā noteikšana)"
 
@@ -2626,15 +2685,15 @@
 msgid "Default editor not properly quoted."
 msgstr ""
 
-#: resources.h:254 resources.h:276 resources.h:851
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
 msgstr "Noklusējuma datne eksistē darbība"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
 msgstr "Noklusējuma a&ttālā direktorijs:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1159
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2644,15 +2703,15 @@
 msgid "Default system language"
 msgstr "Sistēmas noklusējuma valoda"
 
-#: resources.h:674
+#: resources.h:688
 msgid "Default transfer mode:"
 msgstr "Noklusējuma pārsūtīšanas režīms"
 
-#: resources.h:820
+#: resources.h:834
 msgid "Default transfer type:"
 msgstr "Noklusējuma pārsūtīšanas veids:"
 
-#: resources.h:693 resources.h:756
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Noklusējuma: http://ip.filezilla-project.org/ip.php"
 
@@ -2675,47 +2734,47 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1321
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
 msgstr "Dzēst vietņu pārvaldnieka ierakstu"
 
-#: resources.h:631 resources.h:652
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
 msgstr "Dzēst izvēlēto direktoriju"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
 msgstr "Dzēst izvēlētās datnes un direktoriji"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting directories"
 msgstr "Dzēš direktorijus"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1055
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "Darbavirsma"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Detaļas"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "Jaunās atslēgas detaļas:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "Ma&pes"
 
-#: ../../locales/../src/interface/queue.cpp:1194
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Virziens"
 
@@ -2723,9 +2782,9 @@
 msgid "Directory"
 msgstr "Direktorijs"
 
-#: resources.h:638 resources.h:910 resources.h:993
+#: resources.h:652 resources.h:926 resources.h:1009
 #: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2313
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
 msgstr "Direktoriju salīdzināšana"
 
@@ -2743,11 +2802,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Direktorija izdruku pārtrauca lietotājs"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2315
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
 msgstr "Direktorija izdruka neizdevās"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
 msgstr "Direktorija izdrukas filtri"
 
@@ -2755,7 +2814,7 @@
 msgid "Directory listing successful"
 msgstr "Direktorija izdruka veiksmīga"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "Ats&lēgt visu"
 
@@ -2764,25 +2823,25 @@
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 #, fuzzy
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "Atslēdziet šo opciju, ja jūs vairs neredzat savas datnes."
 
-#: resources.h:986
+#: resources.h:1002
 msgid "Disconnect from server"
 msgstr "Atvienoties no servera"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1052
-#: ../../locales/../src/interface/QueueView.cpp:1096
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "Atvienots no servera"
 
@@ -2792,24 +2851,24 @@
 msgid "Disconnected from server: %s"
 msgstr "Atvienots no servera: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1411
+#: ../../locales/../src/interface/QueueView.cpp:1429
 #: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
 msgstr "Atvienojas no iepriekšējā servera"
 
-#: resources.h:987
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
 msgstr "Atvienojas no pašreizējā servera"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "Parāda \"Par\" dialogu"
 
-#: resources.h:928
+#: resources.h:944
 msgid "Do &not use default editor"
 msgstr "Nelietot &noklusējuma redaktoru"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "Nedarīt &neko"
 
@@ -2823,8 +2882,8 @@
 "Izmantojiet labāk stabilas versijas, ja nu vienīgi gribat izmēģināt jaunas "
 "iespējas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
 msgstr "Vai tiešām vēlaties aizvērt FileZilla?"
 
@@ -2839,7 +2898,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Vai tiešām vēlaties dzēst visus vietņu pārvaldnieka ierakstus?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1323
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
 msgstr "Vai tiešām vēlaties dzēst atlasīto ierakstu?"
 
@@ -2847,32 +2906,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Vai tiešām vēlaties dzēst pārsūtīšanas rindu?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Vai tiešām vēlaties sūtīt '%s' uz serveri?"
 
-#: resources.h:465
+#: resources.h:467
 msgid "Documentation"
 msgstr "Dokumentācija"
 
-#: resources.h:695
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
 msgstr "Neizmantot ārējās IP adreses lokālajos savienojumos."
 
-#: resources.h:831
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 
-#: resources.h:913
+#: resources.h:929
 msgid "Double-click action"
 msgstr "Dubultklikšķa darbība"
 
-#: resources.h:361
+#: resources.h:363
 msgid "Download"
 msgstr "Lejupielādēt"
 
-#: resources.h:481 resources.h:807
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
 msgstr "Lejupielādēs &ierobežojums:"
 
@@ -2885,20 +2944,20 @@
 msgid "Download limit: none"
 msgstr "Lejupielādēs ierobežojums: nekāds"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 msgid "Download search results"
 msgstr "Lejupielādēt meklēšanas rezultātus"
 
-#: resources.h:625
+#: resources.h:639
 msgid "Download selected directory"
 msgstr "Lejupielādēt izvēlēto direktoriju"
 
-#: resources.h:573
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "Lejupielādēt atlasītās datnes un direktorijus"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "Lejupielādē"
 
@@ -2908,51 +2967,45 @@
 msgid "Downloading %s"
 msgstr "Lejupielādē %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading search results"
 msgstr "Lejupielādē meklēšanas rezultātus"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Dubults filtra vārds"
-
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "A&ktivizēt visus"
 
-#: resources.h:559 resources.h:576
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
 msgstr "I&eiet direktorijā"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "I&zpildīt"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "I&ziet"
 
@@ -2964,25 +3017,25 @@
 msgid "Each filter needs at least one condition."
 msgstr "Katram filtram vajag vismaz vienu nosacījumu."
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
 msgstr "Rediģēt filtrus"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:1975
-#: ../../locales/../src/interface/LocalListView.cpp:1986
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Editing failed"
 msgstr "Rediģēšana neizdevāš"
 
-#: resources.h:876
+#: resources.h:892
 msgid "Email:"
 msgstr "E-pasts:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2221
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
 msgstr "Tukša komanda"
 
@@ -2990,7 +3043,7 @@
 msgid "Empty command."
 msgstr "Tukša komanda."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2317
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
 msgstr "Tukša direktorija izdruka"
 
@@ -3017,24 +3070,24 @@
 msgid "Empty quoted string."
 msgstr "Tukša direktorija izdruka"
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "Ak&tivizēt visus"
 
-#: resources.h:816
+#: resources.h:830
 #, fuzzy
 msgid "Enable invalid character &filtering"
 msgstr "Filtra validēšana neizdevās"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr "Šifrēts"
 
-#: resources.h:343
+#: resources.h:345
 msgid "Encryption"
 msgstr "Šifrēšana"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
 msgstr "Šifrēšanas detaļas"
 
@@ -3042,24 +3095,24 @@
 msgid "End comparison and change sorting order?"
 msgstr ""
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "Ievadīt &pielāgotu komandu..."
 
-#: resources.h:485
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Ievadiet 0 neierobežotam ātrumam."
 
-#: ../../locales/../src/interface/QueueView.cpp:2210
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
 msgstr "Ievadiet komandu"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:572
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
 msgstr "Ievadiet pielāgotu komandu"
 
-#: resources.h:920
+#: resources.h:936
 msgid "Enter directory"
 msgstr "Ieiet direktorijā"
 
@@ -3069,23 +3122,23 @@
 msgid "Enter filter name"
 msgstr "Ievadiet filtra vārdu"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Ievadiet filtru komplekta vārdu"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Ievadiet jaunu filtru komplekta vārdu"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
 msgstr "Ievadiet paroli"
 
-#: resources.h:560 resources.h:577
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
 msgstr "Ieiet atlasītājā direktorijā"
 
-#: resources.h:715
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3108,7 +3161,7 @@
 "Please note that the converted file will not be password protected."
 msgstr ""
 
-#: resources.h:719
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3130,47 +3183,53 @@
 msgid "Error importing"
 msgstr "Kļūda importējot"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:167
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:294
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:726
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:767
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:816
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/QueueView.cpp:2052
+msgid "Error loading queue"
+msgstr "Kļūda ielādējot rindu"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
 #: ../../locales/../src/interface/import.cpp:120
 #: ../../locales/../src/interface/import.cpp:311
-#: ../../locales/../src/interface/Options.cpp:212
-#: ../../locales/../src/interface/QueueView.cpp:1936
-#: ../../locales/../src/interface/QueueView.cpp:1963
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:736
-#: ../../locales/../src/interface/sitemanager.cpp:889
-#: ../../locales/../src/interface/sitemanager.cpp:2100
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2774
-#: ../../locales/../src/interface/sitemanager.cpp:2880
-#: ../../locales/../src/interface/sitemanager.cpp:3000
-#: ../../locales/../src/interface/sitemanager.cpp:3087
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "Kļūda ielādējot xml datni"
 
+#: ../../locales/../src/interface/QueueView.cpp:1951
+msgid "Error saving queue"
+msgstr "Kļūda saglabājot rindu"
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr "Kļūda uzsākot pprogrammu"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:326
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:854
-#: ../../locales/../src/interface/QueueView.cpp:1947
-#: ../../locales/../src/interface/QueueView.cpp:1983
-#: ../../locales/../src/interface/sitemanager.cpp:913
-#: ../../locales/../src/interface/sitemanager.cpp:2700
-#: ../../locales/../src/interface/sitemanager.cpp:2935
-#: ../../locales/../src/interface/sitemanager.cpp:3062
-#: ../../locales/../src/interface/sitemanager.cpp:3124
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "Kļūda rakstot xml datni"
 
@@ -3183,25 +3242,25 @@
 msgstr "Kļūda, lokālā datne eksistē, bet nevar tikt aizvākta."
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Kļūda:"
 
-#: resources.h:477
+#: resources.h:479
 msgid "Establish connection in a new tab"
 msgstr "Izveidot savienojumu jaunā cilnē"
 
-#: resources.h:939
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Piemērs: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:898
+#: resources.h:914
 msgid "Examples"
 msgstr "Piemēri"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "Izp&ildīt"
 
@@ -3209,45 +3268,56 @@
 msgid "Executable"
 msgstr "Izpildamais"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1749
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 
-#: resources.h:858
+#: resources.h:872
 msgid "Explorer"
 msgstr "Pārlūks"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "Eksportēt &rindu"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "Eksportēt &uzstādījumus"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
 msgstr "Eksporta uzstādījumi"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
 msgstr "F&iltra vārds:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1634
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP programma nav inicializēta, nevar savienoties"
 
-#: resources.h:743
+#: resources.h:757
 msgid "FTP Keep-alive"
 msgstr ""
 
-#: resources.h:763
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP starpniekserveris"
@@ -3256,25 +3326,25 @@
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:671
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:615
-#: ../../locales/../src/interface/LocalListView.cpp:2271
-#: ../../locales/../src/interface/LocalTreeView.cpp:913
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Neizdevās nomainīt direktoriju"
 
@@ -3289,11 +3359,11 @@
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Neizdevās pārbaudīt FileZilla atjauninājumu"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
 msgstr "Neizdevās kopēt vai pārvietot vietnes"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:511
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr "Neizdevās izveidot xml faila rezerves kopiju"
 
@@ -3301,8 +3371,8 @@
 msgid "Failed to create listen socket, aborting"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 
@@ -3310,11 +3380,11 @@
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Neizdevās lejupielādēt jaunāko FileZilla versiju"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:667
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
 msgstr "Neizdevās iegūt 'Mani dokumenti' ceļu"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:653
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
 msgstr "Neizdevās iegūt darbavirsmas ceļu"
 
@@ -3330,8 +3400,8 @@
 msgid "Failed to initialize FTP engine"
 msgstr "Neizdevās inicializēt FTP programmu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Neizdevās inicializēt TLS."
@@ -3345,23 +3415,28 @@
 msgid "Failed to load private key: %s"
 msgstr "Neizdevās ielādēt privāto atslēgu: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Neizdevās atvērt \"%s\" pievienošanai/rakstīšanai"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Neizdevās atvērt \"%s\" lasīšanai"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Neizdevās atvērt \"%s\" rakstīšanai"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+#, fuzzy
+msgid "Failed to parse returned path."
+msgstr "Jānorāda lietotājvārds"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr ""
@@ -3378,11 +3453,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Neizdevās iegūt ārējo ip adresi, pārtraucu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Neizdevās iegūt ārējo ip adresi, izmantoju lokālo adresi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
 msgstr "Neizdevās iegūt lokālo ip adresi."
 
@@ -3436,7 +3511,7 @@
 msgid "Failed to validate settings"
 msgstr "Neizdevās apstiprināt uzstādījumus"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:896
 msgid "Failed to verify peer certificate"
 msgstr "Neizdevās pārbaudīt vienranga sertifikātu"
 
@@ -3445,7 +3520,7 @@
 msgid "Failed to write to file %s"
 msgstr "Neizdevās rakstīt datni %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:529
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "Neizdevās ierakstīt xml datnē"
 
@@ -3453,15 +3528,15 @@
 msgid "Failed transfers"
 msgstr "Neveiksmīgi pārsūtījumi"
 
-#: resources.h:686
+#: resources.h:700
 msgid "Fall back to active mode"
 msgstr "Atkāpšanās uz aktīvo režīmu"
 
-#: resources.h:368
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "Datn&e:"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "Datn&es"
 
@@ -3477,13 +3552,13 @@
 
 #: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr ""
+msgstr "Datne nesatur importējamus datus."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
 msgstr "Datnes rediģēšana"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1874
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "Datne eksistē"
 
@@ -3491,7 +3566,7 @@
 msgid "File exists action"
 msgstr "Datne eksistē darbība"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
 msgstr "Datne ir mainījusies"
 
@@ -3499,14 +3574,14 @@
 msgid "File lists"
 msgstr "Datņu saraksti"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/FileZilla.cpp:702
 #: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "Datne netika atrasta"
 
-#: resources.h:997
+#: resources.h:1013
 msgid "File search"
 msgstr "Datnes meklēšana"
 
@@ -3541,99 +3616,112 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Datnes pārsūtīšana veiksmīga, %s pārsūtīti %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1107
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
 msgstr "Joprojām notiek datnes pārsūtīšana"
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr ""
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr ""
 
 #: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla kļūda"
 
-#: resources.h:708
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 
-#: resources.h:476
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla jau ir savienota ar serveri."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:446
-#: ../../locales/../src/interface/sitemanager.cpp:1069
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1494
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
-msgstr ""
+msgstr "Vajag rerstartēt FileZilla, lai valodas maiņa stātos spēkā."
 
-#: resources.h:516
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "Datņu sarakstau stāvokļa joslas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:126
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Datnes vārds"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "Datnes vārda &filtri..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2309
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1860
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "Datnes vārds nederīgs"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Datņu vārdi nevar saturēt nevinu no sekojošajām zīmēm: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Datnes vārds nemainīts"
 
-#: resources.h:306 resources.h:952
+#: resources.h:308 resources.h:968
 msgid "Filename:"
 msgstr "Datnes vārds:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1363
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Datņu vārdi nevar saturēt nevinu no sekojošajām zīmēm: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1338
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Datņu vārdi nevar saturēt nevinu no sekojošajām zīmēm: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "Pašlaik rediģētās datnes"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:131
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "Datnes izmērs"
 
@@ -3641,47 +3729,50 @@
 msgid "Filesize format"
 msgstr "Datnes izmēra formāts"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Datnes tips"
 
-#: resources.h:940
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Datņu tipu asociācijas"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "Filtrs attiecas uz:"
 
-#: resources.h:815
+#: resources.h:829
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrēt nederīgās rakstzīmes datņu vārdos"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
 msgstr "Filtra vārds jau eksistē"
 
-#: resources.h:220
+#: resources.h:222
 msgid "Filter out items matching all of the following"
 msgstr "Izfiltrēt vienumus, kuriem saskan viss no sekojošajiem"
 
-#: resources.h:221
+#: resources.h:223
 msgid "Filter out items matching any of the following"
 msgstr "Izfiltrēt vienumus, kuriem saskan jebkas no sekojošajiem"
 
-#: resources.h:222
+#: resources.h:224
 msgid "Filter out items matching none of the following"
 msgstr "Izfiltrēt vienumus, kuriem nesaskan nekas no sekojošajiem"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtru komplekts jau eksistē"
 
-#: resources.h:990
+#: resources.h:1006
 msgid "Filter the directory listings"
 msgstr "Filtrēt direktorija izdrukas"
 
@@ -3693,21 +3784,21 @@
 
 #: resources.h:9 resources.h:33
 msgid "Fingerprint (MD5):"
-msgstr ""
+msgstr "Id-summa (MD5):"
 
 #: resources.h:10 resources.h:34
 msgid "Fingerprint (SHA-1):"
-msgstr ""
+msgstr "Id-summa (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
-msgstr ""
+msgstr "Id-summa:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
 msgstr "Ugunsmūra un maršrutētāja konfigurācijas vednis"
 
-#: resources.h:726
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3715,37 +3806,37 @@
 "Detalizētākai informācijai par to, ko šīs opcijas dara, lūdzu palaidiet "
 "konfigurācijas vedni."
 
-#: resources.h:703
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 
-#: ../../locales/../src/interface/Options.cpp:211
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr ""
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
 msgstr "Uzspiest &UTF-8"
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr "Uzspiest rādīt &slēptās datnes"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:652
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
 msgstr "Uzspiest rādīt slēptās datnes"
 
-#: resources.h:770
+#: resources.h:784
 msgid "Format specifications:"
 msgstr "Formāta specifikācija:"
 
-#: resources.h:938
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
 msgstr "Papildu dokumentācija"
 
@@ -3757,60 +3848,60 @@
 msgid "General SOCKS server failure"
 msgstr ""
 
-#: resources.h:788
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Standarta starpniekserveris"
 
-#: resources.h:692
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
 msgstr "Iegūt ārējo IP adresi no sekojošā URL:"
 
-#: resources.h:469
+#: resources.h:471
 msgid "Getting help"
 msgstr "Iegūt palīdzību"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Filtru kompleka vārds jau eksistē, pārrakstīt filtru komplektu?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:253
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr "Vispārējās grāmatzīmes"
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "Grupas atļaujas"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
 msgstr "A&ugsta"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr ""
 
-#: resources.h:339
+#: resources.h:341
 #, fuzzy
 msgid "Hash:"
 msgstr "Saimniekdators:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr "Slēpts"
 
-#: resources.h:813 ../../locales/../src/interface/queue.cpp:901
-#: ../../locales/../src/interface/queue.cpp:982
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Augsta"
 
-#: ../../locales/../src/interface/queue.cpp:903
-#: ../../locales/../src/interface/queue.cpp:984
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Augstākā"
 
@@ -3818,58 +3909,58 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Augstākajai pieejamai pieslēgvietai jābūt skaitlim starp 1024 un 65535"
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Turiet \"shift\" taustiņu, lai pārslēgtu filtra stāvokļus abās pusēs "
 "vienlaicīgi."
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr "Mājaslapa:"
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr ""
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr ""
+msgstr "Saimniekdators nav sasniedzams"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "Saimniekdators:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "Stundas,"
 
-#: resources.h:887
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (piemēram: 15:47)"
 
-#: resources.h:730
+#: resources.h:744
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
 
-#: resources.h:968
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 
-#: resources.h:683
+#: resources.h:697
 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 "
@@ -3877,13 +3968,13 @@
 "basis in the Site Manager."
 msgstr ""
 
-#: resources.h:678
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3901,14 +3992,14 @@
 "connection."
 msgstr ""
 
-#: resources.h:957
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3924,44 +4015,44 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
 
-#: resources.h:277 resources.h:852
+#: resources.h:279 resources.h:866
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
 
-#: resources.h:911
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
 
-#: resources.h:926
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Ja jūs nomainat valodu, vajadzēs restartēt FileZilla."
 
-#: resources.h:709
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Ja aizvērsiet Filezilla, jūsu veiktās izmaiņas pazudīs."
 
-#: resources.h:828
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
 
-#: resources.h:710
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
-msgstr ""
+msgstr "Ja jums ir kādas kļūdas, jūsu konfigurācija nav pareiza."
 
-#: resources.h:742
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -3976,19 +4067,19 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 
-#: resources.h:669
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
 
-#: resources.h:705
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
 
-#: resources.h:704
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4004,7 +4095,7 @@
 msgid "Import data from older version"
 msgstr "Importēt datus no vecākas versijas"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
 msgstr "Importa uzstādījumi"
 
@@ -4018,19 +4109,19 @@
 msgid "Improperly quoted association."
 msgstr ""
 
-#: resources.h:697
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
 
-#: resources.h:699
+#: resources.h:713
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4038,36 +4129,40 @@
 "Ja jūs dodat priekšroku automātiskai atjauninājumu pārbaudīšanai, tad to var "
 "iespējot uzstādījumu dialogā."
 
-#: resources.h:687 resources.h:751
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "Lai lietotu aktīvo režīmu, FilleZillai jāzin ārējā IP adrese."
 
-#: resources.h:672
+#: resources.h:686
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1048
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
 msgstr "Nepareiza parole"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr "Inicializē TLS..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktīvs"
 
@@ -4076,8 +4171,8 @@
 msgstr "Interaktīvs"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1005
-#: ../../locales/../src/interface/QueueView.cpp:1579
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
 msgstr "Lietotājs pārtraucis"
 
@@ -4111,29 +4206,30 @@
 msgid "Invalid date"
 msgstr "Nederīgs datums"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1338
-#: ../../locales/../src/interface/LocalListView.cpp:1363
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "Nederīgs datnes vārds"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Nederīga ievade"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Ievadīta nederīga pieslēgvieta. Pieslēgvietai jābūt ar vērtību no 1 līdz "
 "65534."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4142,7 +4238,12 @@
 "ftpes:// for FTP over SSL (explicit)."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+
+#: ../../locales/../src/interface/search.cpp:698
 #, fuzzy
 msgid "Invalid regular expression in search conditions."
 msgstr "Nederīgs izmērs nosacījumos"
@@ -4151,22 +4252,22 @@
 msgid "Invalid response code"
 msgstr "Nederīgs atbildes kods"
 
-#: ../../locales/../src/interface/search.cpp:718
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:692
+#, c-format
 msgid "Invalid search conditions: %s"
-msgstr "Nederīgs izmērs nosacījumos"
+msgstr "Nederīgi meklēšanas nosacījumi: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2569
-#: ../../locales/../src/interface/sitemanager.cpp:2589
-#: ../../locales/../src/interface/sitemanager.cpp:2606
-#: ../../locales/../src/interface/sitemanager.cpp:2613
-#: ../../locales/../src/interface/sitemanager.cpp:2620
-#: ../../locales/../src/interface/sitemanager.cpp:2637
-#: ../../locales/../src/interface/sitemanager.cpp:2786
-#: ../../locales/../src/interface/sitemanager.cpp:3012
-#: ../../locales/../src/interface/sitemanager.cpp:3019
-#: ../../locales/../src/interface/sitemanager.cpp:3099
-#: ../../locales/../src/interface/sitemanager.cpp:3106
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Nederīgs vietnes ceļš"
 
@@ -4174,7 +4275,7 @@
 msgid "Invalid size in condition"
 msgstr "Nederīgs izmērs nosacījumos"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
 msgstr "Ievadīts nederīgs lietotājsvārds."
 
@@ -4190,61 +4291,61 @@
 msgid "Jurisdiction state or province:"
 msgstr "Jurisdikcijas pavalsts vai province:"
 
-#: resources.h:908
+#: resources.h:924
 msgid "Keep directories on top"
 msgstr "Paturēt direktorijus augšpusē"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
 msgstr "Atslēgu apmaiņa"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "Z&emākā"
 
-#: resources.h:924
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Valoda"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1494
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
 msgstr "Valoda nomainīta"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Pēdējo reizi modificēts"
 
-#: resources.h:855
+#: resources.h:869
 msgid "Layout"
 msgstr "Izkārtojums"
 
-#: resources.h:801
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
 msgstr "Vienlaicīgo lejupielāžu skaits:"
 
-#: resources.h:803
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
 msgstr "Vienlaicīgo augšupielāžu skaits:"
 
-#: resources.h:746
+#: resources.h:760
 msgid "Limit local ports"
 msgstr "Ierobežot lokālās pieslēgvietas"
 
-#: resources.h:954
+#: resources.h:970
 msgid "Limit size of logfile"
 msgstr "Ierobežot žurnāldatnes lielumu"
 
-#: resources.h:955
+#: resources.h:971
 msgid "Limit:"
 msgstr "Ierobežojums:"
 
@@ -4252,7 +4353,7 @@
 msgid "Line length exceeded"
 msgstr "Pārsniegts rindiņas garums"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
 msgstr ""
 
@@ -4261,41 +4362,41 @@
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "Saraksts:"
 
-#: resources.h:749
+#: resources.h:763
 msgid "Lo&west available port:"
 msgstr "Ze&mākā pieejamā pieslēgvieta:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "Lokāli"
 
-#: resources.h:363
+#: resources.h:365
 msgid "Local file"
 msgstr "Lokālā datne"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
 msgstr "Lokālā datne neeksistē."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr "Lokālā datne ir direktorijs un ne parasta datne."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:365
+#: ../../locales/../src/interface/manual_transfer.cpp:369
 msgid "Local file is not a valid filename."
 msgstr "Lokālā datne nav derīgs datnes vārds."
 
-#: resources.h:202
+#: resources.h:204
 msgid "Local filters:"
 msgstr "Lokālie filtri:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Lokālā vietne:"
 
@@ -4307,28 +4408,28 @@
 msgid "Log file"
 msgstr "Žurnāla datne"
 
-#: resources.h:250
+#: resources.h:252
 msgid "Log of update check:"
 msgstr "Atjauninājumu pārbaudes žurnāls:"
 
-#: resources.h:949
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 
@@ -4343,13 +4444,13 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:896
-#: ../../locales/../src/interface/queue.cpp:977
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Zema"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Zemākā"
 
@@ -4361,7 +4462,7 @@
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4382,71 +4483,69 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr ""
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#: ../../locales/../src/interface/manual_transfer.cpp:365
+#: resources.h:395 ../../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
 msgid "Manual transfer"
 msgstr "Manuāls pārsūtijums"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "Saskan visi no sekojošajiem"
 
-#: resources.h:434
-#, fuzzy
+#: resources.h:436
 msgid "Match any of the following"
-msgstr "Saskan visi no sekojošajiem"
+msgstr "Atbilst kādam no sekojošajiem"
 
-#: resources.h:435
-#, fuzzy
+#: resources.h:437
 msgid "Match none of the following"
-msgstr "Saskan visi no sekojošajiem"
+msgstr "Neatbilst neviens no sekojošajiem"
 
-#: resources.h:799
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr "Vienlaicīgo &pārsūtījumu skaits:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1826
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
 msgstr "Ziņojumu žurnāls"
 
-#: resources.h:866
+#: resources.h:880
 msgid "Message log position"
 msgstr "Ziņojumu žurnāla pozīcija"
 
-#: resources.h:956
+#: resources.h:972
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "Minūtes"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
 msgstr "Pārvietot &lejup"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
 msgstr "Pārvietot &augšup"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1074
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "Mans dators"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1064
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "Mani dokumenti"
 
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:725
-#: ../../locales/../src/interface/sitemanager.cpp:2140
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Manas vietnes"
 
@@ -4455,21 +4554,21 @@
 msgid "N/a"
 msgstr "Nav piemerojams"
 
-#: resources.h:398
+#: resources.h:400
 msgid "Name"
 msgstr "Vārds"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:708
-#: ../../locales/../src/interface/sitemanager.cpp:1288
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "Vārds jau eksistē"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:831
-#: ../../locales/../src/interface/sitemanager.cpp:3036
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Grāmatzīmes vārds jau eksistē."
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Vārds:"
 
@@ -4477,12 +4576,11 @@
 msgid "Need to enter filter name"
 msgstr "Jāievada filtra vārdu"
 
-#: ../../locales/../src/interface/search.cpp:708
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:682
 msgid "Need to enter valid remote path"
-msgstr "Jāievada filtra vārdu"
+msgstr "Jāievada derīgu attālo ceļu"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1103
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr "Jānorāda rakstzīmju kodējumu"
 
@@ -4494,39 +4592,39 @@
 msgid "New &Folder"
 msgstr "Jauna &mape"
 
-#: resources.h:493
+#: resources.h:502
 msgid "New &tab"
 msgstr "Jauna &cilne"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr "Jauna grāmat&zīme"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:53
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:67
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:74
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:81
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:91
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:97
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:106
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:448
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:540
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:546
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:552
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:575
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:831
-#: ../../locales/../src/interface/sitemanager.cpp:2477
-#: ../../locales/../src/interface/sitemanager.cpp:3036
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr "Jauna grāmatzīme"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1192
-#: ../../locales/../src/interface/RemoteListView.cpp:1584
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1289
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
 msgstr "Jauns direktorijs"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Jaunas iespējas un uzlabojumi %s"
@@ -4535,17 +4633,17 @@
 msgid "New filter"
 msgstr "Jauns filtrs"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1017
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Jauna mape"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2453
-#: ../../locales/../src/interface/sitemanager.cpp:2899
-#: ../../locales/../src/interface/sitemanager.cpp:2913
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Jauna vietne"
 
-#: resources.h:864
+#: resources.h:878
 msgid "Next to the transfer queue"
 msgstr "Pie pārsūtījumu rindas"
 
@@ -4557,15 +4655,15 @@
 msgid "No category to export selected"
 msgstr "Nav izvēlēta neviena kategorija eksportam"
 
-#: ../../locales/../src/interface/QueueView.cpp:2221
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr "Nav uzstādīta neviena ārējā IP adrese, mēģinu noklusējuma."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "Neviena datne pašlaik netiek rediģēta."
 
@@ -4573,9 +4671,9 @@
 msgid "No filter name given"
 msgstr "Nav iedots filtra vārds"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
 msgstr "Nav dots saimniekdators, lūdzu ievadiet saimniekdatoru."
 
@@ -4583,31 +4681,31 @@
 msgid "No images available"
 msgstr "Neviens attēls nav pieejams"
 
-#: ../../locales/../src/interface/QueueView.cpp:3064
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
 msgstr "Rindā datņu vairs nav!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Nav iedots filtru komplekta vārds."
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr "Neviena programma nav asociēta ar datnes tipu"
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:540
 msgid "No search results"
 msgstr "Nav meklēšanas rezultātu"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2106
-#: ../../locales/../src/interface/sitemanager.cpp:2118
-#: ../../locales/../src/interface/sitemanager.cpp:2149
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
 msgstr "Neviena vietne nav pieejama"
 
@@ -4615,32 +4713,32 @@
 msgid "No supported SOCKS5 auth method"
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Nav iedots lietotājvārds."
 
-#: resources.h:918 resources.h:923
+#: resources.h:934 resources.h:939
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Neviens"
 
-#: resources.h:373
+#: resources.h:375
 msgid "None selected yet"
 msgstr "Nekas vel nav atlasīts"
 
-#: resources.h:812 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/queue.cpp:899
-#: ../../locales/../src/interface/queue.cpp:980
-#: ../../locales/../src/interface/sitemanager.cpp:1395
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Normāls"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:323
-#: ../../locales/../src/interface/queueview_failed.cpp:348
+#: ../../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 ""
 
@@ -4649,11 +4747,11 @@
 msgid "Not connected"
 msgstr "Nav savienots"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2313
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "Nav savienots ne ar vienu serveri"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:560
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
 msgstr "Nav savienots ne ar vienu serveri."
 
@@ -4661,21 +4759,21 @@
 msgid "Not connected."
 msgstr "Nav savienots."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:654
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Ņemiet vērā, ka šī iespēja ir atbalstīta tikai izmantojot FTP protokolu."
 
-#: resources.h:780
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Piezīme: Tas tikai strādā ar vienkāršiem, nešifrētiem FTP savienojumiem."
 
-#: resources.h:797
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 
-#: resources.h:897
+#: resources.h:913
 msgid "Number of decimal places:"
 msgstr "Zīmju skaits aiz komata:"
 
@@ -4683,21 +4781,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Atkārtošanu skaitam jābūt starp 0 un 99."
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "&Atvērt datni"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:723
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "Labi"
 
-#: resources.h:679
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4707,55 +4805,55 @@
 msgid "Once"
 msgstr "Vienreiz"
 
-#: resources.h:948
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
 msgstr ""
 
-#: resources.h:648
+#: resources.h:662
 msgid "Open directory in system's file manager"
 msgstr "Atvērt direktoriju sistēmas datņu pārvaldniekā"
 
-#: resources.h:970 resources.h:971
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "Atver vietņu pārvaldnieku"
 
-#: resources.h:562
+#: resources.h:572
 msgid "Open the file."
 msgstr "Atvērt datni."
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "Atver Filezilla uzstādījumu dialogu"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
 msgstr "Atvērts kā:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2052
-#: ../../locales/../src/interface/LocalListView.cpp:2097
-#: ../../locales/../src/interface/LocalListView.cpp:2184
-#: ../../locales/../src/interface/LocalListView.cpp:2197
-#: ../../locales/../src/interface/RemoteListView.cpp:2634
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
 msgstr "Atvēršana neizdevās"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr "Atver jaunu cilni"
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "Atver vietņu pārvaldnieku"
 
-#: resources.h:991
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Atver direktorija izdrukas filtru dialogu. Labais klikšķis pārslēdz filtrus."
 
-#: resources.h:170
+#: resources.h:172
 msgid "Operating system"
 msgstr "Operētājsistēma"
 
@@ -4771,7 +4869,7 @@
 msgid "Other:"
 msgstr "Cits:"
 
-#: resources.h:725
+#: resources.h:739
 msgid "Overview"
 msgstr "Pārskats"
 
@@ -4779,19 +4877,19 @@
 msgid "Overwrite &if source newer"
 msgstr "Pārrakstīt &ja jaunāks avots"
 
-#: resources.h:259 resources.h:269 resources.h:835 resources.h:844
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 msgid "Overwrite file"
 msgstr "Pārrakstīt datni"
 
-#: resources.h:261 resources.h:271 resources.h:837 resources.h:846
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 msgid "Overwrite file if size differs"
 msgstr "Pārrakstīt datni ja izmērs atšķiras"
 
-#: resources.h:262 resources.h:272 resources.h:838 resources.h:847
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Pārrakstīt ja izmērs atšķiras vai jaunāka avota datne"
 
-#: resources.h:260 resources.h:270 resources.h:836 resources.h:845
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 msgid "Overwrite file if source file newer"
 msgstr "Pārrakstīt datni ja avota datne jaunāka"
 
@@ -4803,31 +4901,31 @@
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Pārrakstīt ja atšķirīga i&zmēra vai jaunāks avots"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
 msgstr "Īpašnieka atļaujas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Īpašnieks/Grupa"
 
-#: resources.h:869
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 
-#: resources.h:777 resources.h:793
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
-msgstr ""
+msgstr "S&tarpserveris:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
 msgstr ""
 
-#: resources.h:739
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&sīvs (ieteikts)"
 
@@ -4835,19 +4933,19 @@
 msgid "Package"
 msgstr "Pakotne"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2458
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
 msgstr "Parametrs nav derīgs URL"
 
-#: resources.h:84 resources.h:382 resources.h:717
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
 msgstr "Par&ole:"
 
-#: resources.h:675
+#: resources.h:689
 msgid "Passive (recommended)"
 msgstr "Pasīvs (ieteikts)"
 
-#: resources.h:759
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Pasīvais režīms"
@@ -4862,42 +4960,42 @@
 msgid "Password required"
 msgstr "Nepieciešama parole"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:146
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Ceļš"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2354
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr ""
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
 msgstr "Ceļi"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "Aizvākšana aizkavēta"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:141
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "Atļauja"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Atļaujas"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -4919,7 +5017,7 @@
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 
-#: resources.h:681
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -4955,10 +5053,10 @@
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr ""
-"Lūdzu ievadiet lejupielādes ātruma ierobežojumu lielāku vai vienādu ar 0 KB/"
+"Lūdzu ievadiet lejupielādes ātruma ierobežojumu lielāku vai vienādu ar 0 %s/"
 "s."
 
 #: ../../locales/../src/interface/filteredit.cpp:134
@@ -4969,7 +5067,7 @@
 msgid "Please enter a new name for the copied filter."
 msgstr "Lūdzu ievadiet jaunu vārdu nokopētajam filtram."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Lūdzu ievadiet jaunu vārdu filtru komplektam \"%s\""
@@ -4995,11 +5093,11 @@
 "transfers."
 msgstr "Lūdzu ievadiet skaitli starp 1 un 10 vienlaicīgo pārsūtīšanu skaitam"
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
 msgstr "Lūdzu ievadiet paroli šim serverim:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2210
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
@@ -5013,11 +5111,11 @@
 "Lūdzu ievadiet noildzi starp 5 un 9999 sekundēm vai 0, lai atslēgtu "
 "taimautus."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Lūdzu ievadiet unikālu vārdu šim filtru komplektam"
 
-#: resources.h:117
+#: resources.h:118
 msgid "Please enter a username for this server:"
 msgstr "Lūdzu ievadiet lietotājvārdu šim serverim:"
 
@@ -5036,26 +5134,31 @@
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
-#, fuzzy, c-format
+#, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr ""
-"Lūdzu ievadiet augšupielādes ātruma ierobežojumu lielāku vai vienādu ar 0 KB/"
+"Lūdzu ievadiet augšupielādes ātruma ierobežojumu lielāku vai vienādu ar 0 %s/"
 "s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:572
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:1184
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1570
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1275
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Lūdzu ievadiet jaunizveidojamā direktorija vārdu:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Lūdzu ievadiet jaunizveidojamā direktorija vārdu:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
 msgstr "Lūdzu ievadiet lietotājvārdu un paroli šim serverim:"
 
@@ -5071,7 +5174,7 @@
 "address, use the external resolver option."
 msgstr ""
 
-#: resources.h:668
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5095,7 +5198,7 @@
 "'game mode'."
 msgstr ""
 
-#: resources.h:682
+#: resources.h:696
 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 "
@@ -5103,13 +5206,13 @@
 "discard."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
 
-#: resources.h:736
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5117,7 +5220,7 @@
 "Lūdzu ņemiet vērā, ka daži serveri var jūs aizliegt, ja mēģināsiet "
 "atkalsavienoties pārāk bieži vai ar pārāk īsiem intervāliem."
 
-#: resources.h:884 resources.h:890
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5126,7 +5229,7 @@
 "Sīkākai informācijai lūdzu lasiet http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting"
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5139,15 +5242,15 @@
 "previously."
 msgstr ""
 
-#: resources.h:455
+#: resources.h:457
 msgid "Please select an action:"
 msgstr "Lūdzu izvēlieties darbību:"
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
 msgstr "Lūdzu izvēlieties kategorijas importam."
 
-#: resources.h:670
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Lūdzu izvēlieties noklusējuma pārsūtīšanas režīmu."
 
@@ -5184,7 +5287,7 @@
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5206,12 +5309,12 @@
 msgid "Postal code:"
 msgstr "Pasta indekss:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1921
-#: ../../locales/../src/interface/sitemanager.cpp:2139
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr "Iepriekš definētas vietnes"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:703
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
 msgstr "Saglabā datnes laikspiedolus"
 
@@ -5219,7 +5322,7 @@
 msgid "Preview:"
 msgstr "Priekšskatījums:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 
@@ -5227,35 +5330,39 @@
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:907
+#: resources.h:923
 msgid "Prioritize directories (default)"
 msgstr "Prioritizēt direktorijus (noklusējuma)"
 
-#: ../../locales/../src/interface/queue.cpp:1197
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritāte"
 
-#: resources.h:947
+#: resources.h:963
 msgid "Privacy policy:"
 msgstr "Privātuma politika:"
 
-#: resources.h:783
+#: resources.h:797
 msgid "Private &keys:"
 msgstr "Privātās &atslēgas:"
 
-#: resources.h:779 resources.h:796
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr "Pro&tokols:"
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
 msgstr "Starpniek&servera parole:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "Apstrādāt &rindu"
 
-#: resources.h:794
+#: resources.h:808
 msgid "Proxy &port:"
 msgstr "Starpniekservera &pieslēgvieta:"
 
-#: resources.h:778 resources.h:795
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
 msgstr "Starpniekservera &lietotājs:"
 
@@ -5269,6 +5376,10 @@
 msgid "Proxy handshake failed: %s"
 msgstr ""
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5283,11 +5394,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
 
-#: resources.h:781
+#: resources.h:795
 msgid "Public Key Authentication"
 msgstr "Publiskās atslēgas autentifikācija"
 
@@ -5295,11 +5406,11 @@
 msgid "Public key algorithm:"
 msgstr "Publiskais atslēgas algoritms:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "Publiskās atļaujas"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
 msgstr "Rinda pilnībā apstrādāta"
 
@@ -5318,35 +5429,35 @@
 msgid "Queue: empty"
 msgstr "Rinda: tukša"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "Sarindotās datnes"
 
-#: resources.h:447
+#: resources.h:449
 msgid "Queueing:"
 msgstr "Rindā:"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "R&estartēt sistēmu"
 
-#: resources.h:520
+#: resources.h:530
 msgid "R&emote directory tree"
 msgstr "Attālais dir&ektoriju koks"
 
-#: resources.h:618 resources.h:622
+#: resources.h:632 resources.h:636
 msgid "R&eset and requeue selected files"
 msgstr "A&tiestatīt un sarindot atlasītās datnes"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:588
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr ""
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
 msgstr "La&sīt"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
 msgstr "At&svaidzināt"
 
@@ -5360,20 +5471,20 @@
 "routers and firewalls accordingly."
 msgstr ""
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "Las&īt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
 msgstr "Lasīšanas režīms"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1062
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
 msgstr "Tiešām pārtraukt aktuālo operāciju?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1658
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
@@ -5381,8 +5492,8 @@
 msgstr[1] "Tiešām dzēst %d direktorijus ar to saturu?"
 msgstr[2] "Tiešām dzēst %d direktorijus ar to saturu?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1656
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
@@ -5390,31 +5501,35 @@
 msgstr[1] "Tiešām dzēst %d datnes?"
 msgstr[2] "Tiešām dzēst %d datnes?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1663
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
 msgstr "Tiešām dzēst %s un %s?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1124
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
 msgstr "Tiešām dzēst visas izvēlētās datnes un mapes?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:18
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Iemesls"
 
-#: ../../locales/../src/interface/QueueView.cpp:3127
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
 msgstr "Atsāknēt tagad"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
 msgstr ""
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2107
-#: ../../locales/../src/engine/directorylistingparser.cpp:2122
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Saņemtā līnija pārsniedz 10000 rakstzīmes, pārtraucu."
 
@@ -5430,11 +5545,11 @@
 "If you continue, your connection will be disconnected."
 msgstr ""
 
-#: resources.h:737
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr "Atkalsavienošanās uzstādījumi"
 
-#: resources.h:988 resources.h:989
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
 msgstr "Savienojas ar pēdējo lietoto serveri"
 
@@ -5442,106 +5557,119 @@
 msgid "Redirection to invalid address"
 msgstr "Novirzīšana uz nederīgu adresi"
 
-#: resources.h:980 resources.h:981
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
 msgstr "Atsvaidzināt datņu un mapju sarakstu"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "Ievadiet paroli"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "Attālināts"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
 msgstr "Attālinātais sertifikāts nav uzticams."
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1195
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Attālā datne"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Remote file search"
 msgstr "Attālā datņu meklēšana"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "Attālie filtri:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "Attālais ceļš"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:425
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the current site's servertype (%s)."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1192
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the servertype (%s) selected on the parent site."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:427
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:431
-#: ../../locales/../src/interface/sitemanager.cpp:1194
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 #, fuzzy
 msgid "Remote path could not be parsed."
 msgstr "nevar palaist fzsftp"
 
-#: resources.h:444
+#: resources.h:446
 msgid "Remote path handling:"
 msgstr "Attālā ceļa apstrāde:"
 
-#: resources.h:312
+#: resources.h:314
 msgid "Remote path:"
 msgstr "Attālā ceļš:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Attālā vietne:"
 
-#: resources.h:615 resources.h:619
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
 msgstr "Aizvākt &visu"
 
-#: resources.h:617 resources.h:621
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
 msgstr "Aizvākt &atlasītos"
 
-#: resources.h:264 resources.h:274 resources.h:840 resources.h:849
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Pārdēvēt datni"
 
-#: resources.h:633 resources.h:654
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
 msgstr "Pārdēvēt izvēlēto direktoriju"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "Pārdēvēt izvēlētās datnes un direktorijus"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2556
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Pārdēvē '%s' par '%s'"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
-#: resources.h:620
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr ""
+
+#: resources.h:634
 msgid "Reset and requeue &all"
 msgstr "Atiestatīt un sarindot &visu"
 
@@ -5557,54 +5685,58 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Atbilde:"
 
-#: resources.h:438
+#: resources.h:440
 msgid "Results:"
 msgstr "Rezultāti:"
 
-#: resources.h:263 resources.h:273 resources.h:839 resources.h:848
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 msgid "Resume file transfer"
 msgstr "Turpināt datņu pārsūtīšanu"
 
-#: resources.h:854
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:954
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
 msgstr "Iegūst direktorija izdruku..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Iegūst ārējo IP adresi no %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:917
 msgid "Root certificate is not trusted"
 msgstr "Saknes sertifikāts nav uzticams"
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "Rā&dīt pašlaik rediģētās datnes..."
 
-#: resources.h:607
+#: resources.h:885
+msgid "S&how the Site Manager on startup"
+msgstr "P&arādīt Vietņu pārvaldnieku pie palaišanas"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "&Izslēgt sistēmu"
 
-#: resources.h:436
+#: resources.h:438
 msgid "S&top"
 msgstr "S&top"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr "S&inhonizētā pārlūkošana"
 
@@ -5612,31 +5744,36 @@
 msgid "SFTP"
 msgstr "SFTP"
 
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "Ierobežojums:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "Saglabāt uzstādījumus?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1813
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
 msgstr "Skenē pēc datnēm, lai pievienotu rindai"
 
-#: ../../locales/../src/interface/QueueView.cpp:1815
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
 msgstr "Skenē pēc datnēm augšupielādei"
 
-#: resources.h:432
+#: resources.h:434
 msgid "Search &conditions:"
 msgstr "Meklēšanas &nosacījumi:"
 
-#: resources.h:430
+#: resources.h:432
 msgid "Search &directory:"
 msgstr "Meklēt &direktorijā:"
 
-#: resources.h:996
+#: resources.h:1012
 msgid "Search for files recursively."
 msgstr "Meklēt datnes rekursīvi."
 
-#: resources.h:539
+#: resources.h:549
 msgid "Search server for files"
 msgstr "Meklēt serverī datnes"
 
@@ -5649,26 +5786,26 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Skatīt arī: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
+#: resources.h:376
 msgid "Sele&ct server"
 msgstr "Izvēlie&ties serveri"
 
-#: resources.h:722
+#: resources.h:736
 msgid "Select &page:"
 msgstr "Izvēlieties &lapu:"
 
-#: resources.h:872
+#: resources.h:888
 msgid "Select Theme"
 msgstr "Izvēlieties tēmu"
 
-#: resources.h:832
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Izvēlieties noklusējuma darbību, kas tiks pielietota, ja pārsūtījuma mērķa "
 "datne jau eksistēs."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "Izvēlieties noklusējuma redaktoru"
@@ -5710,7 +5847,7 @@
 msgstr "Izvēlieties datni eksportējamajiem uzstādījumiem"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2681
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
 msgstr "Atlasiet datni eksportētajām vietnēm"
 
@@ -5718,7 +5855,7 @@
 msgid "Select file to import settings from"
 msgstr "Izvēlieties datni uzstādījumu importam"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
 msgstr "Izvēlieties datni augšupielādei"
 
@@ -5726,28 +5863,28 @@
 msgid "Select filename for converted keyfile"
 msgstr "Izvēlieties vārdu konvertētajai atslēgdatnei"
 
-#: resources.h:420
+#: resources.h:422
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Atlasiet kā šīs datnes vajadzētu atvērt."
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:805
 msgid "Select target download directory"
 msgstr "Atlasiet mērķa lejupielādes direktoriju"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Atlasiet mērķa datnes vārdu"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "Izvēlieties kategoriju eksportam:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "Izvēlieties privātos datus, kurus vēlaties izdzēst."
 
-#: ../../locales/../src/interface/search.cpp:798
+#: ../../locales/../src/interface/search.cpp:772
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5763,7 +5900,7 @@
 msgstr[1] "Atlasīti %d direktoriji."
 msgstr[2] "Atlasīti %d direktoriju."
 
-#: ../../locales/../src/interface/search.cpp:796
+#: ../../locales/../src/interface/search.cpp:770
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5787,7 +5924,7 @@
 msgstr[1] "Atlasītas %d datnes. Kopejais izmērs: Vismaz %s"
 msgstr[2] "Atlasītas %d datnes. Kopejais izmērs: Vismaz %s"
 
-#: ../../locales/../src/interface/search.cpp:803
+#: ../../locales/../src/interface/search.cpp:777
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Atlasīti %s un %s pārsūtīšanai."
@@ -5802,13 +5939,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Atlasīti: %s un %s. Kopējais izmērs: vismaz %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "Selected editor does not exist."
 msgstr "Izvēlētais redaktors neeskistē."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2081
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
 msgstr "Atlasītā datne jau tiek rediģēta"
 
@@ -5816,19 +5953,19 @@
 msgid "Selected file is already loaded"
 msgstr "Atlasītā datne jau ir ielādēta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2666
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid "Selected file is already opened"
 msgstr "Atlasītā datne jau ir atvērta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2694
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid "Selected file is still being edited"
 msgstr "Atlasītā datne joprojām tiek rediģēta"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Atlasītais filtrs darbojas tikai lokālajām datnēm."
 
-#: ../../locales/../src/interface/menu_bar.cpp:310
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -5838,15 +5975,15 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr ""
 
-#: resources.h:744
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
 msgstr ""
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr ""
 
@@ -5855,20 +5992,20 @@
 msgid "Serial number:"
 msgstr "Seriālais numurs:"
 
-#: resources.h:81 resources.h:88
+#: resources.h:89
 msgid "Server &Type:"
 msgstr "Servera &veids:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Serveris neatbalsta atsākšanu datnēm > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -5877,15 +6014,15 @@
 "Serveris neatbalsta atsākšanu datnēm > %d GB. Pārtrauc pārsūtīšanu, jo datņu "
 "izmērs saskan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
 msgstr "Serveris neatbalsta atsākšanu datnēm > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
 msgstr "Serveris neatbalsta atsākšanu datnēm > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -5894,7 +6031,7 @@
 "Serveris var neatbalstīt atsākšanu datnēm > %d GB. Pārtrauc pārsūtīšanu, jo "
 "datņu izmērs saskan."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -5902,17 +6039,21 @@
 "Serveris var pieprasīt kontu. Lūdzu norādiet kontu izmantojot vietņu "
 "pārvaldnieku"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr "Serveris atsūtīja tukšu ceļu."
+
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -5930,24 +6071,24 @@
 msgid "Server sent unexpected reply."
 msgstr "Serveris atsūtīja negaidītu atbildi."
 
-#: resources.h:350
+#: resources.h:352
 msgid "Server to client MAC:"
 msgstr "Serveris klienta MAC:"
 
-#: resources.h:348
+#: resources.h:350
 #, fuzzy
 msgid "Server to client cipher:"
 msgstr "Serveris / lokālā datne"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
 msgstr "Servera &veids:"
 
-#: ../../locales/../src/interface/queue.cpp:1193
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Serveris/Lokālā datne"
 
-#: resources.h:310 resources.h:372
+#: resources.h:312 resources.h:374
 msgid "Server:"
 msgstr "Serveris:"
 
@@ -5955,12 +6096,12 @@
 msgid "Session details"
 msgstr "Sesijas detaļas"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "Uzstādīt &prioritāti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2434
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Iestatīt atļaujas '%s' uz '%s'"
@@ -5969,31 +6110,31 @@
 msgid "SetSocketBufferSize called without socket"
 msgstr ""
 
-#: resources.h:721
+#: resources.h:735
 msgid "Settings"
 msgstr "Uzstādījumi"
 
-#: resources.h:969
+#: resources.h:985
 msgid "Show &raw directory listing"
 msgstr ""
 
-#: resources.h:550
+#: resources.h:560
 msgid "Show &welcome dialog..."
 msgstr "Rādīt &sveiciena dialogu..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2316
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
-msgstr ""
+msgstr "Rādīt abus direktoriju kokus un turpināt salīdzināt?"
 
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Rāda šo palīdzības dialogu"
 
-#: ../../locales/../src/interface/QueueView.cpp:3129
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
 msgstr "Izslēgt sistēmu"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "Vietņu &pārvaldnieka ieraksti"
 
@@ -6001,51 +6142,51 @@
 msgid "Site Manager"
 msgstr "Vietņu pārvaldnieks"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1048
-#: ../../locales/../src/interface/sitemanager.cpp:1060
-#: ../../locales/../src/interface/sitemanager.cpp:1069
-#: ../../locales/../src/interface/sitemanager.cpp:1086
-#: ../../locales/../src/interface/sitemanager.cpp:1103
-#: ../../locales/../src/interface/sitemanager.cpp:1116
-#: ../../locales/../src/interface/sitemanager.cpp:1135
-#: ../../locales/../src/interface/sitemanager.cpp:1145
-#: ../../locales/../src/interface/sitemanager.cpp:1159
-#: ../../locales/../src/interface/sitemanager.cpp:1170
-#: ../../locales/../src/interface/sitemanager.cpp:1195
-#: ../../locales/../src/interface/sitemanager.cpp:1205
-#: ../../locales/../src/interface/sitemanager.cpp:1214
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "Site Manager - Invalid data"
 msgstr "Vietņu pārvaldnieks - Nederīgi dati"
 
-#: ../../locales/../src/interface/sitemanager.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Vietņu pārvaldnieks jau atvērts"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2589
-#: ../../locales/../src/interface/sitemanager.cpp:2606
-#: ../../locales/../src/interface/sitemanager.cpp:2620
-#: ../../locales/../src/interface/sitemanager.cpp:3019
-#: ../../locales/../src/interface/sitemanager.cpp:3106
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Vietne neeksistē."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2569
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr "Vietnes ceļam ir jāsākas ar 0 vai 1."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2613
-#: ../../locales/../src/interface/sitemanager.cpp:2786
-#: ../../locales/../src/interface/sitemanager.cpp:3012
-#: ../../locales/../src/interface/sitemanager.cpp:3099
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr "Vietnei specifiskas grāmatzīmes"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:91
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:540
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
@@ -6055,11 +6196,11 @@
 "pārvaldniekā.\n"
 "Pievienot aktuālo savienojumu Vietņu pārvaldniekam?"
 
-#: ../../locales/../src/interface/queue.cpp:1196
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Lielums"
 
-#: resources.h:891
+#: resources.h:907
 msgid "Size formatting"
 msgstr "Izmēra formatēšana"
 
@@ -6068,7 +6209,7 @@
 msgid "Size unknown"
 msgstr "Nezināms lielums"
 
-#: resources.h:265 resources.h:275 resources.h:841 resources.h:850
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 msgid "Skip file"
 msgstr "Izlaist datni"
 
@@ -6088,31 +6229,30 @@
 msgid "Skipping upload of %s"
 msgstr "Tiek izlaista %s augšupielāde"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1130
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 "Kādas datnes joprojām tiek rediģētas vai arī nepieciešams tās augšupielādēt."
 
-#: resources.h:684 resources.h:760
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
 
-#: resources.h:909
+#: resources.h:925
 msgid "Sort directories inline"
 msgstr "Kārtot direktorijus rindā"
 
 #: ../../locales/../src/interface/filelistctrl.cpp:446
-#, fuzzy
 msgid "Sort order cannot be changed if comparing directories."
-msgstr "Direktoriju nevar ievilkt vienā no tā apakšdirektorijiem."
+msgstr "Kārtošanas secību nevar mainīt, ja salīdzina direktorijus."
 
-#: resources.h:905
+#: resources.h:921
 msgid "Sorting"
 msgstr "Kārtošana"
 
-#: resources.h:906
+#: resources.h:922
 msgid "Sorting &mode:"
 msgstr "Kārtošanas &režīms:"
 
@@ -6124,7 +6264,7 @@
 msgid "Source and target file may not be the same"
 msgstr "Avota un mērķa datne nevar būt tā pati"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr ""
 
@@ -6132,12 +6272,12 @@
 msgid "Source file:"
 msgstr "Avota datne:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Ātruma ierobežojumi"
 
-#: resources.h:805
+#: resources.h:819
 msgid "Speed limits"
 msgstr "Ātruma ierobežojumi"
 
@@ -6149,7 +6289,7 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Ātruma ierobežojumi ir iespējoti, noklikšķiniet, lai izmainītu."
 
-#: resources.h:390
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "Sākt pārsūtīšanu &tūlīt"
 
@@ -6157,14 +6297,14 @@
 msgid "Start with opened Site Manager"
 msgstr "Sākt ar atvērtu Vietņu pārvaldnieku"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1632
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "Sāk %s lejupielādi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1636
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Sāk %s augšupielādi"
@@ -6173,19 +6313,19 @@
 msgid "State or province:"
 msgstr "Štats vai province:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "Apstādināt un aizvākt &visus"
 
@@ -6201,17 +6341,17 @@
 msgid "Successful transfers"
 msgstr "Veiksmīgi pārsūtījumi"
 
-#: resources.h:712
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr "Testa rezultātu kopsavilkums:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:995 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../locales/../src/interface/state.cpp:249
 #: ../../locales/../src/interface/state.cpp:278
 #: ../../locales/../src/interface/state.cpp:285
 #: ../../locales/../src/interface/state.cpp:297
@@ -6230,8 +6370,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr "Sinhronizētā pārlūkošana ir atspējota."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Sintakses kļūda"
 
@@ -6240,24 +6380,27 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2460
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
 msgstr "Sintakses kļūda komandrindā"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr "Sistēma"
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "R&īkjosla"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
-#, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
-msgstr "Nodibināts savienojums, sūta HTTP pieprasījumu"
+msgstr "TLS/SSL savienojums nodibināts, sūta HTTP pieprasījumu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL savienojums nodibināts, gaida sagaidīšanas ziņojumu..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL savienojums nodibināts."
 
@@ -6273,19 +6416,24 @@
 msgid "Target file:"
 msgstr "Mērķa datne:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1874
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "Mērķa datne jau eksistē"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "Mērķa datne jau eksistē, tiešām turpināt?"
 
-#: resources.h:711
+#: resources.h:725
 msgid "Test results"
 msgstr "Testa rezultāti"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr "Testē servera turpināšanas iespējas"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6302,7 +6450,7 @@
 "Vietņu pārvaldnieks ir atvērts citā FileZilla 3 instancē.\n"
 "Lūdzu aizveriet to, vai arī dati netiks dzēsti."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:421
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML dokuments nav labi veidots: %s"
@@ -6312,12 +6460,12 @@
 msgid "The address you entered was: %s"
 msgstr "Ievadītā adrese bija: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:815
-#: ../../locales/../src/interface/sitemanager.cpp:2999
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Grāmatzīmi nevar pievienot."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3086
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Grāmatzīmes nevar notīrīt."
 
@@ -6329,12 +6477,12 @@
 msgid "The custom login sequence cannot be empty."
 msgstr ""
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Nevar atrast noklusējuma redaktoru teksta datnēm."
 
-#: resources.h:422
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Noklusējuma redaktors teksta datnēm ir '%s'."
@@ -6342,8 +6490,8 @@
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "Ievadītais filtra vārds jau eksistē."
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "Ievadītais filtra vārds jau eksistē, lūdzu izvēlieties citu vārdu."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6360,9 +6508,9 @@
 "Datne %s jau eksistē.\n"
 "Lūdzu ievadiet jaunu vārdu:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6378,14 +6526,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:59
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Datni '%s' nevar ielādēt."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2052
-#: ../../locales/../src/interface/LocalListView.cpp:2184
-#: ../../locales/../src/interface/RemoteListView.cpp:2634
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6394,8 +6542,8 @@
 "Datni '%s' nevar atvērt:\n"
 "Neviena programma nav asociēta uz jūsu sistēmas ar šo datņu tipu."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2097
-#: ../../locales/../src/interface/LocalListView.cpp:2197
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6427,9 +6575,8 @@
 msgstr ""
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
-#, fuzzy
 msgid "The file selected as default editor does not exist."
-msgstr "Izvēlētais redaktors neeskistē"
+msgstr "Datne, kas izvēlēta kā noklusējuma redaktors, neeskistē."
 
 #: ../../locales/../src/interface/import.cpp:95
 msgid ""
@@ -6458,19 +6605,19 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Sekojošās rakstzīmes tiks aizstātas: %s"
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "Sekojošās datnes šobrīd tiek rediģētas:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr "Bezmaksas atklātā pirmkoda FTP risinājums"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:293
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
 msgstr "Globālās grāmatzīmes nevar saglabāt."
 
-#: resources.h:967
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6503,15 +6650,14 @@
 "Filezilla un uzsāktu instalāciju."
 
 #: ../../locales/../src/interface/updatewizard.cpp:609
-#, fuzzy
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
 msgstr ""
-"Jaunākā versija ir lejupielādēta. Lūdzu intalējiet tā pat kā šo versiju."
+"Jaunākā versija ir lejupielādēta. Lūdzu intalējiet to tā pat kā jūs "
+"instalējāt šo versiju."
 
-#: ../../locales/../src/interface/QueueView.cpp:1935
-#: ../../locales/../src/interface/QueueView.cpp:1962
+#: ../../locales/../src/interface/QueueView.cpp:1964
 msgid "The queue will not be saved."
 msgstr "Rinda netiks saglabāta."
 
@@ -6526,38 +6672,37 @@
 msgid "The selected categories have been imported."
 msgstr "Izvēlētās kategorijas importētas."
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Izvēlētā datne satur importējamus datus šādām kategorijām:"
 
-#: resources.h:320
+#: resources.h:322
 msgid "The selected file is already being edited:"
 msgstr "Atlasītā datne jau tiek rediģēta:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2694
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/RemoteListView.cpp:2646
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2879
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
 msgstr "Serveri nevar pievienot."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
-#, fuzzy
 msgid "The server sent an unexpected or unrecognized reply."
-msgstr "Serveris nosūtija neatpazītu atbildi."
+msgstr "Serveris nosūtija negaidītu vai neatpazītu atbildi."
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Serveris lieto sekojošo rakstzīmju kopas kodējumu datņu vārdiem:"
 
@@ -6567,14 +6712,14 @@
 "certificate to make sure the server can be trusted."
 msgstr ""
 
-#: resources.h:186
+#: resources.h:188
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
 
-#: resources.h:174
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6588,11 +6733,11 @@
 "Uzstādījumi tika importēti. Jums jārestartē Filezilla, lai visiem "
 "uzstādījumiem būtu efekts."
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3115
+#: ../../locales/../src/interface/QueueView.cpp:3220
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 
@@ -6612,11 +6757,11 @@
 msgid "Themes"
 msgstr "Tēmas"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Šo filtru komlektu nevar aizvākt."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Šo filtru komlektu nevar pārsaukt."
 
@@ -6626,33 +6771,37 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:689
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 
-#: resources.h:667
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
 
-#: resources.h:885
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Laiks"
+
+#: resources.h:901
 msgid "Time formatting"
 msgstr "Laika formatēšana"
 
-#: resources.h:728
+#: resources.h:742
 msgid "Time&out in seconds:"
 msgstr "Noil&dze pēc sekundēm:"
 
-#: resources.h:731 ../../locales/../src/interface/QueueView.cpp:1050
-#: ../../locales/../src/interface/QueueView.cpp:1094
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
 msgstr "Noildze"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1078
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6665,21 +6814,21 @@
 msgid "Title:"
 msgstr "Virsraksts:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2314
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2315
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 
-#: resources.h:782
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
 
-#: resources.h:992
+#: resources.h:1008
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6696,7 +6845,7 @@
 "Zaļa: Datne ir jaunāka nekā neatzīmētā datne otrā pusē\n"
 "Sarkana: Datnes izmēri atšķiras"
 
-#: resources.h:994
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6706,23 +6855,23 @@
 "Ja iespējota, pārvietojoties pa lokālo direktoriju hierarhiju, mainīs "
 "direktorijus arī servera pusē un otrādi."
 
-#: resources.h:982 resources.h:983
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
 msgstr "Pārslēdz pārsūtījumu rindas apstrādi"
 
-#: resources.h:974 resources.h:975
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
 msgstr "Pārslēdz lokālā direktoriju koka attēlošanu"
 
-#: resources.h:972 resources.h:973
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
 msgstr "Pārslēdz ziņojumu žurnāla attēlošanu"
 
-#: resources.h:976 resources.h:977
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
 msgstr "Pārslēdz attālā direktoriju koka attēlošanu"
 
-#: resources.h:978 resources.h:979
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
 msgstr "Pārslēdz pārsūtījumu rindas attēlošanu"
 
@@ -6735,32 +6884,32 @@
 msgstr "Par daudz virziena maiņas"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "Izsekot"
 
-#: resources.h:915 resources.h:921
+#: resources.h:931 resources.h:937
 msgid "Transfer"
 msgstr "Pārsūtīt"
 
-#: resources.h:360
+#: resources.h:362
 msgid "Transfer &direction"
 msgstr "Pārsūtīšanas &virziens"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "Pārsūtīšanas &režīms"
 
-#: resources.h:738
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "Pārsūtīšanas režīms"
 
-#: resources.h:871
+#: resources.h:887
 msgid "Transfer Queue"
 msgstr "Pārsūtījumu rinda"
 
-#: resources.h:97
+#: resources.h:98
 msgid "Transfer Settings"
 msgstr "Pārsūtīšanas uzstādījumi"
 
@@ -6774,7 +6923,7 @@
 msgid "Transferred data got tainted."
 msgstr "Pārsūtītie dati sabojājās."
 
-#: ../../locales/../src/interface/QueueView.cpp:1473
+#: ../../locales/../src/interface/QueueView.cpp:1491
 #: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "Pārsūta"
@@ -6783,16 +6932,16 @@
 msgid "Transfers"
 msgstr "Pārsūtījumi"
 
-#: ../../locales/../src/interface/QueueView.cpp:3032
-#: ../../locales/../src/interface/QueueView.cpp:3035
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "Transfers finished"
 msgstr "Pārsūtījumi pabeigti"
 
-#: resources.h:829
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
 msgstr "Apstrādāt datnes &bez paplašinājuma kā ASCII datnes"
 
-#: resources.h:825
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Apstrādāt &sekojošos datņu veidus kā ASCII datnes:"
 
@@ -6806,49 +6955,49 @@
 msgid "Trust new Hostkey:"
 msgstr "Uzticēties jaunajai saimnieka atslēgai: "
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
-msgstr ""
+msgstr "Uzticēties jaunajai atslēgai un turpināt savienošanos?"
 
 #: resources.h:22
 msgid "Trust this certificate and carry on connecting?"
-msgstr ""
+msgstr "Uzticēties šim sertifikātam un turpināt savienošanos?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
-msgstr ""
+msgstr "Uzticēties šim saimniekdatoram un turpināt savienošanos?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "Tips"
 
-#: resources.h:764
+#: resources.h:778
 msgid "Type of FTP Proxy:"
 msgstr "FTP starpniekdatora tips:"
 
-#: resources.h:789
+#: resources.h:803
 #, fuzzy
 msgid "Type of generic proxy:"
 msgstr "FTP starpniekdatora tips:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
 msgstr "&Augšupielādēt"
 
-#: resources.h:483 resources.h:809
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "A&ugšupielādes ierobežojums:"
 
-#: resources.h:933
+#: resources.h:949
 msgid "U&se filetype associations if available"
 msgstr "J&a pieejamas, lietot datņu tipu asociācijas"
 
-#: resources.h:886
+#: resources.h:902
 msgid "U&se system defaults"
 msgstr "L&ietot sistēmas noklusējuma"
 
-#: resources.h:766
+#: resources.h:780
 msgid "USER@&HOST"
 msgstr ""
 
@@ -6861,12 +7010,12 @@
 msgid "Unit:"
 msgstr "Vienība:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "Nezināms"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 
@@ -6879,13 +7028,13 @@
 msgid "Unknown certificate"
 msgstr "Nezināms sertifikāts"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:409
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "Nezināma saimniekdatora atslēga"
 
@@ -6896,7 +7045,7 @@
 "subnegotiation: %d"
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:454
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -6914,7 +7063,7 @@
 "mode has to be used."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:888
 msgid "Unsupported certificate type"
 msgstr "Neatbalstīts sertifikātu veids"
 
@@ -6922,7 +7071,7 @@
 msgid "Unsupported redirect"
 msgstr "Neatbalstīta virzienmaiņa"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr ""
 
@@ -6936,11 +7085,11 @@
 msgid "Update wizard"
 msgstr "Atjauninājumu vednis"
 
-#: resources.h:362
+#: resources.h:364
 msgid "Upload"
 msgstr "Augšupielāde"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "Augšupielāde neizdevās"
 
@@ -6953,122 +7102,126 @@
 msgid "Upload limit: none"
 msgstr "Augšupielādes ierobežojums: nekāds"
 
-#: resources.h:644
+#: resources.h:658
 msgid "Upload selected directory"
 msgstr "Augšupielādēt atlasīto direktoriju"
 
-#: resources.h:556
+#: resources.h:566
 msgid "Upload selected files and directories"
 msgstr "Augšupielādēt atlasītās datnes un direktorijus"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "Augšupielādēt šo datni atpakaļ uz serveri?"
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr "Augšupielādēt šo datni uz serveri?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "Augšupielādē"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "Augšupielādē un gaida aizvākšanu"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr ""
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
 msgstr "Lietot &pielāgotu rakstzīmju kopu"
 
-#: resources.h:930
+#: resources.h:946
 msgid "Use &custom editor:"
 msgstr "Lietot &pielāgotu redaktoru:"
 
-#: resources.h:421
+#: resources.h:423
 msgid "Use &default editor for text files"
 msgstr "Lietot &noklusējuma redaktoru teksta datnēm"
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr "Izmantot &sinhonizēto pārlūkošanu"
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Lieto UTF-8, ja serveris to atbalsta, citādi lieto lokālo rakstzīmju kopu."
 
-#: resources.h:257 resources.h:267
+#: resources.h:259 resources.h:269
 msgid "Use default action"
 msgstr "Lietot noklusējuma darbību"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr ""
+
+#: resources.h:372
 msgid "Use server currently connected to"
 msgstr "Izmantot aktuālā savienojuma serveri"
 
-#: resources.h:371
+#: resources.h:373
 msgid "Use server from site manager"
 msgstr "Lietot serveri no Vietņu pārvaldnieka"
 
-#: resources.h:880
+#: resources.h:896
 msgid "Use system &defaults"
 msgstr "Lietot sistēmas &noklusējuma"
 
-#: resources.h:690
+#: resources.h:704
 msgid "Use the following IP address:"
 msgstr "Lietot sekojošo IP adresi:"
 
-#: resources.h:700
+#: resources.h:714
 msgid "Use the following port range:"
 msgstr "Izmantot sekojošo pieslēgvietu diapazonu:"
 
-#: resources.h:685
+#: resources.h:699
 msgid "Use the server's external IP address instead"
 msgstr "Izmantot tās vietā servera ārējo IP adresi"
 
-#: resources.h:691 resources.h:754
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Izmantojiet šo, ja jūs esat aiz maršrutētāja un ir statiska ārējā IP adrese."
 
-#: resources.h:694
+#: resources.h:708
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "Lietotājs:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:502
-#: ../../locales/../src/interface/sitemanager.cpp:1135
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
 msgstr "Lietotāja vārds nevar būt vairākas atstarpes"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
 msgstr "Lieto starpniekserveri %s"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Nepareizas rakstzīmju kopas lietošana var izraisīt datņu vārdu nepareizu "
 "attēlošanu."
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "Izmantojot šo vedni jūs varat pārbaudīt atjauninājumus."
 
@@ -7084,43 +7237,43 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
 msgstr "Pārbauda sertifikātu..."
 
-#: resources.h:168
+#: resources.h:170
 msgid "Version:"
 msgstr "Versija:"
 
-#: resources.h:814
+#: resources.h:828
 msgid "Very high"
 msgstr "Ļoti augsts"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 
-#: resources.h:917
+#: resources.h:933
 msgid "View/Edit"
 msgstr "Skatīt/Rediģēt"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
 msgstr "Redzamās kolonnas"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "R&akstīt"
 
-#: ../../locales/../src/interface/QueueView.cpp:1772
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
 msgstr "Gaida"
 
-#: ../../locales/../src/interface/QueueView.cpp:1380
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
 msgstr "Gaida pārlūkošanas savienojumu"
 
-#: ../../locales/../src/interface/QueueView.cpp:1423
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
 msgstr "Gaida paroli"
 
@@ -7162,33 +7315,37 @@
 "Do you really want to check for nightly builds?"
 msgstr ""
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "Brīdinājums: Iespējams drošības pārkāpums!"
 
-#: resources.h:474
+#: resources.h:476
 msgid "Welcome to FileZilla"
 msgstr "Laipni lūgti FileZilla"
 
-#: resources.h:463
+#: resources.h:465
 msgid "What's new"
 msgstr "Kas jauns"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
 msgstr "Kas jauns:"
 
-#: resources.h:817
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 
-#: resources.h:859
+#: resources.h:873
 msgid "Widescreen"
 msgstr "Platekrāna"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "Ra&kstīt"
 
@@ -7205,7 +7362,7 @@
 msgid "Yes"
 msgstr "Jā"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7213,15 +7370,15 @@
 "Jūs jau lietojat aktuālāko FileZilla versiju. Pārbaudiet atjauninājumus arī "
 "turpmāk."
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7242,29 +7399,29 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Jus neievadījāt jaunu vārdu datnei. Vai pārrakstīt datni?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2031
-#: ../../locales/../src/interface/RemoteListView.cpp:2613
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2151
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:426
-#: ../../locales/../src/interface/sitemanager.cpp:1048
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Jāievada saimniekdatora vārds."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:817
 msgid "You have to enter a local directory."
 msgstr "Jāievada lokāls direktorijs."
 
@@ -7273,17 +7430,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Jāievada derīga IP adrese."
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:823
 msgid "You have to enter a writable local directory."
 msgstr "Jāievada rakstāms lokālais direktorijs."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:513
-#: ../../locales/../src/interface/sitemanager.cpp:1145
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
 msgstr "Jāievada saimniekdatora vārds"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:483
-#: ../../locales/../src/interface/sitemanager.cpp:1116
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr "Jānorāda lietotājvārds"
 
@@ -7293,7 +7450,7 @@
 "transferred data."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:53
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
 msgstr "Jums jāievada grāmatzīmes vārds."
 
@@ -7301,54 +7458,52 @@
 msgid "You need to enter a name for the log file."
 msgstr "Jums jāievada žurnāla vārds."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1640
 msgid "You need to enter a properly quoted command."
-msgstr "Jāievada saimniekdatora vārds."
+msgstr "Jums jāievada pareizi citētu komandu."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
-#, fuzzy
 msgid "You need to enter a proxy host."
-msgstr "Jāievada saimniekdatora vārds."
+msgstr "Jums jāievada starpserveris."
 
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Jāievada starpniekservera pieslēgvietu diapazonā no 1 līdz 65535"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:74
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:441
-#: ../../locales/../src/interface/sitemanager.cpp:1205
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:81
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:448
-#: ../../locales/../src/interface/sitemanager.cpp:1214
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1170
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 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:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr "Jānorāda lokālā datne."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
 msgstr "Jānorāda attālā datne."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
 msgstr "Jānorāda attālais ceļš."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
 msgstr "Jānorāda serveris."
 
@@ -7358,37 +7513,37 @@
 "should work properly."
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "after"
 msgstr "pēc"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "before"
 msgstr "pirms"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "sākas ar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "satur"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
 msgstr "nesatur"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
 msgid "does not equal"
 msgstr "nav vienāds"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
 msgstr "beidzas ar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
 msgstr "vienāds ar"
 
@@ -7411,59 +7566,59 @@
 "FileZilla executable."
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1557
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
 msgid "fzsftp could not be started"
 msgstr "nevar palaist fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr "lielāks nekā"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
 msgstr "grupai izpildāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr "grupa lasāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr "grupa rakstāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr "ir vienāds ar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr "ir iestatīts"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr "ir atstatīts"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "mazāk kā"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr "sakrīt ar regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
 msgstr "īpašniekam izpildāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
 msgstr "īpašniekam lasāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
 msgstr "īpašniekam rakstāma"
 
@@ -7471,22 +7626,25 @@
 msgid "unknown"
 msgstr "nezināms"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
 msgstr "pasaulei izpildāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr "pasaulei lasāma"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr "pasaulei rakstāma"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "Duplicate filter name"
+#~ msgstr "Dubults filtra vārds"
+
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Nevar ielādēt galveno izvēlni no resursu datnes"
 
diff -Nru filezilla-3.5.3/locales/nl.po filezilla-3.7.3~precise/locales/nl.po
--- filezilla-3.5.3/locales/nl.po	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/nl.po	2013-04-29 03:30:05.000000000 +0000
@@ -2,28 +2,27 @@
 msgstr ""
 "Project-Id-Version: filezilla_nl\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-08 11:58+0100\n"
-"PO-Revision-Date: 2011-11-03 17:16+0100\n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2013-03-28 13:06+0100\n"
 "Last-Translator: Axel Vanderhaeghen <axel@eco13.eu>\n"
 "Language-Team:  <en@li.org>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Generator: KBabel 1.11.4\n"
+"X-Generator: Poedit 1.5.5\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S verstreken"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S resterend"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -41,9 +40,9 @@
 msgstr[0] "%d map"
 msgstr[1] "%d mappen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -52,9 +51,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -75,7 +74,7 @@
 msgstr[0] "%d bestand. Totale grootte: minstens %s"
 msgstr[1] "%d bestanden. Totale grootte: minstens %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d bestanden toegevoegd aan wachtrij"
@@ -87,31 +86,21 @@
 msgstr[0] "%d seconde"
 msgstr[1] "%d seconden"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Host"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Wachtwoord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
+#, fuzzy, c-format
+msgid "%s (%s/s)"
 msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -126,7 +115,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Nog niet geldig!"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxygebruiker"
@@ -148,27 +137,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
+#: ../../locales/../src/interface/updatewizard.cpp:902
+#, fuzzy, c-format
+msgid "%s bytes (%s/s)"
 msgstr "%s bytes (%d B/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -182,7 +161,7 @@
 "Download FileZilla opnieuw. Als het probleem zich blijft voordoen, verzend "
 "dan een foutenrapport."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -204,152 +183,148 @@
 msgid "%s with %d bits"
 msgstr "%s met %d bits"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Gebruikersnaam"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proxywachtwoord"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "&Over..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
 msgstr "&Account:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Actief"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
 msgstr "F&avoriet toevoegen..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "Bestanden toevoegen aan w&achtrij"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "Sleutelbest&and toevoegen..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "Toevoegen &aan wachtrij"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "Offset van servertijdzone &aanpassen:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "&Altijd het certificaat vertrouwen in toekomstige sessies."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Deze host &altijd vertrouwen en deze sleutel toevoegen aan de cache"
 
-#: resources.h:940
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "&Altijd de standaardeditor gebruiken"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "Selectie &altijd gebruiken voor ongeassocieerde bestanden"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "Deze actie &altijd gebruiken"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr "Vr&aag uw besturingssysteem naar het externe IP-adres"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Automatisch"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "&Auto-detectie"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Binair"
 
-#: resources.h:900
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Binaire prefixes met SI-symbolen (bijv. 1 KB = 1024 bytes)."
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Favorieten"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Bladeren..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Barsttolerantie:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "&Annuleren"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Controleren op betaversies van FileZilla"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
 msgstr "&Privédata wissen..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "&FileZilla sluiten"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
 msgstr "Snelheidlimieten &configureren..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Configureren..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Verbinden"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopiëren"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Huidige verbinding naar Sitebeheer kopiëren..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "&Kopiëren naar klembord"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Crash"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "&Map aanmaken"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "&Nieuwe tab maken"
 
@@ -357,648 +332,659 @@
 msgid "&Debug"
 msgstr "&Debuggen"
 
-#: resources.h:967
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "&Debuginformatie in berichtenlogboek:"
 
-#: resources.h:933
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Standaardeditor:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "&Standaard 'bestand bestaat reeds'-actie..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Verschil tussen mislukte inlogpogingen:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "&Verwijderen"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
 msgstr "Symbolische link verwij&deren"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Mappenvergelijking"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "Lokale bestand verwerpen en een nieuwe &downloaden en bewerken"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "&Verbinding verbreken"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "&Verbinding verbreken met server"
 
-#: resources.h:876
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "Over&drachtsnelheid op elk moment weergeven i.p.v. de gemiddelde snelheid"
 
-#: resources.h:898
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Grootte in bytes tonen"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "&Sla geen wachtwoorden op"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Dit venster niet meer tonen."
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "&Gebruik geen extern IP-adres op lokale verbindingen."
 
-#: resources.h:920
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "&Dubbeklikactie voor bestanden:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Downloaden"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "&Downloaden naar:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
 msgstr "&Downloaden..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "&Downloads:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "B&ewerken"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
 msgstr "Filt&erregels bewerken..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "To&estaan"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "Automatisch&e updatecontrole toestaan"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "Sn&elheidslimieten inschakelen"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "&Encodering:"
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
 msgstr "&Encryptie:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
 msgstr "Aangepast&e opdracht invoeren..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
 msgstr "&Uitvoeren"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Sitebeheervermeldingen exporteren"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "&Exporteren..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Terugvallen naar actieve modus"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Bestand"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Bestandsattributen..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "&Bestandsrechten..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Bestand:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "&Filtervoorwaarden:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Filtergroepen:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Filters:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Voltooien"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "&Bewerken voltooien en het lokale bestand verwijderen"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "&Externe paden vlakmaken, alle bestanden direct naar doelmap downloaden"
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Symbolische link volgen, inhoud van doelmap verwijderen"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
 msgstr "Extern IP-adres &ophalen van de volgende URL:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Hulp verkrijgen..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Globale favoriet"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 met CONNECT-methode"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "&Help"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Identieke bestanden verbergen"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Hoogst"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
 msgstr "&Hoogst mogelijke poort:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Host:"
 
-#: resources.h:899
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC-binaire prefixes (bijv. 1 KiB = 1024 bytes)"
 
-#: resources.h:887
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (voorbeeld: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Importeren..."
 
-#: resources.h:942
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "Bestandstype-assoc&iaties van systeem overnemen"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr "Structuur van externe pad relatief houden aan zoe&kroot"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "&Opmaak van de bestands- en mappanelen:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
 msgstr "Lokale poorten gebruikt door FileZilla &limiteren"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "Het aantal gelijktijdige verbindingen &limiteren"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "&Lokale boomstructuur:"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "&Lokale map:"
 
-#: resources.h:957
+#: resources.h:981
 msgid "&Log to file"
 msgstr "Naar bestand &loggen"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
 msgstr "&Inlogtype:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "&Inlogtype:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "&Laag"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
 msgstr "&Favorieten beheren..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "Hand&matige overdracht..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&Maximaal aantal verbindingen:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Maximum aantal keer opnieuw proberen:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "&Berichtenlogboek"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Minimaliseren naar systeemvak"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Naam:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
 msgstr "&Netwerkconfiguratiewizard..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "&Nieuw"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "&Nieuwe site"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Nieuwe versie beschikbaar!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "Volge&nde >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Nee"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "Gee&n"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "&Normaal"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "Aa&ntal dagen tussen updatecontroles:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Numerieke waarde:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Openen"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "&Overschrijven"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Passief"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Wachtwoord:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "&Geluid afspelen"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "&Poort:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "&Positie van het berichtenlogboek:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "Tijdstem&pels van overgedragen bestanden behouden"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "&Wachtrij"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "&Snelverbinden"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "&Snelverbindbalk"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Lezen"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "He&rverbinden"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Vernieuwen"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "Wachtwoo&rd voor deze sessie onthouden"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+#, fuzzy
+msgid "&Remember passwords"
+msgstr "Wachtwoo&rd voor deze sessie onthouden"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "&Externe map:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Externe pad:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "Ve&rwijderen"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "Sleutel ve&rwijderen"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "Geselectee&rde verwijderen"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "He&rnoemen"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "He&rnoemen..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
 msgstr "Lokaal bestand he&ropenen"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "Ongeldige karakters ve&rvangen met:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "&Fout rapporteren..."
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "&Resetten en allemaal opnieuw in wachtrij zetten"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "&Wizard herstarten"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "He&rvatten"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "Commando uitvoe&ren..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
 msgstr "Configuratiewizard nu uitvoe&ren..."
 
-#: resources.h:951
+#: resources.h:976
 msgid "&Run update check now..."
 msgstr "Nu controle&ren op updates..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
 msgstr "&Opslaan als..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Zoeken"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
 msgstr "Externe be&standen afzoeken..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "Item &selecteren:"
 
-#: resources.h:931
+#: resources.h:951
 msgid "&Select language:"
 msgstr "Taal &selecteren:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "&Selecteer de kolommen die weergegeven moeten worden:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Instellingen"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "&Instellingen..."
 
-#: resources.h:966
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "&Debugmenu tonen"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "&Bericht tonen"
 
-#: resources.h:956
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "Tijd&stempels in berichtenlogboek tonen"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "&Sitebeheer..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "&Site-specifieke favoriet"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "Over&slaan"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "&Snelheidlimieten"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "Overdracht meteen &starten"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Verwissel lokale en externe panelen"
 
+#: resources.h:637
+#, fuzzy
+msgid "&TLS Ciphers"
+msgstr "Code:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testen"
 
-#: resources.h:879
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Thema:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
 msgstr "Overdrach&t"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "Overdrach&tsmodus:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "Overdrach&tswachtrij"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Pun&tbestanden als ASCII-bestanden behandelen"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Niet bewerken"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Gecachte sleutel voor deze host bijwerken"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Uploaden"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "&Uploads:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "Aangepast programma gebr&uiken"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "Gesynchroniseerd bladeren gebr&uiken"
 
-#: resources.h:935
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "Standaardeditor van systeem voor tekstbestanden gebr&uiken"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "&Gebruik het volgende IP-adres:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "&Gebruik het externe IP-adres van de server"
 
-#: resources.h:902
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "Duizend-scheidingsteken gebr&uiken"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
 msgstr "Gebr&uiker:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
 msgstr "Gebr&uikersnaam:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versie %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "&Beeld"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Bekijken/bewerken"
 
-#: resources.h:941
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "Lokaal bewerkte bestanden in de gaten houden en vragen om &wijzigingen te "
 "uploaden"
 
-#: resources.h:136
+#: resources.h:972
+#, fuzzy
+msgid "&When checking for updates, check for:"
+msgstr "Zoeken naar updates"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Schrijven"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Ja"
 
@@ -1022,7 +1008,22 @@
 "Het inlogtype 'Account' wordt niet ondersteund door het geselecteerde "
 "protocol"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:594
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+#, fuzzy
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"FileZilla is uitgevoerd in kioskmode.\n"
+"De inlogtypes 'Normaal' en 'Account' zijn niet beschikbaar in deze mode."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1040,120 +1041,116 @@
 msgstr[0] "(%d object gefilterd)"
 msgstr[1] "(%d objecten gefilterd)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(0 voor onbegrensd)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 seconden)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 om uit te schakelen)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(minimum 7 dagen)"
-
-#: resources.h:895
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(voorbeeld: %H:%M)"
 
-#: resources.h:889
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(voorbeeld: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(in %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ",%H:%M:%S resterend"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ",--:--:-- resterend"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
 msgstr "- Kapotte router en/of firewall"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- Bestand op mirrorsite corrupt"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- Malware op uw computer"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- resterend"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c kan niet samen gebruikt worden met een FTP-URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l kan enkel samen gebruikt worden met een FTP-URL."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s en -c kunnen niet gelijktijdig aanwezig zijn."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s kan niet samen gebruikt worden met een FTP-URL."
 
-#: resources.h:968
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Niets"
 
-#: resources.h:969
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Waarschuwing"
 
-#: resources.h:970
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Informatie"
 
-#: resources.h:971
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Uitgebreid"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-bitsysteem"
 
-#: resources.h:972
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-bitsysteem"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Vorige"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1164,16 +1161,17 @@
 "Een favoriet met de ingevoerde naam bestaat reeds. Kies a.u.b. een "
 "ongebruikte naam."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Er moet een standaardeditor ingesteld worden."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Een map kan niet in één van zijn submappen worden gesleept."
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1183,28 +1181,28 @@
 "zo'n geval kunt u gebruik maken van de actieve modus. In actieve modus opent "
 "FileZilla een poort en vraagt de server ermee te verbinden."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Een eerder geopend bestand is gewijzigd."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Een bestand met die naam wordt al bewerkt. Wilt u '%s' opnieuw openen?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Een bestand met die naam wordt al overgezet."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Een bestand met die naam wordt nog bewerkt. Sluit het en probeer het opnieuw."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1219,11 +1217,11 @@
 "bestandslijsten.\n"
 "Er zal geen waarschuwing meer getoond worden gedurende deze sessie."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Er is een nieuwere versie van FileZilla beschikbaar:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1232,7 +1230,7 @@
 "verbergen bestanden voor de gebruiker. Gebruik deze optie om de server te "
 "forceren om alle bestanden te tonen."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1250,15 +1248,15 @@
 "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de "
 "lokale map?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "&Toevoegen"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "&Hervatten van ASCII-bestanden toestaan"
 
@@ -1270,55 +1268,55 @@
 msgid "A&pply only to uploads"
 msgstr "Enkel toe&passen op uploads"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "Toe&passen op alle bestanden en mappen"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "A&utomatisch succesvolle overdrachten verwijderen"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "Vorige verbinding afbreken en verbinden in nieuwe tab"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "Over FileZilla"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Boven de bestandslijsten"
 
-#: ../../locales/../src/engine/server.cpp:858
-#: ../../locales/../src/engine/server.cpp:877
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Account"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Actie na verwerking van wa&chtrij"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Actie voor geselecteerd bestand:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Uit te voeren actie:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "Actie:"
 
@@ -1352,23 +1350,23 @@
 "adres, maar uw router of firewall heeft het verzendingsadres misleidend "
 "gewijzigd."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "IP voor actieve modus"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "&Bestanden enkel aan wachtrij toevoegen"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Geselecteerde map toevoegen aan de overdrachtswachtrij"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Geselecteerde bestanden en mappen toevoegen aan de overdrachtswachtrij"
 
-#: resources.h:922 resources.h:928
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Toevoegen aan wachtrij"
 
@@ -1376,28 +1374,37 @@
 msgid "Address type not supported"
 msgstr "Adrestype niet ondersteund"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Geavanceerd"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Geavanceerde opties:"
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Algoritme:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Alle bestanden zijn succesvol overgedragen"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Alle poorten in het opgegeven bereik moeten tussen 1024 en 65535 liggen."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, 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."
@@ -1407,19 +1414,19 @@
 "Alle overdrachten zijn afgerond. %d bestanden konden niet overgedragen "
 "worden."
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "&Fallback toelaten naar andere overdrachtsmodus bij een foutmelding"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Fallback toelaten naar andere overdrachtsmodus bij een foutmelding"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Reeds verbonden"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1427,7 +1434,7 @@
 "Ook kunt u het Pageant-hulpmiddel gebruiken van PuTTY om uw sleutels te "
 "beheren, want FileZilla herkent Pageant."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1435,7 +1442,7 @@
 "U kunt ook de SSH-agent van uw systeem gebruiken. Om dit te doen, moet u "
 "ervoor zorgen dat de SSH_AUTH_SOCK-variabele ingeschakeld is."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1443,7 +1450,7 @@
 "Als alternatief bezoekt u http://filezilla-project.org om de nieuwste versie "
 "te downloaden."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1452,7 +1459,7 @@
 "Er is een fout opgetreden bij het laden van de wachtrij van \"%s\".\n"
 "Het is mogelijk dat een aantal items uit de wachtrij niet werden hersteld"
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1462,7 +1469,7 @@
 "Het is mogelijk dat een aantal items uit de wachtrij niet goed werden "
 "opgeslagen."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1470,17 +1477,17 @@
 "Een bestand met dezelfde naam als het gesleepte item bestaat al op de "
 "doellocatie."
 
-#: ../../locales/../src/engine/server.cpp:879
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anoniem"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
@@ -1499,58 +1506,58 @@
 "De veranderingen in Sitebeheer worden niet opgeslagen tenzij u het bestand "
 "repareert."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "De veranderingen aan de filters kunnen niet worden opslagen."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "De veranderingen aan de filters worden niet opgeslagen."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "Enke&l toepassen op mappen"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Toepassen"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Enkel toepassen op huidige wa&chtrij"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "&Enkel toepassen op bestanden"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archief"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Als tab in het overdrachtswachtrijpaneel"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Vragen naar actie"
 
-#: ../../locales/../src/engine/server.cpp:854
-#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Vraag naar een wachtwoord"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
 msgstr "Vraag het besturingssysteem naar een poort."
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "Vraag uw besturingssysteem naar het externe IP-adres"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Vragen stellen in de FileZilla-forums"
 
@@ -1558,39 +1565,35 @@
 msgid "Associated program not found:"
 msgstr "Geassocieerde programma is niet gevonden:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Minstens een filtervoorwaarde is onvolledig"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "Momenteel is alle benodigde informatie verzameld."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attribuut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Authenticatie mislukt"
 
-#: resources.h:880
+#: resources.h:900
 msgid "Author:"
 msgstr "Auteur:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Automatisch"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Automatische bestandstypeclassificatie"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Automatische updatecontrole"
-
-#: resources.h:884
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Beschikbare groottes"
 
@@ -1599,36 +1602,36 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
 msgstr "Prox&y niet gebruiken"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Basisinstructies voor gebruik"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Gedrag"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Wordt aangepast"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Benchmark de snaar coalescer"
 
-#: ../../locales/../src/engine/tlssocket.cpp:881
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Let op! Het certificaat is ingetrokken"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "Binair"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Schoolbord"
 
@@ -1638,27 +1641,27 @@
 msgid "Bookmark"
 msgstr "Favoriet"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Favoriet:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Favorieten"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Bouwdatum:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Bouwinformatie"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Zakencategorie:"
 
-#: resources.h:752
+#: resources.h:772
 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, "
@@ -1668,63 +1671,63 @@
 "brengen in actieve modus. Als u FileZilla wilt limiteren tot een beperkt "
 "poortbereik, voer dan het poortbereik hieronder in."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "Huidige actie &annuleren"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Controleren op nac&htelijke versies van FileZilla"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "A&lles legen"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
 msgstr "URL('s) naar klembord k&opiëren"
 
-#: resources.h:888
+#: resources.h:908
 msgid "C&ustom"
 msgstr "&Aangepast"
 
-#: resources.h:943
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "&Aangepaste bestandstype-associaties:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Tijdzoneverschil van server calculeren..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Kan niet lezen van bestand"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Kan data niet schrijven naar bestand."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Kan data niet naar bestand schrijven: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "Annuleren"
 
-#: resources.h:990
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Huidige actie annuleren"
 
-#: resources.h:991
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Onderbreekt de huidige actie"
 
@@ -1733,11 +1736,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Kan %s niet benaderen, geen media aanwezig of de drive is niet gereed."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:564
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Kon server niet aan Sitebeheer toevoegen"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1753,30 +1756,30 @@
 "Kan mappen niet vergelijken, verschillende filters zijn toegelaten voor "
 "lokale en externe mappen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Kan mappen niet vergelijken, niet verbonden met een server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Kan geen nieuwe filter aanmaken"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Kan bestand niet bewerken"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Kan bestand niet bewerken, niet verbonden met een server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Kan bestand niet bewerken, externe pad onbekend."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1784,8 +1787,8 @@
 "Kan geen FTP-verbinding maken met een SFTP-sever. Selecteer een correct "
 "protocol."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Kan de snelverbindingsbalk niet laden uit bronbestand"
 
@@ -1797,44 +1800,48 @@
 msgid "Cannot load keyfile"
 msgstr "Kan sleutelbestand niet laden"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1066
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Kan de werkbalk niet laden uit bronbestand"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Kan wachtwoord niet onthouden"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Kan de vermelding niet hernoemen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Kan het bestand niet hernoemen"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Kan filtergroep niet opslaan"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Kan filter niet selecteren"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Kan bestandsassociatie niet toepassen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Kan het venster niet tonen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Kan geselecteerde bestand niet bekijken/bewerken"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Categorieën"
 
@@ -1842,61 +1849,61 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certificaat- en sessiegegevens zijn nog niet beschikbaar."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Certificaatdetails"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Certificaat in ketting:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Certificaatuitgever"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Oproepen:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Bestandsattributen veranderen"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Bestandsrechten veranderen."
 
-#: resources.h:964
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Door het wijzigen van de logbestandsinstellingen dient FileZilla herstart te "
 "worden."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Probleem met karakteromzetting"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Karakterset"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Controleren op &betaversies en uitgavekandidaten"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
 msgstr "Controleren op &updates..."
 
-#: resources.h:551
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Controleer automatisch op FileZilla &updates:"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
 msgstr "Zoeken naar nieuwere versies van FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Controleren op updates"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Updatecontrole mislukt"
 
@@ -1904,21 +1911,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Controleren voor correct extern IP-adres"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
 msgstr "Zoeken naar updates"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Checksum komt niet overeen met het gedownloade bestand."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Kies de standaard lokale map"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Kies de lokale map"
 
@@ -1926,43 +1933,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Chunkdata verkeerd beëindigd"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Code:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "&Tab sluiten"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Klassiek"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "&Sitebeheervermeldingen leegmaken"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "&Lay-outcache leegmaken"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "&Snelverbindgeschiedenis leegmaken"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "He&rverbindingsinformatie leegmaken"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Overdrach&tswachtrij leegmaken"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:146
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Geschiedenis leegmaken"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1970,11 +1977,11 @@
 msgid "Clear private data"
 msgstr "Privédata wissen"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:145
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Snelverbindbalk leegmaken"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Wis de snaar coalescer"
 
@@ -1982,24 +1989,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klik op Afsluiten om uw configuratie op te slaan."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klik op Volgende om de nieuwe versie te downloaden."
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "MAC voor cliënt naar server:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Code voor cliënt naar server:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "&Alle andere tabs sluiten"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1138
-#: ../../locales/../src/interface/Mainfrm.cpp:1161
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "FileZilla sluiten"
 
@@ -2007,11 +2014,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Alle lopende FileZilla-programma's sluiten"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Sluit de huidige tab"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "Co&mmentaar:"
 
@@ -2019,11 +2026,11 @@
 msgid "Column properties"
 msgstr "Kolomeigenschappen"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Kolominstellingen"
 
-#: resources.h:938
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Het commando en de argumenten moeten correct opgemaakt zijn."
 
@@ -2042,9 +2049,9 @@
 msgstr "Commando wordt niet ondersteund door het geselecteerde protocol"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Commando:"
 
@@ -2052,7 +2059,7 @@
 msgid "Comment"
 msgstr "Commentaar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Gebruikelijke naam:"
 
@@ -2061,15 +2068,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Communicatie onderbroken door router of firewall"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "&Wijzigingstijd vergelijken"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Be&standsgrootte vergelijken"
 
-#: resources.h:918
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Vergelijkings&drempel (in minuten):"
 
@@ -2077,60 +2084,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Het vergelijkingsaantal moet tussen 0 en 1440 minuten zijn."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Gecompileerd voor:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Gecompileerd op:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Gecompileerd met:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Compilatievlaggen:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Verkleind"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Gelijktijdige overdrachten"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Voorw&aarden zijn hoofdlettergevoelig"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Configuratietest"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Passieve modus configureren"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Poortbereik configureren"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "FileZilla en uw netwerk configureren"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Verwijdering bevestigen"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Bevestiging vereist"
 
@@ -2138,7 +2145,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Gefeliciteerd, uw configuratie lijkt te werken."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:144
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Verbinden zonder proxyinstellingen te gebruiken"
 
@@ -2146,34 +2153,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Verbinden met de gespecificeerde site in Sitebeheer"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Verbonden"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Verbinden"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Verbinden met %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Verbinden met %s via proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Verbinden met %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Verbinden met server"
 
@@ -2181,17 +2188,17 @@
 msgid "Connection"
 msgstr "Verbinding"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
 msgstr "Verbindingspoging mislukt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Verbindingspoging mislukt met \"%s\", probeert nu volgende adres."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Verbindingspoging mislukt met \"%s\"."
@@ -2205,12 +2212,12 @@
 msgid "Connection closed"
 msgstr "Verbinding gesloten"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Verbinding gesloten door server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Verbinding aangemaakt, TLS initialiseren..."
@@ -2219,7 +2226,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Verbinding aangemaakt, HTTP-verzoek verzenden"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Verbinding aangemaakt, welkomstbericht afwachten..."
 
@@ -2235,15 +2242,15 @@
 msgid "Connection refused"
 msgstr "Verbinding geweigerd"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Verbinding verloren"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Verbinding verloren."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Verbinding met server verbroken."
 
@@ -2263,27 +2270,23 @@
 msgid "Convert keyfile"
 msgstr "Sleutelbestand converteren"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Kopiëren"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopiëren (%d) van %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopie van %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Kopieer de URL's van de geselecteerde items naar het klembord."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Kan verbinding niet accepteren: %s"
@@ -2293,16 +2296,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Kan verbinding niet toevoegen aan Sitebeheer"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Kan bewerking niet voltooien"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Kan niet verbinden met server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kan niet verbinden met server: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Kan commando niet converteren naar serverencodering"
 
@@ -2311,17 +2318,17 @@
 msgid "Could not convert private key"
 msgstr "Kan privésleutel niet converteren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Kan URL's niet kopiëren"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Kan data niet kopiëren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2331,11 +2338,11 @@
 "Óf de shellextensie is niet goed geïnstalleerd óf u heeft de bestanden niet "
 "naar een Verkenner-venster gesleept."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Kan geen verbinding maken met de server"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2347,11 +2354,11 @@
 "<aangepast pad>'-opdrachtregeloptie of door de FZ_DATADIR-omgevingsvariabele "
 "te wijzigen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Kan geen aangepaste inlogvolgorde genereren."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1011
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2359,7 +2366,7 @@
 "Kon geen onderscheidende naam verkrijgen van certificaatverschaffer, "
 "gnutls_x509_get_issuer_dn mislukte"
 
-#: ../../locales/../src/engine/tlssocket.cpp:986
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2367,7 +2374,7 @@
 "Kon geen onderscheidende naam verkrijgen het certificaatonderwerp, "
 "gnutls_x509_get_dn mislukte"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Kan externe pad niet volledig verkrijgen."
 
@@ -2376,15 +2383,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Kan geen antwoord krijgen van fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr "Kan de tijdelijke map niet bereiken om het bestand in te downloaden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:939
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "Kon peercertificaten niet importeren, gnutls_x509_crt_import mislukte"
 
-#: ../../locales/../src/engine/tlssocket.cpp:932
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2412,7 +2419,7 @@
 msgid "Could not load private key"
 msgstr "Kan privésleutel niet laden"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2423,7 +2430,7 @@
 "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de "
 "externe map?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2443,9 +2450,9 @@
 "Kan geen corresponderende externe map verkrijgen voor de lokale map '%s'.\n"
 "Gesynchroniseerd bladeren is uitgeschakeld."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Kan klembord niet openen"
 
@@ -2460,11 +2467,11 @@
 msgid "Could not parse remote path."
 msgstr "Kan externe pad niet ontleden."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Kan serveradres niet ontleden:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Kan niet lezen van socket: %s"
@@ -2473,12 +2480,12 @@
 msgid "Could not read server item."
 msgstr "Kan serveritem niet lezen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Kan niet vooruitspringen naar punt %s binnen bestand"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Kan niet tot einde van het bestand zoeken"
 
@@ -2486,17 +2493,17 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Kan geen commando versturen naar fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Kan IO-thread niet spawnen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Kan handschudden met proxy niet starten: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Kan de overdracht niet starten"
 
@@ -2522,7 +2529,7 @@
 "Kan \"%s\" niet schrijven, de globale favorieten kunnen niet toegevoegd "
 "worden: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2531,16 +2538,16 @@
 "Kan \"%s\" niet schrijven, de wachtrij kan niet opgeslagen worden.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Kan \"%s\" niet schrijven, de geselecteerde sites kunnen niet geëxporteerd "
 "worden: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Kan \"%s\" niet schrijven: %s"
@@ -2550,7 +2557,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Kan sleutelbestand niet schrijven: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Kan niet schrijven naar lokaal bestand"
 
@@ -2560,39 +2567,52 @@
 msgid "Could not write to log file: %s"
 msgstr "Kan niet schrijven naar logbestand: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Kan niet schrijven naar socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Land:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Doet FileZilla onmiddellijk crashen. Wordt enkel gebruikt om de exception "
 "handler te debuggen"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "&Nieuw bestand aanmaken"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Nieuwe submap aanmaken in de huidige map"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Nieuwe submap aanmaken in de huidige map"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Map aanmaken"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Nieuw leeg bestand aanmaken"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Map aanmaken"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Map '%s' aanmaken..."
@@ -2610,7 +2630,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Fatale bestandsoverdrachtsfout na het overdragen van %s in %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2632,52 +2652,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Huidige overdrachtstype is ingesteld op binair."
 
-#: resources.h:773 resources.h:894
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "Aangepas&t"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Aangepaste filtergroep"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Aangepaste server"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "D&atatype"
 
-#: resources.h:901
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "D&ecimale prefixes met SI-symbolen (bijv. 1 KB = 1000 bytes)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "&Standaard"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "V&erwijderen"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Alles u&itschakelen"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "Sla geen wachtwoorden op"
 
-#: resources.h:925
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "Dubbelklikactie v&oor mappen:"
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr ""
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-achtig met virtuele paden"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Gevaarlijk bestandstype"
 
@@ -2685,16 +2709,16 @@
 msgid "Data"
 msgstr "Data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Datasocket te snel gesloten."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Datum"
 
-#: resources.h:885
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Datumopmaak"
 
@@ -2713,11 +2737,11 @@
 msgid "Debug"
 msgstr "Debug"
 
-#: resources.h:965
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Instellingen debuggen"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Standaard &lokale map:"
 
@@ -2725,19 +2749,19 @@
 msgid "Default (Autodetect)"
 msgstr "Standaard (autodetectie)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Standaardeditor is niet correct opgemaakt."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Standaard 'bestand bestaat reeds'-actie"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Standaard &externe map:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2749,15 +2773,15 @@
 msgid "Default system language"
 msgstr "Standaard systeemtaal"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Standaard overdrachtsmodus:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Standaard overdrachtstype:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Standaard: http://ip.filezilla-project.org/ip.php"
 
@@ -2783,58 +2807,58 @@
 "Vertraagt verbinding voor %d seconden als gevolg van een vorige mislukte "
 "verbindingspoging..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Sitebeheervermeldingen verwijderen"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Geselecteerde map verwijderen"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Geselecteerde bestanden en mappen verwijderen"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Mappen verwijderen"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 "Het verwijderen van meerdere ongerelateerde mappen wordt nog niet ondersteund"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Symbolische link verwijderen"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Bureaublad"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Details"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Details voor nieuwe sleutel:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "&Mappen"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Richting"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Map"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2338
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Mappenvergelijking"
 
@@ -2853,11 +2877,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Weergeven van mappenlijst is onderbroken door gebruiker"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Mappenlijst opmaken mislukt"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Mappenlijstfilters opmaken"
 
@@ -2865,68 +2889,67 @@
 msgid "Directory listing successful"
 msgstr "Mappenlijst succesvol ontvangen"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "&Alles uitschakelen"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Gesynchroniseerd bladeren uitschakelen en doorgaan met het wijzigen van de "
 "externe map?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:671
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 "Schakel deze optie uit indien u uw mappeninhoud niet meer correct kunt zien."
 
-#: resources.h:992
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Verbinding met server verbreken"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Verbinding verbroken met server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Verbinding verbroken met server: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Verbinding verbreken met vorige server"
 
-#: resources.h:993
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Verbreekt de verbinding met de momenteel zichtbare server"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "'Over...'-venster tonen"
 
-#: resources.h:934
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "&Niet de standaardeditor gebruiken"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "&Niets doen"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2935,8 +2958,8 @@
 "Tenzij u nieuwe mogelijkheden wilt testen, kunt u beter de stabiele versie "
 "gebruiken."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
-#: ../../locales/../src/interface/Mainfrm.cpp:1165
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Wilt u FileZilla werkelijk sluiten?"
 
@@ -2951,7 +2974,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Wilt u de Sitebeheervermeldingen werkelijk verwijderen?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Wilt u de geselecteerde vermelding werkelijk verwijderen?"
 
@@ -2959,34 +2982,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Wilt u de overdrachtswachtij werkelijk verwijderen?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:595
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Wilt u %s werkelijk naar de server verzenden?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Documentatie"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "Gebruik geen extern IP-adres op &lokale verbindingen."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Puntbestanden zijn bestandsnamen die beginnen met een punt, bijvoorbeeld ."
 "htaccess"
 
-#: resources.h:919
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Dubbelklikactie"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "Downloaden"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "Download&limiet:"
 
@@ -2999,42 +3022,51 @@
 msgid "Download limit: none"
 msgstr "Downloadlimiet: geen"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Zoekresultaten downloaden"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Geselecteerde map downloaden"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Geselecteerde bestanden en mappen downloaden"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Downloadsnelheid: %s/s\n"
+"Uploadsnelheid: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Downloaden"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "%s downloaden"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 "Het downloaden van meerdere ongerelateerde mappen wordt nog niet ondersteund"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Zoekresultaten downloaden"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3043,61 +3075,65 @@
 "Slepen & neerzetten tussen verschillende instanties van FileZilla is op dit "
 "moment nog niet mogelijk."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Slepen & neerzetten tussen verschillende servers is op dit moment nog niet "
 "mogelijk."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr ""
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "A&lles toestaan"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "Map invoere&n"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "&Uitvoeren"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "&Afsluiten"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Elke filter vereist minstens één voorwaarde."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Filters bewerken"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Het bestand bewerken met de geconfigureerde editor en wijzigingen uploaden "
 "naar de server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Bewerken mislukt"
 
-#: resources.h:882
+#: resources.h:902
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Leeg commando"
 
@@ -3105,7 +3141,7 @@
 msgid "Empty command."
 msgstr "Leeg commando."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Lege mappenlijst"
 
@@ -3117,95 +3153,102 @@
 msgid "Empty file extension."
 msgstr "Lege bestandsextensie."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Lege filternamen zijn niet toegestaan."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Lege naam"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Lege kommastring."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "A&lles toestaan"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "&Filtering van ongeldige karakters inschakelen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Versleuteld"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
 msgstr "Encryptie"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
 msgstr "Encryptiedetails"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Vergelijking beëindigen en sorteringsvolgorde wijzigen?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
 msgstr "Voer een aangepaste &opdracht in..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Voer 0 in voor ongelimiteerde snelheid."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Voer een opdracht in"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Voer een aangepaste opdracht in"
 
-#: resources.h:926
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Map invoeren"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Voer een filternaam in"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Voer een naam voor de filtergroep in"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Voer een nieuwe naam in voor de filterset"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Voer een wachtwoord in"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Geselecteerde map invoeren"
 
-#: resources.h:719
+#: resources.h:739
+#, fuzzy
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Vul het adres van de server in.\n"
 "Om het serverprotocol te specificeren, vult u voor de host de "
@@ -3225,7 +3268,7 @@
 "Houd er rekening mee dat het geconverteerde bestand niet beschermd zal zijn "
 "met een wachtwoord."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3247,7 +3290,7 @@
 msgid "Error importing"
 msgstr "Fout bij importeren"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Fout bij laden van de wachtrij"
 
@@ -3256,27 +3299,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:731
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:786
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Fout bij laden van XML-bestand"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Fout bij het opslaan van de wachtrij"
 
@@ -3287,73 +3330,81 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Fout bij schrijven van XML-bestand"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Fout, bestandsnaam kan niet ontleed worden."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Fout, het lokale bestand bestaat maar kan niet verwijderd worden"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Fout:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Verbinding maken in een nieuwe tab"
 
-#: resources.h:945
+#: resources.h:971
+msgid "Every month"
+msgstr "Maandelijks"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "Elke twee weken"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Voorbeeld: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:924
 msgid "Examples"
 msgstr "Voorbeelden"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "Uit&voeren"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Uitvoerbaar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Toepassing bevat geen versie-informatie, kan niet controleren op updates."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Verkenner"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Exporterings&wachtrij"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "Exporterings&instellingen"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Exporteringsinstellingen"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "F&ilternaam:"
 
@@ -3373,25 +3424,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Onveilig protocol voor de bestandsoverdracht"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-systeem niet geïnitialiseerd, kan niet verbinden"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP-keepalive"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP-URL"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3407,71 +3458,71 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP over impliciet TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Wijzigen van de map is mislukt"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Wijzen van de taal is mislukt"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Controleren voor een nieuwere versie van FileZilla is mislukt."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Het kopiëren of verplaatsen van sites is mislukt"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:524
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr "Maken van back-upkopie van XML-bestand is mislukt"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Aanmaken van luistersocket is mislukt, breekt af"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Aanmaken van luistersocket voor overdracht met actieve modus is mislukt."
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Downloaden van de laatste versie van FileZilla is mislukt."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Verkrijgen van 'Mijn documenten'-pad is mislukt"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Verkrijgen van 'Bureaublad'-pad is mislukt"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Ontvangen van peeradres via controleverbinding mislukt, verbinding verbroken."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Ontvangen van peeradres via dataverbinding mislukt, verbinding verbroken."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Initialiseren van FTP-systeem is mislukt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Initialiseren van TLS is mislukt."
@@ -3485,24 +3536,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Laden van privésleutel mislukt: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Openen van \"%s\" voor toevoegen/schrijven is mislukt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Openen van \"%s\" voor lezen is mislukt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Openen van \"%s\" voor schrijven is mislukt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Kon het teruggestuurde pad niet ontleden."
 
@@ -3510,7 +3561,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Ontleden van rootcertificaat mislukt."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Ontvangen van data is mislukt"
 
@@ -3522,11 +3573,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Ontvangen van het externe IP-adres is mislukt, breekt af"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Ontvangen van het externe IP-adres is mislukt, gebruikt lokaal adres"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Ontvangen van het lokale IP-adres is mislukt."
 
@@ -3542,13 +3593,13 @@
 msgid "Failed to send command."
 msgstr "Versturen van commando is mislukt."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "De taal instellen als %s (%s) is mislukt, gebruikt de standaard systeemtaal"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3556,27 +3607,27 @@
 "De taal instellen als %s (%s) is mislukt, gebruikt de standaard systeemtaal "
 "(%s, %s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "De taal instellen als %s (%s) is mislukt, gebruikt de standaard systeemtaal."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
 "Taal naar %s overzetten is mislukt, standaard systeemtaal wordt gebruikt"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "De taal instellen als %s is mislukt, gebruikt de standaard systeemtaal (%s, %"
 "s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3586,7 +3637,7 @@
 msgid "Failed to validate settings"
 msgstr "Valideren van instellingen mislukt"
 
-#: ../../locales/../src/engine/tlssocket.cpp:874
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Controleren van peercertificaat mislukt"
 
@@ -3595,7 +3646,7 @@
 msgid "Failed to write to file %s"
 msgstr "Schrijven van bestand %s mislukt"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:542
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
 msgstr "Schrijven van XML-bestand is mislukt"
 
@@ -3603,21 +3654,19 @@
 msgid "Failed transfers"
 msgstr "Mislukte overdrachten"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "Terugval naar actieve modus"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "B&estand:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "B&estanden"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Bestand"
 
@@ -3633,7 +3682,7 @@
 msgid "File editing"
 msgstr "Bestandsbewerking"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Bestand bestaat reeds"
 
@@ -3641,7 +3690,7 @@
 msgid "File exists action"
 msgstr "'Bestand bestaat'-actie"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Bestand is gewijzigd"
 
@@ -3649,14 +3698,14 @@
 msgid "File lists"
 msgstr "Bestandslijsten"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Bestand niet gevonden"
 
-#: resources.h:1003
+#: resources.h:1028
 msgid "File search"
 msgstr "Bestandszoekopdracht"
 
@@ -3693,25 +3742,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Bestandsoverdracht succesvol, %s in %s overgedragen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Bestandsoverdrachten zijn nog bezig."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Het bestand zal overgebracht worden met het ASCII-datatype."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Het bestand zal overgebracht worden met het binaire datatype."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-fout"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3719,78 +3768,80 @@
 "FileZilla kan uw configuratie nu testen om u ervan te verzekeren dat alles "
 "correct is ingesteld."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla is reeds verbonden met een server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla is uitgevoerd in kioskmode.\n"
-"De inlogtypes 'Normaal' en 'Account' zijn niet beschikbaar in deze mode."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla dient herstart te worden om de taalverandering door te voeren."
 
-#: resources.h:517
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla-updates"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "&Balken voor bestandslijststatus"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Bestandsnaam"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "Bestandsnaam&filters..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "Bestandsnaam kan niet gemaakt worden voor de map %s en de bestandsnaam %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Bestandsnaam ongeldig"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Bestandsnamen mogen geen van de volgende tekens bevatten: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Bestandsnaam ongewijzigd"
 
-#: resources.h:307 resources.h:958
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Bestandsnaam:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Bestandsnamen mogen geen van de volgende tekens bevatten: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Bestandsnamen mogen geen van de volgende tekens bevatten: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Bestanden die momenteel bewerkt worden"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Bestandsgrootte"
@@ -3799,68 +3850,68 @@
 msgid "Filesize format"
 msgstr "Bestandsgrootteformaat"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Bestandstype"
 
-#: resources.h:946
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Bestandstype-associaties"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Filter toepassen op:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Ongeldige karakters in bestandsnamen uitfilteren"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Filternaam bestaat reeds"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Items uitfilteren die overeenkomen met alle van de volgende"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr "Items uitfilteren die overeenkomen met elk van de volgende"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
 msgstr "Items uitfilteren die overeenkomen met geen van de volgende"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtergroep bestaat reeds"
 
-#: resources.h:996
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Mappenlijst filteren"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filtervalidatie mislukt"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Vingerafdruk (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Vingerafdruk (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Vingerafdruk:"
 
@@ -3868,7 +3919,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Firewall- en routerconfiguratiewizard"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3876,13 +3927,13 @@
 "Voor meer gedetailleerde informatie over wat deze opties inhouden, kunt u de "
 "netwerkconfiguratiewizard uitvoeren."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Voor de betrouwbaarheid moet u een bereik van minstens 10 poorten "
 "specifiëren."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3890,32 +3941,32 @@
 "Voor deze sessie zullen de standaarinstellingen gebruikt worden. "
 "Veranderingen aan de instellingen worden niet opgeslagen."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "&UTF-8 forceren"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "&Tonen van verborgen bestanden forceren"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Tonen van verborgen bestanden forceren"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Formaatspecificaties:"
 
-#: resources.h:944
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Formaat: extensie gevolgd door correct opgemaakt commando met argumenten."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Verdere documentatie"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Algemeen"
 
@@ -3923,21 +3974,21 @@
 msgid "General SOCKS server failure"
 msgstr "Algemene SOCKS-serverfout"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Generieke proxy"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
 msgstr "Extern IP-adres ophalen van de volgende URL:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Hulp verkrijgen"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "De gegeven filtergroep bestaat reeds. Wilt u deze filtergroep overschrijven?"
@@ -3946,15 +3997,15 @@
 msgid "Global bookmarks"
 msgstr "Globale favorieten"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Groepsrechten"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "&Hoog"
 
@@ -3962,21 +4013,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP over TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Verborgen"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Hoog"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Hoogst"
 
@@ -3984,26 +4035,26 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "De hoogst mogelijke poort moet tussen 1024 en 65535 liggen."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Houd de Shift-knop ingedrukt om door de filterstatus aan beide kanten te "
 "navigeren."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Website:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Hostsleutelvingerafdruk:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Verkeerde hostsleutel"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
 "Er zijn hosts gevonden die met '[' beginnen, maar zonder sluitend haakje "
@@ -4013,20 +4064,20 @@
 msgid "Host unreachable"
 msgstr "Host onbereikbaar"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Host:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "Uren,"
 
-#: resources.h:893
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (voorbeeld: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 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 "
@@ -4036,13 +4087,13 @@
 "langer dan de gespecificeerde tijd, zal de verbinding gesloten worden en "
 "FileZilla zal proberen opnieuw verbinding te maken."
 
-#: resources.h:974
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Bij het rapporteren van fouten is het gewenst dat u logboeken toevoegt met "
 "\"Uitgebreid\"-logniveau."
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -4055,7 +4106,7 @@
 "kunt de instellingen voor overdrachtsmodus voor iedere server afzonderlijk "
 "specificeren in Sitebeheer."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4063,7 +4114,7 @@
 "Indien de fallbackoptie geactiveerd is, kunt u verbinden met servers die de "
 "geselecteerde overdrachtsmodus niet accepteren."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4087,7 +4138,7 @@
 "Indien dit probleem zich blijft voordoen, stoort een router en/of firewall "
 "de verbinding."
 
-#: resources.h:963
+#: resources.h:987
 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 "
@@ -4097,7 +4148,7 @@
 "door \".1\" aan het einde van de bestandsnaam toe te voegen (dit kan oudere "
 "logbestanden overschrijven) en wordt er een nieuw logbestand aangemaakt."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4119,7 +4170,7 @@
 "Indien dit probleem zich blijft voordoen, neem dan contact op met de "
 "fabrikant van de router."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 "
@@ -4130,7 +4181,7 @@
 "(bijv. verschillende tijdzones), specificeer dan een tijdzoneverschil in "
 "Sitebeheer."
 
-#: resources.h:917
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4138,11 +4189,11 @@
 "Indien u tijdstempel-gebaseerde vergelijking gebruikt, acht twee bestanden "
 "dan gelijk als hun tijdstempelverschil niet de drempel overschrijdt."
 
-#: resources.h:932
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Indien u de taal wijzigt, moet u FileZilla herstarten."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4150,11 +4201,11 @@
 "Indien u op 'Testen' klikt, zal FileZilla verbinden met probe.filezilla-"
 "project.org en zullen een aantal eenvoudige tests uitgevoerd worden."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1164
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Indien u Fillezilla sluit, worden uw wijzigingen niet opgeslagen."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4162,13 +4213,13 @@
 "Indien u de verkeerde bestandstypes invult, kan het zijn dat deze bestanden "
 "beschadigd worden tijdens de overdracht."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "Indien er foutmeldingen gegenereerd worden, blijkt het dat uw configuratie "
 "niet correct is."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4188,7 +4239,7 @@
 "u over naar passieve modus en neemt u contact op met de serveradministrator "
 "voor verdere hulp."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4196,7 +4247,7 @@
 "Indien u de wizard succesvol heeft afgerond en de laatste tests gelukt zijn, "
 "zijn uw firewall en router correct ingesteld."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4204,7 +4255,7 @@
 "Indien u een firewall gebruikt, zorg er dan voor dat FileZilla toegelaten "
 "wordt op alle opgegeven poorten."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4224,7 +4275,7 @@
 msgid "Import data from older version"
 msgstr "Data van een oudere versie importeren"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Importeringsinstellingen"
 
@@ -4238,7 +4289,7 @@
 msgid "Improperly quoted association."
 msgstr "Incorrect opgemaakte associatie."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4246,7 +4297,7 @@
 "In actieve modus zal FileZilla luisteren via een poort voor data-"
 "overdrachten. U moet specificeren welke poorten FileZilla zal gebruiken."
 
-#: resources.h:703
+#: resources.h:723
 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."
@@ -4255,7 +4306,7 @@
 "doorsturen, aangezien FileZilla geen invloed heeft op de poorten die door uw "
 "systeem gekozen worden."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4263,14 +4314,14 @@
 "Indien u automatische updates wenst, kunt u dit aanzetten in het "
 "instellingenvenster."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
 "Om de actieve modus te gebruiken, moet FileZilla uw externe IP-adres weten."
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4280,7 +4331,7 @@
 "FileZilla de server naar een poort en zal met de gegeven poort verbinden. Er "
 "zullen niet veel instellingen voor aangepast hoeven te worden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:888
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4288,20 +4339,20 @@
 "Incomplete ketting, topcertificaat is geen zelfgesigneerd "
 "autoriteitscertificaat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Incorrect wachtwoord"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "TLS initialiseren..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Onveilige server, die geen FTP over TLS ondersteunt."
 
-#: ../../locales/../src/engine/server.cpp:856
-#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactief"
@@ -4311,8 +4362,8 @@
 msgstr "Gebruikersomgeving"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
 msgstr "Onderbroken door gebruiker"
 
@@ -4324,8 +4375,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Ongeldig HTTP-antwoord"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4348,12 +4399,13 @@
 msgid "Invalid date"
 msgstr "Ongeldige datum"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Ongeldige bestandsnaam"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Ongeldige host, na het sluitende haakje mag er enkel een dubbele punt en een "
@@ -4363,21 +4415,22 @@
 msgid "Invalid input"
 msgstr "Ongeldige invoer"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Ongeldige poort ingevoerd. Het poortnummer moet tussen 1 en 65535 liggen."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:124
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#, fuzzy
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Ongeldig protocol gespecificeerd. Geldige protocols zijn:\n"
 "ftp:// voor normale FTP,\n"
@@ -4385,7 +4438,15 @@
 "ftps:// voor FTP over SSL (impliciet) en\n"
 "ftpes:// voor FTP over SSL (expliciet)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Ongeldige host, na het sluitende haakje mag er enkel een dubbele punt en een "
+"poort komen."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Ongeldige regulaire expressie in zoekvoorwaarden."
 
@@ -4393,7 +4454,7 @@
 msgid "Invalid response code"
 msgstr "Ongeldige antwoordcode"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Ongeldige zoekvoorwaarden: %s"
@@ -4405,38 +4466,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ongeldig sitepad"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ongeldige grootte in voorwaarde"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Ongeldige gebruikersnaam ingevoerd."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Land van jurisdictie:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Plaats van jurisdictie:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Staat of provincie van jurisdictie:"
 
-#: resources.h:914
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Mappen bovenaan houden"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:670
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4447,50 +4508,55 @@
 "voert enkele tests uit om te kijken of de server deze functie ondersteunt, "
 "maar de tests zouden kunnen mislukken."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Sleuteluitwisseling"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Sleuteluitwisseling"
+
+#: resources.h:619
 msgid "L&owest"
 msgstr "&Laagst"
 
-#: resources.h:930
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Taal"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Taal is gewijzigd"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Laatst gewijzigd"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Opmaak"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Limiet voor gelijktijdige &downloads:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
 msgstr "Limiet voor gelijktijdige &uploads:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
 msgstr "Lokale poorten limiteren"
 
-#: resources.h:960
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Limietgrootte van het logbestand"
 
-#: resources.h:961
+#: resources.h:985
 msgid "Limit:"
 msgstr "Limiet:"
 
@@ -4498,7 +4564,7 @@
 msgid "Line length exceeded"
 msgstr "Regellengte overschreden"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Gelinkt tegen"
 
@@ -4507,21 +4573,21 @@
 msgstr "Luistersocket gesloten"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Lijst:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
 msgstr "&Laagst mogelijke poort:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokaal"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Lokale bestand"
 
@@ -4537,7 +4603,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Lokale bestand heeft geen geldige bestandsnaam."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Lokale filters:"
 
@@ -4545,7 +4611,7 @@
 msgid "Local site:"
 msgstr "Lokale site:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Lokaliteit:"
 
@@ -4553,16 +4619,16 @@
 msgid "Log file"
 msgstr "Logbestand"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Logboek van updatecontrole:"
 
-#: resources.h:955
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Loggen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4571,7 +4637,7 @@
 "8 werken. Kan niet terugvallen op lokale karakterset, omdat proxy gebruikt "
 "wordt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4579,12 +4645,12 @@
 "Inlogdata bevat niet-ASCII-karakters en de server kan misschien niet met UTF-"
 "8 werken. Probeert via lokale karakterset."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "De inlogvolgorde is volledig uitgevoerd, maar er is niet ingelogd. Breekt af."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Het inlogtype moet óf 'vragen' óf 'interactief' zijn (zonder de komma's)."
@@ -4598,13 +4664,13 @@
 "Het inlogtype kan enkel samen gebruikt worden met een FTP-URL. Het argument "
 "moet óf '%s' óf '%s' zijn"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Laag"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Laagst"
 
@@ -4612,7 +4678,7 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "De laagst mogelijke poort moet tussen 1024 en 65535 liggen."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
@@ -4639,7 +4705,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Misvormd antwoord, server verstuurt niet de juiste regeleindes"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4650,52 +4716,52 @@
 msgid "Manual transfer"
 msgstr "Handmatige overdracht"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Komt overeen met al het volgende"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Overeenkomen met elk van de volgende"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Overeenkomen met geen van de volgende"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "Maximum aantal gelijktijdige &overdrachten:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:378
-#: ../../locales/../src/interface/Mainfrm.cpp:1855
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Berichtenlogboek"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "Berichtenlogboekpositie"
 
-#: resources.h:962
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "Minuten"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "&Omlaag verplaatsen"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "&Omhoog verplaatsen"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Mijn computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Mijn documenten"
 
@@ -4710,33 +4776,33 @@
 msgid "N/a"
 msgstr "Niet beschikbaar"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Naam"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Naam bestaat reeds"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Favorietennaam bestaat reeds."
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Naam:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Filternaam moet ingevoerd worden"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Moet een geldig extern pad invoeren"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Karakterencodering moet gespecificeerd worden"
 
@@ -4744,19 +4810,23 @@
 msgid "Network unreachable"
 msgstr "Netwerk onbereikbaar"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "Nooit"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "&Nieuwe map"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Nieuwe &tab"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "&Nieuwe favoriet"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4769,23 +4839,23 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nieuwe favoriet"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nieuwe map"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nieuwe functies en verbeteringen in %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nieuwe filter"
 
@@ -4795,15 +4865,15 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nieuwe site"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "Naast de overdrachtswachtrij"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nee"
 
@@ -4811,25 +4881,25 @@
 msgid "No category to export selected"
 msgstr "Geen exportcategorie geselecteerd"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Geen opdracht gegeven, breekt af."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Geen extern IP-adres ingesteld, probeert standaard."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Er worden momenteel geen bestanden bewerkt."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Geen filternaam ingevoerd"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Geen host ingevuld, vul een host in."
 
@@ -4837,27 +4907,27 @@
 msgid "No images available"
 msgstr "Geen afbeeldingen beschikbaar"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Er zijn geen bestanden meer in de wachtrij!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Er is geen naam ingevoerd voor de filtergroep."
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Geen programma geassocieerd met bestandstype"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 "Er is geen programma geassocieerd om bestanden met de extensie '%s' te "
 "bewerken."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Geen zoekresultaten"
 
@@ -4875,23 +4945,23 @@
 msgid "No username given."
 msgstr "Geen gebruikersnaam ingevoerd."
 
-#: resources.h:924 resources.h:929
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Geen"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Nog geen geselecteerd"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normaal"
 
@@ -4903,15 +4973,15 @@
 "bewerken."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Niet verbonden"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Kan met geen enkele server verbinden"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:564
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Niet verbonden met een server."
 
@@ -4919,24 +4989,24 @@
 msgid "Not connected."
 msgstr "Niet verbonden."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Houd er rekening mee dat deze mogelijkheid alleen ondersteund wordt bij "
 "gebruik van het FTP-protocol."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Nota bene: dit werkt enkel met normale, onversleutelde FTP-verbindingen."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Let op: het gebruik van een generieke proxy forceert passieve mode op FTP-"
 "verbindingen."
 
-#: resources.h:903
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Aantal decimale plaatsen:"
 
@@ -4944,21 +5014,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Het aantal pogingen moeten tussen 0 en 99 zijn."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "Bestand o&penen"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4966,118 +5036,124 @@
 "Op de volgende pagina's worden de overdrachtsmodus geconfigureerd. Indien "
 "ingeschakeld worden ook de fallbackmodus geconfigureerd."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Eenmaal"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Enkel uw FileZilla-versie en uw besturingssysteem zullen naar de server "
-"gestuurd worden."
+#: resources.h:969
+msgid "Once a week"
+msgstr "Wekelijks"
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Map openen in de bestandsbeheerder van het systeem"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Sitebeheer openen"
 
-#: resources.h:564
+#: resources.h:1001
+#, fuzzy
+msgid "Open the Site Manager."
+msgstr "Sitebeheer openen"
+
+#: resources.h:1002
+#, fuzzy
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Opent het mapfilteringsvenster. Klik rechts om de filters te wisselen."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Open het bestand."
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
 msgstr "Instellingenvenster van FileZilla openen"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Geopend als:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Openen is mislukt"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Opent een nieuwe tab"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Opent sitebeheer"
 
-#: resources.h:997
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "Opent het mapfilteringsvenster. Klik rechts om de filters te wisselen."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "Besturingssysteem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Probleem met besturingssysteem gedetecteerd"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Organisatie:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Anders:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Overzicht"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Overschrijven &indien bron nieuwer is"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Bestand overschrijven"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Bestand overschrijven indien grootte verschilt"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Bestand overschrijven indien grootte verschilt of bronbestand nieuwer is"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Bestand overschrijven indien bronbestand nieuwer is"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Overschrijven indien an&dere grootte"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
 msgstr "&Overschrijven indien andere grootte of nieuwere bron"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Eigenaarsrechten"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Eigenaar/groep"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5085,7 +5161,7 @@
 "Voo&rkomen dat het systeem in slaapmodus gaat tijdens overdrachten en andere "
 "operaties"
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "P&roxyhost:"
@@ -5094,27 +5170,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-commando is onderbroken door router of firewall."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssief (aangeraden)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pakket"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2489
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Parameter is geen geldige URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "Wacht&woord:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "Passief (aangeraden)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passieve modus"
@@ -5129,42 +5205,42 @@
 msgid "Password required"
 msgstr "Wachtwoord vereist"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Pad"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Pad kan niet gemaakt worden voor de map %s en de submap %s"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Paden"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Wachten op verwijdering"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Recht"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Rechten"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Platform:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5179,7 +5255,7 @@
 "Controleer op http://filezilla-project.org/probe.php of de server draait en "
 "bekijk uw instellingen dan rustig opnieuw."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5188,7 +5264,7 @@
 "bezoek http://filezilla-project.org om de broncode van FileZilla te "
 "downloaden."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5216,7 +5292,7 @@
 msgid "Please enter a custom time format."
 msgstr "Voer een tijdsformaat in."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5230,20 +5306,20 @@
 msgstr ""
 "Voer een snelheidslimiet in voor downloads, groter of gelijk aan 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Voer een naam in voor de nieuwe filter."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Voer een nieuwe naam in voor deze gekopieerde filtergroep."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Voer a.u.b. een nieuwe naam in voor de filterset \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Voer een nieuwe naam in voor de filter."
 
@@ -5270,11 +5346,11 @@
 "Voer een nummer van 1 tot 10 in voor het maximum aantal gelijktijdige "
 "overdrachten."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Voer een wachtwoord in voor deze server:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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"
@@ -5291,11 +5367,11 @@
 "Voer een timeout in tussen de 5 en de 9999 secondens of 0 om timeout uit te "
 "schakelen."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Voer een unieke naam voor deze filtergroep in"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Voer een gebruikersnaam in voor deze server:"
 
@@ -5307,17 +5383,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Voer de URL in waar uw externe adres van opgehaald kan worden."
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Voer een update-interval in van tenminste 7 dagen."
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Voer een snelheidslimiet in voor uploads, groter of gelijk aan 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5325,14 +5397,19 @@
 "Voer een ruw FTP-commando in.\n"
 "Indien u een FTP-commando gebruikt, wordt de cache leeggemaakt."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Voer een naam in voor de map die gemaakt moet worden:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Voer een naam in voor de map die gemaakt moet worden:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Voer een gebruikersnaam en wachtwoord in voor deze server:"
 
@@ -5351,7 +5428,7 @@
 "Indien u over een dynamisch adres beschikt, of u uw externe adres niet weet, "
 "maakt u gebruik van de optie voor externe adresbepaling."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5368,7 +5445,7 @@
 "zetten en zorg ervoor dat u het juiste adres of de juiste adresbepaler heeft "
 "ingevoerd."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Zorg ervoor dat het gevraagde taalbestand geïnstalleerd is op uw systeem."
@@ -5384,7 +5461,7 @@
 "moet uw router correcte zijn ingesteld. U moet handmatig poorten doorsturen. "
 "Zet uw router niet in de zogenoemde 'DMZ-modus' of 'gamemodus'."
 
-#: resources.h:686
+#: resources.h:706
 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 "
@@ -5396,7 +5473,7 @@
 "denkt dat die enkel gebruikt wordt door trojans of andere malware. Dit zal "
 "een vals alarm veroorzaken dat u gerust kunt negeren."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:718
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5404,7 +5481,7 @@
 "Het behouden van tijdstempels voor uploads werkt enkel op FTP-, FTPS- en "
 "FTPES-servers die het MFMT-commando ondersteunen."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5412,7 +5489,7 @@
 "Houd er rekening mee dat sommige servers u zouden kunnen bannen indien u te "
 "vaak probeert te verbinden in een korte tijd."
 
-#: resources.h:890 resources.h:896
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5421,7 +5498,7 @@
 "Lees http://filezilla-project.org/wiki/index.php/Date_and_Time_formatting "
 "voor details"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5439,39 +5516,39 @@
 "Voer deze wizard opnieuw uit indien u van netwerkomgeving verandert of "
 "indien er problemen optreden met servers die voorheen wel werkten."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Selecteer a.u.b. een actie:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Selecteer de categorieën die u wilt importeren."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Selecteer de standaard overdrachtsmodus die u wenst te gebruiken."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Selecteer de nieuwe attributen voor de map \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Selecteer de nieuwe attributen voor het bestand \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Selecteer de nieuwe attributen voor de geselecteerde mappen."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr ""
 "Selecteer de nieuwe attributen voor de geselecteerde bestanden en mappen."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Selecteer de nieuwe attributen voor de geselecteerde bestanden."
 
@@ -5489,32 +5566,32 @@
 "zogenaamde 'DZM-modus' of 'gamemodus'. Opties als protocolinspectie of "
 "protocolspecifieke fixups moeten uitgeschakeld zijn"
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
 "Bezoek http://filezilla-project.org voor meer informatie over FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 "Bezoek http://filezilla-project.org om de nieuwste versie te downloaden."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Postcode:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Voorgedefinieerde sites"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:717
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Tijdstempels in bestand behouden"
 
@@ -5522,49 +5599,63 @@
 msgid "Preview:"
 msgstr "Voorvertoning:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:914
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Pimaire verbindingscertificaten en dataverbindingscertificaten komen niet "
 "overeen."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Versie-informatie afdrukken naar stdout en afsluiten"
 
-#: resources.h:913
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Mappen indelen op voorkeur (standaard)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioriteit"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Privacybeleid:"
+#: resources.h:977
+#, fuzzy
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Enkel uw FileZilla-versie en uw besturingssysteem zullen naar de server "
+"gestuurd worden."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "Privé&sleutels:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "Pro&tocol:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
 msgstr "Pro&xywachtwoord:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
-msgstr "&Voortgangswachtrij"
+msgstr "Verwerk &Wachtrij"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "Pro&tocol:"
+
+#: resources.h:818
 msgid "Proxy &port:"
 msgstr "Proxy&poort:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
 msgstr "Proxygebr&uiker:"
 
@@ -5572,12 +5663,19 @@
 msgid "Proxy authentication failed"
 msgstr "Proxy-authenticatie mislukt"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Handschudden met proxy mislukt: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"Er zijn hosts gevonden die met '[' beginnen, maar zonder sluitend haakje "
+"eindigen."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5592,23 +5690,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Proxy-aanvraag mislukt: onbekend adrestype in CONNECT-antwoord"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy is ingesteld, maar de proxyhost of -poort is ongeldig"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Authenticatie voor publieke sleutels"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Publiek sleutelalgoritme:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Publieke rechten"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "De wachtrij is volledig verwerkt"
 
@@ -5627,39 +5725,39 @@
 msgid "Queue: empty"
 msgstr "Wachtrij: leeg"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Bestanden in de wachtrij"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "In wachtrij:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "Syst&eem herstarten"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "&Externe boomstructuur"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "R&esetten en geselecteerde bestanden opnieuw in wachtrij zetten"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Ruw FTP-commando"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "L&ezen"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Vernieuwen"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "He&rnoemen"
 
@@ -5671,68 +5769,80 @@
 "Voer de wizard opnieuw uit, controleer uw instellingen en configureer alle "
 "routers en firewalls volgens de wizard."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "Le&zen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Alleen-lezen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1095
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Weet u zeker dat u de huidige operatie wilt onderbreken?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
+#, fuzzy, 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] "Wilt u %d map met inhoud werkelijk verwijderen?"
 msgstr[1] "Wilt u %d mappen met inhoud werkelijk verwijderen?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, fuzzy, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
 msgstr[0] "Wilt u %d bestand werkelijk verwijderen?"
 msgstr[1] "Wilt u %d bestanden werkelijk verwijderen?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
-#, c-format
-msgid "Really delete %s and %s?"
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, fuzzy, c-format
+msgid "Really delete %s and %s from the server?"
 msgstr "%s en %s werkelijk verwijderen?"
 
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+#, fuzzy
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Weet u zeker dat u alle geselecteerde bestanden en/of mappen wilt "
+"verwijderen?"
+
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
+#, fuzzy
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr ""
 "Weet u zeker dat u alle geselecteerde bestanden en/of mappen wilt "
 "verwijderen?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Reden"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Nu opnieuw opstarten"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "Toepassen op alle s&ubmappen"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr ""
 "Er is een regel ontvangen met meer dan 10.000 karakters, bezig met afbreken."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Ontvangen data onderbroken"
 
@@ -5745,11 +5855,11 @@
 "verbinding is met een server.\n"
 "Als u doorgaat, zal de verbinding verbroken worden."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Herverbindingsinstellingen"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Herverbindt met de laatst gebruikte server"
 
@@ -5757,34 +5867,38 @@
 msgid "Redirection to invalid address"
 msgstr "Doorverwijzing naar ongeldig adres"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Bestanden- en mappenlijst verversen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Wachtwoorden onthouden?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Extern"
 
-#: ../../locales/../src/engine/tlssocket.cpp:837
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Externe certificaat is niet vertrouwd."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Extern bestand"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Externe bestandszoekopdracht"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Externe filters:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Externe pad"
 
@@ -5797,7 +5911,7 @@
 "Het externe pad kan niet ontleed worden. Zorg ervoor dat het pad geldig is "
 "en dat het ondersteund wordt door het servertype (%s) van de huidige site."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5808,7 +5922,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Het externe pad kan niet ontleed worden. Zorg ervoor dat het pad geldig is."
@@ -5817,11 +5931,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Het externe pad kan niet ontleed worden."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Behandeling van externe paden:"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Externe pad:"
 
@@ -5829,34 +5943,34 @@
 msgid "Remote site:"
 msgstr "Externe site:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "&Alles verwijderen"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "Ge&selecteerde verwijderen"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Bestand hernoemen"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Geselecteerde map hernoemen"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Geselecteerde bestanden en mappen hernoemen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Hernoemen van '%s' naar '%s'"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
 msgstr "Bugs en functieaanvragen rapporteren"
 
@@ -5868,37 +5982,37 @@
 msgid "Require implicit FTP over TLS"
 msgstr "Vereist impliciet FTP over TLS"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Resetten en &allemaal opnieuw in wachtrij zetten"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Adres oplossen van %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Hostnaam ophalen"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Antwoord:"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Resultaten:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Bestandsoverdracht hervatten"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5906,38 +6020,38 @@
 "Het hervatten van ASCII-bestanden kan problemen geven als de server een "
 "ander regeleindeformaat gebruikt dan de cliënt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Mappenlijst ophalen..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Externe IP-adres ophalen van %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:895
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Rootcertificatie is niet vertrouwd"
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
 msgstr "&Bestanden tonen die momenteel worden bewerkt..."
 
-#: resources.h:875
+#: resources.h:895
 msgid "S&how the Site Manager on startup"
 msgstr "&Toon de Site Manager bij opstart"
 
-#: resources.h:609
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "&Systeem afsluiten"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "S&toppen"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "Ges&ynchroniseerd bladeren"
 
@@ -5945,31 +6059,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr ""
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Instellingen opslaan?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
 msgstr "Zoeken naar bestanden om toe te voegen aan de wachtrij"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
 msgstr "Zoeken naar bestanden om te uploaden"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "&Zoekvoorwaarden:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "&Zoekmap:"
 
-#: resources.h:1002
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Recursief naar bestanden zoeken."
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Server afzoeken voor bestanden"
 
@@ -5982,27 +6110,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Zie ook: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Server sele&cteren"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "&Pagina selecteren:"
 
-#: resources.h:878
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Thema selecteren"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Selecteer een standaardactie voor als het bestand van een overdracht al "
 "bestaat."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Selecteer een standaardeditor"
 
@@ -6022,7 +6150,7 @@
 "Selecteer de standaard 'bestand bestaat reeds'-actie voor aleen de "
 "geselecteerde bestanden in de wachtrij."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Selecteer de downloadlocatie voor het pakket"
 
@@ -6043,7 +6171,7 @@
 msgstr "Selecteer het bestand voor geëxporteerde instellingen"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Selecteer bestand voor geëxporteerde sites"
 
@@ -6059,12 +6187,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Selecteer de bestandsnaam voor het geconverteerde sleutelbestand"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Selecteer hoe deze bestanden geopend moeten worden."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Doeldownloadmap selecteren"
 
@@ -6072,15 +6200,15 @@
 msgid "Select target filename"
 msgstr "Doelbestandsnaam selecteren"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Selecteer de te exporteren categorieën:"
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Selecteer de privégegevens die u wilt verwijderen."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6094,7 +6222,7 @@
 msgstr[0] "%d map geselecteerd."
 msgstr[1] "%d mappen geselecteerd."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6115,7 +6243,7 @@
 msgstr[0] "%d bestand geselecteerd. Totale grootte: minstens %s"
 msgstr[1] "%d bestanden geselecteerd. Totale grootte: minstens %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "U selecteerde %s en %s voor overdracht."
@@ -6130,13 +6258,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s en %s geselecteerd. Totale grootte: minstens %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "De geselecteerde editor bestaat niet."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Het geselecteerde bestand wordt reeds bewerkt"
 
@@ -6144,15 +6272,15 @@
 msgid "Selected file is already loaded"
 msgstr "Het geselecteerde bestand is al geladen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Het geselecteerde bestand is reeds geopend"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Het geselecteerde bestand wordt nog steeds bewerkt"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "De geselecteerde filter werkt enkel voor lokale bestanden."
 
@@ -6170,37 +6298,42 @@
 msgstr ""
 "De geselecteerde port wordt waarschijnlijk gebruikt door een ander protocol."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "FTP-&keepalivecommando's versturen"
 
-#: resources.h:543
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
 msgstr "Indien onmogelijk, stuurt u een aangepast commando naar de server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Sturen van keepalive-commando's"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Serienummer:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "Server&type:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:721
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Server heeft de TLS-verbinding niet goed gesloten"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Server ondersteunt alleen ASCII tekens."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Server ondersteunt het hervatten van bestanden > %d GB niet."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6209,15 +6342,15 @@
 "Server ondersteunt het hervatten van bestanden > %d GB niet. Beëindig de "
 "overdracht indien de bestandsgrootte overeenkomt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Server ondersteunt het hervatten van bestanden > 2 GB niet."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Server ondersteunt het hervatten van bestanden > 4 GB niet."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6226,7 +6359,7 @@
 "Server ondersteunt het hervatten van bestanden > %d GB niet. Beëindig de "
 "overdacht indien de bestandsgrootte overeenkomt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6234,11 +6367,11 @@
 "De server vereist misschien een account. Gelieve een account in te voeren "
 "via Sitebeheer"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "De server stuurde een leeg pad terug."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6246,13 +6379,13 @@
 "De server stuurde een extra inlogaanvraag. U moet het interactieve inlogtype "
 "gebruiken."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "De server genereerde een passief antwoord met een ontraceerbaar adres. "
 "Passieve modus zijn mislukt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6272,89 +6405,98 @@
 msgid "Server sent unexpected reply."
 msgstr "Server stuurde een onverwacht antwoord."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "MAC voor server naar cliënt:"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Code voor server naar cliënt:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "Server&type"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Server-/lokaal bestand"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Sessiedetails"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "&Prioriteit instellen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Rechten verzetten van '%s' naar '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize opgeroepen zonder socket"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Instellingen"
 
-#: resources.h:975
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "B&rondata van mappenlijst tonen"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
 msgstr "&Welkomstvenster tonen..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2341
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Beide boomstructuren van mappen tonen en doorgaan met vergelijken?"
 
+#: resources.h:638
+#, fuzzy
+msgid "Shows available TLS ciphers"
+msgstr "&Laagst mogelijke poort:"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Toont het helpvenster"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Nu afsluiten"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "&Sitebeheeritems"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Sitebeheer"
 
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+#, fuzzy
+msgid "Site Manager - Cannot remember password"
+msgstr "&Sitebeheeritems"
+
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:956
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp: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
 msgid "Site Manager - Invalid data"
 msgstr "Sitebeheer - ongeldige data"
 
@@ -6365,8 +6507,8 @@
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Site bestaat niet."
 
@@ -6376,8 +6518,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Het sitepad is corrupt."
 
@@ -6396,11 +6538,11 @@
 "Sitebeheer.\n"
 "Wilt u de huidige verbinding aan Sitebeheer toevoegen?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Grootte"
 
-#: resources.h:897
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Grootte-opmaak"
 
@@ -6409,31 +6551,31 @@
 msgid "Size unknown"
 msgstr "Grootte onbekend"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Bestand overslaan"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Download overslaan van %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Upload overslaan van %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1163
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Sommige bestanden worden nog bewerkt of moeten geuploadeted worden."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6441,21 +6583,21 @@
 "Enkele verkeerd ingestelde servers op afstand achter een router kunnen "
 "antwoorden met hun lokale IP-adres."
 
-#: resources.h:915
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Mappen op volgorde sorteren"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "De sorteringsvolgorde kan niet veranderd worden bij het vergelijken van "
 "mappen."
 
-#: resources.h:911
+#: resources.h:931
 msgid "Sorting"
 msgstr "Sorteren"
 
-#: resources.h:912
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "Sorteer&methode:"
 
@@ -6467,20 +6609,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Bron- en doelbestand kunnen niet hetzelfde zijn"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Bron en doel van de neerzetbewerking zijn identiek"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Bronbestand:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Snelheidlimieten"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Snelheidlimieten"
 
@@ -6492,7 +6634,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Snelheidlimieten zijn ingeschakeld, klik om te wijzigen."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Stabiele versies en bètaversies"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Alleen stabiele versies"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "&Overdracht meteen starten"
 
@@ -6500,43 +6650,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Opstarten met Sitebeheer geopend"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Download starten van %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Upload starten van %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Staat of provincie:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "Stoppen en &alles verwijderen"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Straat:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Onderwerp van het certificaat"
 
@@ -6544,11 +6694,11 @@
 msgid "Successful transfers"
 msgstr "Succesvolle overdrachten"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Samenvatting van testresultaten:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6556,44 +6706,44 @@
 "Symbolische links worden niet beïnvloed door deze keuze, zulke symbolische "
 "links worden altijd verwijderd."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Gesynchroniseerd bladeren"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Gesynchroniseerd bladeren is uitgeschakeld."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaxfout"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2491
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Syntaxfout in commandoregel"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Systeem"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "T&oolbar"
 
@@ -6601,11 +6751,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL-verbinding aangemaakt, HTTP-aanvraag verzenden"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS-/SSL-verbinding wordt gemaakt, wachten op welkomstbericht..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS-/SSL-verbinding gemaakt."
 
@@ -6613,23 +6763,27 @@
 msgid "TTL expired"
 msgstr "TLL verlopen"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Doelbestand bestaat reeds."
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Doelbestand:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Doelbestand bestaat reeds!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Doelbestand bestaat reeds. Wilt u echt verdergaan?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Testresultaten"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Hervatmogelijkheid op de server testen"
 
@@ -6662,11 +6816,11 @@
 msgstr "De ingevoerde adres was: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "De favoriet kan niet toegevoegd worden."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "De favorieten kunnen niet geleegd worden."
 
@@ -6678,19 +6832,19 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "De aangepaste inlogvolgorde kan niet leeg zijn."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "De standaardeditor voor tekstbestanden kan niet gevonden worden."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "De standaardeditor voor tekstbestanden is '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "De ingevoerde filternaam bestaat reeds, kies a.u.b. een andere naam."
 
@@ -6709,9 +6863,9 @@
 "Het bestand %s bestaat reeds.\n"
 "Vul een nieuwe bestandsnaam in:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6732,9 +6886,9 @@
 msgid "The file '%s' could not be loaded."
 msgstr "Het bestand '%s' kan niet geladen worden."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6743,8 +6897,8 @@
 "Het bestand '%s' kon niet geopend worden:\n"
 "Er is geen programma geassocieerd op uw systeem met dit bestandstype."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6786,7 +6940,7 @@
 "wachtwoord worden nog niet ondersteund door FileZilla.\n"
 "Wilt u het converteren naar een onbeschermd bestand?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Het bestand dat geselecteerd is als standaardeditor bestaat niet."
 
@@ -6822,11 +6976,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "De volgende karakters zullen worden vervangen: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "De volgende bestanden worden momenteel bewerkt:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "De gratis open-source FTP-oplossing"
 
@@ -6834,7 +6988,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "De globale favorieten kunnen niet opgeslagen worden."
 
-#: resources.h:973
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6866,7 +7020,7 @@
 "De laagst mogelijke poort moet kleiner of gelijk zijn aan de hoogst "
 "mogelijke poort"
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6874,7 +7028,7 @@
 "De nieuwste versie is gedownload. Klik op 'Voltooien' om FileZilla af te "
 "sluiten en de installatie te starten."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6882,11 +7036,11 @@
 "De nieuwste versie is gedownload. Installeer deze op dezelfde manier waarop "
 "u de huidige versie installeerde."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "De wachtrij zal niet opgeslagen worden."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6900,26 +7054,26 @@
 msgid "The selected categories have been imported."
 msgstr "De geselecteerde categorieën zijn geïmporteerd."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Het geselecteerde bestand bevat geen belangrijke data voor de volgende "
 "categorieën:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Het geselecteerde bestand wordt reeds bewerkt:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Het geselecteerde bestand is nog open in een ander programma, sluit het a.u."
 "b."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6937,7 +7091,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "De server stuurde een onverwacht of onherkenbaar antwoord."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "De server gebruikt de volgende karakterset om bestandsnamen te encoderen:"
@@ -6950,7 +7104,7 @@
 "Het certificaat van de server is onbekend. Gelieve het goed te controleren "
 "om vast te stellen of de server vertrouwd kan worden."
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6961,7 +7115,7 @@
 "verbinding met een andere computer probeert te maken die pretendeert de "
 "server te zijn."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6977,15 +7131,15 @@
 "De instellingen zijn geïmporteerd. U moet FileZilla herstarten voordat de "
 "instellingen effect hebben."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Het systeem zal snel opnieuw opstarten, tenzij u op Annuleren klikt."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Het systeem zal snel afsluiten, tenzij u op Annuleren klikt."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6993,7 +7147,7 @@
 "Het doelbestand bestaat reeds.\n"
 "Kies a.u.b. een actie."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "De test is mislukt. Weet u zeker dat u de instellingen wilt opslaan?"
 
@@ -7001,11 +7155,11 @@
 msgid "Themes"
 msgstr "Thema's"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Deze filtergroep kan niet verwijderd worden."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Deze filterset kan niet hernoemd worden."
 
@@ -7017,7 +7171,7 @@
 "Dit betekent dat een router en/of firewall nog steeds een conflict heeft met "
 "FileZilla."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7025,7 +7179,7 @@
 "Dit werkt enkel indien u zich niet achter een router bevindt, anders zou uw "
 "systeem enkel uw interne adres terugsturen."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7033,25 +7187,25 @@
 "Deze wizard zal u helpen om uw firewall en routers juist in te stellen en uw "
 "instellingen te testen."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Tijd"
 
-#: resources.h:891
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Tijdopmaak"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Time&out in seconden:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7060,22 +7214,22 @@
 "Tijdzoneverschillen: server - %d seconden, lokaal - %d seconden. Verschil: %"
 "d seconden."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2339
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Om mappen te vergelijken moeten beide bestandslijsten gelijkgeschakeld zijn."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2340
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Om dit te doen moeten de boomstructuren van de mappen beide getoond of "
 "verborgen worden."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7083,7 +7237,7 @@
 "Om authenticatie voor publieke sleutels te ondersteunen, moet FileZilla "
 "weten welke privésleutels gebruikt moeten worden."
 
-#: resources.h:998
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7100,7 +7254,7 @@
 "Groen: bestand is nieuwer dan het ongemarkeerde bestand aan de andere kant\n"
 "Rood: bestandsgroottes verschillen"
 
-#: resources.h:1000
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7110,23 +7264,23 @@
 "Indien ingeschakeld zal de lokale maphiërarchie bij het bladeren ook de map "
 "op de server veranderen en vice versa."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Voortgang van de overdrachtswachtrij omschakelen"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Zichtbaarheid van de lokale mappenboom omschakelen"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Zichtbaarheid van het berichtenlogboek omschakelen"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Zichtbaarheid van de externe mappenboom omschakelen"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Zichtbaarheid van de overdrachtswachtrij omschakelen"
 
@@ -7139,37 +7293,37 @@
 msgstr "Te veel doorwijzingen"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Opsporen:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Overdracht"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "Over&drachtsrichting"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "Overdrachts&type"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
 msgstr "Overdrachtmodus"
 
-#: resources.h:877
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Overdrachtswachtrij"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Overdrachtinstellingen"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Overdrachtsverbinding onderbroken: %s"
@@ -7178,8 +7332,8 @@
 msgid "Transferred data got tainted."
 msgstr "Overgedragen data werd onderbroken."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Overdragen"
 
@@ -7187,69 +7341,69 @@
 msgid "Transfers"
 msgstr "Overdrachten"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Overdrachten afgerond"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "&Bestanden zonder extensie behandelen als ASCII-bestand"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "De vol&gende bestandstypes als ASCII-bestanden behandelen:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Vertrouw de gewijzigde hostsleutel:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Vertrouw de nieuwe hostsleutel:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Nieuwe sleutel vertrouwen en verdergaan met verbinden?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Wilt u dit certificaat vertrouwen en doorgaan met verbinden?"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Deze host vertrouwen en verdergaan met verbinden?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Type"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
 msgstr "FTP-proxytype:"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
 msgstr "Type generieke proxy:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "U&ploaden"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "U&ploadlimiet:"
 
-#: resources.h:939
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "Be&standstype-associaties gebruiken indien beschikbaar"
 
-#: resources.h:892
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "&Systeemstandaarden gebruiken"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
 msgstr "GEBRUIKER@&HOST"
 
@@ -7258,16 +7412,16 @@
 msgid "Unassigned error code %d"
 msgstr "Niet-toegewezen foutcode %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Deel:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Onbekend"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Onbekend FTP-proxytype, kan geen inlogvolgorde genereren."
 
@@ -7288,7 +7442,7 @@
 "Fout met het openen van het bestand. Zorg ervoor dat het bestand "
 "toegankelijk is en dat het een correct gevormd XML-document is."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Onbekende hostsleutel"
 
@@ -7325,7 +7479,7 @@
 "Totdat dit probleem hersteld wordt, zullen de actieve modus voor FTP niet "
 "werken en zullen de passieve modus gebruikt moeten worden."
 
-#: ../../locales/../src/engine/tlssocket.cpp:866
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Niet-ondersteund certificaattype"
 
@@ -7333,25 +7487,25 @@
 msgid "Unsupported redirect"
 msgstr "Niet-ondersteunde doorverwijzing"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "Up&loaden en niet bewerken"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Updatecontrole"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Updatewizard"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+#, fuzzy
+msgid "Updates"
+msgstr "Updatecontrole"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "Uploaden"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Upload mislukt"
 
@@ -7364,61 +7518,61 @@
 msgid "Upload limit: none"
 msgstr "Uploadlimiet: geen"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Geselecteerde map uploaden"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Geselecteerde bestanden en mappen uploaden"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Wilt u dit bestand heruploaden naar de server?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Wilt u dit bestand uploaden naar de server?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Uploaden"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Uploaden en wachten op verwijdering"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Uploaden en niet bewerken"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Gebruik &willekeurige karakterset"
 
-#: resources.h:936
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "&Aangepaste editor gebruiken:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "Stan&daardeditor voor tekstbestanden gebruiken"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Ge&synchroniseerd bladeren gebruiken"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Gebruikt UTF-8 indien de server het ondersteunt, anders wordt de lokale "
 "karakterset gebruikt."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Standaardactie gebruiken"
 
@@ -7426,38 +7580,38 @@
 msgid "Use plain FTP"
 msgstr "Gebruik gewone FTP"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Gebruik de server die nu verbonden is met"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Gebruik de server uit Sitebeheer"
 
-#: resources.h:886
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "Systeemstan&daarden gebruiken"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Gebruik het volgende IP-adres:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "Gebruik het volgende poortbereik:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "Gebruik het interne IP-adres van de server in de plaats"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Gebruik dit indien u zich achter een router bevindt en u over een statisch "
 "extern IP-adres beschikt."
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7468,38 +7622,38 @@
 "actieve modus voor de eerste keer gebruikt. Enkel uw versie van FileZilla "
 "wordt verzonden naar de server."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
 msgstr "Gebruiker:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Gebruikersnaam kan geen reeks van spaties zijn"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Gebruikt proxy %s"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Gebruik van de verkeerde karakterset kan resulteren in verkeerd weergegeven "
 "bestandsnamen."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Door deze wizard te gebruiken, kunt u kijken of er updates van FileZilla "
 "zijn."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Geldig van:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Geldig tot:"
 
@@ -7507,47 +7661,47 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Uitgebreide logberichten van wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1056
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Certificaat controleren...."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Versie:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Erg hoog"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Bekijk de verborgen opties, maar geen ondersteuning op de server"
 
-#: resources.h:923
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Bekijken/bewerken"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Zichtbare kolommen"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "Sch&rijven"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Wachten"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Wachten op verkenningsverbinding."
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Wachten op wachtwoord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Wachten op overdracht om geannuleerd te worden"
 
@@ -7555,7 +7709,7 @@
 msgid "Waiting to retry..."
 msgstr "Wachten om opnieuw te proberen...."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7585,11 +7739,11 @@
 "of de\n"
 "Application Layer Gateway-service wordt uitgeschakeld."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Waarschuwing, data erbinding van verkeerd IP wordt genegeerd."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7604,23 +7758,29 @@
 "\n"
 "Wilt u werkelijk controleren op 'nightly builds' ?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Waarschuwing: mogelijk veiligheidsrisico!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Welkom bij FileZilla"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Wat is er nieuw"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Wat er nieuw is:"
 
-#: resources.h:821
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7629,11 +7789,15 @@
 "lokale besturingssysteem in bestandsnamen vervangen worden als zo'n bestand "
 "gedownload wordt."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Breedbeeld"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr ""
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "Schrij&ven"
 
@@ -7646,11 +7810,17 @@
 msgid "Wrong line endings"
 msgstr "Verkeerde regeleindes"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ja"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7658,15 +7828,15 @@
 "U gebruikt al de meest recente versie van FileZilla. Gelieve later nog eens "
 "te controleren."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "U kunt dit venster altijd weer openen via het helpmenu."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "U kunt het poortveld leeg laten om de standaardpoort te gebruiken."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7693,12 +7863,12 @@
 "U heeft geen nieuwe bestandsnaam voor het bestand ingevuld. Dit bestand "
 "overschrijven?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "U heeft minstens één symbolische link geselecteerd."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7706,7 +7876,7 @@
 "U heeft meer dan 10 bestanden geselecteerd om te bewerken. Weet u zeker dat "
 "u door wilt gaan?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7719,7 +7889,7 @@
 msgid "You have to enter a hostname."
 msgstr "U moet een hostnaam opgeven."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "U dient een lokale map in te voeren."
 
@@ -7728,17 +7898,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "U moet een geldig IP-adres opgeven."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "U dient een schrijfbare lokale map in te voeren."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "U moet een accountnaam opgeven"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "U moet een gebruikersnaam opgeven"
 
@@ -7758,22 +7928,22 @@
 msgid "You need to enter a name for the log file."
 msgstr "U dient een naam in te voeren voor het logbestand."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "U dient een correct commando in te voeren met aanhalingstekens."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "U moet een proxyhost opgeven."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "U moet een proxypoort invoeren met een getal tussen 1 en 65535."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "U dient ten minste één pad in te voeren, want u kunt geen lege favoriet "
@@ -7781,7 +7951,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7789,7 +7959,7 @@
 "U dient een lokaal en een extern pad in te voeren om gesynchroniseerd "
 "bladeren voor deze favoriet in te schakelen."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7821,44 +7991,49 @@
 "Verbinding maken met andere servers lukt probleemloos, bestandsoverdrachten "
 "zouden perfect moeten lukken."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "na"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "vóór"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "begint met"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "bevat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "bevat geen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "is niet gelijk aan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "eindigt met"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "komt overeen met"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "bestand"
 
@@ -7877,82 +8052,124 @@
 "Zorg ervoor dat dit uitvoerbare bestand in dezelfde map als het uitvoerbare "
 "bestand van FileZilla staat."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp kon niet gestart worden"
 
-#: ../../locales/../src/engine/tlssocket.cpp:904
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers gaf geen certificaten terug"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "groter dan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "door groep uitvoerbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "door groep leesbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "door groep schrijfbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "is gelijk aan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "is bepaald"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "is niet bepaald"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "kleiner dan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "komt overeen met regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "door bezitter uitvoerbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "door bezitter leesbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "door bezitter schrijfbaar"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "onbekend"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "door iedereen uitvoerbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "door iedereen leesbaar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "door iedereen schrijfbaar"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Copy"
+#~ msgstr "&Kopiëren"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "Automatisch&e updatecontrole toestaan"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "Aa&ntal dagen tussen updatecontroles:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(minimum 7 dagen)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automatische updatecontrole"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Controleren op &betaversies en uitgavekandidaten"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Kopiëren"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Voer een update-interval in van tenminste 7 dagen."
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Privacybeleid:"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Dubbele filternaam"
 
@@ -7975,9 +8192,6 @@
 #~ msgid "Uploads unlimited."
 #~ msgstr "Ongelimiteerde uploads."
 
-#~ msgid "bytes"
-#~ msgstr "bytes"
-
 #~ msgid "Yada yada"
 #~ msgstr "Yada yada"
 
diff -Nru filezilla-3.5.3/locales/nn_NO.po filezilla-3.7.3~precise/locales/nn_NO.po
--- filezilla-3.5.3/locales/nn_NO.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/nn_NO.po	2013-04-29 03:30:05.000000000 +0000
@@ -2,33 +2,34 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# Yngve Spjeld Landro <l10n@landro.net>, 2010, 2011.
+# Yngve Spjeld Landro <l10n@landro.net>, 2010, 2011, 2012.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: filezilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-02 17:20+0100\n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2012-12-09 00:39+0100\n"
 "Last-Translator: Yngve Spjeld Landro <l10n@landro.net>\n"
-"Language-Team: Norwegian Nynorsk <i18n-nn@lister.ping.uio.no>\n"
+"Language-Team: Norsk (nynorsk) <>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
-"Content-Transfer-Encoding: 8-bit\n"
+"Content-Transfer-Encoding: 8bit\n"
 "Language: \n"
-"Plural-Forms: nplurals=2; plural=(n != 1);\\n\n"
+"Plural-Forms: nplurals=2; plural=(n!=1);\n"
+"X-Generator: Gtranslator 2.91.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S brukt"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S igjen"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -46,9 +47,9 @@
 msgstr[0] "%d katalog"
 msgstr[1] "%d katalogar"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -57,9 +58,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -80,7 +81,7 @@
 msgstr[0] "%d fil. Total storleik: minst %s"
 msgstr[1] "%d filer. Total storleik: minst %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d filer er lagde til i køen"
@@ -92,31 +93,21 @@
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekund"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - vert"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - passord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d kB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -131,7 +122,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - enno ikkje gyldig"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - mellomtenarbrukar"
@@ -153,27 +144,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytar (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytar (%d.%d kB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytar (%d.%d MB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytar (%s/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -187,7 +168,7 @@
 "Last ned FileZilla på nytt. Du bør senda ei feilmelding om problemet "
 "framleis er der då."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -208,152 +189,148 @@
 msgid "%s with %d bits"
 msgstr "%s med %d bitar"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - brukarnamn"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - mellomtenarpassord"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
-msgstr "&Om…"
+msgstr "&Om …"
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
-msgstr "&Konto"
+msgstr "&Konto:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "A&ktiv"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
-msgstr "&Legg til bokmerke…"
+msgstr "&Legg til bokmerke …"
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "Legg til &filer i køen"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
-msgstr "Legg til &nøkkelfil…"
+msgstr "Legg til &nøkkelfil …"
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "Legg til i &køen"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "&Juster tenaren si tidssoneforskyving:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "Stol alltid på &sertifikatet i framtidige økter."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Stol alltid på denne &verten - legg denne nøkkelen til i mellomlageret"
 
-#: resources.h:940
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "Bruk &alltid førehandsvalt skriveprogram"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "Bruk &alltid valet for filer utan tilknyting"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "Bruk alltid denne &handlinga"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr "Spør operativsystemet ditt etter den &eksterne IP-adressa"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "&Auto-oppdaging"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Binær"
 
-#: resources.h:900
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Binærprefiks nyttar SI-symbol (t.d. 1kB = 1024 bytar)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Bokmerke"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
-msgstr "&Bla…"
+msgstr "&Bla …"
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Spreiegrense (burst tolerance):"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "A&vbryt"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "Sjå etter &beta-utgåver av FileZilla"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
-msgstr "&Tøm private data…"
+msgstr "&Tøm private data …"
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "L&ukk FileZilla"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
-msgstr "&Fartsgrenseinnstillingar…"
+msgstr "&Fartsgrenseinnstillingar …"
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
-msgstr "&Innstillingar…"
+msgstr "&Innstillingar …"
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "Kop&la til"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopier"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
-msgstr "&Kopier noverande tilkopling til tilkoplingsstyraren…"
+msgstr "&Kopier noverande tilkopling til tilkoplingsstyraren …"
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "Kopier til &utklippstavla"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Krasj"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "Lag &katalog"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "&Lag ny fane"
 
@@ -361,646 +338,655 @@
 msgid "&Debug"
 msgstr "&Feilsøk"
 
-#: resources.h:967
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "Feilsøkingsopplysningar i &meldingsloggen:"
 
-#: resources.h:933
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Førehandsvalt skriveprogram:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
-msgstr "&Standardhandling når fila finst…"
+msgstr "&Standardhandling når fila finst …"
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Forseinking ved mislykka innloggingsforsøk:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "&Slett"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
 msgstr "&Slett symlenkja"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "Katalog&samanlikning"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Forkast den lokale fila. Last ned og endra ho på nytt"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "Kopla &frå"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "Kopla frå &tenaren"
 
-#: resources.h:876
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "Syn den &gjeldande overføringsfarten i staden for gjennomsnittet"
 
-#: resources.h:898
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "Sy&n storleik i bytar"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "Hugs &ikkje passord"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "Vis &ikkje denne meldinga fleire gonger."
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "Bruk ikkje &ekstern IP-adresse på lokale tilkoplingar."
 
 # var: Vel handling for dobbeltklikk på &filer:
-#: resources.h:920
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "På &filer:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Last ned"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "&Last ned til:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
-msgstr "&Last ned..."
+msgstr "&Last ned …"
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "&Nedlastingar:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "En&dra"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
-msgstr "&Endra filterreglane…"
+msgstr "&Endra filterreglane …"
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Bruk"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "Bruk &automatisk oppdateringskontroll"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "Bruk &fartsgrense:"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "Teikn&koding:"
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
 msgstr "&Kryptering:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
-msgstr "Skriv inn &tilpassa kommando…"
+msgstr "Skriv inn &tilpassa kommando …"
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
 msgstr "&Utfør"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Eksporter oppføringane i tilkoplingsstyraren"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
-msgstr "&Eksporter…"
+msgstr "&Eksporter …"
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Fall tilbake til aktiv modus"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Fil"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
-msgstr "&Filattributtar…"
+msgstr "&Filattributt …"
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
-msgstr "Fil&rettar…"
+msgstr "Fil&rettar …"
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "F&il:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "Filter&vilkår:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Filtersamlingar:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Filter:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "Avsl&utt"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "&Avslutt endring og slett lokal fil"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr "&Flat ut fjernbanene, last ned alle filene direkte til målkatalogen."
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Følg symlenkja, slett målkataloginnhaldet"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
 msgstr "&Få ekstern IP-adresse frå denne adressa:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
-msgstr "&Få hjelp…"
+msgstr "&Få hjelp …"
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Globalt bokmerke"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 og nyttar CONNECT-metoden"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "&Hjelp"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Gøym identiske filer"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Høgste"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
 msgstr "&Høgste tilgjengelege port:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "V&ert:"
 
-#: resources.h:899
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC binærprefiks (t.d.. 1 KiB = 1024 bytar)"
 
-#: resources.h:887
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (døme: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
-msgstr "&Importer…"
+msgstr "&Importer …"
 
-#: resources.h:942
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "&Bruk systemet sine filtypetilknytingar"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr "Hald &fjernbanestrukturen relativ til søkjerota"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "&Formgjeving av fil- og katalogvindauga:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
 msgstr "Avgrens dei &lokale portane FileZilla kan nytta"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "Avgrens talet på samstundes &tilkoplingar"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "Lok&alt katalogtre"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "&Lokal katalog:"
 
-#: resources.h:957
+#: resources.h:981
 msgid "&Log to file"
 msgstr "&Logg til fil"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
 msgstr "P&åloggingstype:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "P&åloggingstype:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "&Låg"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
-msgstr "&Bokmerkebehandling…"
+msgstr "&Bokmerkebehandling …"
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
-msgstr "&Manuell overføring…"
+msgstr "&Manuell overføring …"
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&Høgste tal tilkoplingar:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Høgste tal på forsøk:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "&Meldingslogg"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Plasser i systemfeltet"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Namn:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
-msgstr "Rettleiar &nettverksinnstillingar…"
+msgstr "Rettleiar &nettverksinnstillingar …"
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "&Ny"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "&Ny nettstad"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "Ny utg&åve er tilgjengeleg."
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Neste >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Nei"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Ingen"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "&Tal dagar mellom kvar oppdateringskontroll:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Talverdi:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "OP&EN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Opna"
 
 # var: &Skriva over
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "&Skriv over"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Passiv"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Passord:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "&Spel lyd"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "Po&rt:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "&Meldingsloggposisjonen:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "Ta vare på &tidsstempelet til dei overførte filene"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "&Kø"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "&Lyntilkopling"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "Lyn&tilkoplingslinja"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Les"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "Kopla til &att"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Oppdater"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "Hugs passordet til denne &økta"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Hugs passord"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "&Fjernkatalog:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Fjernfilbane:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Fjern"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "&Fjern nøkkel"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "&Fjern vald(e)"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "En&dra namn"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
-msgstr "En&dra namn…"
+msgstr "En&dra namn …"
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
 msgstr "Opna lokal fil på &nytt"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "Byt ut ugyldige &teikn med:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
-msgstr "&Meld frå om feil…"
+msgstr "&Meld frå om feil …"
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "&Nullstill og legg alle i køen igjen"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "Start om att &rettleiaren"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "&Gå vidare"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
-msgstr "&Kjør kommando…"
+msgstr "&Køyr kommando …"
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
-msgstr "Kjør &innstillingsrettleiaren no…"
+msgstr "Køyr &innstillingsrettleiaren no …"
 
-#: resources.h:951
+#: resources.h:976
 msgid "&Run update check now..."
-msgstr "Kjør oppdaterings&kontroll no…"
+msgstr "Køyr oppdaterings&kontroll no …"
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&NETTSTAD"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "SO&CKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
-msgstr "Lagra so&m…"
+msgstr "Lagra so&m …"
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Søk"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
-msgstr "S&øk fjernfiler…"
+msgstr "S&øk fjernfiler …"
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "Vel opp&føring:"
 
-#: resources.h:931
+#: resources.h:951
 msgid "&Select language:"
 msgstr "Vel spr&åk:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "Vel kva for kolonnar som skal &synast:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Tenar"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Innstillingar"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
-msgstr "&Innstillingar…"
+msgstr "&Innstillingar …"
 
-#: resources.h:966
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "Syn &feilsøkingsmenyen"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "Syn &melding"
 
-#: resources.h:956
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "Vis &tidsstempel i meldingsloggen"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
-msgstr "&Tilkoplingsstyraren…"
+msgstr "&Tilkoplingsstyraren …"
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "Nettstad&spesifikt bokmerke"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "Hopp ov&er"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "&Fartsgrenser"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "Start overføringa &med ein gong"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Byt om på lokal- og fjernvindauga"
 
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "&TLS-krypteringsmetode"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Test"
 
-#: resources.h:879
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Drakt:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
 msgstr "&Overfør"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "&Overføringsmodus:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "Overførings&kø"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Behandla filer som begynner med &punktum som ASCII-filer"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Gjer om"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Oppdater den mellomlagra nøkkelen for denne verten"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Last opp"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "Opp&lastingar:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "Bruk tilpassa &program"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "Bruk synk&ronisert blaing"
 
-#: resources.h:935
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "&Bruk systemet sitt førehandsvalde skriveprogram til tekstfiler"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "Bruk denne &IP-adressa:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "Bruk heller tenaren si &eksterne adresse"
 
-#: resources.h:902
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "Bruk &tusenskilje"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
 msgstr "Br&ukar:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
 msgstr "Brukar&namn:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Utgåve %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "&Syn"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Syn/endra"
 
-#: resources.h:941
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "Følg &lokalt endra filer og spør om å lasta opp endringane"
 
-#: resources.h:136
+#: resources.h:972
+#, fuzzy
+msgid "&When checking for updates, check for:"
+msgstr "Ser etter oppdateringar"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Skriv"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Ja"
 
@@ -1018,11 +1004,27 @@
 msgstr "'%s' er ikkje ein katalog."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Påloggingstypen 'konto' er ikkje støtta av den valde protokollen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+#, fuzzy
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"FileZilla køyrer i kioskmodus.\n"
+"Påloggingstypane \"Normal\" og \"Konto\" er ikkje tilgjengelege i denne "
+"modusen."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1040,120 +1042,116 @@
 msgstr[0] "(%d objekt filtrert)"
 msgstr[1] "(%d objekt filtrerte)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(0 gjev inga grense)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekund)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 for å slå av)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(minst 7 dagar)"
-
-#: resources.h:895
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(døme: %H:%M)"
 
-#: resources.h:889
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(døme: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(i %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S igjen"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- igjen"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
 msgstr "- feil på rutar og/eller brannmur"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- fila er øydelagt på speillageret"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- skadevare på systemet ditt"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- igjen"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c kan ikkje nyttast saman med ei FTP-adresse."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l kan berre nyttast saman med ei FTP-adresse."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s og -c kan ikkje vera tilstades samstundes."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s kan ikkje nyttast saman mned ei FTP-adresse."
 
-#: resources.h:968
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Ingen"
 
-#: resources.h:969
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Åtvaring"
 
-#: resources.h:970
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Info"
 
-#: resources.h:971
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Alle meldingar"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 bit-system"
 
-#: resources.h:972
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Feilsøk"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 bit-system"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Attende"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1164,16 +1162,17 @@
 "Det finst allereie eit bokmerke med det innskrivne namnet. Skriv inn eit "
 "namn som ikkje er i bruk."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Ein må velja eit føretrekt skriveprogram."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Ein katalog kan ikkje bli dregen til ein av underkatalogane sine."
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1183,29 +1182,29 @@
 "innstillingar. I slike tilfelle må du bruka aktivmodus. Aktivmodus betyr at "
 "FileZilla opnar ein port og spør tenaren om å få kopla seg til han."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Ei fil som tidlegare er opna, er blitt endra."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr ""
 "Ei fil med det namnet held allereie på å bli endra. Vil du opna '%s' på nytt?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Ei fil med det namnet blir allereie overført."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Ei fil med det namnet held allereie på å bli endra. Lukk ho og prøv på nytt."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1219,11 +1218,11 @@
 "fillistingane.\n"
 "Det vil ikkje bli vist fleire åtvaringar i denne økta."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Ei nyare utgåve av FileZilla er tilgjengeleg:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1231,7 +1230,7 @@
 "Ein tenar skal alltid visa alle filer. Nokre tenarar har feil innstillingar "
 "og skjuler filer for brukaren. Dette valet vil tvinga tenaren til å visa dei."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1248,15 +1247,15 @@
 "Vil du slå av den synkroniserte blainga og halda fram med å endra den lokale "
 "katalogen?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "AS&CII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "&Legg til"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "Tillata &framhald av ASCII-filer"
 
@@ -1268,55 +1267,55 @@
 msgid "A&pply only to uploads"
 msgstr "Bruk berre på opp&lastingar"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "&Bruk på alle filer og katalogar"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "Fjern &automatisk vellykka overføringar"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "Avbryt den førre tilkoplinga og kopla til i denne fana"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "Om FileZilla"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Over fillistene"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Handling etter at køen er &tømt"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Handling på vald fil:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Utføra handlinga:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "Handling:"
 
@@ -1349,23 +1348,23 @@
 "FTP-testen i aktivmodus feila. FileZilla veit den rette eksterne IP-adressa, "
 "men rutaren eller brannmuren har feilaktig endra sendingsadressa."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "IP-adressa i aktivmodus"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "Legg berre til filer i &køen"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Legg den valde katalogen til overføringskøen"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Legg valde filer og mapper til overføringskøen"
 
-#: resources.h:922 resources.h:928
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Legg til i køen"
 
@@ -1373,46 +1372,55 @@
 msgid "Address type not supported"
 msgstr "Adressetypen er ikkje støtta"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Avansert"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Avanserte val:"
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Algoritme:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Alle filene blei overførde"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Alle portar i det gjevne området må vera mellom 1024 og 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Alle overføringane er ferdige. Klarte ikkje å overføra %d fil."
 msgstr[1] "Alle overføringane er ferdige. Klarte ikkje å overføra %d filer."
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Tillèt &tilbakefall til annan overføringsmåte ved feil"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Tillèt tilbakefall til annan overføringsmåte ved feil"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Allereie tilkopla"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1420,7 +1428,7 @@
 "Alternativt kan du nytta Pageant-verktøyet frå PuTTY til å styra nøklane "
 "dine. FileZilla godtek Pageant."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1428,7 +1436,7 @@
 "Alternativt kan du nytta systemet ditt sin SSH-agent. For å kunna gjera "
 "dette må miljøvariabelen SSH_AUTH_SOCK vera lagra."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1436,7 +1444,7 @@
 "Alternativt kan du besøkja http://filezilla-project.org for å lasta ned den "
 "nyaste utgåva."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1445,7 +1453,7 @@
 "Klarte ikkje å lasta overføringskøen frå \"%s\".\n"
 "Somme køelement er kanskje ikkje førde attende."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1454,7 +1462,7 @@
 "Klarte ikkje å lagra overføringskøen på \"%s\".\n"
 "Somme element blei kanskje ikkje lagra."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1462,84 +1470,84 @@
 "Eit element finst allereie på lagringsstaden med det same namnet som det du "
 "dreg."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Ei anna fjernhandling er allereie i gang - kan ikkje endra katalogen no."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Klarte ikkje å lagra endringane i tilkoplingsstyraren."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 "Du må reparera fila om du vil lagra endringane i tilkoplingsstyraren."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Klarte ikkje å lagra eventuelle filterendringar."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Ingen filterendringar vil lagrast."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "Bruk berre på &katalogar"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Ta i bruk"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Bruk berre på gjeldande k&ø"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "Bruk berre på &filer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arkiv"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Som fane i overføringskøvindauget"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Spør etter handling"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Spør etter passord"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
 msgstr "Spør operativsystemet etter ein port."
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "Spør operativsystemet ditt etter den eksterne IP-adressa"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Stilla spørsmål i FileZilla-foruma"
 
@@ -1547,39 +1555,35 @@
 msgid "Associated program not found:"
 msgstr "Fann ikkje tilknytta program:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Minst eitt filtervilkår er ufullstendig"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "No er alle nødvendige opplysningar samla inn."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attributt"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Autentiseringa feila."
 
-#: resources.h:880
+#: resources.h:900
 msgid "Author:"
 msgstr "Forfattar:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Automatisk filtypeklassifisering"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Automatisk oppdateringskontroll"
-
-#: resources.h:884
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Tilgjengelege storleikar"
 
@@ -1588,67 +1592,67 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
 msgstr "Bruk ikkje &mellomtenar"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Rettleiing i grunnleggjande bruk"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Oppførsel"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Blir endra"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Utmålingsstrengsamlar"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Ver merksam! Sertifikatet er blitt trekt tilbake"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "Binær"
 
 # ?
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Tavle"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Bokmerke"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Bokmerke:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Bokmerke"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Utgåvedato:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Utgåveopplysningar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Forretningskategori:"
 
-#: resources.h:752
+#: resources.h:772
 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, "
@@ -1658,63 +1662,63 @@
 "tilgjengelege lokale portar. Om du vil avgrensa FileZilla til berre å nytta "
 "eit lite portområde, må du skriva det inn nedanfor."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "A&vbryt noverande handling"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Sjå etter &utviklingsutgåver (nightly builds) av FileZilla"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "Tøm &alle"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Kopier adresse(r) til utklippstavla"
 
-#: resources.h:888
+#: resources.h:908
 msgid "C&ustom"
 msgstr "Ti&lpassa"
 
-#: resources.h:943
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "&Tilpassa filtypetilknytingar:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
-msgstr "Reknar ut tidssoneforskyvinga til tenaren…"
+msgstr "Reknar ut tidssoneforskyvinga til tenaren …"
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Klarer ikkje å lesa frå fila"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Klarer ikkje å skriva data til fila."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Klarer ikkje å skriva data til fila: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "A&vbryt"
 
-#: resources.h:990
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Avbryt gjeldande handling"
 
-#: resources.h:991
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Avbryt gjeldande handling"
 
@@ -1724,11 +1728,11 @@
 msgstr ""
 "Kan ikkje bruka '%s': media er ikkje sett i, eller stasjonen er ikkje klar."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Klarer ikkje å leggja til tenaren i tilkoplingsstyraren"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1745,39 +1749,39 @@
 "Klarer ikkje å samanlikna katalogane sidan lokal- og fjernkatalogane nyttar "
 "forskjellige filter"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr ""
 "Klarer ikkje å samanlikna katalogane sidan det ikkje er samband mot ein "
 "tenar."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Klarer ikkje å oppretta nytt filter"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Klarer ikkje å endra fila"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Klarer ikkje å endra fila - er ikkje tilkopla ein tenar."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Klarer ikkje å endra fila sidan fjernbana er ukjend."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "Kan ikkje laga FTP-samband mot ein SFTP-tenar. Vel rett protokoll."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Klarer ikkje å lasta lyntilkoplinga si verktøylinje frå ressursfila"
 
@@ -1789,44 +1793,49 @@
 msgid "Cannot load keyfile"
 msgstr "Klarer ikkje å lasta nøkkelfila"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Klarer ikkje å lasta verktøylinja frå ressursfila"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+#, fuzzy
+msgid "Cannot remember password"
+msgstr "Hugs &ikkje passord"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Klarer ikkje å gje oppføringa nytt namn"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Klarer ikkje å gje fila nytt namn"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Klarer ikkje å lagra filtersamlinga"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Klarer ikkje å velja filter"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Klarer ikkje å laga filtilknytingar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Klarer ikkje å syna meldingsvindauget"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Klarer ikkje å syna/endra vald val"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Kategoriar"
 
@@ -1834,59 +1843,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Sertifikat og øktdata er enno ikkje tilgjengelege."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Sertifikatdetaljar"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Sertifikat i kjeda:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Sertifikatutferdar"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Utfordring:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Endra filattributt"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Endra filrettane."
 
-#: resources.h:964
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Endring av loggfilinnstillingane krev omstart av FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Teiknkodehending"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Teiknkoding"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Sjå etter &beta- og prøveutgåver"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
-msgstr "&Sjå etter oppdateringar…"
+msgstr "&Sjå etter oppdateringar …"
 
-#: resources.h:551
+#: resources.h:967
+#, fuzzy
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Oppdateringskontrollen feila"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
 msgstr "Sjå etter nyare utgåver av FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Sjå etter oppdateringar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Oppdateringskontrollen feila"
 
@@ -1894,21 +1904,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Ser etter den rette, eksterne IP-adressa"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
 msgstr "Ser etter oppdateringar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Kontrollsummen samsvarer ikkje med den nedlasta fila."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Vel standard lokalkatalog"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Vel lokalkatalogen"
 
@@ -1916,44 +1926,44 @@
 msgid "Chunk data improperly terminated"
 msgstr "Datamengda er ikkje rett avslutta"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Krypteringsmetode:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "&Lukk fana"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Klassisk"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "Tøm oppføringane i &tilkoplingsstyraren"
 
 # ?
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "Tøm &utformingslageret"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "Tøm &lyntilkoplingshistorikken"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "Tøm oppattilkoplings&historikken"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Tøm overførings&køen"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Tøm historikken"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1961,11 +1971,11 @@
 msgid "Clear private data"
 msgstr "Tøm private opplysningar"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Tøm lyntilkoplingsdataa"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Tøm strengsamlaren"
 
@@ -1973,25 +1983,25 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klikk på Avslutt for å lagra innstillingane dine."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klikk på Neste for å lasta ned den nye utgåva."
 
 # maskinvareadressa?
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "Maskinvareadressa klient til tenar:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Krypteringsmetode klient til tenar:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "Lukk alle &andre faner"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Lukk FileZilla"
 
@@ -2000,11 +2010,11 @@
 msgstr "Lukk alle opne FileZilla-instansar"
 
 # Lukkar gjeldande fane?
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Lukkar denne fana"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "&Merknader:"
 
@@ -2012,11 +2022,11 @@
 msgid "Column properties"
 msgstr "Kolonneeigenskapar"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Kolonneinnstillingar"
 
-#: resources.h:938
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Kommandoen og argumenta må vera i rett form."
 
@@ -2035,9 +2045,9 @@
 msgstr "Protokollen støttar ikkje denne kommandoen"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Kommando:"
 
@@ -2045,7 +2055,7 @@
 msgid "Comment"
 msgstr "Merknad"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Namn:"
 
@@ -2054,15 +2064,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Sambandet er øydelagd av rutar eller brannmur"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "Samanlikna &endringstidspunkt"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Samanlikna &filstorleik"
 
-#: resources.h:918
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Samanliknings&grense (i minutt):"
 
@@ -2070,61 +2080,61 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Samanlikningsgrensa må vera mellom 0 og 1440 minutt."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Kompilert for:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Kompilert på:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Kompilert med:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Kompilatorflagg:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Komprimert"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Samtidige overføringar"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Vilkåra skil mellom &store/små bokstavar"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Test av innstillingane"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Innstillingar for passivmodus"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Områdeinnstillingar"
 
 # ?
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "FileZilla- og nettverksinnstillingar"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Stadfest slettinga"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Treng stadfesting"
 
@@ -2132,7 +2142,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Gratulerer, innstillingane ser ut til å verka."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Kopla til forbi mellomtenaren"
 
@@ -2140,34 +2150,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Kopla til den spesifiserte staden i tilkoplingsstyraren"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Tilkopla"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Koplar til"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Koplar opp mot %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Koplar opp mot %s gjennom mellomtenar"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
-msgstr "Koplar opp mot %s…"
+msgstr "Koplar opp mot %s …"
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Koplar opp mot tenaren"
 
@@ -2175,17 +2185,17 @@
 msgid "Connection"
 msgstr "Tilkopling"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
 msgstr "Tilkoplingsforsøket feila"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Tilkoplingsforsøket feila med \"%s\". Prøver neste adresse."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Tilkoplingsforsøket feila med \"%s\"."
@@ -2199,21 +2209,21 @@
 msgid "Connection closed"
 msgstr "Tilkoplinga er lukka"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Tenaren kopla ned sambandet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
-msgstr "Tilkopla, startar TLS…"
+msgstr "Tilkopla, startar TLS …"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
 msgstr "Sambandet er i orden, sender HTTP-førespurnad"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Sambandet er i orden, ventar på velkomstmelding …"
 
@@ -2229,15 +2239,15 @@
 msgid "Connection refused"
 msgstr "Tilkoplinga avvist"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Tidsavbrot på sambandet"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Tidsavbrot på sambandet."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Mista sambandet til tenaren."
 
@@ -2257,27 +2267,23 @@
 msgid "Convert keyfile"
 msgstr "Konverter nøkkelfila"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Kop&ier"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopier (%d) av %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopi av %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Kopier adressene til dei valde elementa til utklippstavla."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Klarte ikkje å godta tilkoplinga: %s"
@@ -2287,16 +2293,21 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Klarte ikkje å leggja tilkoplinga til i tilkoplingsstyraren"
 
+#: ../../locales/../src/interface/state.cpp:842
+#, fuzzy
+msgid "Could not complete operation"
+msgstr "Klarte ikkje å kopiera dataa"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Klarte ikkje å kopla opp mot tenaren"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Klarte ikkje å kopl opp mot tenaren: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Klarte ikkje å tilpassa kommandoen til tenarkodinga"
 
@@ -2305,18 +2316,18 @@
 msgid "Could not convert private key"
 msgstr "Klarte ikkje å konvertera privatnøkkelen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Klarte ikkje å kopiera adressene (URL)"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Klarte ikkje å kopiera dataa"
 
 # set om Explorer
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2326,11 +2337,11 @@
 "Anten er ikkje skalutvidinga rett installert, eller så sleppte du ikkje "
 "filene i eit Utforskar-vindauge."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Fekk ikkje kontakt med tenaren"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2342,11 +2353,11 @@
 "kommandolinjevalet '--datadir <eiga bane>' eller ved å lagra miljøvariabelen "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Klarte ikkje å laga tilpassa påloggingssekvens."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2354,7 +2365,7 @@
 "Klarte ikkje å få det eintydige namnet til sertifikatutferdaren, "
 "gnutls_x509_get_issuer_dn feila"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2362,7 +2373,7 @@
 "Klarte ikkje å få det eintydige namnet til sertifikatentiteten, "
 "gnutls_x509_get_issuer_dn feila"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Klarte ikkje å henta full fjernfilbane."
 
@@ -2371,15 +2382,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Klarte ikkje å få svar frå fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr "Klarte ikkje å finna ein mellombels katalog å lasta filer ned til."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "Klarte ikkje å importera sertifikata, gnutls_x509_crt_import feila"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2406,7 +2417,7 @@
 msgid "Could not load private key"
 msgstr "Klarte ikkje å lasta den private nøkkelen"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2416,7 +2427,7 @@
 "Klarte ikkje å henta fjernkatalogen '%s' sin tilsvarande lokalkatalog.\n"
 "Vil du slå av synkronisert blaing og halda fram med å endra fjernkatalogen?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2436,9 +2447,9 @@
 "Klarte ikkje å henta lokalkatalogen '%s' sin tilsvarande fjernkatalog.\n"
 "Synkronisert blaing er slått av."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Klarte ikkje å opna utklippstavla"
 
@@ -2453,11 +2464,11 @@
 msgid "Could not parse remote path."
 msgstr "Klarte ikkje å tolka fjernfilbana."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Klarte ikkje å tolka tenaradressa:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Klarte ikkje å lesa endepunktet: %s"
@@ -2466,12 +2477,12 @@
 msgid "Could not read server item."
 msgstr "Klarte ikkje å lesa tenarelementet."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Klarte ikkje å finna posisjonen %s i fila"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Klarte ikkje å gå til slutten av fila"
 
@@ -2479,22 +2490,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Klarte ikkje å senda kommandoen til fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Klarte ikkje å starta I/U-tråden"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Klarte ikkje å starta mellomtenargodkjenninga: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Klarte ikkje å starta overføringa"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2514,7 +2525,7 @@
 msgstr ""
 "Klarte ikkje å skriva \"%s\". Dei globale bokmerka blei ikkje lagra: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2523,16 +2534,16 @@
 "Klarte ikkje å skriva \"%s\" - køen kunne ikkje lagrast.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Klarte ikkje å skriva \"%s\". Dei valde nettstadene blei ikkje eksporterte: %"
 "s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Klarte ikkje å skriva \"%s\": %s"
@@ -2542,7 +2553,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Klarte ikkje å skriva nøkkelfila: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Klarte ikkje å skriva til lokal fil"
 
@@ -2552,40 +2563,52 @@
 msgid "Could not write to log file: %s"
 msgstr "Klarte ikkje å skriva til loggfila: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Klarte ikkje å skriva til endepunktet: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Land:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "Crashes FileZilla instantly. Only used to debug the exception handler"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "Lag &ny fil"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Lag ein ny underkatalog i den gjeldande katalogen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Lag ei ny, tom fil i den gjeldande katalogen"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Laga katalog"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Lag ei tom fil"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Lagar katalog"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "Lagar katalogen '%s…"
+msgstr "Lagar katalogen '%s …"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
@@ -2600,7 +2623,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Kritisk filoverføringsfeil etter å ha overført %s i %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2621,53 +2644,57 @@
 msgid "Current transfer type is set to binary."
 msgstr "Gjeldande overføringstype er binær."
 
-#: resources.h:773 resources.h:894
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "&Tilpassa"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Tilpassa filtersamling"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Eigen tenar"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "D&atatype"
 
-#: resources.h:901
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "&Desimalprefiks nyttar SI-symbol (dvs. 1kB = 1000 bytar)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "Stan&dard"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "&Slett"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Slå &av alle"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "Lagra &ikkje passorda"
 
 # var: Dobbeltklikkhandling for &katalogar:
-#: resources.h:925
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "For &katalogar:"
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr ""
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS-liknande med virtuelle baner"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Farleg filtype"
 
@@ -2675,16 +2702,16 @@
 msgid "Data"
 msgstr "Data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Dataendepunktet blei lukka for tidleg."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Dato"
 
-#: resources.h:885
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Datoformatering"
 
@@ -2703,11 +2730,11 @@
 msgid "Debug"
 msgstr "Feilretting"
 
-#: resources.h:965
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Feilsøkingsinnstillingar"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Standard lokalkatalo&g"
 
@@ -2715,19 +2742,19 @@
 msgid "Default (Autodetect)"
 msgstr "Standard (auto-oppdaging)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Førehandsvalt skriveprogram er utan rette argument."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Standardhandling når fila finst"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Standard fjern&katalog:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2739,15 +2766,15 @@
 msgid "Default system language"
 msgstr "Standard systempråk"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Standard overføringsmodus:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Standard overføringstype:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Standard: http://ip.filezilla-project.org/ip.php"
 
@@ -2767,61 +2794,61 @@
 "Delaying connection for %d seconds due to previously failed connection "
 "attempt..."
 msgstr[0] ""
-"Lèt sambandet venta i %d sekund sidan det førre tilkoplingsforsøket feila…"
+"Lèt sambandet venta i %d sekund sidan det førre tilkoplingsforsøket feila …"
 msgstr[1] ""
-"Lèt sambandet venta i %d sekund sidan det førre tilkoplingsforsøket feila…"
+"Lèt sambandet venta i %d sekund sidan det førre tilkoplingsforsøket feila …"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Slett oppføringa i tilkoplingsstyraren"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Sletta vald katalog"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Sletta valde filer og katalogar"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Slettar katalogar"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Sletting av fleire ikkje-relaterte katalogar er enno ikkje støtta"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Slettar symbolsk lenkje"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Arbeidsflate"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Detaljar"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Detaljar for ny nøkkel:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "&Katalogar"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Retning"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Katalog"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Katalogsamanlikning"
 
@@ -2840,11 +2867,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Kataloglistinga avbroten av brukaren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Klarte ikkje å lista opp katalogar"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Kataloglistefilter"
 
@@ -2852,16 +2879,16 @@
 msgid "Directory listing successful"
 msgstr "Vellykka kataloglisting"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "S&lå av alle"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr "Slå av synkronisert blaing og halda fram med å endra fjernkatalogen?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2869,50 +2896,49 @@
 "Slå av dette valet igjen dersom du ikkje ønskjer å kunna sjå det rette "
 "kataloginnhaldet meir."
 
-#: resources.h:992
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Kopla frå tenaren"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Fråkopla tenaren"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Fråkopla tenaren: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Koplar frå den førre tenaren"
 
-#: resources.h:993
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Kopla frå den noverande synlege tenaren"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "Syn opplysningsvindauget"
 
-#: resources.h:934
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "Bruk &ikkje det førehandsvalde skriveprogrammet"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "Gjer &ingenting"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2921,8 +2947,8 @@
 "Om du ikkje ønskjer å testa nye eigenskapar bør du halda deg til stabile "
 "utgåver."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Vil du verkeleg lukka FileZilla?"
 
@@ -2937,7 +2963,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Vil du verkeleg sletta alle oppføringane til tilkoplingsstyraren?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Vil du verkeleg sletta den valde oppføringa?"
 
@@ -2945,33 +2971,33 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Vil du verkeleg sletta overføringskøen?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Vil du verkeleg senda '%s' til tenaren?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Dokumentasjon"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "Bruk ikkje ekstern IP-adresse på &lokale tilkoplingar."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Punktumsfiler er filnamn som begynner med eit punktum, slik som .htaccess"
 
-#: resources.h:919
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Dobbeltklikkhandling"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "Last ned"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "N&edlastingsgrense:"
 
@@ -2984,41 +3010,50 @@
 msgid "Download limit: none"
 msgstr "Nedlastingsgrense: inga"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Last ned søkjeresultata"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Last ned vald katalog"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Last ned valde filer og katalogar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Nedlastingsfart: %s/s\n"
+"Opplastingsfart: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Lastar ned"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Lastar ned %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Ein kan ikkje lasta ned fleire ikkje-relaterte katalogar."
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Lastar ned søkjeresultata"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3026,61 +3061,65 @@
 msgstr ""
 "Ein kan ikkje nytta dra-og-slepp mellom forskjellige &instansar av FileZilla."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Ein kan ikkje nytta dra-og-slepp mellom forskjellige &tenarar."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr ""
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "Slå p&å alle"
 
 # Skriv inn?
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "Opna &katalog"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "&Utfør"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "Avsl&utt"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "E-post:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Kvart filter treng minst eitt vilkår."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Endra filtera"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Arbeid med fila i det førehandsvalde skriveprogrammet og last opp endringane "
 "til tenaren."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Endringa feila."
 
-#: resources.h:882
+#: resources.h:902
 msgid "Email:"
 msgstr "E-post:"
 
 # ?
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Tom kommando"
 
@@ -3088,7 +3127,7 @@
 msgid "Empty command."
 msgstr "Tom kommando."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Tom katalogliste"
 
@@ -3100,103 +3139,115 @@
 msgid "Empty file extension."
 msgstr "Tom filtype."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Filternamn kan ikkje vera tomme."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Tomt namn"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Tom sitatstreng."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "Slå &på alle"
 
 # Må vel ha bindestrek for å visa at filtreringa gjeld "ugyldige teikn" og ikkje berre "teikn"
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "Bruk &filtrering av ugyldige teikn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Kryptert"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
 msgstr "Krypteringsdetaljar"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Avslutta samanlikningog endra sorteringsrekkjefølgja?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
-msgstr "Skriv inn &tilpassa kommando…"
+msgstr "Skriv inn &tilpassa kommando …"
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Verdien 0 gjev uavgrensa fart."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Skriv inn kommando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Skriv inn tilpassa kommando"
 
-#: resources.h:926
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Opna katalog"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Skriv filternamn"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Skriv inn namnet til filtersamlinga"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Skriv inn det nye namnet til filtersamlinga"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Skriv passord"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Opna vald katalog"
 
-#: resources.h:719
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Skriv inn adressa til tenaren.\n"
 "For å spesifisera tenarprotokollen må du skriva protokollidentifikatoren "
-"framfor vertsnamnet. Dersom du ikkje spesifiserer protokollen, vil "
+"framfor vertsnamnet. Dersom du ikkje spesifiserer protokollen vil "
 "standardprotokollen (ftp://) bli nytta.\n"
 "Du kan her òg skriva inn heile adresser på forma protokoll://brukar:"
-"passord@vert:port. Då vil verdiane i andre felt bli overskrivne."
+"passord@vert:port. Då vil verdiane i andre felt bli overskrivne.\n"
+"\n"
+"Dei støtta protokollane er:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH-filoverføringsprokollen\n"
+"- ftps:// for FTP over TLS (implisitt)\n"
+"- ftpes:// for FTP over TLS (eksplisitt)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3207,7 +3258,7 @@
 "Skriv inn passordet til fila '%s'.\n"
 "Ver merksam på at den konverterte fila ikkje vil vera passordbeskytta."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3229,7 +3280,7 @@
 msgid "Error importing"
 msgstr "Feil under importeringa"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Klarte ikkje å lasta køen"
 
@@ -3238,27 +3289,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Feil under lastinga av xml-fil"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Klarte ikkje å lagra køen"
 
@@ -3269,75 +3320,83 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Feil under skrivinga av xml-fil"
 
 # lesa?
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Feil: klarer ikkje å tolka filnamnet."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Feil - lokal fil finst, men ho kan ikkje fjernast"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Feil:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Gjer tilkoplinga i ei ny fane"
 
-#: resources.h:945
+#: resources.h:971
+msgid "Every month"
+msgstr ""
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr ""
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Døme: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:924
 msgid "Examples"
 msgstr "Døme"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "&Utfør"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
-msgstr "Kjørbar"
+msgstr "Køyrbar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Programfila inneheld ikkje utgåveopplysningar. Klarer derfor ikkje å sjå "
 "etter oppdateringar."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Utforskar"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Eksporter &køen"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "Eksporter &innstillingane"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Eksporter innstillingane"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "&Filternamn:"
 
@@ -3345,7 +3404,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - filoverføringsprotokoll"
 
@@ -3357,25 +3416,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - utrygg filoverføringsprotokoll"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Klarer ikkje å kopla til: FTP-motoren er ikkje starta"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP vedlikehaldssamband"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-mellomtenar"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP-adresse"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3391,26 +3450,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP over implisitt TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Klarte ikkje å endra katalogen"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Klarte ikkje å endra språket"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Klarte ikkje å sjå etter nyare utgåve av FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Klarte ikkje å kopiera eller flytta nettstadene"
 
@@ -3418,42 +3477,42 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Klarte ikkje å laga tryggleikskopi av xml-fila"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Klarte ikkje å laga lyttande endepunkt - avbryt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Klarte ikkje å laga lyttande endepunkt til aktivmodusoverføringa"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Klarte ikkje å lasta ned den siste utgåva av FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Klarte ikkje å finna bana til 'Mine dokument'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Klarte ikkje å finna skrivebordsbana"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Klarte ikkje å henta adressa til kontrollsambandet - sambandet er lukka."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "Klarte ikkje å henta adressa til datasambandet - sambandet er lukka."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Klarte ikkje å starta FTP-motoren"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Klarte ikkje å setja i gang TLS."
@@ -3467,24 +3526,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Klarte ikkje å lasta den private nøkkelen: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Klarte ikkje å opna \"%s\" for tilføying/skriving"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Klarte ikkje å opna \"%s\" for lesing"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Klarte ikkje å opna \"%s\" for skriving"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Klarte ikkje å tolka filbana."
 
@@ -3492,7 +3551,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Klarte ikkje å tolka tiltrudd rotsertifikat."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Klarte ikkje å ta i mot data"
 
@@ -3504,11 +3563,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Klarte ikkje å henta ekstern IP-adresse - avbryt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Klarte ikkje å henta ekstern IP-adresse - bruker lokaladresse"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Klarte ikkje å henta lokal IP-adresse."
 
@@ -3524,12 +3583,12 @@
 msgid "Failed to send command."
 msgstr "Klarte ikkje å senda kommandoen."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk."
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3537,24 +3596,24 @@
 "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk (%s, %"
 "s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "Klarte ikkje å lagra språkvalet %s (%s). Nyttar standard systemspråk."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Klarte ikkje å lagra språkvalet %s. Nyttar standard systemspråk."
@@ -3564,7 +3623,7 @@
 msgstr "Klarte ikkje å stadfesta innstillingane"
 
 # ?
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Klarte ikkje å stadfesta tenarsertifikatet"
 
@@ -3581,21 +3640,19 @@
 msgid "Failed transfers"
 msgstr "Mislykka overføringar"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "Fall tilbake til aktivmodus"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "Fi&l:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "&Filer"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Fil"
 
@@ -3611,7 +3668,7 @@
 msgid "File editing"
 msgstr "Filendring"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Fila finst"
 
@@ -3619,7 +3676,7 @@
 msgid "File exists action"
 msgstr "Handling når fila finst"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Fila er endra"
 
@@ -3627,14 +3684,14 @@
 msgid "File lists"
 msgstr "Fillister"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Fann ikkje fila"
 
-#: resources.h:1003
+#: resources.h:1028
 msgid "File search"
 msgstr "Filsøk"
 
@@ -3669,101 +3726,101 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Vellykka filoverføring, overførte %s i %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Det er framleis filoverføringar i gang."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Fila nyttar ASCII datatype-overføring."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Fila nyttar binær datatype-overføring."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-feil"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 "FileZilla kan no testa innstillingane dine for å sikra at alt er gjort rett."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla er allereie tilkopla ein tenar."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla kjører i kioskmodus.\n"
-"Påloggingstypane \"Normal\" og \"Konto\" er ikkje tilgjengelege i denne "
-"modusen."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "Du tek i bruk språkendringa ved å starta om att FileZilla."
 
-#: resources.h:517
+#: resources.h:978
+#, fuzzy
+msgid "FileZilla updates"
+msgstr "FileZilla-feil"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "Status&linje filliste"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Filnamn"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
-msgstr "F&ilnamnfilter…"
+msgstr "F&ilnamnfilter …"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Klarer ikkje å laga filnamn for katalogen %s og filnamnet %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Ugyldig filnamn"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Filnamn kan ikkje innehalda nokon av desse teikna: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Filnamnet er uendra"
 
-#: resources.h:307 resources.h:958
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Filnamn kan ikkje innehalda nokon av desse teikna: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Filnamn kan ikkje innehalda nokon av desse teikna: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Filer som blir endra no"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Filstorleik"
@@ -3772,68 +3829,68 @@
 msgid "Filesize format"
 msgstr "Format filstorleik"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Filtype"
 
-#: resources.h:946
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Filtypetilknytingar"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Filteret nyttast på:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrer ugyldige teikn i filnamn"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Filtrer om namnet finst allereie"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Filtrer ut element som passar alle følgjande"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr "Filtrer ut element som passar eit av dei følgjande"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
 msgstr "Filtrer ut element som ikkje passar nokon av dei følgjande"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filtersamlinga finst allereie"
 
-#: resources.h:996
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Filtrera kataloglistinga"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filterstadfestinga feila"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Fingeravtrykk (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Fingeravtrykk (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Fingeravtrykk:"
 
@@ -3841,19 +3898,19 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Brannmur- og rutarinnstillingsrettleiar"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
-"Kjør nettverksinnstillingsrettleiaren om du ønskjer fleire "
+"Køyr nettverksinnstillingsrettleiaren om du ønskjer fleire "
 "detaljopplysningar om kva desse vala gjer."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "For å auka støleiken, bør du oppgje eit område på minst 10 portar."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3861,31 +3918,31 @@
 "Standardinnstillingane vil nyttast i denne økta. Endringar vil ikkje bli "
 "lagra."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "Tvungen &UTF-8"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "Tving fram vising av &skjulte filer"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Tving fram vising av skjulte filer"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Formatspesifikasjonar:"
 
-#: resources.h:944
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Format: utviding etterfølgt av kommando og argument i rett form."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Meir dokumentasjon"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Generelt"
 
@@ -3893,21 +3950,21 @@
 msgid "General SOCKS server failure"
 msgstr "Generell SOCKS-tenarfeil"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Generisk mellomtenar"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
 msgstr "Få ekstern IP-adresse frå denne adressa:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Få hjelp"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Det oppgjevne filternamnet finst allereie. Vil du skriva over det?"
 
@@ -3915,15 +3972,15 @@
 msgid "Global bookmarks"
 msgstr "Globale bokmerke"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GNUTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Grupperettar"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "H&øg"
 
@@ -3931,21 +3988,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP over TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Nøkkel:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Gøymd"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Høg"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Høgste"
 
@@ -3953,27 +4010,27 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Høgste tilgjengelege port må vera eit tal mellom 1024 og 65535."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Hald nede skift-tasten for å endra filtertilstanden på begge sider "
 "samstundes."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Heimeside:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Fingeravtrykk vertsnøkkel:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Vertsnøkkelen samsvarte ikkje"
 
 # ?
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Verten startar med '[', men manglar avsluttande parentes."
 
@@ -3981,20 +4038,20 @@
 msgid "Host unreachable"
 msgstr "Klarer ikkje å nå verten"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Vert:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "timar,"
 
-#: resources.h:893
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "ISO &8601 (døme: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 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 "
@@ -4004,11 +4061,11 @@
 "oppgjevne tida, vil sambandet bli lukka og FileZilla vil prøva å kopla til "
 "att."
 
-#: resources.h:974
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "Om du rapporterer feil bør du bruka loggenivået \"Alle meldingar\"."
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -4020,7 +4077,7 @@
 "det vera at tenaren ikkje har rette innnstillingar og at du må prøva "
 "aktivmodus. Du kan endra overføringsmåten i tilkoplingsstyraren."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4028,7 +4085,7 @@
 "Om tilbakefallsvalet er slått på, vil du vera i stand til å kopla til "
 "feilkonfigurerte tenarar som avslår den valde overføringsmåten."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4052,7 +4109,7 @@
 "Om problemet held fram, kan det vera fordi ein rutar og/eller brannmur bryt "
 "av sambandet."
 
-#: resources.h:963
+#: resources.h:987
 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 "
@@ -4062,7 +4119,7 @@
 "\".1\" blir lagt til slutten av filnamnet og det blir laga ei ny fil. Då kan "
 "det vera at eldre loggfiler blir overskrivne."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4082,7 +4139,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Om problemet held fram, kontakt rutarleverandøren din."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 "
@@ -4092,7 +4149,7 @@
 "tenaren. Om tida er forskjellig (til dømes grunna anna tidssone), skriv ei "
 "tidssoneforskyving i tilkoplingsstyraren."
 
-#: resources.h:917
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4100,11 +4157,11 @@
 "Dersom ein bruker tidsbasert samanlikning, rekn to filer for å vera like om "
 "tidsskilnaden er innanfor denne grensa."
 
-#: resources.h:932
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Om du endrar språket, bør du starta om att FileZilla."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4112,22 +4169,22 @@
 "Om du klikkar på test-knappen vil FileZilla kopla seg til probe.filezilla-"
 "project.org og utføra nokre enkle testar."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Om du lukkar FileZilla, vil du mista alle endringane."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
 "Om du skriv feil filtypar kan filtypane bli øydelagde under overføringar."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Om du får feil, er ikkje innstillingane rette."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4145,7 +4202,7 @@
 "ein fjernrutar eller ein brannmur ha feil innstillingar. Då kan du prøva å "
 "slå på passivmodus og kontakta tenaradministratoren for hjelp."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4153,7 +4210,7 @@
 "Om du går gjennom rettleiaren og sluttesten er vellykka, skal brannmur- og "
 "rutarinnstillingane vera i orden."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4161,13 +4218,13 @@
 "Om du nyttar ein brannmur må du sjå til at FileZilla får lov til å godta "
 "samband over alle gjevne portar."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
 "Om du nyttar ein rutar bør du sjå til alle desse portane blir vidaresende "
-"til maskina der du kjører FileZilla."
+"til maskina der du køyrer FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
@@ -4180,7 +4237,7 @@
 msgid "Import data from older version"
 msgstr "Importer data frå eldre utgåve"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Importer innstillingar"
 
@@ -4194,7 +4251,7 @@
 msgid "Improperly quoted association."
 msgstr "Feil i tilknytinga."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4202,7 +4259,7 @@
 "I aktivmodus må FileZilla lytta på ein port for dataoverføringar. Du må "
 "skriva inn kva portar FileZilla skal bruka."
 
-#: resources.h:703
+#: resources.h:723
 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."
@@ -4210,14 +4267,14 @@
 "Dersom du har ein rutar må du vidaresenda alle tilgjengelege portar. Det er "
 "fordi FileZilla ikkje kan påverka kva portar systemet ditt vel."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
 "Om du vil, kan du slå på automatisk oppdateringskontroll i innstillingane."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4225,7 +4282,7 @@
 "FileZilla må kjenna til den eksterne IP-adressa di for å kunna bruka "
 "aktivmodus."
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4235,7 +4292,7 @@
 "spør tenaren etter ein port og koplar seg til den gjevne porten. Metoden "
 "krev få innstillingar."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4243,20 +4300,20 @@
 "Ufullstendig kjede, rotsertifikatet er ikkje eit sjølvsignert "
 "sertifiseringsinstanssertifikat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Feil passord"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
-msgstr "Starta TLS…"
+msgstr "Startar TLS …"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Utrygg tenar - han kan ikkje nytta FTP over TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiv"
@@ -4266,8 +4323,8 @@
 msgstr "Grensesnitt"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
 msgstr "Avbroten av brukaren"
 
@@ -4279,8 +4336,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Ugyldig HTTP-svar"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4303,12 +4360,13 @@
 msgid "Invalid date"
 msgstr "Ugyldig dato"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Ugyldig filnamn"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "Ugyldig vert - berre kolon og port kan følgja etter sluttparentes."
 
@@ -4316,28 +4374,34 @@
 msgid "Invalid input"
 msgstr "Ugyldige inndata"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Ugyldig port - portnummeret må vera mellom 1 og 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Ugyldig protokoll er valt. Gyldige protokollar er:\n"
 "ftp:// for normal FTP,\n"
-"sftp:// for SSH filoverføringsprotokoll,\n"
-"ftps:// for FTP over SSL (implisitt) and\n"
-"ftpes:// for FTP over SSL (eksplisitt)."
+"sftp:// for SSH-filoverføringsprotokollen,\n"
+"ftps:// for FTP over TLS (implisitt) og\n"
+"ftpes:// for FTP over TLS (eksplisitt)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Ugyldig mellomtenarvert - berre kolon og port kan følgja etter sluttparentes."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Ugyldig regulært uttrykk i søkjevilkåra."
 
@@ -4345,7 +4409,7 @@
 msgid "Invalid response code"
 msgstr "Ugyldig svarkode"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Ugyldige søkjevilkår: %s"
@@ -4357,38 +4421,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ugyldig nettstadbane"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ugyldig storleik på føresetnaden"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Brukarnamnet er ugyldig."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Rettsområde land:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Domsmyndeområde:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Domsmyndestat/-provins:"
 
-#: resources.h:914
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Hald alltid katalogane øvst"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4398,51 +4462,56 @@
 "lister om dette valet er slått på. Sjølv om FileZilla utfører nokre testar "
 "for å sjå om tenaren støttar denne eigenskapen, kan testen feila."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Nøkkelutveksling"
 
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Nøkkelutveksling"
+
 # L&
-#: resources.h:601
+#: resources.h:619
 msgid "L&owest"
 msgstr "L&ågaste"
 
-#: resources.h:930
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Språk"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Språket er endra"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Sist endra"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Utforming"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Grense for samtidige &nedlastingar:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
 msgstr "Grense for samtidige oppl&astingar:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
 msgstr "Avgrens lokale portar"
 
-#: resources.h:960
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Avgrens loggfilstorleiken"
 
-#: resources.h:961
+#: resources.h:985
 msgid "Limit:"
 msgstr "Grense:"
 
@@ -4450,7 +4519,7 @@
 msgid "Line length exceeded"
 msgstr "For lang linjelengd"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Lenka til"
 
@@ -4460,21 +4529,21 @@
 
 # var: Listing:
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listar:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
 msgstr "L&ågaste tilgjengelege port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokal"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Lokal fil"
 
@@ -4490,7 +4559,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Lokal fil er ikkje eit gyldig filnamn."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Lokale filter:"
 
@@ -4498,7 +4567,7 @@
 msgid "Local site:"
 msgstr "Lokal stad:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Stad:"
 
@@ -4506,16 +4575,16 @@
 msgid "Log file"
 msgstr "Loggfil"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Oppdateringskontrollogg:"
 
-#: resources.h:955
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Loggføring"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4524,7 +4593,7 @@
 "forstår UTF-8. Det er ikkje mogleg å falla tilbake til lokalt teiknsett "
 "grunna bruk av mellomtenar."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4532,11 +4601,11 @@
 "Påloggingsdataa inneheld ikkje-ASCII-teikn og det kan vera at tenaren ikkje "
 "forstår UTF-8. Prøver lokalt teiknsett."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "Påloggingssekvensen er fullført, men er likevel ikkje pålogga. Avbryt."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Påloggingstypen må anten vera 'spør' eller 'interaktiv' (utan apostrofane)."
@@ -4550,13 +4619,13 @@
 "Påloggingstypen kan berre nyttast saman med ei FTP-adresse. Argumentet må "
 "anten vera '%s' eller '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Låg"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Lågaste"
 
@@ -4565,11 +4634,11 @@
 msgstr "Det lågaste portnummeret må vera mellom 1024 og 65535."
 
 # Nettkortadresse?
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Sjå til at ein har tilgang til fila og at ho er eit velforma XML-dokument."
@@ -4591,7 +4660,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Svaret er ikkje velforma: tenaren sender ikkje rette linjeavslutningar"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4602,58 +4671,58 @@
 msgid "Manual transfer"
 msgstr "Manuell overføring"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Samsvar med alle følgjande"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Samsvar med kva som helst av følgjande"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Samsvar med ingen av dei følgjande"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "&Høgste tal samtidige overføringar:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Meldingslogg"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "Meldingsloggposisjon"
 
-#: resources.h:962
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "minutt"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "Flytt &ned"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "Flytt &opp"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Datamaskina mi"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Dokumenta mine"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Nettstadene mine"
 
@@ -4662,33 +4731,33 @@
 msgid "N/a"
 msgstr "-"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Namn"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Namnet finst allereie"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Bokmerkenamnet finst allereie."
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Du må skriva inn filternamnet"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Du må skriva inn gyldig fjernsti"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Ein må føra opp teiknkoding"
 
@@ -4696,19 +4765,24 @@
 msgid "Network unreachable"
 msgstr "Klarer ikkje å nå nettverket"
 
-#: resources.h:73
+#: resources.h:968
+#, fuzzy
+msgid "Never"
+msgstr "&Tenar"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "N&y mappe"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Ny &fane"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "Nytt bok&merke"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4721,41 +4795,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nytt bokmerke"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Ny katalog"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nye eigenskapar og forbetringar i %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nytt filter"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Ny mappe"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Ny stad"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "Ved sida av overføringskøen"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nei"
 
@@ -4763,26 +4837,26 @@
 msgid "No category to export selected"
 msgstr "Ingen kategori er vald for eksportering"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Ingen kommando er oppgjeven - avbryt."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Inga ekstern IP-adresse er lagra - prøver standardverdien."
 
 # var: Ingen filer held på å bli endra no.
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Ingen filer blir endra no."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Er ikkje oppgjeve noko filternamn"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Manglar vertsnamnet - skriv det inn."
 
@@ -4790,25 +4864,25 @@
 msgid "No images available"
 msgstr "Ingen bilete er tilgjengelege"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Ingen fleire filer i køen."
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Er ikkje oppgjeve noko filtersamlingsnamn."
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Ikkje noko program er knytt til filtypen"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "Ikkje noko program er knytt til endring av filer med filtypen '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Ingen søkjeresultat"
 
@@ -4826,23 +4900,23 @@
 msgid "No username given."
 msgstr "Brukarnamn er ikkje oppgjeve."
 
-#: resources.h:924 resources.h:929
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ingen"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Ingen er enno valde"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4852,15 +4926,15 @@
 msgstr "Klarte ikkje å leggja alle elementa i kø for vising/endring."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Ikkje tilkopla"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Ikkje tilkopla mot nokon tenar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Ikkje tilkopla mot nokon tenar."
 
@@ -4868,21 +4942,21 @@
 msgid "Not connected."
 msgstr "Ikkje tilkopla."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Ver merksam på at denne eigenskapen berre er støtta når ein nyttar FTP-"
 "protokollen."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Obs: dette fungerer berre med vanlege, ikkje-krypterte FTP-samband."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "Obs: bruk av generisk mellomtenar gjev passivmodus på FTP-sambanda."
 
-#: resources.h:903
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Tal på desimalplassar:"
 
@@ -4890,22 +4964,22 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Talet på forsøk må vera mellom 0 og 99."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "O&pna fil"
 
 # ? skal vi ha med hurtigtast?
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "&OK"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4913,120 +4987,124 @@
 "På dei følgjande sidene stiller ein inn overførings- og tilbakefallsmåten "
 "(dersom slått på)."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Éin gong"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
+#: resources.h:969
+msgid "Once a week"
 msgstr ""
-"Berre opplysningar om FileZilla- og operativsystemutgåvene du bruker vil bli "
-"sende til tenaren."
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Opna katalogen i systemet sin filbehandlar"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Opna tilkoplingsstyraren"
 
-#: resources.h:564
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Opna tilkoplingsstyraren."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Opnar tilkoplingsstyraren. Høgreklikk for å sjå nettstadlista."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Opna fila."
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
 msgstr "Opna FileZilla sine innstillingar"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Opna som:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Opninga feila"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Opnar i ny fane"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Opnar tilkoplingsstyraren"
 
-#: resources.h:997
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Opnar filtervindauget for kataloglister. Høgreklikk for å slå filtera av/på."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "Operativsystem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Fann eit operativsystemproblem"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Organisasjon:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Anna:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Oversyn"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Skriv over om &kjelda er nyare"
 
 # var: Skriva over fila
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Skriv over fila"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Skriv over fila om storleiken er forskjellig"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Skriv over fila om storleiken er forskjellig eller kjeldefila er nyare"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Skriv over fila om kjeldefila er nyare"
 
 # var: Skriva over om &forskjellige storleik
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Skriv over om &forskjellige storleik"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Skr&iv over om forskjellig storleik eller kjeldefila er nyare"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Eigarrettar"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Eigar/gruppe"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5034,7 +5112,7 @@
 "&Hindra systemet frå å gå i sovemodus under overføringar og andre handlingar"
 
 # var: &Vert:
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "&Mellomtenarvert:"
@@ -5043,27 +5121,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-kommandoen er endra av rutaren eller brannmuren."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "&Passiv (tilrådd)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pakke"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Parameteren er ikkje ei gyldig adresse"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "&Passord:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "&Passiv (tilrådd)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passivmodus"
@@ -5078,42 +5156,42 @@
 msgid "Password required"
 msgstr "Passord er påkravd"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Filbane"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Klarer ikkje å laga bane for katalogen %s og underkatalogen %s"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Stigar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Ventar på fjerning"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Løyve"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Tilgangar"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5126,10 +5204,10 @@
 "Please check on http://filezilla-project.org/probe.php that the server is "
 "running and carefully check your settings again."
 msgstr ""
-"Gå til http://filezilla-project.org/probe.php for å sjå om tenaren kjører og "
+"Gå til http://filezilla-project.org/probe.php for å sjå om tenaren køyrer og "
 "sjå nøye over innstillingane dine éin gong til."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5137,7 +5215,7 @@
 "Bruk pakkestyraren på systemet ditt til å sjå etter ei oppdatert pakke eller "
 "besøk http://filezilla-project.org for å lasta ned kjeldekoden til FileZilla."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5167,7 +5245,7 @@
 msgid "Please enter a custom time format."
 msgstr "Før opp eit tilpassa tidformat."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5179,20 +5257,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Skriv inn ei nedlastingsfartsgrense større eller lik 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Gje namn til det nye filteret."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Gje det kopierte filteret eit nytt namn."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Skriv inn eit nytt namn for filtersamlinga \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Gje nytt namn til filteret."
 
@@ -5219,17 +5297,17 @@
 "Skriv inn eit tal mellom 0 og 10 for å bestemma talet på samtidige "
 "overføringar."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Skriv inn eit passord for denne tenaren:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
 "You can also optionally specify program arguments."
 msgstr ""
-"Skriv bana og programmet som skal kjørast.\n"
+"Skriv bana og programmet som skal køyrast.\n"
 "T.d. c:\\bane\\fil.exe i MS Windows eller /bane/fil i Unix.\n"
 "Du kan òg føra opp valfrie programargument."
 
@@ -5240,11 +5318,11 @@
 "Skriv eit tidsavbrot mellom 5 og 9999 sekund, eller 0 for å slå av "
 "tidsavbrot."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Gje filtersamlinga eit eintydig namn"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Skriv inn eit brukarnamn for denne tenaren:"
 
@@ -5256,17 +5334,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Skriv nettadressa der du kan få den eksterne adressa di frå"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Skriv eit oppdateringsintervall på minst sju dagar"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Skriv inn ei opplastingsfartsgrense større enn eller lik 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5274,14 +5348,18 @@
 "Skriv ein rå FTP-kommando.\n"
 "Bruk av råe FTP-kommandoar medfører tømming av katalogmellomlageret."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Skriv namnet på katalogen som skal opprettast:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Skriv namnet på fila som skal opprettast:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Skriv inn brukarnamn og passord for denne tenaren:"
 
@@ -5300,7 +5378,7 @@
 "aktivmodus. Dersom du har ei dynamisk adresse eller du ikkje kjenner den "
 "eksterne adressa, bruk det eksterne oppslagsvalet."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5316,7 +5394,7 @@
 "Sjå til at FileZilla kan etablera utgåande tilkoplingar og at du skreiv rett "
 "adresse til adresseløysaren."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Sjå til at regionaltilpassinga du bad om er installert på systemet ditt."
@@ -5332,7 +5410,7 @@
 "innstillingane. Du må bruka manuell portvidaresending. Slå av innstillingar "
 "slik som \"DMZ-modus\" eller \"spelemodus\" i rutaren din."
 
-#: resources.h:686
+#: resources.h:706
 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 "
@@ -5344,7 +5422,7 @@
 "blir brukt av trojanarar eller andre skadeprogram. Du kan trygt sjå vekk frå "
 "slike falske alarmar."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5352,7 +5430,7 @@
 "Det er berre mogleg å ta vare på opplastingstidsstempla til FTP-, FTPS- og "
 "FTPES-tenarar om dei støttar MFMT-kommandoen."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5360,7 +5438,7 @@
 "Ver merksam på at somme tenarar kan stengja deg ute om du koplar til for "
 "ofte eller med for korte opphald."
 
-#: resources.h:890 resources.h:896
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5369,7 +5447,7 @@
 "Nettstaden http://wiki.filezilla-project.org/Date_and_Time_formatting gjev "
 "fleire opplysningar"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5383,41 +5461,41 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
-"Kjør denne rettleiaren ein gong til om nettverket endrar seg eller du får "
+"Køyr denne rettleiaren ein gong til om nettverket endrar seg eller du får "
 "problem med tenarar som tidlegare fungerte."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Vel ei handling:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Vel kategoriane du vil importera."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Vel kva standard overføringstype du ønskjer å bruka."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr "Gje katalogen \"%s\" nye attributt ."
+msgstr "Gje katalogen \"%s\" nye attributt."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Gje fila \"%s\" nye attributt."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Gje dei valde katalogane nye attributt."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Gje dei valde filene og katalogane nye attributt."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Gje dei valde filene nye attributt."
 
@@ -5435,7 +5513,7 @@
 "\"spelemodus\" i rutaren din. Bruk heller ikkje protokollkontrollar eller "
 "protokollspesifikke \"fiksar\"."
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5443,24 +5521,24 @@
 "Du finn fleire opplysningar om FileZilla på nettstaden <http://filezilla-"
 "project.org>."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "Besøk http://filezilla-project.org for å lasta ned den nyaste utgåva."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Postnummer:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Førehandsdefinerte stader"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Tek vare på tidsstempel"
 
@@ -5468,50 +5546,64 @@
 msgid "Preview:"
 msgstr "Førehandsvising:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Sertifikata til primær- og datatilkoplingane samsvarer ikkje."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Skriv ut utgåveopplysningane til standard utkanal og avslutt"
 
-#: resources.h:913
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Prioriter katalogar (standard)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritet"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Personvernreglar:"
+#: resources.h:977
+#, fuzzy
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Berre opplysningar om FileZilla- og operativsystemutgåvene du bruker vil bli "
+"sende til tenaren."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "Private &nøklar:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "Pro&tokoll:"
 
 # var: &Mellomtenarpassord:
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
 msgstr "P&assord:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "Behandla &køen"
 
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "Pro&tokoll:"
+
 # var: Mellomtenar&port:
-#: resources.h:798
+#: resources.h:818
 msgid "Proxy &port:"
 msgstr "&Port:"
 
 # var: Mellomtenar&brukar:
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
 msgstr "&Brukar:"
 
@@ -5519,12 +5611,17 @@
 msgid "Proxy authentication failed"
 msgstr "Mellomtenarautentiseringa feila"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Mellomtenargodkjenningsprosedyren feila: %s"
 
+# ?
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Mellomlagerverten startar med '[', men manglar avsluttande parentes."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5539,23 +5636,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Mellomtenarførespurnaden feila: ukjend adressetype i CONNECT-svaret"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Mellomtenarinnstillinga er lagra, men verten eller porten er ugyldig"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Offentleg nøkkel-autentisering"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Offentleg nøkkel-algoritme:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Offentlege tilgangar"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "Køen er blitt fullstendig behandla"
 
@@ -5574,39 +5671,39 @@
 msgid "Queue: empty"
 msgstr "Kø: tom"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Filer i køen"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "I kø:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "Start &om att systemet"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "&Fjernkatalogtre"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "N&ullstill og legg dei valde filene i køen igjen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Rå FTP-kommando"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "&Les"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Oppdater"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Gje &nytt namn"
 
@@ -5615,68 +5712,78 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"Kjør rettleiaren på nytt og sjå nøye over innstillingane dine. Bruk dei på "
+"Køyr rettleiaren på nytt og sjå nøye over innstillingane dine. Bruk dei på "
 "same vis på dei andre rutarane og brannmurane dine."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "&Les"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Berre lesing"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Vil du verkeleg avslutta den gjeldande handlinga?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Vil du verkeleg sletta %d katalog og innhaldet i han?"
-msgstr[1] "Vil du verkeleg sletta %d katalogar og innhaldet i dei?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Vil du verkeleg sletta %d fil?"
-msgstr[1] "Vil du verkeleg sletta %d filer?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "Vil du verkeleg sletta %d katalog og innhaldet i han frå tenaren?"
+msgstr[1] "Vil du verkeleg sletta %d katalogar og innhaldet i dei frå tenaren?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Vil du verkeleg sletta %d fil frå tenaren?"
+msgstr[1] "Vil du verkeleg sletta %d filer frå tenaren?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Vil du verkeleg sletta %s og %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Vil du verkeleg sletta %s og %s frå tenaren?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Vil du verkeleg sletta dei valde filene og/eller katalogane frå tenaren?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Vil du verkeleg sletta dei valde filene og/eller katalogane?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Vil du verkeleg sletta dei valde filene og/eller katalogane frå tenaren?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Årsak"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Start om att no"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "Ta med &underkatalogar|"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Den mottekne kataloglista verkar vera koda med EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Avbryt: motteke ei linje med over 10000 teikn."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Mottekne data er øydelagde"
 
@@ -5689,11 +5796,11 @@
 "Oppattkoplingsopplysningar kan ikkje tømmast når ein er tilkopla ein tenar.\n"
 "Om du held fram, vil sambandet bli kopla ned."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Omattilkoplingsinnstillingar"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Koplar seg opp att til den sist nytta tenaren."
 
@@ -5701,34 +5808,38 @@
 msgid "Redirection to invalid address"
 msgstr "Omdirigering til ugyldig adresse"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Frisk opp att fil- og mappelista"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Hugsa passord?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Fjern"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Fjernsertifikatet er ikkje tiltrudd."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Fjernfil"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Fjernfilsøk"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Fjernfilter:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Fjernfilbane"
 
@@ -5741,7 +5852,7 @@
 "Klarer ikkje å tolka fjernbana. Sjå til at ho er ei gyldig, absolutt bane og "
 "at ho er støtta av tenartypen (%s) til den gjeldande nettstaden."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5752,7 +5863,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Klarer ikkje å tolka fjernbana. Sjå til at ho er ei gyldig, absolutt bane."
@@ -5761,11 +5872,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Klarte ikkje å tolka fjernfilbana."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Fjernstibehandling"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Fjernfilbane:"
 
@@ -5773,76 +5884,76 @@
 msgid "Remote site:"
 msgstr "Fjernstad:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "Fjern &alle"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "Fjern &valde"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Gje fila nytt namn"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Gje vald katalog nytt namn"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Gje nytt namn til valde filer og katalogar"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Gjev '%s' det nye namnet '%s'"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
 msgstr "Senda forslag og feilmeldingar"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Krev eksplisitt FTP over TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Krev implisitt FTP over TLS"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Nullstill og legg &alle i køen igjen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Slår opp adressa til %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Finn vertsnamnet"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Svar:"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Resultat:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Hald fram med filoverføringa"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5850,39 +5961,38 @@
 "Dersom tenaren bruker eit anna linjeendingsformat enn klienten kan ein få "
 "problem ved oppattaking av ASCII-filer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Hentar kataloglista …"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Hentar ekstern IP-adresse frå %s:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Rotsertifikatet er ikkje tiltrudd."
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
-msgstr "&Vis filer som blir endra no…"
+msgstr "&Vis filer som blir endra no …"
 
-#: resources.h:875
-#, fuzzy
+#: resources.h:895
 msgid "S&how the Site Manager on startup"
-msgstr "&Eksporter oppføringane i tilkoplingsstyraren"
+msgstr "&Start med tilkoplingsstyraren"
 
-#: resources.h:609
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "Slå &av systemet"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "S&topp"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "S&ynkronisert blaing"
 
@@ -5890,31 +6000,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Lagra innstillingane?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
 msgstr "Søkjer etter filer som skal leggjast til i køen"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
 msgstr "Søkjer etter filer som skal lastast opp"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "Søkje&vilkår:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "Søkje&katalog:"
 
-#: resources.h:1002
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Rekursivt filsøk."
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Søk i heile tenaren etter filer"
 
@@ -5927,25 +6051,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Sjå òg: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "&Vel tenar"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "Vel &side:"
 
-#: resources.h:878
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Vel drakt"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Vel standardhandlinga om målfila til overføringa allereie finst."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Vel føretrekt skriveprogram"
 
@@ -5965,7 +6089,7 @@
 "Vel standardhandlinga om målfila allereie finst. Valet gjeld berre for dei "
 "valde filene i køen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Vel nedlastingsstad for pakken"
 
@@ -5986,7 +6110,7 @@
 msgstr "Vel fil for eksporterte innstillingar"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Vel fil for eksporterte stader"
 
@@ -6002,12 +6126,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Vel filnamn til den konverterte nøkkelfila"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Vel korleis desse filene skal opnast"
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Vel målet sin nedlastingskatalog"
 
@@ -6015,15 +6139,15 @@
 msgid "Select target filename"
 msgstr "Vel målfilnamn"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Vel kategoriane du vil eksportera:"
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Vel kva for private data du vil sletta."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6037,7 +6161,7 @@
 msgstr[0] "%d katalog er vald."
 msgstr[1] "%d katalogar er valde."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6059,7 +6183,7 @@
 msgstr[0] "%d fil vald. Storleik: minst %s"
 msgstr[1] "%d filer valde. Total storleik: minst %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Vald %s og %s for overføring."
@@ -6074,13 +6198,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s og %s er valde. Total storleik: minst %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Det valde skriveprogrammet finst ikkje."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Den valde fila er allereie i bruk"
 
@@ -6088,15 +6212,15 @@
 msgid "Selected file is already loaded"
 msgstr "Den valde fila er allereie lasta"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Den valde fila er allereie opna"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Den valde fila blir framleis endra"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Det valde filteret gjeld berre for lokale filer."
 
@@ -6113,38 +6237,43 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Den valde porten blir vanlegvis brukt av ein annan protokoll."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "Send &FTP-vedlikehaldssambandskommandoar"
 
-#: resources.h:543
+#: resources.h:559
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Send ein tilpassa kommando, som elles ikkje er tilgjengeleg, til tenaren"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Sender vedlikehaldstilkoplingskommando"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Serienummer:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "&Tenartype:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Tenaren lukka ikkje TLS-sambandet på rett vis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Tenaren støttar berre ASCII-teikn."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn %dGB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6153,15 +6282,15 @@
 "Tenaren kan ikkje overføra filer på nytt om dei er større enn %dGB. "
 "Avsluttar overføringa sidan filstorleiken samsvarer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Tenaren kan ikkje overføra filer på nytt om dei er større enn 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6170,7 +6299,7 @@
 "Det kan vera at tenaren ikkje støttar oppattaking av filer > %d GB. "
 "Avsluttar overføringa sidan filene er like store."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6178,11 +6307,11 @@
 "Det kan vera at tenaren krev ein konto. Prøv å laga ein konto i "
 "tilkoplingsstyraren."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Tenaren sende attende ei tom filbane."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6190,13 +6319,13 @@
 "Tenaren sende ein ekstra leietekst. Då må bruka den interaktive "
 "påloggingstypen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Tenaren sende eit passivsvar med ei adresse som ikkje kan rutast. "
 "Passivmodusen feila."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6216,101 +6345,109 @@
 msgid "Server sent unexpected reply."
 msgstr "Tenaren sende eit uventa svar."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "Maskinvareadresse tenar-klient"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Krypteringsmetode tenar til klient:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "&Tenartype"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Tenar / lokal fil"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Tenar:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Øktopplysningar"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "Gje &forrang"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Vel tilgang for '%s' til '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize blei kalla utan endepunkt"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Innstillingar"
 
-#: resources.h:975
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "Syn &rå katalogliste"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
-msgstr "Syn &velkomstvindauget…"
+msgstr "Syn &velkomstvindauget …"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Syna begge katalogtrea og halda fram med samanlikninga?"
 
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "Syner tilgjengelege TLS-krypteringsmetodar"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Syner dette hjelpevindauget"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Slå av no"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "&Oppføringar i tilkoplingsstyraren"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Tilkoplingsstyraren"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+#, fuzzy
+msgid "Site Manager - Cannot remember password"
+msgstr "Hugs &ikkje passord"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Tilkoplingsstyraren - ugyldige data"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Tilkoplingsstyraren er allereie opna"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Nettstaden finst ikkje."
 
@@ -6320,8 +6457,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Nettstadbana er ikkje velforma"
 
@@ -6339,11 +6476,11 @@
 "Nettspesifikke bokmerke krev at tenaren er lagra i tilkoplingsstyraren.\n"
 "Vil du leggja til den gjeldande tilkoplinga?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Storleik"
 
-#: resources.h:897
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Storleiksformatering"
 
@@ -6352,31 +6489,31 @@
 msgid "Size unknown"
 msgstr "Ukjend storleik"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Hopp over fila"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Hoppar over nedlastinga av %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Hoppar over opplastinga av %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Somme filer er framleis opne eller treng å bli lasta opp."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6385,19 +6522,19 @@
 "kanskje svara med den lokale IP-adressa deira."
 
 # inline?
-#: resources.h:915
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Sorter katalogane"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Ein kan ikkje endra sorteringsrekkjefølgja ved katalogsamanlikning."
 
-#: resources.h:911
+#: resources.h:931
 msgid "Sorting"
 msgstr "Sorterer"
 
-#: resources.h:912
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "Sorterings&måte:"
 
@@ -6409,20 +6546,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Kjelde- og målfila kan ikkje vera like"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Kjelda og målet til sleppe-handlinga er like"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Kjeldefil:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Fartsgrenser"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Fartsgrenser"
 
@@ -6434,7 +6571,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Fartsavgrensing er slått på. Klikk for å endra."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr ""
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr ""
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "Start overføringa &no"
 
@@ -6442,43 +6587,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Start med open tilkoplingsstyrar"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Begynner nedlastinga av %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Begynner opplastinga av %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Stat/fylke eller provins:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "Stopp og fjern &alle"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Gate:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Sertifikat utferda til"
 
@@ -6486,11 +6631,11 @@
 msgid "Successful transfers"
 msgstr "Vellykka overføringar"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Samandrag av prøveresultat:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6498,44 +6643,44 @@
 "Symbolske lenkjer til filer er ikkje berørte av dette valet, slike "
 "symlenkjer blir alltid sletta."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synkronisert blaing"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synkronisert blaing er slått av"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaksfeil"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Syntaksfeil i kommandolinja"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "System"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "&Verktøylinje"
 
@@ -6543,11 +6688,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL-tilkoplinga er i orden, sender HTTP-førespurnad"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr "TLS-/SSL-samband er oppretta, ventar på velkomsmeldinga…"
+msgstr "TLS-/SSL-samband er oppretta, ventar på velkomsmeldinga …"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL-samband er oppretta."
 
@@ -6555,27 +6700,31 @@
 msgid "TTL expired"
 msgstr "TTL er gått ut"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Målfila finst allereie"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Målfil:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Filnamnet finst allereie."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Målfila finst allereie. Vil du verkeleg halda fram?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Prøveresultat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testar oppattakingseigenskapane til tenaren"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6592,7 +6741,7 @@
 "Tilkoplingsstyraren er open i ein annan instans av FileZilla 3.\n"
 "Lukk han, elles vil ikkje dataa kunne slettast."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-dokumentet er ikkje velforma: %s"
@@ -6603,11 +6752,11 @@
 msgstr "Adressa du skreiv inn var: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Klarte ikkje å leggja til bokmerket."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Klarte ikkje å tømma bokmerka."
 
@@ -6620,19 +6769,19 @@
 msgstr "Den tilpassa påloggingssekvensen kan ikkje vera tom."
 
 # skriv ikkje ut heile setninga
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Fann ikkje det førehandsvalde skriveprogrammet."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Førehandsvalt skriveprogram for tekstfiler er '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Filternamnet du skreiv finst allereie. Vel eit anna namn."
 
@@ -6651,9 +6800,9 @@
 "Fila %s finst allereie.\n"
 "Skriv eit anna namn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6670,14 +6819,14 @@
 msgstr ""
 "Klarte ikkje å lasta fila '%s' eller ho inneheld ikkje ein privatnøkkel."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Klarte ikkje å laste fila '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6686,8 +6835,8 @@
 "Klarte ikkje å opna fila '%s':\n"
 "Ikkje noko program på systemet ditt er knytt til denne filtypen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6729,7 +6878,7 @@
 "nøkkelfiler.\n"
 "Vil du endra fila til å vera ubeskytta?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Vald skriveprogram finst ikkje."
 
@@ -6765,11 +6914,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Dei følgjande teikna vil bli bytta ut: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "Dei følgjande filene held på å bli endra no:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "Den frie og opne FTP-løysinga"
 
@@ -6777,7 +6926,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Klarte ikkje å lagra dei globale bokmerka."
 
-#: resources.h:973
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6808,7 +6957,7 @@
 "Den lågast tilgjengelege porten må vera lågare eller lik med den høgste "
 "tilgjengelege porten."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6816,7 +6965,7 @@
 "Den aller siste utgåva er blitt lasta ned. Klikk på Avslutt for å lukka "
 "FileZilla og starta installasjonen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6824,11 +6973,11 @@
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Køen vil ikkje bli lagra."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6842,29 +6991,29 @@
 msgid "The selected categories have been imported."
 msgstr "Dei valde elementa er blitt importerte."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Den valde fila inneheld data som kan importerast for desse kategoriane:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Den valde fila er allereie i bruk:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "Den valde fila er opna av eit anna program. Lukk det."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
-"Den valde fila kan kjørast direkte.\n"
+"Den valde fila kan køyrast direkte.\n"
 "Dette kan vera farleg og kan skada systemet ditt.\n"
 "Vil du verkeleg halda fram?"
 
@@ -6876,7 +7025,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Tenaren sende eit uventa eller ukjend svar."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Tenaren bruker denne teiknkodinga på filnamn:"
 
@@ -6888,7 +7037,7 @@
 "Tenarsertifikatet er ukjend. Sjå nøye over det for å sikra at ein kan stola "
 "på tenaren."
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6898,7 +7047,7 @@
 "betyr anten at administratoren har endra vertsnøkkelen eller at du faktisk "
 "prøver å kopla deg til ei anna maskin som gjer seg ut for å vera tenaren."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6914,15 +7063,15 @@
 "Innstillingane er blitt importerte. Du må starta om att FileZilla for at dei "
 "skal bli tekne i bruk."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "Systemet vil starta om att om du ikkje trykkjer Avbryt."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Systemet vil snart takast ned om du ikkje trykkjer Avbryt."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6931,7 +7080,7 @@
 "Vel ei handling."
 
 # Prøven feila?
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testen feila. Vil du verkeleg lagra innstillingane?"
 
@@ -6939,11 +7088,11 @@
 msgid "Themes"
 msgstr "Drakter"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Denne filtersamlinga kan ikkje fjernast."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Denne filtersamlinga kan ikkje få nytt namn."
 
@@ -6954,7 +7103,7 @@
 msgstr ""
 "Dette betyr at ein rutar og/eller brannmur framleis stengjer for FileZilla."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6962,7 +7111,7 @@
 "Dette vil berre verka dersom du ikkje er bak ein rutar, elles vil systemet "
 "ditt berre visa den interne adressa di."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6970,25 +7119,25 @@
 "Denne rettleiaren vil hjelpa deg å stilla inn kvar rutar eller brannmur du "
 "måtte ha. Han vil òg testa innstillingane."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Tid"
 
-#: resources.h:891
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Tidsformatering"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Tids&avbrot i sekund:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Tidsavbrot"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6996,20 +7145,20 @@
 msgstr ""
 "Tidssoneforskyving: Tenar: %d sekund. Lokalt: %d sekund. Skilnad: %d sekund."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Tittel:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "Begge fillistene må vera justerte saman for å samanlikna dei."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "For å kunna gjera dette må begge katalogtrea anten synast eller skjulast."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7017,7 +7166,7 @@
 "For å kunna bruka offentlegnøkkelautentisering må FileZilla veta kva for "
 "privatnøklar som skal nyttast."
 
-#: resources.h:998
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7033,7 +7182,7 @@
 "Grøn: fila er nyare enn den umarkerte fila på den andre sida\n"
 "Raud: ulik filstorleik"
 
-#: resources.h:1000
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7043,23 +7192,23 @@
 "Dersom slått på, vil blaing i lokalkatalogen endra katalogvisinga på tenaren "
 "tilsvarande."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Slår av/på behandlinga av overføringskøen"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Slår av/på vising av det lokalkatalogtreet"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Slår av/på visinga av meldingsloggen"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Slår av/på vising av fjernkatalogtreet"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Slår av/på visinga av overføringskøen"
 
@@ -7072,38 +7221,38 @@
 msgstr "For mange vidaresendingar"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Sporing:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Overfør"
 
 # Strengen MÅ vera kort
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "Overførings&retning"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "&Overføringstype"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
 msgstr "Overføringsmodus"
 
-#: resources.h:877
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Overføringskø"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Overføringsinnstillingar"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Overføringssambandet blei lukka: %s"
@@ -7112,8 +7261,8 @@
 msgid "Transferred data got tainted."
 msgstr "Dei overførte dataa blei endra (\"tainted\")."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Overfører"
 
@@ -7122,69 +7271,69 @@
 msgstr "Overføringar"
 
 # Strengen MÅ vera kort?
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Overføringane er ferdige"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "Behandla filer &utan filtype som ASCII-fil"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Behandla &desse filtypane som ASCII-filer:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Stol på den endra vertsnøkkelen:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Stol på den nye vertsnøkkelen:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Stoler du på den nye nøkkelen og vil du halda fram med tilkoplinga?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Stoler du på dette sertifikatet og vil du halda fram med tilkoplinga?"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Stoler du på denne verten og vil du halda fram med tilkoplinga?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Type"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
 msgstr "Type FTP-mellomtenar:"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
 msgstr "Type generisk mellomtenar:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "&Opplasting"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Opp&lastingsgrense:"
 
-#: resources.h:939
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "Bruk filtype&tilknyting om mogleg"
 
-#: resources.h:892
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "Bruk syst&emstandardane"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
 msgstr "BRUKAR@VE&RT"
 
@@ -7193,16 +7342,16 @@
 msgid "Unassigned error code %d"
 msgstr "Utildelt feilkode %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Eining:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Ukjent"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Ukjend FTP-mellomlagertype. Klarer ikkje å laga påloggingssekvens."
 
@@ -7215,7 +7364,7 @@
 msgid "Unknown certificate"
 msgstr "Sertifikatet er ukjent"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7223,7 +7372,7 @@
 "Ukjend feil ved opninga av fila. Sjå til at ein har tilgang til fila og at "
 "ho er eit velforma XML-dokument."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Ukjend vertsnøkkel"
 
@@ -7236,7 +7385,7 @@
 msgstr ""
 "Ukjend protokollutgåve av SOCKS brukarnamn-/passordautentiseringsdialogen: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "Ukjend rotelement. Det ser ikkje ut til at fila er laga av FileZilla."
@@ -7258,7 +7407,7 @@
 "Dersom ikkje problemet blir ordna, vil ikkje FTP-aktivmodusen verka og ein "
 "må nytta passivmodus."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Sertifikattypen er ikkje støtta"
 
@@ -7266,25 +7415,25 @@
 msgid "Unsupported redirect"
 msgstr "Ustøtta vidaresending"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "Last &opp utan å lagra ikkje endringa(ne)"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Oppdateringskontroll"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Oppdateringsrettleiar"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+#, fuzzy
+msgid "Updates"
+msgstr "Oppdateringskontroll"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "Last opp"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Opplastinga feila"
 
@@ -7297,99 +7446,99 @@
 msgid "Upload limit: none"
 msgstr "Opplastingsgrense: inga"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Last opp vald katalog"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Lasta opp valde filer og katalogar"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Lasta opp fila tilbake til tenaren?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Lasta opp denne fila til tenaren?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Lastar opp"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Lastar opp og ventar på fjerning"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Lasta opp utan å lagra endringane"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Bruk tilpassa &teiknkoding"
 
-#: resources.h:936
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "&Eige skriveprogram:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "&Bruk det førehandvalde skriveprogrammet på tekstfiler"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Br&uk synkronisert blaing"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr "Bruk UTF-8 dersom tenaren støttar det, elles bruk lokal teiknkoding."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Bruk standardhandlinga"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Bruk vanleg FTP"
 
 # var: Bruk tenaren som no er tilkopla til /* originalen uklår */
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Bruk tenaren som no er tilkopla"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Bruk tenar frå tilkoplingsstyraren"
 
-#: resources.h:886
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "Bruk syste&mstandardane"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Bruk denne IP-adressa:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "Bruk dette portområdet:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "Bruk tenaren si eksterne IP-adresse i staden for"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Bruk dette valet om du er bak ein rutar og har ei statisk, ekstern IP-"
 "adresse."
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7399,34 +7548,34 @@
 "tenaren éin gong i kvar økt straks du slår på aktivmodus første gongen. "
 "Berre opplysningar om kva FileZilla-utgåve du bruker blir sende til tenaren."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
 msgstr "Brukar:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Brukarnamnet kan ikkje vera ei rekkje av mellomrom"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Bruker mellomtenaren %s"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "Bruk av feil teiknkoding kan medføra at filnamn ikkje blir viste rett."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "Denne rettleiaren ser etter tilgjengelege oppdateringar av FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Gyldig frå:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Gyldig til:"
 
@@ -7434,55 +7583,55 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Fulle loggmeldingar frå wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
-msgstr "Stadfestar sertifikatet…"
+msgstr "Stadfestar sertifikatet …"
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Utgåve:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Veldig høg"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Vis skjult-valet er i bruk, men ikkje støtta av tenaren."
 
-#: resources.h:923
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Vis/endra"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Synlege kolonnar"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "&Lagra"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Ventar"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Ventar på samband"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Ventar på passord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Ventar på at overførings skal avbrytast"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
-msgstr "Ventar på å få forsøkja igjen…"
+msgstr "Ventar på å få forsøkja igjen …"
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7512,11 +7661,11 @@
 "Windows-brannmuren\n"
 "eller Application Layer Gateway-tenesta."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Åtvaring: ignorerer datasamband frå feil IP."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7531,36 +7680,48 @@
 "\n"
 "Vil du verkeleg sjå etter dei?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Åtvaring: mogleg tryggleiksbrot!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Velkomen til FileZilla"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Kva er nytt"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Nytt:"
 
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Om du tillèt FileZilla å hugsa passordet kan du seinare kopla til utan å "
+"skriva det inn. Krev omstart av FileZilla."
+
 # ? Dersom du lastar ned ei fil som bruker teikn i filnamnet som det lokale operativsystemet ikkje nyttar, vil dette valet ...
-#: resources.h:821
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 "Dersom slått på, vil teikn som ikkje er støtta av det lokale "
-"operativsystemet bytast ut i filer som blir lasta ned."
+"operativsystemet verta bytte ut i filer som blir lasta ned."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Breiskjerm"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Ønskjer du at FileZilla skal hugsa passord?"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "&Lagra"
 
@@ -7573,26 +7734,34 @@
 msgid "Wrong line endings"
 msgstr "Feil linjeavslutningar"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ja"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Det ser ut til at du nyttar ein vert som berre bruker IPv6. Denne "
+"rettleiaren støttar ikkje dette miljøet."
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
 "Du nyttar allereie den nyaste utgåva av FileZilla. Søk igjen om ei stund."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Du kan alltid opna dette vindauget igjen frå hjelpemenyen."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Standardporten blir nytta om du lèt portfeltet vera tomt."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7618,18 +7787,18 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Du gav ikkje fila eit nytt namn. Vil du heller skriva over ho?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "Du har vald minst éi symbolsk lenkje."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "Du har vald å endra meir enn ti filer. Vil du verkeleg halda fram?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7638,11 +7807,11 @@
 "fram?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Du må skriva eit vertsnamn."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Du må føra opp ein lokal katalog."
 
@@ -7651,17 +7820,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Du må skriva ei gyldig IP-adresse."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Du må føra opp ein lokal katalog som kan skrivast til."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Du må føra opp eit kontonamn"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Du må skriva eit brukarnamn"
 
@@ -7681,28 +7850,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Du må gje loggfila eit namn."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Du må skriva kommandoen i rett form."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Du må føra opp ein mellomtenarvert."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Du må oppgje eit mellomtenarportnummer mellom 1 og 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Bokmerke kan ikkje vera tomme - du må skriva inn minst éi filbane."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7710,7 +7879,7 @@
 "Du må skriva inn både lokal- og fjernfilbanene for å slå på synkronisert "
 "blaing for dette bokmerket."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7742,44 +7911,49 @@
 "Du bør ikkje ha vanskar med å kopla deg til andre tenarar. Filoverføringar "
 "skal kunna fungera."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "etter"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "før"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "begynner med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytar"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "inneheld"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "inneheld ikkje"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "er ulik"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "sluttar med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "er lik"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "fil"
 
@@ -7797,82 +7971,124 @@
 "Klarte ikkje å starta fzputtygen.\n"
 "Sjå til at programmet finst i same katalogen som FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "Klarte ikkje å starta fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers gav ingen sertifikat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "større enn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "gruppe kan utføra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "gruppe kan lesa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "gruppe kan lesa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "er likt med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "er lagra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "er ikkje lagra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "mindre enn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "samsvarer med regulære uttrykk"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "eigar kan utføra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "eigar kan lesa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "eigar kan skriva"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "ukjent"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "alle kan utføra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "alle kan lesa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "alle kan skriva"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Kopier"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "Bruk &automatisk oppdateringskontroll"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Tal dagar mellom kvar oppdateringskontroll:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(minst 7 dagar)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automatisk oppdateringskontroll"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Sjå etter &beta- og prøveutgåver"
+
+#~ msgid "Cop&y"
+#~ msgstr "Kop&ier"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Skriv eit oppdateringsintervall på minst sju dagar"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Personvernreglar:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d kB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytar (%d.%d kB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytar (%d.%d MB/s)"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Duplisert filternamn"
 
@@ -7880,7 +8096,7 @@
 #~ msgstr "Serienummer:"
 
 #~ msgid "&Speed limits..."
-#~ msgstr "&Fartsgrenser…"
+#~ msgstr "&Fartsgrenser …"
 
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Klarer ikkje å lasta hovudmenyen frå ressursfila"
@@ -7888,9 +8104,6 @@
 #~ msgid "Please enter an upload speedlimit greater or equal to 0 KB/s."
 #~ msgstr "Skriv inn ei opplastingsgrense større eller lik 0 kB/s."
 
-#~ msgid "bytes"
-#~ msgstr "bytar"
-
 #~ msgid "Downloads unlimited."
 #~ msgstr "Inga nedlastingsgrense."
 
@@ -7935,7 +8148,7 @@
 #~ msgstr "Kva som helst av det følgjande"
 
 #~ msgid "Connecting to %s:%d..."
-#~ msgstr "Koplar opp mot %s:%d…"
+#~ msgstr "Koplar opp mot %s:%d …"
 
 #~ msgid "None of the following"
 #~ msgstr "Ingen av dei følgjande"
diff -Nru filezilla-3.5.3/locales/pl_PL.po filezilla-3.7.3~precise/locales/pl_PL.po
--- filezilla-3.5.3/locales/pl_PL.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/pl_PL.po	2013-05-01 03:30:03.000000000 +0000
@@ -1,36 +1,36 @@
 # This file is distributed under the same license as the filezilla package.
 # Michał Trzebiatowski <hippie_1968@hotmail.com>, 2008, 2009, 2010, 2011
+# Krystian Biesaga <krystian.biesaga@gmail.com>, 2013
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: FileZilla 3.5.x\n"
+"Project-Id-Version: FileZilla 3.7.x\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-10-13 01:14+0100\n"
-"Last-Translator: Michał Trzebiatowski <hippie_1968@hotmail.com>\n"
+"POT-Creation-Date: 2013-04-30 22:56+0200\n"
+"PO-Revision-Date: 2013-04-30 22:50+0100\n"
+"Last-Translator: Krystian Biesaga <krystian.biesaga@gmail.com>\n"
 "Language-Team: translationproject.org/team/pl.html <translation-team-"
 "pl@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Polish\n"
-"X-Poedit-Country: poland\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Language: pl_PL\n"
+"X-Poedit-SourceCharset: UTF-8\n"
 "Plural-Forms: nplurals=3; plural=n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
 "|| n%100>=20) ? 1 : 2;\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S upłynęło"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S pozostało"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -49,9 +49,9 @@
 msgstr[1] "%d katalogi"
 msgstr[2] "%d katalogów"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -87,7 +87,7 @@
 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:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d pliki dodane do kolejki"
@@ -100,31 +100,21 @@
 msgstr[1] "%d sekundy"
 msgstr[2] "%d sekund"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Host"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Hasło"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -139,7 +129,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Jeszcze nieważny!"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Użytkownik proxy"
@@ -162,27 +152,17 @@
 msgstr[1] "%s bajty"
 msgstr[2] "%s bajtów"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bajtów"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bajtów (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bajtów (%d.%d KB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bajtów (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bajtów (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -197,7 +177,7 @@
 "Proszę pobrać FileZilla ponownie. Jeśli problem będzie się powtarzał, wyślij "
 "raport błędów."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -220,152 +200,148 @@
 msgid "%s with %d bits"
 msgstr "%s z %d bitów"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nazwa użytkownika"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Hasło proxy"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "&O FileZilla..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
 msgstr "&Konto:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Aktywny"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
 msgstr "&Dodaj zakładkę..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "&Dodaj pliki do kolejki"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "&Dodaj plik klucza..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "&Dodaj do kolejki"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
 msgstr "&Określ przesunięcie czasu serwera:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "&Zawsze ufaj certyfikatowi w kolejnych sesjach."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Zawsze ufaj temu hostowi, dodaj ten klucz do pamięci podręcznej"
 
-#: resources.h:939
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "&Zawsze używaj domyślnego edytora"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "&Zawsze używaj wyboru dla nieskojarzonych plików"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "&Zawsze wykonuj tę akcję"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Pytaj system operacyjny o zewnętrzny adres IP"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "&Automatyczny"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "&Wykryj automatycznie"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "&Binarny"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Prefiksy binarne o &symbolach SI (np. 1 KB = 1024 bajty)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Zakładki"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Przeglądaj..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Odporność na przerwanie"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "&Anuluj"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
 msgstr "Sprawdzaj dostępność wersji beta FileZilla"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
 msgstr "&Wyczyść prywatne dane..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "&Zamknij FileZilla"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
 msgstr "&Konfiguruj limity prędkości..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Konfiguruj..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Połącz"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopiuj"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopiuj aktualne połączenie do Menadżera Stron..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "&Kopiuj do schowka"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "&Zawieś"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "Utwórz &katalog"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "Otwórz nową kartę"
 
@@ -373,168 +349,168 @@
 msgid "&Debug"
 msgstr "Debuger"
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "Informacje o debugu w dzienniku &wiadomości:"
 
-#: resources.h:932
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "&Domyślny edytor:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "&Domyślna akcja, jeśli plik już istnieje..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
 msgstr "&Opóźnienie między nieudanymi próbami logowania:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "U&suń"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
 msgstr "U&suń symlinka"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Porównywanie katalogów"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Odrzuć plik lokalny, pobierz ponownie i edytuj na nowo"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "&Rozłącz"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "&Odłącz od serwera"
 
-#: resources.h:875
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Pokazuj chwilową prędkość transferu zamiast średniej prędkości"
 
-#: resources.h:897
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Pokazuj rozmiar w bajtach"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "&Nie zapisuj haseł"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Nie pokazuj więcej tego okna."
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "Nie używaj &zewnętrznego adresu IP przy połączeniach lokalnych."
 
-#: resources.h:919
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "Akcja &dwukrotnego kliknięcia na plikach:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "&Pobierz"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "&Pobierz do:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
 msgstr "&Pobierz..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "&Pobierania:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "&Edytuj"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
 msgstr "&Edytuj reguły filtrów..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Włącz"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "&Włącz automatyczne sprawdzanie aktualizacji"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "&Włącz limity prędkości"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "K&odowanie:"
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
 msgstr "&Szyfrowanie:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
 msgstr "&Wprowadź dowolne polecenie..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
 msgstr "&Wykonanie"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "&Eksportuj wpisy Menadżera Stron"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "&Eksportuj..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "&Powróć do trybu aktywnego"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Plik"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Atrybuty pliku..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "&Prawa pliku..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Plik:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "&Warunki filtrów:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Zestawy filtrów:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Filtry:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Zakończ"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "&Zakończ edycję i skasuj plik lokalny"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -542,478 +518,486 @@
 "&Omijaj zdalne ścieżki, pobierz wszystkie zawarte pliki bezpośrednio do "
 "katalogu docelowego"
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr "Ś&ledź symlinka, usuń zawartość katalogu docelowego"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
 msgstr "Po&bierz zewnętrzny adres IP z następującego adresu:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Pomoc..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Globalna zakładka"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 z użyciem metody CONNECT"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "Pomo&c"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "&Ukryj identyczne pliki"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&Najwyższy"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
 msgstr "Naj&wyższy dostępny port:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Serwer:"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Prefiksy w p&ostaci symboli IEC (np. 1 KiB = 1024 bajty)"
 
-#: resources.h:886
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (przykład: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Importuj..."
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "Dziedzicz &systemowe skojarzenia plików"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 "&Zachowaj strukturę zdalnej ścieżki w stosunku do głównego wyszukiwania"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "&Układ paneli plików i katalogów:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Ogranicz porty lokalne używane przez FileZilla"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "&Ogranicz liczbę jednoczesnych połączeń"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "D&rzewo lokalnych katalogów"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "&Lokalny katalog:"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Log to file"
 msgstr "&Dziennik do pliku"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
 msgstr "Typ logo&wania:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "Typ logo&wania:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "Ni&ski"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
 msgstr "&Zarządzaj zakładkami..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "&Ręczny transfer..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&Maksymalna liczba połączeń:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&Maksymalna liczba ponownych prób:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "&Dziennik wiadomości"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "&Minimalizuj do zasobnika"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Imię:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
 msgstr "&Kreator konfiguracji sieci..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "&Nowy"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "&Nowy adres"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Dostępna jest nowa wersja!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Dalej >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Nie"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Brak"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "No&rmalny"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Liczba dni między sprawdzeniami aktualizacji:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "Wartość numeryczna:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Otwórz"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "&Zamień"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Pasywny"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Hasło:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "O&degraj dzwięk"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "&Pozycja dziennika wiadomości:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Zachowaj daty przesyłanych plików"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "&Kolejka"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "S&zybkie łączenie"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "Pasek &szybkiego łączenia"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Odczyt"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "&Połącz ponownie"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Odśwież"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
 msgstr "&Zapamiętaj hasło dla tej sesji"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "&Pamiętaj hasła"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "&Zdalny katalog:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Zdalna ścieżka:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Usuń"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "&Usuń klucz"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "&Usuń zaznaczone"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "Zm&ień nazwę"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "Zm&ień nazwę..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
 msgstr "&Otwórz ponownie plik lokalny"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "&Zamień nieprawidłowe znaki na:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "&Zgłoś błąd..."
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "Z&resetuj wszystkie pliki i ponownie dodaj do kolejki"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "&Zrestartuj kreatora"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "&Wznów"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "&Wprowadź polecenie..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
 msgstr "Uruchom kreatora &konfiguracji..."
 
-#: resources.h:950
+#: resources.h:976
 msgid "&Run update check now..."
 msgstr "&Sprawdź dostępność aktualizacji..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
 msgstr "&Zapisz jako..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Szukaj"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
 msgstr "&Szukaj zdalnych plików..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "&Wybierz wpis:"
 
-#: resources.h:930
+#: resources.h:951
 msgid "&Select language:"
 msgstr "&Wybierz język:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "&Wybierz kolumny, które mają być widoczne:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Serwer"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "&Ustawienia"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "&Ustawienia..."
 
-#: resources.h:965
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "Pokaż menu &debugera"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "&Pokaż wiadomość"
 
-#: resources.h:955
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "&Pokaż daty w dzienniku wiadomości"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "&Menadżer Stron..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "Zakładka konkretnej &strony"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "&Pomiń"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "&Limity prędkości"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "&Natychmiast rozpocznij transfer"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Zamień miejscami panel lokalny i panel serwera"
 
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "Szyfrowanie &TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testuj"
 
-#: resources.h:878
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Styl:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
 msgstr "&Transfer"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "&Tryb transferu:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "&Kolejka transferów"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Tra&ktuj pliki zaczynające się od kropki jako pliki ASCII"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Zakończ edycję"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "&Uaktualnij klucz zapisany w pamięci podręcznej dla tego hosta"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Wyślij"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "&Wysyłania:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "&Użyj własnego programu"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "Użyj &synchronizowanego przeglądania"
 
-#: resources.h:934
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "&Użyj domyślnego edytora systemu dla plików tekstowych"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "&Użyj następującego adresu IP:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "&Użyj zewnętrznego adresu IP serwera"
 
-#: resources.h:901
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "&Użyj separatora tysięcy"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
 msgstr "&Użytkownik:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
 msgstr "&Nazwa użytkownika:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "Wersja %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "&Podgląd"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Podgląd/Edycja"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Sprawdzaj lokalnie edytowane pliki i pytaj, czy przesłać zmiany"
 
-#: resources.h:136
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "&Sprawdzaj dostępność aktualizacji dla:"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Zapis"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Tak"
 
@@ -1031,11 +1015,27 @@
 msgstr "'%s' nie jest katalogiem."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Typ logowania 'Konto' nieobsługiwany przez wybrany protokół"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Typy logowania 'Normalny' i 'Konto' są niedostępne, zostanie użyta opcja "
+"'Pytaj o hasło'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Typy logowania 'Normalny' i 'Konto' są niedostępne. Zmieniono opcję na "
+"'Pytaj o hasło'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1054,120 +1054,116 @@
 msgstr[1] "(%d obiekty filtrowane)"
 msgstr[2] "(%d obiektów filtrowanych)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(0 dla braku limitu)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekund)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 aby wyłączyć)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(Minimum 7 dni)"
-
-#: resources.h:894
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(przykład: %H:%M)"
 
-#: resources.h:888
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(przykład: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(w %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", pozostało %H:%M:%S"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", pozostało --:--:--"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
 msgstr "- Zepsuty router i/lub firewall"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- Plik uszkodzony na serwerze lustrzanym"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- Malware na twoim komputerze"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- pozostało"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c nie może być używane wraz z adresem typu FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l może być używane jedynie wraz z adresem typu FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s i -c nie mogą być używane jednocześnie."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s nie może być używane wraz z adresem typu FTP."
 
-#: resources.h:967
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Brak"
 
-#: resources.h:968
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Ostrzeżenia"
 
-#: resources.h:969
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Informacje"
 
-#: resources.h:970
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Szczegółowe"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-bitowy system"
 
-#: resources.h:971
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Debuger"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-bitowy system"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Wstecz"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1178,17 +1174,18 @@
 "Zakładka z podaną nazwą już istnieje. Proszę wpisać jeszcze niewykorzystaną "
 "nazwę."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Domyślny edytor musi zostać ustawiony."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 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."
 
-#: resources.h:677
+#: resources.h:697
 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 "
@@ -1198,29 +1195,29 @@
 "tych przypadkach musisz użyć trybu aktywnego. W trybie aktywnym FileZilla "
 "otwiera port i wysyła do serwera prośbę o połączenie."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Wcześniej otwarty plik został zmieniony."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Plik o tej nazwie jest już edytowany. Otworzyć ponownie '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Plik o tej nazwie jest już przesyłany."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Plik o tej nazwie jest wciąż edytowany. Proszę go zamknąć i spróbować "
 "ponownie."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1235,11 +1232,11 @@
 "plików.\n"
 "Ostrzeżenie nie zostanie ponownie wyświetlane podczas tej sesji."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
 msgstr "Dostępna jest nowa wersja FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1248,7 +1245,7 @@
 "niektóre serwery mogą ukrywać pliki przed użytkownikiem. Uzyj tej opcji, aby "
 "wymusić pokazywanie wszystkich plików przez serwer."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1265,15 +1262,15 @@
 "Wyłączyc synchronizowane przeglądanie i kontynuować zmianę lokalnego "
 "katalogu?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "D&odaj"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
 msgstr "&Pozwól na wznawianie plików ASCII"
 
@@ -1285,55 +1282,55 @@
 msgid "A&pply only to uploads"
 msgstr "Zastosuj tylko dla wysyłań"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "Zastosuj dla wszystkich plików i katalogów"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
 msgstr "A&utomatycznie usuń udane transfery"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "Przerwij poprzednie połączenie i połącz się w bieżącej karcie"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "O FileZilla"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Powyżej listy plików"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Akcja po wykonaniu zadań z &kolejki"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Akcja dla zaznaczonego pliku:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Akcja do wykonania:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "&Akcja:"
 
@@ -1366,23 +1363,23 @@
 "Testy trybu aktywnego nie powiódł się. FileZilla zna prawidłowy zewnętrzny "
 "adres IP, ale został on zmodyfikowany przez twój router lub firewall."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
 msgstr "Aktywny tryb IP"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
 msgstr "Dodaj pliki tylko do &kolejki"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Dodaj zaznaczony katalog do kolejki"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Dodaj zaznaczone pliki i katalogi do kolejki wysyłania"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Dodaj do kolejki"
 
@@ -1390,27 +1387,42 @@
 msgid "Address type not supported"
 msgstr "Typ adresu nieobsługiwany"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Zaawansowane"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Opcje zaawansowane:"
 
-#: resources.h:338
+#: resources.h:975
+#, fuzzy
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Wskazówka: O ile nie chcesz testować nowych funkcji, używaj tylko stabilnych "
+"wersji. Wersje beta oraz codzienne kompilacje są przeznaczone wyłącznie do "
+"testów. Codzienne kompilacje programu FileZilla mogą nie działać zgodnie z "
+"oczekiwaniami i istnieje ryzyko uszkodzenia twojego systemu. Używasz wersji "
+"beta oraz codziennych kompilacji na własne ryzyko."
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Algorytm:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Wszystkie pliki zostały wysłane pomyślnie"
 
-#: resources.h:706
+#: resources.h:726
 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:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, 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."
@@ -1421,19 +1433,19 @@
 msgstr[2] ""
 "Wszystkie transfery się zakończyły. Transfer %d plików się nie powiódł"
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Pozwól na powrót do innego trybu transferu po &niepowodzeniu"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Pozwól na powrót do innego trybu transferu po niepowodzeniu"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Już połączono"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1441,7 +1453,7 @@
 "Do zarządzania kluczami można również użyć narzędzia Pageant z PuTTY."
 "FileZilla rozpoznaje program Pageant."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1449,7 +1461,7 @@
 "Alternatywnie, możesz użyć systemowego agenta SSH. By to zrobić, upewnij "
 "się, że ustawiona jest zmienna środowiskowa SSH_AUTH_SOCK."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1457,7 +1469,7 @@
 "Alternatywnie, wejdź na http://filezilla-project.org, by pobraćnajnowszą "
 "wersję."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1466,7 +1478,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1475,7 +1487,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:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1483,26 +1495,26 @@
 "W lokalizacji docelowej istnieje już obiekt o takej samej nazwie, jak obiekt "
 "przeciągany."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonimowy"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "Trwa już inna zdalna operacja, nie można teraz zmieniać katalogu."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 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/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1510,58 +1522,58 @@
 "Wszelkie zmiany dokonane w Menedżerze Stron nie zostaną zapisane, dopóki nie "
 "naprawisz pliku."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Wszelkie zmiany dokonane w filtrach nie zostaną zapisane."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
 msgstr "Zastosuj tylko do katalogów"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Zastosuj"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
 msgstr "Zastosuj tylko do bieżącej kolejki"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
 msgstr "Zastosuj tylko do plików"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Archiwum"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Jako karta w panelu kolejki transferu"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Pytaj o akcję"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Pytaj o hasło"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
 msgstr "Pytaj system operacyjny o port."
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "Pytaj system operacyjny o zewnętrzny adres IP"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "Zadawanie pytań na forum FileZilli"
 
@@ -1569,39 +1581,35 @@
 msgid "Associated program not found:"
 msgstr "Skojarzony program nie został znaleziony:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Przynajmniej jeden warunek filtra jest niekompletny"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "Na tę chwilę, wszystkie wymagane informacje zostały zebrane."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atrybut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Uwierzytelnianie nie powiodło się."
 
-#: resources.h:879
+#: resources.h:900
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Automatyczny"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Automatyczna klasyfikacja typów plików"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Automatyczne sprawdzanie aktualizacji"
-
-#: resources.h:883
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Dostępne rozmiary"
 
@@ -1610,66 +1618,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
 msgstr "&Obejście proxy"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Podstawowe instrukcje użytkowania"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Zachowanie"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "W edycji"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Przeprowadź Benchmark stringa coalescer"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Uważaj! Certyfikat został unieważniony"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "Binarny"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Tablica"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Zakładka"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Zakładka:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Zakładki"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Data kompilacji:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Informacje o kompilacji"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "Kategoria biznes:"
 
-#: resources.h:752
+#: resources.h:772
 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, "
@@ -1679,63 +1687,63 @@
 "jakikolwiek wolny port lokalny. Jeśli chcesz ograniczyć liczbę portów "
 "używanych przez FileZilla, wprowadź zakres portów poniżej."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "Anuluj &bieżącą operację"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Sprawdzaj codzienne kompilacje FileZilla"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "Wy&czyść wszystkie"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Kopiuj adres(y) do schowka"
 
-#: resources.h:887
+#: resources.h:908
 msgid "C&ustom"
 msgstr "&Własny"
 
-#: resources.h:942
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "&Własne skojarzenia plików:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Obliczanie przesunięcia czasu serwera..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Nie można odczytać pliku"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Nie można zapisać danych do pliku."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Nie można zapisać danych do pliku: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "Anuluj"
 
-#: resources.h:989
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Anuluj bieżącą operację"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Anuluje bieżącą operację"
 
@@ -1746,11 +1754,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:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Nie można dodać serwera do Menadżera Stron"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1766,30 +1774,30 @@
 "Nie można porównać katalogów, użyte są różne filtry dla lokalnego i zdalnego "
 "katalogu."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Nie można porównać katalogów, nie podłączono do serwera."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Nie można utworzyć nowego filtra."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Nie można edytować pliku"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 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:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Nie można edytować pliku, zdalna ścieżka nieznana."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1797,8 +1805,8 @@
 "Nie można nawiązać połączenia FTP z serwerem SFTP. Wybierz odpowiedni "
 "protokół."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Nie można załadować paska szybkiego łączenia z pliku z zasobami"
 
@@ -1810,44 +1818,48 @@
 msgid "Cannot load keyfile"
 msgstr "Nie można załadować pliku klucza"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 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:463
+msgid "Cannot remember password"
+msgstr "Nie można zapamiętać hasła"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Nie można zmienić nazwy wpisu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Nie można zmienić nazwy pliku"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Nie można zapisać zbioru filtrów"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Nie można wybrać filtra"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Nie można ustawić skojarzenia pliku"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Nie można wyświetlić okna"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Nie można wyświetlić/edytować zaznaczonego pliku"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Kategorie"
 
@@ -1855,60 +1867,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certyfikat oraz dane sesji nie są jeszcze dostępne."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
 msgstr "Szczegóły certyfikatu"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Certyfikat w łańcuchu:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Wystawca certyfikatu"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Żądanie:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Zmień atrybuty pliku"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Zmień prawa dostępu do pliku."
 
-#: resources.h:963
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "Zmiana ustawień pliku dziennika wymaga ponownego uruchomienia FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problem z kodowaniem znaków"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Kodowanie"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "Sprawdzaj dostępność wersji &beta i release candidate"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
 msgstr "&Sprawdź dostępność aktualizacji..."
 
-#: resources.h:551
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Sprawdzaj dostępność &aktualizacji programu FileZilla automatycznie:"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
 msgstr "Sprawdź dostępność nowszej wersji FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Sprawdź dostępność aktualizacji"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Sprawdzenie dostępności aktualizacji nieudane"
 
@@ -1916,21 +1928,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Sprawdzanie zewnętrznego adresu IP"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
 msgstr "Sprawdzanie aktualizacji"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Niezgodność sumy kontrolnej pobranego pliku."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Wybierz domyślny katalog lokalny"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Wybierz lokalny katalog"
 
@@ -1938,43 +1950,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Fragment danych niepoprawnie zakończony"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Szyfr:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "Z&amknij kartę"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Klasyczny"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "&Wyczyść wpisy Menadżera Stron"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "Wy&czyść pamięć podręczną układu okien"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "Wyczyść &historię połączeń"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "Wyczyść i&nformacje o ponownych połączeniach"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Wyczyść &kolejkę transferów"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Wyczyść historię"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1982,11 +1994,11 @@
 msgid "Clear private data"
 msgstr "Wyczyść prywatne dane"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Wyczyść pasek szybkiego łączenia"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Wyczyść stringa coalescer"
 
@@ -1994,24 +2006,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Kliknij na Zakończ, aby zapisać swoją konfigurację."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Kliknij Dalej, aby pobrać nową wersję."
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "MAC klienta dla serwera:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "Szyfr klienta dla serwera:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "Zamknij wszystkie inne karty"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Zamknij FileZilla"
 
@@ -2019,11 +2031,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Zamknij wszystkie uruchomione kopie FileZilla"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Zamyka bieżącą kartę"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "K&omentarze:"
 
@@ -2031,11 +2043,11 @@
 msgid "Column properties"
 msgstr "Właściwości kolumn"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Ustawienia kolumn"
 
-#: resources.h:937
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 "Polecenie i jego argumenty powinny być poprawnie umieszczone w cudzysłowach."
@@ -2055,9 +2067,9 @@
 msgstr "Polecenie nieobsługiwane przez ten protokół"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Polecenie:"
 
@@ -2065,7 +2077,7 @@
 msgid "Comment"
 msgstr "Komentarz"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Aktualna nazwa:"
 
@@ -2074,15 +2086,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Połączenie zniekształcone przez router lub firewall"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "Porównaj czas &modyfikacji"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Porównaj &rozmiar pliku"
 
-#: resources.h:917
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Próg poró&wnywania (w minutach):"
 
@@ -2090,60 +2102,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Wartość progu porównywania musi być między 0 a 1440 minut."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Skompilowano dla:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Skompilowano na:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Skompilowano z:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Flagi kompilatora:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Skompresowany"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Jednoczesne transfery"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Warunki rozróżniają małe i duże litery"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Test konfiguracji"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
 msgstr "Konfiguracja trybu pasywnego"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
 msgstr "Konfiguracja zakresu portów"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "Konfiguracja FileZilli i twojej sieci"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Potwierdź usunięcie"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Wymagane potwierdzenie"
 
@@ -2151,7 +2163,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Gratulacje, wygląda na to, że twoja konfiguracja działa."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Połącz z pominięciem ustawień serwera proxy"
 
@@ -2159,34 +2171,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Połącz do podanego serwera z Menadżera Stron"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Połączono"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Łączenie"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Łączenie z %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Łączenie z %s przez proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Łączenie z %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Łączenie z serwerem"
 
@@ -2194,17 +2206,17 @@
 msgid "Connection"
 msgstr "Połączenie"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
 msgstr "Nieudana próba połączenia"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Nieudana próba połączenia z \"%s\"."
@@ -2218,12 +2230,12 @@
 msgid "Connection closed"
 msgstr "Połączenie zamknięte"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Połączenie zakończone przez serwer"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Połączenie nawiązane, inicjowanie TLS..."
@@ -2232,7 +2244,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Połączenie nawiązane, wysyłanie żądania HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Połączenie nawiązanie, oczekiwanie na wiadomość powitalną..."
 
@@ -2248,15 +2260,15 @@
 msgid "Connection refused"
 msgstr "Połączenie odrzucone"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Przekroczony czas oczekiwania na połączenie"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Przekroczony czas oczekiwania na połączenie."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Połączenie z serwerem przerwane."
 
@@ -2277,27 +2289,23 @@
 msgid "Convert keyfile"
 msgstr "Przekształć plik klucza"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Kopiuj"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopiowanie (%d) z %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopiowanie z %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Kopiuj adresy wybranych przedmiotów do schowka."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Nie można nawiązać połączenia: %s"
@@ -2307,16 +2315,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Nie można dodać połączenia do Menadżera Stron"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Nie można ukończyć operacji"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Nie można połączyć się z serwerem"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nie można połączyć się z serwerem: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Nie można przetworzyć polecenia na kodowanie serwera"
 
@@ -2325,17 +2337,17 @@
 msgid "Could not convert private key"
 msgstr "Nie można przekształcić prywatnego klucza"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Nie można skopiować adresów"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Nie można skopiować danych"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2345,11 +2357,11 @@
 "Rozszerzenie shella nie jest poprawnie zainstalowane lub nie upuściłeś "
 "plików na okno Explorera."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Nie można nawiązać połączenia z serwerem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2361,11 +2373,11 @@
 "datadir <ścieżka>' lub przez ustawienie wartości zmiennej środowiskowej "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Nie można wygenerować własnej sekwencji logowania."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2373,7 +2385,7 @@
 "Nie można otrzymać nazwy wydawcy certyfikatu, gnutls_x509_get_issuer_dn nie "
 "powiodło się"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2381,7 +2393,7 @@
 "Nie można otrzymać nazwy podmiotu certyfikatu, gnutls_x509_get_dn nie "
 "powiodło się"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Nie można uzyskać pełnej ścieżki zdalnej."
 
@@ -2390,17 +2402,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Nie można pobrać odpowiedzi z fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2428,7 +2440,7 @@
 msgid "Could not load private key"
 msgstr "Nie można załadować prywatnego klucza"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2439,7 +2451,7 @@
 "s'.\n"
 "Wyłączyć synchronizowane przeglądanie i kontynuować zmianę katalogu zdalnego?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2461,9 +2473,9 @@
 "s'.\n"
 "Synchronizowane przeglądanie zostało wyłączone."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Nie można otworzyć schowka"
 
@@ -2478,11 +2490,11 @@
 msgid "Could not parse remote path."
 msgstr "Nie można zanalizować zdalnej ścieżki."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Nie można zanalizować adresu serwera:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Nie można czytać z gniazda: %s"
@@ -2491,12 +2503,12 @@
 msgid "Could not read server item."
 msgstr "Nie można odczytać elementu serwera."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Nie można przejść na koniec pliku"
 
@@ -2504,22 +2516,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Nie można wysłać polecenia do fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Nie można utworzyć wątku IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Nie można zacząć wymiany danych powitalnych z serwerem proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Nie można rozpocząć transferu"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2539,7 +2551,7 @@
 msgstr ""
 "Nie można zapisać \"%s\", globalne zakładki nie mogły zostać zapisana: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2548,15 +2560,15 @@
 "Nie można zapisać \"%s\", kolejka nie mogła zostać zapisana.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Nie można zapisać \"%s\", wybrane witryny nie mogły być wyeksportowane: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Nie można zapisać \"%s\": %s"
@@ -2566,7 +2578,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Nie można zapisać pliku klucza: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Nie można zapisać do pliku lokalnego"
 
@@ -2576,37 +2588,49 @@
 msgid "Could not write to log file: %s"
 msgstr "Nie można zapisać do pliku dziennika: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Nie można zapisać do gniazda: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Kraj:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "Ciągle zawiesza FileZilla. Używane tylko do debugowania wyjątków."
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "Utwórz &nowy plik"
+
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Utwórz nowy podkatalog w bieżącym katalogu"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Utwórz nowy pusty plik w aktualnym katalogu"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Utwórz katalog"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Utwórz pusty plik"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Tworzenie katalogu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Tworzenie katalogu '%s'..."
@@ -2624,7 +2648,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2646,52 +2670,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Bieżący typ transferu jest ustawiony na binarny."
 
-#: resources.h:773 resources.h:893
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "Włas&ne"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Własny zestaw filtrów"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Własny serwer"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "Typ d&anych"
 
-#: resources.h:900
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Prefiksy &dziesiętne, używające symboli SI (np. 1 KB = 1000 bajtów)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "&Domyślny"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "&Usuń"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Deaktywuj wszystkie"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "&Nie zapisuj haseł"
 
-#: resources.h:924
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "Akcja &dwukrotnego kliknięcia na katalogach:"
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr "&Duplikuj"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Wirtualne ścieżki w stylu DOS"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Niebezpieczny typ pliku"
 
@@ -2699,16 +2727,16 @@
 msgid "Data"
 msgstr "Dane"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Gniazdo danych zamknięte zbyt wcześnie."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Data"
 
-#: resources.h:884
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Format daty"
 
@@ -2727,11 +2755,11 @@
 msgid "Debug"
 msgstr "Debuger"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Ustawienia debugowania"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Domyślny katalog lokalny:"
 
@@ -2739,19 +2767,19 @@
 msgid "Default (Autodetect)"
 msgstr "Wykryj automatycznie"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Domyślny edytor niepoprawnie wywołany z cytowaniem."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Domyślna akcja dla istniejącego pliku"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Domyślny katalog zdalny:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2763,15 +2791,15 @@
 msgid "Default system language"
 msgstr "Domyślny język systemu"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
 msgstr "Domyślny tryb transferu:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Domyślny tryb transferu:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Domyślnie: http://ip.filezilla-project.org/ip.php"
 
@@ -2800,57 +2828,57 @@
 "Opóźnianie połączenia na %d sekund z powodu wcześniejszej nieudanej próby "
 "połączenia..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Wyczyść wpis Menadżera Stron"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Usuń zaznaczony katalog"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Usuń zaznaczone pliki i katalogi"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Usuwanie katalogów"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Usuwanie kilku niepowiązanych katalogów nie jest jeszcze obsługiwane"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Usuwanie linka symbolicznego"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Pulpit"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
 msgstr "Szczegóły"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
 msgstr "Szczegóły nowego klucza:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "&Katalogi"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Kierunek"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Katalog"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Porównywanie katalogów"
 
@@ -2870,11 +2898,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Listowanie katalogów przerwane przez użytkownika"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Listowanie katalogów nieudane"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Filtry listy katalogów"
 
@@ -2882,17 +2910,17 @@
 msgid "Directory listing successful"
 msgstr "Listowanie katalogów zakończone pomyślnie"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "Deaktywuj wszystkie"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2900,50 +2928,49 @@
 "Wyłącz tę opcję ponownie, jeśli nie będziesz widzieć prawidłowej zawartości "
 "katalogu."
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Odłącz od serwera"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Odłączono od serwera"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Odłączono od serwera: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Odłączanie od poprzedniego serwera"
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Odłącza od aktualnie widocznego serwera"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "Pokaż okno O FileZilla"
 
-#: resources.h:933
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "&Nie używaj domyślnego edytora"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "Brak &akcji"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2951,8 +2978,8 @@
 "Na pewno chcesz sprawdzać dostępność wersji beta?\n"
 "Jeśli nie chcesz testować nowych opcji, używaj stabilnych wersji."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Czy na pewno chcesz zamknąć FileZilla?"
 
@@ -2967,7 +2994,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Czy na pewno chcesz usunąć wszystkie wpisy Menadżera Stron?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Czy na pewno chcesz usunąć zaznaczony wpis?"
 
@@ -2975,32 +3002,32 @@
 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:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Czy na pewno chcesz wysłać '%s' do serwera?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Dokumentacja"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "Nie używaj zewnętrznego adresu IP przy połączeniach lokalnych."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "Plik zaczynający się od kropki to np. .htaccess"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Akcja dwukrotnego kliknięcia"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "Pobieranie"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "Limit pobierania:"
 
@@ -3013,41 +3040,50 @@
 msgid "Download limit: none"
 msgstr "Limit pobierania: brak"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Pobierz wyniki wyszukiwania"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Pobierz zaznaczony katalog"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Pobierz zaznaczone pliki i katalogi"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Prędkość pobierania: %s/s\n"
+"Prędkość wysyłania: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Pobieranie"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Pobieranie %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Pobieranie wyników wyszukiwania"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3056,60 +3092,64 @@
 "Operacja drag&drop pomiędzy różnymi instancjami FileZilla nie została "
 "jeszcze zaimplementowana."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Operacja drag&drop pomiędzy różnymi serwerami nie została jeszcze "
 "zaimplementowana."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr "Dupl&ikuj"
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "Aktywuj wszystkie"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "Podaj &katalog"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "Wy&konaj"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "&Zakończ"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Każdy filtr potrzebuje przynajmniej jednego warunku."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Edytuj filtry"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Edytuj plik za pomocą zdefiniowanego edytora i wyślij zmiany na serwer."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Edytowanie nie powiodło się"
 
-#: resources.h:881
+#: resources.h:902
 msgid "Email:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Puste polecenie"
 
@@ -3117,7 +3157,7 @@
 msgid "Empty command."
 msgstr "Puste polecenie."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Pusta lista katalogów"
 
@@ -3129,101 +3169,113 @@
 msgid "Empty file extension."
 msgstr "Puste rozszerzenie pliku."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Puste nazwy filtra nie są dozwolone."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Pusta nazwa"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Pusty ciąg."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "Aktywuj wszystkie"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "Włącz &filtrowanie nieprawidłowych znaków"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Zaszyfrowany"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
 msgstr "Szyfrowanie"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
 msgstr "Szczegóły szyfrowania"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Zakończyć porównywanie i zmienić porządek sortowania?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
 msgstr "&Wprowadź dowolne polecenie..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Wpisz 0 dla nieograniczonej prędkości."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Wprowadź polecenie"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Wprowadź dowolne polecenie"
 
-#: resources.h:925
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Podaj katalog"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Wprowadź nazwę filtra"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Wprowadź nazwę zestawu filtrów"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Wprowadź nową nazwę zestawu filtrów"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Wprowadź hasło"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Podaj zaznaczony katalog"
 
-#: resources.h:719
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Wprowadź adres serwera.\n"
-"Żeby określić protokół serwera, dodaj na początku identyfikator protokołu. "
+"Aby określić protokół serwera, dodaj na początku identyfikator protokołu. "
 "Jeśli nie określisz protokołu, zostanie użyty domyślny protokół (ftp://).\n"
 "Możesz także wprowadzać całe adresy w formie protokół://użytkownik:"
-"hasło@host:port, wartości innych pół zostaną wtedy zamienione."
+"hasło@host:port, wartości innych pół zostaną wtedy zamienione.\n"
+"\n"
+"Wspierane protokoły:\n"
+"- ftp:// dla zwykłego FTP\n"
+"- sftp:// dla protokołu transferu plików SSH\n"
+"- ftps:// dla FTP przez domniemany TLS\n"
+"- ftpes:// dla FTP przez bezpośredni TLS"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3234,7 +3286,7 @@
 "Wprowadź hasło do pliku '%s'.\n"
 "Przekształcony plik nie będzie chroniony hasłem."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3256,7 +3308,7 @@
 msgid "Error importing"
 msgstr "Błąd importowania"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Błąd przy wczytywaniu kolejki"
 
@@ -3265,27 +3317,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Błąd ładowania pliku XML"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Błąd przy zapisywaniu kolejki"
 
@@ -3296,74 +3348,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Błąd zapisywania pliku XML"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Błąd, nazwa pliku nie może być zanalizowana."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Błąd, lokalny plik istnieje, ale nie może być usunięty"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Błąd:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Nawiąż połączenie w nowej karcie"
 
-#: resources.h:944
+#: resources.h:971
+msgid "Every month"
+msgstr "Co miesiąc"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "Co dwa tygodnie"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Przykład: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:924
 msgid "Examples"
 msgstr "Przykłady"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "Wyko&naj"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Plik wykonywalny"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Plik wykonywalny nie zawiera informacji o wersji, nie można sprawdzić "
 "aktualizacji."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Eksplorator"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "Eksportuj &kolejkę"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "Eksportuj &ustawienia"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Eksportuj ustawienia"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "&Nazwa filtra:"
 
@@ -3371,7 +3431,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - protokół transferu plików"
 
@@ -3383,25 +3443,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - niezabezpieczony protokół transferu plików"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Nie zainicjowano silnika FTP, nie można się połączyć"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP Proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "Adres FTP"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3417,26 +3477,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP przez domniemany TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Nie udało się zmienić katalogu"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Nie udało się zmienić języka"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Nie udało się sprawdzić aktualizacji FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Nie udało się skopiować lub przenieść lokalizacji"
 
@@ -3444,46 +3504,46 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Nie udało się stworzyć kopii zapasowej pliku XML"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Nie udało się utworzyć nasłuchującego gniazda, przerywanie"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Nie udało się pobrać aktualizacji FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Nie udało się pobrać ścieżki do katalogu 'Moje dokumenty'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Nie udało się pobrać ścieżki do pulpitu"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Nie udało się otrzymać adresu połączenia danych drugiej strony, połączenie "
 "zakończone."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Nie udało się zainicjować silnika FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Nie udało się zainicjalizować TLS."
@@ -3497,24 +3557,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Nie powiodło sie załadowanie prywatnego klucza: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, 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:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Nie udało się otworzyć \"%s\" do odczytu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Nie udało się otworzyć \"%s\" do zapisu"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Nie można zanalizować zwróconej ścieżki."
 
@@ -3522,7 +3582,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Nie udało się zanalizować zaufanego certyfikatu głównego."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Nie udało się otrzymać danych"
 
@@ -3534,11 +3594,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Nie udało się uzyskać zewnętrznego adresu IP, przerywanie"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Nie udało się uzyskać lokalnego adresu IP."
 
@@ -3554,14 +3614,14 @@
 msgid "Failed to send command."
 msgstr "Nie udało się wysłać polecenia."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3569,28 +3629,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:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, 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:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3600,7 +3660,7 @@
 msgid "Failed to validate settings"
 msgstr "Nie udało się sprawdzić ustawień"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Nie udało się zweryfikować certyfikatu drugiej strony"
 
@@ -3617,21 +3677,19 @@
 msgid "Failed transfers"
 msgstr "Nieudane transfery"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
 msgstr "Wróć do trybu aktywnego."
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "P&lik:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "P&liki"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Plik"
 
@@ -3647,7 +3705,7 @@
 msgid "File editing"
 msgstr "Edycja pliku"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Plik istnieje"
 
@@ -3655,7 +3713,7 @@
 msgid "File exists action"
 msgstr "Akcja dla istniejącego pliku"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Plik został zmieniony"
 
@@ -3663,14 +3721,14 @@
 msgid "File lists"
 msgstr "Listy plików"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Nie znaleziono pliku"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "File search"
 msgstr "Wyszukiwanie plików"
 
@@ -3705,89 +3763,91 @@
 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:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Transfer plików jeszcze trwa."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Plik byłby transferowany z typem danych ASCII."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Plik byłby transferowany z binarnym typem danych."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Błąd FileZilla"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr "FileZilla może teraz przetestować poprawność konfiguracji."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla już jest podłączona do serwera."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla jest uruchomiona w trybie informacyjnym.\n"
-"Typy logowania 'Normalny' i 'Konto' nie są dostępne w tym trybie."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 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."
 
-#: resources.h:517
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "Aktualizacje FileZilla"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "Paski &statusu listy plików"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nazwa pliku"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "&Filtry nazw plików..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Nieprawidłowa nazwa pliku"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Nazwa pliku nie może zawierać żadnego z następujących znaków: / \\ : * ? \" "
+"< > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nazwa pliku niezmieniona"
 
-#: resources.h:307 resources.h:957
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Nazwa pliku:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Nazwy plików nie mogą zawierać żadnego z następujących znaków: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3795,13 +3855,13 @@
 "Nazwa pliku nie może zawierać żadnego z następujących znaków: / \\ : * ? \" "
 "< > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Pliki obecnie edytowane"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Rozmiar pliku"
@@ -3810,68 +3870,68 @@
 msgid "Filesize format"
 msgstr "Format rozmiaru pliku"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Typ pliku"
 
-#: resources.h:945
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Skojarzenia typu plików"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Filtr stosowany do:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Filtruj nieprawidłowe znaki w nazwach plików"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Nazwa filtra już istnieje"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Filtruj pozycje pasujące do wszystkiego z następujących"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr "Filtruj pozycje pasujące do czegokolwiek z następujących"
 
-#: resources.h:223
+#: resources.h:232
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Zbiór filtrów już istnieje"
 
-#: resources.h:995
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Filtruj listy katalogów"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Walidacja filtra nieudana"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Hash (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Hash (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Hash:"
 
@@ -3879,7 +3939,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Kreator konfiguracji firewalla i routera"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3887,12 +3947,12 @@
 "Aby uzyskać bardziej szczegółowe informacje o tym, o robią te opcje, włącz "
 "kreatora konfiguracji sieci."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Dla pewności powinieneś podać przedział zawierający co najmniej 10 portów."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3900,33 +3960,33 @@
 "Dla tej sesji zostaną użyte domyślne ustawienia. Żadne zmiany ustawień nie "
 "zostaną zapamiętane."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
 msgstr "Wymuś &UTF-8"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "Wymuś wyświetlanie plików &ukrytych"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Wymuś wyświetlanie plików ukrytych"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Określenia formatu:"
 
-#: resources.h:943
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Format: Po rozszerzeniu powinno następować prawidłowo cytowane polecenie i "
 "argumenty."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
 msgstr "Dalsza dokumentacja"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Ogólne"
 
@@ -3934,21 +3994,21 @@
 msgid "General SOCKS server failure"
 msgstr "Awaria serwera SOCKS"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Ogólne proxy"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
 msgstr "Pobierz zewnętrzny adres IP z następującego adresu:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Uzyskiwanie pomocy"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Podana nazwa zestawu filtrów już istnieje, nadpisać zestaw filtrów?"
 
@@ -3956,15 +4016,15 @@
 msgid "Global bookmarks"
 msgstr "Globalne zakładki"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Grupowe prawa dostępu"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "&Wysoki"
 
@@ -3972,21 +4032,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP przez TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Ukryty"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Wysoka"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Najwyższy"
 
@@ -3994,26 +4054,26 @@
 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."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Przytrzymaj shift w celu przełączenia stanu filtra jednocześnie dla obu "
 "stron."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Strona domowa:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Hash klucza hosta:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Niezgodność klucza hosta"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Host rozpoczyna się od '[', jednak brakuje nawiasu zamykającego."
 
@@ -4021,20 +4081,20 @@
 msgid "Host unreachable"
 msgstr "Host nieosiągalny"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Host:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "Godzin,"
 
-#: resources.h:892
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (przykład: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 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 "
@@ -4044,11 +4104,11 @@
 "okres dłuższy niż określony czas, połączenie zostanie zamknięte, a FileZilla "
 "spróbuje ponowić połączenie."
 
-#: resources.h:973
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "Jeśli zgłaszasz błędy, dołącz logi z trybem logowania 'Szczegółowe'."
 
-#: resources.h:687
+#: resources.h:707
 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 "
@@ -4060,7 +4120,7 @@
 "skonfigurowany i powinieneś spróbować trybu aktywnego. Możesz ustawić tryb "
 "transferu dla każdego serwera w Menadżerze Stron."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4068,7 +4128,7 @@
 "Jeśli opcja powrotu została zaznaczona, możliwe będzie łączenie się ze źle "
 "skonfigurowanymi serwerami, które odrzucają wybrany tryb transferu."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4091,7 +4151,7 @@
 msgstr ""
 "Jeśli ten problem nie zniknie, jakiś router i/lub zapora przerywa połączenie."
 
-#: resources.h:962
+#: resources.h:987
 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 "
@@ -4101,7 +4161,7 @@
 "zmieniona nazwa przez dodanie \".1\" na końcu nazwy pliku (ewentualnie "
 "zostaną nadpisanie starsze pliki dziennika) i zostanie utworzony nowy plik."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4122,7 +4182,7 @@
 msgstr ""
 "Jeśli ten problem nie zniknie, skontaktuj się z producentem twojego routera."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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 "
@@ -4132,7 +4192,7 @@
 "zsynchronizowany z serwerem. Jeśli istnieje różnica (spowodowana np. inną "
 "strefą czasową), określ przesunięcie w Menadżerze Stron."
 
-#: resources.h:916
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4140,12 +4200,12 @@
 "Jeśli używane jest porównywanie oparte na czasie, przyjmij, że dwa pliki są "
 "jednakowe, jeśli różnica w czasie nie przekracza tego progu."
 
-#: resources.h:931
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
 msgstr ""
 "Jeśli nastąpiła zmiana języka, powinno się ponownie uruchomić FileZilla."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4153,11 +4213,11 @@
 "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:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Jeśli zamkniesz FileZilla, twoje zmiany nie zostaną zapisane."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4165,13 +4225,13 @@
 "Jeśli wprowadzisz złe typy plików, te pliki mogą zostać uszkodzone podczas "
 "transferu."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "Otrzymanie jakichkolwiek błędów będzie oznaczało, że twoja konfiguracja nie "
 "jest poprawna."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4189,7 +4249,7 @@
 "lub firewall może być źle skonfigurowany. W tej sytuacji spróbuj przełączyć "
 "tryb pasywny i skontaktuj się z administratorem serwera."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4197,7 +4257,7 @@
 "Jeśli pomyślnie ukończysz kreatora oraz końcowy test, wszystkie posiadane "
 "firewalle i routery powinny być skonfigurowane prawidłowo."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4205,7 +4265,7 @@
 "Jeśli używasz firewalla, upewnij się, że FileZilla została dopuszczona do "
 "akceptowania połączeń na wszystkich podanych portach."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4224,7 +4284,7 @@
 msgid "Import data from older version"
 msgstr "Importuj dane ze starszej wersji"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Importuj ustawienia"
 
@@ -4238,7 +4298,7 @@
 msgid "Improperly quoted association."
 msgstr "Niepoprawnie zapisane cytowanie w skojarzeniu."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4246,7 +4306,7 @@
 "W trybie aktywnym, FileZilla musi nasłuchiwać na porcie do transferów "
 "danych. Musisz podać, których portów FileZilla ma użyć."
 
-#: resources.h:703
+#: resources.h:723
 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."
@@ -4254,7 +4314,7 @@
 "W sytuacji, gdy masz router, musisz przekierować wszystkie dostępne porty, "
 "jako że FileZilla nie ma wpływu na porty wybierane przez twój system."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4262,7 +4322,7 @@
 "Jeśli wolisz aktualizacje automatyczne, możesz włączyć automatyczne "
 "sprawdzanie aktualizacji w oknie ustawień."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4270,7 +4330,7 @@
 "W celu używania trybu aktywnego, FileZilla musi znać twój zewnętrzny adres "
 "IP."
 
-#: resources.h:676
+#: resources.h:696
 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 "
@@ -4280,7 +4340,7 @@
 "serwer o port i łączy się z podanym portem. Do tego nie potrzeba wiele "
 "konfiguracji."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4288,20 +4348,20 @@
 "Niekompletny łańcuch, górny certyfikat nie jest samopodpisanym certyfikatem "
 "urzędu certyfikacji"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Nieprawidłowe hasło"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Inicjowanie TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Niezabezpieczony serwer, nie obsługuje FTP przez TLS."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktywny"
@@ -4311,8 +4371,8 @@
 msgstr "Interfejs"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
 msgstr "Przerwane przez użytkownika"
 
@@ -4324,8 +4384,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Nieprawidłowa odpowiedź HTTP"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4348,12 +4408,13 @@
 msgid "Invalid date"
 msgstr "Nieprawidłowa data"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Nieprawidłowa nazwa pliku"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Nieprawidłowy host, po nawiasie zamykającym może znajdować się tylko "
@@ -4363,28 +4424,35 @@
 msgid "Invalid input"
 msgstr "Nieprawidłowe wejście"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Nieprawidłowy port. Numer portu musi być liczbą od 1 do 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Podano nieprawidłowy protokół. Poprawne protokoły to:\n"
-"ftp:// dla normalnego FTP,\n"
+"ftp:// dla zwykłego FTP,\n"
 "sftp:// dla protokołu transferu plików SSH,\n"
-"ftps:// dla FTP przez domniemany SSL i\n"
-"ftpes:// dla FTP przez bezpośredni SSL."
+"ftps:// dla FTP przez domniemany TLS i\n"
+"ftpes:// dla FTP przez bezpośredni TLS."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Nieprawidłowe wyrażenie regularne w warunkach wyszukiwania."
 
@@ -4392,7 +4460,7 @@
 msgid "Invalid response code"
 msgstr "Nieprawidłowy kod odpowiedzi"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Nieprawidłowe warunki wyszukiwania: %s"
@@ -4404,38 +4472,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Nieprawidłowy ścieżka adresu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Nieprawidłowy rozmiar w warunku"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nieprawidłowa nazwa użytkownika."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Jurysdykcja kraju:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Jurysdykcja regionalna:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Jurysdykcja państwa lub prowincji:"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Katalogi na wierzchu"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4445,50 +4513,54 @@
 "nieprawidłowe listy jeśli ta opcja jest włączona. FileZilla wykonuje testy, "
 "aby sprawdzić czy serwer obsługuje tę opcję, lecz mogą one się nie powieść."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Wymiana klucza"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+msgid "Key exchange:"
+msgstr "Wymiana klucza:"
+
+#: resources.h:619
 msgid "L&owest"
 msgstr "N&ajniższy"
 
-#: resources.h:929
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Język"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Język zmieniony"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Data modyfikacji"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Układ"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Limit jednoczesnych pobierań:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
 msgstr "Limit jednoczesnych wysyłań:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
 msgstr "Ograniczenia lokalnych portów"
 
-#: resources.h:959
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Limit rozmiaru pliku dziennika"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit:"
 msgstr "Limit:"
 
@@ -4496,7 +4568,7 @@
 msgid "Line length exceeded"
 msgstr "Długość linii przekroczona"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Zlinkowany z"
 
@@ -4505,21 +4577,21 @@
 msgstr "Gniazdo nasłuchujące zamknięte"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Lista:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
 msgstr "&Najniższy dostępny port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokalny"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Lokalny plik"
 
@@ -4535,7 +4607,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Lokalny plik nie jest prawidłową nazwą pliku."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Filtry lokalne:"
 
@@ -4543,7 +4615,7 @@
 msgid "Local site:"
 msgstr "Adres lokalny:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Lokalizacja:"
 
@@ -4551,16 +4623,16 @@
 msgid "Log file"
 msgstr "Plik dziennika"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Dziennik sprawdzania aktualizacji:"
 
-#: resources.h:954
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Logowanie"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4568,7 +4640,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:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4576,13 +4648,13 @@
 "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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Sekwencja logowania została całkowicie wykonana, lecz użytkownik nie jest "
 "zalogowany. Przerywanie."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "Typ loginu musi być 'ask' lub 'interactive' (bez cudzysłowów)."
 
@@ -4595,13 +4667,13 @@
 "Typ loginu musi używany być wraz z adresem typu FTP. Argumentem musi być '%"
 "s' lub '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Niski"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Najniższy"
 
@@ -4609,11 +4681,11 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Upewnij się, że plik jest dostępny i jest poprawnie sformatowanym dokumentem "
@@ -4637,7 +4709,7 @@
 msgstr ""
 "Zniekształcona odpowiedź, serwer nie wysyła odpowiednich zakończeń linii"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4648,58 +4720,58 @@
 msgid "Manual transfer"
 msgstr "Ręczny transfer"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Musi pasować do wszystkich z następujących"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Musi pasować do jakiegokolwiek z następujących"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Musi nie pasować do żadnego z następujących"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "Maksymalna liczba jednoczesnych transferów:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Dziennik wiadomości"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "Pozycja wiadomości dziennika"
 
-#: resources.h:961
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "Minut"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "Przesuń w &dół"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "Przesuń w &górę"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Mój komputer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Moje dokumenty"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Moje strony"
 
@@ -4708,33 +4780,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Nazwa"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Nazwa już istnieje"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Nazwa zakładki już istnieje"
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Nazwa:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Należy wpisać nazwę filtra"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Należy wprowadzić prawidłową ścieżkę zdalną"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Należy wybrać rodzaj kodowania znaków"
 
@@ -4742,19 +4814,23 @@
 msgid "Network unreachable"
 msgstr "Sieć nieosiągalna"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "Nigdy"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "Nowy &katalog"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Nowa &karta"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "Nowa &Zakładka"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4767,41 +4843,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nowa zakładka"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nowy katalog"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nowe funkcje i ulepszenia w %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nowy filtr"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nowy katalog"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Nowy adres"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "Następny w kolejce transferów"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nie"
 
@@ -4809,25 +4885,25 @@
 msgid "No category to export selected"
 msgstr "Nie zaznaczono żadnej kategorii do eksportowania"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Nie podano polecenia, przerywanie."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Brak ustawionego zewnętrznego adresu IP, próbowanie domyślnego."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Żadne pliki nie są obecnie edytowane."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Nie podano nazwy filtra"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Nie podano hosta, podaj host."
 
@@ -4835,26 +4911,26 @@
 msgid "No images available"
 msgstr "Brak dostępnych obrazków"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Brak plików w kolejce!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Nie podano nazwy zbioru filtrów."
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Żaden program nie jest skojarzony z typem pliku"
 
-#: resources.h:420
+#: resources.h:429
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Brak wyników wyszukiwania"
 
@@ -4872,23 +4948,23 @@
 msgid "No username given."
 msgstr "Nie podano nazwy użytkownika."
 
-#: resources.h:923 resources.h:928
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Brak"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Jeszcze nic nie wybrano"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normalna"
 
@@ -4898,15 +4974,15 @@
 msgstr "Nie wszystki pliki mogły zostać wpisane do kolejki do podglądu/edycji."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Nie połączono"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Nie połączono z żadnym serwerem"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Nie połączono z jakimkolwiek serwerem."
 
@@ -4914,20 +4990,20 @@
 msgid "Not connected."
 msgstr "Nie połączony."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 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."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Uwaga: To działa tylko w przypadku nieszyfrowanych połączeń FTP."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Uwaga: Użycie ogólnego proxy wymusza tryb pasywny przy połączeniach FTP."
 
-#: resources.h:902
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Liczba cyfr po przecinku:"
 
@@ -4935,21 +5011,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Liczba ponownych prób musi być między 0 a 99."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "O&twórz plik"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4957,119 +5033,125 @@
 "Na następujących stronach zostanie skonfigurowany wybrany tryb transferu "
 "oraz opcja powrotu, jeśli została wybrana."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Raz"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Do serwera zostaną wysłane jedynie numery używanych przez ciebie wersji "
-"systemu operacyjnego oraz FileZilla."
+#: resources.h:969
+msgid "Once a week"
+msgstr "Raz na tydzień"
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Otwórz katalog w systemowym menedżerze plików"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Otwórz Menadżera Stron"
 
-#: resources.h:564
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Otwórz Menadżera Stron."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Otwiera okno Menedżera Stron. Kliknij prawym klawiszem myszy, aby wyświetlić "
+"listę stron."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Otwórz plik."
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
 msgstr "Otwarcie okna ustawień FileZilla"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Otwarty jako:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Otwarcie nie powiodło się"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Otwiera nową kartę"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Otwiera Menadżera Stron"
 
-#: resources.h:996
+#: resources.h:1022
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Otwiera okno filtrów nazw. Kliknij prawym klawiszem myszy, aby włączyć/"
 "wyłączyć filtry."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "System operacyjny"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Wykryto problem z systemem operacyjnym"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Organizacja:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Inne:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Przegląd"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Z&amień, jeśli źródło nowsze"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Zastąp plik"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Zastąp plik jeśli rożni się rozmiar"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Zastąp plik jeśli rożni się rozmiar lub plik źródłowy jest nowszy"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Zastąp plik jeśli plik źródłowy jest nowszy"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "Zamień, jeśli inny &rozmiar"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Zamień, jeśli inny rozmiar lu&b źródło nowsze"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Prawa właściciela"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Właściciel/Grupa"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5077,7 +5159,7 @@
 "Zapobieganie wchodzenia systemu w tryb stand-by podczas transferów lub "
 "innych operacji"
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Hos&t proxy:"
@@ -5086,27 +5168,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Polecenie PORT zniekształcone przez router lub firewall."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "&Pasywny (zalecany)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paczka"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "Parametr nie jest prawidłowym adresem"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "&Hasło:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "&Pasywny (zalecane)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Tryb pasywny"
@@ -5121,42 +5203,42 @@
 msgid "Password required"
 msgstr "Wymagane hasło"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Ścieżka"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Ścieżki"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "W trakcie usuwania"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Prawo dostępu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Prawa dostępu"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Platforma:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5170,7 +5252,7 @@
 "Sprawdź na http://filezilla-project.org/probe.php czy serwer działa i "
 "ponownie sprawdź ustawienia."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5178,7 +5260,7 @@
 "Sprawdź, czy w menadżerze pakietów twojego systemu są dostępne aktualizacje, "
 "lub odwiedź http://filezilla-project.org, aby pobrać kod źródłowy FileZilla."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5206,7 +5288,7 @@
 msgid "Please enter a custom time format."
 msgstr "Podaj własny format czasu."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5218,20 +5300,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Podaj limit prędkości pobierania większy lub równy 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Podaj nazwę nowego filtra."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Podaj nową nazwę dla skopiowanego filtra."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Podaj nową nazwę dla zestawu filtrów \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Podaj nową nazwę dla filtra."
 
@@ -5252,11 +5334,11 @@
 "transfers."
 msgstr "Podaj liczbę między 1 a 10 dla liczby jednoczesnych transferów."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Podaj hasło do tego serwera:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 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"
@@ -5272,11 +5354,11 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "Podaj limit oczekiwania między 5 a 9999 sekund, lub 0 aby wyłączyć."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Podaj unikalną nazwę dla tego zestawu filtrów"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Podaj nazwę użytkownika do tego serwera:"
 
@@ -5288,17 +5370,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Podaj adres, z którego pobrać twój adres zewnętrzny"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Podaj częstotliwość aktualizacji, minimum 7 dni"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Podaj limit prędkości wysyłania większy lub równy 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5306,14 +5384,18 @@
 "Podaj polecenie FTP.\n"
 "Używanie poleceń FTP wyczyści pamięć podręczną katalogu."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Podaj nazwę katalogu, który powinien zostać utworzony:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Wprowadź nazwę pliku, który powinien zostać utworzony:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Podaj nazwę użytkownika i hasło do tego serwera:"
 
@@ -5332,7 +5414,7 @@
 "Jeśli masz adres dynamiczny lub nie znasz zewnętrznego adresu, użyj opcji "
 "zewnętrznego resolwera."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5348,7 +5430,7 @@
 "Upewnij się, że FileZila została uprawniona do nawiązywania połączeń "
 "wychodzących, i że wprowadziłeś poprawny adres resolwera adresów."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Upewnij się, że wymagany język istnieje w twoim systemie."
 
@@ -5364,7 +5446,7 @@
 "przekierować porty. Nie włączaj twojego routera w tzw. 'tryb DMZ' lub 'tryb "
 "gier'."
 
-#: resources.h:686
+#: resources.h:706
 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 "
@@ -5376,7 +5458,7 @@
 "inne malware. To może wywołać fałszywy alarm, który można bezpiecznie "
 "zignorować."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5384,14 +5466,14 @@
 "Zachowywanie dat plików podczas wysyłania będzie działać tylko dla serwerów "
 "FTP, FTPS i FTPES obsługujących polecenie MFMT."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
 "Niektóre serwery mogą cię zablokować, jeśli próbujesz łączyć się zbyt często."
 
-#: resources.h:889 resources.h:895
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5400,7 +5482,7 @@
 "Szczegóły na stronie http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5417,38 +5499,38 @@
 "Uruchom tego kreatora ponownie, gdy zmienisz środowisko sieciowe lub gdy "
 "nagle napotkasz problemy z serwerami, które uprzednio działały."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Wybierz akcję:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Wybierz kategorie, które chciałyś zaimportować."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Wybierz domyślny tryb transferu, którego chciałbyś użyć."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Wybierz nowe atrybuty dla katalogu \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Wybierz nowe atrybuty dla pliku \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Wybierz nowe atrybuty dla zaznaczonych katalogów."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Wybierz nowe atrybuty dla zaznaczonych plików i katalogów."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Wybierz nowe atrybuty dla zaznaczonych plików."
 
@@ -5466,7 +5548,7 @@
 "routera w tzw. 'tryb DMZ' lub 'tryb gier'. Inspekcja protokołu lub poprawki "
 "protokołu muszą zostać wyłączone."
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5474,24 +5556,24 @@
 "Odwiedź http://filezilla-project.org, aby uzyskać więcej informacji o "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "Odwiedź http://filezilla-project.org, aby pobrać najnowszą wersję."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Kod pocztowy:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Predefiniowane witryny"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Zachowywanie dat plików"
 
@@ -5499,47 +5581,60 @@
 msgid "Preview:"
 msgstr "Podgląd:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Certyfikaty podstawowego połączenia i połączenia danych nie pasują."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Wydrukuj informacje diagnostyczne dotyczące uruchamiania programu FileZilla"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Wydrukuj informacje wersji do stdout i wyjdź"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Nadaj piorytet katalogom (domyślne)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Priorytet"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Polityka prywatności:"
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Polityka prywatności: Do serwera będzie wysyłana tylko wersja programu, "
+"twojego systemu oraz architektura procesora."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "&Klucze prywatne:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "Pro&tokół:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
 msgstr "Hasło pro&xy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "&Rozpocznij"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+msgid "Protocol:"
+msgstr "Protokół:"
+
+#: resources.h:818
 msgid "Proxy &port:"
 msgstr "Po&rt proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
 msgstr "&Użytkownik proxy:"
 
@@ -5547,12 +5642,16 @@
 msgid "Proxy authentication failed"
 msgstr "Uwierzytelnianie proxy nie powiodło się."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Wymiana danych powitalnych z proxy nie powiodła się: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5568,23 +5667,23 @@
 msgstr ""
 "Żądanie proxy nie powiodło się: Nieznany typ adresu w odpowiedzi CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy ustawione, jednak host lub port proxy jest nieprawidłowy"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Uwierzytelnianie kluczem publicznym"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Algorytm klucza publicznego:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Publiczne prawa dostępu"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "Kolejka została całkowicie przetworzona"
 
@@ -5603,39 +5702,39 @@
 msgid "Queue: empty"
 msgstr "Kolejka: pusta"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Pliki w kolejce"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "Kolejkowanie:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "Z&restartuj system"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "Dr&zewo zdalnych katalogów"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "Zr&esetuj zaznaczone pliki i ponownie dodaj do kolejki"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Polecenie FTP"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "O&dczyt"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Odśwież"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Zmi&eń nazwę"
 
@@ -5647,67 +5746,77 @@
 "Ponownie uruchom kreatora i dokładnie sprawdzić swoje ustawienia i "
 "odpowiednio skonfiguruj wszystkie routery i zapory."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "Od&czyt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Tylko do odczytu"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
-msgstr "Naprawdę przerwać bieżącą operację?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Czy na pewno usunąć %d katalog wraz z zawartością?"
-msgstr[1] "Czy na pewno usunąć %d katalogi wraz z zawartością?"
-msgstr[2] "Czy na pewno usunąć %d katalogów wraz z zawartością?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Czy na pewno usunąć %d plik?"
-msgstr[1] "Czy na pewno usunąć %d pliki?"
-msgstr[2] "Czy na pewno usunąć %d plików?"
+msgstr "Naprawdę przerwać bieżącą operację?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Czy na pewno usunąć %s i %s?"
+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] "Czy na pewno usunąć %d katalog z serwera wraz z jego zawartością?"
+msgstr[1] "Czy na pewno usunąć %d katalogi z serwera wraz z ich zawartością?"
+msgstr[2] "Czy na pewno usunąć %d katalogów z serwera wraz z ich zawartością?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Czy na pewno usunąć %d plik z serwera?"
+msgstr[1] "Czy na pewno usunąć %d pliki z serwera?"
+msgstr[2] "Czy na pewno usunąć %d plików z serwera?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, 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:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Naprawdę usunąć wszystkie zaznaczone pliki i/lub katalogi?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Na pewno usunąć wszystkie zaznaczone pliki i/lub katalogi z twojego "
+"komputera?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Powód"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Zrestartuj teraz"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "Przechodź do podkatalogów"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Otrzymano linę powyżej 10000 znaków, przerywanie."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Otrzymane dane zniekształcone"
 
@@ -5720,11 +5829,11 @@
 "połączenia do serwera.\n"
 "Jeśli będziesz kontynuować, połączenie zostanie przewane."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Ustawienia ponownego łączenia"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Łączy z ostatnio używanym serwerem"
 
@@ -5732,34 +5841,38 @@
 msgid "Redirection to invalid address"
 msgstr "Przekierowanie do nieprawidłowego adresu"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Odśwież plik i listę katalogów"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Zapamiętać hasła?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Zdalny"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Zdalny certyfikat nie jest zaufany."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Zdalny plik"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Zdalne wyszukiwanie plików"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Zdalne filtry:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Zdalna ścieżka"
 
@@ -5773,7 +5886,7 @@
 "bezwzględna ścieżka i jest obsługiwana przez typ serwera bieżącej witryny (%"
 "s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5785,7 +5898,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Zdalna ścieżka nie może być zanalizowana. Upewnij się czy jest to poprawna "
@@ -5795,11 +5908,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Zdalna ścieżka nie może być zanalizowana."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Obsługa zdalnej ścieżki:"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Zdalna ścieżka:"
 
@@ -5807,76 +5920,76 @@
 msgid "Remote site:"
 msgstr "Serwer zdalny:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "Usuń &wszystkie"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "Usuń &zaznaczone"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Zmień nazwę pliku"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Zmień nazwę zaznazconego katalogu"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Zmień nazwy zaznaczonych plików i katalogów"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Zmiana nazwy z '%s' na '%s'"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
 msgstr "Zgłoś błędy i propozycje funkcji"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
-msgstr "Wymaga bezpośredni FTP przez TLS"
+msgstr "Wymagaj bezpośredniego FTP przez TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
-msgstr "Wymaga domniemany FTP przez TLS"
+msgstr "Wymagaj domniemanego FTP przez TLS"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Zresetuj &wszystkie pliki i ponownie dodaj do kolejki"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Znajdowanie adresu IP dla %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Znajdowanie nazwy hosta"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Odpowiedź"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Wyniki:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
 msgstr "Wznów transfer pliku"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5884,34 +5997,38 @@
 "Wznawianie plików ASCII może powodować problemy, jeśli serwer używa innych "
 "zakończeń linii niż klient."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Uzyskiwanie listy katalogów..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Otrzymywanie zewnętrznego adresu IP z %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Główny certyfikat nie jest zaufany"
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
 msgstr "&Pokaż obecnie edytowane pliki..."
 
-#: resources.h:609
+#: resources.h:895
+msgid "S&how the Site Manager on startup"
+msgstr "&Wyświetlaj okno Menedżera Stron przy uruchamianiu"
+
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "W&yłącz system"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "S&top"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
 msgstr "S&ynchronizowane przeglądanie"
 
@@ -5919,31 +6036,46 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Zapisać ustawienia?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr ""
+"Zapisywanie hasła zostało wyłączone przez administratora twojego systemu."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Zapisywanie haseł zostało wyłączone przez ciebie."
+
+#: ../../locales/../src/interface/QueueView.cpp:1835
 msgid "Scanning for files to add to queue"
 msgstr "Skanuje w poszukiwaniu plików w celu dodania do kolejki"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
 msgstr "Skanuje w poszukiwaniu plików do wysłania na serwer"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "&Warunki wyszukiwania:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "&Katalog wyszukiwania:"
 
-#: resources.h:1001
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Szukaj plików rekursywnie."
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Szukaj plików na serwerze"
 
@@ -5957,27 +6089,27 @@
 msgstr ""
 "Zobacz również: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Wybierz serwer"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "Wybierz stronę:"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Wybierz styl"
 
-#: resources.h:836
+#: resources.h:856
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Wybierz domyślną akcję do wykonania, jeśli plik docelowy transferu już "
 "istnieje."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Wybierz domyślny edytor"
 
@@ -5997,7 +6129,7 @@
 "Wybierz domyślną akcję do wykonania, jeśli plik docelowy już istnieje, tylko "
 "dla aktualnie zaznaczonych plików w kolejce."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Wybierz miejsce pobrania dla paczki"
 
@@ -6018,7 +6150,7 @@
 msgstr "Wybierz plik dla eksportowanych ustawień"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Wybierz plik dla eksportowanych witryn"
 
@@ -6034,12 +6166,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Wybierz nazwę pliku dla przekształconego pliku klucza"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Wybierz sposób, w jaki te pliki powinny być otwierane."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Wybierz docelowy katalog pobierania"
 
@@ -6047,15 +6179,15 @@
 msgid "Select target filename"
 msgstr "Wybierz nazwę pliku docelowego"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Wybierz kategorie do eksportowania:"
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Wybierz prywatne dane, które chcesz usunąć."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6071,7 +6203,7 @@
 msgstr[1] "Zaznaczono %d katalogi."
 msgstr[2] "Zaznaczono %d katalogów."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6095,7 +6227,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Zaznaczone %s i %s do transferu."
@@ -6110,13 +6242,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Zaznaczono %s i %s. Całkowity rozmiar: Co najmniej %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Wybrany edytor nie istnieje."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Zaznaczony plik jest już edytowany"
 
@@ -6124,15 +6256,15 @@
 msgid "Selected file is already loaded"
 msgstr "Zaznaczony plik jest już załadowany"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Zaznaczony plik jest już otwarty"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "Zaznaczony plik wciąż jest edytowany"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Zaznaczony filtr działa tylko dla plików lokalnych."
 
@@ -6148,37 +6280,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Wybrany port jest zwykle używany przez inny protokół."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "Wysyłaj polecenia &utrzymywania połączenia FTP"
 
-#: resources.h:543
+#: resources.h:559
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Wysyłanie polecenia utrzymania połączenia"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Numer seryjny:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "&Typ serwera:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 msgid "Server did not properly shut down TLS connection"
 msgstr "Serwer niepoprawnie zakończył połączenie TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Serwer nie obsługuje znaków spoza ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6187,15 +6324,15 @@
 "Serwer nie obsługuje wznawiania plików > %d GB. Koniec transferu gdyż "
 "rozmiary plików się zgadzają."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Serwer nie obsługuje wznawiania plików > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Serwer nie obsługuje wznawiania plików > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6204,7 +6341,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6212,11 +6349,11 @@
 "Serwer może wymagać posiadania konta. Wprowadź konto, używając Menadżera "
 "Stron"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Serwer zwrócił pustą ścieżkę."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6224,13 +6361,13 @@
 "Serwer wysłał dodatkową zachętę do zalogowania się. Musisz użyć "
 "interaktywnego typu logowania."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6250,101 +6387,108 @@
 msgid "Server sent unexpected reply."
 msgstr "Serwer wysłał nieoczekiwaną odpowiedź."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "MAC serwera dla klienta:"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Szyfr serwera dla klienta:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "&Typ serwera:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Serwer/lokalny plik"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Serwer:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
 msgstr "Szczegóły sesji"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "U&staw priorytet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Ustaw prawa dostępu '%s' na '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize wywołane bez gniazda"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Ustawienia"
 
-#: resources.h:974
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "Pokaż proste listy &katalogów"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
 msgstr "Pokaż okno po&witalne..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Pokazać obydwa drzewa katalogów i kontynuować porównywanie?"
 
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "Pokazuje dostępne szyfry TLS"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Pokazuje to okienko pomocy"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Wyłączanie systemu teraz"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "Wpisy &Menadżera Stron"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Menadżer Stron"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Menedżer Stron - nie można zapamiętać hasła"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Menadżer Stron - Błędne dane"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Menadżer Stron został już otwarty"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Adres nie istnieje."
 
@@ -6354,8 +6498,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Ścieżka strony jest źle sformułowana."
 
@@ -6374,11 +6518,11 @@
 "Menedżerze Stron.\n"
 "Dodaj bieżące połączenie do Menedżera Stron?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Rozmiar"
 
-#: resources.h:896
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Format rozmiaru"
 
@@ -6387,31 +6531,31 @@
 msgid "Size unknown"
 msgstr "Rozmiar nieznany"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Pomiń plik"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Pomijanie pobierania %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Pomijanie wysyłania %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Niektóre pliki są wciąż edytowane lub muszą zostać przesłane."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6419,20 +6563,20 @@
 "Niektóre źle skonfigurowane serwery znajdujące się za routerem mogą "
 "odpowiadać z ich lokalnym adresem IP."
 
-#: resources.h:914
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Sortuj katalogi in-line"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr ""
 "Nie można zmienić kolejności sortowania w trakcie porównywania katalogów."
 
-#: resources.h:910
+#: resources.h:931
 msgid "Sorting"
 msgstr "Sortowanie"
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "Tryb &sortowania:"
 
@@ -6444,20 +6588,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Źródło i plik docelowy nie mogą być takie same"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Źródło i plik docelowy operacji upuszczania są identyczne"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Plik źródłowy:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limity prędkości"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Limity prędkości"
 
@@ -6469,7 +6613,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Limity prędkości są włączone, kliknij aby zmienić."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Wersje beta i stabilne"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Tylko wersje stabilne"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "&Natychmiast rozpocznij transfer"
 
@@ -6477,43 +6629,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Otwórz Menadżera Stron przy starcie"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Rozpoczynanie pobierania %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Rozpoczynanie wysyłania %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Państwo lub prowincja:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "&Zatrzymaj i usuń wszystko"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Ulica:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Podmiot certyfikatu"
 
@@ -6521,11 +6673,11 @@
 msgid "Successful transfers"
 msgstr "Udane transfery"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Podsumowanie wyników testu:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6533,44 +6685,44 @@
 "Ta decyzja nie ma wpływu na symlinki do plików, takie linki są zawsze "
 "usuwane."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synchronizowane przeglądanie"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synchronizowane przeglądanie zostało wyłączone."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Błąd składni"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Błąd składni na linii poleceń"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Systemowy"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "P&asek narzędzi"
 
@@ -6578,11 +6730,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Połączenie TLS/SSL nawiązane, wysyłanie zapytania HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Połączenie TLS/SSL nawiązane, oczekiwanie na wiadomość powitalną..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Połączenie TLS/SSL nawiązane."
 
@@ -6590,27 +6742,31 @@
 msgid "TTL expired"
 msgstr "TTL wygasł"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Plik docelowy już istnieje"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Plik docelowy:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Plik docelowy już istnieje!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Plik docelowy już istnieje, naprawdę kontynuować?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Wyniki testu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testowanie zdolności wznowień serwera"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6628,7 +6784,7 @@
 "Menadż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/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Dokument XML nie jest w właściwym formacie: %s"
@@ -6639,11 +6795,11 @@
 msgstr "Adres, który wprowadziłeś to: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Zakładka nie mogła zostać dodana."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Zakładki nie mogły zostać wyczyszczone."
 
@@ -6655,19 +6811,19 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Własna sekwencja logowania nie może być pusta."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Nie można znaleźć domyślnego edytora dla plików tekstowych."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Domyślny edytor dla plików tekstowych to '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Wprowadzona nazwa filtra już istnieje, proszę wybrać inną nazwę."
 
@@ -6686,9 +6842,9 @@
 "Plik %s już istnieje.\n"
 "Wprowadź nową nazwę:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6705,14 +6861,14 @@
 msgstr ""
 "Plik '%s' nie mógł zostać załadowany lub nie zawiera prywatnego klucza."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Plik '%s' nie mógł zostać załadowany."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6721,8 +6877,8 @@
 "Plik '%s' nie mógł być otwarty:\n"
 "Żaden program nie został skojarzony w twoim systemie z tym typem pliku."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6765,7 +6921,7 @@
 "są jeszcze obsługiwane przez FileZilla.\n"
 "Czy chciałbyś przekształcić plik do niezabezpieczonego hasłem?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Plik wybrany jako domyślny edytor nie istnieje."
 
@@ -6800,11 +6956,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Następujące znaki zostaną zastąpione: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "Następujące pliki są aktualnie edytowane:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "Bezpłatne i otwarte rozwiązanie FTP"
 
@@ -6812,7 +6968,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Globalne zakładki nie mogły zostać zapisane."
 
-#: resources.h:972
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6844,7 +7000,7 @@
 "Najniższy dostępny port musi być mniejszy lub równy najwyższemu dostępnemu "
 "portowi."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6852,7 +7008,7 @@
 "Najnowsza wersja została pobrana. Kliknij Zakończ, aby zamknąć FileZilla i "
 "rozpocząć instalację."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6860,11 +7016,11 @@
 "Została pobrana najnowsza wersja. Zainstaluj ją w ten sam sposób, jak "
 "zainstalowałeś tą wersję."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Kolejka nie zostanie zapisana."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6877,25 +7033,25 @@
 msgid "The selected categories have been imported."
 msgstr "Wybrane kategorie zostały zaimportowane."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "Zaznaczony plik zawiera dane, które można zaimportować do nastepujących "
 "kategorii:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Zaznaczony plik jest już edytowany:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Zaznaczony plik wciąż jest otwarty w jakimś innym programie, zamknij go."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6913,7 +7069,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Serwer wysłał nieoczekiwaną lub nierozpoznaną odpowiedź."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Ten serwer używa następującego kodowania znaków:"
 
@@ -6925,7 +7081,7 @@
 "Certyfikat serwera jest nieznany. Sprawdź uważnie certyfikat, by upewnić "
 "się, że serwer jest zaufany."
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6935,7 +7091,7 @@
 "administrator zmienił klucz hosta, albo próbujesz połączyć się z komputerem "
 "podszywającym się pod ten serwer."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6951,15 +7107,15 @@
 "Ustawienia zostały zaimportowane. Musisz zrestartować FileZilla, aby "
 "wszystkie ustawienia odniosły skutek."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "System wkrótce ponownie się uruchomi, jeśli nie klikniejsz Anuluj."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "System wkrótce się zamknie, jeśli nie klikniejsz Anuluj."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6967,7 +7123,7 @@
 "Plik docelowy już istnieje.\n"
 "Proszę wybrać jakąś akcję."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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?"
 
@@ -6975,11 +7131,11 @@
 msgid "Themes"
 msgstr "Style"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Zestaw filtrów nie może zostać usunięty."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Ten zestaw filtrów nie może mieć innej nazwy."
 
@@ -6990,7 +7146,7 @@
 msgstr ""
 "Oznacza to, że jakiś routery i/lub zapora nadal zakłóca działanie FileZilla."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6998,7 +7154,7 @@
 "To działa tylko wtedy, gdy nie jesteś za routerem, inaczej twój system "
 "zwróci po prostu twój adres wewnętrzny."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7006,25 +7162,25 @@
 "Ten kreator pomoże prawidłowo skonfigurować wszelkie posiadane przez ciebie "
 "routery i firewalle oraz przetestuje twoją konfigurację."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Czas"
 
-#: resources.h:890
+#: resources.h:911
 msgid "Time formatting"
 msgstr "Format czasu"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "&Limit czasu oczekiwania w sekundach:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Limit czasu oczekiwania"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7033,20 +7189,20 @@
 "Przesunięcie czasu: Serwer: %d sekund. Komputer lokalny: %d sekund. Różnica: "
 "%d sekund."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Tytuł:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 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."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7054,7 +7210,7 @@
 "FileZilla musi znać prywatny klucz, aby obsłużyć uwierzytelnianie kluczem "
 "publicznym."
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7071,7 +7227,7 @@
 "Zielony: Plik jest nowszy niż nieoznakowany plik na drugiej stronie\n"
 "Czerwony: Różne rozmiary pliku"
 
-#: resources.h:999
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7081,23 +7237,23 @@
 "Jeśli opcja ta jest włączona, nawigacja hierarchii katalogu lokalnego będzie "
 "również odpowiednio zmieniać katalog na serwerze i odwrotnie."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Uruchom/zatrzymaj przetwarzanie kolejki transferów"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Włącz/wyłącz okno lokalnego drzewa katalogów"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "Włącz/wyłącz okno logu wiadomości"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Włącz/wyłącz okno drzewa katalogów na serwerze"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Włącz/wyłącz okno kolejki transferów"
 
@@ -7110,37 +7266,37 @@
 msgstr "Za dużo przekierowań"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Dojście:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Transfer"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "&Kierunek transferu"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "Tryb &transferu"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
 msgstr "Tryb transferu"
 
-#: resources.h:876
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Kolejka transferów"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Ustawienia przesyłania"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Przesyłanie przerwane: %s"
@@ -7149,8 +7305,8 @@
 msgid "Transferred data got tainted."
 msgstr "Przesłane dane niepoprawne."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Przesyłanie"
 
@@ -7158,69 +7314,69 @@
 msgid "Transfers"
 msgstr "Transfery"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Transfery zakończone"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "T&raktuj pliki bez rozszerzenia jako pliki ASCII"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "&Traktuj następujące typy plików jako pliki ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Ufaj zmienionemu kluczowi hosta:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Ufaj nowemu kluczowi hosta:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Zaufać nowemu kluczowi i doprowadzić do połączenia?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Zaufać temu certyfikatowi i kontynuować łączenie?"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Zaufać temu hostowi i doprowadzić do połączenia?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Typ"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
 msgstr "Typ FTP proxy"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
 msgstr "Typ ogólnego proxy:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "W&yślij"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limit wysyłania:"
 
-#: resources.h:938
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "&Użyj skojarzeń typów plików, jeśli są dostępne"
 
-#: resources.h:891
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "&Użyj domyślnych wartości systemowych"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7229,16 +7385,16 @@
 msgid "Unassigned error code %d"
 msgstr "Nieprzypisany kod błędu %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Jednostka:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Nieznany"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Nieznany typ FTP proxy, nie można wygenerować sekwencji logowania."
 
@@ -7251,7 +7407,7 @@
 msgid "Unknown certificate"
 msgstr "Nieznany certyfikat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7259,7 +7415,7 @@
 "Nieznany błąd podczas otwierania pliku. Upewnij się, że plik jest dostępny i "
 "jest poprawnie sformatowanym dokumentem XML."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Nieznany klucz hosta"
 
@@ -7272,7 +7428,7 @@
 "Nieznana wersja protokołu podnegocjacji uwierzytelniania SOCKS Nazwa "
 "użytkownika/Hasło: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7296,7 +7452,7 @@
 "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:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Nieobsługiwany typ certyfikatu"
 
@@ -7304,25 +7460,24 @@
 msgid "Unsupported redirect"
 msgstr "Nieobsługiwane przekierowanie"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "Prześ&lij i zakończ edycję"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Sprawdzanie aktualizacji"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Kreator aktualizacji"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Aktualizacje"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "Wyślij"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Wysyłanie nie powiodło się"
 
@@ -7335,98 +7490,98 @@
 msgid "Upload limit: none"
 msgstr "Limit wysyłania: brak"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Wyślij zaznaczony katalog"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Wyślij zaznaczone pliki i katalogi"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Wysłać z powrotem ten plik na serwer?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Wysłać ten plik na serwer?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Wysyłanie"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Wysyłanie oraz usuwanie w toku"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Wysyłanie i kończenie edycji"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Użyj własnego &kodowania"
 
-#: resources.h:935
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "Użyj własnego edytora:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "Użyj &domyślnego edytora dla plików tekstowych"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Użyj &synchronizowanego przeglądania"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Użyj UTF-8 jeśli serwer to obsługuje, w innym przypadku użyj lokalnego "
 "zestawu znaków."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Użyj domyślnej akcji"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Użyj zwykłego FTP"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Użyj serwera aktualnie podłączonego"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Użyj serwera ze strony Menadżera Stron"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "Użyj &domyślnych wartości systemowych"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Użyj następującego adresu IP:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
 msgstr "Użyj następującego zakresu portów:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "Użyj zewnętrznego adresu IP serwera"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr "Użyj tego, jeśli jesteś za routerem i masz stały zewnętrzny adres IP."
 
-#: resources.h:698
+#: resources.h:718
 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 "
@@ -7437,37 +7592,37 @@
 "aktywnego po raz pierwszy. Tylko numer używanej wersja FileZilla będzie "
 "podawany do serwera."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
 msgstr "Użytkownik:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Nazwa użytkownika nie może składać się ze spacji"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Użycie proxy %s"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Użycie nieprawidłowego kodowania może spowodować niepoprawne wyświetlanie "
 "nazw plików."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Używając tego kreatora, możesz sprawdzić dostępność aktualizacji FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Ważny od:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Ważny do:"
 
@@ -7475,48 +7630,48 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Szczegółowe logi wiadomości z wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Weryfikacja certyfikatu..."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Wersja:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Bardzo wysoka"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 "Wyświetlanie ukrytych plików ustawione, ale nieobsługiwane przez serwer"
 
-#: resources.h:922
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Podgląd/Edycja"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Widoczne kolumny"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "Z&apis"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Oczekiwanie"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Oczekiwanie na połączenie do przeglądania"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Oczekiwanie na hasło"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Oczekiwanie na anulowanie transferu"
 
@@ -7524,7 +7679,7 @@
 msgid "Waiting to retry..."
 msgstr "Oczekiwanie na ponowienie..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7555,11 +7710,11 @@
 "FileZilla będzie przekraczał limity oczekiwania w przypadku większych "
 "transferów."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Ostrzeżenie, ignorowanie połączenia danych z niewłaściwego IP."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7574,23 +7729,31 @@
 "\n"
 "Czy naprawdę chcesz sprawdzić dostępność codziennych kompilacji?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Uwaga: Potencjalne złamanie zabezpieczeń!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "Witaj w FileZilli"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Co nowego"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Co nowego:"
 
-#: resources.h:821
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Umożliwienie zapisywania haseł przez FileZilla pozwala ci na łączenie się z "
+"serwerem bez potrzeby ponownego wpisywania hasła po restarcie programu."
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7599,11 +7762,15 @@
 "przez lokalny system operacyjny, będą wymienione, jeżeli pobierasz takie "
 "pliki."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Szeroki ekran"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Czy chcesz, aby FileZilla pamiętał hasła?"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "Zapi&s"
 
@@ -7616,25 +7783,33 @@
 msgid "Wrong line endings"
 msgstr "Nieprawidłowe zakończenia linii"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Tak"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Używasz hosta obsługującego tylko IPv6. Ten kreator nie obsługuje tego "
+"środowiska."
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "Używasz już najnowszej wersji FileZilla. Sprawdź innym razem."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Zawsze możesz ponownie otworzyć to okno poprzez menu Pomoc."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Możesz zostawić pole portu puste używając domyślnego portu."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7658,19 +7833,19 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Nie wprowadziłeś nowej nazwy pliku. Zamienić plik?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "Wybrałeś przynajmniej jeden link symboliczny."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 "Wybrałeś więcej niż 10 plików do edycji, czy na pewno chcesz kontynuować?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7679,11 +7854,11 @@
 "kontynuować?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Musisz podać nazwę hosta."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Musisz podać lokalny katalog."
 
@@ -7692,17 +7867,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Musisz podać poprawny adres IP."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Musisz podać zapisywalny katalog lokalny."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Musisz podać nazwę konta"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Musisz podać nazwę użytkownika"
 
@@ -7722,29 +7897,29 @@
 msgid "You need to enter a name for the log file."
 msgstr "Musisz podać nazwę pliku dziennika."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Musisz podać wprowadzić prawidłowo cytowane polecenie."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Musisz podać nazwę hosta proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Port serwera proxy musi znajdować się w przedziale od 1 do 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Musisz wpisać co najmniej jedną ścieżkę, puste zakładki nie są obsługiwane."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7752,7 +7927,7 @@
 "Musisz wpisać zarówno lokalną, jak i zdalną ścieżkę, aby umożliwić "
 "synchronizowane przeglądanie dla tej zakładki."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7784,44 +7959,49 @@
 "Nie powinieneś mieć problemów w łączeniu się z innymi serwerami, transfer "
 "plików powinien działać poprawnie."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "za"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "przed"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "zaczyna się od"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bajtów"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "zawiera"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "nie zawiera"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "nie równa się"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "kończy się na"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "równa się"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "plik"
 
@@ -7840,85 +8020,81 @@
 "Proszę upewnić się, że plik wykonywalny istnieje w tym samym katalogu, co "
 "plik wykonywalny FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp nie mógł zostać uruchomiony"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers zwróciła brak certyfikatów"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "większy niż"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "wykonywanie - grupa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "odczyt - grupa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "zapis - grupa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "jest równa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "jest ustawiony"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "nie jest ustawiony"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "mniejszy niż"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "pasuje do wyrażenia regularnego"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "wykonywanie - właściciel"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "odczyt - właściciel"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "zapis - właściciel"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "nieznany"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "wykonywanie - wszyscy"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "odczyt - wszyscy"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "zapis - wszyscy"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
-
-#~ msgid "Duplicate filter name"
-#~ msgstr "Duplikat nazwy filtra"
-
-#, fuzzy
-#~ msgid "Serial Number:"
-#~ msgstr "Numer seryjny:"
diff -Nru filezilla-3.5.3/locales/pt_BR.po filezilla-3.7.3~precise/locales/pt_BR.po
--- filezilla-3.5.3/locales/pt_BR.po	2011-08-21 17:53:49.000000000 +0000
+++ filezilla-3.7.3~precise/locales/pt_BR.po	2013-05-26 15:45:23.000000000 +0000
@@ -1,35 +1,34 @@
 # Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
 # This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
-# 
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla 3 pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-21 19:49+0200\n"
-"PO-Revision-Date: 2011-06-15 11:12-0300\n"
-"Last-Translator: Mauro A. Santos <m_a_santos@hotmail.com>\n"
+"POT-Creation-Date: 2013-05-26 17:32+0200\n"
+"PO-Revision-Date: 2013-05-11 01:47-0300\n"
+"Last-Translator: Paulo Neto <layoutbr@lexxa.com.br>\n"
 "Language-Team: Felipe Santello <fsantello@gmail.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Language: Portuguese\n"
-"X-Poedit-Country: BRASIL\n"
+"Language: pt\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S decorridos"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S restantes"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -47,9 +46,9 @@
 msgstr[0] "%d pasta"
 msgstr[1] "%d pastas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -58,9 +57,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -81,7 +80,7 @@
 msgstr[0] "%d arquivo. Tamanho: No mínimo %s"
 msgstr[1] "%d arquivos. Tamanho: No mínimo %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d arquivos adicionados à fila"
@@ -93,31 +92,21 @@
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
-msgstr "%h - Host"
+msgstr "%h - Domínio"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Senha"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s bytes (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s bytes (%s B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -132,7 +121,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ainda não é válido!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Usuário proxy"
@@ -154,27 +143,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s B/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -189,7 +168,7 @@
 "Faça o download do FileZilla novamente. Caso esse problema persista, por "
 "favor reporte esse bug."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -212,152 +191,148 @@
 msgid "%s with %d bits"
 msgstr "%s com %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nome de usuário:"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Senha do proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Sobre..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "Con&ta:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "Ati&vo"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Adicionar marcador..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Adicionar arquivos à fila"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Adicionar arquivo de chave..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Adicionar à fila"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "Ajustar a diferença do fuso &horário do servidor:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Confiar sempre nesse certificado em sessões futuras."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Confiar sempre nesse host, adicionar esta chave ao cache"
 
-#: resources.h:939
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Utiliz&ar sempre o editor padrão"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Utilizar sempre a seleção para arquivos não associados"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Utilizar sempre esta Ação"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Pedir ao sistema operational pelo endereço IP externo"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automático"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "Auto&detectar"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binário"
 
-#: resources.h:899
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Prefixos &binários usando símbolos SI (p.ex. 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Marcadores"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Procurar..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Tolerância a picos:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "Procurar por versões &beta do FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Limpar dados privados..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Sair do FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configurar limites de velocidade..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Configurar..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Conectar"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Copiar"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Copiar a conexão atual para o Gerenciador de Sites..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copiar para a área de transferência"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Abortar"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Criar pasta"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Criar nova aba"
 
@@ -365,169 +340,169 @@
 msgid "&Debug"
 msgstr "&Depuração de erros"
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Informações de depuração de erros no log de mensagens:"
 
-#: resources.h:932
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Editor padrão:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Ação padrão se o arquivo existir..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Tempo de espera entre tentativas de login com falha:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Apagar"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Apagar atalho simbólico"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Comparação de pastas"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Descartar o arquivo local e depois Baixar e editar um arquivo novo"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Desconectar"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Desconectar do servidor"
 
-#: resources.h:875
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "E&xibir velocidades de transferência momentâneas ao invés da velocidade média"
 
-#: resources.h:897
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Mostrar o tamanho em bytes"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Nã&o relembrar senhas"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "Não &mostrar esta pergunta outra vez."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Não usar o endereço IP externo em conexões locais."
 
-#: resources.h:919
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Ação para clique &duplo nos arquivos:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Baixar"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Baixar para:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Baixar..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Downloads:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Editar"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Editar regras dos filtros..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Ativar"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "&Ativar a verificação automática de atualizações."
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Ativar limites de velocidade"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "Codi&ficação:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
-msgstr "&Encriptação"
+msgstr "Cripto&grafia"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
-msgstr "&Entre com comando personalizado..."
+msgstr "&Entre com comando personalizado…"
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Executar"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Exportar entradas do Gerenciador de Sites"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exportar..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Alternar para o modo ativo"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Arquivo"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Atributos do arquivo..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Permissões do &arquivo..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Arquivo:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Condições para o &filtro:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Conjuntos de filtros:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtros:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Terminar"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Terminar edição e apagar o arquivo local"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -535,478 +510,486 @@
 "&Consolidar caminhos remotos, baixar todos os arquivos diretamente para a "
 "pasta de destino"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Seguir o atalho simbólico, apagar o conteúdo da pasta de destino"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Obter um endereço IP externo a partir da seguinte URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Obter ajuda..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Marcador global"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 usando o método CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "Aj&uda"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Ocultar arquivos idênticos"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Maior"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "M&aior porta disponível:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Host:"
 
-#: resources.h:898
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Prefixos binários IEC (p.ex. 1 KiB = 1024 bytes)"
 
-#: resources.h:886
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exemplo: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importar..."
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Usar associações de tipos de arquivo do sistema"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "Manter a estrutura remota de caminhos relativa à rai&z de procura"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Disposição das janelas de arquivos e pastas:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limitar portas locais usadas pelo FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limitar o número de conexões simultâneas"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Árvore de pastas &local"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Pasta &local:"
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Log no arquivo"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "Tipo de lo&gon:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Tipo de logon:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Baixo"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Gerenciar marcadores..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transferência &manual..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Número &máximo de conexões:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Número &máximo de tentativas:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Log de &mensagens"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimizar para a barra de notificação"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Assistente de configuração de rede..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Novo"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Novo Site"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Nova versão disponível!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Próximo >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Não"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Nenhum"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Número de dias entre verificações de atualizações:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "Valor &numérico:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&ABERTO"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Abrir"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Substituir"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passivo"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "Sen&ha:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Reproduzir som"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "P&orta:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Posição do log de mensagens:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Preservar data e hora dos arquivos transferidos"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Fila"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Conexão rápida"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Barra de cone&xão rápida"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Ler"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Reconectar"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Atualizar"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Lembrar a senha para esta sessão"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Lembrar senhas"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Pasta &remota:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Caminho &remoto:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Remover"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Remover chave"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Remover selecionados"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Renomear"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Renomear..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Reabrir o arquivo local"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "Substitui&r caracteres inválidos com:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Reportar um erro..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "Limpar e &recolocar todos na fila"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Reinicar o Assistente"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "Continua&r"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "E&xecutar comando..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "E&xecutar o assistente de configuração agora..."
 
-#: resources.h:950
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Verificar atualizações agora..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Salvar como..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Procurar"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Procurar arquivos remotos..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Selecionar Entrada:"
 
-#: resources.h:930
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Selecionar idioma:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Selecione as colunas a serem mostradas:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Servidor"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Configurações"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Configurações..."
 
-#: resources.h:965
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "Mo&strar menu de depuração de erros"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "Mo&strar mensagem"
 
-#: resources.h:955
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Mo&strar data e hora no log de mensagens"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Gerenciador de Sites..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Marcador próprio do &site"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Pular"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Limites de velocidade"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Começar a transferência &imediatamente"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Inverter a ordem das janelas local e remota"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Codificações &TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Teste"
 
-#: resources.h:878
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transferir"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Modo de &transferência:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Fila de &transferência"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Tratar arquivos de ponto como arquivos ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Sem editar"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "At&ualizar a chave do cache para esse host"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Upload"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Uploads:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Usar um programa personalizado"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Usar navegação sincronizada"
 
-#: resources.h:934
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Usar o editor de texto do sistema"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Usar o seguinte endereço IP:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Usar o endereço IP externo do servidor"
 
-#: resources.h:901
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Usar separador de milhares"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Usuário:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Nome de &usuário:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versão %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Ver"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Ver/Editar"
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Monitorar os arquivos locais editados e perguntar para enviar as alterações"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Quando verificar atualizações, verificar por:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Gravar"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Sim"
 
@@ -1024,11 +1007,27 @@
 msgstr "'%s' não é uma pasta."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "O tipo de logon 'Conta' não é suportado pelo protocolo selecionado"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Os inícios de sessão 'Normal' e 'Conta' não estão disponíveis, em vez disso "
+"use 'Pedir senha'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Os tipos de início de sessão 'Normal' e 'Conta' não estão disponíveis. Sua "
+"entrada precisa ser alterada para 'Pedir Senha'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 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 "
@@ -1046,120 +1045,116 @@
 msgstr[0] "(%d objeto filtrado)"
 msgstr[1] "(%d objetos filtrados)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 para ilimitado)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 segundos)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 para desativar)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(Pelo menos 7 dias)"
-
-#: resources.h:894
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(exemplo: %H:%M)"
 
-#: resources.h:888
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(exemplo: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(em %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S restantes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- restantes"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Roteador e/ou Firewall inválido"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Arquivo corrompido no 'mirror'"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware no seu sistema"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- restantes"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c não pode ser usado com uma URL FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l só pode ser usado com uma URL FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s e -c não podem ser usados ao mesmo tempo."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s não pode ser usado com uma URL FTP."
 
-#: resources.h:967
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Nenhum"
 
-#: resources.h:968
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Aviso"
 
-#: resources.h:969
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Info"
 
-#: resources.h:970
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Verboso"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "Sistema de 32 bit"
 
-#: resources.h:971
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debug"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "Sistema de 64 bit"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Anterior"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1168,16 +1163,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Já existe um marcador com esse nome. Entre com um nome não usado."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "É necessário definir um editor padrão."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Uma pasta não pode ser arrastada para dentro de uma de suas subpastas."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1187,28 +1183,28 @@
 "Nesses casos é necessário usar o modo ativo. Em modo ativo, o FileZilla abre "
 "uma porta e pede ao servidor para se conectar a ela."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Um arquivo previamente aberto foi alterado."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Um arquivo com esse nome já está sendo editado. Quer reabrir '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Um arquivo com esse nome já está sendo transferido."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Um arquivo com esse nome ainda está sendo editado. Feche-o e tente outra vez."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1223,11 +1219,11 @@
 "listagens.\n"
 "Não será exibido mais nenhum aviso durante esta sessão."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Está disponível uma nova versão do FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1236,7 +1232,7 @@
 "configurados ocultam arquivos ao usuário. Use esta opção para forçar o "
 "servidor a mostrar todos os arquivos."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1254,15 +1250,15 @@
 "Desativar a navegação sincronizada e continuar com as alterações na pasta "
 "local?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "A&dicionar"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "P&ermitir a continuação de arquivos ASCII"
 
@@ -1274,55 +1270,55 @@
 msgid "A&pply only to uploads"
 msgstr "A&plicar somente a uploads"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "A&plicar a todos os arquivos e pastas"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Remover a&utomaticamente as transferências bem sucedidas"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Abortar a conexão anterior e conectar na aba atual"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Sobre o FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Acima das listas de arquivos"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Conta"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Ação após &término da fila"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Ação para o arquivo selecionado:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Ação a executar:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Ação:"
 
@@ -1356,23 +1352,23 @@
 "correto, mas o seu roteador ou firewall modificaram o endereço enviado "
 "indevidamente."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Modo de IP ativo"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Somente adicione os arquivos à fila"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Adicionar pastas selecionadas à fila de transferência"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Adicionar arquivos e pastas selecionados à fila de transferência"
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Adicionar à fila"
 
@@ -1380,27 +1376,42 @@
 msgid "Address type not supported"
 msgstr "Tipo do endereço não é suportado"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avançado"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opções avançadas:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Aviso: A menos que você queira testar novas funcionalidades, por favor, "
+"mantenha usando apenas as versões estáveis. As versões beta e compilações "
+"noturnas são versões de desenvolvimento voltados para fins de teste. Versões "
+"noturnas do FileZilla podem não funcionar como esperado e pode até mesmo "
+"danificar o sistema. Use versões beta e compilações noturnas por sua conta e "
+"risco."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritmo:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Todos os arquivos foram transferidos com sucesso"
 
-#: resources.h:706
+#: resources.h:727
 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:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1409,19 +1420,19 @@
 msgstr[1] ""
 "Todas as transferências acabaram. %d arquivos não puderam ser transferidos."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Permitir alternar para outro modo de transferência em caso de &falha."
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Permitir fallback para outro modo de transferência em caso de falha"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Já conectado"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1429,7 +1440,7 @@
 "Alternativamente pode-se usar a ferramenta 'Pageant' do PuTTY para gerenciar "
 "as suas chaves, o FileZilla reconhece o 'Pageant'."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1437,7 +1448,7 @@
 "Alternativamente pode-se usar o agente SSH do seu sistema. Para fazer isso, "
 "certifique-se que a variável de ambiente SSH_AUTH_SOCK está configurada."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1445,7 +1456,7 @@
 "Alternativamente, visite o site http://filezilla-project.org para baixar a "
 "versão mais recente."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1454,7 +1465,7 @@
 "Ocorreu um erro ao carregar a fila detransferência de \"%s\".\n"
 "Alguns itens da fila podem não ter sido restaurados."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1463,7 +1474,7 @@
 "Ocorreu um erro ao salvar a fila detransferência para \"%s\".\n"
 "Alguns itens da fila podem não ter sido salvos."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1471,28 +1482,28 @@
 "Um item com o mesmo nome daquele que está sendo arrastado já existe no "
 "destino."
 
-#: ../../locales/../src/engine/server.cpp:869
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anônimo"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Outra operação remota já está sendo executada, não é possível alterar a "
 "pasta agora."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Quaisquer alterações ao Gerenciador de Sites não poderão ser salvas."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1500,58 +1511,58 @@
 "Alterações no Gerenciador de Sites não serão salvas a não ser que se repare "
 "o arquivo."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Alterações nos filtros não poderão ser salvas."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Alterações nos filtros não serão salvas."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Apl&icar somente a pastas"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Aplicar"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Aplicar somente à &fila atual"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Aplicar somente a ar&quivos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arquivo"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Como aba no painel da fila de transferência"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Perguntar a ação"
 
-#: ../../locales/../src/engine/server.cpp:844
-#: ../../locales/../src/engine/server.cpp:863
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Pedir a senha"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Pedir uma porta ao sistema operacional."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Pedir o endereço IP externo ao sistema operacional"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Fazer perguntas nos fóruns do FileZilla"
 
@@ -1559,39 +1570,35 @@
 msgid "Associated program not found:"
 msgstr "Programa associado não encontrado:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Pelo menos uma condição de filtro está incompleta"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Nesse momento, toda a informação necessária foi obtida."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Falha de autenticação."
 
-#: resources.h:879
+#: resources.h:901
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Classificação de tipo de arquivo automática"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Verificação automática de atualizações"
-
-#: resources.h:883
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Tamanhos disponíveis"
 
@@ -1600,66 +1607,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Contornar o prox&y"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instruções básicas de uso"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Sendo editado"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Benchmark do aglutinador de strings"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:960
 msgid "Beware! Certificate has been revoked"
 msgstr "Atenção! O certificado foi revogado"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binário"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Quadro negro"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Marcador:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Data da versão:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Informações da versão"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Categoria de negócio:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1669,63 +1676,63 @@
 "em modo ativo. Se quiser limitar o FileZilla a usar um intervalo menor de "
 "portas, entre com o intervalo de portas abaixo."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "&Cancelar a operação atual"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Procurar por &'nightly builds' do FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&Limpar todos"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opiar URL(s) para a área de transferência"
 
-#: resources.h:887
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Personalizado"
 
-#: resources.h:942
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Associações dos tipos de arq&uivo personalizadas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Calculando o fuso horário do servidor..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Não foi possível ler o arquivo"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Não foi possível gravar dados no arquivo."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Não foi possível gravar dados no arquivo: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: resources.h:989
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Cancelar operação atual"
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Cancela a operação atual"
 
@@ -1736,11 +1743,11 @@
 "Não foi possível acessar '%s', nenhum disco inserido ou a unidade não está "
 "pronta."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Não foi possível adicionar o servidor ao Gerenciador de Sites"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1756,30 +1763,30 @@
 "Não é possivel comparar as pastas, existem filtros diferentes para as pastas "
 "locais e remotas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Não é possível comparar pastas, não conectado a um servidor."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Não é possível criar um novo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Não é possível editar o arquivo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 msgid "Cannot edit file, not connected to any server."
 msgstr "Não é possível editar o arquivo, não está conectado a um servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Não é possível editar o arquivo, caminho remoto desconhecido."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1787,8 +1794,8 @@
 "Não é possível establecer uma conexão FTP a um servidor SFTP. Selecione o "
 "protocolo correto."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr ""
 "Não é possível carregar a barra de conexão rápida a partir do arquivo de "
@@ -1802,46 +1809,50 @@
 msgid "Cannot load keyfile"
 msgstr "Não é possível carregar o arquivo de chave"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr ""
 "Não é possível carregar a barra de ferramentas a partir de arquivo de "
 "recursos"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Não foi possível relembrar a senha"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Não é possível renomear da entrada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Não é possível renomear o arquivo"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Não é possível salvar o conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Não é possível selecionar o filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Não é possível definir a associação de arquivos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Não é possível mostrar janela"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Não é possível ler/editar o arquivo selecionado"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Categorias"
 
@@ -1849,61 +1860,61 @@
 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."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detalhes do certificado"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certificado na cadeia:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Emissor do certificado"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Desafio:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Alterar atributos do arquivo"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Alterar as permissões do arquivo."
 
-#: resources.h:963
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "A alteração das configurações do arquivo de log requer que se reinicie o "
 "FileZila."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problema de codificação de caracteres"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Mapa de caracteres"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "Procurar por versões &beta e pré-lançamentos"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "&Procurar atualizações..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Verificar at&ualizações do FileZilla automaticamente:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Procurar novas versões do FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Procurar atualizações"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Procura por atualizações falhou"
 
@@ -1911,21 +1922,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Verificando o endereço IP externo correto"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Procurando atualizações"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Erro de checksum do arquivo baixado."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Escolha a pasta local padrão"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Escolha a pasta local"
 
@@ -1933,43 +1944,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Bloco de dados encerrado indevidamente"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cifra:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "&Fechar aba"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Clássico"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Limpar as entradas do Gerenciador de &Sites"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "&Limpar cache de layout"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Limpar histórico de cone&xões rápidas"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Limpar registro de &reconexões"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Limpar fila de &transferência"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Limpar histórico"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1977,11 +1988,11 @@
 msgid "Clear private data"
 msgstr "Limpar dados privados"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Limpar a barra de conexão rápida"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Limpar aglutinador de strings"
 
@@ -1989,24 +2000,24 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Clique em Terminar para salvar a configuração."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Clique em 'seguinte' para fazer download da nova versão."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC do cliente para o servidor:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Cifra do cliente para o servidor:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Fechar todas as outras &abas"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "Sair do FileZilla"
 
@@ -2014,11 +2025,11 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Fechar todas as instâncias do FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Fecha a aba atual"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mentários:"
 
@@ -2026,11 +2037,11 @@
 msgid "Column properties"
 msgstr "Propriedades da coluna"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Configuração da coluna"
 
-#: resources.h:937
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "O comando e os seus parâmetros devem ser inseridos entre aspas."
 
@@ -2049,9 +2060,9 @@
 msgstr "Comando não suportado por esse protocolo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Comando:"
 
@@ -2059,7 +2070,7 @@
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nome comum:"
 
@@ -2068,15 +2079,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Comunicação danificada pelo rotador ou pelo firewall"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Comparar a &hora da modificação"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Comparar o &tamanho do arquivo"
 
-#: resources.h:917
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Limi&te de comparação (em minutos):"
 
@@ -2084,60 +2095,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "O limite de comparação precisa ser entre 0 e 1440 minutos."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilado para:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilado em:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilado com:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Parâmetros da compilação:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Comprimido"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transferências simultâneas"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "As condições são sensíveis a &maiúsculas e minúsculas"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Teste de configuração"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Configurar modo passivo"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Configurar intervalo de portas"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Configurando FileZilla e a sua rede"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Confirme para apagar"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Confirmação requerida"
 
@@ -2145,7 +2156,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Parabéns, a configuração parece estar funcionando."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Conectar contornando as configurações do proxy"
 
@@ -2153,34 +2164,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Conectar ao site especificado no Gerenciador de Sites"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Conectado"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Conectando"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectando %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Conectando %s através do proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectando %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Conectado servidor"
 
@@ -2188,17 +2199,17 @@
 msgid "Connection"
 msgstr "Conexão"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Tentativa de conexão falhou"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Tentativa de conexão falhou com \"%s\", tentando endereço seguinte."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Tentativa de conexão falhou com \"%s\"."
@@ -2212,12 +2223,12 @@
 msgid "Connection closed"
 msgstr "Conexão terminada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Conexão terminada pelo servidor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Conexão estabelecida, iniciando o TLS..."
@@ -2226,7 +2237,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Conexão estabelecida, enviando pedido HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Conexão estabelecida, esperando mensagem de boas-vindas..."
 
@@ -2242,15 +2253,15 @@
 msgid "Connection refused"
 msgstr "Conexão recusada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "A conexão excedeu limite de tempo"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "A conexão excedeu limite de tempo."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Conexão com servidor perdida."
 
@@ -2270,27 +2281,23 @@
 msgid "Convert keyfile"
 msgstr "Converter arquivo de chave"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Cop&iar"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Cópia (%d) de %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Copiar URLs dos itens selecionados para a área de transferência."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Não foi possível aceitar a conexão: %s"
@@ -2300,16 +2307,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Não foi possível adicionar a conexão ao Gerenciador de Sites"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Não foi possível concluir a operação"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Não foi possível conectar ao servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Não foi possível conectar ao servidor: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Não foi possível converter o comando para o código do servidor"
 
@@ -2318,17 +2329,17 @@
 msgid "Could not convert private key"
 msgstr "Não foi possível converter a chave privada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Não foi possível copiar os caminhos URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Não foi possível copiar os dados"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2338,11 +2349,11 @@
 "Ou a extensão do Explorer não está instalada corretamente ou você não soltou "
 "os arquivos na janela do Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Não foi possível establecer a conexão com o servidor"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2355,11 +2366,11 @@
 "comandos '--pasta de dados <caminho>' ou configurar a variável de ambiente "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Não foi possível gerar a sequência de login personalizada."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2367,7 +2378,7 @@
 "Não foi possível obter o nome distinto do emissor do certificado, o módulo "
 "'gnutls_x509_get_issuer_dn' falhou"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1076
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2375,7 +2386,7 @@
 "Não foi possível obter o nome distinto do sujeito do certificado, o módulo "
 "'gnutls_x509_get_dn' falhou"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Não foi possível obter o caminho remoto completo."
 
@@ -2384,17 +2395,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Não foi possível obter uma resposta do fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 msgid "Could not get temporary directory to download file into."
 msgstr "Não foi possível obter a pasta temporária para download do arquivo."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:1018
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 "Não foi possível importar os certificados de pares, módulo "
 "'gnutls_x509_crt_import' falhou"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:1011
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2422,7 +2433,7 @@
 msgid "Could not load private key"
 msgstr "Não foi possível carregar a chave privada"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2433,7 +2444,7 @@
 "Desconectar a navegação sincronizada e continuar com as alterações na pasta "
 "remota?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2453,9 +2464,9 @@
 "Não foi posível encontrar a pasta remota correspondente à pasta local '%s'.\n"
 "A navegação sincronizada foi desativada."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Não foi possível abrir a área de transferência"
 
@@ -2470,11 +2481,11 @@
 msgid "Could not parse remote path."
 msgstr "Não foi possível analisar o caminho remoto."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Não foi possível analisar o endereço do servidor:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Não foi possível ler do soquete: %s"
@@ -2483,12 +2494,12 @@
 msgid "Could not read server item."
 msgstr "Não foi possível ler o item do servidor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Não foi possível ir até à posição %s dentro do arquivo"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Não foi possível procurar o término do arquivo"
 
@@ -2496,22 +2507,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Não foi possível enviar o comando para o fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Não foi possível criar o processo de IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Não foi possível saudar o proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Não foi possível iniciar a transferência"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2532,7 +2543,7 @@
 "Não foi possível gravar \"%s\", os marcadores globais não puderam ser "
 "salvos: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2541,16 +2552,16 @@
 "Não foi possível gravar \"%s\", a fila não pode ser salva.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Não foi possível gravar \"%s\", os sites selecionados não foram exportados: %"
 "s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Não foi possível gravar \"%s\": %s"
@@ -2560,7 +2571,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Não foi possível gravar o arquivo de chave: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Não foi possível gravar arquivo local"
 
@@ -2570,39 +2581,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Não foi possível gravar arquivo de log: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, 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:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "País:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Encerra o Filezilla abruptamente. Usado somente para fins de depuração de "
 "erros."
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Cr&iar novo arquivo"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Criar uma nova subpasta na pasta atual"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Criar um novo arquivo em branco no diretório atual"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Criar pasta"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Criar arquivo em branco"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Criando pasta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Criando pasta '%s'..."
@@ -2620,7 +2643,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Erro crítico na transferência de arquivo após transferir %s em %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2641,52 +2664,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "O tipo de transferência atual está definido para binário."
 
-#: resources.h:773 resources.h:893
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Personali&zado"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Conjunto de filtros personalizado"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Servidor personalizado"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tipo de d&ados"
 
-#: resources.h:900
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Pr&efixos decimais usando símbolos SI (p.ex. 1 KB = 1000 bytes)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Pa&drão"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "A&pagar"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Desat&ivar todos"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Nã&o salvar senhas"
 
-#: resources.h:924
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Açã&o para clique duplo em pastas:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplicar"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Como em DOS com caminhos virtuais"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Tipo de arquivo perigoso"
 
@@ -2694,16 +2721,16 @@
 msgid "Data"
 msgstr "Dados"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Ponto de dados fechado prematuramente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Data"
 
-#: resources.h:884
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Formato da data"
 
@@ -2722,11 +2749,11 @@
 msgid "Debug"
 msgstr "Depuração de erros"
 
-#: resources.h:964
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Configurações para depuração de erros"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Pasta &local padrão:"
 
@@ -2734,19 +2761,19 @@
 msgid "Default (Autodetect)"
 msgstr "Padrão (Autodetectar)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "O editor padrão não foi colocado entre aspas corretamente."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Ação padrão para arquivo existente"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Pasta r&emota padrão:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2758,15 +2785,15 @@
 msgid "Default system language"
 msgstr "Idioma padrão do sistema"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Modo de transferência padrão:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Tipo de transferência padrão:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Padrão: http://ip.filezilla-project.org/ip.php"
 
@@ -2790,58 +2817,58 @@
 msgstr[1] ""
 "Postergando a conexão por %d segundos devido à falha na tentativa anterior..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Apagar entrada no Gerenciador de Sites"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Apagar a pasta selecionada"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Apagar os arquivos e as pastas selecionados"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Apagando as pastas"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 "A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Apagando o atalho simbólico"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Área de trabalho"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detalhes"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detalhes para a nova chave:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "&Pastas"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Direção"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Pasta"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Comparação de pastas"
 
@@ -2861,11 +2888,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Listagem de pastas abortada pelo usuário"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Falha na listagem de pastas"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtros da listagem de pastas"
 
@@ -2873,18 +2900,18 @@
 msgid "Directory listing successful"
 msgstr "Listagem de pastas bem sucedida"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "&Desativar todos"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Desconectar a navegação sincronizada e continuar com as alterações na pasta "
 "remota?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2892,50 +2919,49 @@
 "Desmarque esta opção outra vez se deixar de ver o conteúdo correcto das "
 "pastas."
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Desconectar do servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Desconectado do servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Desconectado do servidor: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Desconectando do servidor anterior"
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Desconecta do servidor atualmente visível"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Exibe a caixa 'Sobre...'"
 
-#: resources.h:933
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Não usar o editor padrão"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Não &fazer nada"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2944,8 +2970,8 @@
 "A menos que queira testar novas capacidades, continue a usar versões "
 "estáveis."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
 msgstr "Quer mesmo sair do FileZilla?"
 
@@ -2960,7 +2986,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Quer mesmo apagar todas as entradas do Gerenciador de Sites?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Quer mesmo apagar a entrada selecionada?"
 
@@ -2968,34 +2994,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Quer mesmo apagar a fila de transferência?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Quer mesmo enviar '%s' para o servidor?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentação"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Não usar o endereço IP externo em conexões &locais."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Arquivos de ponto são nomes de arquivo que começam com um ponto, p.ex., ."
 "htaccess"
 
-#: resources.h:918
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Ação para clique duplo do mouse"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Download"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Limite de do&wnload:"
 
@@ -3008,42 +3034,51 @@
 msgid "Download limit: none"
 msgstr "Limite de download: nenhum"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Baixar os resultados da procura"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Baixar a pasta selecionada"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Baixar os arquivos e as pastas selecionados"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Velocidade ad transferência: %s/s\n"
+"Velocidade do envio: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Baixando"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Baixando %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 "A opção 'Baixar múltiplas pastas não relacionadas' ainda não é suportada"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Baixando os resultados da procura"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3052,66 +3087,64 @@
 "O 'arrastar e largar' entre instâncias diferentes do FileZilla ainda não foi "
 "implementado."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "O 'arrastar e soltar' entre servidores diferentes ainda não foi implementado."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Nome do filtro duplicado"
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&icar"
 
-#: resources.h:204
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Ati&var todos"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "E&ntrar na pasta"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&xecutar"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Sair"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Cada filtro deve ter pelo menos uma condição."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Editar filtros"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Editar o arquivo com o editor configurado e enviar as mudanças para o "
 "servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "A edição falhou"
 
-#: resources.h:881
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Comando vazio"
 
@@ -3119,7 +3152,7 @@
 msgid "Empty command."
 msgstr "Comando vazio."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Lista de pastas vazia"
 
@@ -3131,102 +3164,115 @@
 msgid "Empty file extension."
 msgstr "Extenção de arquivo vazia."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Não são permitidos nomes de filtros vazios."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nome vazio"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "String vazia."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "A&tivar todos"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Ativar &filtragem de caracteres inválidos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
-msgstr "Encriptado"
+msgstr "Criptografado"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
-msgstr "Encriptação"
+msgstr "Criptografia"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Detalhes da encriptação"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Parar comparação e alterar a ordenação?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Entrar comando personalizado..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Entre com 0 para velocidade ilimitada."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Entre com o comando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Entre com o comando personalizado"
 
-#: resources.h:925
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Entrar na pasta"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Entre com o nome do filtro"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Entre com o nome para o conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Entre com o novo nome para conjunto de filtros"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Entre com a senha"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Entre com a pasta selecionada"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
-"Entre com o endereço do servidor.\n"
-"Para especificar o protocolo do servidor, adicione o host com o "
+"Insira o endereço do servidor.\n"
+"Para especificar o protocolo do servidor, adicione o domínio com o "
 "identificador de protocolo. Se não for especificado nenhum protocolo, o "
 "protocolo padrão (ftp://) será usado.\n"
-"Também pode-se entrar com endereços URLs completos na forma: //usuário:"
-"pass@host:porta aqui, então os valores nos outros campos serão substituídos."
+"Você também pode inserir endereços completos de URLs na forma: protocolo://"
+"usuário:pass@host:porta aqui, então os valores nos outros campos serão "
+"substituídos.\n"
+"\n"
+"Os protocolos suportados:\n"
+"- ftp:// para FTP normal\n"
+"- sftp:// para protocolo de transferência de arquivos SSH\n"
+"- ftps:// para FTP sobre TLS (implicito)\n"
+"- ftpes:// para FTP sobre TLS (explícito)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3237,7 +3283,7 @@
 "Entre com a senha para o arquivo '%s'.\n"
 "Note que o arquivo convertido não estará protegido por senha."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3259,7 +3305,7 @@
 msgid "Error importing"
 msgstr "Erro ao importar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Erro ao carregar fila"
 
@@ -3268,29 +3314,29 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Erro ao carregar arquivo xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
-msgstr "Erro ao salvar fila "
+msgstr "Erro ao salvar fila"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
@@ -3299,74 +3345,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Erro ao gravar arquivo xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Erro, o nome do arquivo não pode ser analisado."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Erro: o arquivo local existe mas não pode ser removido"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Erro:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Abrir conexão em uma nova aba"
 
-#: resources.h:944
+#: resources.h:972
+msgid "Every month"
+msgstr "A cada mês"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "A cada duas semanas"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Exemplo: png \"c:\\Programas\\editor\\editor.exe\" -open"
 
-#: resources.h:903
+#: resources.h:925
 msgid "Examples"
 msgstr "Exemplos"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Exe&cutar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Executável"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "O executável não contém informação sobre a versão, não foi possível "
 "verificar se há atualizações."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorer"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exportar &Fila"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exportar &Configurações"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportar configurações"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Nome do f&iltro:"
 
@@ -3374,7 +3428,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferência de Arquivos"
 
@@ -3386,25 +3440,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferência de Arquivos sem segurança"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Motor de FTP ainda não iniciado, não é possivel conectar"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Manter o FTP ativo"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy do FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
 msgstr "FTP URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3420,26 +3474,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPES - FTP sobre TLS/SSL implícito"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Falha ao alterar pasta"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Falh ao alterar idioma"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Falha ao verificar por uma nova versão do FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Falha ao copiar ou o mover sites"
 
@@ -3447,46 +3501,46 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Falha na criação de uma cópia de segurança do arquivo xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Falha na criação de um soquete de escuta, abortando"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Falha na criação de um soquete de escuta para a transferência em modo Ativo"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Falha no download da versão mais recente do FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Falha na obtenção do caminho para 'Meus Documentos'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Falha na obtenção do caminho para a área de trabalho"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Falha na obtenção do endereço do ponto da conexão de controlo, conexão "
 "terminada."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Falha na obtenção do endereço do ponto da conexão de dados, conexão "
 "terminada."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Falha na iniciação de um motor FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Falha na iniciação do TLS"
@@ -3500,33 +3554,32 @@
 msgid "Failed to load private key: %s"
 msgstr "Falha ao carregar a chave privada: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Falha na abertura de \"%s\" para anexação/escrita"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Falha na abertura de \"%s\" para leitura"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Falha na abertura de \"%s\" para escrita"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
-msgstr "Não foi possível analisar o caminho remoto."
+msgstr "Falha ao analisar o caminho retornado."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr "A análise ao certificado de raíz confiável falhou."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Falha na recepção de dados"
 
@@ -3538,11 +3591,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Falha na obtenção de um endereço IP externo, abortando"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Falha na obtenção de um endereço IP externo, usando o endereço local"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Falha na obtenção de um endereço IP local"
 
@@ -3558,14 +3611,14 @@
 msgid "Failed to send command."
 msgstr "Falha no envio do comando."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do "
 "sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3573,14 +3626,14 @@
 "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do "
 "sistema %s (%s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Falha na definição do idioma para %s (%s), a utilizar o idioma padrão do "
 "sistema."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3588,14 +3641,14 @@
 "Falha na definição de um idioma para %s, a utilizar o idioma padrão do "
 "sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Falha na definição do idioma para %s, utilizando o idioma padrão do sistema "
 "(%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3605,7 +3658,7 @@
 msgid "Failed to validate settings"
 msgstr "Falha na validação das configurações"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:953
 msgid "Failed to verify peer certificate"
 msgstr "Falha na verificação do certificado de ponto"
 
@@ -3622,21 +3675,19 @@
 msgid "Failed transfers"
 msgstr "Transferências com falha"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Alternar para o modo ativo"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Ar&quivo:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Ar&quivos"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Arquivo"
 
@@ -3652,7 +3703,7 @@
 msgid "File editing"
 msgstr "Edição do arquivo"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Arquivo já existe"
 
@@ -3660,7 +3711,7 @@
 msgid "File exists action"
 msgstr "O arquivo existe"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "O arquivo foi alterado"
 
@@ -3668,14 +3719,14 @@
 msgid "File lists"
 msgstr "Listas de arquivos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Arquivo não encontrado"
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "File search"
 msgstr "Procura de arquivo"
 
@@ -3711,25 +3762,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Transferência do arquivo bem sucedida, transferência de %s em %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Transferência do arquivo ainda em andamento."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "O arquivo será transferido com o tipo de dados ASCII."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "O arquivo será transferido com o tipo de dados binários"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Erro do FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3737,68 +3788,70 @@
 "O FileZilla pode testar a sua configuração agora para certificar-se que está "
 "tudo configurado corretamente ."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "O FileZilla já está conectado a um servidor."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"O FileZilla está executando em modo quiosque.\n"
-"O tipos 'Normal' e 'Conta' não estão disponíveis nesse modo."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "O FileZilla tem que ser reiniciado para que a alteração de idioma tenha "
 "efeito."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Atualizações do FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Barras de estado da lista de arquivos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nome"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtros..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 "O nome do arquivo para a pasta %s e o arquivo %s não pode ser construído"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Nome de arquivo inválido"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"O nome do arquivo não pode conter nenhum dos seguintes caracteres: / \\ : "
+"* ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nome de arquivo não modificado"
 
-#: resources.h:307 resources.h:957
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nome do arquivo:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Os nomes de arquivo não podem conter quaisquer dos seguintes caracteres: / "
 "* ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3806,13 +3859,13 @@
 "Os nomes de arquivo não podem conter quaisquer dos seguintes caracteres: / "
 "\\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Arquivos que estão sendo editados"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Tamanho"
@@ -3821,65 +3874,68 @@
 msgid "Filesize format"
 msgstr "Formato do tamanho de arquivo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tipo"
 
-#: resources.h:945
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Associações dos tipos de arquivos"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "O filtro aplica-se a:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrar caracteres inválidos nos nomes dos arquivos"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Esse nome de filtro já existe"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "As saídas do filtro correspondem a todos os seguintes"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "As saídas do filtro não correspondem a quaisquer dos seguintes"
 
-#: resources.h:223
+#: resources.h:233
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Esse conjunto de filtros já existe"
 
-#: resources.h:995
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrar as listas de pastas"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Falha na validação do filtro"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Impressão digital (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Impressão digital (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
@@ -3887,7 +3943,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Assistente de configuração de firewall e roteador"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3895,13 +3951,13 @@
 "Para uma informação mais detalhada sobre estas opções, execute o assistente "
 "de configuração de rede."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Para confiabilidade deve ser especificado um intervalo de pelo menos 10 "
 "portas."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3909,31 +3965,31 @@
 "Para essa sessão, serão usadas as configurações padrão. Nenhuma alteração às "
 "configurações serão salvas."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forçar &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "&Forçar a mostra de arquivos ocultos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Forçar a mostra de arquivos ocultos"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Especificações do formato:"
 
-#: resources.h:943
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Formato: Extensão seguida do comando entre aspas e seus parâmetros."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Documentação adicional"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Geral"
 
@@ -3941,21 +3997,21 @@
 msgid "General SOCKS server failure"
 msgstr "Falha geral do servidor de SOCKS"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy genérico"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Obter um endereço IP externo a partir do seguinte URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Obtendo ajuda"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "O nome de conjunto de filtros dado já existe, pretende substituir o conjunto "
@@ -3965,15 +4021,15 @@
 msgid "Global bookmarks"
 msgstr "Marcadores globais"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permissões de grupo"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "A&lto"
 
@@ -3981,21 +4037,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP sobre TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Mistura:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Oculto"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Alta"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Maior"
 
@@ -4003,26 +4059,26 @@
 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."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Mantenha pressionada a tecla shift para alterar o estado do filtro em ambos "
 "os lados simultaneamente."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Página oficial:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Impressão digital da chave do host:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "A chave do host não coincide"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "O host começa com '[' mas não foi encontrado o parêntesis no fecho."
 
@@ -4030,20 +4086,20 @@
 msgid "Host unreachable"
 msgstr "host inacessível"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "host:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Horas,"
 
-#: resources.h:892
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (exemplo: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4053,13 +4109,13 @@
 "tempo do que o especificado, a conexão será fechada e o FileZilla tentará "
 "reconectar-se."
 
-#: resources.h:973
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Se reportar erros, por favor providencie a informação dada no nível de log "
 "\"Verboso\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4071,7 +4127,7 @@
 "estar mal configurado e você deve tentar o modo ativo. Você pode definir um "
 "modo de transferência para cada servidor no Gerenciador de Sites."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4079,7 +4135,7 @@
 "Se a opção de fallback estiver marcada, será possível conectar a servidores "
 "mal configurados que rejeitem o modo de transferência selecionado."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4103,7 +4159,7 @@
 "Se o problema persistir, algum roteador e/ou firewall continua a interromper "
 "a conexão."
 
-#: resources.h:962
+#: resources.h:988
 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 "
@@ -4113,7 +4169,7 @@
 "adicionand um \".1\" no fim do nome (podendo substituir arquivos de log mais "
 "antigos) e um novo arquivo será criado."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4133,7 +4189,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Se esse problema persistir, contacte o fabricante do seu roteador."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4143,7 +4199,7 @@
 "estar sincronizada com a do servidor. Se as horas forem diferentes (p.ex. "
 "fuso horário diferente), entre com um fuso horário no Gerenciador de Sites."
 
-#: resources.h:916
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4151,11 +4207,11 @@
 "Ao usar uma comparação baseada em fusos horários, considera-se dois arquivos "
 "iguais quando as diferenças de fuso não excederem esse intervalo."
 
-#: resources.h:931
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Se o idioma for alterado, é necessário reiniciar o FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4163,11 +4219,11 @@
 "Se você clicar em Teste, o FileZilla irá fazer a conexão a \"probe.filezilla-"
 "project.org\" e realizar alguns testes simples."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Se você sair do FileZilla as alterações serão perdidas."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4175,11 +4231,11 @@
 "Se forem especificados tipos de arquivo errados, esses arquivos podem ser "
 "corrompidos quando transferidos."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Se receber um algum erro, a sua configuração não está a correta."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4198,7 +4254,7 @@
 "tente mudar para modo passivo e contacte o administrador do servidor para "
 "obter ajuda."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4207,7 +4263,7 @@
 "qualquer firewall ou roteador que você tenha deverão estar configurados "
 "adequadamente."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4215,7 +4271,7 @@
 "Se você usa um firewall, certifique-se que é dada permissão ao FileZilla "
 "para aceitar conexões em todas as portas dadas."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4235,7 +4291,7 @@
 msgid "Import data from older version"
 msgstr "Importar dados de uma versão anterior"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importar configurações"
 
@@ -4249,7 +4305,7 @@
 msgid "Improperly quoted association."
 msgstr "Associação não colocada entre aspas corretamente."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4257,7 +4313,7 @@
 "Em modo ativo, o FileZilla tem que supervisionar a porta para transferências "
 "de dados. Deve-se especificar que porta o FileZilla irá usar."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4266,7 +4322,7 @@
 "disponíveis, pois o FileZilla não tem influência nas portas que o sistema "
 "escolhe."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4274,7 +4330,7 @@
 "No caso de preferir atualizações automáticas, pode ativar a verificação "
 "automática de atualizações, na caixa de configurações."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4282,7 +4338,7 @@
 "A fim de usar o modo ativo, o FileZilla precisa saber o seu endereço IP "
 "externo."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4292,7 +4348,7 @@
 "FileZilla pede ao servidor uma porta e se conecta à porta dada. Não há muita "
 "configuração a ser feita para isso."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:967
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4300,20 +4356,20 @@
 "Cadeia incompleta, o certificado raiz não está assinado por uma autoridade "
 "certificadora"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "senha incorreta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "A iniciar o TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Servidor sem segurança, não suporta FTP sobre TLS"
 
-#: ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interativo"
@@ -4323,8 +4379,8 @@
 msgstr "Interface"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Interrompido pelo usuário"
 
@@ -4336,8 +4392,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Resposta HTTP inválida"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4360,12 +4416,13 @@
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Nome de arquivo inválido"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Host inválido, após o fecha colchete só pode haver dois pontos e a porta."
@@ -4374,29 +4431,36 @@
 msgid "Invalid input"
 msgstr "Entrada inválida"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Porta especificada inválida. A porta deve ter um valor entre 1 e 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Especificado um protocolo inválido. Os protocolos válidos são:\n"
+"O protocolo especificado é inválido. Os protocolos válidos são:\n"
 "ftp:// para FTP normal,\n"
 "sftp:// para o protocolo de transferência SSH,\n"
 "ftps:// para FTP sobre SSL (implícito) e\n"
 "ftpes:// para FTP sobre SSL (explícito)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"O proxy do domínio é inválido, após o fecha colchete pode apenas haver dois "
+"pontos e a porta."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Expressão regular inválida nas condições para a procura."
 
@@ -4404,7 +4468,7 @@
 msgid "Invalid response code"
 msgstr "Código de resposta inválido"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Condições para a procura inválidas: %s"
@@ -4416,38 +4480,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Caminho do site inválido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Tamanho inválido nesta condição"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nome de usuário inválido."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "País de jurisdição:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Localidade de jurisdição:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Estado ou província de jurisdição:"
 
-#: resources.h:913
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Manter as pastas em cima"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4458,50 +4522,54 @@
 "alguns testes para verificar se o servidor suporta essa funcionalidade, o "
 "teste pode falhar."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Troca de chave"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Troca de chave:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "M&enor"
 
-#: resources.h:929
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Idioma"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Idioma alterado"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Modificado"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Disposição"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Limite para &downloads simultâneos:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Limite para &uploads simultâneos:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limitar portas locais"
 
-#: resources.h:959
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Limite para o tamanho do arquivo de log"
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limite:"
 
@@ -4509,7 +4577,7 @@
 msgid "Line length exceeded"
 msgstr "Excedido o comprimento da linha"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Lincados com"
 
@@ -4518,21 +4586,21 @@
 msgstr "Soquete de supervisão fechado"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listando:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "M&enor porta disponível:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Local"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Arquivo local"
 
@@ -4548,7 +4616,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Arquivo local não é um nome de arquivo válido."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtros locais:"
 
@@ -4556,7 +4624,7 @@
 msgid "Local site:"
 msgstr "Endereço local:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Localidade:"
 
@@ -4564,16 +4632,16 @@
 msgid "Log file"
 msgstr "Arquivo de log"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Log da procura por atualizações:"
 
-#: resources.h:954
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Logging"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4582,7 +4650,7 @@
 "não entender UTF-8. Não é possivel tentar o mapa de caracteres local uma vez "
 "que está sendo usado proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4590,12 +4658,12 @@
 "Os dados para login contêm caracteres que não são ASCII e o servidor pode "
 "não entender UTF-8. Tentando o mapa de caracteres local."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Sequência de login executada mas mesmo assim não foi logado. Cancelando."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "O tipo de login tem que ser 'ask' ou 'interactive' (sem as aspas)."
 
@@ -4608,13 +4676,13 @@
 "O tipo de login só pode ser usado com URL FTP. O argumento tem que ser '%s' "
 "ou '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Baixo"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Menor"
 
@@ -4622,11 +4690,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "A menor porta disponível tem que ser um número entre 1024 e 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Certifique-se de que o arquivo está acessível e de que é um documento XML "
@@ -4650,7 +4718,7 @@
 msgstr ""
 "Resposta malformada, o servidor não está a enviar fins de linha correctos"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4661,58 +4729,58 @@
 msgid "Manual transfer"
 msgstr "Transferência &manual"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Corresponder a qualquer dos seguintes"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Corresponder a nenhum dos seguintes"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Máximo de &transferências simultâneas:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "Janela de mensagens"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Posição do log de mensagens"
 
-#: resources.h:961
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minutos"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Mover para &baixo"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Mover para &cima"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "O meu computador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Os meus documentos"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Meus Sites"
 
@@ -4721,33 +4789,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nome"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Esse nome já existe"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "O nome do marcador já existe."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "É necessário introduzir o nome do filtro"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "É necessário entrar com um caminho remoto válido"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "É necessário especificar a codificação de caracteres"
 
@@ -4755,19 +4823,23 @@
 msgid "Network unreachable"
 msgstr "Rede inacessível"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Nunca"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Nova &Pasta"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "&Nova aba"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Novo &Marcador"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4780,41 +4852,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Novo marcador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nova pasta"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Novas funcionalidades e melhoramentos em %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Novo filtro"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nova pasta"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Novo site"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Ao lado da fila de transferência"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Não"
 
@@ -4822,25 +4894,25 @@
 msgid "No category to export selected"
 msgstr "Nenhuma categoria selecionada para exportar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Nenhum comando dado, abortando."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Endereço IP externo não especificado, a tentar o padrão."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Nenhum arquivo está sendo editado."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Não foi dado um nome ao filtro"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Host não especificado, entre com um host."
 
@@ -4848,26 +4920,26 @@
 msgid "No images available"
 msgstr "Nehuma imagem disponível"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Não há mais arquivos na fila!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Não foi dado um nome ao conjunto de filtros."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Não há programa associado a esse tipo de arquivo."
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 "Não foi associado um programa para editar arquivos com essa extensão '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Nenhum resultado para a procura"
 
@@ -4885,23 +4957,23 @@
 msgid "No username given."
 msgstr "Não foi dado nenhum nome de usuário."
 
-#: resources.h:923 resources.h:928
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Nenhuma"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Nenhum selecionado"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:842
-#: ../../locales/../src/engine/server.cpp:861
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4912,15 +4984,15 @@
 "Nem todos os items puderam serrecolocados na fila para serem vistos/editados."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Não conectado"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Não conectado a qualquer servidor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Não conectado a qualquer servidor."
 
@@ -4928,19 +5000,19 @@
 msgid "Not connected."
 msgstr "Não conectado."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Note que essa opção apenas é suportada se usar o protocolo FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Nota: Isso só funciona com conexões FTP simples e não encriptadas."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "Nota: Usar um proxy genérico força o modo passivo em conexões FTP."
 
-#: resources.h:902
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Número de casas decimais:"
 
@@ -4948,21 +5020,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "O número de tentativas tem que ser entre 0 e 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "A&brir arquivo"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4970,130 +5042,136 @@
 "Nas páginas seguintes, o modo de transferência selecionado será configurado, "
 "assim como o modo de fallback, se ativado."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Uma vez"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Apenas as versões do FileZilla e do sistema operational que você está usando "
-"serão submetidas ao servidor."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Uma vez por semana"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Abrir pasta no Gerenciador de arquivos do sistema"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Abrir o Gerenciador de Sites"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Abrir o Gerenciador de Sites."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Abre o Gerenciador de Sites. CLique o botão direito do mouse para listas os "
+"sites."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Abrir o arquivo."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Abre a caixa de configurações do FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Aberto como:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
 msgstr "Falha na abertura"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Abre uma nova aba"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Abre o Gerenciador de Sites"
 
-#: resources.h:996
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Abre a janela dos filtros da lista de pastas. Botão direito do mouse para "
 "alternar entre filtros."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistema operacional"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Foi detectado um problema no sistema operational"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organização:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Outro:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Introdução"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Substituir &se for mais recente"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Substituir arquivo"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Substituir arquivo se o tamanho diferir"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Substituir arquivo se o tamanho diferir ou o arquivo de origem for mais "
 "recente"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Substituir arquivo se o arquivo de origem for mais recente"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Substituir se o tamanho for &diferente"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr ""
 "Substituir se o ta&manho for diferente ou o arquivo de origem for mais "
 "recente"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permissões do proprietário"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Proprietário/Grupo"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 "Impedi&r a suspenção do sistema durante as transferências e outras operações"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Host do p&roxy:"
@@ -5102,27 +5180,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Comando PORT danificado pelo roteador ou firewall."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssivo (recomendado)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pacote"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
 msgstr "O parâmetro não é um URL válido"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "&Senha:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Pa&ssivo (recomendado)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Modo passivo"
@@ -5137,42 +5215,42 @@
 msgid "Password required"
 msgstr "Senha requerida"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Caminho"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: resources.h:411
 msgid "Paths"
 msgstr "Caminhos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Remoção pendente"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Permissões"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permissões"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plataforma:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5188,7 +5266,7 @@
 "Consulte o site http://filezilla-project.org/probe.php para confirmar se o "
 "servidor está ativo e verifique suas configurações cuidadosamente."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5197,7 +5275,7 @@
 "atualização ou vá o site http://filezilla-project.org para baixar o código-"
 "fonte do FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5225,7 +5303,7 @@
 msgid "Please enter a custom time format."
 msgstr "Entre com um formato personalizado para a hora."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Entre a data no formato AAAA-MM-DD como, por exemplo, 2010-07-18"
@@ -5236,20 +5314,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Insira uma velocidade de download maior ou igual que 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Entre com um nome para o filtro novo."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Entre com um novo nome para o filtro copiado."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Entre com um novo nome para o conjunto de filtros\"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Entre com um novo nome para o filtro."
 
@@ -5272,11 +5350,11 @@
 msgstr ""
 "Entre com um número entre 1 e 10 para o número de transferências simultâneas."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Entre com uma senha para esse servidor:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5292,11 +5370,11 @@
 msgstr ""
 "Entre com um limite de tempo entre 5 e 9999 segundos ou 0 para nenhum limite."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Entre com um nome único para esse conjunto de filtros"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Entre com um nome de usuário para esse servidor:"
 
@@ -5308,17 +5386,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Entre com uma URL onde se possa obter o seu endereço externo."
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Entre com um intervalo entre atualizações de pelo menos 7 dias"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Entre com um limite de velocidade de envio maior ou igual a 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5326,14 +5400,18 @@
 "Entre com um comando FTP bruto.\n"
 "Usar comandos FTP brutos limpará o cache de pastas."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Entre com o nome da pasta que deve ser criada:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Insira o nome do arquivo que deve ser criado:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Entre com um nome de usuário e uma senha para esse servidor:"
 
@@ -5352,7 +5430,7 @@
 "assistente. Caso você tenha um endereço dinâmico ou não saiba o seu "
 "endereço, use a opção de resolução externa."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5369,7 +5447,7 @@
 "outros computadores e certifique-se que você entrou com o nome endereço de "
 "resolução corretamente."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Certifique-se que o local pedido está instalado no seu sistema."
 
@@ -5385,7 +5463,7 @@
 "'port forwarding' manual. Não trabalhe com o roteador nos chamados 'DMZ "
 "mode' ou 'game mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5397,7 +5475,7 @@
 "utilizada por cavalos de tróia ou outro tipo de malware. Isto poderá gerar "
 "um falso alarme que pode ser ignorado com segurança."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5405,7 +5483,7 @@
 "Note que a preservação da data e da hora em envios em servidores de FTP, "
 "FTPS e FTPES só funciona se eles suportarem o comando MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5413,7 +5491,7 @@
 "Note que alguns servidores podem bani-lo se tentar conectar demasiadas vezes "
 "em intervalos de tempo muito curtos."
 
-#: resources.h:889 resources.h:895
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5422,7 +5500,7 @@
 "Veja http://wiki.filezilla-project.org/Date_and_Time_formatting para mais "
 "detalhes"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5439,38 +5517,38 @@
 "Execute de novo esse assistente se o ambiente de rede for alterado ou em "
 "caso de encontrar problemas com servidores que anteriormente funcionaram bem."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Selecione uma ação:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Selecione as categorias que deseja importar"
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Selecione o modo de transferência padrão que deseja usar."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Selecione os novos atributos para a pasta \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Selecione os novos atributos para o arquivo \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Selecione os novos atributos para as pastas Selecionadas."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Selecione os novos atributos para os arquivos e pastas selecionados."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Selecione os novos atributos para os arquivos selecionados."
 
@@ -5488,7 +5566,7 @@
 "o roteador nos chamados 'DMZ mode' ou 'game mode'. Coisas como inspeção de "
 "protocolo ou 'fixups' específicos do protocolo têm que ser desativados"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5496,8 +5574,8 @@
 "Visite o site http://filezilla-project.org para mais informações sobre o "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5505,17 +5583,17 @@
 "Visite o site http://filezilla-project.org para fazer download da versão "
 "mais recente."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Código postal:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Sites predefinidos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Preservando data e hora dos arquivos"
 
@@ -5523,48 +5601,62 @@
 msgid "Preview:"
 msgstr "Preview:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:993
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Os certificados da conexão anterior e da conexão de dados não coincidem."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Imprimir informações de diagnóstico relacionado à inicialização do FileZilla"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Imprimir informação sobre a versão para o 'stdout' e sair"
 
-#: resources.h:912
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Priorizar pastas (padrão)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioridade"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Política de privacidade:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Política de privacidade: Apenas as informações da versão do FileZilla, de "
+"seu sistema operacional e a da arquitetura de sua CPU serão enviadas ao "
+"servidor."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Chaves &privadas:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Protoco&lo:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Senha do pro&xy"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Processar &fila"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "&Porta do &proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Usuário do proxy:"
 
@@ -5572,12 +5664,17 @@
 msgid "Proxy authentication failed"
 msgstr "A autenticação do proxy falhou"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "A saudação do proxy falhou: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"O domínio proxy começa com '[' mas não foi encontrado o fechar parêntesis."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5594,24 +5691,24 @@
 "O pedido de proxy falhou: tipo do endereço desconhecido na resposta do "
 "CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 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"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Autenticação por Chave Pública"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritmo da chave pública:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permissões públicas"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "A fila foi processada totalmente"
 
@@ -5630,39 +5727,39 @@
 msgid "Queue: empty"
 msgstr "Fila: vazia"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Arquivos na fila"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Enfileirando:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&einiciar o computador"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Árvore de pastas &remota"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "Limpar &e recolocar arquivos selecionados na fila"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Comando FTP bruto:"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "L&er"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "A&tualizar"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Re&nomear"
 
@@ -5674,65 +5771,79 @@
 "Reexecute o assistente e verifique com cuidado as configurações de todos as "
 "roteadores e firewalls."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Le&r"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Somente leitura"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Deseja mesmo cancelar a operação atual?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Deseja mesmo apagar 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:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Deseja mesmo apagar o arquivo %d?"
-msgstr[1] "Deseja mesmo apagar os arquivos %d?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] ""
+"Deseja realmente excluir o diretório %d e todo o seu conteúdo do servidor?"
+msgstr[1] ""
+"Deseja realmente excluir os diretórios '%d' e todo o seu conteúdo de seu "
+"computador?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Deseja mesmo apagar %s e %s?"
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Deseja realmente excluir o arquivo %d do servidor?"
+msgstr[1] "Deseja realmente excluir os arquivos %d do servidor?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Deseja realmente excluir %s e %s do servidor?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Deseja realmente excluir todos arquivos e/ou diretórios do servidor?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Deseja mesmo apagar todos arquivos e/ou pastas selecionados?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Deseja realmente excluir todos arquivos e/ou diretórios selecionados de seu "
+"computador?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Motivo"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Reiniciar agora"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Incl&uir subpastas"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"Foi recebida uma listagem de diretório que parece ser codificado em EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Recebida uma linha com mais de 10000 carateres, cancelando."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Dados recebidos danificados."
 
@@ -5745,11 +5856,11 @@
 "um servidor.\n"
 "Se continuar, a conexão atual vai terminar."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Configurações para voltar a conectar"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Volta a conectar ao último servidor usado"
 
@@ -5757,34 +5868,38 @@
 msgid "Redirection to invalid address"
 msgstr "Redireccionado para um endereço inválido"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Atualiza as listas de arquivos e de pastas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Re&lembrar senhas?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "O certificado remoto não é de confiança."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Arquivo remoto"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Procura de arquivos remotos"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filtros remotos:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Caminho remoto"
 
@@ -5797,7 +5912,7 @@
 "Não foi possível analisar o caminho remoto. Certifique-se de que é um "
 "caminho absoluto válido e suportado pelo tipo do servidor atual do site (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5809,7 +5924,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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 "
@@ -5819,11 +5934,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Não foi possível analisar o caminho local."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Tratando caminho remoto:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Caminho remoto:"
 
@@ -5831,76 +5946,76 @@
 msgid "Remote site:"
 msgstr "Endereço remoto:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Remover &todos"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Remover &selecionados"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Renomear arquivo"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Renomear a pasta selecionada"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Renomear arquivos e pastas selecionadas"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Renomeando '%s' para '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Reportar erros e pedidos de funcionalidades"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Requer FTP sobre TLS explícito"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Requer FTP sobre TLS implícito"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Limp&ar e recolocar todos na fila"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "A resolver o endereço de %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "A resolver o nome do host"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Resposta:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Resultados:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Continuar transferência de arquivos"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5908,34 +6023,38 @@
 "A continuação de arquivos ASCII pode causar problemas se o servidor usar um "
 "término de linha diferente da do cliente."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Obtendo lista de pastas..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Obtendo endereço IP externo a partir de %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "Root certificate is not trusted"
 msgstr "O certificado de raiz não é de confiança"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "&Mostrar os arquivos que estão sendo editados..."
 
-#: resources.h:609
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "M&ostrar o Gerenciador de Sites ao iniciar"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "D&esligar o computador"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Parar"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Navegação &sincronizada"
 
@@ -5943,31 +6062,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Salvar configurações?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "O salvamento de senha foi desativado pelo administrador do sistema."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "O salvamento de senha foi desativado por você."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Procurando arquivos para adicionar à fila"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Procurando arquivos para enviar"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "&Condições para a procura:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Procurar na &pasta:"
 
-#: resources.h:1001
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Procurar arquivos novamente."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Procurar no servidor pelos arquivos"
 
@@ -5980,26 +6113,26 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Veja também: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Sele&cione o servidor"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Selecione a &página:"
 
-#: resources.h:877
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Selecione o tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Selecione a ação padrão a ser executada se o arquivo já existir no destino."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Selecione o editor padrão"
 
@@ -6019,7 +6152,7 @@
 "Selecione a ação padrão se o arquivo já existir no destino somente para os "
 "arquivos atualmente selecionados na fila."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Selecione localização para download do pacote"
 
@@ -6040,7 +6173,7 @@
 msgstr "Selecione arquivo para exportadar as configurações"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Selecione arquivo para os sites exportados"
 
@@ -6056,12 +6189,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Selecione nome de arquivo para a chave de arquivo convertida"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Selecione como deverão ser abertos esses arquivos."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Selecione pasta destino para download"
 
@@ -6069,15 +6202,15 @@
 msgid "Select target filename"
 msgstr "Selecione nome do arquivo destino"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Selecione as categorias a serem exportadas:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Selecione os dados privados que deseja apagar."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6091,7 +6224,7 @@
 msgstr[0] "Selecionada %d pasta."
 msgstr[1] "Selecionadas %d pastas."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6112,7 +6245,7 @@
 msgstr[0] "Selecionado %d arquivo. Tamanho: No mínimo %s"
 msgstr[1] "selecionados %d arquivos. Tamanho: No mínimo %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Selecionados %s e %s para transferir."
@@ -6127,13 +6260,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Selecionados %s e %s. Tamanho: No mínimo %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "O editor selecionado não existe."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "O arquivo selecionado já está sendo editado."
 
@@ -6141,15 +6274,15 @@
 msgid "Selected file is already loaded"
 msgstr "O arquivo selecionado já está carregado."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "O arquivo selecionado já está aberto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
 msgstr "O arquivo selecionado ainda está sendo editado"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "O filtro selecionado só funciona para arquivos locais."
 
@@ -6166,38 +6299,43 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "A porta selecionada é habitualmente usada por um protocolo diferente."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Enviar &comandos para manter o FTP ativo"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Envia comandos personalizados ao servidor de outro modo não disponíveis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "A enviar um comando para manter a atividade"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Número de série:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Tipo de servidor:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "O servidor não fechou devidamente a conexão TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+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:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "O servidor não suporta continuação de arquivos > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6206,15 +6344,15 @@
 "O servidor não suporta continuação de arquivos > %d GB. Terminar a "
 "transferência se o tamanho dos arquivos for maior."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "O servidor não suporta continuação de arquivos > 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "O servidor não suporta continuação de arquivos > 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6223,7 +6361,7 @@
 "O servidor pode não suportar a continuação de arquivos > %d GB. Terminar a "
 "transferência se o tamanho dos arquivos for maior."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6231,12 +6369,11 @@
 "O servidor pode exigir uma conta. Tenter especificar uma conta através do "
 "Gerenciador de Sites."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
-msgstr "O servidor enviou uma resposta inesperada."
+msgstr "O servidor enviou um caminho em branco."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6244,13 +6381,13 @@
 "O servidor enviou um pedido de login adicional. É necessário usar de usar "
 "login interativo."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "O servidor enviou uma resposta passiva com um endereço não roteável. Modo "
 "passivo falhou."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6270,101 +6407,113 @@
 msgid "Server sent unexpected reply."
 msgstr "O servidor enviou uma resposta inesperada."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "MAC do servidor para o cliente:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Cifra do servidor para o cliente:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Tipo de &servidor:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Arquivo remoto/local"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Servidor:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Detalhes da sessão"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Definir &Prioridade"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Definir permissões de '%s' para '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize chamado sem soquete"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Configurações"
 
-#: resources.h:974
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Mostrar &lista bruta de pastas"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "&Mostrar a janela de boas-vindas..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Mostrar ambas as árvores de pastas e continuar a comparação?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Mostrar codificações TLS disponíveis"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Mostra essa janela de ajuda"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Desconectar o computador"
 
-#: resources.h:299
+#: resources.h:9
+#, fuzzy
+msgid "Signature algorithm:"
+msgstr "Algoritmo da chave pública:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Entradas do &Gerenciador de Sites"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Gerenciador de Sites"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gerenciador de Sites - Não foi possível relembrar a senha"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Gerenciador de Sites - Dados Inválidos"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Gerenciador de Sites já aberto"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "O site não existe."
 
@@ -6374,8 +6523,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "O caminho para o site está incorreto."
 
@@ -6394,11 +6543,11 @@
 "Gerenciador de Sites.\n"
 "Adicionar a conexão atual ao Gerenciador de Sites?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Tamanho"
 
-#: resources.h:896
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Formato do tamanho"
 
@@ -6407,32 +6556,32 @@
 msgid "Size unknown"
 msgstr "Tamanho desconhecido"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Pular arquivo"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Pulando a transferência de %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Pulando o envio de %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
 msgstr ""
 "Alguns arquivos ainda estão sendo editados ou precisam de ser enviados."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6440,19 +6589,19 @@
 "Alguns servidores mal configurados que estão atrás de um roteador podem "
 "responder com o endereço IP local deles."
 
-#: resources.h:914
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Ordenar as pastas em linha"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "A ordenação não pode ser alterada se estiver comparando pastas."
 
-#: resources.h:910
+#: resources.h:932
 msgid "Sorting"
 msgstr "Ordenação"
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Modo de ordenação:"
 
@@ -6464,20 +6613,20 @@
 msgid "Source and target file may not be the same"
 msgstr "O arquivo original e o de destino podem não ser os mesmos"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "O destino e a fonte da operação 'soltar' são idênticos"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Arquivo de origem:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limites de velocidade"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Limites de velocidade"
 
@@ -6489,7 +6638,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Limites de velocidade estão ativados, clique aqui para modificar."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versões beta e estável"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Apenas versões estáveis"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Começar a transferência &imediatamente"
 
@@ -6497,43 +6654,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Começar com o Gerenciador de Sites aberto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Iniciando a transferência de %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Iniciando o envio de %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Estado ou província:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Estado:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Parar e remover &todos"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Rua:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Objeto do certificado"
 
@@ -6541,11 +6698,11 @@
 msgid "Successful transfers"
 msgstr "Transferências bem sucedidas"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Sumário dos resultados do teste:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6553,56 +6710,56 @@
 "Atalhos simbólicos a arquivos não são afetadas por essa opção, tais atalhos "
 "são sempre apagados."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Navegação sincronizada"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "A navegação sincronizada foi desativada."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Erro de sintaxe"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Erro de sintaxe na linha de comandos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistema"
 
-#: resources.h:518
-msgid "T&ool bar"
-msgstr ""
+#: resources.h:535
+msgid "T&oolbar"
+msgstr "Barra de F&erramentas"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Conexão TLS/SSL estabelecida, a enviar o pedido HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Conexão TLS/SSL estabelecida, à espera da mensagem de boas-vindas..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Conexão TLS/SSL estabelecida."
 
@@ -6610,28 +6767,32 @@
 msgid "TTL expired"
 msgstr "TTL expirado"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "O arquivo já existe no destino"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Arquivo destino:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "O arquivo já existe no destino!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr ""
 "O nome do arquivo já existe no destino, tem a certeza que quer continuar?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Resultados do teste"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testando as capacidades de continuação de arquivos do servidor"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6648,7 +6809,7 @@
 "O Gerenciador de Sites está aberto em outra instância do FileZilla 3.\n"
 "Feche-o ou os dados não serão apagados."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "O código do documento XML não está correto: %s"
@@ -6659,11 +6820,11 @@
 msgstr "O endereço que você introduziu foi: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Não foi possível salvar o marcador."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Não foi possível limpar os marcadores."
 
@@ -6675,21 +6836,22 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "A sequência para o login não pode estar vazia."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Não foi encontrado o editor para os arquivos de texto."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "O editor para os arquivos de texto é o '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "O nome de filtro indicado já existe."
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr ""
+"O nome de filtro inserido já existe, por favor escolha um nome diferente."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6706,9 +6868,9 @@
 "O arquivo %s já existe.\n"
 "Entre com um novo nome:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6726,14 +6888,14 @@
 "Não foi possível carregar o arquivo '%s' ou esse não contém uma chave "
 "privada."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Não foi possível carregar o arquivo '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6742,8 +6904,8 @@
 "Não foi possível abrir o arquivo '%s':\n"
 "Nenhum programa está associado no seu sistema a esse tipo de arquivo."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6785,7 +6947,7 @@
 "não são suportados pelo FileZilla.\n"
 "Gostaria de o converter para um arquivo desprotegido?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "O arquivo selecionado como editor padrão não existe."
 
@@ -6821,11 +6983,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Os seguintes caracteres serão substituídos: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Os arquivos seguintes estão sendo editados:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "A solução FTP de código aberto gratuita"
 
@@ -6833,7 +6995,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Não foi possível salvar os marcadores globais."
 
-#: resources.h:972
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6864,7 +7026,7 @@
 msgstr ""
 "A menor porta disponível tem que ser menor ou igual à maior porta disponível."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6872,7 +7034,7 @@
 "A versão mais recente foi baixada. Clique em Terminar para sair do FileZilla "
 "e começar a instalação."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6880,11 +7042,11 @@
 "A versão mais recente foi baixada. Por favor instale a nova versão da mesma "
 "forma como essa versão foi instalada."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "A fila não será salva."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6898,24 +7060,24 @@
 msgid "The selected categories have been imported."
 msgstr "As categorias Selecionadas foram importadas."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "O arquivo selecionado contém dados importáveis para as seguintes categorias."
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "O arquivo selecionado já está sendo editado:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "O arquivo selecionado ainda está aberto em outro programa, por favor feche-o."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6933,7 +7095,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "O servidor enviou uma resposta inesperada ou não reconhecida."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "O servidor utiliza o seguinte mapa de caracteres para os nomes de arquivo:"
@@ -6946,7 +7108,7 @@
 "O certificado do servidor é desconhecido. Examine com cuidado o certificado "
 "para ter a certeza que o servidor é de confiança."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6956,7 +7118,7 @@
 "Isto significa que ou o administrador alterou a chave do servidor ou está a "
 "tentar conectar a um computador que se faz passar pelo servidor."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6972,15 +7134,15 @@
 "As configurações foram importadas. Tem de reiniciar o FileZilla para que "
 "todas as configurações produzam efeito."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "O sistema irá reiniciar em breve a não ser que clique em Cancelar."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "O sistema irá desligar em breve a não ser que clique em Cancelar."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6988,7 +7150,7 @@
 "O arquivo já existe.\n"
 "Escolha uma ação."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "O teste não foi bem sucedido. Quer mesmo salvar as configurações?"
 
@@ -6996,11 +7158,11 @@
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Esse conjunto de filtros não pode ser removido."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Esse conjunto de filtros não pode ser renomeado."
 
@@ -7012,7 +7174,7 @@
 "Isto significa que algum roteador e/ou firewall ainda está interferindo com "
 "o FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7020,7 +7182,7 @@
 "Isso só funciona se você não estiver usando um roteador, de outro modo o "
 "sistema devolverá apenas o seu endereço interno."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7028,25 +7190,25 @@
 "Esse assistente irá ajudá-lo a configurar corretamente qualquer roteador ou "
 "firewall que você tenha e testar essa configuração."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Hora"
 
-#: resources.h:890
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Formato da hora"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Time&out, em segundos:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Timeout"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7055,22 +7217,22 @@
 "Fusos horários: Servidor: %d segundos. Local %d segundos. Diferença: %d "
 "segundos."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Título:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Para comparar pastas, ambas as listas de arquivos têm que estar alinhadas."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Para fazer isso, as árvores de pastas têm que estar ambas visíveis ou ambas "
 "ocultas."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7078,7 +7240,7 @@
 "Para suportar autenticação por chave pública, o FileZilla precisa saber que "
 "chaves privadas usar."
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7095,7 +7257,7 @@
 "Verde: O arquivo é mais recente do que aquele não marcado do outro lado\n"
 "Vermelho: Tamanhos de arquivo diferentes"
 
-#: resources.h:999
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7105,23 +7267,23 @@
 "Se ativada, ao navegar na pasta local também mudará a pasta correspondente "
 "no servidor e vice-versa."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Inicia ou pára a fila de transferência"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Mostra ou oculta a árvore de pastas locais"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Mostra ou oculta o log de mensagens"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Mostra ou oculta a árvore de pastas remotas"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Mostra ou oculta a fila de transferência"
 
@@ -7134,37 +7296,37 @@
 msgstr "Muitos redirecionamentos"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Traçar:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transferência"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Direção da transferência"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Tipo de transferência"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Modo de transferência"
 
-#: resources.h:876
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Fila de transferência"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Configurações de transferência"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Transferência interrompida: %s"
@@ -7173,8 +7335,8 @@
 msgid "Transferred data got tainted."
 msgstr "Os dados transferidos foram danificados."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Transferindo"
 
@@ -7182,69 +7344,69 @@
 msgid "Transfers"
 msgstr "Transferências"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transferências completadas"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Tratar arquivos sem e&xtensão como arquivos ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Tratar os se&guintes tipos de arquivo como arquivos ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Confiar na chave de host alterada:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Confiar na chave de host nova:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Confiar na nova chave e continuar a conexão?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Confiar nesse certificado e continuar a conexão?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Confiar nesse host e continuar a conexão?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tipo"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Tipo de Proxy FTP"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Tipo de proxy genérico:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "E&nviar"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limite de u&pload:"
 
-#: resources.h:938
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "U&sar as associações dos tipos de arquivos, se disponíveis"
 
-#: resources.h:891
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "&Usar o padrão do sistema"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USUÁRIO@&HOST"
 
@@ -7253,16 +7415,16 @@
 msgid "Unassigned error code %d"
 msgstr "Código de erro não atribuído %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unidade:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Tipo de proxy FTP desconhecido, não é possivel gerar a sequência de login."
@@ -7276,7 +7438,7 @@
 msgid "Unknown certificate"
 msgstr "Certificado desconhecido"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7284,7 +7446,7 @@
 "Erro desconhecido ao abrir o arquivo. Certifique-se que o arquivo pode ser "
 "acedido e de que é um documento XML correcto."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Chave de host desconhecida"
 
@@ -7297,7 +7459,7 @@
 "Versão do protocolo da autenticação de nome de usuário / senha de SOCKS "
 "desconhecida: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7320,7 +7482,7 @@
 "A não ser que esse problema seja corrigido, o modo ativo de FTP não "
 "funcionará e o modo passivo terá de ser usado."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:945
 msgid "Unsupported certificate type"
 msgstr "Tipo de certificado não suportado"
 
@@ -7328,25 +7490,24 @@
 msgid "Unsupported redirect"
 msgstr "Redirecionamento não suportado"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "En&viar sem editar"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Atualizações"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Assistente de atualização"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Atualizações"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Enviar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Envio falhou"
 
@@ -7359,99 +7520,99 @@
 msgid "Upload limit: none"
 msgstr "Limite de upload: nenhum"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Enviar pasta selecionada"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Enviar os arquivos e pastas selecionados"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Enviar esse arquivo de volta ao servidor?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Enviar esse arquivo para o servidor?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Enviando"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Enviando e remoção pendente"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Enviando e a terminando a edição"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Usar um mapa de caracteres personali&zado"
 
-#: resources.h:935
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Usar um editor &personalizado:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Usar o &editor padrão para arquivos de texto"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Usar a navegação &sincronizada"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Usa UTF-8 se o servidor o suportar, senão usa o mapa de caracteres local."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Usar ação padrão"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Usar FTP simples"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Usar o servidor conectado atualmente"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Usar um servidor do Gerenciador de Sites"
 
-#: resources.h:885
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Usar o pa&drão do sistema"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Utilizar o seguinte endereço IP:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Utilizar o seguinte intervalo de portas:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Utilizar o endereço IP externo do servidor"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Use isso se você estiver atrás de um roteador e tiver um endereço IP externo "
 "estático."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7462,38 +7623,38 @@
 "primeira vez. Somente a versão do FileZilla que está sendo usadar será "
 "submetida ao servidor."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Usuário:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "O nome de usuário não pode ser uma série de espaços"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Usando o proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "O uso de um mapa de caracteres errado pode fazer com que nomes de arquivos "
 "não sejam mostrados corretamente."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Usando esse assistente você pode procurar atualizações disponíveis para o "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Válido desde:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Válido até:"
 
@@ -7501,47 +7662,47 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Mensagens de entrada verbosas a partir de wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1149
 msgid "Verifying certificate..."
 msgstr "Verificando certificado..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versão"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Muito alta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Ver conjunto de opções oculto, mas não suportado pelo servidor"
 
-#: resources.h:922
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Ver/Editar"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Colunas visíveis"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "G&ravar"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Aguardando"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Aguardando conexão do navegador"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Aguardando a senha"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Aguardando a transferência ser cancelada"
 
@@ -7549,7 +7710,7 @@
 msgid "Waiting to retry..."
 msgstr "Aguardando para tentar novamente..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7579,11 +7740,11 @@
 "aplicação' sejam desligados,\n"
 "o FileZilla entrará em espera em grandes transferências."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Aviso, ignorando a conexão de um IP errado."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7598,23 +7759,31 @@
 "\n"
 "Quer mesmo procurar 'nightly builds'?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Aviso: Possível quebra de segurança!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Bem-vindo ao FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Novidades"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Novidades:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Ao permitir que o FileZilla relembre senhas, você pode se reconectar sem ter "
+"que reintroduzir uma senha depois de reiniciar o FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7623,11 +7792,15 @@
 "operacional local nos nomes de arquivos são substituídos se fizer o download "
 "do arquivo."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Tela panorâmica"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Você gostaria que o FileZilla relembre senhas?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Gra&var"
 
@@ -7640,11 +7813,19 @@
 msgid "Wrong line endings"
 msgstr "Fins de linha incorretos"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Sim"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Parece que você está usando apenas um domínio IPv6. Este assistente não "
+"suporta esse ambiente."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7652,15 +7833,15 @@
 "Você já está usando a versão mais recente do FileZilla. Por favor, verifique "
 "novamente no futuro."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Pode sempre voltar a abrir essa janela a partir do menu de ajuda."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Você pode manter o campo de Portas vazio para utilizar a porta padrão."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7688,19 +7869,19 @@
 "Você não entrou com um novo nome para o arquivo. Substituir o arquivo "
 "existente?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Você selecionou pelo menos um atalho simbólico."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 "Você selecionou mais de 10 arquivos para edição, deseja mesmo continuar?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7709,11 +7890,11 @@
 "mesmo continuar?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "É necessário entrar com um nome de host."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "É necessário entrar com uma pasta local."
 
@@ -7722,17 +7903,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "É necessário entrar com um endereço IP válido."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "É necessário entrar com uma pasta local com permissão de escrita."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "É necessário entrar com um nome de conta"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "É necessário entrar com um nome de usuário"
 
@@ -7752,23 +7933,23 @@
 msgid "You need to enter a name for the log file."
 msgstr "É necessário entrar com um nome para o arquivo de log."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "É necessário entrar com um comando entre aspas."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "É necessário entrar com um host de proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr ""
 "É necessário entrar com uma porta do proxy do intervalo entre 1 e 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "É necessário entrar com pelo menos um caminho, não são suportados marcadores "
@@ -7776,7 +7957,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7784,7 +7965,7 @@
 "É necessário entrar com ambos os caminhos, local e remoto, para permitir a "
 "navegação sincronizada para esse marcador."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7816,44 +7997,49 @@
 "Não deve haver problemas em conectar outros servidores, as transferências de "
 "arquivos devem funcionar normalmente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "depois de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "antes de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "começa com"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "contém"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "não contêm"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "é diferente de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "termina com"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "é igual a"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "arquivo"
 
@@ -7872,83 +8058,128 @@
 "Certifique-se que esse executável existe na mesma pasta de programa do "
 "FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp não pôde ser iniciado"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:983
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 "o módulo gnutls_certificate_get_peers não retornou qualquer certificado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "é maior que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "grupo de execução"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "grupo de leitura"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "grupo de gravação"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "é igual a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "está ligado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "está desligado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "é menor que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "atende regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "proprietário para executáveis"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "proprietário para leitura"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "proprietário para gravação"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1160
+#: ../../locales/../src/engine/tlssocket.cpp:1171
+#: ../../locales/../src/engine/tlssocket.cpp:1186
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "executável global"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "leitura global"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "gravação global"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Copy"
+#~ msgstr "&Copiar"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Ativar a verificação automática de atualizações."
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Número de dias entre verificações de atualizações:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Pelo menos 7 dias)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Verificação automática de atualizações"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Procurar por versões &beta e pré-lançamentos"
+
+#~ msgid "Cop&y"
+#~ msgstr "Cop&iar"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Nome do filtro duplicado"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Entre com um intervalo entre atualizações de pelo menos 7 dias"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Política de privacidade:"
+
 #, fuzzy
 #~ msgid "Serial Number:"
 #~ msgstr "Número de série:"
diff -Nru filezilla-3.5.3/locales/pt_PT.po filezilla-3.7.3~precise/locales/pt_PT.po
--- filezilla-3.5.3/locales/pt_PT.po	2011-05-15 21:29:46.000000000 +0000
+++ filezilla-3.7.3~precise/locales/pt_PT.po	2013-06-18 20:02:24.000000000 +0000
@@ -6,8 +6,8 @@
 msgstr ""
 "Project-Id-Version: FileZilla 3 pt\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-05-15 23:22+0200\n"
-"PO-Revision-Date: 2011-05-13 00:35-0000\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-11 01:45-0000\n"
 "Last-Translator: Inácio Barroso <caderno@hotmail.com>\n"
 "Language-Team: \n"
 "MIME-Version: 1.0\n"
@@ -20,16 +20,16 @@
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S decorridos"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S restantes"
 
-#: resources.h:777
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -47,9 +47,9 @@
 msgstr[0] "%d pasta"
 msgstr[1] "%d pastas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -58,9 +58,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -93,31 +93,21 @@
 msgstr[0] "%d segundo"
 msgstr[1] "%d segundos"
 
-#: resources.h:774
+#: resources.h:796
 msgid "%h - Host"
-msgstr "%h - Anfitrião"
+msgstr "%h - Servidor"
 
-#: resources.h:776
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Palavra-passe:"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -132,7 +122,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ainda não é válido!"
 
-#: resources.h:778
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Utilizador proxy"
@@ -154,27 +144,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -189,7 +169,7 @@
 "Por favor, descarregue o FileZilla novamente. Se este problema persistir, "
 "por favor reporte este erro."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -212,152 +192,148 @@
 msgid "%s with %d bits"
 msgstr "%s com %d bits"
 
-#: resources.h:775
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Nome de utilizador:"
 
-#: resources.h:779
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Palavra-passe do Proxy"
 
-#: resources.h:554
+#: resources.h:572
 msgid "&About..."
 msgstr "&Sobre ..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Conta:"
 
-#: resources.h:101 resources.h:679 resources.h:743
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Activo"
 
-#: resources.h:545
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Adicionar aos marcadores ..."
 
-#: resources.h:558 resources.h:575
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Adicionar ficheiros à lista"
 
-#: resources.h:787
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Adicionar chave de ficheiro ..."
 
-#: resources.h:629 resources.h:648
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Adicionar à lista"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Ajustar a diferença do fuso horário do servidor:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Confiar sempre neste certificado em sessões futuras."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
-msgstr "&Confiar sempre neste anfitrião, adicionar esta chave ao cofre"
+msgstr "&Confiar sempre neste servidor, adicionar esta chave ao cofre"
 
-#: resources.h:938
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Utilizar sempre o editor predefinido"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Utilizar sempre a selecção para ficheiros não associados"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Utilizar sempre esta acção"
 
-#: resources.h:755
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Pedir ao sistema operativo pelo endereço IP externo"
 
-#: resources.h:527 resources.h:659 resources.h:824
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Automático"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Auto-detectar"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binário"
 
-#: resources.h:898
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "A usar símbolos SI nos prefixos &binários. (p.ex. 1 KB = 1024 bytes)."
 
-#: resources.h:544
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Marcadores"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:935 resources.h:957
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Explorar ..."
 
-#: resources.h:814
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Tolerância à falha"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:727
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Cancelar"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Procurar por versões beta do FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Limpar os dados privados ..."
 
-#: resources.h:602
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Sair do FileZilla"
 
-#: resources.h:669
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configurar os limites de velocidade..."
 
-#: resources.h:532
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Configurar..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Ligar"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Copiar"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Copiar a ligação actual para o Gestor de Sítios..."
 
-#: resources.h:172 resources.h:611
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copiar para a área de transferência"
 
-#: resources.h:616
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Abortar"
 
-#: resources.h:566 resources.h:580 resources.h:631 resources.h:652
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Criar pasta"
 
-#: resources.h:664
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Criar novo separador"
 
@@ -365,650 +341,658 @@
 msgid "&Debug"
 msgstr "&Corrigir erros"
 
-#: resources.h:965
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Informações sobre a correcção de erros na janela de mensagens:"
 
-#: resources.h:931
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Editor predefinido:"
 
-#: resources.h:525 resources.h:594
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Acções ..."
 
-#: resources.h:737
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Tempo de espera entre tentativas de início de sessão falhadas:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:569 resources.h:654
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Apagar"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Apagar a ligação simbólica"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Comparação de pastas"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
-"&Descartar o ficheiro local e depois descarregar e editar um ficheiro novo"
+"&Descartar o ficheiro local e depois transferir e editar um ficheiro novo"
 
-#: resources.h:538
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Desligar"
 
-#: resources.h:603
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Desligar do servidor"
 
-#: resources.h:874
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 "&Mostrar a velocidade de transferência temporária em vez da velocidade "
 "teórica"
 
-#: resources.h:896
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Mostrar o tamanho em bytes"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Não lembrar as palavras-passe"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Não mostrar esta caixa outra vez."
 
-#: resources.h:760
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Não usar o endereço IP externo em ligações locais."
 
-#: resources.h:918
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Acção para o clique &duplo nos ficheiros:"
 
-#: resources.h:573 resources.h:627
+#: resources.h:591 resources.h:649
 msgid "&Download"
-msgstr "&Descarregar"
+msgstr "&Transferir"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
-msgstr "&Descarregar para:"
+msgstr "&Transferir para:"
 
-#: resources.h:662
+#: resources.h:684
 msgid "&Download..."
-msgstr "&Descarregar ..."
+msgstr "&Transferir ..."
 
-#: resources.h:257 resources.h:836
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Descargas:"
 
-#: resources.h:503 resources.h:564
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Editar"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Editar regras dos filtros ..."
 
-#: resources.h:512 resources.h:531 resources.h:642 resources.h:668
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Activar"
 
-#: resources.h:946
-msgid "&Enable automatic update check"
-msgstr "&Autorizar a verificação automática de actualizações."
-
-#: resources.h:481 resources.h:809
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Autorizar os limites de velocidade"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Codificação:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Encriptação:"
 
-#: resources.h:610
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Introduzir comando personalizado ..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Executar"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Exportar as Entradas do Gestor de Sítios"
 
-#: resources.h:498 resources.h:658
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exportar ..."
 
-#: resources.h:765
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Retroceder para o modo activo"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Ficheiro"
 
-#: resources.h:639
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Atributos do ficheiro ..."
 
-#: resources.h:589
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Permissões do &ficheiro ..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Ficheiro:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Condições para os &filtros:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Conjuntos de filtros:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtros:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Terminar"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&A terminar de editar e a apagar o ficheiro local."
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
-"&Unir os caminhos remotos, descarregar todos os ficheiros directamente para "
-"a pasta indicada"
+"&Unir os caminhos remotos, transferir todos os ficheiros directamente para a "
+"pasta indicada"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Seguir a ligação simbólica, apagar o conteúdo da pasta indicada"
 
-#: resources.h:758
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Obter um endereço IP externo a partir do seguinte URL:"
 
-#: resources.h:552
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Obter ajuda ..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Marcador Universal"
 
-#: resources.h:794
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 a usar o método CONNECT"
 
-#: resources.h:548
+#: resources.h:566
 msgid "&Help"
 msgstr "&Ajuda"
 
-#: resources.h:515 resources.h:645
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Esconder ficheiros idênticos"
 
-#: resources.h:596
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Maior"
 
-#: resources.h:753
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Porta maior disponível:"
 
-#: resources.h:79 resources.h:378 resources.h:717
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
-msgstr "&Anfitrião:"
+msgstr "&Servidor:"
 
-#: resources.h:897
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Prefixos binários IEC (p.ex. 1 KiB = 1024 bytes)"
 
-#: resources.h:885
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exemplo: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importar ..."
 
-#: resources.h:940
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Associações dos tipos de ficheiro do sistema"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Manter a estrutura remota de caminhos relativa à raiz de procura"
 
-#: resources.h:859
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Aparência das janelas de ficheiros e pastas:"
 
-#: resources.h:750
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limitar as portas locais usadas pelo FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limitar o número de ligações simultâneas"
 
-#: resources.h:520
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Árvore de ficheiros local"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Pasta &local:"
 
-#: resources.h:955
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Ligar ao ficheiro"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Tipo de início de sessão:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Tipo de início de sessão:"
 
-#: resources.h:599
+#: resources.h:619
 msgid "&Low"
 msgstr "&Baixo"
 
-#: resources.h:546
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Gerir marcadores ..."
 
-#: resources.h:534
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transferência &manual ..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Número máximo de ligações:"
 
-#: resources.h:735
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Número máximo de tentativas:"
 
-#: resources.h:519
+#: resources.h:537
 msgid "&Message log"
-msgstr "Janela de &Mensagens"
+msgstr "Janela de &mensagens"
 
-#: resources.h:872
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimizar para a Barra de Ferramentas"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nome:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Assistente de configuração de rede ..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Novo"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Novo Sítio"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Nova versão disponível!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Próximo >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Não"
 
-#: resources.h:768 resources.h:793
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Nenhum"
 
-#: resources.h:598
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:947
-msgid "&Number of days between update checks:"
-msgstr "&Número de dias entre verificações de actualizações:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Valor numérico:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:771
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&ABRIR"
 
-#: resources.h:562 resources.h:650
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Abrir"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Substituir"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passivo"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Palavra-passe:"
 
-#: resources.h:606
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Reproduzir som"
 
-#: resources.h:80 resources.h:379 resources.h:721
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Porta:"
 
-#: resources.h:865
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Posição da janela de mensagens:"
 
-#: resources.h:530
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Preservar a data e a hora dos ficheiros transferidos"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Lista"
 
-#: resources.h:723
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Ligação rápida"
 
-#: resources.h:518
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Barra de ligação rápida"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Ler"
 
-#: resources.h:537
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Voltar a ligar"
 
-#: resources.h:509 resources.h:667
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Actualizar"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Lembrar palavra-passe para esta sessão"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Lembrar as palavra-passe"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Pasta &remota:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Caminho &remoto:"
 
-#: resources.h:830
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Remover"
 
-#: resources.h:788
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Remover chave"
 
-#: resources.h:593
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Remover seleccionados"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:571
-#: resources.h:585 resources.h:635 resources.h:656
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Mudar o Nome"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Mudar o nome ..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Reabrir o ficheiro local"
 
-#: resources.h:821
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Substituir caracteres inválidos com:"
 
-#: resources.h:553
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Reportar um erro ..."
 
-#: resources.h:619
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Limpar e voltar a listar todos os ficheiros"
 
-#: resources.h:716
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Reinicar o Assistente"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Retomar"
 
-#: resources.h:604
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Correr o comando ..."
 
-#: resources.h:730
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Correr o assistente de configuração rede agora ..."
 
-#: resources.h:949
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Verificar a existência de actualizações ..."
 
-#: resources.h:770
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SÍTIO"
 
-#: resources.h:795
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Guardar como ..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Procurar"
 
-#: resources.h:539
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Procurar ficheiros remotos ..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Seleccionar Entrada:"
 
-#: resources.h:929
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Seleccionar linguagem:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "Seleccione as colunas a serem mostradas:"
 
-#: resources.h:370 resources.h:535
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Servidor"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Configurações"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Configurações ..."
 
-#: resources.h:964
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Mostrar o menu de correcção de erros"
 
-#: resources.h:605
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Mostrar mensagem"
 
-#: resources.h:954
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Mostrar a data e a hora na janela de mensagens"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Gestor de Sítios ..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Marcador próprio para o sítio"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Saltar"
 
-#: resources.h:533
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "Limites de &velocidade"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&Começar a transferência de imediato"
 
-#: resources.h:864
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Trocar a ordem das janelas local e remota"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Cifras &TLS:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Teste"
 
-#: resources.h:877
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:523
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transferência"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Modo de transferência:"
 
-#: resources.h:522
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Lista de transferências"
 
-#: resources.h:833
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Tratar ficheiros de ponto como ficheiros ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Sem editar"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
-msgstr "&Actualizar a chave do cofre para este anfitrião"
+msgstr "&Actualizar a chave do cofre para este servidor"
 
-#: resources.h:556 resources.h:646
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Enviar"
 
-#: resources.h:267 resources.h:845
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Envios:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Usar um programa próprio"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Usar a navegação sincronizada"
 
-#: resources.h:933
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Usar o editor de texto do sistema"
 
-#: resources.h:756
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Utilizar o seguinte endereço IP:"
 
-#: resources.h:764
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Usar em alternativa o endereço IP externo do servidor"
 
-#: resources.h:900
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "Usar o &separador dos milhares"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Utilizador:"
 
-#: resources.h:719
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Nome de utilizador:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versão %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Ver"
 
-#: resources.h:579
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Ver/Editar"
 
-#: resources.h:939
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Vigiar os ficheiros locais editados e perguntar para enviar as alterações"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Ao procurar actualizações, verificar:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Escrever"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Sim"
 
@@ -1026,13 +1010,27 @@
 msgstr "'%s' não é uma pasta."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
+msgstr "O início de sessão 'Conta' não é suportado pelo protocolo seleccionado"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
 msgstr ""
-"O tipo de início de sessão 'Conta' não é suportado pelo protocolo "
-"seleccionado"
+"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/Mainfrm.cpp:591
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"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:596
 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 "
@@ -1050,120 +1048,116 @@
 msgstr[0] "(%d objecto filtrado)"
 msgstr[1] "(%d objectos filtrados)"
 
-#: resources.h:805 resources.h:807
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 para ilimitado)"
 
-#: resources.h:736
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:738
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 segundos)"
 
-#: resources.h:803
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:732
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 para nenhum)"
 
-#: resources.h:948
-msgid "(At least 7 days)"
-msgstr "(Pelo menos 7 dias)"
-
-#: resources.h:893
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(exemplo: %H:%M)"
 
-#: resources.h:887
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(exemplo: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:811 resources.h:813
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(em %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S restantes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- restantes"
 
-#: resources.h:704
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Router e/ou Firewall inutilizadas"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Ficheiro corrumpido no espelho"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware no seu sistema"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- restantes"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c não pode ser usado junto com um endereço FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l apenas pode ser usado com um endereço FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s e -c não podem ser apresentados ao mesmo tempo."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s não pode ser usado junto com um endereço FTP."
 
-#: resources.h:966
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Nada"
 
-#: resources.h:967
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Aviso"
 
-#: resources.h:968
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Info"
 
-#: resources.h:969
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Verboso"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "sistema de 32 bits"
 
-#: resources.h:970
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Correcção de erros"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "sistema de 64 bits"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Anterior"
 
-#: resources.h:547
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1173,17 +1167,18 @@
 msgstr ""
 "Já existe um marcador com este nome. Por favor indique um nome não usado."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "É necessário predefinir um editor"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 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."
 
-#: resources.h:676
+#: resources.h:698
 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 "
@@ -1193,30 +1188,30 @@
 "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."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Um ficheiro previamente aberto foi alterado."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 ""
 "Um ficheiro com esse nome já está a ser editado. Quer voltar a abrir '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2676
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Um ficheiro com esse nome já está a ser transferido."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2681
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 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:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1231,11 +1226,11 @@
 "listas.\n"
 "Não será exibido mais nenhum aviso durante esta sessão."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Está disponível uma nova versão do FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1244,7 +1239,7 @@
 "desconfigurados ocultam ficheiros ao utilizador. Use esta opção para forçar "
 "o servidor a mostrar todos os ficheiros."
 
-#: resources.h:748
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1262,15 +1257,15 @@
 "Desligar a navegação sincronizada e continuar com as alterações na pasta "
 "local?"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:829
+#: resources.h:851
 msgid "A&dd"
 msgstr "A&dicionar"
 
-#: resources.h:856
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "P&ermitir o retomar de ficheiros ASCII"
 
@@ -1282,55 +1277,55 @@
 msgid "A&pply only to uploads"
 msgstr "A&plicar apenas a envios"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "A&plicar a todos os ficheiros e pastas"
 
-#: resources.h:626
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "&Remover automaticamente as transferências bem sucedidas"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Abortar a conecção anterior e ligar no separador actual"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Sobre o FileZilla"
 
-#: resources.h:866
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Acima das listas de ficheiros"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Conta"
 
-#: resources.h:601
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Resposta após a lista estar &completa"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Acção para o ficheiro seleccionado:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Acção a realizar:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Acção:"
 
@@ -1364,24 +1359,24 @@
 "externo correcto, mas o seu router ou firewall inadvertidamente modificaram "
 "o endereço enviado."
 
-#: resources.h:761
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Activar o modo IP"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Adicionar ficheiros apenas à lista"
 
-#: resources.h:630 resources.h:649
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Adicionar as pastas seleccionadas à lista de transferências"
 
-#: resources.h:559 resources.h:576
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr ""
 "Adicionar os ficheiros e pastas seleccionados à lista de transferências"
 
-#: resources.h:920 resources.h:926
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Adicionar à lista"
 
@@ -1389,27 +1384,42 @@
 msgid "Address type not supported"
 msgstr "O tipo do endereço não é suportado"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avançado"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opções avançadas:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Conselho: A menos que deseje testar as novas funções, por favor, continue a "
+"usar as versões estáveis. As versões beta e as versões de desenvolvimento "
+"são destinadas apenas para teste. As versões de desenvolvimento do FileZilla "
+"poderão não funcionar como o esperado e poderão causar problemas ao seu "
+"sistema. Use as versões beta e as versões de desenvolvimento por sua própria "
+"conta e risco."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritmo:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Todos os ficheiros foram transferidos com sucesso"
 
-#: resources.h:705
+#: resources.h:727
 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:3132
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1418,20 +1428,20 @@
 msgstr[1] ""
 "Todas as transferências acabaram. %d ficheiros não puderam ser transferidos."
 
-#: resources.h:744
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr ""
 "Permitir &retroceder para outro modo de transferência em caso de falha."
 
-#: resources.h:680
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Permitir recuo para outro modo de transferência em caso de falha."
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Já ligado"
 
-#: resources.h:789
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1439,7 +1449,7 @@
 "Em alternativa pode usar a ferramenta 'Pageant' do PuTTY para gerir as suas "
 "chaves, o FileZilla reconhece o 'Pageant'."
 
-#: resources.h:790
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1447,15 +1457,15 @@
 "Em alternativa pode usar o agente SSH do seu sistema. Para o fazer, "
 "certifique-se que a variável de ambiente SSH_AUTH_SOCK está configurada."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
-"Em alternativa, visite o sítio http://filezilla-project.org para descarregar "
+"Em alternativa, visite o sítio http://filezilla-project.org para transferir "
 "a versão mais recente."
 
-#: ../../locales/../src/interface/QueueView.cpp:2048
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1464,7 +1474,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1473,7 +1483,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:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1481,27 +1491,27 @@
 "Um item com o mesmo nome daquele que está a ser arrastado já existe no "
 "destino."
 
-#: ../../locales/../src/engine/server.cpp:869
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anónimo"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 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:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 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:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1509,58 +1519,58 @@
 "Não será guardada qualquer alteração no Gestor de Sítios sem que repare o "
 "ficheiro."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Não será guardada qualquer alteração nos filtros."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Apl&icar apenas a pastas"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Aplicar"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Aplicar apenas &à lista actual"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Aplicar apenas &aos ficheiros"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "&Ficheiro"
 
-#: resources.h:868
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Como tópico no painel da lista de transferências"
 
-#: resources.h:259 resources.h:269 resources.h:837 resources.h:846
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Perguntar"
 
-#: ../../locales/../src/engine/server.cpp:844
-#: ../../locales/../src/engine/server.cpp:863
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Pedir palavra-passe"
 
-#: resources.h:701
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Pedir uma porta ao sistema operativo."
 
-#: resources.h:691
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Pedir o endereço IP externo ao sistema operativo"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Fazer perguntas nos fóruns do FileZilla"
 
@@ -1568,39 +1578,35 @@
 msgid "Associated program not found:"
 msgstr "Não foi encontrado o programa associado:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Pelo menos uma condição de filtro está incompleta"
 
-#: resources.h:710
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Neste momento, está reunida toda a informação necessária."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:136
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atributo"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Falhou a validação."
 
-#: resources.h:878
+#: resources.h:901
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:827
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Classificação de tipo de ficheiro automática"
 
-#: resources.h:945
-msgid "Automatic update check"
-msgstr "Verificação automática de actualizações"
-
-#: resources.h:882
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Tamanhos disponíveis"
 
@@ -1609,66 +1615,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Con&tornar o proxy"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instruções básicas de utilização"
 
-#: resources.h:870
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Comportamento"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "A ser editado"
 
-#: resources.h:615
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Cadeia aglutinadora da Marca de Referência"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Atenção! O Certificado foi revogado"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binário"
 
-#: resources.h:863
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Quadro negro"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
-#: ../../locales/../src/interface/menu_bar.cpp:311
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Marcador"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Marcador:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Marcadores"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Data da versão:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Informações da versão"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Categoria de negócio:"
 
-#: resources.h:751
+#: resources.h:773
 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, "
@@ -1678,63 +1684,63 @@
 "transferências em modo activo. Se pretender que o FileZilla use apenas um "
 "pequeno leque de portas, por favor indique um intervalo."
 
-#: resources.h:536
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "C&ancelar a operação actual"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "P&rocurar 'nightly builds' do FileZilla"
+msgstr "P&rocurar versões de desenvolvimento do FileZilla"
 
-#: resources.h:612
+#: resources.h:632
 msgid "C&lear all"
 msgstr "L&impar tudo"
 
-#: resources.h:587 resources.h:637
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opiar os caminhos URL para a área de transferência"
 
-#: resources.h:886
+#: resources.h:909
 msgid "C&ustom"
 msgstr "P&ersonalizado"
 
-#: resources.h:941
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "A&ssociações dos tipos de ficheiro predefinidas:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "A calcular o fuso horário do servidor..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Impossível ler a partir do ficheiro"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Impossível escrever dados para o ficheiro."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Não é possível escrever dados para o ficheiro: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Cancelar"
 
-#: resources.h:988
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Cancelar a operação actual"
 
-#: resources.h:989
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Cancela a operação actual"
 
@@ -1745,11 +1751,11 @@
 "Não é possível aceder a '%s', nenhum disco inserido ou o leitor não está "
 "preparado."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Não é possível adicionar o servidor ao Gestor de Sítios"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1765,30 +1771,30 @@
 "Não é possivel comparar as pastas, existem filtros diferentes para as pastas "
 "locais e remotas"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2780
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 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:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Não é possível criar um novo filtro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2610
-#: ../../locales/../src/interface/RemoteListView.cpp:2656
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Não é possível editar o ficheiro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 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:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Não é possível editar o ficheiro, o caminho remoto é desconhecido."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1796,8 +1802,8 @@
 "Não é possível establecer uma ligação por FTP a um servidor SFTP. Por favor "
 "seleccione o protocolo correcto."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr ""
 "Não é possível carregar a Barra de Ligação Rápida a partir do ficheiro de "
@@ -1811,46 +1817,50 @@
 msgid "Cannot load keyfile"
 msgstr "Não é possível carregar a chave de ficheiro"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1042
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr ""
 "Não é possível carregar a barra de ferramentas a partir de ficheiro de "
 "recursos"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Não é possível lembrar a palavra-passe"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Não é possível mudar o nome da entrada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Não é possível mudar o nome do ficheiro"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Não é possível guardar o conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Não é possível seleccionar o filtro"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Não é possível configurar as associações dos ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Não é possível mostrar a caixa de diálogo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2676
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Não é possível ler/editar o ficheiro seleccionado"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Categorias"
 
@@ -1858,61 +1868,61 @@
 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."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detalhes do certificado"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certificado na cadeia:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Emissor do certificado"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Desafio:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Alterar atributos do ficheiro"
 
-#: resources.h:590 resources.h:640
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Alterar as permissões do ficheiro."
 
-#: resources.h:962
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
 "A alteração das configurações do ficheiro 'logfile' requer que reinicie o "
 "FileZila."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problema de codificação de caracteres"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Mapa de caracteres"
 
-#: resources.h:950
-msgid "Check for &beta versions and release candidates"
-msgstr "Procurar por versões &beta e pré-lançamentos"
-
-#: resources.h:549
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Procurar &actualizações ..."
 
-#: resources.h:550
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Procurar automaticamente as actualizações do FileZilla:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Procurar novas versões do FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Procurar actualizações"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1758
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Procurar por actualizações falhadas"
 
@@ -1920,21 +1930,21 @@
 msgid "Checking for correct external IP address"
 msgstr "A verificar pelo endereço IP externo correcto"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "A procurar actualizações"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "A verificação sumária do ficheiro descarregado difere."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Escolha a pasta local predefinida"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Escolha a pasta local"
 
@@ -1942,43 +1952,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Dados tratados indevidamente"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cifra:"
 
-#: resources.h:496 resources.h:665
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Fe&char separador"
 
-#: resources.h:860
+#: resources.h:882
 msgid "Classic"
 msgstr "Clássico"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Limpar &as entradas do Gestor de Sítios"
 
-#: resources.h:613
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Limpar &a vista do cofre"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Limpar &o histórico das ligações rápidas"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Limpar &o registo das ligações"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Limpar &a lista de transferências"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Limpar o histórico"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1986,11 +1996,11 @@
 msgid "Clear private data"
 msgstr "Limpar os dados privados"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Limpar a barra de ligação rápida"
 
-#: resources.h:614
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Limpar a cadeia aglutinadora"
 
@@ -1998,36 +2008,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Prima em Terminar para guardar a configuração."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
-msgstr "Prima em seguinte para descarregar uma nova versão."
+msgstr "Prima em seguinte para transferir uma nova versão."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC do cliente para o servidor:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Cifra do cliente para o servidor:"
 
-#: resources.h:666
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Fechar &todos os outros separadores"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1114
-#: ../../locales/../src/interface/Mainfrm.cpp:1137
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Sair do FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Fechar todas as janelas do FileZilla"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Fecha o separador actual"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mentários:"
 
@@ -2035,11 +2045,11 @@
 msgid "Column properties"
 msgstr "Propriedades da coluna"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Configuração da coluna"
 
-#: resources.h:936
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "O comando e os seus parâmetros devem ser inseridos de forma correcta."
 
@@ -2058,9 +2068,9 @@
 msgstr "O comando não é suportado por este protocolo"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Comando:"
 
@@ -2068,7 +2078,7 @@
 msgid "Comment"
 msgstr "Comentário"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nome comum:"
 
@@ -2077,15 +2087,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Comunicação marcada pelo router ou pela firewall"
 
-#: resources.h:514 resources.h:644
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Comparar a hora da &modificação"
 
-#: resources.h:513 resources.h:643
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Comparar o &tamanho do ficheiro"
 
-#: resources.h:916
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Intervalo para a &comparação (em minutos):"
 
@@ -2093,59 +2103,59 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "O intervalo para a comparação tem de ser entre 0 e 1440 minutos."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilado para:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilado em:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilado com:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Parâmetros da compilação:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Comprimido"
 
-#: resources.h:801
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transferências simultâneas"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "As condições são sensíveis a m&aiúsculas e minúsculas"
 
-#: resources.h:709
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Teste de configuração"
 
-#: resources.h:683
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Configurar o modo passivo"
 
-#: resources.h:699
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Configurar o intervalo de portas"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "A configurar o FileZilla e a sua rede"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Confirme para apagar"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2627
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Confirmação necessária"
@@ -2154,7 +2164,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Parabéns, a configuração parece estar funcionar."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "A conectar as configurações de contorno do proxy"
 
@@ -2162,34 +2172,34 @@
 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:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Ligado"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "A ligar"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "A ligar a %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "A ligar a %s através do proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "A ligar a %s ..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "A ligar ao servidor"
 
@@ -2197,18 +2207,18 @@
 msgid "Connection"
 msgstr "Ligação"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Falhou a tentativa de ligação"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Falhou a tentativa de ligação com \"%s\"."
@@ -2222,12 +2232,12 @@
 msgid "Connection closed"
 msgstr "Ligação terminada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Ligação terminada pelo servidor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Ligação estabelecida, a iniciar o TLS ..."
@@ -2236,7 +2246,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Ligação estabelecida, a enviar o pedido HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Ligação estabelecida, à espera da mensagem de boas-vindas ..."
 
@@ -2252,15 +2262,15 @@
 msgid "Connection refused"
 msgstr "Ligação recusada"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "A ligação excedeu o tempo de espera"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Ligação terminada."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Perdida a ligação ao servidor."
 
@@ -2280,28 +2290,24 @@
 msgid "Convert keyfile"
 msgstr "Converter a chave do ficheiro"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Copiar"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Cópia (%d) de %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Cópia de %s"
 
-#: resources.h:588 resources.h:638
+#: resources.h:608 resources.h:660
 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:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Não foi possível aceitar a ligação: %s"
@@ -2311,16 +2317,20 @@
 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:842
+msgid "Could not complete operation"
+msgstr "Não foi possível terminar a operação"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Não foi possível ligar ao servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Não foi possível ligar ao servidor: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Não foi possível converter o comando para o código do servidor"
 
@@ -2329,16 +2339,16 @@
 msgid "Could not convert private key"
 msgstr "Não foi possível converter a chave privada"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3061
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Não foi possível copiar os caminhos URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Não foi possível copiar os dados"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2549
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
 #: ../../locales/../src/interface/RemoteTreeView.cpp:899
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
@@ -2349,11 +2359,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:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Impossível establecer a ligação com o servidor"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2365,11 +2375,11 @@
 "Pode definir a pasta de dados do FileZilla com a opção da linha de comandos "
 "'--pasta de dados <caminho>' ou configurar a variável de ambiente FZ_DATADIR"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 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:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2377,7 +2387,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:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2385,7 +2395,7 @@
 "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:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Não é possível obter o caminho remoto completo."
 
@@ -2394,17 +2404,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Não foi possível obter uma resposta do fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2610
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2432,7 +2442,7 @@
 msgid "Could not load private key"
 msgstr "Não foi possível carregar a chave privada"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2443,7 +2453,7 @@
 "Desligar a navegação sincronizada e continuar com as alterações na pasta "
 "remota?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2463,8 +2473,8 @@
 "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:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3061
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Não foi possível abrir a área de transferência"
@@ -2480,11 +2490,11 @@
 msgid "Could not parse remote path."
 msgstr "Impossível analisar o caminho remoto."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Impossível analisar o endereço do servidor:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Não foi possível ler do ponto: %s"
@@ -2493,12 +2503,12 @@
 msgid "Could not read server item."
 msgstr "Não foi possível ler o item do servidor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Impossível procurar o término do ficheiro"
 
@@ -2506,22 +2516,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Não foi possível enviar o comando para o fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Impossível criar o processo IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Não foi possível saudar o proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Impossível iniciar a transferência"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2542,7 +2552,7 @@
 "Impossível escrever em \"%s\", os marcadores globais não puderam ser "
 "guardados: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1982
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2551,15 +2561,15 @@
 "Impossível escrever em \"%s\", a lista não pode ser guardada.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, 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/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Impossível escrever em \"%s\": %s"
@@ -2569,7 +2579,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Não foi possível escrever a chave de ficheiro: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Não foi possível esvrever para o ficheiro local"
 
@@ -2580,39 +2590,51 @@
 msgstr ""
 "Não foi possível escrever para o ficheiro das configurações iniciais: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, 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:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "País"
 
-#: resources.h:617
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Encerra o Filezilla abruptamente. Usado apenas para fins de depuração de "
 "erros."
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Criar um &novo ficheiro"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Criar uma nova subpasta na pasta actual"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Criar um novo, e vazio, ficheiro, na pasta actual"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Criar pasta"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Criar um ficheiro vazio"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "A criar a pasta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "A criar a pasta '%s' ..."
@@ -2630,7 +2652,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2651,52 +2673,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "O tipo de transferência actual está definido para binário."
 
-#: resources.h:772 resources.h:892
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Perso&nalizado"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Conjunto de filtros personalizado"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Servidor personalizado"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tipo de D&ados"
 
-#: resources.h:899
+#: resources.h:922
 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)."
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "P&redefinição"
 
-#: resources.h:583 resources.h:633 resources.h:663
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "A&pagar"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "D&esactivar tudo"
 
-#: resources.h:871
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Nã&o guardar as palavras-passe"
 
-#: resources.h:923
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Acçã&o para o clique duplo nas pastas:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplicar"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Como em DOS com caminhos virtuais"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Tipo de ficheiro perigoso"
 
@@ -2704,16 +2730,16 @@
 msgid "Data"
 msgstr "Dados"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Ponto de dados fechado prematuramente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:151
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Data"
 
-#: resources.h:883
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Formato para a data"
 
@@ -2732,11 +2758,11 @@
 msgid "Debug"
 msgstr "Corrigir erros"
 
-#: resources.h:963
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Configurações para corrigir erros"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Pasta &local predefinida:"
 
@@ -2744,19 +2770,19 @@
 msgid "Default (Autodetect)"
 msgstr "Predefinição (Auto-detectar)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "O editor predefinido não foi chamado de forma correcta."
 
-#: resources.h:255 resources.h:277 resources.h:854
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "O ficheiro existe no destino"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Pasta &remota predefinida:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2768,15 +2794,15 @@
 msgid "Default system language"
 msgstr "Linguagem predefinida do sistema"
 
-#: resources.h:677
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Modo de transferência predefinido:"
 
-#: resources.h:823
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Tipo de transferência predefinido:"
 
-#: resources.h:696 resources.h:759
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Predefinição: http://ip.filezilla-project.org/ip.php"
 
@@ -2800,58 +2826,58 @@
 msgstr[1] ""
 "A atrasar a ligação por %d segundos devido a uma tentativa prévia falhada ..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Apagar a entrada no Gestor de Sítios"
 
-#: resources.h:634 resources.h:655
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Apagar a pasta seleccionada"
 
-#: resources.h:570 resources.h:584
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Apagar os ficheiros e as pastas seleccionados"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "A apagar as pastas"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 "A opção 'apagar múltiplas pastas não relacionadas' ainda não é suportada"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "A apagar a ligação simbólica"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1055
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Ambiente de trabalho"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detalhes"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detalhes para a nova chave:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Past&as"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Direcção"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Pasta"
 
-#: resources.h:641 resources.h:914 resources.h:997
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2315
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Comparação de pastas"
 
@@ -2871,11 +2897,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Listagem de pastas abortada pelo utilizador"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Listagem de pastas falhada"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtros da lista de pastas"
 
@@ -2883,18 +2909,18 @@
 msgid "Directory listing successful"
 msgstr "Listagem de pastas bem sucedida"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Desa&ctivar tudo"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:666
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2902,50 +2928,49 @@
 "Desmarque esta opção outra vez se deixar de ver o conteúdo correcto das "
 "pastas."
 
-#: resources.h:990
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Desligar do servidor"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Desligado do servidor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Desligado do servidor: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "A desligar do servidor anterior"
 
-#: resources.h:991
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Desliga do servidor actualmente visível"
 
-#: resources.h:555
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Exibe a caixa 'Sobre ...'"
 
-#: resources.h:932
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Não utilizar o editor predefinido"
 
-#: resources.h:609
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Não &fazer nada"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2954,8 +2979,8 @@
 "A menos que queira testar novas capacidades, continue a usar versões "
 "estáveis."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1117
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Quer mesmo sair do FileZilla?"
 
@@ -2970,7 +2995,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:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Quer mesmo apagar a entrada seleccionada?"
 
@@ -2978,34 +3003,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Quer mesmo apagar a lista de transferências?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Quer mesmo enviar '%s' para o servidor?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentação"
 
-#: resources.h:698
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Não usar o endereço IP externo em &ligações locais."
 
-#: resources.h:834
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Ficheiros de ponto são nomes de ficheiro que começam com um ponto, p.ex. ."
 "htaccess"
 
-#: resources.h:917
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Acção por clique duplo do rato"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
-msgstr "Descarregar"
+msgstr "Transferir"
 
-#: resources.h:482 resources.h:810
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Limite em &descarga"
 
@@ -3018,42 +3043,51 @@
 msgid "Download limit: none"
 msgstr "Limite para &descarga: nenhum"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
-msgstr "Descarregar os resultados da procura"
+msgstr "Transferir os resultados da procura"
 
-#: resources.h:628
+#: resources.h:650
 msgid "Download selected directory"
-msgstr "Descarregar a pasta seleccionada"
+msgstr "Transferir a pasta seleccionada"
 
-#: resources.h:574
+#: resources.h:592
 msgid "Download selected files and directories"
-msgstr "Descarregar os ficheiros e as pastas seleccionados"
+msgstr "Transferir os ficheiros e as pastas seleccionados"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Velocidade de descarga: %s/s\n"
+"Velocidade de envio: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
-msgstr "A descarregar"
+msgstr "A transferir"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
-msgstr "A descarregar %s"
+msgstr "A transferir %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
-"A opção 'descarregar múltiplas pastas não relacionadas' ainda não é suportada"
+"A opção 'transferir múltiplas pastas não relacionadas' ainda não é suportada"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
-msgstr "A descarregar os resultados da procura"
+msgstr "A transferir os resultados da procura"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3062,66 +3096,64 @@
 "O 'arrastar e largar' entre instâncias diferentes do FileZilla ainda não foi "
 "implementado."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "O 'arrastar e largar' entre servidores diferentes ainda não foi implementado."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Duplicar o nome do filtro"
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&icar"
 
-#: resources.h:204
+#: resources.h:214
 msgid "E&nable all"
 msgstr "A&ctivar tudo"
 
-#: resources.h:560 resources.h:577
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "E&ntrar na pasta"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&xecutar"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "S&air"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Cada filtro necessita de pelo menos uma condição."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Editar filtros"
 
-#: resources.h:565
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Editar o ficheiro com o editor configurado e enviar as mudanças para o "
 "servidor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Falhou a edição"
 
-#: resources.h:880
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2294
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Limpar comando"
 
@@ -3129,7 +3161,7 @@
 msgid "Empty command."
 msgstr "Comando vazio."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Limpar lista de pastas"
 
@@ -3141,103 +3173,115 @@
 msgid "Empty file extension."
 msgstr "Limpar as extenções de ficheiros."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Não são permitidos nomes de filtros vazios."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nome vazio"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Limpar as chaves guardadas."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Ac&tivar tudo"
 
-#: resources.h:819
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Activar a &filtragem de caracteres inválidos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Encriptado"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Encriptação"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Detalhes da encriptação"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Terminar comparação e alterar a ordenação?"
 
-#: resources.h:541
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Introduzir comando &personalizado ..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Indique 0 para velocidade ilimitada."
 
-#: ../../locales/../src/interface/QueueView.cpp:2283
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Introduzir comando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Introduzir comando personalizado"
 
-#: resources.h:924
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Entrar na pasta"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Introduzir o nome do filtro"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Introduza um nome para o conjunto de filtros"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Introduza um novo nome para o conjunto de filtros"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Introduzir a palavra-passe"
 
-#: resources.h:561 resources.h:578
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Entrar na pasta seleccionada"
 
-#: resources.h:718
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Introduza o endereço do servidor.\n"
-"Para especificar o protocolo do servidor, adicione o anfitrião com o "
-"identificador de protocolo. Se não for especificado nenhum protocolo, o "
-"protocolo predefinido (ftp://) será usado.\n"
-"Também pode introduzir endereços URLs completos sob a forma: //utilizador:"
-"pass@anfitrião:porta aqui, então os valores nos outros campos serão "
-"substituídos."
+"Para especificar o protocolo do servidor, indique o nome com o identificador "
+"de protocolo. Se não for especificado nenhum, será usado o protocolo "
+"predefinido (ftp://).\n"
+"Também pode indicar aqui os endereços URL completos sob a forma; protocolo://"
+"utilizador:palavra-passe@servidor:porta, então os valores nos outros campos "
+"serão substituídos.\n"
+"\n"
+"Os protocolos suportados são:\n"
+"- ftp:// para FTP normal\n"
+"- sftp:// para o protocolo de transferência SSH\n"
+"- ftps:// para FTP sobre TLS (implícito)\n"
+"- ftpes:// para FTP sobre TLS (explícito)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3249,7 +3293,7 @@
 "Por favor tenha em atenção que o ficheiro convertido não estará protegido "
 "por palavra-passe."
 
-#: resources.h:722
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3271,7 +3315,7 @@
 msgid "Error importing"
 msgstr "Erro ao importar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2049
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Erro ao ler a lista"
 
@@ -3280,27 +3324,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1963
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Erro ao carregar ficheiro xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Erro ao guardar a lista"
 
@@ -3311,74 +3355,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1983
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Erro ao escrever ficheiro xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Erro: o nome do ficheiro não pode ser analisado."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Erro: o ficheiro local existe mas não pode ser removido"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Erro:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Ligar num novo separador"
 
-#: resources.h:943
+#: resources.h:972
+msgid "Every month"
+msgstr "Todos os meses"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "A cadas duas semanas"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Exemplo: png \"c:\\Programas\\editor\\editor.exe\" -open"
 
-#: resources.h:902
+#: resources.h:925
 msgid "Examples"
 msgstr "Exemplos"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Exe&cutar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Executável"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1758
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "O executável não contém informação sobre a versão, não é possível verificar "
 "se há actualizações."
 
-#: resources.h:861
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorador"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exportar &Lista"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exportar &Configurações"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportar"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "F&iltrar nome:"
 
@@ -3386,7 +3438,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferência de Ficheiros"
 
@@ -3398,25 +3450,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocolo de Transferência de Ficheiros Inseguro"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Motor de FTP ainda não iniciado, não é possivel a ligação"
 
-#: resources.h:746
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Manter o FTP activo"
 
-#: resources.h:766
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy do FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
-msgstr "FTP URL"
+msgstr "Endereço FTP"
 
-#: resources.h:674
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3432,74 +3484,74 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPES - FTP sobre TLS/SSL implícito"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:913
-#: ../../locales/../src/interface/viewheader.cpp:522
+#: ../../locales/../src/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
 msgid "Failed to change directory"
 msgstr "Falhou a mudança de pasta"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Falhou a alteração de linguagem"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Falhou a verificação duma nova versão do FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Falhou a cópia ou o mover dos sítios"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:511
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 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:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 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:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 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/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
-msgstr "Falhou a descarga da última versão do FileZilla."
+msgstr "Falhou a transferência da última versão do FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:667
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Falhou a obtenção do caminho para 'Os meus documentos'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:653
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Falhou a obtenção do caminho para o ambiente de trabalho"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Falhou a iniciação de um motor FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Falhou a iniciação do TLS"
@@ -3513,28 +3565,32 @@
 msgid "Failed to load private key: %s"
 msgstr "Falha ao carregar a chave privada: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, 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:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Falhou a abertura de \"%s\" para leitura"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Falhou a abertura de \"%s\" para escrita"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:418
+msgid "Failed to parse returned path."
+msgstr "Falhou a análise do caminho devolvido."
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr "A análise ao certificado de raíz confiável falhou."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Falhou a recepção de dados"
 
@@ -3546,11 +3602,11 @@
 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:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Falhou a obtenção de um endereço IP local"
 
@@ -3566,14 +3622,14 @@
 msgid "Failed to send command."
 msgstr "Falhou o envio do comando."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3581,14 +3637,14 @@
 "Falhou a definição da linguagem para %s (%s), a utilizar a linguagem "
 "predefinida do sistema %s (%s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3596,14 +3652,14 @@
 "Falhou a definição de uma linguagem para %s, a utilizar a linguagem "
 "predefinida do sistema"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3614,7 +3670,7 @@
 msgid "Failed to validate settings"
 msgstr "Falhou a validação das configurações"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Falhou a verificação do certificado de ponto"
 
@@ -3623,7 +3679,7 @@
 msgid "Failed to write to file %s"
 msgstr "Falhou a escrita no ficheiro %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:529
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
 msgstr "Falhou a escrita no ficheiro xml"
 
@@ -3631,21 +3687,19 @@
 msgid "Failed transfers"
 msgstr "Transferências falhadas"
 
-#: resources.h:689
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Retroceder para o modo activo"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Fich&eiro:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fic&heiros"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Ficheiro"
 
@@ -3661,7 +3715,7 @@
 msgid "File editing"
 msgstr "Edição do ficheiro"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "O ficheiro existe"
 
@@ -3669,7 +3723,7 @@
 msgid "File exists action"
 msgstr "O ficheiro existe"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "O ficheiro foi alterado"
 
@@ -3677,14 +3731,14 @@
 msgid "File lists"
 msgstr "Listas de ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Ficheiro não encontrado"
 
-#: resources.h:1001
+#: resources.h:1029
 msgid "File search"
 msgstr "Procura de ficheiro"
 
@@ -3721,25 +3775,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Transferência bem sucedida, tranferidos %s in %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1116
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Transferência ainda a decorrer."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "O ficheiro será transferido com o tipo de dados ASCII."
 
-#: resources.h:388
+#: resources.h:398
 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:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Erro do FileZilla"
 
-#: resources.h:711
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3747,68 +3801,70 @@
 "O FileZilla pode testar a sua configuração agora para certificar-se que está "
 "tudo correctamente configurado."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "O FileZilla já está ligado a um servidor."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"O FileZilla está a correr em modo kiosk.\n"
-"O tipos 'Normal' e 'Conta' não estão disponíveis neste modo."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1503
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 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."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Actualizações do FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
-msgstr "&Barras de estado da lista de ficheiros"
+msgstr "&Barras de estado das listas de ficheiros"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:126
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nome"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtros ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Nome de ficheiro inválido"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Os nomes de ficheiro não podem conter quaisquer dos seguintes caracteres: / "
+"\\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Nome de ficheiro não modificado"
 
-#: resources.h:307 resources.h:956
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nome do ficheiro:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 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/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3816,13 +3872,13 @@
 "Os nomes de ficheiro não podem conter quaisquer dos seguintes caracteres: / "
 "\\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Ficheiros que estão a ser editados"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:131
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Tamanho"
@@ -3831,65 +3887,68 @@
 msgid "Filesize format"
 msgstr "Formato do tamanho de ficheiro"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tipo"
 
-#: resources.h:944
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Associações dos tipos de ficheiros"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "O filtro aplica-se a:"
 
-#: resources.h:818
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrar caracteres inválidos nos nomes dos ficheiros"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Este nome de filtro já existe"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "As saídas do filtro correspondem a todos os seguintes"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "As saídas do filtro não correspondem a quaisquer dos seguintes"
 
-#: resources.h:223
+#: resources.h:233
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Este conjunto de filtros já existe"
 
-#: resources.h:994
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrar as listas de pastas"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Falhou a validação do filtro"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Impressão digital (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Impressão digital (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Impressão digital:"
 
@@ -3897,7 +3956,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Assistente de configuração de firewall e router"
 
-#: resources.h:729
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3905,11 +3964,11 @@
 "Para uma informação mais detalhada sobre estas opções, por favor corra o "
 "assistente de configuração de rede."
 
-#: resources.h:706
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Para fiabilidade deverá especificar um leque de pelo menos 10 portas."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3917,31 +3976,31 @@
 "Para esta sessão, serão usadas as configurações predefinidas. Qualquer "
 "alteração a estas não será guardada."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forçar ao &UTF-8"
 
-#: resources.h:543
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Forçar a mostra de &ficheiros escondidos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:661
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Forçar a mostra de ficheiros escondidos"
 
-#: resources.h:773
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Especificações do formato:"
 
-#: resources.h:942
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Formato: Extensão seguida do comando correcto e dos seus parâmetros."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Documentação adicional"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Geral"
 
@@ -3949,21 +4008,21 @@
 msgid "General SOCKS server failure"
 msgstr "Falha geral do servidor de SOCKS"
 
-#: resources.h:791
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy genérico"
 
-#: resources.h:695
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Obter um endereço IP externo a partir do seguinte URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Obtendo ajuda"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "O nome de conjunto de filtros dado já existe, pretende substituir o conjunto "
@@ -3973,15 +4032,15 @@
 msgid "Global bookmarks"
 msgstr "Marcadores universais"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permissões de grupo"
 
-#: resources.h:597
+#: resources.h:617
 msgid "H&igh"
 msgstr "A&lto"
 
@@ -3989,21 +4048,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP sobre TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Mistura:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Escondido"
 
-#: resources.h:816 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Alta"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Maior"
 
@@ -4011,48 +4070,49 @@
 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."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Mantenha premida a tecla shift para alterar o estado do filtro em ambos os "
 "lados simultaneamente."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Página oficial:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
-msgstr "Impressão digital da chave do anfitrião:"
+msgstr "Impressão digital da chave do servidor:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
-msgstr "A chave do anfitrião não coincide"
+msgstr "A chave do servidor não coincide"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
-"O anfitrião começa com '[' mas não foi encontrado o parêntesis no fecho."
+"O nome do servidor começa com '[' mas não foi encontrado o parêntesis no "
+"fecho."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr "Anfitrião inacessível"
+msgstr "Servidor inacessível"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
-msgstr "Anfitrião:"
+msgstr "Servidor:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Horas,"
 
-#: resources.h:891
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (exemplo: 15:47)"
 
-#: resources.h:733
+#: resources.h:755
 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 "
@@ -4062,13 +4122,13 @@
 "do que o tempo especificado, a ligação será fechada e o FileZilla tentará "
 "reconectar-se."
 
-#: resources.h:972
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Se reportar erros, por favor providencie a informação dada no nível \"Verboso"
 "\"."
 
-#: resources.h:686
+#: resources.h:708
 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 "
@@ -4080,7 +4140,7 @@
 "estar mal configurado e deverá tentar o modo activo. Pode definir um modo de "
 "transferência por servidor no Gestor de Sítios."
 
-#: resources.h:681
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4088,7 +4148,7 @@
 "Se a opção de recuar estiver marcada, será capaz de ligar a servidores "
 "desconfigurados que regeitem o modo de transferência seleccionado."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4112,7 +4172,7 @@
 "Se o problema persistir, alguma router e/ou firewall continua a interromper "
 "a ligação."
 
-#: resources.h:961
+#: resources.h:988
 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 "
@@ -4122,7 +4182,7 @@
 "com um \".1\" no fim do nome (talvez reescrevendo ficheiros antigos) e um "
 "novo ficheiro será criado."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4143,7 +4203,7 @@
 msgstr ""
 "Se este problema persistir, por favor contacte o fabricante do seu router."
 
-#: resources.h:278 resources.h:855
+#: resources.h:288 resources.h:877
 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 "
@@ -4153,7 +4213,7 @@
 "sincronizada com a do servidor. Se as horas forem diferentes (p.ex. fuso "
 "horário diferente), indique um fuso horário no gestor de sítios."
 
-#: resources.h:915
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4161,11 +4221,11 @@
 "Ao usar uma comparação baseada em fusos horários, considera-se dois "
 "ficheiros iguais quando as diferenças de fuso não excederem este intervalo."
 
-#: resources.h:930
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Se mudar a linguagem, deve reiniciar o FileZilla."
 
-#: resources.h:712
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4173,11 +4233,11 @@
 "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:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Se sair do FileZilla as alterações serão perdidas."
 
-#: resources.h:831
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4185,11 +4245,11 @@
 "Se introduzir os tipos de ficheiro errados, esses ficheiros podem ficar "
 "corrompidos quando transferidos."
 
-#: resources.h:713
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Se obtiver um erro qualquer, a sua configuração não é a correcta."
 
-#: resources.h:745
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4208,7 +4268,7 @@
 "tente mudar para modo passivo e contacte o administrador do servidor para "
 "obter ajuda."
 
-#: resources.h:672
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4216,7 +4276,7 @@
 "Se completar o assistente com sucesso e o teste final for bem sucedido, "
 "qualquer firewall ou router que tiver deverão estar devidamente configurados."
 
-#: resources.h:708
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4224,7 +4284,7 @@
 "Se usa uma firewall, certifique-se que é dada permissão ao FileZilla para "
 "aceitar ligações em todas as portas dadas."
 
-#: resources.h:707
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4244,7 +4304,7 @@
 msgid "Import data from older version"
 msgstr "Importar dados de uma versão anterior"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importar configurações"
 
@@ -4258,7 +4318,7 @@
 msgid "Improperly quoted association."
 msgstr "Associação incorrecta."
 
-#: resources.h:700
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4266,7 +4326,7 @@
 "Em modo activo, o FileZilla tem que supervisionar a porta para "
 "transferências de dados. Tem que especificar que porta o FileZilla irá usar."
 
-#: resources.h:702
+#: resources.h:724
 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."
@@ -4274,7 +4334,7 @@
 "Caso tenha um router, terá que direccionar todas as portas disponíveis, pois "
 "o FileZilla não tem influência nas portas que o sistema escolhe."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4282,7 +4342,7 @@
 "No caso de preferir actualizações automáticas, pode marcar a verificação "
 "automática de actualizações, na caixa de configurações."
 
-#: resources.h:690 resources.h:754
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4290,7 +4350,7 @@
 "De modo a utilizar o modo activo, o FileZilla necessita de saber o seu "
 "endereço IP externo."
 
-#: resources.h:675
+#: resources.h:697
 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 "
@@ -4300,7 +4360,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:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4308,20 +4368,20 @@
 "Cadeia incompleta, o certificado de topo não está assinado por uma "
 "autoridade certificadora"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Palavra-passe incorrecta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "A iniciar o TLS ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Servidor inseguro, não suporta FTP sobre TLS"
 
-#: ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactivo"
@@ -4331,8 +4391,8 @@
 msgstr "Interface"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Interrompido pelo utilizador"
 
@@ -4344,8 +4404,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Resposta HTTP inválida"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4368,44 +4428,52 @@
 msgid "Invalid date"
 msgstr "Data inválida"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nome de ficheiro inválido"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
-"Anfitrião inválido, após o parêntesis no fecho apenas se podem seguir os "
-"dois-pontos e a porta."
+"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:104
 msgid "Invalid input"
 msgstr "Entrada inválida"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Porta especificada inválida. A porta deve ter um valor entre 1 e 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Especificado um protocolo inválido. Os protocolos válidos são:\n"
+"Indicado um protocolo inválido. Os protocolos válidos são:\n"
 "ftp:// para FTP normal,\n"
 "sftp:// para o protocolo de transferência SSH,\n"
-"ftps:// para FTP sobre SSL (implícito) e\n"
-"ftpes:// para FTP sobre SSL (explícito)."
+"ftps:// para FTP sobre TLS (implícito) e\n"
+"ftpes:// para FTP sobre TLS (explícito)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Expressão regular inválida nas condições para a procura."
 
@@ -4413,7 +4481,7 @@
 msgid "Invalid response code"
 msgstr "Código de resposta inválido"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Condições para a procura inválidas: %s"
@@ -4425,38 +4493,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Caminho do sítio inválido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Tamanho inválido nesta condição"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nome de utilizador inválido."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "País de jurisdição:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Localidade de jurisdição:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Estado ou província de jurisdição:"
 
-#: resources.h:912
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Manter as pastas em cima"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:665
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4467,50 +4535,54 @@
 "FilleZilla efectuar alguns testes para verificar se o servidor suporta esta "
 "funcionalidade, o teste pode falhar."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Troca de chave"
 
-#: resources.h:600
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Troca de chave:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "M&enor"
 
-#: resources.h:928
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Linguagem"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1503
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Linguagem alterada"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Modificado"
 
-#: resources.h:858
+#: resources.h:880
 msgid "Layout"
 msgstr "Vista"
 
-#: resources.h:804
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Limite para &descargas simultâneas:"
 
-#: resources.h:806
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Limite para &envios simultâneos:"
 
-#: resources.h:749
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limitar portas locais"
 
-#: resources.h:958
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Limite para o tamanho do ficheiro 'logfile'"
 
-#: resources.h:959
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limite:"
 
@@ -4518,7 +4590,7 @@
 msgid "Line length exceeded"
 msgstr "Excedido o comprimento da linha"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Unidos contra"
 
@@ -4527,21 +4599,21 @@
 msgstr "Ponto de supervisão fechado"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "A listar:"
 
-#: resources.h:752
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Porta &menor disponível:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Local"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Ficheiro local"
 
@@ -4557,15 +4629,15 @@
 msgid "Local file is not a valid filename."
 msgstr "O ficheiro local não tem um nome válido."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtros locais:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Endereço local:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Localidade:"
 
@@ -4573,16 +4645,16 @@
 msgid "Log file"
 msgstr "Ligar ao ficheiro"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Início da procura por actualizações:"
 
-#: resources.h:953
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "A iniciar sessão"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4591,7 +4663,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:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4599,34 +4671,34 @@
 "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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Sequência de início de sessão totalmente executada no entanto ainda não "
 "ligado. A abortar."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "O tipo de início de sessão tem de ser 'pergunta' ou 'interactivo' (sem as "
 "aspas)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
-"O tipo de início de sessão apenas pode ser usado com caminhos FTP. O "
+"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:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Baixo"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Menor"
 
@@ -4634,11 +4706,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "A menor porta disponível tem que ser um número entre 1024 e 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 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 "
@@ -4662,7 +4734,7 @@
 msgstr ""
 "Resposta malformada, o servidor não está a enviar fins de linha correctos"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4673,58 +4745,58 @@
 msgid "Manual transfer"
 msgstr "Transferência manual"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Corresponder a todos os seguintes"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Corresponder a qualquer dos seguintes"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Corresponder a nenhum dos seguintes"
 
-#: resources.h:802
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Máximo de &transferências simultâneas:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:376
-#: ../../locales/../src/interface/Mainfrm.cpp:1835
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Janela de mensagens"
 
-#: resources.h:869
+#: resources.h:891
 msgid "Message log position"
 msgstr "Posição da janela de mensagens"
 
-#: resources.h:960
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minutos"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Mover para &baixo"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Mover para &cima"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1074
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "O meu computador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1064
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Os meus documentos"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Os meus sítios"
 
@@ -4733,33 +4805,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nome"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Este nome já existe"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "O nome do marcador já existe."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nome:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Tem que introduzir o nome do filtro"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Tem que indicar um caminho remoto válido"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Tem que especificar a codificação de caracteres"
 
@@ -4767,19 +4839,23 @@
 msgid "Network unreachable"
 msgstr "Rede inacessível"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Nunca"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Nova &Pasta"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Novo &separador"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Novo &Marcador"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4792,41 +4868,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Novo marcador"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1192
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Nova pasta"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Novas funcionalidades e melhoramentos em %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Novo filtro"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Nova pasta"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Novo sítio"
 
-#: resources.h:867
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "A seguir à lista de transferências"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Não"
 
@@ -4834,52 +4910,52 @@
 msgid "No category to export selected"
 msgstr "Nenhuma categoria seleccionada para exportar"
 
-#: ../../locales/../src/interface/QueueView.cpp:2294
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Nenhum comando dado, a abortar."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 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:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Nenhum ficheiro está a ser editado."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Não foi dado um nome ao filtro"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
-msgstr "Anfitrião não especificado, por favor introduza um anfitrião."
+msgstr "Servidor não indicado, por favor indique um servidor."
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
 msgstr "Não há imagens disponíveis"
 
-#: ../../locales/../src/interface/QueueView.cpp:3165
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Não há mais ficheiros na lista!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Não foi dado um nome ao conjunto de filtros."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Não há programa associado a este tipo de ficheiro."
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Nenhum resultado para a procura"
 
@@ -4897,23 +4973,23 @@
 msgid "No username given."
 msgstr "Não foi indicado nenhum nome de utilizador."
 
-#: resources.h:922 resources.h:927
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Nada"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Nenhum seleccionado"
 
-#: resources.h:815 ../../locales/../src/engine/server.cpp:842
-#: ../../locales/../src/engine/server.cpp:861
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4923,15 +4999,15 @@
 msgstr "Nem todos os items podem ser listados para serem vistos/editados."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Não ligado"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Não ligado a qualquer servidor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Não ligado a qualquer servidor."
 
@@ -4939,20 +5015,20 @@
 msgid "Not connected."
 msgstr "Não ligado."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:663
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 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."
 
-#: resources.h:783
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Nota: Isto apenas funcionará com ligações FTP simples e não encriptadas."
 
-#: resources.h:800
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "Nota: Usar um proxy genérico força ao modo passivo, em ligações FTP."
 
-#: resources.h:901
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Número de locais decimais:"
 
@@ -4960,21 +5036,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "O número de tentativas tem de ser entre 0 e 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "A&brir ficheiro"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:726
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:682
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4982,159 +5058,165 @@
 "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:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Uma vez"
 
-#: resources.h:952
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Apenas as versões do FileZilla e do sistema operativo que está a usar serão "
-"submetidas ao servidor."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Uma vez por semana"
 
-#: resources.h:651
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Abrir pasta no gestor de ficheiros do sistema"
 
-#: resources.h:974 resources.h:975
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Abrir o Gestor de Sítios"
 
-#: resources.h:563
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Abre o Gestor de Sítios."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Abre o Gestor de Sítios. Prima o botão direito do rato para ver uma lista de "
+"sítios."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Abrir o ficheiro."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Abre a caixa de configurações do FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Aberto como:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2649
+#: ../../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
 msgid "Opening failed"
 msgstr "Falhou a abertura"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Abre um novo separador"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Abre o Gestor de Sítios"
 
-#: resources.h:995
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Abre a caixa de diálogo dos filtros da lista de pastas. Prima o botão "
 "direito do rato para alternar entre filtros."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistema operativo"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Foi detectado um problema no sistema operativo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organização:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Outro:"
 
-#: resources.h:728
+#: resources.h:750
 msgid "Overview"
 msgstr "Introdução"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Substituir &se for mais recente"
 
-#: resources.h:260 resources.h:270 resources.h:838 resources.h:847
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Substituir ficheiro"
 
-#: resources.h:262 resources.h:272 resources.h:840 resources.h:849
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Substituir ficheiro se o tamanho diferir"
 
-#: resources.h:263 resources.h:273 resources.h:841 resources.h:850
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr ""
 "Substituir ficheiro se o tamanho diferir ou o ficheiro de origem for mais "
 "recente"
 
-#: resources.h:261 resources.h:271 resources.h:839 resources.h:848
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Substituir ficheiro se o ficheiro de origem for mais recente"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Substituir se o tamanho for &diferente"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr ""
 "Substituir se o ta&manho for diferente ou o ficheiro de origem for mais "
 "recente"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permissões do proprietário"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Proprietário/Grupo"
 
-#: resources.h:873
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 "P&revenir a suspenção do sistema durante as transferências e outras operações"
 
-#: resources.h:780 resources.h:796
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
-msgstr "Anfitrião de P&roxy:"
+msgstr "Servidor de p&roxy:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
 msgstr "Comando PORT marcado pelo router ou pela firewall."
 
-#: resources.h:742
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssivo (recomendado)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pacote"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2460
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "O parâmetro não é um caminho URL válido"
 
-#: resources.h:85 resources.h:383 resources.h:720
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "&Palavra-passe:"
 
-#: resources.h:678
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passivo (recomendado)"
 
-#: resources.h:762
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Modo passivo"
@@ -5149,42 +5231,46 @@
 msgid "Password required"
 msgstr "Palavra-passe pedida"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:146
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Caminho"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Caminho não encontrado:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Caminhos"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Remoção pendente"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:141
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Permissões"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permissões"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plataforma:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5201,16 +5287,16 @@
 "confirmar se o servidor está a correr e minuciosamente, de novo, verifique "
 "as suas configurações."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 "Por favor consulte o gestor de pacotes do seu sistema por um pacote de "
-"actualização ou visite o sítio http://filezilla-project.org para descarregar "
+"actualização ou visite o sítio http://filezilla-project.org para transferir "
 "o código-fonte do FileZilla."
 
-#: resources.h:684
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5240,7 +5326,7 @@
 msgid "Please enter a custom time format."
 msgstr "Por favor indique um formato para a hora."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
@@ -5254,20 +5340,20 @@
 msgstr ""
 "Por favor indique uma velocidade de descarga maior ou igual que 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Por favor indique um nome para o filtro novo."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 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:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Por favor indique um novo nome para o conjunto de filtros\"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Por favor indique um novo nome para o filtro."
 
@@ -5293,11 +5379,11 @@
 "Por favor insira um número entre 1 e 10 para o número de transferências "
 "simultâneas."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Por favor indique uma palavra-passe para este servidor:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2283
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5314,11 +5400,11 @@
 "Por favor insira um tempo de espera entre 5 e 9999 segundos ou 0 para nenhum "
 "tempo de espera."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Por favor indique um nome único para este conjunto de filtros"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Por favor indique um nome de utilizador para este servidor:"
 
@@ -5330,18 +5416,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Por favor indique um URL onde se possa obter o seu endereço externo."
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr ""
-"Por favor indique um intervalo entre actualizações de pelo menos 7 dias"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Por favor indique uma velocidade de envio maior ou igual que 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5349,14 +5430,18 @@
 "Por favor introduza um comando FTP bruto.\n"
 "Ao usar comandos ftp brutos limpará o cofre das pastas."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Por favor indique o nome da pasta que deve ser criada:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Por favor indique o nome do ficheiro que deve ser criado:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr ""
 "Por favor indique um nome de utilizador e uma palavra-passe para este "
@@ -5377,7 +5462,7 @@
 "assistente. Em caso de ter um endereço dinâmico ou não saber o seu endereço, "
 "use a opção de resolução externa."
 
-#: resources.h:671
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5394,7 +5479,7 @@
 "ligações com outros computadores e certifique-se de que está a indicou o "
 "endereço correcto."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 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."
@@ -5411,7 +5496,7 @@
 "de usar 'port forwarding' manual. Não trabalhe com o router nos chamados "
 "'DMZ mode' e 'game mode'."
 
-#: resources.h:685
+#: resources.h:707
 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 "
@@ -5424,7 +5509,7 @@
 "malware. Isto poderá levantar um falso alarme que poderá ignorar com "
 "segurança."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:713
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5432,7 +5517,7 @@
 "Por favor, note que a preservação da data e da hora em envios em servidores "
 "de FTP, FTPS e FTPES apenas funciona se eles suportarem o comando MFMT."
 
-#: resources.h:739
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5440,7 +5525,7 @@
 "Por favor note que alguns servidores podem bani-lo se tentar ligar "
 "demasiadas vezes em intervalos de tempo muito curtos."
 
-#: resources.h:888 resources.h:894
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5449,13 +5534,13 @@
 "Por favor vá a http://wiki.filezilla-project.org/Date_and_Time_formatting "
 "para mais detalhes"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
-"Por favor volte a tentar descarregar a actualização. Razões possíveis, se o "
-"problema persistir (listadas em ordem decrescente de probabilidade."
+"Por favor volte a tentar transferir a actualização. Razões possíveis, se o "
+"problema persistir (listadas em ordem decrescente de probabilidade):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5467,41 +5552,41 @@
 "ou em caso de encontrar problemas com servidores que anteriormente "
 "funcionaram bem."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Por favor seleccione uma acção:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Por favor seleccione as categorias que deseja importar"
 
-#: resources.h:673
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr ""
 "Por favor seleccione o modo de transferência predefinido que deseja usar."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, 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:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, 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:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 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:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 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:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr ""
 "Por favor seleccione os novos atributos para os ficheiros seleccionados."
@@ -5521,7 +5606,7 @@
 "inspecção de protocolo ou 'consertos' específicos do protocolo têm de estar "
 "inactivos"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5529,26 +5614,26 @@
 "Por favor viiste o sítio http://filezilla-project.org para mais informações "
 "sobre o FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
-"Por favor visite o sítio http://filezilla-project.org para descarregar a "
+"Por favor visite o sítio http://filezilla-project.org para transferir a "
 "versão mais recente."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Código Postal:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Sítios predefinidos"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:712
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "A preservar a data e a hora dos ficheiros"
 
@@ -5556,48 +5641,60 @@
 msgid "Preview:"
 msgstr "Pré-visualizar:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 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."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Imprimir um diagnóstico sobre o início do FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Imprimir informação sobre a versão para o 'stdout' e sair"
 
-#: resources.h:911
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Pastas prioritárias (predefinição)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioridade"
 
-#: resources.h:951
-msgid "Privacy policy:"
-msgstr "Política de privacidade:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Política de privacidade: Apenas a versão do FileZilla, do sistema operativo "
+"e a arquitectura do CPU serão submetidas ao servidor."
 
-#: resources.h:786
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Chaves &privadas:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tocolo:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Pa&lavra-passe de Proxy"
 
-#: resources.h:524 resources.h:591
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Processar &Lista"
 
-#: resources.h:797
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocolo:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Porta de &Proxy:"
 
-#: resources.h:781 resources.h:798
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Utilizador de Proxy:"
 
@@ -5605,12 +5702,18 @@
 msgid "Proxy authentication failed"
 msgstr "Falhou a autenticação do proxy."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Falhou a saudação do proxy: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5625,24 +5728,24 @@
 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:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr ""
-"Configaração do Proxy feita mas ou o servidor proxy ou a porta são inválidos"
+"Configuração do Proxy feita mas ou o servidor proxy ou a porta são inválidos"
 
-#: resources.h:784
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Autenticação por Chave Pública"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritmo da chave pública:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permissões públicas"
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "A lista foi processada totalmente"
 
@@ -5661,39 +5764,39 @@
 msgid "Queue: empty"
 msgstr "Lista: vazia"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Ficheiros listados"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "A Listar:"
 
-#: resources.h:607
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&einiciar o computador"
 
-#: resources.h:521
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Á&rvore de pastas remota"
 
-#: resources.h:621 resources.h:625
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "&Limpar e voltar a listar os ficheiros seleccionados"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Comando FTP bruto:"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "L&er"
 
-#: resources.h:568 resources.h:582
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Ac&tualizar"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Mu&dar o nome"
 
@@ -5705,66 +5808,76 @@
 "Volte a correr o assistente e verifique com cuidado as configurações de "
 "todas as routers e firewalls."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Le&r"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Apenas Leitura"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1071
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Tem a certeza que pretende cancelar a operação actual?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-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?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "Deseja 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:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Deseja mesmo apagar %s e %s?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Deseja mesmo apagar %s e %s ?"
 
-#: ../../locales/../src/engine/local_filesys.cpp:136
 #: ../../locales/../src/interface/RemoteTreeView.cpp:1125
-msgid "Really delete all selected files and/or directories?"
+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:136
+msgid "Really delete all selected files and/or directories from your computer?"
 msgstr ""
-"Tem a certeza que pretende apagar os ficheiros e/ou pastas seleccionados?"
+"Deseja mesmo apagar os ficheiros e/ou pastas seleccionados, no seu "
+"computador?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Razão"
 
-#: ../../locales/../src/interface/QueueView.cpp:3228
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Reiniciar agora"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Exp&lorar subpastas"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Recebida uma linha que excede os 10000 caracteres, a abortar."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Dados marcados recebidos."
 
@@ -5777,11 +5890,11 @@
 "ligado a um servidor.\n"
 "Se continuar, a ligação actual vai terminar."
 
-#: resources.h:740
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Configurações para voltar a ligar"
 
-#: resources.h:992 resources.h:993
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Volta a ligar ao último servidor usado"
 
@@ -5789,34 +5902,38 @@
 msgid "Redirection to invalid address"
 msgstr "Redireccionado para um endereço inválido"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Actualiza as listas de ficheiros e de pastas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Lembrar as palavras-passe?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Remoto"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "O certificado remoto não é de confiança."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Ficheiro remoto"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Procura de ficheiros remotos"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filtros remotos:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Caminho remoto"
 
@@ -5830,7 +5947,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:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5842,7 +5959,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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 "
@@ -5850,90 +5967,90 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "Não foi possível analisar o caminho local."
+msgstr "Não foi possível analisar o caminho remoto."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "A tratar caminho remoto:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Caminho remoto:"
 
-#: ../../locales/../src/interface/viewheader.cpp:547
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Endereço remoto:"
 
-#: resources.h:618 resources.h:622
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Remover &tudo"
 
-#: resources.h:620 resources.h:624
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Remover &seleccionados"
 
-#: resources.h:265 resources.h:275 resources.h:843 resources.h:852
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Mudar o nome do ficheiro"
 
-#: resources.h:636 resources.h:657
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Mudar o nome da pasta seleccionada"
 
-#: resources.h:572 resources.h:586
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Mudar o nome aos ficheiros e às pastas seleccionados"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Mudar o nome de '%s' para '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Reportar erros e pedidos de funcionalidades"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Requer FTP sobre TLS explícito"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Requer FTP sobre TLS implícito"
 
-#: resources.h:623
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Limpar e voltar a listar &todos os ficheiros"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "A resolver o endereço de %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
-msgstr "A resolver o nome do anfitrião"
+msgstr "A resolver o nome do servidor"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Resposta:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Resultados:"
 
-#: resources.h:264 resources.h:274 resources.h:842 resources.h:851
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Retomar a transferência de ficheiros"
 
-#: resources.h:857
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5941,34 +6058,38 @@
 "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:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "A obter a lista de pastas ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "A obter endereço IP externo a partir de %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "O certificado de raiz não é de confiança"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "M&ostrar os ficheiros que estão a ser editados ..."
 
-#: resources.h:608
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "Mostrar o &Gestor de Sítios ao iniciar."
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "D&esligar o computador"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Parar"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Navegação &sincronizada"
 
@@ -5976,31 +6097,46 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Guardar configurações?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+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:1822
 msgid "Scanning for files to add to queue"
 msgstr "A procurar ficheiros para adicionar à lista"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "A procurar ficheiros para enviar"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "&Condições para a procura:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Procurar na &pasta:"
 
-#: resources.h:1000
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Procurar ficheiros novamente."
 
-#: resources.h:540
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Procurar no servidor pelos ficheiros"
 
@@ -6013,27 +6149,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Veja também: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Sele&ccionar servidor"
 
-#: resources.h:725
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Seleccionar &página:"
 
-#: resources.h:876
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Seleccionar Tema"
 
-#: resources.h:835
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Seleccione as acções predefinidas para executar se o ficheiro já existir no "
 "destino."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Seleccionar o editor predefinido"
 
@@ -6053,9 +6189,9 @@
 "Seleccione a acção predefinida se o ficheiro já existir no destino, apenas "
 "para os ficheiros actualmente seleccionados na lista."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
-msgstr "Seleccione o localização para descarregar o pacote"
+msgstr "Seleccione o localização para transferir o pacote"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
@@ -6074,7 +6210,7 @@
 msgstr "Seleccione um ficheiro para exportadar as configurações"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Seleccione um ficheiro para os sítios exportados"
 
@@ -6090,12 +6226,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Seleccione um nome de ficheiro para a chave de ficheiro convertida"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Seleccione como deverão ser abertos estes ficheiros."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Seleccione a pasta de destino para descargas"
 
@@ -6103,15 +6239,15 @@
 msgid "Select target filename"
 msgstr "Seleccionar o nome do ficheiro pretendido"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Seleccione as categorias para exportar"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Seleccione os dados privados que deseja apagar."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6125,7 +6261,7 @@
 msgstr[0] "Seleccionada %d pasta."
 msgstr[1] "Seleccionadas %d pastas."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6146,7 +6282,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Seleccionados %s e %s para transferir."
@@ -6161,13 +6297,13 @@
 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:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "O editor seleccionado não existe."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "O ficheiro seleccionado já está a ser editado."
 
@@ -6175,19 +6311,19 @@
 msgid "Selected file is already loaded"
 msgstr "O ficheiro seleccionado já está carregado."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2681
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "O ficheiro seleccionado já está aberto"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2709
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "O ficheiro seleccionado ainda está a ser editado"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "O filtro seleccionado apenas funciona para ficheiros locais."
 
-#: ../../locales/../src/interface/menu_bar.cpp:311
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6200,38 +6336,43 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "A porta seleccionada é habitualmente usada por um protocolo diferente."
 
-#: resources.h:747
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Enviar &comandos para manter o FTP activo"
 
-#: resources.h:542
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr ""
 "Envia comandos personalizados ao servidor de outro modo não disponíveis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "A enviar um comando para manter a actividade"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Número de série:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Tipo de Servidor:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 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:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+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:4349
 #, 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:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6240,15 +6381,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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 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:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 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:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6257,7 +6398,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6265,7 +6406,11 @@
 "O Servidor pode exigir uma conta. Tenter especificar uma conta através do "
 "Gestor de Sítios."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/ControlSocket.cpp:420
+msgid "Server returned empty path."
+msgstr "O servidor devolveu um caminho vazio."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6273,13 +6418,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:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6299,101 +6444,112 @@
 msgid "Server sent unexpected reply."
 msgstr "O servidor enviou uma resposta inesperada."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "MAC do servidor para o cliente:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Cifra do servidor para o cliente:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Tipo de &servidor:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Ficheiro remoto/local"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Servidor:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Detalhes da sessão"
 
-#: resources.h:595
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Definir &Prioridade"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Definir permissões de '%s' para '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize chamado sem socket"
 
-#: resources.h:724
+#: resources.h:746
 msgid "Settings"
 msgstr "Configurações"
 
-#: resources.h:973
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Mostrar &lista de pastas em bruto"
 
-#: resources.h:551
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Mostrar a janela de &boas-vindas..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2318
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Mostrar ambas as árvores de pastas e continuar a comparação?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Mostrar as cifras TLS disponíveis"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Mostra esta janela de ajuda"
 
-#: ../../locales/../src/interface/QueueView.cpp:3230
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Desligar o computador"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Algorítmo de assinatura:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Entradas do &Gestor de Sítios"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Gestor de Sítios"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Gestor de Sítios - Não lembrar a palavra-passe"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Gestor de Sítios - Dados inválidos"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Gestor de Sítios já aberto"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "O sítio não existe."
 
@@ -6403,8 +6559,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "O caminho para o sítio está incorrecto."
 
@@ -6423,11 +6579,11 @@
 "Gestor de Sítios.\n"
 "Adicionar a ligação actual ao gestor de sítios?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Tamanho"
 
-#: resources.h:895
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Formato do tamanho"
 
@@ -6436,32 +6592,32 @@
 msgid "Size unknown"
 msgstr "Tamanho desconhecido"
 
-#: resources.h:266 resources.h:276 resources.h:844 resources.h:853
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Saltar ficheiro"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "A saltar a transferência de %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "A saltar o envio de %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1139
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 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."
 
-#: resources.h:687 resources.h:763
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6469,19 +6625,19 @@
 "Alguns servidores desconfigurados e que estão atrás de um router podem "
 "responder com o endereço IP local, deles próprios."
 
-#: resources.h:913
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Ordenar as pastas em linha"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "A ordenação não pode ser alterada quando a comparar pastas."
 
-#: resources.h:909
+#: resources.h:932
 msgid "Sorting"
 msgstr "Ordenar"
 
-#: resources.h:910
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Modo de &classificação:"
 
@@ -6493,20 +6649,20 @@
 msgid "Source and target file may not be the same"
 msgstr "O ficheiro original e o de destino podem não ser os mesmos"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "O destino e a fonte da operação 'largar' são idênticos"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Ficheiro fonte:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limites de Velocidade"
 
-#: resources.h:808
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Limites de velocidade"
 
@@ -6518,7 +6674,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Os limites de velocidade estão activados, prima para mudar"
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versões estáveis e beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Apenas versões estáveis"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Começar a transferência de &imediato"
 
@@ -6526,43 +6690,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Começar com o Gestor de Sítios aberto"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "A iniciar a transferência de %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "A iniciar o envio de %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Inicia o sítio local no caminho indicado"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Estado ou província"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Estado"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Estado:"
 
-#: resources.h:592
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Parar e remover &tudo"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Rua:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Sujeito do certificado"
 
@@ -6570,11 +6738,11 @@
 msgid "Successful transfers"
 msgstr "Transferências bem sucedidas"
 
-#: resources.h:715
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Sumário dos resultados do teste:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6582,52 +6750,57 @@
 "As ligações simbólicas aos ficheiros não são afectadas por esta opção, tais "
 "ligações são sempre apagadas."
 
-#: resources.h:999 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Navegação sincronizada"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "A navegação sincronizada foi desligada."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Erro de sintaxe"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2462
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Erro de sintaxe na linha de comandos"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistema"
 
+#: resources.h:535
+msgid "T&oolbar"
+msgstr "Barra de &ferramentas"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Ligação TLS/SSL estabelecida, a enviar o pedido HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Ligação TLS/SSL estabelecida, à espera da mensagem de boas-vindas ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Ligação TLS/SSL estabelecida."
 
@@ -6635,28 +6808,32 @@
 msgid "TTL expired"
 msgstr "TTL expirado"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "O ficheiro já existe no destino"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Ficheiro destino:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "O nome do ficheiro já existe no destino!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr ""
 "O nome do ficheiro já existe no destino, tem a certeza que quer continuar?"
 
-#: resources.h:714
+#: resources.h:736
 msgid "Test results"
 msgstr "Resultados do teste"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "A testar as capacidades de retoma do servidor"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6674,7 +6851,7 @@
 "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:421
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "O código do documento XML não está correcto: %s"
@@ -6685,11 +6862,11 @@
 msgstr "O endereço que introduziu foi: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Não foi possível guardar o marcador."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Não foi possível limpar os marcadores."
 
@@ -6701,21 +6878,26 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "A sequência para o início de sessão não pode estar vazia."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Não foi possível estabelecer a ligação de dados: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Não foi encontrado o editor para os ficheiros de texto."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "O editor para os ficheiros de texto é o '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "O nome de filtro indicado já existe."
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "O nome de filtro indicado já existe, por favor, indique um diferente."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6732,9 +6914,9 @@
 "O ficheiro %s já existe.\n"
 "Por favor introduza um novo nome:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2655
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6752,14 +6934,14 @@
 "Não foi possível carregar o ficheiro '%s' ou este não contém uma chave "
 "privada."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:59
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Não foi possível carregar o ficheiro '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2649
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6768,8 +6950,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/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6811,7 +6993,7 @@
 "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:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "O ficheiro seleccionado como editor predefinido não existe."
 
@@ -6825,8 +7007,8 @@
 msgstr ""
 "O ficheiro que seleccionou contém dados do gestor de sítios de uma versão "
 "anterior do FileZilla.\n"
-"Devido a diferenças no formato, apenas o anfitrião, porta, nome de "
-"utilizador e palavra-passe serão importados.\n"
+"Devido a diferenças no formato, apenas o servidor, porta, nome de utilizador "
+"e palavra-passe serão importados.\n"
 "Continuar com a importação?"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
@@ -6847,11 +7029,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Os seguintes caracteres serão substituídos: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Os ficheiros seguintes estão a ser editados:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "A solução FTP de código aberto gratuita"
 
@@ -6859,7 +7041,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Não foi possível guardar os marcadores globais."
 
-#: resources.h:971
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6890,7 +7072,7 @@
 msgstr ""
 "A menor porta disponível tem que ser menor ou igual à maior porta disponível."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6898,7 +7080,7 @@
 "A versão mais recente foi descarragada. Prima em Terminar para sair do "
 "FileZilla e começar a instalação."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6906,11 +7088,11 @@
 "A versão mais recente foi descarragada. Por favor instale-a conforme "
 "instalou esta versão."
 
-#: ../../locales/../src/interface/QueueView.cpp:1962
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "A lista não será guardada."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6924,26 +7106,26 @@
 msgid "The selected categories have been imported."
 msgstr "As categorias seleccionadas foram importadas."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr ""
 "O ficheiro seleccionado contém dados importáveis para as seguintes "
 "categorias."
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "O ficheiro seleccionado já está a ser editado:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2709
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 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/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2661
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6961,7 +7143,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "O servidor enviou uma resposta inesperada ou não reconhecida."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "O servidor utiliza o seguinte mapa de caracteres para os nomes de ficheiro:"
@@ -6974,23 +7156,23 @@
 "O certificado do servidor é desconhecido. Por favor examine com cuidado o "
 "certificado para ter a certeza que o servidor é de confiança."
 
-#: resources.h:187
+#: resources.h:197
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
-"A chave do servidor anfitrião não corresponde à chave que foi guardada. Isto "
-"significa que, ou o administrador alterou a chave do servidor, ou está a "
-"tentar ligar a um computador que se faz passar pelo servidor."
+"A chave do servidor não corresponde à chave que foi guardada. Isto significa "
+"que, ou o administrador alterou a chave do servidor, ou está a tentar ligar "
+"a um computador que se faz passar pelo servidor."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
-"A chave do servidor anfitrião é desconhecida. Não tem garantias que o "
-"servidor é o computador que pensa que é."
+"A chave do servidor é desconhecida. Não tem garantias que o servidor é o "
+"computador que pensa que é."
 
 #: ../../locales/../src/interface/import.cpp:81
 msgid ""
@@ -7000,15 +7182,15 @@
 "As configurações foram importadas. Tem de reiniciar o FileZilla para que "
 "todas as configurações produzam efeito."
 
-#: ../../locales/../src/interface/QueueView.cpp:3218
+#: ../../locales/../src/interface/QueueView.cpp:3206
 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:3216
+#: ../../locales/../src/interface/QueueView.cpp:3204
 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."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -7016,7 +7198,7 @@
 "O ficheiro já existe.\n"
 "Por favor escolha uma acção."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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?"
 
@@ -7024,11 +7206,11 @@
 msgid "Themes"
 msgstr "Temas"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Este conjunto de filtros não pode ser removido."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Este conjunto de filtros não pode ser renomeado."
 
@@ -7040,7 +7222,7 @@
 "Isto significa que alguma router e/ou firewall ainda está a interferir com o "
 "FileZilla."
 
-#: resources.h:692
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7048,7 +7230,7 @@
 "Isto funciona apenas se não estiver a utilizar um router, de outro modo o "
 "sistema devolverá apenas o seu endereço interno."
 
-#: resources.h:670
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7056,25 +7238,25 @@
 "Este assistente ajudá-lo-á a configurar correctamente qualquer router ou "
 "firewall que tiver e testa a configuração."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Tempo"
 
-#: resources.h:889
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Formato para a hora"
 
-#: resources.h:731
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Tempo de espera, em &segundos:"
 
-#: resources.h:734 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Tempo de espera"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7083,22 +7265,22 @@
 "Fusos horários: Servidor: %d segundos. Local %d segundos. Diferença: %d "
 "segundos."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Título:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2316
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2317
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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 "
 "invisíveis."
 
-#: resources.h:785
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7106,7 +7288,7 @@
 "Para suportar uma autenticação por chave pública, o FileZilla precisa de "
 "saber que chaves privadas usar."
 
-#: resources.h:996
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7123,7 +7305,7 @@
 "Verde: O ficheiro é mais recente do que aquele não marcado, do outro lado\n"
 "Vermelho: Tamanhos de ficheiro diferentes"
 
-#: resources.h:998
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7133,23 +7315,23 @@
 "Se ligada, ao navegar na pasta local também mudará a pasta correspondente no "
 "servidor e vice-versa."
 
-#: resources.h:986 resources.h:987
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Inicia ou pára a lista de transferências"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Mostra ou esconde a árvore das pastas locais"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Mostra ou esconde a janela de mensagens"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Mostra ou esconde a árvore das pastas remotas"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Mostra ou esconde a lista de transferências"
 
@@ -7162,37 +7344,37 @@
 msgstr "Demasiados redireccionamentos"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Traçar:"
 
-#: resources.h:919 resources.h:925
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transferência"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "&Direcção da transferência"
 
-#: resources.h:526
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Tipo de &transferência"
 
-#: resources.h:741
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Modo de Transferência"
 
-#: resources.h:875
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Lista de Transferências"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Configurações para Transferências"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Transferência interrompida: %s"
@@ -7201,8 +7383,8 @@
 msgid "Transferred data got tainted."
 msgstr "Os dados transferidos foram marcados."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "A transferir"
 
@@ -7210,87 +7392,87 @@
 msgid "Transfers"
 msgstr "Transferências"
 
-#: ../../locales/../src/interface/QueueView.cpp:3133
-#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transferências acabadas"
 
-#: resources.h:832
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Tratar &ficheiros sem extensão como ficheiros ASCII"
 
-#: resources.h:828
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Tratar os &seguintes tipos de ficheiro como ficheiros ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
-msgstr "Confiar na Chave de Anfitrião alterada:"
+msgstr "Confiar na Chave de Servidor alterada:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
-msgstr "Confiar na Chave de Anfitrião nova:"
+msgstr "Confiar na nova Chave de Servidor:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Confiar nesta nova chave e continuar a ligar?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Confiar neste certificado e continuar a ligação?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
-msgstr "Confiar neste anfitrião e continuar a ligar?"
+msgstr "Confiar neste servidor e continuar a ligar?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tipo"
 
-#: resources.h:767
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Tipo de Proxy do FTP"
 
-#: resources.h:792
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Tipo de proxy genérico:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "E&nviar"
 
-#: resources.h:484 resources.h:812
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limite em &envio:"
 
-#: resources.h:937
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "U&sar as associações dos tipos de ficheiros, se disponíveis"
 
-#: resources.h:890
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "&Usar as predefinições do sistema"
 
-#: resources.h:769
+#: resources.h:791
 msgid "USER@&HOST"
-msgstr "UTILIZADOR@&ANFITRIÃO"
+msgstr "UTILIZADOR@&SERVIDOR"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
 msgstr "Código de erro não atribuído %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unidade:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Desconhecido"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Tipo de proxy do FTP desconhecido, não é possivel gerar a sequência para "
@@ -7305,7 +7487,7 @@
 msgid "Unknown certificate"
 msgstr "Certificado desconhecido"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:409
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7313,9 +7495,9 @@
 "Erro desconhecido ao abrir o ficheiro. Certifique-se que o ficheiro pode ser "
 "acedido e de que é um documento XML correcto."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
-msgstr "Chave de anfitrião desconhecida"
+msgstr "Chave de servidor desconhecida"
 
 #: ../../locales/../src/engine/proxy.cpp:378
 #, c-format
@@ -7326,7 +7508,7 @@
 "Versão do Protocolo da Autenticação, Nome de Utilizador / Palavra-Passe, por "
 "SOCKS desconhecida: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:454
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7349,7 +7531,7 @@
 "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:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Este tipo de certificado não é suportado"
 
@@ -7357,25 +7539,24 @@
 msgid "Unsupported redirect"
 msgstr "Este redireccionamento não é suportado"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "E&nviar sem editar"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Actualizações"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Assistente de actualização"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Actualizações"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Enviar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "O envio falhou"
 
@@ -7388,99 +7569,99 @@
 msgid "Upload limit: none"
 msgstr "Limite para envio: nenhum"
 
-#: resources.h:647
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Enviar a pasta seleccionada"
 
-#: resources.h:557
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Enviar os ficheiros e as pastas seleccionados"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Enviar este ficheiro de volta ao servidor?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Enviar este ficheiro para o servidor?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "A enviar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "A enviar e a remoção pendente"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "A enviar e a terminar a edição"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Usar um &mapa de caracteres personalizado"
 
-#: resources.h:934
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Usar um editor &próprio:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Usar o &editor predefinido para ficheiros de texto"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Usar a navegação &sincronizada"
 
-#: resources.h:108
+#: resources.h:117
 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."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Usar a acção predefinida"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Usar FTP simples"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Usar o servidor agora ligado para"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Usar um servidor do Gestor de Sítios"
 
-#: resources.h:884
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Usar as &predefinições do sistema"
 
-#: resources.h:693
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Utilizar o endereço IP seguinte:"
 
-#: resources.h:703
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Utilizar o intervalo de portas seguinte:"
 
-#: resources.h:688
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Utilizar, em alternativa, o endereço IP externo do servidor"
 
-#: resources.h:694 resources.h:757
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Use apenas se estiver a utilizar um router e tiver um endereço IP externo "
 "estático."
 
-#: resources.h:697
+#: resources.h:719
 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 "
@@ -7491,86 +7672,86 @@
 "primeira vez. Apenas a versão do FileZilla que está a utilizar será "
 "submetida ao servidor."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Utilizador:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 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:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "A usar o proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "O uso de um mapa de caracteres errado pode resultar em nomes de ficheiros "
 "incorrectamente mostrados."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Ao usar este assistente pode procurar actualizações disponíveis para o "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Válido desde:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Válido até:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Mensagens de entrada eloquentes a partir de wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "A verificar o certificado ..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versão:"
 
-#: resources.h:817
+#: resources.h:839
 msgid "Very high"
 msgstr "Muito alta"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Ver o conjunto escondido de opções, mas não suportado pelo servidor"
 
-#: resources.h:921
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Ver/Editar"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Colunas vísiveis"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "E&screver"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "À espera"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "A esperar pela ligação do navegador"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "À espera da palavra-passe"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "À espera do cancelamento da transferência"
 
@@ -7578,7 +7759,7 @@
 msgid "Waiting to retry..."
 msgstr "À espera para voltar a tentar ..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7609,11 +7790,11 @@
 "camada de aplicação',\n"
 "o FileZilla entrará em espera em grandes transferências."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Aviso, a ignorar a ligação de um IP errado."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7621,30 +7802,38 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
-"Aviso, use as 'nightly builds' por sua própria conta e risco.\n"
-"As 'nightly builds' não são suportadas.\n"
-"As 'nightly builds' podem não funcionar como esperado e podem mesmo "
-"danificar o seu sistema.\n"
+"Aviso, use as versões de desenvolvimento por sua própria conta e risco.\n"
+"As versões de desenvolvimento não têm suporte técnico.\n"
+"As versões de desenvolvimento podem não funcionar como o esperado e podem "
+"mesmo danificar o seu sistema.\n"
 "\n"
-"Quer mesmo procurar 'nightly builds'?"
+"Quer mesmo procurar versões de desenvolvimento?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Aviso: Possível quebra de segurança!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Bem-vindo ao FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Novidades"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Novidades:"
 
-#: resources.h:820
+#: resources.h:501
+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."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7653,11 +7842,15 @@
 "local nos nomes de ficheiros serão substituídos na transferência de tal "
 "ficheiro."
 
-#: resources.h:862
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Ecrã panorâmico"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Deseja que o Filezilla lembre as palavras-passe?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Es&crever"
 
@@ -7670,11 +7863,19 @@
 msgid "Wrong line endings"
 msgstr "Fins de linha incorrectos"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Sim"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Parece estar a utilizar um servidor com ligação IPv6 apenas. Este assistente "
+"não suporta esta ligação."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7682,15 +7883,15 @@
 "Já está a utilizar a versão mais recente do FileZilla. Por favor, verifique "
 "novamente mais tarde."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Pode sempre voltar a abrir esta janela através do menu de ajuda."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Para usar a porta predefinida, deixe o campo da porta vazio."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7717,18 +7918,18 @@
 msgstr ""
 "Não indicou um novo nome para o ficheiro. Substituir ao invés o ficheiro?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Seleccionou pelo menos uma ligação simbólica."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2628
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 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:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7737,11 +7938,11 @@
 "continuar?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
-msgstr "Tem que inserir um nome de anfitrião."
+msgstr "Tem que inserir um nome de servidor."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Tem que indicar uma pasta local."
 
@@ -7750,17 +7951,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Tem que inserir um endereço IP válido."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 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:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Tem que inserir um nome de conta"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Tem de indicar um nome de utilizador"
 
@@ -7780,29 +7981,29 @@
 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:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Tem que indicar um comando apropriado."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
-msgstr "Tem que inserir um anfitrião de proxy."
+msgstr "Tem que inserir um servidor de proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 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:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 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:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7810,7 +8011,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:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7842,44 +8043,49 @@
 "Não deve ter problemas em ligar a outros servidores, as transferências de "
 "ficheiros devem funcionar normalmente."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "depois"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "antes"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "começa com"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "contém"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "não contém"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "não é igual"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "termina com"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "igual a"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "ficheiro"
 
@@ -7898,82 +8104,128 @@
 "Por favor, certifique-se que este executável existe na mesma pasta de "
 "programa do FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp não pôde ser iniciado"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 "o módulo gnutls_certificate_get_peers não devolveu qualquer certificado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "maior que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "agrupar executáveis"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "grupo só de leitura"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "grupo de arquivo"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "é igual a"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "está configurado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "está desconfigurado"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "menor que"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "condiz com o regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "proprietário para executáveis"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "proprietário para leitura"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "proprietário para escrita"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "desconhecido"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "universo executável"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "universo só de leitura"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "universo de arquivo"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Copiar"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Copiar"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Autorizar a verificação automática de actualizações."
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Número de dias entre verificações de actualizações:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Pelo menos 7 dias)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Verificação automática de actualizações"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Procurar por versões &beta e pré-lançamentos"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr ""
+#~ "Por favor indique um intervalo entre actualizações de pelo menos 7 dias"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Política de privacidade:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Duplicar o nome do filtro"
+
 #~ msgid "Serial Number:"
 #~ msgstr "Número de Série:"
diff -Nru filezilla-3.5.3/locales/ro_RO.po filezilla-3.7.3~precise/locales/ro_RO.po
--- filezilla-3.5.3/locales/ro_RO.po	2011-08-21 17:53:49.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ro_RO.po	2013-06-18 20:02:24.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: Filezilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-08-21 19:49+0200\n"
-"PO-Revision-Date: 2011-05-23 11:13+0200\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-13 21:17+0200\n"
 "Last-Translator: Alexandru Bogdan Munteanu <muntealb@gmail.com>\n"
 "Language-Team: MunteAlb, Laurențiu Anisie <muntealb@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -15,16 +15,16 @@
 "20)) ? 1 : 2);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S scurs"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S rămas"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -43,9 +43,9 @@
 msgstr[1] "%d dosare"
 msgstr[2] "%d de dosare"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -81,7 +81,7 @@
 msgstr[1] "%d file (mărime totală: cel puțin %s)"
 msgstr[2] "%d de file (mărime totală: cel puțin %s)"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d file adăugate în coadă"
@@ -94,31 +94,21 @@
 msgstr[1] "%d secunde"
 msgstr[2] "%d secunde"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Gazdă"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Parolă"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -133,7 +123,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Nu este încă valid!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Utilizator Proxy"
@@ -156,27 +146,17 @@
 msgstr[1] "%s baiți"
 msgstr[2] "%s baiți"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s baiți"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s baiți (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s baiți (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s baiți (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s baiți (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -191,7 +171,7 @@
 "Descarcă FileZilla din nou. Dacă problema persistă, te rugăm să trimiți un "
 "raport despre bug."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -213,152 +193,148 @@
 msgid "%s with %d bits"
 msgstr "%s cu %d biți"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Utilizator"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Parola Proxy"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Despre..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Cont:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Activ"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Adaugă Semn de Carte..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Adaugă în Coadă"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Adaugă Filă Cheie..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Adaugă în Coadă"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Ajustează decalarea fusului orar al serverului:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "Încrede-te în certific&at și în sesiunile viitoare."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Ai încredere mereu în această gazdă, adaugă-i cheia în caș [cache]"
 
-#: resources.h:939
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Utilizează mereu editorul implicit"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "Folosește &mereu selecția pentru filele neasociate"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Utilizează mereu această acțiune"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "Î&ntreabă sistemul de operare despre adresa IP externă"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Auto"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Autodetectează"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binar"
 
-#: resources.h:899
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Prefixe &binare folosind simboluri SI (de ex. 1 KB = 1024 baiți)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Semn"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Explorează..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "Toleranța la &rafală [burst]:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Anulează"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Caută versiuni beta de FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Curăță Datele Private..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "Înc&hide FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Configurează limitele de viteză..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Configurează..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Conectează"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Copiază"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
-msgstr "&Copiază Conexiunea Curentă în Administratorul de Situri..."
+msgstr "&Copiază Conexiunea Curentă în Administratorul Siturilor..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Copiază în Cliplanșetă"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Prăbușire"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Creează Dosar"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Creează Tab Nou"
 
@@ -366,168 +342,168 @@
 msgid "&Debug"
 msgstr "&Debughează"
 
-#: resources.h:966
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "Informații de &debugare în jurnalul cu mesaje:"
 
-#: resources.h:932
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "Editor &Implicit:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Acțiunea Implicită pentru Filele Deja Existente..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "Inter&valul între încercările eșuate de logare:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Șterge"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Șterge simlegătura"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "Compară &Dosarele"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "Aban&donează fila locală, apoi descarcă din nou și editează fila"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Deconectează"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Deconectează de la Server"
 
-#: resources.h:875
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "Afișează viteza de transfer momentană în locul vitezei medii"
 
-#: resources.h:897
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "Afișează &dimensiunea în baiți"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Nu memora par&olele"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Nu arăta din nou acest dialog."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Nu utiliza a&drese IP externe la conexiunile locale."
 
-#: resources.h:919
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Acțiune la &dublu-clic pe filă:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Descarcă"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Descarcă în:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Descarcă..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Descărcări:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Editează"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Editează Regulile Filtrelor..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "Acti&vează"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "Ac&tivează controlul automat al actualizărilor"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "Activ&ează limitele de viteză"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Codare:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "Criptar&e:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "Comandă &Personalizată...."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Execută"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
-msgstr "&Exportă intrările din Administratorul de Situri"
+msgstr "&Exportă intrările din Administratorul Siturilor"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exportă..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Repliază [fallback] la modul activ"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Filă"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Atributele Filei..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "Permisiunile &Filelor..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Filă:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Condiții ale &Filtrului:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Seturi de Filtre:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filtre:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Finalizează"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Termină editarea și șterge fila locală"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -535,478 +511,486 @@
 "A&platizează căile distante, descarcă toate filele conținute direct în "
 "dosarul țintă"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Urmărește simlegătura, șterge conținutul dosarului țintă"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "O&bține adresa IP externă de la următoarea adresă:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "Ajutor pe &Internet..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "Semn de Carte &Global"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 folosind metoda CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "A&jutor"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "A&scunde Filele Identice"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Maximă"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Port maxim disponibil:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "Adre&să:"
 
-#: resources.h:898
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Prefixe binare &IEC (de ex. 1 KB = 1024 baiți)"
 
-#: resources.h:886
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exemplu: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importă..."
 
-#: resources.h:941
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Preia de la SO asocierile tipurilor de file"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Păstrează structura căii distante ca relativă la rădăcina căutării"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "Aran&jamentul panourilor cu file și dosare:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Limitează porturile locale utilizate de FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Limitează numărul de conexiuni simultane"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "Arborele Dosarelor &Locale"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "Dosar &Local:"
 
-#: resources.h:956
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Jurnalizează în filă"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "Tip de &Logare:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "Tip de &Logare:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Joasă"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "Ad&ministrează Semnele de Carte..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Transferă &Manual..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Numărul &maxim de conexiuni:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Numărul maxim de &reîncercări:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "Jurnalul &Mesajelor"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimizează în sertar [system tray]"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Nume:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Vrăjitorul de Configurare a Rețelei..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Nou"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Sit Nou"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
-msgstr "E disponibilă o &versiune nouă!"
+msgstr "Este disponibilă o &versiune nouă!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "Î&nainte"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Nu"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Nimic"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "&Numărul de zile între verificările actualizărilor:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "Valoare &numerică:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Deschide"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Suprascrie"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Pasiv"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Parolă:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Emite un Sunet"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Poziția jurnalului cu mesaje:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Păstrează Marcajele de Timp ale Filelor Transferate"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Coadă"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "Conectează &Rapid"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "Bara de Conectare &Rapidă"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Citire"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Reconectează"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "Îm&prospătează"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Memorează parola pentru această sesiune"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "Memo&rează parolele"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "Dosar &Distant:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Cale &Distantă:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "În&lătură"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "Înlătură C&heia"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "Înlătură &Selectatele"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Renumește"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Renumește..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Redeschide fila locală"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "Înlocuiește ca&racterele nevalide cu:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Raportează un Bug..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Resetează și repune în coadă tot"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Repornește Vrăjitorul"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Reia [resume]"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Rulează Comanda...."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Rulează vrăjitorul de configurare acum..."
 
-#: resources.h:950
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Caută Actualizări Acum..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Salvează ca..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Caută"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Caută în Filele Distante..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Selectează Intrarea:"
 
-#: resources.h:930
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Selectează limba:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Selectează coloanele care trebuie afișate:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Setări"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Setări..."
 
-#: resources.h:965
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Arată meniul de debugare [debugging]"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "Arată Mesa&jul Serverului"
 
-#: resources.h:955
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "Arată marcajele de &timp în jurnalul mesajelor [log]"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
-msgstr "Ad&ministrator de Situri..."
+msgstr "Ad&ministratorul Siturilor..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "Semn de Carte Specific &Sitului"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Sari"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Limite de Viteză"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Pornește transferul &imediat"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Schimbă între ele panourile local și distant"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Cifruri &TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testează"
 
-#: resources.h:878
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Temă:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Transfer"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Mod de Transfer:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Coada de Trans&fer"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Tratează filele avînd punct inițial în nume ca file ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "De&zeditează"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Actualizează cheia existentă pentru această gazdă"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Încarcă"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "În&cărcări:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "Folosește program personali&zat"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Folosește explorarea sincroni&zată"
 
-#: resources.h:934
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "Folosește editor&ul implicit din sistem pentru filele text"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Folosește următoarea adresă IP:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Folosește mai degrabă adresa externă IP a serverului"
 
-#: resources.h:901
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Folosește separator de mii"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Utilizator:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Utilizator:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Versiunea %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Vezi"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Vezi/Editează"
 
-#: resources.h:940
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Monitorizează filele editate local și îndeamnă să fie încărcate modificările"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "La &verificarea existenței actualizărilor, caută:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Scriere"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Da"
 
@@ -1024,11 +1008,27 @@
 msgstr "'%s' nu e un dosar."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Tipul de logare 'Cont' nu este suportat de protocolul selectat"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Tipurile de logare (autentificare) 'Normală' și 'Cont' nu sînt disponibile, "
+"deci va fi folosit tipul 'Cere parola'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Tipurile de logare (autentificare) 'Normală' și 'Cont' nu sînt disponibile. "
+"Intrarea a fost schimbată în tipul 'Cere parola'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1047,120 +1047,116 @@
 msgstr[1] "(%d obiecte filtrate)"
 msgstr[2] "(%d de obiecte filtrate)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 pt. nelimitat)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 secunde)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 pt. dezactivare)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(cel puțin 7 zile)"
-
-#: resources.h:894
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(exemplu: %H:%M)"
 
-#: resources.h:888
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(exemplu: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(în %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S rămas"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- rămas"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Ruter sau/și parafoc defecte"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Filă deteriorată pe serverul clonă"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
-msgstr "- Soft malefic în calculatorul tău."
+msgstr "- Malsoft (soft malițios) în calculatorul tău."
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- rămas"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c nu poate fi utilizat împreună cu o adresă FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l poate fi utilizat doar împreună cu o adresă FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s și -c nu pot fi prezente în același timp."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s nu poate fi utilizat împreună cu o adresă FTP."
 
-#: resources.h:967
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Nimic"
 
-#: resources.h:968
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Atenționare"
 
-#: resources.h:969
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Informații"
 
-#: resources.h:970
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Detaliat"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "sistem pe 32 biți"
 
-#: resources.h:971
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Debugare"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "sistem pe 64 biți"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< Îna&poi"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1170,16 +1166,17 @@
 msgstr ""
 "Există deja un semn de carte cu numele specificat. Folosește un alt nume."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "E necesară setarea editorului implicit."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Un dosar nu poate fi tras într-unul din subdosarele lui."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1189,27 +1186,27 @@
 "aceste cazuri trebuie să utilizezi modul activ. În modul activ, FileZilla "
 "deschide un port și solicită serverului conectarea la el."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "O filă deschisă anterior a fost modificată."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "O filă cu același nume e în curs de editare. Vrei să redeschizi '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "O filă cu același nume e deja în curs de transferare."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "O filă cu același nume este editată acum. Închide-o și reîncearcă."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1222,11 +1219,11 @@
 "Pînă nu vei rezolva problema, unele file ar putea să lipsească din liste.\n"
 "Nu vor mai fi afișate atenționări în această sesiune."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Este disponibilă o versiune mai nouă de FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1235,7 +1232,7 @@
 "configurate greșit pot ascunde unele file. Folosește această opțiune pentru "
 "a forța serverul să afișeze toate filele."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1252,15 +1249,15 @@
 "Dezactivezi explorarea sincronizată și continui cu schimbarea dosarului "
 "local?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "A&daugă"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "Permite re&luarea filelor ASCII"
 
@@ -1272,55 +1269,55 @@
 msgid "A&pply only to uploads"
 msgstr "A&plică numai la încărcări"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "A&plică la toate filele și dosarele"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Înlătură a&utomat transferurile realizate cu succes"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Închide conexiunea precedentă și conectează în tabul curent"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Despre FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Deasupra listelor de file și dosare"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Cont"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Acțiune după Terminarea &Cozii"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Acțiune la Fila Selectată:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Acțiune de efectuat:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Acțiune:"
 
@@ -1354,23 +1351,23 @@
 "corectă, dar ruterul sau parafocul tău a modificat în mod greșit adresa "
 "trimisă."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Adresa IP pentru Modul Activ"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Adaugă în coadă filele"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Adaugă dosarul selectat la coada de transfer"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Adaugă filele și dosarele selectate la coada de transfer"
 
-#: resources.h:921 resources.h:927
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Adaugă în Coadă"
 
@@ -1378,27 +1375,42 @@
 msgid "Address type not supported"
 msgstr "Tipul de adresă nu e suportat"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avansate"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Opțiuni Avansate:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Sfat: Dacă nu vrei să testezi funcțiile nou introduse, folosește doar "
+"versiunile stabile ale softului. Versiunile beta și compilările nocturne "
+"sînt versiuni de dezvoltare create în scop de testare. Compilările nocturne "
+"de FileZilla ar putea să nu funcționeze corespunzător și ar putea chiar să "
+"producă daune sistemului. Folosește versiunile beta și compilările nocturne "
+"doar pe riscul tău."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritm:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Toate filele au fost transferate cu succes"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Toate porturile din intervalul dat trebuie să fie între 1024 și 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1409,19 +1421,19 @@
 msgstr[2] ""
 "Toate transferurile au fost terminate. %d de file nu au putut fi transferate."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Permite comutarea la alte moduri de trans&fer în caz de eșec"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Permite replierea [fallback] la alte moduri de transfer în caz de eșec"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Deja conectat"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1429,7 +1441,7 @@
 "Alternativ, poți utiliza unealta Pageant din Putty pentru administra cheile, "
 "deoarece FileZilla e compatibil cu acest program."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1437,7 +1449,7 @@
 "Alternativ, poți utiliza agentul SSH al sistemului propriu. Pentru a face "
 "acest lucru, asigură-te că variabila de mediu SSH_AUTH_SOCK este setată."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1445,7 +1457,7 @@
 "Alternativ, vizitează http://filezilla-project.org pentru a descărca cea mai "
 "recentă versiune."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1454,7 +1466,7 @@
 "A apărut o eroare la încărcarea cozii de așteptare din \"%s\".\n"
 "Anumite itemuri din coadă e posibil să nu fi fost restaurate."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1463,93 +1475,93 @@
 "A apărut o eroare la salvarea cozii de așteptare în \"%s\".\n"
 "Anumite itemuri din coadă e posibil să nu fi fost salvate."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 "O filă cu nume identic ca aceea trasă, există deja în locul de destinație."
 
-#: ../../locales/../src/engine/server.cpp:869
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "O altă operație distantă e deja în curs, nu pot schimba dosarul acum."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
-"Modificările făcute în Administratorul de Situri nu vor putea fi salvate."
+"Modificările făcute în Administratorul Siturilor nu vor putea fi salvate."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 ""
-"Modificările făcute în Administratorul de Situri nu vor fi salvate pînă nu "
+"Modificările făcute în Administratorul Siturilor nu vor fi salvate pînă nu "
 "va fi reparată fila."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Modificările făcute la filtre nu vor putea fi salvate."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Modificările făcute la filtre nu vor fi salvate."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Ap&lică numai la dosare"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Aplică"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Aplică doar la coada &curentă"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Aplică doar la &file"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arhivă"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Ca tab în panoul cozii de transfer"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Întreabă utilizatorul ce acțiune dorește"
 
-#: ../../locales/../src/engine/server.cpp:844
-#: ../../locales/../src/engine/server.cpp:863
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
-msgstr "Cu parolă"
+msgstr "Cere parola"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Cere sistemului de operare un port."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Cere sistemului de operare adresa IP externă"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Pune întrebări pe forumul FileZilla"
 
@@ -1557,39 +1569,35 @@
 msgid "Associated program not found:"
 msgstr "Programul asociat nu a fost găsit:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Cel puțin o condiție din filtru este incompletă"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "În acest punct, toate informațiile necesare au fost culese."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Atribut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Autentificarea a eșuat."
 
-#: resources.h:879
+#: resources.h:901
 msgid "Author:"
 msgstr "Autor:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Auto"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Clasificare Automată a Tipurilor de File"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Căutare automată de actualizări"
-
-#: resources.h:883
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Mărimi Disponibile"
 
@@ -1598,66 +1606,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Șu&ntează proxyul [bypass]"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Instrucțiuni simple de utilizare"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Comportament"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Este editat"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Măsoară fuzionatorul de șiruri"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Atenție! Certificatul a fost anulat"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binar"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Tablă de Scris"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Semn de Carte"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Semn de Carte:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Semne de Carte"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Data compilării:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Info despre Compilare"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Categoria de afaceri:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1667,63 +1675,63 @@
 "transferuri în mod activ. Dacă vrei să limitezi intervalul de porturi "
 "utilizat de FileZilla, specifică acest interval mai jos."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "&Anulează Operația Curentă"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "&Caută compilații nocturne [nightly builds] de FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "C&urăță Tot"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "C&opiază Adresele în Cliplanșetă"
 
-#: resources.h:887
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Personalizat"
 
-#: resources.h:942
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Asocieri personalizate ale tip&urilor de file:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Calculez decalajul de fus orar al serverului..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Nu pot citi din filă"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Nu pot scrie date în filă."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Nu pot scrie date în fila: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Anulează"
 
-#: resources.h:989
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Anulează Operația Curentă"
 
-#: resources.h:990
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Anulează Operația Curentă"
 
@@ -1732,11 +1740,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Nu pot accesa '%s', nu e inserat nici un mediu sau unitatea nu e gata."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
-msgstr "Nu pot adăuga serverul la Administratorul de Situri"
+msgstr "Nu pot adăuga serverul la Administratorul Siturilor"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1752,30 +1760,30 @@
 "Nu pot compara dosarele, sînt activate filtre diferite pentru dosarul local "
 "și cel distant."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Nu pot compara dosarele, nu sînt conectat la un server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Nu pot crea un filtru nou"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Nu pot edita fila"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Nu pot edita fila, nu sînt conectat la un server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Nu pot edita fila, calea distantă e necunoscută."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1783,8 +1791,8 @@
 "Nu se poate stabili o conexiune FTP la un server SFTP. Selectează protocolul "
 "corect."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Nu pot încărca bara de conectare rapidă din fila cu resurse"
 
@@ -1796,44 +1804,48 @@
 msgid "Cannot load keyfile"
 msgstr "Nu pot încărca fila cheie"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Nu pot încărca bara de unelte din fila cu resurse"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Nu pot memora parola"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Nu pot renumi intrarea"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Nu pot renumi fila"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Nu pot salva setul de filtre"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Nu pot selecta filtrul"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Nu pot seta asocierea de file"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Nu pot afișa dialogul"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Nu pot vedea/edita fila selectată"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Categorii"
 
@@ -1841,59 +1853,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certificatul și datele sesiunii nu sînt încă disponibile."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Detaliile Certificatului"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certificatul înlănțuit:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Emitentul Certificatului"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Solicitare:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Modifică Atributele Filei"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Modifică Permisiunile Filei."
 
-#: resources.h:963
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Schimbarea setărilor pentru fila jurnal necesită repornirea FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Problemă de codare a caracterelor"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Caractere"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "Caută &versiuni beta și candidate la lansare [RC]"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "&Caută Actualizări..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Caută automat act&ualizări pentru FileZilla:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Caută versiune nouă de FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Caută Actualizări"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Căutarea de actualizări a eșuat"
 
@@ -1901,21 +1913,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Verific corectitudinea adresei IP externe"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Caut actualizări"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Nepotrivire a sumei de control pentru fila descărcată."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Alege dosarul local implicit"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Alege dosarul local"
 
@@ -1923,43 +1935,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Pachet de date terminat necorespunzător"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cifru:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Înc&hide Tabul"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Clasic"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
-msgstr "Curăță Intrările din Ad&ministratorul de Situri"
+msgstr "Curăță Intrările din Ad&ministratorul Siturilor"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Curăță Cașul Afișaju&lui"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Curăță Istoria Conectărilor Ra&pide"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Curăță Informațiile despre &Reconectări"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Curăță Coada de &Transfer"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Curăță Istoria"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1967,11 +1979,11 @@
 msgid "Clear private data"
 msgstr "Curăță Datele Private"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Curăță Bara de Conectare Rapidă"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Curăță fuzionatorul de șiruri"
 
@@ -1979,36 +1991,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Clichează pe Finalizează/Finish pentru a salva configurația."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Clichează pe Înainte/Next pentru a descărca versiunea nouă."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC client la server:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Cifru client la server:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Închide Celel&alte Taburi"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Închide FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Închide toate instanțele FileZilla care rulează"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Închide tabul curent"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Co&mentarii:"
 
@@ -2016,11 +2028,11 @@
 msgid "Column properties"
 msgstr "Proprietățile Coloanei"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Configurarea Coloanei"
 
-#: resources.h:937
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Comanda și argumentele ei trebuie să fie corect citată [quoted]."
 
@@ -2039,9 +2051,9 @@
 msgstr "Comanda nu e suportată de acest protocol"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Comandă:"
 
@@ -2049,7 +2061,7 @@
 msgid "Comment"
 msgstr "Comentariu"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Nume Comun:"
 
@@ -2058,15 +2070,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Comunicare alterată de ruter sau parafoc"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Compară Data &Modificării"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Compară Mărimea &Filelor"
 
-#: resources.h:917
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "&Pragul Comparării (în minute):"
 
@@ -2074,60 +2086,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Pragul comparării trebuie să fie între 0 și 1440 de minute."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Compilat pentru:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Compilat pe:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Compilat cu:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Fanioanele compilatorului:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Comprimat"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Transferuri Simultane"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Condițiile sînt sensibile la c&aseta literelor (MAJUSCULE/minuscule)"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Testarea Configurării"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Configurarea Modului Pasiv"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Configurarea Intervalului de Porturi"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Configurarea FileZilla și a rețelei"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Confirmă ștergerea"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Confirmare necesară"
 
@@ -2135,42 +2147,42 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Felicitări, configurația setată pare să meargă."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Conectează șuntînd setările pentru proxy"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr "Conectează la situl specificat în Administratorul de Situri"
+msgstr "Conectează la situl specificat în Administratorul Siturilor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Conectat"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Conectare"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Conectare la %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Conectare la %s prin proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Conectare la %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Conectare la server"
 
@@ -2178,17 +2190,17 @@
 msgid "Connection"
 msgstr "Conectare"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Tentativa de conectare a eșuat"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Tentativa de conectare cu \"%s\" a eșuat, încerc adresa următoare."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Tentativa de conectare cu \"%s\" a eșuat."
@@ -2202,12 +2214,12 @@
 msgid "Connection closed"
 msgstr "Conexiune închisă"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Conexiune închisă de către server"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Conexiune stabilită, inițializez TLS..."
@@ -2216,7 +2228,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Conexiune stabilită, trimit solicitarea HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Conexiune stabilită, aștept mesajul de întîmpinare..."
 
@@ -2232,21 +2244,23 @@
 msgid "Connection refused"
 msgstr "Conexiune refuzată"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Conexiune expirată"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Conexiune expirată."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Conectarea la server a fost pierdută."
 
 #: ../../locales/../src/engine/proxy.cpp:188
 msgid "Connection with proxy established, performing handshake..."
-msgstr "Conexiune stabilită cu proxyul, realizez strîngerea de mînă..."
+msgstr ""
+"Conexiune stabilită cu serverul proxy (interpus), realizez strîngerea de "
+"mînă..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
@@ -2260,27 +2274,23 @@
 msgid "Convert keyfile"
 msgstr "Convertesc fila cheie"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Cop&iază"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Copiază (%d) din %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Copie a lui %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Copiază în cliplanșetă adresele itemurilor selectate."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Nu pot accepta conexiunea: %s"
@@ -2288,18 +2298,22 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:99
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "Nu pot adăuga conexiunea curentă la Administratorul de Situri"
+msgstr "Nu pot adăuga conexiunea curentă la Administratorul Siturilor"
+
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Nu am putut termina operația"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Nu mă pot conecta la server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Nu mă pot conecta la server: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Nu pot converti comanda la codarea serverului"
 
@@ -2308,17 +2322,17 @@
 msgid "Could not convert private key"
 msgstr "Nu pot converti cheia privată"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Nu pot copia adresele"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Nu pot copia datele"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2328,11 +2342,11 @@
 "E posibil ca extensia contextuală să nu fi fost instalată corect sau nu ai "
 "pus filele într-o fereastră Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Nu pot realiza conexiunea cu serverul"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2344,11 +2358,11 @@
 "comandă '--datadir <cale personalizată>' sau setînd variabila de mediu "
 "FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Nu pot genera secvența personalizată de logare."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2356,7 +2370,7 @@
 "Nu pot obține numele distinctiv al emițătorului certificatului, "
 "gnutls_x509_get_issuer_dn a eșuat"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2364,7 +2378,7 @@
 "Nu pot obține numele distinctiv al obiectului certificatului, "
 "gnutls_x509_get_dn a eșuat"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Nu pot obține calea distantă completă."
 
@@ -2373,16 +2387,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Nu primesc nici un răspuns de la fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "Nu găsesc dosarul temporar în care să descarc fila."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 "Nu pot importa certificatele de parteneriat, gnutls_x509_crt_import a eșuat"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2399,7 +2413,7 @@
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
 "Nu pot încărca \"%s\". Asigură-te că fila este validă și poate fi accesată.\n"
-"Orice modificare făcută în Administratorul de Situri nu va fi salvată."
+"Orice modificare făcută în Administratorul Siturilor nu va fi salvată."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
@@ -2409,7 +2423,7 @@
 msgid "Could not load private key"
 msgstr "Nu pot încărca cheia privată"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2420,7 +2434,7 @@
 "Dezactivezi explorarea sincronizată și continui cu schimbarea dosarului "
 "distant?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2440,9 +2454,9 @@
 "Nu pot obține dosarul distant corespunzător celui local '%s'.\n"
 "Explorarea sincronizată a fost dezactivată."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Nu pot deschide cliplanșeta"
 
@@ -2457,11 +2471,11 @@
 msgid "Could not parse remote path."
 msgstr "Nu pot parsa calea distantă."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Nu pot parsa adresa serverului:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Nu pot citi din socket: %s"
@@ -2470,12 +2484,12 @@
 msgid "Could not read server item."
 msgstr "Nu pot citi itemul serverului."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Nu pot sări la decalajul %s în filă"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Nu pot sări la sfîrșitul filei"
 
@@ -2483,28 +2497,28 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Nu pot trimite comanda la fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Nu pot genera firul de execuție IO"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Nu pot porni strîngerea de mînă cu proxyul: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Nu pot porni transferul"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
-"Nu pot scrie \"%s\". Orice modificare în Administratorul de Situri nu poate "
+"Nu pot scrie \"%s\". Orice modificare în Administratorul Siturilor nu poate "
 "fi salvată: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:858
@@ -2517,7 +2531,7 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "Nu pot scrie \"%s\", semnele de carte globale nu pot fi salvate: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2526,14 +2540,14 @@
 "Nu pot scrie \"%s\", coada nu poate fi salvată.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Nu pot scrie \"%s\", siturile selectate nu pot fi exportate: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Nu pot scrie \"%s\": %s"
@@ -2543,7 +2557,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Nu pot scrie fila cheie: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Nu pot scrie în fila locală"
 
@@ -2553,39 +2567,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Nu pot scrie în fila jurnal: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Nu pot scrie în socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Țară:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Prăbușește FileZilla instantaneu. E utilizată numai la debugarea "
 "mînuitorului de excepții"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Creea&ză o filă nouă"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Creează un subdosar nou în dosarul curent"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Creează o filă nouă, goală, în dosarul curent"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Creează Dosar"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Creează o filă goală"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Creez dosarul"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Creez dosarul '%s'..."
@@ -2603,7 +2629,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Eroare critică de transfer a filelor după transferarea a %s în %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2625,52 +2651,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Tipul curent de transfer este setat la format binar."
 
-#: resources.h:773 resources.h:893
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Personaliza&t"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Set personal de filtre"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Server Personalizat"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Tip de D&ate"
 
-#: resources.h:900
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Prefi&xe zecimale utilizînd simboluri SI (de ex. 1 KB = 1000 baiți)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "I&mplicit"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "Șter&ge"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "De&zactivează Tot"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Nu salva par&olele"
 
-#: resources.h:924
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Acțiune la dublu-clic pe d&osar:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "D&uplichează"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Similar cu DOS, cu căi virtuale"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Tip de filă periculos"
 
@@ -2678,16 +2708,16 @@
 msgid "Data"
 msgstr "Date"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Socketul de date s-a închis prematur."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Dată"
 
-#: resources.h:884
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Formatul de Dată"
 
@@ -2706,11 +2736,11 @@
 msgid "Debug"
 msgstr "Debugare"
 
-#: resources.h:964
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Setări de Debugare"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Dosarul &Local Implicit:"
 
@@ -2718,19 +2748,19 @@
 msgid "Default (Autodetect)"
 msgstr "Implicit (Autodetectare)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Editorul predefinit nu este citat corect cu parametrul [quote]."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Acțiunea Implicită:"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Dosarul &Distant Implicit:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2742,15 +2772,15 @@
 msgid "Default system language"
 msgstr "Limba implicită a sistemului"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Modul implicit de transfer:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Tipul Implicit de Transfer:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Implicit: http://ip.filezilla-project.org/ip.php"
 
@@ -2779,57 +2809,57 @@
 "Amîn conectarea pentru %d de secunde din cauza eșuării tentativei de "
 "conectare precedente..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
-msgstr "Șterge Intrarea din Administratorul de Situri"
+msgstr "Șterge Intrarea din Administratorul Siturilor"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Șterge Dosarul Selectat"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Șterge Filele și Dosarele Selectate"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Șterg dosarele"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Ștergerea mai multor dosare neînrudite nu este încă suportată"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Șterg legătura simbolică"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Birou"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detalii"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detalii pentru noua cheie:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "&Dosare"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Sens"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Dosar"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Comparare de Dosare"
 
@@ -2848,11 +2878,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Listarea dosarului a fost întreruptă de utilizator"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Listarea dosarului a eșuat"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Filtre de listare a dosarelor"
 
@@ -2860,18 +2890,18 @@
 msgid "Directory listing successful"
 msgstr "Listarea dosarului a avut succes"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "De&zactivează Tot"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Dezactivezi explorarea sincronizată și continui cu schimbarea dosarului "
 "distant?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2879,50 +2909,49 @@
 "Dezactivează din nou această opțiune dacă nu mai poți vedea corect "
 "conținutul dosarelor."
 
-#: resources.h:991
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Deconectează de la server"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Deconectat de la server"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Deconectat de la server: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Deconectez de la serverul precedent"
 
-#: resources.h:992
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Deconectează de la serverul afișat curent"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Afișează fereastra cu informații despre soft"
 
-#: resources.h:933
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Nu folosi editorul implicit"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "&Nici o Acțiune"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2930,8 +2959,8 @@
 "Vrei să verifici dacă a apărut o versiune beta?\n"
 "Te sfătuim s-o folosești numai dacă dorești să testezi opțiuni noi."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Sigur vrei să închizi FileZilla?"
 
@@ -2939,14 +2968,14 @@
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
-"Sigur vrei să ștergi toate intrările din Administratorul de Situri și coada "
-"de transfer?"
+"Sigur vrei să ștergi toate intrările din Administratorul Siturilor și din "
+"coada de transfer?"
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
-msgstr "Sigur vrei să ștergi toate intrările din Administratorul de Situri?"
+msgstr "Sigur vrei să ștergi toate intrările din Administratorul Siturilor?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Sigur vrei să ștergi intrarea selectată?"
 
@@ -2954,34 +2983,34 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Sigur vrei să ștergi coada de transfer?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Sigur vrei să trimiți '%s' la server?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Documentație"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Nu utiliza adrese IP externe la conexiunile &locale."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Filele cu punct sînt filele al căror nume începe cu un punct, de ex. ."
 "htaccess"
 
-#: resources.h:918
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Acțiune la dublu-clic"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "&Descarcă"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Limita Descărcării:"
 
@@ -2994,41 +3023,50 @@
 msgid "Download limit: none"
 msgstr "Limita Descărcării: fără"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Descarcă rezultatele căutării"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Descarcă Dosarul Selectat"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Descarcă filele și dosarele selectate"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Viteza de descărcare: %s/s\n"
+"Viteza de încărcare: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Descarc"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Descarc %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Descărcarea mai multor dosare neînrudite nu este încă suportată"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Descarc rezultatele căutării"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3037,66 +3075,64 @@
 "Operația de Tragere-și-Punere între instanțe diferite de FileZilla nu a fost "
 "încă implementată."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Operația de Tragere-și-Punere între servere diferite nu a fost încă "
 "implementată."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Nume de filtru duplicat"
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Dupl&ichează"
 
-#: resources.h:204
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Acti&vează Tot"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "&Explorează Dosarul"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "E&xecută"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "&Ieși"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Fiecare filtru necesită cel puțin o condiție."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Editează Filtrele"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Editează fila cu editorul configurat și încarcă modificările pe server."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Editarea a eșuat"
 
-#: resources.h:881
+#: resources.h:903
 msgid "Email:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Comandă vidă"
 
@@ -3104,7 +3140,7 @@
 msgid "Empty command."
 msgstr "Comandă vidă."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Listă de dosare goală"
 
@@ -3116,102 +3152,115 @@
 msgid "Empty file extension."
 msgstr "Filă fără extensie."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Filtrele fără nume nu sînt permise."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Nume vid"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Șir citat vid."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "&Activează Tot"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Activează &filtrarea caracterelor nevalide"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Criptat"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Criptare"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Detaliile Criptării"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Termin compararea și schimb ordinea de sortare?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "&Comandă Personalizată..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Scrie 0 pentru viteză nelimitată."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Specifică Comanda"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Comandă Personalizată"
 
-#: resources.h:925
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Deschide Dosarul"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Scrie Numele Filtrului"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Scrie Numele Setului de Filtre"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Scrie numele nou pentru setul de filtre"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Introdu Parola"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Deschide Dosarul Selectat"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Introdu adresa serverului.\n"
-"Pentru a specifica protocolul serverului, prefixează gazda cu protocolul de "
-"identificare. Dacă acesta nu e specificat, va fi utilizat cel implicit "
-"(ftp://).\n"
-"Poți de asemenea să introduci adrese complete în forma protocol://utiliz:"
-"parolă@server:port, valorile din celelalte cîmpuri fiind apoi suprascrise."
+"Pentru a specifica protocolul serverului, prefixează adresa serverului cu "
+"protocolul de identificare. Dacă acesta nu e specificat, va fi utilizat cel "
+"implicit (ftp://).\n"
+"Poți de asemenea să introduci aici adrese complete în forma protocol://"
+"utilizator:parolă@server:port, valorile din celelalte cîmpuri fiind apoi "
+"suprascrise.\n"
+"\n"
+"Protocoalele suportate sînt:\n"
+"ftp:// pt. FTP normal,\n"
+"sftp:// pt. protocolul de transfer SSH,\n"
+"ftps:// pt. FTP prin TLS (implicit)\n"
+"ftpes:// pt. FTP prin TLS (explicit)."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3222,7 +3271,7 @@
 "Introdu parola pentru fila '%s'.\n"
 "Reține că fila convertită nu va fi protejată cu parolă."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3244,7 +3293,7 @@
 msgid "Error importing"
 msgstr "Eroare la importare"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Eroare la încărcarea cozii de așteptare"
 
@@ -3253,27 +3302,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Eroare la încărcărea filei xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Eroare la salvarea cozii de așteptare"
 
@@ -3284,73 +3333,81 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Eroare la scrierea filei xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Eroare, numele filei nu poate fi parsat."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Eroare, fila locală există, dar nu poate fi înlăturată"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Eroare:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Realizează conectarea într-un tab nou"
 
-#: resources.h:944
+#: resources.h:972
+msgid "Every month"
+msgstr "Lunar"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "La două săptămîni"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Exemplu: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:925
 msgid "Examples"
 msgstr "Exemple"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Exe&cută"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Executabil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Executabilul nu conține informații despre versiune, nu pot căuta actualizări."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Explorator"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exportă &Coada"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exportă &Setările"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportă Setările"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Numele F&iltrului:"
 
@@ -3358,7 +3415,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Protocol de Transfer al Filelor"
 
@@ -3370,25 +3427,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Protocol Nesecurizat de Transfer al Filelor"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Motorul FTP nu e inițializat, nu pot face conectarea."
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Păstrarea Conexiunii FTP"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Proxy FTP"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "Adresă FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3404,26 +3461,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP prin TLS/SSL implicit"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Schimbarea dosarului a eșuat"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Schimbarea limbii a eșuat"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Căutarea versiunilor noi de FileZilla a eșuat."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Copierea sau mutarea siturilor a eșuat"
 
@@ -3431,46 +3488,46 @@
 msgid "Failed to create backup copy of xml file"
 msgstr "Crearea copiei de rezervă a filei xml a eșuat"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Socketul de ascultare nu a putut fi creat, abandonez"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Socketul de ascultare pentru modul de transfer activ nu a putut fi creat"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Descărcarea ultimei versiuni de FileZilla a eșuat."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Nu pot obține calea către 'My Documents'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Nu pot obține calea dosarului Birou [Desktop]"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Nu pot obține adresa partenerului de la conexiunea de control. Conexiune "
 "închisă."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Nu pot obține adresa partenerului de la conexiunea de date. Conexiune "
 "închisă."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Inițializarea motorului FTP a eșuat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Inițializarea TLS a eșuat."
@@ -3484,33 +3541,32 @@
 msgid "Failed to load private key: %s"
 msgstr "Eșec la încărcarea cheii private: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Nu pot deschide \"%s\" pentru anexare/scriere"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Nu pot deschide \"%s\" pentru citire"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Nu pot deschide \"%s\" pentru scriere"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
-msgstr "Nu pot parsa calea distantă."
+msgstr "Nu pot parsa calea returanată."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr "Certificatul de încredere al rădăcinii nu a putut fi parsat."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Nu pot recepționa datele"
 
@@ -3522,11 +3578,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Nu pot obține adresa IP externă. Abandonez."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Nu pot obține adresa IP externă. Utilizez adresa locală"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Nu pot obține adresa IP locală."
 
@@ -3542,13 +3598,13 @@
 msgid "Failed to send command."
 msgstr "Nu pot trimite comanda."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Setarea limbii la %s (%s) a eșuat. Utilizez limba implicită a sistemului"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3556,25 +3612,25 @@
 "Setarea limbii la %s (%s) a eșuat. Utilizez limba implicită a sistemului (%"
 "s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Setarea limbii la %s (%s) a eșuat. Utilizez limba implicită a sistemului."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Setarea limbii la %s a eșuat. Utilizez limba implicită a sistemului"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Setarea limbii la %s a eșuat. Utilizez limba implicită a sistemului (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Setarea limbii la %s a eșuat. Utilizez limba implicită a sistemului."
@@ -3583,7 +3639,7 @@
 msgid "Failed to validate settings"
 msgstr "Validarea setărilor a eșuat"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Verificarea certificatului partenerului a eșuat"
 
@@ -3600,21 +3656,19 @@
 msgid "Failed transfers"
 msgstr "Transferuri Eșuate"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Repliază [fallback] la modul activ"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Fi&lă:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fil&e"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Filă"
 
@@ -3630,7 +3684,7 @@
 msgid "File editing"
 msgstr "Editare de File"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Fila există"
 
@@ -3638,7 +3692,7 @@
 msgid "File exists action"
 msgstr "Acțiune la Filă Existentă"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Fila a fost schimbată"
 
@@ -3646,14 +3700,14 @@
 msgid "File lists"
 msgstr "Liste de File"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Fila nu a fost găsită"
 
-#: resources.h:1002
+#: resources.h:1029
 msgid "File search"
 msgstr "Căutare de file"
 
@@ -3690,25 +3744,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Transferul filei a avut succes, s-au transferat %s în %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Transferul filei este încă în curs."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Fila va fi transferată sub formă de date ASCII."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Fila va fi transferată sub formă de date binare."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Eroare FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3716,66 +3770,67 @@
 "FileZilla poate acum să testeze configurația pentru a se asigura că totul e "
 "setat corect."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla este deja conectat la un server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla rulează în mod chioșc.\n"
-"Tipurile de autentificare 'Normală' și 'Cont' nu sînt disponibile în acest "
-"mod."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla trebuie repornită pentru ca schimbarea limbii să devină efectivă."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Actualizări FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "&Bara de Stare a Listei de File"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Nume"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "&Filtrează Filele..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Numele filei nu poate fi construit pentru dosarul %s și fila %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Numele filei nu e valid"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Numele filei nu poate conține vreunul din următoarele caractere: / \\ : * ? "
+"\" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Numele filei e neschimbat"
 
-#: resources.h:307 resources.h:957
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Nume:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Numele filelor nu pot conține vreunul din următoarele caractere: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3783,13 +3838,13 @@
 "Numele filelor nu pot conține vreunul din următoarele caractere: / \\ : * ? "
 "\" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "File editate acum"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Mărime"
@@ -3798,65 +3853,68 @@
 msgid "Filesize format"
 msgstr "Formatul Mărimii Filelor"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tip"
 
-#: resources.h:945
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr "Asocieri ale tipurilor de file"
+msgstr "Asocierile tipurilor de file"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filtrul se aplică la:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrează caracterele nevalide din numele filelor"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Numele filtrului există deja"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Exclude itemurile potrivite cu toate condițiile următoare"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Exclude itemurile potrivite cu oricare din condițiile următoare"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Exclude itemurile nepotrivite cu vreuna din condițiile următoare"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Setul de filtre există deja"
 
-#: resources.h:995
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrează lista de dosare"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Validarea filtrului a eșuat"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Amprentă (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Amprentă (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Amprentă:"
 
@@ -3864,7 +3922,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Vrăjitor de Configurare a Parafocului și Ruterului"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3872,12 +3930,12 @@
 "Pentru informații detaliate despre ce fac aceste opțiuni, va trebui să "
 "rulezi vrăjitorul de configurare a rețelei."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Pentru siguranță, ar trebui să specifici un interval de cel puțin 10 porturi."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3885,31 +3943,31 @@
 "Pentru această sesiune vor fi utilizate setările implicite. Orice modificare "
 "adusă acestor setări nu va fi salvată."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Forțează &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Forțează Afișarea Filelor Asc&unse"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Forțează Afișarea Filelor Ascunse"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Specificațiile formatului:"
 
-#: resources.h:943
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Format: Extensie urmată de comandă și argumente citate corect."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Documentație suplimentară"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Generale"
 
@@ -3917,21 +3975,21 @@
 msgid "General SOCKS server failure"
 msgstr "Defectare generalizată a serverului SOCKS"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Proxy Generic"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Obține adresa IP externă de la următoarea adresă:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Obține ajutor"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Numele setului de filtre există deja. Suprascriu setul de filtre existent?"
@@ -3940,15 +3998,15 @@
 msgid "Global bookmarks"
 msgstr "Semne de Carte Globale"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Permisiuni de grup"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "Îna&ltă"
 
@@ -3956,21 +4014,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP prin TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Haș:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Ascuns"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Înaltă"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Maximă"
 
@@ -3980,48 +4038,49 @@
 "Portul cel mai avansat disponibil trebuie să fie un număr între 1024 și "
 "65535."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Ține tasta Shift apăsată pentru a comuta starea filtrului în amîndouă "
 "părțile simultan."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Sit:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Amprenta cheii gazdei:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Nepotrivire a cheii gazdei"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr ""
-"Gazda începe cu '[' dar nu a fost găsită paranteza dreaptă de închidere."
+"Adresa serverului gazdă începe cu '[' dar nu a fost găsită paranteza dreaptă "
+"de închidere."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
 msgstr "Gazda e inaccesibilă"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Gazdă:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Ore,"
 
-#: resources.h:892
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (de exemplu: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4031,13 +4090,13 @@
 "perioadă de timp mai mare decît cea specificată, conexiunea va fi închisă și "
 "FileZilla va încerca să se reconecteze."
 
-#: resources.h:973
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Dacă raportezi buguri, te rugăm să trimiți jurnalul [log] obținut cu nivelul "
 "de jurnalizare setat pe \"Detaliat\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4047,10 +4106,10 @@
 "Dacă testul automat de la sfîrșitul acestui vrăjitor reușește, dar nu poți "
 "totuși să transferi file către un anumit server, e posibil ca acesta să fie "
 "configurat greșit și deci va trebui să utilizezi modul activ de transfer. "
-"Poți seta acest mod pentru fiecare server în parte în Administratorul de "
-"Situri."
+"Poți seta acest mod pentru fiecare server în parte în Administratorul "
+"Siturilor."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4058,7 +4117,7 @@
 "Dacă opțiunea de repliere este activată, se va putea face conectarea la "
 "serverele configurate incorect care resping modul de transfer selectat."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4082,7 +4141,7 @@
 "Dacă problema persistă, ruterul sau/și parafocul produc întreruperea "
 "intermitentă a conexiunii."
 
-#: resources.h:962
+#: resources.h:988
 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 "
@@ -4092,7 +4151,7 @@
 "adăugarea lui \".1\" la sfîrșitul numelui (posibil suprascriind file jurnal "
 "vechi) și astfel e creată o filă nouă."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4112,7 +4171,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "Dacă problema nu se rezolvă, contactează producătorul ruterului."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4122,7 +4181,7 @@
 "fie sincronizată cu a serverului. Dacă orele diferă (de ex. zone orare "
 "diferite), trebuie specificat un decalaj de fus orar în managerul de situri."
 
-#: resources.h:916
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4130,11 +4189,11 @@
 "Dacă se utilizează compararea pe bază de marcaje de timp, se consideră două "
 "file ca egale dacă diferența dintre marcaje nu depășește acest prag."
 
-#: resources.h:931
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Dacă schimbi limba interfeței, va trebui să repornești FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4142,11 +4201,11 @@
 "Dacă clichezi pe test, FileZilla se va conecta la probe.filezilla-project."
 "org și va efectua cîteva teste simple."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Dacă închizi FileZilla, modificările vor fi pierdute."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4154,11 +4213,11 @@
 "Dacă introduci tipurile greșite de file, acestea ar putea fi deteriorate la "
 "transferare."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Dacă obții vreo eroare, configurația nu este corectă."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4176,7 +4235,7 @@
 "parafocul ar putea fi configurate greșit. În acest caz, încearcă să comuți "
 "pe modul pasiv și să contactezi administratorul serverului pentru ajutor."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4184,7 +4243,7 @@
 "Dacă vrăjitorul este încheiat cu succes și testul final reușește, orice "
 "parafoc sau ruter pe care-l ai ar trebui să fie configurat corespunzător."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4192,7 +4251,7 @@
 "Dacă utilizezi un parafoc, asigură-te că programului FileZilla i se permite "
 "acceptarea de conexiuni la toate porturile stabilite."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4212,7 +4271,7 @@
 msgid "Import data from older version"
 msgstr "Importă datele dintr-o versiune mai veche"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importă Setările"
 
@@ -4226,7 +4285,7 @@
 msgid "Improperly quoted association."
 msgstr "Asociere citată necorespunzător."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4234,7 +4293,7 @@
 "În modul activ, FileZilla trebuie să asculte la un port pentru a realiza "
 "transferul de date. Trebuie să specifici ce porturi va utiliza programul."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4243,7 +4302,7 @@
 "disponibile, deoarece FileZilla nu are nici o influență asupra celor alese "
 "de sistem."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4251,7 +4310,7 @@
 "În caz că preferi actualizarea automată, poți activa în panoul setărilor "
 "căutarea automată de actualizări."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4259,7 +4318,7 @@
 "Adresa IP Externă a Calculatorului (necesară pentru a putea utiliza modul "
 "activ)"
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4269,7 +4328,7 @@
 "FileZilla solicită serverului un port și se conectează la acesta. Nu este "
 "necesară nici o configurare complicată."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4277,20 +4336,20 @@
 "Lanț incomplet, certificatul din vîrf nu este un certificat de autoritate "
 "subsemnat [self-signed]"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Parolă incorectă"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Inițializez TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Server nesecurizat, nu suportă FTP prin TLS."
 
-#: ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interactiv"
@@ -4300,8 +4359,8 @@
 msgstr "Interfață"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Întrerupt de utilizator"
 
@@ -4313,14 +4372,14 @@
 msgid "Invalid HTTP Response"
 msgstr "Răspuns HTTP Nevalid"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
 "A fost recepționată o secvență de caractere nevalide, care a dezactivat UTF-"
-"8. Selectează opțiunea UTF-8 în Administratorul de Situri pentru a forța UTF-"
+"8. Selectează opțiunea UTF-8 în Administratorul Siturilor pentru a forța UTF-"
 "8."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
@@ -4338,43 +4397,51 @@
 msgid "Invalid date"
 msgstr "Dată nevalidă"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Nume de filă nevalid"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
-"Adresa gazdei e nevalidă, după paranteza dreaptă de închidere pot urma doar "
-"două puncte și portul."
+"Adresa serverului gazdă e nevalidă, după paranteza dreaptă de închidere pot "
+"urma doar două puncte (:) și portul."
 
 #: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Introducere nevalidă"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Port nevalid. El trebuie să aibă o valoare cuprinsă între 1 și 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Protocolul specificat este nevalid. Protocoalele valide sînt:\n"
 "ftp:// pt. FTP normal,\n"
-"sftp:// pt. protocolul de tranfer SSH,\n"
-"ftps:// pt. FTP prin SSL (implicit) și\n"
-"ftpes:// pt. FTP prin SSL (explicit)."
+"sftp:// pt. protocolul de transfer SSH,\n"
+"ftps:// pt. FTP prin TLS (implicit) și\n"
+"ftpes:// pt. FTP prin TLS (explicit)."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Adresa serverului proxy e nevalidă, după paranteza dreaptă de închidere pot "
+"urma doar două puncte (:) și portul."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Expresie regulată nevalidă în condițiile de căutare."
 
@@ -4382,7 +4449,7 @@
 msgid "Invalid response code"
 msgstr "Cod de răspuns nevalid"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Condiții de căutare nevalide: %s"
@@ -4394,38 +4461,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Cale distantă nevalidă"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Mărime nevalidă în condiție"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Nume de utilizator nevalid."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Țara de jurisdicție:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Localitatea de jurisdicție:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Statul sau provincia de jurisdicție:"
 
-#: resources.h:913
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Dosarele sînt listate primele"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4435,50 +4502,54 @@
 "incorectă dacă ea este activată. Deși FileZilla efectuează unele teste să "
 "verifice dacă serverul suportă această opțiune, testul poate eșua."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Schimb de chei"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Schimb de chei:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Minimă"
 
-#: resources.h:929
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Limbă"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Limbă schimbată"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Modificat"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Aspect"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Nr. max. de &descărcari simultane:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Nr. max. de î&ncărcari simultane:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Limitarea Porturilor Locale"
 
-#: resources.h:959
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Mărimea limită a filei jurnal"
 
-#: resources.h:960
+#: resources.h:986
 msgid "Limit:"
 msgstr "Limită:"
 
@@ -4486,7 +4557,7 @@
 msgid "Line length exceeded"
 msgstr "Lungimea liniei e prea mare"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Legat cu"
 
@@ -4495,21 +4566,21 @@
 msgstr "Socketul de ascultare s-a închis"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listă:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Port&ul minim disponibil:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Local"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Filă Locală"
 
@@ -4525,7 +4596,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Fila locală nu este o filă validă."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Filtre locale:"
 
@@ -4533,7 +4604,7 @@
 msgid "Local site:"
 msgstr "Local:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Locație:"
 
@@ -4541,16 +4612,16 @@
 msgid "Log file"
 msgstr "Filă Jurnal"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Jurnalul verificării actualizărilor:"
 
-#: resources.h:954
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Jurnalizare"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4559,7 +4630,7 @@
 "suporte codarea UTF-8. În caz de probleme la logare nu se poate reveni la "
 "setul local de caractere atîta timp cît se folosește un server proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4567,19 +4638,19 @@
 "Datele de logare conțin caractere non-ASCII, iar serverul ar putea să nu "
 "suporte codarea UTF-8. Încerc cu setul local de caractere."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Secvența de logare a fost parcursă integral, dar nu s-a realizat conexiunea. "
 "Abandonez."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Tipul de logare trebuie să fie de tipul \"ask\" sau \"interactiv\" (fără "
 "ghilimele)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4588,13 +4659,13 @@
 "Tip de logare, poate fi utilizat doar împreună cu adresa (URL) FTP. "
 "Argumentul trebuie să fie '%s' sau '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Scăzută"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Minimă"
 
@@ -4602,11 +4673,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "Portul minim disponibil trebuie să fie un număr între 1024 și 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Asigură-te că fila poate fi accesată și este un document XML bine formatat."
@@ -4628,7 +4699,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Răspuns malformat, serverul nu trimite finaluri de linie corecte"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4639,59 +4710,59 @@
 msgid "Manual transfer"
 msgstr "Transfer Manual"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Toate regulile următoare"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Potrivește cu oricare din următoarele"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Potrivește cu nici una din următoarele"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Nr. max. de &transferuri simultane:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Jurnalul Mesajelor"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr ""
 "Poziția Jurnalului cu Mesaje (Jurnalul de Activitate FileZilla) - [Log]"
 
-#: resources.h:961
+#: resources.h:987
 msgid "MiB"
 msgstr "MB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minute"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Mută în &Jos"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Mută în &Sus"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "My Computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "My Documents"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "My Sites"
 
@@ -4700,33 +4771,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Nume"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Numele există deja"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Numele semnului de carte există deja."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Nume:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Trebuie să precizezi numele filtrului"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Trebuie să precizezi o cale distantă validă"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Trebuie să specifici un set de codare a caracterelor"
 
@@ -4734,19 +4805,23 @@
 msgid "Network unreachable"
 msgstr "Rețea inaccesibilă"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Niciodată"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "&Dosar Nou"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Tab Nou"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Se&mn de Carte Nou"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4759,41 +4834,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Semn de Carte Nou"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Dosar Nou"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Facilități noi și îmbunătățiri în versiunea %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Filtru Nou"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Dosar Nou"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Sit Nou"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Lîngă coada de transfer"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nu"
 
@@ -4801,26 +4876,26 @@
 msgid "No category to export selected"
 msgstr "N-a fost selectată nici o categorie pentru exportat"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Nu a fost dată nici o comandă. Abandonez."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr ""
 "N-a fost specificată nici o adresă IP externă, o încerc pe cea implicită."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Momentan nu este editată nici o filă."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "N-a fost specificat nici un nume de filtru"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "N-a fost specificat nici un server. Specifică unul."
 
@@ -4828,26 +4903,26 @@
 msgid "No images available"
 msgstr "Nici o imagine disponibilă"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Nu mai există file în coada de transfer!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Setului de filtre nu i-a fost dat un nume."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Nu există un program asociat cu tipul de filă"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 "Nu a fost asociat nici un program pentru editarea filelor cu extensia '%s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Nu există rezultate ale căutării"
 
@@ -4865,23 +4940,23 @@
 msgid "No username given."
 msgstr "N-a fost dat un nume de utilizator."
 
-#: resources.h:923 resources.h:928
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Nimic"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Nimic selectat pînă acum"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:842
-#: ../../locales/../src/engine/server.cpp:861
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4891,15 +4966,15 @@
 msgstr "Nu toate itemurile pot fi repuse în coadă pentru vedere/editare."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Neconectat"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Neconectat la server"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Neconectat la un server."
 
@@ -4907,21 +4982,21 @@
 msgid "Not connected."
 msgstr "Neconectat."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Această setare este suportată numai dacă utilizezi protocolul FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Notă: Această opțiune funcționează numai pentru conexiunile FTP necriptate."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Notă: Folosirea unui proxy generic forțează modul pasiv la conexiunile FTP."
 
-#: resources.h:902
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Număr de locuri zecimale:"
 
@@ -4929,21 +5004,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Numărul de reîncercări trebuie să fie între 0 și 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Desc&hide Filă"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4951,119 +5026,125 @@
 "În paginile următoare va fi configurat modul de transfer selectat și modul "
 "de repliere, dacă e activat."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "O dată"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Vor fi trimise serverului doar versiunea de FileZilla și sistemul de operare "
-"pe care îl utilizezi."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Săptămînal"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Deschide dosarul în administratorul de file al sistemului"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1001
 msgid "Open the Site Manager"
-msgstr "Deschide Administratorul de Situri"
+msgstr "Deschide Administratorul Siturilor"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Deschide Administratorul Siturilor"
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Deschide Administratorul Siturilor. Clichează-dreapta pentru a vedea lista "
+"siturilor."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Deschide fila."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Deschide panoul cu setări pentru FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Deschis ca:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Deschidere eșuată"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Deschide ca Tab Nou"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
-msgstr "Deschide Administratorul de Situri"
+msgstr "Deschide Administratorul Siturilor"
 
-#: resources.h:996
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Deschide dialogul de filtrare a listării dosarului. Clic-dreapta pentru a "
 "comuta filtrele."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Sistem de Operare"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "A fost detectată o problemă cu sistemul de operare"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organizație:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Altul:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Vedere de Ansamblu"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Suprascr&ie dacă sursa e mai nouă"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Suprascrie fila"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Suprascrie fila dacă mărimea e diferită"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Suprascrie fila dacă mărimea e diferită sau sursa e mai nouă"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Suprascrie fila dacă sursa e mai nouă"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Suprascrie dacă mărimea e &diferită"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Suprascrie dacă mărimea e diferită sau sursa e mai &nouă"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Permisiunile proprietarului"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Proprietar | Grup"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5071,7 +5152,7 @@
 "Împiedică intrarea sistemului în stare de repaus [sleep] în timpul "
 "transferurilor și a altor operațiuni"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Adresa P&roxy:"
@@ -5080,27 +5161,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Comanda PORT a fost modificată de ruter sau parafoc."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&siv (recomandat)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Pachet"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Parametrul nu este o adresă validă"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Pa&rolă:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Pasiv (recomandat)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Mod Pasiv"
@@ -5115,42 +5196,46 @@
 msgid "Password required"
 msgstr "Parolă necesară"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Cale"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Calea nu poate fi construită pentru dosarul %s și subdosarul %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Cale negasită:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Căi"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Înlăturare în curs"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Permisiune"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Permisiuni"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Platformă:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5166,7 +5251,7 @@
 "Verifică la http://filezilla-project.org/probe.php dacă serverul rulează și "
 "apoi reverifică cu atenție setările programului."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5175,7 +5260,7 @@
 "actualizat sau vizitează http://filezilla-project.org pentru a descărca "
 "codul sursă FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5203,7 +5288,7 @@
 msgid "Please enter a custom time format."
 msgstr "Scrie un format personalizat al orei."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Inserează o dată de forma AAAA-LL-ZZ, ca de exemplu 2010-07-18"
@@ -5214,20 +5299,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Specifică o viteză maximă de descărcare mai mare sau egală cu 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Scrie un nume pentru filtrul nou."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Scrie un nume pentru filtrul copiat."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Scrie un nume nou pentru setul de filtre \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Scrie un nume pentru filtru."
 
@@ -5248,11 +5333,11 @@
 "transfers."
 msgstr "Scrie o valoare între 0 și 10 pentru numărul de transferuri simultane."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Scrie o parolă pentru acest server:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5270,11 +5355,11 @@
 "Scrie o valoare a expirării între 5 și 9999 de secunde sau 0 pentru a "
 "dezactiva expirarea."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Scrie un nume unic pentru acest set de filtre"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Scrie un nume de utilizator pentru acest server:"
 
@@ -5286,17 +5371,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Scrie URL-ul de unde trebuie obținută adresa externă a calculatorului"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Specifică un interval de actualizare de cel puțin 7 zile"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Specifică o viteză maximă de încărcare mai mare sau egală cu 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5304,14 +5385,18 @@
 "Scrie comanda FTP brută.\n"
 "Utilizarea comenzilor FTP brute va goli cașul dosarelor [cache]."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Scrie numele dosarului care trebuie creat:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Introdu numele filei care trebuie creată:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Scrie numele de utilizator și parola pentru acest server:"
 
@@ -5330,7 +5415,7 @@
 "vrăjitor. În caz că ai o adresă dinamică sau nu o cunoști pe cea externă, "
 "folosește opțiunea rezolvatorului extern."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5346,7 +5431,7 @@
 "Asigură-te că programului FileZilla îi este permis să stabilească conexiuni "
 "ieșinde și asigură-te că adresa tastată a rezolvatorului de adrese e validă."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Asigură-te că localizarea (limba) solicitată este instalată în sistem."
 
@@ -5362,7 +5447,7 @@
 "utilizezi înaintarea manuală a porturilor [forwarding]. Nu rula ruterul în "
 "modurile 'DMZ Mode' sau 'Game Mode'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5374,7 +5459,7 @@
 "crede că e utilizat doar de troieni sau alte programe nocive. Acest lucu "
 "poate duce la o alarmă falsă pe care o poți ignora."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5382,7 +5467,7 @@
 "Reține că păstrarea marcajului original de timp la încărcările pe servere "
 "FTP, FTPS și FTPES merge numai dacă serverele suportă comanda MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5390,7 +5475,7 @@
 "E posibil ca unele servere să-ți blocheze accesul daca încerci să te "
 "reconectezi la ele foarte des sau la intervale foarte scurte de timp."
 
-#: resources.h:889 resources.h:895
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5399,7 +5484,7 @@
 "Pentru detalii citește http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5416,38 +5501,38 @@
 "Rulează vrăjitorul încă o dată dacă a trebuit să modifici setările rețelei "
 "sau dacă ai întîmpinat probleme cu servere care mai înainte au mers corect."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Va rog sa selectati o actiune:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Selectează categoriile care vrei să fie importate."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Modul Implicit de Transfer pentru Date"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Selectează noile atribute pentru dosarul \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Selectează noile atribute pentru fila \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Selectează noile atribute pentru dosarele selectate."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Selectează noile atribute pentru filele și dosarele selectate."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Selectează noile atribute pentru filele selectate."
 
@@ -5466,7 +5551,7 @@
 "Lucruri ca inspectarea protocolului sau anumite corecții specifice "
 "protocolului trebuie dezactivate"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5474,8 +5559,8 @@
 "Vizitează http://filezilla-project.org pentru mai multe informații despre "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5483,17 +5568,17 @@
 "Vizitează http://filezilla-project.org pentru a descărca cea mai recentă "
 "versiune."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Codul poștal:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Situri Predefinite"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Păstrarea marcajului original de timp"
 
@@ -5501,48 +5586,61 @@
 msgid "Preview:"
 msgstr "Previzionare:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Conexiunea primară și certificatele de conexiune pentru date nu se potrivesc."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Tipărește informații de diagnosticare legate de pornirea FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Tipărește la ieșirea standard informațiile despre versiune și ieși"
 
-#: resources.h:912
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Prioritizează dosarele (implicit)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritate"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Politica de Confidențialitate:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Politică de confidențialitate: Vor fi trimise serverului doar versiunea de "
+"FileZilla, sistemul de operare folosit și arhitectura procesorului "
+"calculatorului."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "C&hei Private:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tocol:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Parolă Pro&xy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Procesează Coa&da de Transfer"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protocol:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Port &Proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "&Utilizator Proxy:"
 
@@ -5550,12 +5648,18 @@
 msgid "Proxy authentication failed"
 msgstr "Autentificarea la proxy a eșuat."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Strîngerea de mînă cu proxyul a eșuat: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr ""
+"Adresa serverului proxy începe cu '[' dar nu a fost găsită paranteza dreaptă "
+"de închidere."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5572,23 +5676,23 @@
 "Solicitarea proxyului a eșuat: Tip necunoscut de adresă în răspunsul la "
 "CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxy setat, dar adresa sau portul lui sînt nevalide"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Atentificare cu Cheie Publică"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Algoritm cu Cheie Publică:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Permisiuni Publice"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Coada a fost procesată complet"
 
@@ -5607,39 +5711,39 @@
 msgid "Queue: empty"
 msgstr "Coadă: goală"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "File în Coadă"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Coadă:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "R&epornește Calculatorul"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Arborele Dosar&elor Distante"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "R&esetează și repune în coadă filele selectate"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Comandă FTP brută"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Ci&tire"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Îm&prospătează"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Re&numește"
 
@@ -5651,67 +5755,77 @@
 "Rulează din nou vrăjitorul, verifică cu atenție setările și configurează "
 "ruterul și parafocul în mod corespunzător."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "C&itire"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Doar-citire"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Sigur vrei să anulezi operația curentă?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Sigur ștergi %d dosar cu tot conținutul său?"
-msgstr[1] "Sigur ștergi cele %d dosare cu tot conținutul lor?"
-msgstr[2] "Sigur ștergi cele %d de dosare cu tot conținutul lor?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Sigur ștergi %d filă?"
-msgstr[1] "Sigur ștergi cele %d file?"
-msgstr[2] "Sigur ștergi cele %d de file?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Sigur ștergi %s și %s?"
+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] "Sigur ștergi %d dosar cu tot conținutul său de pe server?"
+msgstr[1] "Sigur ștergi cele %d dosare cu tot conținutul lor de pe server?"
+msgstr[2] "Sigur ștergi cele %d de dosare cu tot conținutul lor de pe server?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, c-format
+msgid "Really delete %d file from the server?"
+msgid_plural "Really delete %d files from the server?"
+msgstr[0] "Sigur ștergi %d filă de pe server?"
+msgstr[1] "Sigur ștergi cele %d file de pe server?"
+msgstr[2] "Sigur ștergi cele %d de file de pe server?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Sigur ștergi %s și %s de pe server?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Sigur vrei să ștergi de pe server filele și/sau dosarele selectate?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Sigur vrei să ștergi filele și/sau dosarele selectate?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr ""
+"Sigur vrei să ștergi de pe calculatorul tău filele și/sau dosarele selectate?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Motiv"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Repornește Acum"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Incl&usiv subdosarele"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+"Am primit o listare de dosare care pare a fi codată în standardul EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "A fost primită o linie ce depășește 10000 de caractere, abandonez."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Datele primite sînt alterate"
 
@@ -5724,11 +5838,11 @@
 "server.\n"
 "Dacă vrei să continui, conexiunea va fi întreruptă."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Setări de Reconectare"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Reconectează la ultimul server utilizat"
 
@@ -5736,34 +5850,38 @@
 msgid "Redirection to invalid address"
 msgstr "Redirecționare la o adresa nevalidă"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Împrospătează listele de file și dosare"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Memorez parolele?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Distant"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Certificatul distant nu este de încredere."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Filă Distantă"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Căutare în filele distante"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Filtre Distante:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Calea Distantă"
 
@@ -5776,7 +5894,7 @@
 "Calea distantă nu poate fi parsată. Asigură-te că e o cale absolută validă "
 "și e suportată de tipul de server al sitului curent (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5787,7 +5905,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Calea distantă nu poate fi parsată. Asigură-te că e o cale absolută validă."
@@ -5796,11 +5914,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Calea distantă nu a putut fi parsată."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Tratamentul căii distante:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Calea Distantă:"
 
@@ -5808,76 +5926,76 @@
 msgid "Remote site:"
 msgstr "Distant:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "Înlătură &Tot"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Înlătură &Selectatele"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Renumește fila"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Renumește dosarul selectat"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Renumește filele și dosarele selectate"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Renumesc '%s' în '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Raportează buguri și cere facilități noi"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Solicită FTP explicit prin TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Solicită FTP implicit prin TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Resetează și repune în co&adă filele selectate"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Rezolv adresa IP pentru %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Rezolv numele gazdei"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Răspuns:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Rezultate:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Reia transferul de file"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5885,34 +6003,38 @@
 "Reluarea filelor ASCII poate cauza probleme dacă serverul utilizează un alt "
 "format de final de linie față de client."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Preiau lista de dosare..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Preiau adresa IP externă de la %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Certificatul rădăcinii nu este de încredere"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Arată File&le Editate Curent..."
 
-#: resources.h:609
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "Arată Ad&ministratorul Siturilor la pornire"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Înc&hide Calculatorul"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "Opreș&te"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "Explorează Sincroni&zat"
 
@@ -5920,31 +6042,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Salvez setările?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Salvarea parolelor a fost dezactivată de administratorul de sistem."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Salvarea parolelor a fost dezactivată de tine."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Scanez după file de adăugat la coadă"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Scanez după file de încărcat"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Condiții de &căutare:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "&Dosar de căutare:"
 
-#: resources.h:1001
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Caută recursiv după file (inclusiv în subdosare)."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Caută file pe server"
 
@@ -5957,27 +6093,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Vezi și: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Sele&ctează Serverul"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Cate&gorii:"
 
-#: resources.h:877
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Selectează Tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Selectează acțiunea implicită de efectuat dacă fila țintă a unui transfer "
 "există deja."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Selectează editorul implicit"
 
@@ -5997,7 +6133,7 @@
 "Selectează acțiunea implicită în caz că fila există deja, valabilă doar "
 "pentru filele selectate curent în coadă."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Selectează locul de descărcare pentru pachet"
 
@@ -6018,7 +6154,7 @@
 msgstr "Selectează fila pentru exportarea setărilor"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Selectează fila pentru siturile exportate"
 
@@ -6034,12 +6170,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Selectează fila pentru cheia convertită"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Selectează modul în care să fie deschise aceste file."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Selectează dosarul în care să se descarce"
 
@@ -6047,15 +6183,15 @@
 msgid "Select target filename"
 msgstr "Selectează numele filei țintă"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Selectează categoriile de exportat:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Selectează datele private pe care vrei să le ștergi."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6071,7 +6207,7 @@
 msgstr[1] "%d dosare selectate."
 msgstr[2] "%d de dosare selectate."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6095,7 +6231,7 @@
 msgstr[1] "%d file selectate (mărime totală: cel puțin %s)"
 msgstr[2] "%d de file selectate (mărime totală: cel puțin %s)"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "%s și %s selectate pentru transfer."
@@ -6110,13 +6246,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s și %s selectate (mărime totală: cel puțin %s)"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Editorul selectat nu există."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Fila selectată se editează deja"
 
@@ -6124,15 +6260,15 @@
 msgid "Selected file is already loaded"
 msgstr "Fila selectată este deja încărcată"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Fila selectată este deja deschisă"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Fila selectată este în curs de editare"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Filtrul selectat se aplică numai filelor locale."
 
@@ -6149,37 +6285,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Portul selectat este de obicei folosit de un protocol diferit."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Tri&mite comenzi FTP pentru menținerea activă a conexiunii"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "Trimite comandă personalizată la serverul altfel indisponibil"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Trimit comandă FTP pentru menținerea activă a conexiunii"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Număr de serie:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Tip de Server:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Serverul nu a închis corespunzător conexiunea TLS"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Serverul nu suportă caracterele non-ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Serverul nu suportă reluarea filelor > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6188,15 +6329,15 @@
 "Serverul nu suportă reluarea filelor > %d GB. Transferul e terminat cînd "
 "mărimile filelor se potrivesc."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Serverul nu suportă reluarea filelor > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Serverul nu suportă reluarea filelor > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6205,20 +6346,19 @@
 "Serverul nu suportă reluarea filelor > %d GB. Transferul e terminat cînd "
 "mărimile filelor se potrivesc."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
 "Serverul ar putea necesita autentificare. Încearcă să specifici un cont "
-"folosind Administratorul de Situri"
+"folosind Administratorul Siturilor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
-#, fuzzy
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
-msgstr "Serverul a trimis un răspuns neașteptat."
+msgstr "Serverul a returnat o cale absentă (goală)."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6226,13 +6366,13 @@
 "Serverul a trimis o solicitare suplimentară de logare. Trebuie să utilizezi "
 "tipul de logare interactivă."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Serverul a transmis un răspuns pasiv cu o adresă nerutabilă. Modul pasiv a "
 "eșuat."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6252,101 +6392,112 @@
 msgid "Server sent unexpected reply."
 msgstr "Serverul a trimis un răspuns neașteptat."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "MAC server către client:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Cifru server către client:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Tip de Server:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Server | Filă Locală"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Detaliile Sesiunii"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Setează &Prioritatea"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Setează permisiunile pentru '%s' la '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize apelat fără socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Setări"
 
-#: resources.h:974
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Afișează lista b&rută de dosare"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Afișează Dialogul de Bun &Venit..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Afișez amîndoi arborii de dosare și continui compararea?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Arată cifrurile TLS disponibile"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Afișează acest dialog de ajutor"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Închide Calculatorul Acum"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Algoritmul Semnăturii:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
-msgstr "Intrări în Ad&ministratorul de Situri"
+msgstr "Intrări în Ad&ministratorul Siturilor"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
-msgstr "Administrator de Situri"
+msgstr "Administratorul Siturilor"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Administratorul Siturilor - Nu pot memora parola"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
-msgstr "Administratorul de Situri - Date nevalide"
+msgstr "Administratorul Siturilor - Date nevalide"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
-msgstr "Administratorul de Situri este deja deschis"
+msgstr "Administratorul Siturilor este deja deschis"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Situl nu există."
 
@@ -6356,8 +6507,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Calea sitului este malformată."
 
@@ -6373,14 +6524,14 @@
 "Add current connection to the site manager?"
 msgstr ""
 "Semnele de carte specifice pentru sit necesită ca serverul să fie stocat în "
-"Administratorul de Situri.\n"
-"Adaug conexiunea curentă la managerul de situri?"
+"Administratorul Siturilor.\n"
+"Adaug conexiunea curentă la administratorul de situri?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Mărime"
 
-#: resources.h:896
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Formatul Mărimii Filelor"
 
@@ -6389,31 +6540,31 @@
 msgid "Size unknown"
 msgstr "Mărime Necunoscută"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Sari fila"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Sar descărcarea lui %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Sar încărcarea lui %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Unele file sînt încă editate sau trebuie încărcate."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6421,19 +6572,19 @@
 "Unele servere care sînt configurate greșit și se găsesc în spatele unui "
 "ruter ar putea răspunde cu adresa lor IP locală."
 
-#: resources.h:914
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Sortează dosarele în linie [inline]"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Ordinea de sortare nu poate fi schimbată dacă se compară dosare."
 
-#: resources.h:910
+#: resources.h:932
 msgid "Sorting"
 msgstr "Sortare"
 
-#: resources.h:911
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "&Mod de Sortare:"
 
@@ -6445,20 +6596,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Fila sursă și cea țintă pot să nu fie identice"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Sursa și ținta operațiunii de punere sînt identice."
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Fila Sursă:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Limite de Viteză"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Limite de Viteză"
 
@@ -6470,51 +6621,63 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Limitele de viteză sînt activate, clichează pentru a modifica."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Versiunile stabile și cele beta"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Doar versiunile stabile"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Pornește &imediat transferul"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
 msgid "Start with opened Site Manager"
-msgstr "Pornește cu Administratorul de Situri deschis"
+msgstr "Pornește cu Administratorul Siturilor deschis"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Pornesc descărcarea lui %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Pornesc încărcarea lui %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Pornește situl local cu calea dată"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Statul sau provincia:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Stare"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Stare:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Oprește și Înlătură &Tot"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Stradă:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Subiectul Certificatului"
 
@@ -6522,11 +6685,11 @@
 msgid "Successful transfers"
 msgstr "Transferuri Reușite"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Rezumatul rezultatelor testului:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6534,56 +6697,57 @@
 "Simlegăturile către file nu sînt afectate de această alegere, astfel de "
 "simlegături sînt șterse mereu."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Explorare sincronizată"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Explorarea sincronizată a fost dezactivată."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Eroare de sintaxă"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Eroare de sintaxă în linia de comandă"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistem"
 
-#: resources.h:518
-msgid "T&ool bar"
-msgstr ""
+#: resources.h:535
+msgid "T&oolbar"
+msgstr "Bara de Unel&te"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Conexiune TLS/SSL stabilită, trimit solicitarea HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Conexiunea TLS/SSL a fost stabilită. Aștept mesajul de întîmpinare..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Conexiunea TLS/SSL a fost stabilită."
 
@@ -6591,33 +6755,37 @@
 msgid "TTL expired"
 msgstr "TTL a expirat"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Fila țintă există deja"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Fila Țintă:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Fila țintă există deja!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Fila țintă există deja. Sigur continui?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Rezultatele testului"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testez capacitatea serverului de a relua file"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"Administratorul de Situri e deschis într-o altă instanță de FileZilla.\n"
+"Administratorul Siturilor e deschis într-o altă instanță de FileZilla.\n"
 "Vrei să continui? Orice modificare efectuată în Administrator nu va fi "
 "salvată."
 
@@ -6626,10 +6794,10 @@
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
-"Administratorul de Situri este deschis într-o altă instanță de FileZilla.\n"
+"Administratorul Siturilor este deschis într-o altă instanță de FileZilla.\n"
 "Închide-o sau datele nu vor putea fi șterse."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "Documentul XML nu este bine formatat: %s"
@@ -6640,11 +6808,11 @@
 msgstr "Adresa introdusă de tine a fost: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Semnul de carte nu poate fi adăugat."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Semnele de carte nu pot fi curățate."
 
@@ -6656,21 +6824,26 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Secvența personalizată de logare nu poate fi goală."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Conexiunea de date nu a putut fi stabilită: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Editorul implicit pentru filele text nu a putut fi găsit."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Editorul implicit pentru filele text e '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "Numele introdus al filtrului există deja."
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "Numele introdus al filtrului există deja. Alege alt nume."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6687,9 +6860,9 @@
 "Fila %s există deja.\n"
 "Scrie un nume nou:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6705,14 +6878,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Fila '%s' nu poate fi încărcată sau nu conține o cheie privată."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Fila '%s' nu poate fi încărcată."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6721,8 +6894,8 @@
 "Fila '%s' nu poate fi încărcată:\n"
 "În sistem nu este asociat nici un program cu acest tip de filă."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6764,7 +6937,7 @@
 "încă suportate de FileZilla.\n"
 "Vrei s-o convertești într-un format suportat și neprotejat?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Fila selectată ca editor implicit nu există."
 
@@ -6776,7 +6949,7 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"Fila selectată conține date ale managerului de situri dintr-o versiune "
+"Fila selectată conține date ale Administratorului Siturilor dintr-o versiune "
 "anterioară de FileZilla.\n"
 "Din cauza diferențelor în formatul de stocare, numai serverul, portul, "
 "utilizatorul și parola vor fi importate.\n"
@@ -6800,11 +6973,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Caracterele următoare vor fi înlocuite: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Următoarele file sînt în curs de editare:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Soft liber și cu sursă deschisă pentru FTP"
 
@@ -6812,7 +6985,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Semnele de carte globale nu pot fi salvate."
 
-#: resources.h:972
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6844,7 +7017,7 @@
 "Portul minim disponibil trebuie să fie mai mic sau egal cu cel maxim "
 "disponibil."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6852,7 +7025,7 @@
 "A fost descărcată cea mai nouă versiune. Apasă pe Finalizare/Finish pentru a "
 "închide FileZilla și a porni instalarea."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6860,11 +7033,11 @@
 "A fost descărcată cea mai nouă versiune. Instaleaz-o așa cum ai făcut cu "
 "versiunea existentă."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Coada nu va fi salvată."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6879,24 +7052,24 @@
 msgid "The selected categories have been imported."
 msgstr "Categoriile selectate au fost importate."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Fila selectată conține date importabile pentru următoarele categorii:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Fila selectată e deja în curs de editare:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Fila selectată este încă deschisă într-un alt program. Va trebui s-o închizi "
 "acolo."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6914,7 +7087,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Serverul a trimis un răspuns neașteptat sau nerecunoscut."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr ""
 "Serverul utilizează următorul set de caractere pentru a coda numele filelor:"
@@ -6927,7 +7100,7 @@
 "Ceritificatul serverului este necunoscut. Examinează cu atenție certificatul "
 "pentru a te asigura că serverul este de încredere."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6938,7 +7111,7 @@
 "conectezi la un calculator diferit, care pretinde că e serverul pentru care "
 "ai cheia."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6954,19 +7127,19 @@
 "Setările au fost importate. Trebuie să repornești FileZilla pentru ca "
 "modificările să aibă efect."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "Sistemul va reporni în curînd; acțiunea poate fi oprită dacă apeși pe "
 "butonul Anulează."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 "Sistemul se va închide în curînd; acțiunea poate fi oprită dacă apeși pe "
 "butonul Anulează."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6974,7 +7147,7 @@
 "Fila țintă există deja.\n"
 "Alege o acțiune."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testul nu a reușit. Sigur vrei să salvezi setările?"
 
@@ -6982,11 +7155,11 @@
 msgid "Themes"
 msgstr "Teme"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Acest set de filtre nu poate fi înlăturat."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Acest set de filtre nu poate fi renumit."
 
@@ -6998,7 +7171,7 @@
 "Asta înseamnă că un anumit ruter sau/și parafoc continuă să interfereze cu "
 "FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7006,7 +7179,7 @@
 "Aceasta funcționează numai cînd calculatorul nu este în spatele unui ruter, "
 "altfel sistemul va returna pur și simplu adresa internă a calculatorului."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7014,25 +7187,25 @@
 "Acest vrăjitor te va ajuta să configurezi corect orice ruter sau parafoc "
 "[firewall] de care dispui și să testezi configurația rezultată."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Timp"
 
-#: resources.h:890
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Formatul de Oră"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Expirare în sec&unde:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Expirare"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7041,21 +7214,21 @@
 "Decalajul de fus orar: Server: %d secunde. Local: %d secunde. Diferența: %d "
 "secunde."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titlu:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "Pentru a compara dosarele, amîndouă listele trebuie să fie aliniate."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Pentru a face acest lucru, arborii de dosare trebuie să fie amîndoi ascunși "
 "sau afișați."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7063,7 +7236,7 @@
 "Pentru a utiliza autentificarea pe bază de chei publice, FileZilla trebuie "
 "să știe ce chei private să utilizeze."
 
-#: resources.h:997
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7077,10 +7250,10 @@
 "\n"
 "Culori:\n"
 "Galben: Fila există doar într-o singură parte\n"
-"Verde: Fila este mai nouă decît fișierul nemarcat din cealaltă parte\n"
+"Verde: Fila este mai nouă decît fila nemarcată din cealaltă parte\n"
 "Roșu: Mărimile filelor diferă"
 
-#: resources.h:999
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7090,23 +7263,23 @@
 "Dacă e activată, navigarea în arborele de dosare local va duce la o navigare "
 "identică în arborele de dosare de pe server și viceversa."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Comută procesarea cozii de transfer"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Comută afișarea arborelui local de dosare (de pe calculator)"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Comută afișarea jurnalului cu mesaje de la server"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Comută afișarea arborelui distant de dosare (de pe server)"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Comută afișarea cozii de transfer"
 
@@ -7119,37 +7292,37 @@
 msgstr "Prea multe redirecționări"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Urmărește:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Transferă"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Sens &de Transfer"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "&Tipul de Transfer"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Mod de Transfer"
 
-#: resources.h:876
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Coada de Transfer"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Setări de Transfer"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Conexiunea de transfer a fost întreruptă: %s"
@@ -7158,8 +7331,8 @@
 msgid "Transferred data got tainted."
 msgstr "Datele transferate au fost alterate."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Transfer în curs"
 
@@ -7167,69 +7340,69 @@
 msgid "Transfers"
 msgstr "Transferuri"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Transferuri terminate"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Tratează filele fără e&xtensie ca fiind ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Tratează următoarele tipuri de &file ca fiind ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Încredere în cheia modificată a gazdei:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Încredere în cheia nouă a gazdei:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Ai încredere în cheia nouă și continui cu conectarea?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Ai încredere în acest certificat și continui cu conectarea?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Ai încredere în această gazdă și continui cu conectarea?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tip"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
-msgstr "Tip de proxy FTP:"
+msgstr "Tip de server proxy (interpus) FTP:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
-msgstr "Tip de proxy generic:"
+msgstr "Tip de server proxy (interpus) generic:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "&Încarcă"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Limita Încă&rcării:"
 
-#: resources.h:938
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Utilizează a&socierile filelor dacă sînt disponibile"
 
-#: resources.h:891
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Folosește setările implicite ale &sistemului"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7238,16 +7411,16 @@
 msgid "Unassigned error code %d"
 msgstr "Cod de eroare %d nealocat"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Unitate:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Necunoscut"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Tip necunoscut de proxy FTP. Nu se poate genera secvența de logare."
 
@@ -7260,7 +7433,7 @@
 msgid "Unknown certificate"
 msgstr "Certificat necunoscut"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7268,7 +7441,7 @@
 "Eroare necunoscută la deschiderea filei. Asigură-te că fila poate fi "
 "accesată și este un document XML bine formatat."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Cheie a gazdei necunoscută"
 
@@ -7281,7 +7454,7 @@
 "Versiune necunoscută de subnegociere a autentificării cu utilizator/parolă "
 "din protocolul SOCKS: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7304,7 +7477,7 @@
 "Pînă cînd problema nu se rezolvă, modul FTP activ nu va funcționa și va "
 "trebui folosit modul pasiv."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Tip de certificat nesuportat"
 
@@ -7312,25 +7485,24 @@
 msgid "Unsupported redirect"
 msgstr "Redirecționare nesuportată"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Încarcă și de&zeditează"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Control al Actualizărilor"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Vrăjitor de Actualizare"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Actualizare"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Încarcă"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Încărcarea a eșuat"
 
@@ -7343,100 +7515,100 @@
 msgid "Upload limit: none"
 msgstr "Limita Încărcării: fără"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Încarcă dosarul selectat"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Încarcă filele și dosarele selectate"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Încarc din nou această filă pe server?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Încarc această filă pe server?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Î&ncarc"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Încarc și aștept înlăturarea"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Încarc și dezeditez"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Folosește set de &caractere personalizat"
 
-#: resources.h:935
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Folosește editor persona&lizat:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Folosește e&ditorul implicit pentru filele text"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Folosește explorarea sincroni&zată"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Folosește UTF-8 dacă suportă serverul, în caz contrar utilizează setul de "
 "caractere local."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Folosește acțiunea implicită"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Folosește FTP obișnuit"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Folosește serverul conectat curent"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
-msgstr "Folosește un server din administratorul de situri"
+msgstr "Folosește un server din Administratorul Siturilor"
 
-#: resources.h:885
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Folosește setările im&plicite"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Folosește următoarea adresă IP:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Folosește următorul interval de porturi:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Folosește mai degrabă adresa IP externă a serverului"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Utilizează opțiunea aceasta dacă calculatorul se găsește în spatele unui "
 "ruter și are o adresă IP externă statică."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7447,88 +7619,88 @@
 "utiliza modul activ pentru prima dată. Doar versiunea de FileZilla folosită "
 "va fi trimisă serverului."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Utilizator:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr ""
 "Numele de utilizator nu poate consta dintr-o succesiune de spații goale"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Utilizez proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Folosirea unui set greșit de caractere poate duce la afișarea incorectă a "
 "numelui filelor."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Folosind acest vrăjitor poți verifica existența actualizărilor disponibile "
 "pentru FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Valid de la:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Valid pînă la:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Mesaje de jurnalizare detaliate de la wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Verific certificatul..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Versiune:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Foarte Înaltă"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr ""
 "Opțiunea de afișare a filelor ascunse e setată, dar nu e suportată de server"
 
-#: resources.h:922
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Vezi/Editează"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Coloane Vizibile"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "Sc&riere"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Aștept"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Aștept conexiunea de explorare"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Aștept parola"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Aștept ca transferul să fie anulat"
 
@@ -7536,7 +7708,7 @@
 msgid "Waiting to retry..."
 msgstr "Aștept să reîncerc..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7566,11 +7738,11 @@
 "Gateway,\n"
 "FileZilla va expira la descărcarea filelor mari."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Atenție, ignor conexiunea de date de la un IP greșit."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7585,23 +7757,31 @@
 "\n"
 "Sigur vrei să verifici existența compilațiilor nocturne?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Atenție: Breșă Potențială de Securitate!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Bine ai venit la FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Ce este nou"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Ce este nou:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Dacă permiți ca FileZilla să memoreze parolele, după repornirea softului te "
+"vei putea conecta la servere fără să mai reintroduci parola."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7609,11 +7789,15 @@
 "Cînd este activată, caracterele nesuportate de sistemul de operare în numele "
 "de file sînt înlocuite dacă e descărcat o astfel de filă."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Ecran Lat"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Vrei ca FileZilla să memoreze parolele?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Scr&iere"
 
@@ -7626,11 +7810,19 @@
 msgid "Wrong line endings"
 msgstr "Finaluri de linie incorecte"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Da"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Se pare că utilizezi un server gazdă exclusiv IPv6. Acest vrăjitor nu "
+"suportă mediul respectiv."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7638,15 +7830,15 @@
 "Folosești deja cea mai recentă versiune de FileZilla. Verifică altă dată "
 "existența unei versiuni mai noi."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Poți să redeschizi oricînd acest dialog folosind meniul de ajutor."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Poți lăsa gol cîmpul portului pentru a fi utilizat portul implicit."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7671,19 +7863,19 @@
 msgstr ""
 "Nu ai introdus un nume nou pentru filă. Vrei mai degrabă să suprascrii fila?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Ai selectat cel puțin o legătură simbolică (simlegătură)."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 "Ai selectat mai mult de 10 file pentru a fi editate, sigur vrei să continui?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7692,11 +7884,11 @@
 "să continui?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Trebuie să introduci o adresă de server validă."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Trebuie să introduci un dosar local."
 
@@ -7705,18 +7897,18 @@
 msgid "You have to enter a valid IP address."
 msgstr "Trebuie să introduci o adresă IP validă."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr ""
 "Trebuie să introduci un dosar local în care scrierea de date e permisă."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Trebuie să introduci un nume de cont."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Trebuie să specifici un nume de utilizator."
 
@@ -7736,22 +7928,22 @@
 msgid "You need to enter a name for the log file."
 msgstr "Introdu un nume pentru fila jurnal."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Trebuie să introduci o comandă citată [quoted] corespunzător."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Trebuie să introduci o adresă proxy."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Trebuie să introduci un port proxy."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 "Trebuie să introduci cel puțin o cale, semnele de carte goale nu sînt "
@@ -7759,7 +7951,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7767,7 +7959,7 @@
 "Trebuie să completezi atît o cale locală cît și una distantă, ca să activezi "
 "explorarea sincronizată pentru acest semn de carte."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7799,44 +7991,49 @@
 "Nu ar trebui să existe probleme cu conectarea la alte servere. Transferul "
 "filelor ar trebui să funcționeze corect."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "este după"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "este înainte de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "începe cu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "baiți"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "conține"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "nu conține"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "nu este egală cu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "se termină cu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "este egală cu"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "filă"
 
@@ -7855,88 +8052,133 @@
 "Asigură-te că executabilul există în același dosar cu executabilul principal "
 "FileZilla."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp nu poate fi pornit"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers nu a returnat nici un certificat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "este mai mare de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "grupul execută"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "grupul citește"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "grupul scrie"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "este identic cu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "este setat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "nu este setat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "este mai mică de"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "se potrivește cu regexul"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "proprietarul execută"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "proprietarul citește"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "proprietarul scrie"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "necunoscut"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "oricine execută"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "oricine citește"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "oricine scrie"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s baiți (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s baiți (%d.%d MB/s)"
+
+#~ msgid "&Copy"
+#~ msgstr "&Copiază"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "Ac&tivează controlul automat al actualizărilor"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Numărul de zile între verificările actualizărilor:"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "Memo&rează parola asta și toate cele viitoare"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(cel puțin 7 zile)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Căutare automată de actualizări"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Caută &versiuni beta și candidate la lansare [RC]"
+
+#~ msgid "Cop&y"
+#~ msgstr "Cop&iază"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Specifică un interval de actualizare de cel puțin 7 zile"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Politica de Confidențialitate:"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Nume de filtru duplicat"
+
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Nu pot încărca meniul principal din fișierul cu resurse"
 
-#~ msgid "bytes"
-#~ msgstr "baiți"
-
 #~ msgid "Break current connection?"
 #~ msgstr "Întrerup conexiunea curentă?"
 
@@ -8132,9 +8374,6 @@
 #~ msgid "Theme error"
 #~ msgstr "Eroare tema"
 
-#~ msgid "item not found"
-#~ msgstr "obiect negasit"
-
 #~ msgid "themes.xml missing, can not get theme data"
 #~ msgstr "themes.xml lipseste, nu pot citi datele despre teme"
 
diff -Nru filezilla-3.5.3/locales/ru.po filezilla-3.7.3~precise/locales/ru.po
--- filezilla-3.5.3/locales/ru.po	2010-08-07 15:29:57.000000000 +0000
+++ filezilla-3.7.3~precise/locales/ru.po	2013-06-18 20:02:24.000000000 +0000
@@ -4,13 +4,14 @@
 # Updated by Alex B. <bsf@mail.ru>, 2009
 # Last update: December 14, 2009
 # boobaloo <koptev.oleg@gmail.com>, 2010.
+# Updated by Sergey (private_joker) <private_joker@mail.ru>, 2013
 msgid ""
 msgstr ""
 "Project-Id-Version: Русский перевод\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-08-07 14:50+0200\n"
-"PO-Revision-Date: 2010-08-06 00:04+0400\n"
-"Last-Translator: boobaloo <koptev.oleg@gmail.com>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-12 14:20+0400\n"
+"Last-Translator: Sergey <private_joker@mail.ru>\n"
 "Language-Team: Oleg Koptev\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -18,21 +19,19 @@
 "Language: ru\n"
 "Plural-Forms: nplurals=3; plural=(n%10==1 && n%100!=11 ? 0 : n%10>=2 && n%"
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
-"X-Generator: Virtaal 0.5.2\n"
-"X-Poedit-Language: Russian\n"
-"X-Poedit-Country: RUSSIA\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S затрачено"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S осталось"
 
-#: resources.h:772
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -51,9 +50,9 @@
 msgstr[1] "%d каталога"
 msgstr[2] "%d каталогов"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -63,9 +62,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -89,7 +88,7 @@
 msgstr[1] "%d файла. Общий размер: не менее %s"
 msgstr[2] "%d файлов. Общий размер: не менее %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2845
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d файлов добавлено в задание"
@@ -102,46 +101,36 @@
 msgstr[1] "%d секунды"
 msgstr[2] "%d секунд"
 
-#: resources.h:769
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Хост"
 
-#: resources.h:771
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Пароль"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d Б/сек)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d КБ/сек)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/сек)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
-#, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d МБ/сек)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? Б/сек)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
-msgstr "%s - Сертификат недействителен!"
+msgstr "%s - Срок действия сертификата истек!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - Пока не действителен!"
 
-#: resources.h:773
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Пользователь прокси"
@@ -164,27 +153,17 @@
 msgstr[1] "%s байт"
 msgstr[2] "%s байт"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s байт"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s байт (%d Б/сек)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s байт (%d.%d КБ/сек)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s байт (%d.%d МБ/сек)"
+msgid "%s bytes (%s/s)"
+msgstr "%s байт (%s/сек)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -198,7 +177,7 @@
 "Пожалуйста, загрузите FileZilla снова. Если проблема не решится, отправьте "
 "сообщение об ошибке."
 
-#: ../../locales/../src/interface/FileZilla.cpp:796
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -208,332 +187,329 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"%s не найден. Без этого компонента SFTP не будет работать.\n"
+"%s не найден. Без этого компонента FileZilla, SFTP не будет работать.\n"
 "\n"
-"Решение проблемы:\n"
-"- Убедитесь, что %s находится в папке, указанной в переменной PATH.\n"
-"- Укажите полный путь к %s в переменной FZ_FZSFTP."
+"Возможное решение:\n"
+"- Убедитесь, что %s находится в каталоге, указанном в переменной среды "
+"PATH.\n"
+"- Укажите полный путь к %s в переменной среды FZ_FZSFTP."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s с %d бит"
 
-#: resources.h:770
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Имя пользователя"
 
-#: resources.h:774
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Пароль прокси"
 
-#: resources.h:553
+#: resources.h:572
 msgid "&About..."
 msgstr "&О программе..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Учетная запись:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "&Активный"
 
-#: resources.h:544
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Добавить закладку..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Добавить файлы в задание"
 
-#: resources.h:782
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Добавить файл с ключом..."
 
-#: resources.h:624 resources.h:643
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Добавить в задание"
 
-#: resources.h:94
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Применить настройки временной зоны сервера:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Всегда принимать сертификат в будущих сессиях"
 
-#: resources.h:181
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Всегда доверять этому хосту, добавить ключ в кэш"
 
-#: resources.h:932
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Всегда использовать редактор по умолчанию"
 
-#: resources.h:426
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Всегда использовать для файлов без ассоциации"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Всегда использовать это действие"
 
-#: resources.h:750
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Получить сведения о внешнем IP-адресе в настройках системы"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Авто"
 
-#: resources.h:106
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Автоопределение"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "&Автоматически скрывать успешные загрузки"
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Двоичный"
 
-#: resources.h:892
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Двоичные префиксы в системе СИ (напр., 1 KБ = 1024 байт)"
 
-#: resources.h:543
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Закладки"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Обзор..."
 
-#: resources.h:809
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Допустимое превышение:"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Отмена"
 
-#: resources.h:234
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Проверить бета-версии FileZilla"
 
-#: resources.h:504
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Удалить личные данные..."
 
-#: resources.h:601
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Закрыть FileZilla"
 
-#: resources.h:664
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Настройка ограничения скорости..."
 
-#: resources.h:531
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Настройка..."
 
-#: resources.h:112
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Соединиться"
 
-#: resources.h:217
-msgid "&Copy"
-msgstr "&Копировать"
-
-#: resources.h:492
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
-msgstr "&Копировать соединение в Менеджер Сайтов..."
+msgstr "&Копировать текущее соединение в Менеджер Сайтов..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Копировать в буфер"
 
-#: resources.h:613
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Сбой"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "&Создать каталог"
 
-#: resources.h:659
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Создать новую вкладку"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Отладка"
 
-#: resources.h:959
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Записи в журнале отладки:"
 
-#: resources.h:925
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Редактор по умолчанию:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Действие по умолчанию, если файл существует..."
 
-#: resources.h:732
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Пауза между неудачными попытками:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Удалить"
 
-#: resources.h:456
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Удалить символьную ссылку"
 
-#: resources.h:510
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Сравнить каталоги"
 
-#: resources.h:324
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Отменить локальный файл, закачать и возобновить редактирование"
 
-#: resources.h:537
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Разъединить"
 
-#: resources.h:602
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Отключиться от сервера"
 
-#: resources.h:868
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr "&Показать мгновенную скорость передачи вместо средней"
+msgstr "&Показывать мгновенную скорость передачи вместо средней"
 
-#: resources.h:890
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Показывать размер файла в байтах"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Не запоминать пароли"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Больше не показывать."
 
-#: resources.h:755
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Не использовать внешний IP-адрес при &локальных соединениях"
 
-#: resources.h:912
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "&Действие по двойному клику на файлах:"
 
-#: resources.h:572 resources.h:622
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Скачать"
 
-#: resources.h:442
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Скачать в:"
 
-#: resources.h:657
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Скачать..."
 
-#: resources.h:256 resources.h:831
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Загрузки:"
 
-#: resources.h:502 resources.h:563
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Редактирование"
 
-#: resources.h:209
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "&Править правила фильтрования..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Включить"
 
-#: resources.h:940
-msgid "&Enable automatic update check"
-msgstr "&Автопроверка обновлений"
-
-#: resources.h:480 resources.h:804
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Включить ограничения скорости"
 
-#: resources.h:110
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Кодировка:"
 
-#: resources.h:609
+#: resources.h:91
+msgid "&Encryption:"
+msgstr "&Шифрование:"
+
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Ввести произвольную команду..."
 
-#: resources.h:136
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Выполнить"
 
-#: resources.h:291
+#: resources.h:302
 msgid "&Export Site Manager entries"
-msgstr "&Экспорт пунктов из Менеджера Сайтов"
+msgstr "&Экспорт записей из Менеджера Сайтов"
 
-#: resources.h:497 resources.h:653
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Экспорт..."
 
-#: resources.h:760
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Вернуться в активный режим"
 
-#: resources.h:489
+#: resources.h:507
 msgid "&File"
 msgstr "&Файл"
 
-#: resources.h:634
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Атрибуты файла..."
 
-#: resources.h:588
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Права доступа к файлу..."
 
-#: resources.h:364
+#: resources.h:375
 msgid "&File:"
 msgstr "&Файл:"
 
-#: resources.h:219
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Условия фильтра:"
 
-#: resources.h:198
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Наборы фильтров:"
 
-#: resources.h:213
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Фильтры:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Закончить"
 
-#: resources.h:316
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Закончить правку и удалить локальный файл"
 
-#: resources.h:446
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -541,495 +517,523 @@
 "&Сгладьте удаленные пути, загрузите все содержащиеся файлы прямо в целевой "
 "каталог"
 
-#: resources.h:457
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Следуя символьной ссылке удалить содержимое каталога"
 
-#: resources.h:753
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Получить внешний IP-адрес со следующей страницы:"
 
-#: resources.h:551
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Получение помощи..."
 
-#: resources.h:396
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Общая закладка"
 
-#: resources.h:789
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 используя метод CONNECT"
 
-#: resources.h:547
+#: resources.h:566
 msgid "&Help"
 msgstr "&Помощь"
 
-#: resources.h:514 resources.h:640
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Скрыть одинаковые файлы"
 
-#: resources.h:595
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Высочайший"
 
-#: resources.h:748
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "&Наибольший доступный порт:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Хост:"
 
-#: resources.h:891
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Двоичные префиксы &IEC (например, 1 КиБ = 1024 байт)"
 
-#: resources.h:879
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (например: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Импорт..."
 
-#: resources.h:934
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "&Использовать системные ассоциации файлов"
 
-#: resources.h:445
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Оставьте структуру удаленных путей относительно корня поиска"
 
-#: resources.h:854
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Раскладка панелей:"
 
-#: resources.h:745
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Ограничение используемых локальных портов"
 
-#: resources.h:102
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Ограничение одновременных подключений"
 
-#: resources.h:519
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Локальный &список"
 
-#: resources.h:401 resources.h:407
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Локальный каталог:"
 
-#: resources.h:949
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Записать в лог-файл"
 
-#: resources.h:82
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Тип входа:"
 
-#: resources.h:380
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Тип входа:"
 
-#: resources.h:598
+#: resources.h:619
 msgid "&Low"
 msgstr "&Низкий"
 
-#: resources.h:545
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Редактировать закладки..."
 
-#: resources.h:533
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Передача вручную..."
 
-#: resources.h:103
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Макс. число подключений:"
 
-#: resources.h:730
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Максимальное число попыток:"
 
-#: resources.h:518
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Журнал сообщений"
 
-#: resources.h:866
+#: resources.h:894
 msgid "&Minimize to tray"
-msgstr "&Свернуть в трей"
+msgstr "&Сворачивать в трей"
 
-#: resources.h:399
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Имя:"
 
-#: resources.h:503
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Мастер настройки сети..."
 
-#: resources.h:214
+#: resources.h:225
 msgid "&New"
 msgstr "&Новый"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Новый Сайт"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Доступна новая версия!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Дальше >"
 
-#: resources.h:318
+#: resources.h:329
 msgid "&No"
 msgstr "&Нет"
 
-#: resources.h:763 resources.h:788
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Ничего"
 
-#: resources.h:597
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Нормальный"
 
-#: resources.h:941
-msgid "&Number of days between update checks:"
-msgstr "&Число дней между проверками:"
-
-#: resources.h:145
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Числовое значение:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&ОК"
 
-#: resources.h:766
+#: resources.h:793
 msgid "&OPEN"
-msgstr "&ОТКРЫТЬ"
+msgstr "&OPEN"
 
-#: resources.h:561 resources.h:645
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Открыть"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Перезаписать"
 
-#: resources.h:101
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Пассивный"
 
-#: resources.h:124
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Пароль:"
 
-#: resources.h:605
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Проиграть звук"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Порт:"
 
-#: resources.h:860
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Позиция журнала сообщений:"
 
-#: resources.h:529
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Сохранять временные метки файлов"
 
-#: resources.h:300
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Задание"
 
-#: resources.h:718
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Быстрое соединение"
 
-#: resources.h:517
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Панель быстрого соединения"
 
-#: resources.h:134
+#: resources.h:144
 msgid "&Read"
 msgstr "&Чтение"
 
-#: resources.h:536
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "&Переподключиться"
 
-#: resources.h:508 resources.h:662
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Обновить"
 
-#: resources.h:125
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Запомнить пароль для этой сессии"
 
-#: resources.h:403 resources.h:409
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Запомнить пароли"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Удаленный каталог:"
 
-#: resources.h:367
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Удаленный путь:"
 
-#: resources.h:825
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Удалить"
 
-#: resources.h:783
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Удалить ключ"
 
-#: resources.h:592
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Удалить выбранное"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Переименовать"
 
-#: resources.h:200
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Переименовать..."
 
-#: resources.h:323
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Заново открыть локальный файл"
 
-#: resources.h:816
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Заменять недопустимые символы на:"
 
-#: resources.h:552
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Сообщить об ошибке..."
 
-#: resources.h:711
+#: resources.h:641
+msgid "&Reset and requeue all"
+msgstr "&Очистить выбранные и получить снова"
+
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Перезапустить мастер"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Докачать"
 
-#: resources.h:603
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Выполнить команду..."
 
-#: resources.h:725
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Запустить мастер настройки сейчас..."
 
-#: resources.h:943
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Проверить обновление..."
 
-#: resources.h:765
+#: resources.h:792
 msgid "&SITE"
-msgstr "&САЙТ"
+msgstr "&SITE"
 
-#: resources.h:790
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:199
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Сохранить как..."
 
-#: resources.h:431
+#: resources.h:442
 msgid "&Search"
 msgstr "&Искать"
 
-#: resources.h:538
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Поиск файлов на сервере..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Выберите запись:"
 
-#: resources.h:923
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Выбрать язык:"
 
-#: resources.h:355
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Выбрать колонки для отображения:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Сервер"
 
-#: resources.h:299
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Настройки"
 
-#: resources.h:505
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Настройки..."
 
-#: resources.h:958
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Показать меню отладки"
 
-#: resources.h:604
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Показать сообщение"
 
-#: resources.h:948
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Показывать время создания файлов в журнале сообщений"
 
-#: resources.h:490
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Менеджер Сайтов..."
 
-#: resources.h:397
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Индивидуальная закладка"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Пропустить"
 
-#: resources.h:532
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Ограничение скорости"
 
-#: resources.h:448
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&Начать передачу сейчас"
 
-#: resources.h:859
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Поменять панели местами"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS Шифрование"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Тест"
 
-#: resources.h:871
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Тема:"
 
-#: resources.h:522
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Передача"
 
-#: resources.h:98
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Режим передачи:"
 
-#: resources.h:521
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Окно задания"
 
-#: resources.h:828
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Файлы с точками как ASCII"
 
-#: resources.h:329
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Отменить правку"
 
-#: resources.h:194
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Обновить ключ в кэше для этого хоста"
 
-#: resources.h:555 resources.h:641
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Закачать на сервер"
 
-#: resources.h:266 resources.h:840
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
-msgstr "&Передачи:"
+msgstr "&Закачки:"
 
-#: resources.h:424
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Использовать программу по выбору"
 
-#: resources.h:93
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Использовать синхронизированный просмотр"
 
-#: resources.h:927
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Использовать системный редактор для текстовых файлов"
 
-#: resources.h:751
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "&Использовать следующий IP-адрес:"
 
-#: resources.h:759
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Использовать внешний IP-адрес сервера"
 
-#: resources.h:894
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "&Использовать разделитель тысяч"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Пользователь:"
 
-#: resources.h:714
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Имя пользователя"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Версия %s"
 
-#: resources.h:507
+#: resources.h:525
 msgid "&View"
 msgstr "&Вид"
 
-#: resources.h:578
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Просмотр/Правка"
 
-#: resources.h:933
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "&Следить за редактированием файлов и подсказывать о передаче изменений"
 
-#: resources.h:135
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "Проверяя наличие обновлений, проверять:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Запись"
 
-#: resources.h:317
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Да"
 
-#: ../../locales/../src/engine/local_path.cpp:444
-#: ../../locales/../src/engine/local_path.cpp:494
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "'%s' не существует либо недоступен"
 
-#: ../../locales/../src/engine/local_path.cpp:460
-#: ../../locales/../src/engine/local_path.cpp:481
-#: ../../locales/../src/engine/local_path.cpp:488
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
 msgstr "'%s' не каталог"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1057
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Вход с помощью учетной записи не поддерживается выбранным протоколом"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Типы входа 'Нормальный' и 'Учетная запись' недоступны, используйте 'Спросить "
+"пароль'."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Типы входа 'Нормальный' и 'Учетная запись' недоступны. Ваша запись будет "
+"изменена на 'Спросить пароль'."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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,138 +1052,136 @@
 msgstr[1] "(%d объекта отфильтровано)"
 msgstr[2] "(%d объектов отфильтрован)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 - без ограничения)"
 
-#: resources.h:731
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:760
 msgid "(0-999 seconds)"
-msgstr "(0-999 сек.)"
+msgstr "(0-999 секунд)"
 
-#: resources.h:798
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 - отключено)"
 
-#: resources.h:942
-msgid "(At least 7 days)"
-msgstr "(Минимум 7 дней)"
-
-#: resources.h:887
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(например: %H:%M)"
 
-#: resources.h:881
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(например: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(в %s/сек)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S осталось"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- осталось"
 
-#: resources.h:699
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:258
 msgid "- Broken router and/or firewall"
-msgstr "- Сбой роутера и/или брандмауэра"
+msgstr "- Сбой маршрутизатора и/или брандмауэра"
 
-#: resources.h:248
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Файл поврежден на зеркале"
 
-#: resources.h:246
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Malware в Вашей системе"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- осталось"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c нельзя использовать вместе с адресом FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l можно использовать только вместе с адресом FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s и -c не могут использоваться одновременно."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s нельзя использовать вместе с адресом FTP."
 
-#: resources.h:960
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Ничего"
 
-#: resources.h:961
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Предупреждения"
 
-#: resources.h:962
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Инфо"
 
-#: resources.h:963
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Подробности"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-битная система"
 
-#: resources.h:964
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Отладка"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-битная система"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Назад"
 
-#: resources.h:546
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
-msgstr "Закладка с таким именем уже существует. Пожалуйста, введите новое имя."
+msgstr ""
+"Закладка с таким именем уже существует. Пожалуйста, введите другое имя."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Необходимо указать редактор по умолчанию."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Каталог не может быть перенесен в один из своих подкаталогов."
 
-#: resources.h:671
+#: resources.h:698
 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 "
@@ -1189,29 +1191,29 @@
 "не настроены. В этом случае требуется активный режим. В этом режиме "
 "FileZilla открывает порт и просит сервер подключиться к нему."
 
-#: resources.h:305
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "Ранее открытый файл был изменен."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../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 "Файл с таким именем уже редактируется. Хотите заново открыть '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2078
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "Файл в таким именем уже передается."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Файл с таким именем все еще редактируется. Пожалуйста, закройте его и "
 "попробуйте снова."
 
-#: ../../locales/../src/interface/FileZilla.cpp:682
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1220,16 +1222,16 @@
 "No further warning will be displayed this session."
 msgstr ""
 "Локальное имя файла не может быть декодировано.\n"
-"Убедитесь, что значения переменных LC_CTYPE (или LC_ALL) установлены "
-"корректно.\n"
-"Если не устранить проблему, файлы могут быть не указаны в списке.\n"
-"Сообщение не будет более показываться в этой сессии."
+"Пожалуйста, убедитесь, что значения переменных среды LC_CTYPE (или LC_ALL) "
+"установлены корректно.\n"
+"Пока вы не устраните проблему, файлы могут быть не указаны в списке.\n"
+"Предупреждение не будет более показываться в этой сессии."
 
-#: resources.h:236
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Доступна новая версия FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1238,12 +1240,12 @@
 "файлы от пользователя. Воспользуйтесь данной настройкой, чтобы заставить "
 "сервер показывать все файлы."
 
-#: resources.h:743
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
 msgstr ""
-"Обычно сервер не требует этого. Свяжитесь с администратором если вам это "
+"Обычно сервер не требует этого. Свяжитесь с администратором, если вам это "
 "нужно."
 
 #: ../../locales/../src/interface/state.cpp:284
@@ -1255,71 +1257,75 @@
 "Выключить синхронизированный просмотр и продолжить изменение локального "
 "каталога?"
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:824
+#: resources.h:851
 msgid "A&dd"
 msgstr "Д&обавить"
 
-#: resources.h:851
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "Р&азрешить докачку ASCII файлов"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "П&рименить только к загрузкам с сервера"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "П&рименить только к загрузкам на сервер"
 
-#: resources.h:148
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "П&рименить ко всем файлам и каталогам"
 
-#: resources.h:388
+#: resources.h:648
+msgid "A&utomatically remove successful transfers"
+msgstr "&Автоматически очищать успешные загрузки"
+
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Установить соединение в текущей вкладке"
 
-#: resources.h:153
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "О FileZilla"
 
-#: resources.h:861
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Поверх списка файлов"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/manual_transfer.cpp:554
-#: ../../locales/../src/interface/sitemanager.cpp:1392
-#: ../../locales/../src/interface/sitemanager.cpp:1393
+#: ../../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:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Учетная запись"
 
-#: resources.h:600
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Действие после завершения &задания"
 
-#: resources.h:328
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Действие с выбранным файлом:"
 
-#: resources.h:322
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Выполнить действие:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Действие:"
 
@@ -1341,7 +1347,7 @@
 "address. In addition to that, your router has modified the sent address."
 msgstr ""
 "Тест активного режима не удался. FileZilla не знает правильный внешний IP-"
-"адрес. Кроме того, ваш роутер изменил отправленный адрес."
+"адрес. Кроме того, ваш маршрутизатор изменил отправленный адрес."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:580
 msgid ""
@@ -1350,25 +1356,25 @@
 "address."
 msgstr ""
 "Тест активного режима не удался. FileZilla знает правильный внешний IP-"
-"адрес, однако ваш роутер некорректно изменил отправленный адрес."
+"адрес, однако ваш маршрутизатор некорректно изменил отправленный адрес."
 
-#: resources.h:756
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP-адрес для активного режима"
 
-#: resources.h:449
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "&Добавить файлы только в задание"
 
-#: resources.h:625 resources.h:644
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Добавить выбранный каталог в задание"
 
-#: resources.h:558 resources.h:575
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Добавить выбранные файлы и каталоги в задание"
 
-#: resources.h:914 resources.h:920
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Добавить в задание"
 
@@ -1376,27 +1382,42 @@
 msgid "Address type not supported"
 msgstr "Этот тип адреса не поддерживается"
 
-#: resources.h:87
+#: resources.h:97
 msgid "Advanced"
 msgstr "Дополнительно"
 
-#: resources.h:233
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Дополнительные настройки:"
 
-#: resources.h:337
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Совет: Если вы не хотите тестировать новый функционал, пожалуйста, "
+"продолжайте использовать только стабильные версии. Бета-версии и ночные "
+"сборки являются разрабатываемыми версиями, предназначенными для "
+"тестирования. Ночные сборки FileZilla могут не работать как ожидается и "
+"могут даже повредить вашу систему. Используйте бета-версии и ночные сборки "
+"на свой страх и риск."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Алгоритм:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3047
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Все файлы успешно переданы"
 
-#: resources.h:700
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "Все порты должны находиться в диапазоне между 1024 и 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3043
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, 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."
@@ -1404,27 +1425,28 @@
 msgstr[1] "Все передачи завершены. %d файла не был передан."
 msgstr[2] "Все передачи завершены. %d файлов не был передан."
 
-#: resources.h:739
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Разрешить возврат к другому режиму при сбое"
 
-#: resources.h:675
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Разрешить возврат к другому режиму передачи при сбое"
 
-#: resources.h:475
+#: resources.h:486
 msgid "Already connected"
 msgstr "Соединение установлено"
 
-#: resources.h:784
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
-"В качестве альтернативы можно воспользоваться инструментом Pageant в "
-"программе PuTTY для назначения клавиш. FileZilla может работать с Pageant."
+"В качестве альтернативы, можно воспользоваться инструментом Pageant в "
+"программе PuTTY для управления вашими ключами. FileZilla может работать с "
+"Pageant."
 
-#: resources.h:785
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1432,99 +1454,117 @@
 "В качестве альтернативы можно воспользоваться системным SSH агентом. Для "
 "этого убедитесь, что выбрано значение переменной SSH&AUTH&SOCK."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
 "Можете посетить http://filezilla-project.org чтобы скачать последнюю версию."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2309
+#: ../../locales/../src/interface/QueueView.cpp:2042
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+"Ошибка при загрузке очереди передач из \"%s\".\n"
+"Часть передач не была восстановлена."
+
+#: ../../locales/../src/interface/QueueView.cpp:1941
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+"Ошибка при сохранении очереди передач в \"%s\".\n"
+"Часть передач не была сохранена."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "Объект с таким именем уже существует в целевом каталоге."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:552
-#: ../../locales/../src/interface/sitemanager.cpp:1391
-#: ../../locales/../src/interface/sitemanager.cpp:1633
+#: ../../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:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Анонимный"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 "Выполняется другая удалённая операция, невозможно сменить каталог сейчас."
 
-#: ../../locales/../src/interface/sitemanager.cpp:885
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Любые изменения в Менеджере Сайтов не будут сохранены."
 
-#: ../../locales/../src/interface/sitemanager.cpp:732
+#: ../../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 ""
-"Любые изменения, внесенные в Менеджер Сайтов, не будут сохранены, если вы "
+"Любые изменения, внесенные в Менеджер Сайтов, не будут сохранены, если вы не "
 "восстановите файл."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Любые изменения в фильтрах не будут сохранены."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Любые изменения в фильтрах не будут сохранены."
 
-#: resources.h:150
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "При&менить только к каталогам"
 
-#: resources.h:212
+#: resources.h:223
 msgid "Apply"
 msgstr "Применить"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Применить только к &текущему заданию"
 
-#: resources.h:149
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Применить только к &файлам"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Архив"
 
-#: resources.h:863
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "В виде закладки в панели заданий"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Спросить о действии"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Запросить пароль"
 
-#: resources.h:696
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Запросить порт в операционной системе."
 
-#: resources.h:686
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Запросить внешний IP-адрес в операционной системе"
 
-#: resources.h:470
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Задать вопрос на FileZilla форуме"
 
@@ -1532,182 +1572,182 @@
 msgid "Associated program not found:"
 msgstr "Не найдена ассоциированная программа:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:647
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Как минимум один фильтр незавершен"
 
-#: resources.h:705
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Вся необходимая информация была собрана."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Сбой аутентификации."
 
-#: resources.h:872
+#: resources.h:901
 msgid "Author:"
 msgstr "Автор:"
 
-#: resources.h:385
+#: resources.h:396
 msgid "Auto"
 msgstr "Авто"
 
-#: resources.h:822
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Автоматическая классификация типа файла"
 
-#: resources.h:939
-msgid "Automatic update check"
-msgstr "Автопроверка обновлений"
-
-#: resources.h:876
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Доступные размеры"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Символ для байта. Переводится только первое письмо>"
 
-#: resources.h:89
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "О&бход прокси"
 
-#: resources.h:466
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Основные инструкции по применению"
 
-#: resources.h:865
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Состояние"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Редактируется"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:635
+msgid "Benchmark string coalescer"
+msgstr "Бенчмарк объединителя строк"
+
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Внимание! Сертификат был отозван"
 
-#: resources.h:389
+#: resources.h:400
 msgid "Binary"
 msgstr "Двоичный"
 
-#: resources.h:858
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Доска объявлений"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:309
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Закладка"
 
-#: resources.h:412
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Закладка:"
 
-#: resources.h:411
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Закладки"
 
-#: resources.h:161
+#: resources.h:171
 msgid "Build date:"
 msgstr "Дата сборки:"
 
-#: resources.h:158
+#: resources.h:168
 msgid "Build information"
 msgstr "Информация о сборке"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Вид деятельности:"
 
-#: resources.h:746
+#: resources.h:773
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
 "По умолчанию используется любой доступный локальный порт для передачи в "
-"активном режиме. Если вы хотите использовать порты из меньшего диапазона, то "
-"укажите диапазон ниже."
+"активном режиме. Если вы хотите ограничить FileZilla использованием только "
+"небольшого диапазона портов, пожалуйста, введите диапазон портов ниже."
 
-#: resources.h:535
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "О&тменить текущую операцию"
 
-#: resources.h:235
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "П&роверить наличие 'ночных' сборок FileZilla"
 
-#: resources.h:611
+#: resources.h:632
 msgid "C&lear all"
 msgstr "О&чистить все"
 
-#: resources.h:586 resources.h:632
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Копировать адрес в буфер обмена"
 
-#: resources.h:880
+#: resources.h:909
 msgid "C&ustom"
 msgstr "Произвольный"
 
-#: resources.h:935
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "Произвольные ассоциации файлов:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Подсчет разницы между часовыми поясами..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:736
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Невозможно прочитать данные из файла!"
 
-#: ../../locales/../src/engine/transfersocket.cpp:715
-#: ../../locales/../src/engine/transfersocket.cpp:789
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Невозможно записать данные в файл!"
 
-#: ../../locales/../src/engine/transfersocket.cpp:713
-#: ../../locales/../src/engine/transfersocket.cpp:787
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Невозможно записать данные в файл: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Отмена"
 
-#: resources.h:982
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Отменить текущую операцию"
 
-#: resources.h:983
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Отменить текущую операцию"
 
-#: ../../locales/../src/engine/local_path.cpp:454
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Нет доступа к '%s', нет данных, либо диск не готов."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Невозможно добавить сервер в Менеджер Сайтов"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1723,30 +1763,30 @@
 "Невозможно сравнить каталоги, заданы разные фильтры для локальных и "
 "удаленных каталогов"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2763
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Невозможно сравнить каталоги: нет подключения к серверу."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Невозможно создать новый фильтр"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2060
-#: ../../locales/../src/interface/LocalListView.cpp:2191
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Невозможно редактировать файл"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1976
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "Невозможно редактировать файл: нет подключения к серверу."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1987
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Невозможно редактировать файл: неизвестен удаленный путь."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1754,8 +1794,8 @@
 "Невозможно установить FTP соединение на SFTP сервер. Пожалуйста, выберите "
 "правильный протокол."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Невозможно загрузить панель быстрого соединения из файла ресурсов"
 
@@ -1767,104 +1807,108 @@
 msgid "Cannot load keyfile"
 msgstr "Невозможно загрузить файл с ключем"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Невозможно загрузить панель инструментов из файла ресурсов"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1285
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Не запоминать пароль"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Невозможно переименовать запись"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Невозможно переименовать файл"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Невозможно сохранить фильтры"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Невозможно выбрать фильтр"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Невозможно ассоциировать файл"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
-msgstr "Невозможно отобразить диалогое окно"
+msgstr "Невозможно отобразить диалоговое окно"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2078
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Невозможно просмотреть/редактировать выделенный файл"
 
-#: resources.h:282
+#: resources.h:293
 msgid "Categories"
 msgstr "Категории"
 
-#: ../../locales/../src/interface/statusbar.cpp:530
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
 msgstr "Сертификаты и информация по сессии еще не доступны."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Информация о сертификате"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Информация о сертификате:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Сертификат выдан"
 
-#: resources.h:122
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Попытка:"
 
-#: resources.h:131
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Изменить атрибуты файла"
 
-#: resources.h:589 resources.h:635
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Изменить права для файлов."
 
-#: resources.h:956
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Требуется перезагрузка FileZilla для изменения настроек лог-файла."
 
-#: ../../locales/../src/interface/FileZilla.cpp:682
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Проблема кодирования символов"
 
-#: resources.h:104
+#: resources.h:114
 msgid "Charset"
 msgstr "Кодировка"
 
-#: resources.h:944
-msgid "Check for &beta versions and release candidates"
-msgstr "&Проверить бета-версии и релиз-кандидаты"
-
-#: resources.h:548
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Проверить &обновления..."
 
-#: resources.h:549
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Автоматически проверять &обновления FileZilla:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Проверить наличие новой версии FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Проверить обновления"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1750
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Не удалось проверить обновления"
 
@@ -1872,21 +1916,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Проверка корректного внешнего IP"
 
-#: resources.h:231
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Проверка наличия обновлений"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Не совпадает контрольная сумма загруженного файла."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1563
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Выбрать локальный каталог по умолчанию"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2715
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Выбрать локальный каталог"
 
@@ -1894,43 +1938,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Часть данных неправильно удалена"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Шифр:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Зак&рыть вкладку"
 
-#: resources.h:855
+#: resources.h:882
 msgid "Classic"
 msgstr "Классический"
 
-#: resources.h:285
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Очистить &записи Менеджера Сайтов"
 
-#: resources.h:612
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Очистить &кэш раскладки"
 
-#: resources.h:283
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Очистить &историю быстрого соединения"
 
-#: resources.h:284
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Очистить &информацию о подключениях"
 
-#: resources.h:286
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Очистить &задание"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Очистить историю"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1938,56 +1982,60 @@
 msgid "Clear private data"
 msgstr "Стереть личные данные"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Очистить строку соединения"
 
+#: resources.h:634
+msgid "Clear string coalescer"
+msgstr "Очистить объединитель строк"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Нажмите 'Завершить' для сохранения конфигурации."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Нажмите 'Далее' чтобы скачать новую версию."
 
-#: resources.h:346
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "MAC-адрес клиент-сервер:"
 
-#: resources.h:344
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Шифр клиент-сервер:"
 
-#: resources.h:661
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Закрыть &все прочие вкладки"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Закрыть FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Закрыть все запущенные копии FileZilla"
 
-#: resources.h:496
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Закрыть рекущую вкладку"
 
-#: resources.h:86
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Ко&мментарии:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr "Свойства колонки"
 
-#: resources.h:353
+#: resources.h:364
 msgid "Column setup"
 msgstr "Настройка колонки"
 
-#: resources.h:930
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "Команда и ее аргументы должны быть заключены в кавычки."
 
@@ -2006,9 +2054,9 @@
 msgstr "Команда не поддерживается этим протоколом"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Команда:"
 
@@ -2016,85 +2064,85 @@
 msgid "Comment"
 msgstr "Комментарии"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Общее название:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:426
 #: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
-msgstr "Соединение испорчено роутером или брандмауэром"
+msgstr "Соединение испорчено маршрутизатором или брандмауэром"
 
-#: resources.h:513 resources.h:639
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Сравнить время модификации"
 
-#: resources.h:512 resources.h:638
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Сравнить размеры файлов"
 
-#: resources.h:910
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
-msgstr "Временной интервал сравнения (в мин.):"
+msgstr "Временной интервал сравнения (в минутах):"
 
 #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Временной интервал сравнения должен быть между 0 и 1440 мин."
 
-#: resources.h:159
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Скомпилировано для:"
 
-#: resources.h:160
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Скомпилировано:"
 
-#: resources.h:162
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Скомпилировано:"
 
-#: resources.h:163
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Флаги компилятора:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Сжат"
 
-#: resources.h:796
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Число одновременных передач"
 
-#: resources.h:223 resources.h:437
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Условия чувствительны к р&егистру"
 
-#: resources.h:704
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Тест конфигурации"
 
-#: resources.h:678
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Настройка пассивного режима"
 
-#: resources.h:694
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Настройка диапазона портов"
 
-#: resources.h:467
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Настройка FileZilla и вашей сети"
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Подтвердите удаление"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2031
-#: ../../locales/../src/interface/LocalListView.cpp:2151
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Необходимо подтверждение"
 
@@ -2102,15 +2150,15 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Поздравляем, ваша конфигурация работает."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Подключиться в обход настроек прокси"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr "Подключиться к серверу из Менеджера Сайтов"
+msgstr "Подключиться к сайту указанному в Менеджере Сайтов"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Соединение установлено"
 
@@ -2119,25 +2167,25 @@
 msgstr "Соединение"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Соединяюсь с %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Соединяюсь с %s через прокси"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Соединяюсь с %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Соединение с сервером"
 
@@ -2145,17 +2193,17 @@
 msgid "Connection"
 msgstr "Соединение"
 
-#: ../../locales/../src/interface/QueueView.cpp:1055
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Не удалось установить соединение"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "Не удалось установить соединение с \"%s\", использую другой адрес."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Не удалось установить соединение с \"%s\"."
@@ -2169,12 +2217,12 @@
 msgid "Connection closed"
 msgstr "Соединение закрыто"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Соединение закрыто сервером"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Соединение установлено, инициализация TLS..."
@@ -2183,7 +2231,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Соединение установлено, отправка HTTP запроса"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Соединение установлено, ожидание приглашения..."
 
@@ -2199,15 +2247,15 @@
 msgid "Connection refused"
 msgstr "Отказано в соединении"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Превышено время ожидания соединения"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Превышено время ожидания соединения."
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Соединение с сервером потеряно."
 
@@ -2227,46 +2275,46 @@
 msgid "Convert keyfile"
 msgstr "Конвертировать файл с ключем"
 
-#: resources.h:77 resources.h:416
-msgid "Cop&y"
-msgstr "Коп&ировать"
-
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1863
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Копировать (%d) из %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1840
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Копировать из %s"
 
-#: resources.h:587 resources.h:633
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "Скопировать ссылки выбранных элементов в буфер обмена."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
-msgstr "Не могу принять подключение: %s"
+msgstr "Невозможно принять подключение: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "Не удалось добавить соединение в Менеджер Сайтов"
+msgstr "Невозможно добавить соединение в Менеджер Сайтов"
+
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Невозможно завершить операцию"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Невозможно подключиться к серверу"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Невозможно подключиться к серверу: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Невозможно преобразовать команду в кодировку сервера"
 
@@ -2275,17 +2323,17 @@
 msgid "Could not convert private key"
 msgstr "Невозможно преобразовать секретный ключ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3064
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Невозможно скопировать адреса"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Невозможно скопировать данные"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2295,26 +2343,26 @@
 "Либо расширение не установлено должным образом, либо вы не перетащили файлы "
 "в окно проводника."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Невозможно установить соединение с сервером"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"Не могу найти файлы ресурсов FileZilla, закрываю программу.\n"
+"Невозможно найти файлы ресурсов FileZilla, закрываю программу.\n"
 "Установите каталог данных FileZilla, используя параметр командной строки '--"
-"datadir <путь_к_каталогу>', либо установите переменную FZ_DATADIR"
+"datadir <путь_к_каталогу>', либо установите переменную среды FZ_DATADIR"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Невозможно сгенерировать произвольный логин."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2322,31 +2370,31 @@
 "Невозможно получить имя издателя сертификата, ошибка в "
 "gnutls_x509_get_issuer_dn"
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 "Невозможно получить имя субъекта сертификата, ошибка в gnutls_x509_get_dn"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 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:170
 msgid "Could not get reply from fzputtygen."
 msgstr "Невозможно получить ответ от fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
-msgstr "Отсутствует временный каталог для закачки файла."
+msgstr "Невозможно получить временный каталог для закачки файла."
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "Невозможно импортировать сертификаты, ошибка в gnutls_x509_crt_import"
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2362,9 +2410,9 @@
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Не могу загрузить \"%s\", пожалуйста, проверьте правильность и доступность "
-"файла.\n"
-"Изменения в Менеджере Сайтов не сохранятся."
+"Невозможно загрузить \"%s\", пожалуйста, убедитесь, что файл правильный и "
+"может быть доступен.\n"
+"Любые изменения, сделанные в Менеджере Сайтов, не будут сохранены."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
@@ -2374,7 +2422,7 @@
 msgid "Could not load private key"
 msgstr "Невозможно загрузить секретный ключ"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2385,7 +2433,7 @@
 "Выключить синхронизированный просмотр и продолжить изменение удалённого "
 "каталога?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2405,9 +2453,9 @@
 "Нет доступа к удалённому каталогу, соответствующему локальному '%s'.\n"
 "Синхронизированный просмотр был отключен."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3064
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Невозможно открыть буфер обмена"
 
@@ -2418,96 +2466,97 @@
 msgid "Could not open log file: %s"
 msgstr "Невозможно открыть лог-файл: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
 msgstr "Невозможно разобрать удаленный путь."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Невозможно разобрать адрес сервера:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Невозможно получить данные с сокета: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2634
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
-msgstr "Не удалось прочитать данные на сервере."
+msgstr "Невозможно прочитать данные на сервере."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
-msgstr "Не могу найти положение %s в файле"
+msgstr "Невозможно найти положение %s в файле"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
-msgstr "Не могу найти конец файла"
+msgstr "Невозможно найти конец файла"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
 msgstr "Невозможно послать команду на fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
-msgstr "Не могу загрузить I/O процесс!"
+msgstr "Невозможно создать IO поток"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Невозможно подтвердить установление связи с прокси: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1106
-#: ../../locales/../src/interface/QueueView.cpp:1111
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Невозможно начать передачу"
 
-#: ../../locales/../src/interface/sitemanager.cpp:909
-#: ../../locales/../src/interface/sitemanager.cpp:2931
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
-msgstr "Не могу записать \"%s\", изменения в Менеджере Сайтов не сохранены: %s"
+msgstr ""
+"Невозможно записать \"%s\", любые изменения в Менеджере Сайтов не будут "
+"сохранены: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "Невозможно записать \"%s\", закладка не была добавлена: %s"
+msgstr "Невозможно записать \"%s\", закладка не может быть добавлена: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr "Невозможно записать \"%s\", общая закладка не была сохранена: %s"
+msgstr "Невозможно записать \"%s\", общая закладка не может быть сохранена: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1947
-#: ../../locales/../src/interface/QueueView.cpp:1983
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, 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:2696
-#: ../../locales/../src/interface/sitemanager.cpp:3058
-#: ../../locales/../src/interface/sitemanager.cpp:3120
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Невозможно записать \"%s\", нельзя экспортировать выбранные сайты: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr "Не могу записать \"%s\": %s"
+msgstr "Невозможно записать \"%s\": %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
 msgstr "Невозможно записать секретный ключ: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Невозможно записать данные в локальный файл"
 
@@ -2515,41 +2564,53 @@
 #: ../../locales/../src/engine/logging.cpp:386
 #, c-format
 msgid "Could not write to log file: %s"
-msgstr "Не удалось записать данные в лог-файл: %s"
+msgstr "Невозможно записать данные в лог-файл: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
-msgstr "Не могу записать данные в сокет: %s"
+msgstr "Невозможно записать данные в сокет: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Страна:"
 
-#: resources.h:614
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Приводит FileZilla к сбою. Используется только в целях отладки обработчика "
 "исключений."
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "Созда&ть новый файл"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Создать подкаталог в текущем каталоге"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1185
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Создать новый, пустой файл в текущем каталоге"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Создать каталог"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Создать пустой файл"
+
 #: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Создание каталога"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Создание каталога '%s'..."
@@ -2567,70 +2628,78 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "Критическая ошибка после передачи %s в %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"Текущий удалённый каталог '%s' находится выше корневой папки синхронизации (%"
-"s).\n"
+"Текущий удалённый каталог (%s) находится не ниже корневого каталога "
+"синхронизации (%s).\n"
 "Синхронизированный просмотр был выключен."
 
-#: ../../locales/../src/interface/statusbar.cpp:422
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
 msgstr "Выбран ASCII тип передачи."
 
-#: ../../locales/../src/interface/statusbar.cpp:432
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr "Выбрано автоопределение типа передачи."
 
-#: ../../locales/../src/interface/statusbar.cpp:427
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr "Выбран бинарный тип передачи."
 
-#: resources.h:767 resources.h:886
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "Произвольный"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Пользовательский набор фильтров"
 
-#: resources.h:375 resources.h:376
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Сервер, выбранный пользователем"
 
-#: resources.h:384
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Т&ип данных"
 
-#: resources.h:893
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Десятичные префиксы в системе СИ (напр., 1 КБ = 1000 байт)"
 
-#: resources.h:99
+#: resources.h:109
 msgid "D&efault"
 msgstr "П&о умолчанию"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "У&далить"
 
-#: resources.h:204
+#: resources.h:215
 msgid "D&isable all"
 msgstr "З&апретить все"
 
-#: resources.h:917
+#: resources.h:893
+msgid "D&o not save passwords"
+msgstr "Н&е сохранять пароли"
+
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Д&ействие по двойному клику на каталогах:"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "Д&ублировать"
+
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "В виде DOS с виртуальными путями"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2065
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Опасные типы файлов"
 
@@ -2638,16 +2707,16 @@
 msgid "Data"
 msgstr "Данные"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Сокет данных закрыт слишком рано."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Дата"
 
-#: resources.h:877
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Формат даты"
 
@@ -2655,10 +2724,10 @@
 msgid "Date/time format"
 msgstr "Формат даты/времени"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Неизвестные дата/время"
 
@@ -2666,31 +2735,31 @@
 msgid "Debug"
 msgstr "Отладка"
 
-#: resources.h:957
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Настройки отладки"
 
-#: resources.h:90
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Локальный &каталог по умолчанию:"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
 msgstr "По умолчанию (автоопределение)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Неверно выбран редактор по умолчанию."
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Действие по умолчанию, если файл существует"
 
-#: resources.h:92
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "У&даленный каталог по умолчанию:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1156
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2702,24 +2771,24 @@
 msgid "Default system language"
 msgstr "Системный язык по умолчанию"
 
-#: resources.h:672
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Режим передачи по умолчанию:"
 
-#: resources.h:818
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Тип передачи по умолчанию:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "По умолчанию: http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
-msgstr "Пауза между повторными соединениями должна быть от 1 до 999 сек."
+msgstr "Пауза между повторными соединениями должна быть от 1 до 999 секунд."
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2731,57 +2800,57 @@
 msgstr[1] "Ожидание подключения в %d секунды после неудачной попытки..."
 msgstr[2] "Ожидание подключения в %d секунд после неудачной попытки..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1318
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Удалить запись из Менеджера Сайтов"
 
-#: resources.h:629 resources.h:650
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Удалить выбранный каталог"
 
-#: resources.h:569 resources.h:583
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Удалить выбранные файлы и каталоги"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Удаление каталогов"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Удаление нескольких несвязанных каталогов пока не поддерживается."
 
-#: resources.h:452
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Удаление символьной ссылки"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1055
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Рабочий стол"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Детали"
 
-#: resources.h:188
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Детали нового ключа:"
 
-#: resources.h:226
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Ката&логи"
 
-#: ../../locales/../src/interface/queue.cpp:1192
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Направление"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Каталог"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2320
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Сравнение каталогов"
 
@@ -2799,11 +2868,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Построение списка каталогов прервано пользователем"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Не удалось построить список каталогов"
 
-#: resources.h:197
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Фильтры построения списка каталогов"
 
@@ -2811,18 +2880,18 @@
 msgid "Directory listing successful"
 msgstr "Список каталогов извлечен"
 
-#: resources.h:207
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Запр&етить все"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 "Выключить синхронизированный просмотр и продолжить изменение удалённого "
 "каталога?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2830,50 +2899,49 @@
 "Отключите эту настройку, если содержимое каталогов будет отображаться "
 "некорректно."
 
-#: resources.h:984
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Отключиться от сервера"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1053
-#: ../../locales/../src/interface/QueueView.cpp:1097
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Отключен от сервера"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Отключен от сервера: %s"
 
 #: ../../locales/../src/interface/QueueView.cpp:1412
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Отключаюсь от предыдущего сервера"
 
-#: resources.h:985
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Отключиться от просматриваемого сервера"
 
-#: resources.h:554
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Показать окно 'О программе'"
 
-#: resources.h:926
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "Не &использовать редактор по умолчанию"
 
-#: resources.h:608
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Ничего &не делать"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2882,21 +2950,21 @@
 "Пользуйтесь стабильными версиями если только не хотите опробовать новые "
 "возможности."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 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 "Уверены, что хотите очистить Менеджер Сайтов?"
+msgstr "Уверены, что хотите удалить все записи Менеджера Сайтов?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1320
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Уверены, что хотите удалить выбранный пункт?"
 
@@ -2904,144 +2972,151 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Уверены, что хотите удалить задание?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Уверены, что хотите отправить '%s' на сервер?"
 
-#: resources.h:465
+#: resources.h:476
 msgid "Documentation"
 msgstr "Документация"
 
-#: resources.h:693
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Не использовать внешний IP-адрес при &локальных соединениях"
 
-#: resources.h:829
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
-"Файлы с точками это когда имя файла начинается с точки, напр. .htaccess"
+"Файлы с точками, это имена файлов, начинающиеся с точки, например .htaccess"
 
-#: resources.h:911
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Действие по двойному клику"
 
-#: resources.h:361
+#: resources.h:372
 msgid "Download"
 msgstr "Загрузить"
 
-#: resources.h:481 resources.h:805
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Ограничение &скачивания:"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
+#: ../../locales/../src/interface/statusbar.cpp:604
 #, c-format
 msgid "Download limit: %s/s"
 msgstr "Ограничение скачивания: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
+#: ../../locales/../src/interface/statusbar.cpp:606
 msgid "Download limit: none"
 msgstr "Ограничение скачивания: нет"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Скачать результаты поиска"
 
-#: resources.h:623
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Скачать выбранный каталог"
 
-#: resources.h:573
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Скачать выбранные файлы и каталоги"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Скорость скачивания: %s/s\n"
+"Скорость загрузки: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Скачиваю"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Скачиваю %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "Загрузка нескольких несвязанных каталогов пока не поддерживается."
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Скачиваю результаты поиска"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr "Перетаскивание между запущенными копиями FileZilla не было выполнено."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Перетаскивание между различными серверами не было выполнено."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Дублировать имя фильтра"
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Д&ублировать"
 
-#: resources.h:203
+#: resources.h:214
 msgid "E&nable all"
 msgstr "Р&азрешить все"
 
-#: resources.h:559 resources.h:576
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "&Войти в каталог"
 
-#: resources.h:140
+#: resources.h:150
 msgid "E&xecute"
 msgstr "В&ыполнить"
 
-#: resources.h:500
+#: resources.h:518
 msgid "E&xit"
 msgstr "В&ыход"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-Mail:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:629
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Каждый фильтр должен содержать не менее одного условия."
 
-#: resources.h:229
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Править фильтры"
 
-#: resources.h:564
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Редактировать файл выбранным редактором и загрузить изменения на сервер."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1976
-#: ../../locales/../src/interface/LocalListView.cpp:1987
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Не удалось отредактировать"
 
-#: resources.h:874
+#: resources.h:903
 msgid "Email:"
 msgstr "Email:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2227
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Пустая команда"
 
@@ -3049,7 +3124,7 @@
 msgid "Empty command."
 msgstr "Пустая команда."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Пустой список каталогов"
 
@@ -3061,101 +3136,114 @@
 msgid "Empty file extension."
 msgstr "Пустое расширение файла."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Заполните имя фильтра!"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Пустое имя"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Пустая строка в кавычках."
 
-#: resources.h:206
+#: resources.h:217
 msgid "En&able all"
 msgstr "Вк&лючить все"
 
-#: resources.h:814
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Разрешить &фильтрацию недопустимых символов"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Зашифровано"
 
-#: resources.h:343
+#: resources.h:354
 msgid "Encryption"
 msgstr "Шифрование"
 
-#: resources.h:335
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Параметры шифра"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Закончить сравнение и изменить порядок сортировки?"
 
-#: resources.h:540
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Ввести &команду..."
 
-#: resources.h:485
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Введите 0 для отключения ограничения."
 
-#: ../../locales/../src/interface/QueueView.cpp:2216
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Введите команду"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Введите произвольную команду"
 
-#: resources.h:918
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Войти в каталог"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Введите имя фильтра"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Введите имя набора фильтров"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Введите новое название набора фильтров"
 
-#: resources.h:115
+#: resources.h:125
 msgid "Enter password"
 msgstr "Введите пароль"
 
-#: resources.h:560 resources.h:577
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Войти в выбранный каталог"
 
-#: resources.h:713
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Введите адрес сервера.\n"
 "Для указания серверного протокола, введите перед адресом идентификатор "
-"протокола. По умолчанию используется FTP протокол (ftp://).\n"
-"Можно также вводить сюда полные URL типа protocol://user:pass@host:port при "
-"этом другие поля будут перезаписаны."
+"протокола. Если протокол не указан, будет использован FTP протокол "
+"(ftp://).\n"
+"Также вы можете вводить сюда полные URL в формате protocol://user:pass@host:"
+"port, при этом значения в других полях будут перезаписаны.\n"
+"\n"
+"Поддерживаемые протоколы:\n"
+"- ftp:// для нормального FTP\n"
+"- sftp:// для SSH протокола передачи\n"
+"- ftps:// для FTP через SSL (неявным)\n"
+"- ftpes:// для FTP через SSL (явным)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3164,9 +3252,10 @@
 "Please note that the converted file will not be password protected."
 msgstr ""
 "Введите пароль для файла '%s'.\n"
-"Обратите внимание, что преобразованный файл будет без пароля."
+"Пожалуйста, обратите внимание, что преобразованный файл не будет защищен "
+"паролем."
 
-#: resources.h:717
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3188,134 +3277,160 @@
 msgid "Error importing"
 msgstr "Ошибка импорта"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/QueueView.cpp:2043
+msgid "Error loading queue"
+msgstr "Ошибка загрузки очереди"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1034
 #: ../../locales/../src/interface/import.cpp:120
 #: ../../locales/../src/interface/import.cpp:311
-#: ../../locales/../src/interface/Options.cpp:212
-#: ../../locales/../src/interface/QueueView.cpp:1937
-#: ../../locales/../src/interface/QueueView.cpp:1964
-#: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:733
-#: ../../locales/../src/interface/sitemanager.cpp:886
-#: ../../locales/../src/interface/sitemanager.cpp:2097
-#: ../../locales/../src/interface/sitemanager.cpp:2595
-#: ../../locales/../src/interface/sitemanager.cpp:2771
-#: ../../locales/../src/interface/sitemanager.cpp:2877
-#: ../../locales/../src/interface/sitemanager.cpp:2997
-#: ../../locales/../src/interface/sitemanager.cpp:3084
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Ошибка загрузки файла xml"
 
+#: ../../locales/../src/interface/QueueView.cpp:1942
+msgid "Error saving queue"
+msgstr "Ошибка сохранения очереди"
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr "Ошибка запуска программы"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1948
-#: ../../locales/../src/interface/QueueView.cpp:1984
-#: ../../locales/../src/interface/sitemanager.cpp:910
-#: ../../locales/../src/interface/sitemanager.cpp:2697
-#: ../../locales/../src/interface/sitemanager.cpp:2932
-#: ../../locales/../src/interface/sitemanager.cpp:3059
-#: ../../locales/../src/interface/sitemanager.cpp:3121
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Ошибка записи файла xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Ошибка, имя файла не распознано."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Ошибка, локальный файл существует и не может быть удален."
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Ошибка:"
 
-#: resources.h:477
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Установить соединение на новой вкладке"
 
-#: resources.h:937
+#: resources.h:972
+msgid "Every month"
+msgstr "Каждый месяц"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Каждые две недели"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Пример: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:896
+#: resources.h:925
 msgid "Examples"
 msgstr "Примеры"
 
-#: resources.h:144
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Вып&олнить"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Исполняемый"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1750
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
-"Исполняемый файл не содержит указания версии. Не могу проверить обновление!"
+"Исполняемый файл не содержит указания версии, невозможно проверить "
+"обновление."
 
-#: resources.h:856
+#: resources.h:883
 msgid "Explorer"
 msgstr "Проводник"
 
-#: resources.h:293
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Экспорт &задания"
 
-#: resources.h:292
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Экспорт настроек"
 
-#: resources.h:289
+#: resources.h:300
 msgid "Export settings"
 msgstr "Экспорт настроек"
 
-#: resources.h:218
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "И&мя фильтра:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1631
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:197
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr "FTP - Протокол передачи файлов"
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr "FTP - Протокол передачи файлов с опциональным шифрованием"
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr "FTP - Небезопасный протокол передачи файлов"
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
-msgstr "Движок FTP не инициализирован, не могу соединиться!"
+msgstr "Движок FTP не инициализирован, невозможно соединиться"
 
-#: resources.h:741
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Поддержка FTP соединения"
 
-#: resources.h:761
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP прокси"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP адрес"
 
-#: resources.h:669
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3323,151 +3438,155 @@
 "FTP использует вторичные соединения для передачи. Эти соединения могут быть "
 "установлены двумя путями:"
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr "FTPES - FTP через явный TLS/SSL"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP через неявный TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:615
-#: ../../locales/../src/interface/LocalListView.cpp:2272
-#: ../../locales/../src/interface/LocalTreeView.cpp:913
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../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
 msgid "Failed to change directory"
-msgstr "Не могу сменить каталог!"
+msgstr "Не удалось изменить каталог"
 
-#: ../../locales/../src/interface/FileZilla.cpp:260
-#: ../../locales/../src/interface/FileZilla.cpp:268
-#: ../../locales/../src/interface/FileZilla.cpp:270
+#: ../../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
 msgid "Failed to change language"
-msgstr "Не могу изменить язык!"
+msgstr "Не удалось изменить язык"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
-msgstr "Не могу проверить новую версию FileZilla!"
+msgstr "Не удалось проверить новую версию FileZilla."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2309
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Не удалось скопировать или переместить сайты"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:511
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
-msgstr "Не могу создать резервную копию файла xml!"
+msgstr "Не удалось создать резервную копию файла xml"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
-msgstr "Не могу создать сокет прослушивания, действие отменено!"
+msgstr "Не удалось создать сокет прослушивания, действие отменено"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "Не могу создать сокет прослушивания для активного режима!"
+msgstr "Не удалось создать сокет прослушивания для активного режима передачи"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
-msgstr "Не могу загрузить новую версию FileZilla!"
+msgstr "Не удалось загрузить новую версию FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:667
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
-msgstr "Не могу получить путь к каталогу 'Мои документы'"
+msgstr "Не удалось получить путь к каталогу 'Мои документы'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:653
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Не удалось получить путь к 'Рабочему столу'"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr ""
 "Не удалось получить peer-адрес контрольного соединения, соединение закрыто!"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr ""
 "Не удалось получить peer-адрес соединения передачи данных, соединение "
 "закрыто!"
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
-msgstr "Не могу инициализировать движок FTP!"
+msgstr "Не удалось инициализировать движок FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
-msgstr "Не могу инициализировать TLS!"
+msgstr "Не удалось инициализировать TLS."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
-msgstr "Не могу загрузить панели, проверьте правильность ресурсов!"
+msgstr "Не удалось загрузить панели, неправильные файлы ресурсов?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
 msgstr "Не удалось загрузить секретный ключ: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr "Невозможно открыть \"%s\" для добавления/записи"
+msgstr "Не удалось открыть \"%s\" для добавления/записи"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "Не могу открыть \"%s\" для чтения!"
+msgstr "Не удалось открыть \"%s\" для чтения"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "Не могу открыть \"%s\" для записи!"
+msgstr "Не удалось открыть \"%s\" для записи"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:418
+msgid "Failed to parse returned path."
+msgstr "Не удалось разобрать возвращенный путь."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr "Ошибка при разборе корневого сертификата"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
-msgstr "Не могу получить данные!"
+msgstr "Не удалось получить данные"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
-msgstr "Не могу получить список каталогов!"
+msgstr "Не удалось получить список каталогов"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "Не могу получить внешний IP-адрес, действие отменено!"
+msgstr "Не удалось получить внешний IP-адрес, действие отменено"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
-msgstr "Не могу получить внешний IP-адрес, использую локальный!"
+msgstr "Не удалось получить внешний IP-адрес, используется локальный"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
-msgstr "Не могу получить локальный IP-адрес!"
+msgstr "Не удалось получить локальный IP-адрес."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "Не могу получить локальный IP-адрес, действие отменено!"
+msgstr "Не удалось получить локальный IP-адрес, действие отменено"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
-msgstr "Не могу получить внешний IP-адрес!"
+msgstr "Не удалось получить внешний IP-адрес."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
-msgstr "Не могу отправить команду!"
+msgstr "Не удалось отправить команду."
 
-#: ../../locales/../src/interface/FileZilla.cpp:268
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "Не удалось установить %s (%s) язык, использую системный по умолчанию"
 
-#: ../../locales/../src/interface/FileZilla.cpp:253
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3475,64 +3594,62 @@
 "Не удалось установить %s (%s) язык, использую системный по умолчанию (%s, %"
 "s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:241
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "Не удалось установить %s (%s) язык, использую системный по умолчанию"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
-msgstr "Не могу установить %s язык, использую системный по умолчанию"
+msgstr "Не удалось установить %s язык, использую системный по умолчанию"
 
-#: ../../locales/../src/interface/FileZilla.cpp:249
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Не удалось установить %s язык, использую системный по умолчанию (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:238
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Не удалось установить %s язык, использую системный по умолчанию"
 
 #: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
-msgstr "Не могу установить правильность настроек!"
+msgstr "Не удалось проверить настройки"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
-msgstr "Не могу проверить сертификат"
+msgstr "Не удалось проверить сертификат"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
-msgstr "Не могу записать в файл %s"
+msgstr "Не удалось записать в файл %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:529
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
-msgstr "Не могу записать в файл xml!"
+msgstr "Не удалось записать в файл xml"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Неудавшиеся передачи"
 
-#: resources.h:684
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Возврат в активный режим"
 
-#: resources.h:368
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Фай&л:"
 
-#: resources.h:225
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Фай&лы"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Файл"
 
@@ -3542,13 +3659,13 @@
 
 #: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr "Файл не содержит данных, пригодных для импорта!"
+msgstr "Файл не содержит данных, пригодных для импорта."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
 msgstr "Правка файлов"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Файл существует"
 
@@ -3556,7 +3673,7 @@
 msgid "File exists action"
 msgstr "Действие, если файл существует"
 
-#: resources.h:304
+#: resources.h:315
 msgid "File has changed"
 msgstr "Файл изменен"
 
@@ -3564,14 +3681,14 @@
 msgid "File lists"
 msgstr "Списки файлов"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:703
-#: ../../locales/../src/interface/FileZilla.cpp:797
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../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
 msgid "File not found"
-msgstr "Файл не найден!"
+msgstr "Файл не найден"
 
-#: resources.h:995
+#: resources.h:1029
 msgid "File search"
 msgstr "Поиск файла"
 
@@ -3606,25 +3723,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Файл передан успешно, передан %s в %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Идет передача файлов."
 
-#: resources.h:386
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Файл будет передан с типом данных ASCII."
 
-#: resources.h:387
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Файл будет передан с бинарным типом данных."
 
-#: ../../locales/../src/interface/FileZilla.cpp:488
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:197
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Ошибка FileZilla"
 
-#: resources.h:706
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3632,76 +3749,76 @@
 "FileZilla может протестировать конфигурацию, чтобы убедиться, что все "
 "настроено правильно."
 
-#: resources.h:476
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla уже подключен к серверу."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:446
-#: ../../locales/../src/interface/sitemanager.cpp:1066
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla работает в режиме 'киоск'.\n"
-"В этом режиме тип входа 'Нормальный' и 'Учетная запись' не доступны."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1495
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "Необходимо перезапустить FileZilla для смены языка."
 
-#: resources.h:516
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Обновления FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Строка &состояния"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Имя файла"
 
-#: resources.h:509
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "Фильтры по названию файлов..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Невозможно задать имя файла для каталога %s и файла %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Неправильное имя файла"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Имена файлов не могут содержать следущие знаки: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Имя файла не изменено"
 
-#: resources.h:306 resources.h:950
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Имя файла:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Имя файла не может содержать знаки: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Имена файлов не могут содержать знаки: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Редактируемые файлы"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../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
 msgid "Filesize"
 msgstr "Размер"
 
@@ -3709,84 +3826,88 @@
 msgid "Filesize format"
 msgstr "Формат размера файлов"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Тип файла"
 
-#: resources.h:938
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Ассоциации файлов"
 
-#: resources.h:224
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Применить фильтр к:"
 
-#: resources.h:813
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Фильтр недопустимых символов в именах файлов"
 
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
-msgstr "Название фильтра уже существует!"
+msgstr "Название фильтра уже существует"
 
-#: resources.h:220
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Элементы, соответствующие всем следующего"
 
-#: resources.h:221
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Элементы, соответствующие любому из следующего"
 
-#: resources.h:222
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Элементы, соответствующие ничему из следующего"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
-msgstr "Набор фильтров существует!"
+msgstr "Набор фильтров уже существует"
 
-#: resources.h:988
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Фильтр списка каталогов"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Не удалось проверить фильтр"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Контрольная сумма MD5:"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Контрольная сумма SHA-1:"
 
-#: resources.h:178 resources.h:191
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Контрольная сумма:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
-msgstr "Мастер настройки брандмауэра и роутера"
+msgstr "Мастер настройки брандмауэра и маршрутизатора"
 
-#: resources.h:724
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
-"Для более полной информации об настройках, запустите мастер настройки сети."
+"Для более подробной информации о настройках, пожалуйста, запустите мастер "
+"настройки сети."
 
-#: resources.h:701
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Для надежности, диапазон портов должен быть не менее 10."
 
-#: ../../locales/../src/interface/Options.cpp:211
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3794,31 +3915,31 @@
 "Эта сессия будет использовать настройки по умолчанию. Любые изменения в "
 "настройках не будут сохранены."
 
-#: resources.h:108
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "UTF-8 &принудительно"
 
-#: resources.h:542
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Принудительно отображать &скрытые файлы"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Принудительно отображать скрытые файлы"
 
-#: resources.h:768
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Спецификации формата:"
 
-#: resources.h:936
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "Формат: расширение \"команда\" аргументы"
 
-#: resources.h:468
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Подробная документация"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Общие"
 
@@ -3826,59 +3947,59 @@
 msgid "General SOCKS server failure"
 msgstr "Общий сбой сервера SOCKS"
 
-#: resources.h:786
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Базовый прокси"
 
-#: resources.h:690
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Получить внешний IP-адрес со следующией страницы:"
 
-#: resources.h:469
+#: resources.h:480
 msgid "Getting help"
 msgstr "Получение помощи"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Набор фильтров существует. Заменить?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr "Общие закладки"
 
-#: resources.h:165
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Групповые права"
 
-#: resources.h:596
+#: resources.h:617
 msgid "H&igh"
 msgstr "В&ысокий"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP через TLS"
 
-#: resources.h:339
+#: resources.h:350
 msgid "Hash:"
 msgstr "Хэш:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Скрытый"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:899
-#: ../../locales/../src/interface/queue.cpp:980
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Высокий"
 
-#: ../../locales/../src/interface/queue.cpp:901
-#: ../../locales/../src/interface/queue.cpp:982
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Наивысший"
 
@@ -3886,24 +4007,24 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Наивысший номер порта должен быть между 1024 и 65535"
 
-#: resources.h:208
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr "Удерживайте SHIFT, чтобы включить фильтр одновременно на обе стороны."
 
-#: resources.h:156
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Домашняя страница:"
 
-#: resources.h:341
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Контрольная сумма ключа хоста:"
 
-#: resources.h:184
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Ключ хоста не совпадает"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Хост начинается с '[', но отсутствует кавычка в конце."
 
@@ -3911,20 +4032,20 @@
 msgid "Host unreachable"
 msgstr "Хост недоступен"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Хост:"
 
-#: resources.h:95
+#: resources.h:105
 msgid "Hours,"
 msgstr "Часы,"
 
-#: resources.h:885
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (например: 15:47)"
 
-#: resources.h:728
+#: resources.h:755
 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 "
@@ -3933,11 +4054,11 @@
 "Если во время операции данные не будут переданы дольше этого времени, то "
 "соединение будет закрыто и FileZilla попытается подключиться заново."
 
-#: resources.h:966
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "Для сообщения об ошибках, выберите \"Подробности\" из списка."
 
-#: resources.h:681
+#: resources.h:708
 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 "
@@ -3948,7 +4069,7 @@
 "сможете передать файлы на сервер, попытайтесь использовать активный режим. "
 "Для разных серверов можно задать разные режимы передачи в Менеджере Сайтов."
 
-#: resources.h:676
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -3956,7 +4077,7 @@
 "Если настройка включена, то вы сможете подключаться к ненастроенным "
 "серверам, которые отвергают выбранный режим передачи."
 
-#: resources.h:187
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3968,7 +4089,7 @@
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"Если проблема осталась, значит роутер и/или брандмауэр продолжает "
+"Если проблема осталась, значит маршрутизатор и/или брандмауэр продолжает "
 "блокировать FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
@@ -3976,10 +4097,10 @@
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"Если проблема осталась, значит роутер и/или брандмауэр продолжает прерывать "
-"соединение."
+"Если проблема осталась, значит маршрутизатор и/или брандмауэр продолжает "
+"прерывать соединение."
 
-#: resources.h:955
+#: resources.h:988
 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 "
@@ -3989,7 +4110,7 @@
 "\" (возможна перезапись старых лог-файлов), после чего создается новый лог-"
 "файл."
 
-#: resources.h:454
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4003,13 +4124,14 @@
 "manufacturer for a solution."
 msgstr ""
 "Если проблема осталась, обратитесь к производителю вашего брандмауэра или "
-"роутера."
+"маршрутизатора."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr "Если проблема осталась, обратитесь к производителю вашего роутера."
+msgstr ""
+"Если проблема осталась, обратитесь к производителю вашего маршрутизатора."
 
-#: resources.h:277 resources.h:850
+#: resources.h:288 resources.h:877
 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 "
@@ -4019,7 +4141,7 @@
 "синхронизировано с сервером. Если вы и сервер находитесь в разных часовых "
 "поясах, то сделайте поправку в Менеджере Сайтов."
 
-#: resources.h:909
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4027,11 +4149,11 @@
 "Если используется сравнение по дате, считать оба файла одинаковыми если "
 "разница во времени их создания или модификации не превышает заданного лимита."
 
-#: resources.h:924
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "После смены языка потребуется перезапустить FileZilla."
 
-#: resources.h:707
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4039,11 +4161,11 @@
 "Нажав 'Тест', FileZilla подключится к probe.filezilla-project.org и проведет "
 "несколько простых тестов."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Если вы закроете FileZilla, изменения не будут сохранены."
 
-#: resources.h:826
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4051,11 +4173,11 @@
 "Если указать неверные типы файлов, то файлы могут быть повреждены при "
 "передаче."
 
-#: resources.h:708
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Если возникнут ошибки - ваша конфигурация неправильная."
 
-#: resources.h:740
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4070,19 +4192,19 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 "Если у вас остались проблемы с определенным сервером, то, возможно, это "
-"вызвано неверными настройками сервера, удаленного роутера или брандмауэра. В "
-"этом случае используйте пассивный режим и обратитесь к администратору "
-"сервера за помощью."
+"вызвано неверными настройками сервера, удаленного маршрутизатора или "
+"брандмауэра. В этом случае используйте пассивный режим и обратитесь к "
+"администратору сервера за помощью."
 
-#: resources.h:667
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
 "Если работа мастера завершилась успешно и тест удался, то ваш брандмауэр и "
-"роутер сконфигурированы правильно."
+"маршрутизатор сконфигурированы правильно."
 
-#: resources.h:703
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4090,27 +4212,27 @@
 "Если у вас установлен брандмауэр, убедитесь, что у FileZilla есть доступ ко "
 "всем используемым портам."
 
-#: resources.h:702
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"Если вы используете роутер, убедитесь, что все указанные порты доступны "
-"компьютеру, на котором запущена FileZilla."
+"Если вы используете маршрутизатор, убедитесь, что все указанные порты "
+"доступны компьютеру, на котором запущена FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
 msgstr ""
-"Если ваш роутер постоянно меняет IP-адреса, то обратитесь к производителю "
-"роутера."
+"Если ваш маршрутизатор постоянно меняет IP-адреса, то обратитесь к "
+"производителю маршрутизатора."
 
 #: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Импорт данных из старой версии"
 
-#: resources.h:296
+#: resources.h:307
 msgid "Import settings"
 msgstr "Импортировать настройки"
 
@@ -4124,7 +4246,7 @@
 msgid "Improperly quoted association."
 msgstr "Неверно задана ассоциация."
 
-#: resources.h:695
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4132,15 +4254,15 @@
 "В активном режиме FileZilla требуется прослушивать порт для передачи. Нужно "
 "указать порты, которые FileZilla будет использовать."
 
-#: resources.h:697
+#: resources.h:724
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
-"В случае использования роутера, вам должны быть доступны все необходимые "
-"порты, так как FileZilla не может менять системные настройки."
+"В случае использования маршрутизатора, вам должны быть доступны все "
+"необходимые порты, так как FileZilla не может менять системные настройки."
 
-#: resources.h:253
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4148,7 +4270,7 @@
 "Если хотите получать автоматические обновления, можете выбрать необходимый "
 "пункт в окне настроек."
 
-#: resources.h:685 resources.h:749
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4156,7 +4278,7 @@
 "Чтобы использовать активный режим, FileZilla нужно получить ваш внешний IP-"
 "адрес."
 
-#: resources.h:670
+#: resources.h:697
 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 "
@@ -4166,7 +4288,7 @@
 "сервера порт и присоединяется к нему. В этом случае больше настроек не "
 "понадобится."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4174,17 +4296,21 @@
 "Незавершенная цепочка сертификатов, верхний сертификат не является "
 "самоподписанным авторизованным сертификатом."
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Неправильный пароль"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Инициализирую TLS..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "Небезопасный сервер, не поддерживает FTP через TLS."
+
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Интерактивный"
 
@@ -4193,8 +4319,8 @@
 msgstr "Интерфейс"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1006
-#: ../../locales/../src/interface/QueueView.cpp:1580
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Прервано пользователем"
 
@@ -4206,8 +4332,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Неправильный ответ HTTP"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4225,46 +4351,54 @@
 msgid "Invalid data received"
 msgstr "Приняты неверные данные"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
 msgstr "Неправильная дата"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1339
-#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Неправильное имя файла"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "Неверный хост, после кавычки может стоять только точка и порт."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Неверные данные"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Неправильный номер порта. Задайте номер в диапазоне от 1 до 65535"
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Задан неверный протокол! Поддерживаемые протоколы:\n"
+"Задан неверный протокол. Поддерживаемые протоколы:\n"
 "ftp:// для нормального FTP,\n"
 "sftp:// для SSH протокола передачи,\n"
-"ftps:// для FTP с SSL (явным)\n"
-"ftpes:// для FTP с SSL (неявным)."
+"ftps:// для FTP через SSL (неявным)\n"
+"ftpes:// для FTP через SSL (явным)."
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Неверный хост прокси, после закрывающей скобки может следовать только "
+"двоеточие и порт."
+
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Неверное регулярное выражение в условии поиска."
 
@@ -4272,50 +4406,50 @@
 msgid "Invalid response code"
 msgstr "Неверный код ответа"
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Неверные условия поиска: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2566
-#: ../../locales/../src/interface/sitemanager.cpp:2586
-#: ../../locales/../src/interface/sitemanager.cpp:2603
-#: ../../locales/../src/interface/sitemanager.cpp:2610
-#: ../../locales/../src/interface/sitemanager.cpp:2617
-#: ../../locales/../src/interface/sitemanager.cpp:2634
-#: ../../locales/../src/interface/sitemanager.cpp:2783
-#: ../../locales/../src/interface/sitemanager.cpp:3009
-#: ../../locales/../src/interface/sitemanager.cpp:3016
-#: ../../locales/../src/interface/sitemanager.cpp:3096
-#: ../../locales/../src/interface/sitemanager.cpp:3103
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Неверный путь сайта"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:662
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Неверный размер"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Неверное имя пользователя."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Страна юрисдикции:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Место юрисдикции:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Штат или провинция юрисдикции:"
 
-#: resources.h:906
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Показывать сначала каталоги"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4326,50 +4460,54 @@
 "некоторые тесты для проверки, поддерживает ли сервер эту возможность, "
 "однако, тест может не удаться."
 
-#: resources.h:336
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Обмен ключами"
 
-#: resources.h:599
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Обмен ключами:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Н&аименьший"
 
-#: resources.h:922
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Язык"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1495
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Язык изменен"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Последнее изменение"
 
-#: resources.h:853
+#: resources.h:880
 msgid "Layout"
 msgstr "Раскладка"
 
-#: resources.h:799
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Ограничить число одновременных &скачиваний:"
 
-#: resources.h:801
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Ограничить число одновременных &закачек:"
 
-#: resources.h:744
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Ограничение локальных портов"
 
-#: resources.h:952
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Ограничить размер лог-файла"
 
-#: resources.h:953
+#: resources.h:986
 msgid "Limit:"
 msgstr "Лимит:"
 
@@ -4377,7 +4515,7 @@
 msgid "Line length exceeded"
 msgstr "Превышена длина строки"
 
-#: resources.h:166
+#: resources.h:177
 msgid "Linked against"
 msgstr "Кроме того"
 
@@ -4386,45 +4524,45 @@
 msgstr "Сокет прослушивания закрыт"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Список:"
 
-#: resources.h:747
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Наименьший порт:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Локальный"
 
-#: resources.h:363
+#: resources.h:374
 msgid "Local file"
 msgstr "Локальный файл"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
 msgstr "Локальный файл не существует."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr "Локальный файл является каталогом а не файлом."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:365
+#: ../../locales/../src/interface/manual_transfer.cpp:369
 msgid "Local file is not a valid filename."
 msgstr "Локальный файл имеет неверное имя."
 
-#: resources.h:202
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Локальные фильтры:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Локальный сайт:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Локальность:"
 
@@ -4432,16 +4570,16 @@
 msgid "Log file"
 msgstr "Файл журнала"
 
-#: resources.h:250
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Журнал проверки обновлений:"
 
-#: resources.h:947
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Вход"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4449,7 +4587,7 @@
 "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Нельзя "
 "вернуться к локальной кодировке из-за использования прокси."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4457,16 +4595,16 @@
 "Логин содержит не ASCII символы, сервер может не поддерживать UTF-8. Попытка "
 "использовать локальную кодировку."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "Последовательность входа выполнена, но войти не удалось. Отменяю."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Тип входа должен быть 'Спросить пароль' или 'Интерактивный' (без кавычек)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4475,13 +4613,13 @@
 "Тип входа может использоваться вместе с адресом FTP. Параметры должны быть '%"
 "s' или '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Низкий"
 
-#: ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Самый низкий"
 
@@ -4489,11 +4627,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "Самый низкий доступный порт должен иметь номер от 1024 до 65535."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:63
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr "Убедитесь, что файл доступен и имеет правильный XML-формат документа."
 
@@ -4514,69 +4652,69 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Поврежден ответ, сервер не посылает надлежащие окончания строк"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#: ../../locales/../src/interface/manual_transfer.cpp:365
+#: resources.h:404 ../../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
 msgid "Manual transfer"
 msgstr "Передача вручную"
 
-#: resources.h:433
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Найдено все из следующего"
 
-#: resources.h:434
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Найдено любое из следующего"
 
-#: resources.h:435
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Найдено ничего из следующего"
 
-#: resources.h:797
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Максимум одновременных &передач:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1833
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Журнал сообщений"
 
-#: resources.h:864
+#: resources.h:891
 msgid "Message log position"
 msgstr "Позиция журнала сообщений"
 
-#: resources.h:954
+#: resources.h:987
 msgid "MiB"
 msgstr "Мб"
 
-#: resources.h:96
+#: resources.h:106
 msgid "Minutes"
 msgstr "Минут"
 
-#: resources.h:357
+#: resources.h:368
 msgid "Move &down"
 msgstr "Переместить вниз"
 
-#: resources.h:356
+#: resources.h:367
 msgid "Move &up"
 msgstr "Переместить вверх"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1074
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Мой компьютер"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1064
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Мои документы"
 
-#: ../../locales/../src/interface/sitemanager.cpp:720
-#: ../../locales/../src/interface/sitemanager.cpp:722
-#: ../../locales/../src/interface/sitemanager.cpp:2137
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Мои Сайты"
 
@@ -4585,33 +4723,33 @@
 msgid "N/a"
 msgstr "Нет данных"
 
-#: resources.h:398
+#: resources.h:409
 msgid "Name"
 msgstr "Имя"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1285
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Имя уже существует"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3033
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Закладка с таким именем уже существует."
 
-#: resources.h:119 resources.h:167
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Имя:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Нужно ввести имя фильтра"
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Нужно ввести действительный удаленный путь"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1100
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Укажите кодировку символов"
 
@@ -4619,62 +4757,66 @@
 msgid "Network unreachable"
 msgstr "Сеть недоступна"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Никогда"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Новый &каталог"
 
-#: resources.h:493
+#: resources.h:511
 msgid "New &tab"
 msgstr "Новая &вкладка"
 
-#: resources.h:74 resources.h:413
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Новая &закладка"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2474
-#: ../../locales/../src/interface/sitemanager.cpp:3033
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Новая закладка"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1192
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Новый каталог"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Новые возможности и исправления в %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Новый фильтр"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1014
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Новый каталог"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2450
-#: ../../locales/../src/interface/sitemanager.cpp:2896
-#: ../../locales/../src/interface/sitemanager.cpp:2910
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Новый сайт"
 
-#: resources.h:862
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Рядом с панелью заданий"
 
@@ -4686,25 +4828,25 @@
 msgid "No category to export selected"
 msgstr "Не выбрана категория экспорта"
 
-#: ../../locales/../src/interface/QueueView.cpp:2227
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Не указана команда. Отбой."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Внешний IP-адрес неустановлен, использую по умолчанию."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Ни один файл сейчас не редактируется."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Не указано имя фильтра"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Пожалуйста, укажите хост."
 
@@ -4712,31 +4854,31 @@
 msgid "No images available"
 msgstr "Нет доступных изображений"
 
-#: ../../locales/../src/interface/QueueView.cpp:3076
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Нет больше файлов в задании!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Не указано имя набора фильтров."
 
-#: resources.h:429
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Нет программы, ассоциированной с данным типом файлов"
 
-#: resources.h:419
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "Ни одна программа не ассоциирована с файлами с расширением '%s'."
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Ничего не найдено"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2103
-#: ../../locales/../src/interface/sitemanager.cpp:2115
-#: ../../locales/../src/interface/sitemanager.cpp:2146
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
 msgstr "Нет доступных сайтов"
 
@@ -4744,44 +4886,45 @@
 msgid "No supported SOCKS5 auth method"
 msgstr "Неподдерживаемый метод авторизации SOCKS5"
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Не указано имя пользователя."
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:945 resources.h:950
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Нет"
 
-#: resources.h:373
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Ничего не выбрано"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:553
-#: ../../locales/../src/interface/queue.cpp:897
-#: ../../locales/../src/interface/queue.cpp:978
-#: ../../locales/../src/interface/sitemanager.cpp:1392
+#: resources.h:837 ../../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:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Нормальный"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
 msgid "Not all items could be requeued for viewing/editing."
 msgstr "Не все элементы могут быть доступны для просмотра/редактирования."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Нет соединения"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Нет подключения к серверу"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Нет подключения к серверу."
 
@@ -4789,25 +4932,25 @@
 msgid "Not connected."
 msgstr "Нет соединения."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Предупреждение: эта особенность поддерживается, только при использовании "
 "протокола FTP."
 
-#: resources.h:778
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Предупреждение: это работает только для обычных, незашифрованных FTP-"
 "соединений."
 
-#: resources.h:795
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Внимание: использование базового прокси принудительно включает пассивный "
 "режим для FTP соединений."
 
-#: resources.h:895
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Кол-во знаков после запятой:"
 
@@ -4815,21 +4958,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Число попыток должно быть между 0 и 99"
 
-#: resources.h:332
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Открыть файл"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "ОК"
 
-#: resources.h:677
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4841,150 +4984,155 @@
 msgid "Once"
 msgstr "Однажды"
 
-#: resources.h:946
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Будет передана информация только о версии FileZilla и используемой "
-"операционной системе."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Каждую неделю"
 
-#: resources.h:646
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Открыть каталог в системном менеджере файлов"
 
-#: resources.h:968 resources.h:969
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Открыть Менеджер Сайтов"
 
-#: resources.h:562
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Открыть Менеджер Сайтов"
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr ""
+"Открыть Менеджер Сайтов. Нажмите правую клавишу мыши для списка сайтов."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Открыть файл."
 
-#: resources.h:506
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Открыть окно настроек FileZilla"
 
-#: resources.h:308
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Открыт как:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2053
-#: ../../locales/../src/interface/LocalListView.cpp:2098
-#: ../../locales/../src/interface/LocalListView.cpp:2185
-#: ../../locales/../src/interface/LocalListView.cpp:2198
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../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
 msgid "Opening failed"
 msgstr "Не удалось открыть"
 
-#: resources.h:494
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Открывает новую вкладку"
 
-#: resources.h:491
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Открывает Менеджер Сайтов"
 
-#: resources.h:989
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Открывает окно фильтра списка каталогов. Нажмите правую клавишу мыши для "
 "переключения между фильтрами."
 
-#: resources.h:170
+#: resources.h:181
 msgid "Operating system"
 msgstr "Операционная система"
 
-#: ../../locales/../src/interface/FileZilla.cpp:307
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Обнаружена проблема операционной системы"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Организация:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Другое:"
 
-#: resources.h:723
+#: resources.h:750
 msgid "Overview"
 msgstr "Обзор"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Заменить &более новым"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Заменить файл"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Заменить файл, если отличается размер"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Заменить файл, если отличается размер или файл новее"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Заменить файл, если файл новее"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Заменить, если отличается размер"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Заменить, если отличается размер или новее"
 
-#: resources.h:133
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Права владельца"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:377
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Владелец/Группа"
 
-#: resources.h:867
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "Препятствовать засыпанию системы во время передач и других операций"
 
-#: resources.h:775 resources.h:791
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Хост прокси:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
-msgstr "Команда PORT повреждена роутером или брандмауэром."
+msgstr "Команда PORT повреждена маршрутизатором или брандмауэром."
 
-#: resources.h:737
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Па&ссивный (рекомендуется)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Архив"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2465
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Параметр не является допустимым URL-адресом"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Паро&ль:"
 
-#: resources.h:673
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Пассивный (рекомендуется)"
 
-#: resources.h:757
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Пассивный режим"
@@ -4999,42 +5147,46 @@
 msgid "Password required"
 msgstr "Требуется пароль"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Путь"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Невозможно задать путь для каталога %s и подкаталога %s"
 
-#: resources.h:400
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Путь не найден:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Пути"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Ожидаю удаления"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Право"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:376
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Права"
 
-#: resources.h:169
+#: resources.h:180
 msgid "Platform:"
 msgstr "Платформа:"
 
-#: resources.h:249
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5050,7 +5202,7 @@
 "Посетите http://filezilla-project.org/probe.php чтобы убедиться, что сервер "
 "работает и проверьте установки еще раз."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5058,17 +5210,18 @@
 "Проверьте ваш менеджер архивов на предмет обновлений, либо посетите http://"
 "filezilla-project.org , чтобы скачать исходный код FileZilla."
 
-#: resources.h:679
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
-"Сконфигурируйте брандмауэр и роутер так, чтобы FileZilla могла установить "
-"соединение через произвольные порты."
+"Сконфигурируйте брандмауэр и маршрутизатор так, чтобы FileZilla могла "
+"установить исходящее соединение с произвольными портами."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
-msgstr "Пожалуйста, отключите режимы 'DMZ' и 'Игровой' на вашем роутере."
+msgstr ""
+"Пожалуйста, отключите режимы 'DMZ' и 'Игровой' на вашем маршрутизаторе."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
 msgid ""
@@ -5086,7 +5239,7 @@
 msgid "Please enter a custom time format."
 msgstr "Введите свой формат времени."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:678
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Введите дату в формате ГГГГ-ММ-ДД, например 2010-07-18."
@@ -5099,20 +5252,20 @@
 "Пожалуйста, введите ограничение скорости скачивания (больше или равно 0 %s/"
 "сек)."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Введите название нового фильтра."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Введите название для копии фильтра."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Введите новое название набора фильтров \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Введите новое название фильтра."
 
@@ -5133,11 +5286,11 @@
 "transfers."
 msgstr "Введите число одновременных передач (0-10)"
 
-#: resources.h:116
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Введите пароль для данного сервера:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2216
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5152,11 +5305,11 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "Введите время паузы от 5 до 9999 сек. (0 - нет паузы)"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Введите уникальное имя для этого набора фильтров"
 
-#: resources.h:117
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Введите имя пользователя для данного сервера:"
 
@@ -5168,10 +5321,6 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Введите URL, с которого будет получен ваш внешний IP-адрес"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Введите периодичность обновления (не менее 7 дней)"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
@@ -5180,7 +5329,7 @@
 "Пожалуйста, введите ограничение скорости загрузки (больше или равно 0 %s/"
 "сек)."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5188,14 +5337,18 @@
 "Введите raw FTP команду.\n"
 "Использование raw команд очищает кэш каталогов."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1185
-#: ../../locales/../src/interface/LocalTreeView.cpp:1189
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
-msgstr "Введите имя каталога:"
+msgstr "Введите имя создаваемого каталога:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Введите имя создаваемого файла:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Введите имя пользователя и пароль для данного сервера:"
 
@@ -5214,7 +5367,7 @@
 "странице мастера. Если же у вас динамический IP, либо вы не знаете вашего "
 "внешнего IP, то включите настройку получения внешнего IP."
 
-#: resources.h:666
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5230,7 +5383,7 @@
 "Убедитесь, что FileZilla имеет право устанавливать соединение и что "
 "введенный адрес правильный."
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Убедитесь, что выбранный язык установлен в системе."
 
@@ -5241,11 +5394,11 @@
 "manual port forwarding. Don't run your router in the so called 'DMZ mode' or "
 "'game mode'."
 msgstr ""
-"Убедитесь, что ваш роутер правильно настроен и используется последняя версия "
-"прошивки. Вам придется использовать ручную передачу порта. Не используйте "
-"такие режимы роутера, как 'DMZ' или 'Игровой'."
+"Убедитесь, что ваш маршрутизатор правильно настроен и используется последняя "
+"версия прошивки. Вам придется использовать ручную передачу порта. Не "
+"используйте такие режимы маршрутизатора, как 'DMZ' или 'Игровой'."
 
-#: resources.h:680
+#: resources.h:707
 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 "
@@ -5257,7 +5410,7 @@
 "троянами и другими вредоносными программами. Это может вызвать ложный сигнал "
 "тревоги, который вы можете спокойно отключить."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5265,7 +5418,7 @@
 "Учтите, что сохранение времени создания файла при закачках на FTP, FTPS и "
 "FTPES серверы работает только если они поддерживают команду MFMT."
 
-#: resources.h:734
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5273,7 +5426,7 @@
 "Учтите, что некоторые серверы могут забанить вас, если вы будете делать "
 "попытки соединения с очень коротким интервалом."
 
-#: resources.h:882 resources.h:888
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5282,7 +5435,7 @@
 "Подробности на http://filezilla-project.org/wiki/index.php/"
 "Date_and_Time_formatting"
 
-#: resources.h:245
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5300,38 +5453,38 @@
 "вас возникнут проблемы с серверами, к которым ранее вы подключались "
 "нормально."
 
-#: resources.h:455
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Пожалуйста, выберите действие:"
 
-#: resources.h:301
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Пожалуйста, выберите категории для импорта."
 
-#: resources.h:668
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Выберите режим передачи по умолчанию."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Выберите новые атрибуты для каталога \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Выберите новые атрибуты для файла \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Выберите новые атрибуты для выбранных каталогов."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Выберите новые атрибуты для выбранных файлов и каталогов."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Выберите новые атрибуты для выбранных файлов."
 
@@ -5343,13 +5496,13 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
-"Пожалуйста, обновите ваш брандмауэр и убедитесь, что ваш роутер использует "
-"последнюю версию прошивки. Убедитесь, что роутер настроен правильно. Вам "
-"придется использовать ручную передачу порта. Не используйте такие режимы "
-"роутера, как 'DMZ' или 'Игровой'. Кроме этого, проверка протокола должна "
-"быть отключена."
+"Пожалуйста, обновите ваш брандмауэр и убедитесь, что ваш маршрутизатор "
+"использует последнюю версию прошивки. Убедитесь, что маршрутизатор настроен "
+"правильно. Вам придется использовать ручную передачу порта. Не используйте "
+"такие режимы маршрутизатора, как 'DMZ' или 'Игровой'. Кроме этого, проверка "
+"протокола должна быть отключена."
 
-#: resources.h:252
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5357,23 +5510,24 @@
 "Пожалуйста, посетите http://filezilla-project.org для получения "
 "дополнительной информации о FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "Посетите http://filezilla-project.org чтобы скачать последнюю версию."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Почтовый индекс:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1918
-#: ../../locales/../src/interface/sitemanager.cpp:2136
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Предустановленные Сайты"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Сохраняю время создания файлов"
 
@@ -5381,43 +5535,59 @@
 msgid "Preview:"
 msgstr "Предпросмотр:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Сертификаты основного соединения и канала данных не соответсвуют."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Выводить диагностическую информацию связанную с запуском FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Печать версии на stdout и выйти"
 
-#: resources.h:905
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Приоритет каталогов (по умолчанию)"
 
-#: ../../locales/../src/interface/queue.cpp:1195
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Приоритет"
 
-#: resources.h:945
-msgid "Privacy policy:"
-msgstr "Политика безопасности:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Политика конфиденциальности: Будет передана информация только о версии "
+"FileZilla, используемой операционной системе и архитектуре процессора."
 
-#: resources.h:781
+#: resources.h:808
 msgid "Private &keys:"
-msgstr "Секретные коды:"
+msgstr "Личные &ключи:"
+
+#: resources.h:90
+msgid "Pro&tocol:"
+msgstr "Про&токол:"
 
-#: resources.h:777 resources.h:794
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "&Пароль прокси:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Выполнить &задание"
 
-#: resources.h:792
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Протокол:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Порт прокси:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Пользователь прокси"
 
@@ -5425,12 +5595,16 @@
 msgid "Proxy authentication failed"
 msgstr "Аутентификация прокси не удалась"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Не установлена связь с прокси: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Хост прокси начинается с '[', но закрывающая скобка не найдена."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5445,70 +5619,74 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Сбой запроса прокси: Неизвестный тип адреса в ответе CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Прокси установлен, но хост или порт прокси недействителен"
 
-#: resources.h:779
+#: resources.h:806
 msgid "Public Key Authentication"
-msgstr "Проверка публичного ключа"
+msgstr "Аутентификация с открытым ключом"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Алгоритм публичного ключа:"
 
-#: resources.h:141
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Публичные права"
 
-#: ../../locales/../src/interface/QueueView.cpp:3131
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Задание полностью завершено"
 
-#: ../../locales/../src/interface/statusbar.cpp:461
+#: ../../locales/../src/interface/statusbar.cpp:462
 #, c-format
 msgid "Queue: %s MiB"
 msgstr "Задание: %s Мб"
 
-#: ../../locales/../src/interface/statusbar.cpp:391
+#: ../../locales/../src/interface/statusbar.cpp:392
 #, c-format
 msgid "Queue: %s%s"
 msgstr "Задание: %s%s"
 
-#: ../../locales/../src/interface/statusbar.cpp:387
-#: ../../locales/../src/interface/statusbar.cpp:452
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Задание: пусто"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Файлы в задании"
 
-#: resources.h:447
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Задание:"
 
-#: resources.h:606
+#: resources.h:627
 msgid "R&eboot system"
-msgstr "Перезагрузить систему"
+msgstr "П&ерезагрузить систему"
 
-#: resources.h:520
+#: resources.h:539
 msgid "R&emote directory tree"
-msgstr "Удаленный список"
+msgstr "У&даленный список"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: resources.h:643 resources.h:647
+msgid "R&eset and requeue selected files"
+msgstr "О&чистить выбранные и получить снова"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Raw команда FTP"
 
-#: resources.h:138
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Чт&ение"
 
-#: resources.h:567 resources.h:581
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "&Обновить"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Пе&реименовать"
 
@@ -5518,69 +5696,77 @@
 "routers and firewalls accordingly."
 msgstr ""
 "Повторно запустите Мастер и тщательно проверьте настройки и конфигурирование "
-"всех роутеров и брандмауэров."
+"всех маршрутизаторов и брандмауэров."
 
-#: resources.h:142
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Чте&ние"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:86
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Только чтение"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Отменить текущую операцию?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
-#, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Удалить %d каталог вместе со всем содержимым?"
-msgstr[1] "Удалить %d каталога вместе со всем содержимым?"
-msgstr[2] "Удалить %d каталогов вместе со всем содержимым?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Удалить %d файл?"
-msgstr[1] "Удалить %d файла?"
-msgstr[2] "Удалить %d файлов?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Удалить %s и %s?"
+msgid "Really delete %d directory with its contents from the server?"
+msgid_plural ""
+"Really delete %d directories with their contents from the server?"
+msgstr[0] "Удалить %d каталог вместе со всем содержимым с сервера?"
+msgstr[1] "Удалить %d каталога вместе со всем содержимым с сервера?"
+msgstr[2] "Удалить %d каталогов вместе со всем содержимым с сервера?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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 файла с сервера?"
+msgstr[2] "Удалить %d файлов с сервера?"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
+#, c-format
+msgid "Really delete %s and %s from the server?"
+msgstr "Удалить %s и %s с сервера?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "Удалить все выбранные файлы и/или каталоги с сервера?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
-msgid "Really delete all selected files and/or directories?"
-msgstr "Удалить все выбранные объекты?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "Удалить все выбранные файлы и/или каталоги с вашего компьютера?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Причина"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Перезагрузить сейчас"
 
-#: resources.h:147
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Пер&енаправить во вложенные каталоги"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2107
-#: ../../locales/../src/engine/directorylistingparser.cpp:2122
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "Получен список каталога который вероятно закодирован в EBCDIC."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Получена строка, содержащая более 10000 символов, остановка."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Принятые данные повреждены"
 
@@ -5593,11 +5779,11 @@
 "серверу.\n"
 "Если Вы продолжите, то подключение будет разорвано."
 
-#: resources.h:735
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Настройка переподключения"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Подключиться к последнему использованному серверу"
 
@@ -5605,38 +5791,42 @@
 msgid "Redirection to invalid address"
 msgstr "Перенаправление на неправильный адрес"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Обновить список файлов и каталогов"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Запомнить пароли?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Удаленный"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Сертификат удаленного сервера не действителен"
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1193
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Файл на сервере"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Удаленный поиск файлов"
 
-#: resources.h:205
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Удаленные фильтры:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Удаленный путь"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5645,7 +5835,7 @@
 "Невозможно разобрать удаленный путь. Убедитесь, что указан верный абсолютный "
 "путь и что он поддерживается типом сервера (%s) данного сайта."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5655,92 +5845,100 @@
 "путь и что он поддерживается типом сервера (%s) установленном на исходном "
 "сайте."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1191
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Невозможно разобрать удаленный путь. Убедитесь, что указан верный абсолютный "
 "путь."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
 msgstr "Невозможно разобрать удаленный путь."
 
-#: resources.h:444
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Удаленный путь:"
 
-#: resources.h:312
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Удаленный путь:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Удаленный сайт:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
-msgstr "Удалить &все"
+msgstr "Очистить &все"
 
-#: resources.h:616 resources.h:619
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
-msgstr "Удалить &выбранные"
+msgstr "Очистить &выбранные"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Переименовать файл"
 
-#: resources.h:631 resources.h:652
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Переименовать выбранный каталог"
 
-#: resources.h:571 resources.h:585
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Переименовать выбранные файлы и каталоги"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Переименование '%s' в '%s'"
 
-#: resources.h:471
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Отчет об ошибках и запрос возможностей"
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
-msgstr "Очистить список и вновь добавить файлы в очередь"
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr "Требовать FTP через TLS (явный)"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr "Требовать FTP через TLS (неявный)"
+
+#: resources.h:645
+msgid "Reset and requeue &all"
+msgstr "Очистить все и получить снова"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Определение IP-адреса для %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Определение имени хоста"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Ответ:"
 
-#: resources.h:438
+#: resources.h:449
 msgid "Results:"
 msgstr "Результаты:"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Докачать файл"
 
-#: resources.h:852
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5748,34 +5946,38 @@
 "Режим докачки ASCII файлов может вызвать проблемы, если сервер использует "
 "другой формат конца строки."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Получение списка каталогов..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Получение внешнего IP-адреса с %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Корневой сертификат не действителен"
 
-#: resources.h:499
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "Показать редактируемые файлы..."
 
-#: resources.h:607
+#: resources.h:896
+msgid "S&how the Site Manager on startup"
+msgstr "П&оказывать Менеджер Сайтов на запуске"
+
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Выключить систему"
 
-#: resources.h:436
+#: resources.h:447
 msgid "S&top"
 msgstr "&Прервать"
 
-#: resources.h:515
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "С&инхронизированный просмотр."
 
@@ -5783,35 +5985,49 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Сохранить настройки?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1814
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "Сохранение пароля было отключено вашим системным администратором."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Сохранение паролей было отключено вами."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "Поиск файлов для добавления в задание"
 
-#: ../../locales/../src/interface/QueueView.cpp:1816
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Поиск файлов для загрузки на сервер"
 
-#: resources.h:432
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Условия &поиска:"
 
-#: resources.h:430
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Поиск каталога:"
 
-#: resources.h:994
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Рекурсивный поиск файлов."
 
-#: resources.h:539
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Сервер поиска для файлов"
 
-#: ../../locales/../src/interface/statusbar.cpp:530
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
 msgstr "Информация о безопасности"
 
@@ -5821,25 +6037,25 @@
 msgstr ""
 "Смотрите также: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Выберите сервер"
 
-#: resources.h:720
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Выберите &страницу:"
 
-#: resources.h:870
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Выбор темы"
 
-#: resources.h:830
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Выберите действие по умолчанию, если объект существует"
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Выберите редактор по умолчанию"
 
@@ -5859,13 +6075,13 @@
 "Выберите действие по умолчанию, если объект существует (только для выбранных "
 "файлов в задании)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Выберите место для загрузки архива"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
-msgstr "Выберите файл с секретным кодом"
+msgstr "Выберите файл содержащий личный ключ"
 
 #: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
@@ -5880,7 +6096,7 @@
 msgstr "Выберите файл для экспорта настроек"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2678
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Выберите файл для экспорта сайтов"
 
@@ -5888,7 +6104,7 @@
 msgid "Select file to import settings from"
 msgstr "Выберите файл, из которого будут импортироваться настройки"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
 msgstr "Выбор файла для загрузки на сервер"
 
@@ -5896,28 +6112,28 @@
 msgid "Select filename for converted keyfile"
 msgstr "Выберите название для файла с ключем"
 
-#: resources.h:420
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Определите, как открывать данные файлы."
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Выберите каталог для загрузки"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Выберите имя файла"
 
-#: resources.h:290
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Выберите категории для экспорта:"
 
-#: resources.h:281
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "Выберите личные данные, которые вы хотите удалить."
 
-#: ../../locales/../src/interface/search.cpp:798
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5933,7 +6149,7 @@
 msgstr[1] "Выбрано %d каталога."
 msgstr[2] "Выбрано %d каталогов."
 
-#: ../../locales/../src/interface/search.cpp:796
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5957,7 +6173,7 @@
 msgstr[1] "Выбрано %d файла. Размер: не менее %s"
 msgstr[2] "Выбрано %d файлаов. Размер: не менее %s"
 
-#: ../../locales/../src/interface/search.cpp:803
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Выбраны %s и %s для передачи."
@@ -5972,33 +6188,33 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Выбраны %s и %s. Размер: не менее %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Выбранный редактор не существует."
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2082
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Выбранный файл уже редактируется"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-msgid "Selected file already opened."
-msgstr "Выбранный файл уже открыт."
-
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
 msgstr "Выбранный файл уже загружен"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
+msgid "Selected file is already opened"
+msgstr "Выбранный файл уже открыт"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
+msgid "Selected file is still being edited"
 msgstr "Выбранный файл все еще редактируется"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Выбранный фильтр касается только для локальных файлов."
 
-#: ../../locales/../src/interface/menu_bar.cpp:309
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6010,36 +6226,42 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Выбранный порт обычно используется с другим протоколом."
 
-#: resources.h:742
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Посылать команды FTP активности"
 
-#: resources.h:541
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "Посылать индивидуальную команду на сервер не доступный иначе"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Посылаю команду FTP активности"
 
-#: resources.h:7 resources.h:31
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Серийный номер:"
 
-#: resources.h:81 resources.h:88
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Тип &сервера:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Сервер неверно закрыл TLS соединение"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Сервер не поддерживает символы не ASCII."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Сервер не поддерживает докачку файлов более %d ГБ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6048,15 +6270,15 @@
 "Сервер не поддерживает докачку файлов более %d ГБ. Окончить передачу, так "
 "как размеры файлов совпадают."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "Сервер не поддерживает докачку файлов более 2 ГБ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "Сервер не поддерживает докачку файлов более 4 ГБ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6065,7 +6287,7 @@
 "Сервер может не поддерживать докачку файлов более %d ГБ. Окончить передачу, "
 "так как размеры файлов совпадают."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6073,7 +6295,11 @@
 "Сервер может потребовать учетную запить. Попробуйте указать учетную запись "
 "используя Менеджер Сайтов"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:420
+msgid "Server returned empty path."
+msgstr "Сервер вернул пустой путь."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6081,13 +6307,13 @@
 "Сервер послал дополнительный запрос на логин. Необходимо использовать "
 "интерактивный логин."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Сервер отправил пассивный ответ с неопределяемым адресом. Пассивный режим не "
 "сработал."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6107,121 +6333,132 @@
 msgid "Server sent unexpected reply."
 msgstr "Сервер направил неожиданный ответ."
 
-#: resources.h:350
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "MAC-адрес сервер-клиент:"
 
-#: resources.h:348
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Шифр сервер-клиент:"
 
-#: resources.h:379
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Тип &сервера:"
 
-#: ../../locales/../src/interface/queue.cpp:1191
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Сервер/Локальный файл"
 
-#: resources.h:310 resources.h:372
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Сервер:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Детали сессии"
 
-#: resources.h:594
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Установить &приоритет"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Сменить права '%s' на '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:863
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize вызван без указания сокета"
 
-#: resources.h:719
+#: resources.h:746
 msgid "Settings"
 msgstr "Настройки"
 
-#: resources.h:967
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Показать необработанный &список каталогов"
 
-#: resources.h:550
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Показать окно приветствия..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Показать оба дерева каталогов и продолжить сравнение?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Показывать доступность TLS шифрования"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Показывать это окно помощи"
 
-#: ../../locales/../src/interface/QueueView.cpp:3141
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Выключить систему"
 
-#: resources.h:298
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Алгоритм подписи:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Записи &Менеджера Сайтов"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Менеджер Сайтов"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1045
-#: ../../locales/../src/interface/sitemanager.cpp:1057
-#: ../../locales/../src/interface/sitemanager.cpp:1066
-#: ../../locales/../src/interface/sitemanager.cpp:1083
-#: ../../locales/../src/interface/sitemanager.cpp:1100
-#: ../../locales/../src/interface/sitemanager.cpp:1113
-#: ../../locales/../src/interface/sitemanager.cpp:1132
-#: ../../locales/../src/interface/sitemanager.cpp:1142
-#: ../../locales/../src/interface/sitemanager.cpp:1156
-#: ../../locales/../src/interface/sitemanager.cpp:1167
-#: ../../locales/../src/interface/sitemanager.cpp:1192
-#: ../../locales/../src/interface/sitemanager.cpp:1202
-#: ../../locales/../src/interface/sitemanager.cpp:1211
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Менеджер Сайтов - Не сохранять пароль"
+
+#: ../../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
 msgid "Site Manager - Invalid data"
-msgstr "Менеджер Сайтов - некорректные данные"
+msgstr "Менеджер Сайтов - Некорректные данные"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Менеджер Сайтов уже открыт"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2586
-#: ../../locales/../src/interface/sitemanager.cpp:2603
-#: ../../locales/../src/interface/sitemanager.cpp:2617
-#: ../../locales/../src/interface/sitemanager.cpp:3016
-#: ../../locales/../src/interface/sitemanager.cpp:3103
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Сайт не существует."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2566
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr "Путь к сайту должен начинаться с 0 или 1."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2610
-#: ../../locales/../src/interface/sitemanager.cpp:2783
-#: ../../locales/../src/interface/sitemanager.cpp:3009
-#: ../../locales/../src/interface/sitemanager.cpp:3096
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Неправильный путь к сайту."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr "Индивидуальные закладки"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
@@ -6230,68 +6467,68 @@
 "Для индивидуальных закладок требуется сохранить сервер в Менеджере Сайтов.\n"
 "Добавить текущее соединение в Менеджер Сайтов?"
 
-#: ../../locales/../src/interface/queue.cpp:1194
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Размер"
 
-#: resources.h:889
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Отображение размера"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Размер неизвестен"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Пропустить файл"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Пропускаю закачку %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Пропускаю загрузку %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Некоторые файлы все еще редактируются или требуют закачки на сервер."
 
-#: resources.h:682 resources.h:758
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
-"Ненастроенные серверы при соединении через роутер могут отвечать, используя "
-"свой локальный адрес."
+"Некоторые неправильно настроенные удаленные серверы, находящиеся за "
+"маршрутизатором, могут отвечать с их локального IP адреса."
 
-#: resources.h:907
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Линейная сортировка каталогов"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Режим сортировки не может быть изменен при сравнении каталогов."
 
-#: resources.h:903
+#: resources.h:932
 msgid "Sorting"
 msgstr "Сортировка"
 
-#: resources.h:904
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Сортировка:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
 msgstr "Источник и путь одинаковы"
 
@@ -6299,32 +6536,40 @@
 msgid "Source and target file may not be the same"
 msgstr "Источник и место назначения не могут быть одинаковы"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Источник и место назначения одинаковы"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Исходный файл:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Ограничение скорости"
 
-#: resources.h:803
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Ограничение скорости"
 
-#: ../../locales/../src/interface/statusbar.cpp:596
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
 msgstr "Ограничение скорости выключено, кликните для изменения."
 
-#: ../../locales/../src/interface/statusbar.cpp:600
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr "Ограничение скорости включено, кликните для изменения."
 
-#: resources.h:390
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Стабильные и бета версии"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Только стабильные версии"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Начать передачу немедленно"
 
@@ -6332,43 +6577,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Запускать с открытым Менеджером Сайтов"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Начинаю скачивать %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Начинаю закачивать %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Запуск локального сайта по указанному пути"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Штат или провинция:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Состояние"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Статус:"
 
-#: resources.h:591
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Остановить и удалить &все"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Улица:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Тема сертификата"
 
@@ -6376,11 +6625,11 @@
 msgid "Successful transfers"
 msgstr "Успешные передачи"
 
-#: resources.h:710
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Результаты теста:"
 
-#: resources.h:458
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6388,52 +6637,57 @@
 "Символьные ссылки на файлы не затронуты этим выбором, такие ссылки всегда "
 "удаляются."
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Синхронизированный просмотр."
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Синхронизированный просмотр был отключен."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Ошибка синтаксиса"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2467
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Ошибка синтаксиса в командной строке"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Система"
 
+#: resources.h:535
+msgid "T&oolbar"
+msgstr "П&анель инструментов"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL соединение установлено, отправка HTTP запроса"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL соединение установлено, ожидаю приветствие..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL соединение установлено."
 
@@ -6441,27 +6695,31 @@
 msgid "TTL expired"
 msgstr "TTL истекло"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Файл существует"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Файл на сервере:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Файл с таким именем уже существует!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Файл с таким именем уже существует! Продолжить?"
 
-#: resources.h:709
+#: resources.h:736
 msgid "Test results"
 msgstr "Результаты теста"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Проверяется возможность докачки с сервера"
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6479,7 +6737,7 @@
 "Менеджер Сайтов открыт другим процессом FileZilla 3.\n"
 "Закройте его или данные не будут удалены."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:421
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-документ имеет не верный формат: %s"
@@ -6489,16 +6747,16 @@
 msgid "The address you entered was: %s"
 msgstr "Вы ввели адрес: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2996
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Закладка не может быть добавлена."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3083
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Закладки не могут быть очищены."
 
-#: ../../locales/../src/interface/statusbar.cpp:489
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
 msgstr "Соединение зашифровано. Нажмите значок для получения доп. сведений."
 
@@ -6506,21 +6764,26 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Пользовательский режим логина не может быть пустым."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, fuzzy, c-format
+msgid "The data connection could not be established: %s"
+msgstr "TLS/SSL соединение установлено."
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Редактор текстовых файлов по умолчанию не найден."
 
-#: resources.h:422
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Редактор текстовых файлов по умолчанию - '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr "Фильтр с таким именем уже существует."
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "Фильтр с таким именем уже существует, выберите другое имя."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
@@ -6537,9 +6800,9 @@
 "Файл %s существует.\n"
 "Введите новое имя:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2059
-#: ../../locales/../src/interface/LocalListView.cpp:2190
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6555,14 +6818,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Файл '%s' нельзя загрузить или он не содержит секретного ключа."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:59
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Файл '%s' не может быть загружен."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2053
-#: ../../locales/../src/interface/LocalListView.cpp:2185
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6571,8 +6834,8 @@
 "Файл '%s' нельзя открыть:\n"
 "Не указана программа, ассоциированная с этим типом файлов."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2098
-#: ../../locales/../src/interface/LocalListView.cpp:2198
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6614,7 +6877,7 @@
 "защищенные паролем.\n"
 "Хотите преобразовать его в незащищенный формат?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Выбранный редактор не существует."
 
@@ -6632,11 +6895,11 @@
 "пользователя и пароль.\n"
 "Продолжить импорт?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
 msgstr "Колонку с названиями файлов нельзя скрывать или перемещать."
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
 msgstr "Колонку с названиями файлов нельзя скрыть."
 
@@ -6650,19 +6913,19 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Следующие символы будут заменены: %s"
 
-#: resources.h:327
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "В данный момент редактируются следующие файлы:"
 
-#: resources.h:462
+#: resources.h:473
 msgid "The free open source FTP solution"
-msgstr "Бесплатный Open Source FTP клиент"
+msgstr "Бесплатный FTP клиент с открытым исходным кодом"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
 msgstr "Общие закладки не могут быть сохранены."
 
-#: resources.h:965
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6681,8 +6944,9 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"Локальный каталог '%s' находится выше корневой папки синхронизации (%s).\n"
-"Выключить синхронизированный просмотр и продолжить изменение удалённого "
+"Локальный каталог '%s' находится не ниже корневого каталога синхронизации (%"
+"s).\n"
+"Выключить синхронизированный просмотр и продолжить изменение локального "
 "каталога?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
@@ -6693,7 +6957,7 @@
 "Наименьший доступный порт должен быть либо меньше, либо равен наибольшему из "
 "выбранных портов."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6701,7 +6965,7 @@
 "Последняя версия загружена. Нажмите 'Финиш' чтобы закрыть FileZilla и начать "
 "установку."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6709,18 +6973,18 @@
 "Последняя версия загружена. Пожалуйста, установите эту версию так же, как вы "
 "устанавливали текущую."
 
-#: ../../locales/../src/interface/QueueView.cpp:1936
-#: ../../locales/../src/interface/QueueView.cpp:1963
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Очередь не может быть сохранена."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, 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"
 "Выключить синхронизированный просмотр и продолжить изменение удалённого "
 "каталога?"
 
@@ -6728,23 +6992,23 @@
 msgid "The selected categories have been imported."
 msgstr "Выбранные категории импортированы."
 
-#: resources.h:297
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Выбранный файл содержит импортируемые данные для следующих категорий:"
 
-#: resources.h:320
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Выбранный файл уже редактируется"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Выбранный файл все еще используется каким-то приложением. Закройте его."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2065
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6754,7 +7018,7 @@
 "Это опасно и может повредить вашу систему.\n"
 "Уверены, что хотите продолжить?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2876
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
 msgstr "Сервер не может быть добавлен."
 
@@ -6762,7 +7026,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Сервер отправил неожиданный или непознанный ответ."
 
-#: resources.h:105
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Кодировка, используемая сервером:"
 
@@ -6774,7 +7038,7 @@
 "Неизвестный сертификат сервера. Проверьте сертификат, чтобы убедиться, что "
 "он может быть принят."
 
-#: resources.h:186
+#: resources.h:197
 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 "
@@ -6784,7 +7048,7 @@
 "администратор сервера сменил ключ, либо вы пытаетесь подключиться к какому-"
 "то другому компьютеру, выдающему себя за сервер."
 
-#: resources.h:174
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6799,17 +7063,17 @@
 msgstr ""
 "Настройки импортированы. Перезапустите FileZilla для применения настроек."
 
-#: ../../locales/../src/interface/QueueView.cpp:3129
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "Система вскоре будет перезагружена, если только вы нажмете кнопку 'Отмена'."
 
-#: ../../locales/../src/interface/QueueView.cpp:3127
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr ""
 "Система вскоре будет выключена, если только вы не нажмете кнопку 'Отмена'."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6817,7 +7081,7 @@
 "Файл уже существует.\n"
 "Выберите действие."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Тест не удался. Уверены, что хотите сохранить настройки?"
 
@@ -6825,11 +7089,11 @@
 msgid "Themes"
 msgstr "Темы"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Набор фильтров не может быть удален."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Набор фильтров не может быть переименован."
 
@@ -6838,40 +7102,44 @@
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
 msgstr ""
-"Это означает, что роутер и/или брандмауэр по-прежнему вмешивается в "
+"Это означает, что маршрутизатор и/или брандмауэр по-прежнему вмешивается в "
 "FileZilla."
 
-#: resources.h:687
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
-"Работает только если вы не соединены через роутер, иначе ваша система вернет "
-"внутренний IP."
+"Работает только если вы не соединены через маршрутизатор, иначе ваша система "
+"вернет внутренний IP."
 
-#: resources.h:665
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
-"Этот мастер поможет вам правильно настроить роутер и брандмауэр и "
+"Этот мастер поможет вам правильно настроить маршрутизатор и брандмауэр и "
 "протестировать вашу конфигурацию."
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "Время"
+
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Формат времени"
 
-#: resources.h:726
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Время ожид&ания, сек.:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1051
-#: ../../locales/../src/interface/QueueView.cpp:1095
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Время ожидания"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6880,28 +7148,28 @@
 "Временная разница: Серверное: %d секунд. Местное: %d секунд. Разница: %d "
 "секунд."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Название:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "Для сравнения каталогов, оба списка должны быть выровнены."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Для этого, оба дерева каталогов должны быть либо скрыты, либо включены."
 
-#: resources.h:780
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr ""
-"Для поддержки аутентификации открытых ключей, FileZilla должен знать, какие "
-"личные ключи можно использовать."
+"Для поддержки аутентификации с открытым ключом, FileZilla должен знать, "
+"какие личные ключи можно использовать."
 
-#: resources.h:990
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6917,7 +7185,7 @@
 "Зеленый: Файл новее неотмеченного файла на другой стороне\n"
 "Красный: Размеры файлов не совпадают"
 
-#: resources.h:992
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6927,23 +7195,23 @@
 "При включении, навигация в локальном каталоге также приводит к "
 "соответствующей смене каталога на сервере и наоборот."
 
-#: resources.h:980 resources.h:981
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Показать/скрыть процесс выполнения задания"
 
-#: resources.h:972 resources.h:973
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Показать/скрыть локальное дерево каталогов"
 
-#: resources.h:970 resources.h:971
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Показать/скрыть журнал сообщений"
 
-#: resources.h:974 resources.h:975
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Показать/скрыть удаленное дерево каталогов"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Показать/скрыть задание"
 
@@ -6956,37 +7224,37 @@
 msgstr "Слишком много перенаправлений"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Трассировка:"
 
-#: resources.h:913 resources.h:919
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Передача"
 
-#: resources.h:360
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Направление &передачи"
 
-#: resources.h:525
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Режим &передачи"
 
-#: resources.h:736
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Режим передачи"
 
-#: resources.h:869
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Окно задания"
 
-#: resources.h:97
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Настройки передачи"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Соединение прервано: %s"
@@ -6996,7 +7264,7 @@
 msgstr "Преданные данные повреждены."
 
 #: ../../locales/../src/interface/QueueView.cpp:1474
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Передача"
 
@@ -7004,87 +7272,87 @@
 msgid "Transfers"
 msgstr "Передачи"
 
-#: ../../locales/../src/interface/QueueView.cpp:3044
-#: ../../locales/../src/interface/QueueView.cpp:3047
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Передачи завершены"
 
-#: resources.h:827
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Считать файлы &без расширения как ASCII"
 
-#: resources.h:823
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Считать &следующие типы файлов как ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
-msgstr "Принять измененный ключ хоста: "
-
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
-msgstr "Принять новый ключ хоста: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
+msgid "Trust changed Hostkey:"
+msgstr "Принять измененный ключ хоста:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
+msgid "Trust new Hostkey:"
+msgstr "Принять новый ключ хоста:"
 
-#: resources.h:193
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Принять новый ключ и продолжить соединение?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Принять сертификат и продолжить соединение?"
 
-#: resources.h:180
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Доверить этому хосту и продолжить соединение?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Тип"
 
-#: resources.h:762
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Тип FTP прокси:"
 
-#: resources.h:787
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Тип базового прокси:"
 
-#: resources.h:330
+#: resources.h:341
 msgid "U&pload"
 msgstr "Загрузить на сервер"
 
-#: resources.h:483 resources.h:807
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "О&граничение загрузки:"
 
-#: resources.h:931
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "Для открытия использовать ассоциации файлов"
 
-#: resources.h:884
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Использовать системные настройки"
 
-#: resources.h:764
+#: resources.h:791
 msgid "USER@&HOST"
-msgstr "ПОЛЬЗОВАТЕЛЬ@ХОСТ"
+msgstr "USER@&HOST"
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
 msgstr "Неопределенный код ошибки %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Объект:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Неизвестен"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Неизвестный тип FTP прокси, невозможно сгенерировать последовательность для "
@@ -7099,7 +7367,7 @@
 msgid "Unknown certificate"
 msgstr "Неизвестный сертификат"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:409
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7107,7 +7375,7 @@
 "Неизвестная ошибка при открытии файла. Убедитесь в том, что файл доступен и "
 "имеет правильный XML-формат документа."
 
-#: resources.h:173
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Неизвестный ключ"
 
@@ -7120,7 +7388,7 @@
 "Неизвестная версия протокола доп. согласования аутентификации имени "
 "пользователя/пароля SOCKS: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:454
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "Неизвестный корневой элемент, файл по-видимому сгенерирован FileZilla."
@@ -7142,7 +7410,7 @@
 "Если не исправить эту проблему, активный режим FTP не будет работать и нужно "
 "будет использовать пассивный режим."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Тип сертификата не поддерживается"
 
@@ -7150,127 +7418,130 @@
 msgid "Unsupported redirect"
 msgstr "Перенаправление не поддерживается"
 
-#: resources.h:331
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Загрузить без изменений"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Проверка обновлений"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Мастер обновления"
 
-#: resources.h:362
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Обновления"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Закачать"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Загрузка не удалась"
 
-#: ../../locales/../src/interface/statusbar.cpp:608
+#: ../../locales/../src/interface/statusbar.cpp:609
 #, c-format
 msgid "Upload limit: %s/s"
 msgstr "Ограничение загрузки: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:610
+#: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
 msgstr "Ограничение загрузки: нет"
 
-#: resources.h:642
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Загрузить выбранный каталог"
 
-#: resources.h:556
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Загрузить выбранные файлы и каталоги"
 
-#: resources.h:315
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Загрузить файл обратно на сервер?"
 
-#: resources.h:314
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Загрузить файл на сервер?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Загрузка"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Загрузка и ожидание удаления"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Загрузка без изменений"
 
-#: resources.h:109
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Использовать &указанную кодировку"
 
-#: resources.h:928
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Использовать &следующий редактор:"
 
-#: resources.h:421
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Использовать &редактор по умолчанию"
 
-#: resources.h:404 resources.h:410
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Использовать с&инхронизированный просмотр"
 
-#: resources.h:107
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Использовать UTF-8 если сервер поддерживает, иначе использовать локальную "
 "кодировку."
 
-#: resources.h:257 resources.h:267
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Использовать по умолчанию"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "Использовать простой FTP"
+
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Использовать сервер к которому подключены"
 
-#: resources.h:371
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Использовать сервер из Менеджера Сайтов"
 
-#: resources.h:878
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Использовать системные настройки"
 
-#: resources.h:688
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Использовать следующий IP-адрес:"
 
-#: resources.h:698
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Использовать следующий диапазон портов:"
 
-#: resources.h:683
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Использовать внешний IP-адрес сервера"
 
-#: resources.h:689 resources.h:752
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
-"Воспользуйтесь этим если вы подключены через роутер и у вас статический "
-"внешний IP-адрес."
+"Воспользуйтесь этим, если вы подключены через маршрутизатор и у вас "
+"статический внешний IP-адрес."
 
-#: resources.h:692
+#: resources.h:719
 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 "
@@ -7281,72 +7552,72 @@
 "использования активного режима. Передаваться будет только информация об "
 "используемой версии FileZilla."
 
-#: resources.h:121
+#: resources.h:131
 msgid "User:"
 msgstr "Пользователь:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:502
-#: ../../locales/../src/interface/sitemanager.cpp:1132
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Имя пользователя не может состоять из одних пробелов"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Используется прокси %s"
 
-#: resources.h:111
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Использование неправильной кодировки приводит к неправильному отображению "
 "имен файлов."
 
-#: resources.h:230
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "Используйте этот мастер для проверки обновлений FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Действителен с:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Действителен до:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Подробные сообщения журнала wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Проверка сертификата..."
 
-#: resources.h:168
+#: resources.h:179
 msgid "Version:"
 msgstr "Версия:"
 
-#: resources.h:812
+#: resources.h:839
 msgid "Very high"
 msgstr "Очень высокий"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Просмотреть скрытый набор настроек, неподдерживаемый сервером"
 
-#: resources.h:915
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Просмотр/Правка"
 
-#: resources.h:354
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Видимые колонки"
 
-#: resources.h:139
+#: resources.h:149
 msgid "W&rite"
 msgstr "З&апись"
 
-#: ../../locales/../src/interface/QueueView.cpp:1773
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Ожидание"
 
@@ -7358,7 +7629,7 @@
 msgid "Waiting for password"
 msgstr "Ожидание пароля"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Ожидание отмены передачи"
 
@@ -7366,7 +7637,7 @@
 msgid "Waiting to retry..."
 msgstr "Ожидание повтора..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:298
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7397,11 +7668,11 @@
 "Gateway,\n"
 "FileZilla будет выдавать перерывы при больших передачах."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Внимание, игнорирую соединение с неправильного IP."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7415,35 +7686,47 @@
 "\n"
 "Проверить наличие 'ночных' сборок?"
 
-#: resources.h:185
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Внимание! Обнаружена уязвимость в системе защиты!"
 
-#: resources.h:474
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Добро пожаловать в FileZilla"
 
-#: resources.h:463
+#: resources.h:474
 msgid "What's new"
 msgstr "Что нового"
 
-#: resources.h:240
+#: resources.h:251
 msgid "What's new:"
 msgstr "Что нового:"
 
-#: resources.h:815
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Позволяя FileZilla запоминать пароли, вы можете повторно соединятся без "
+"необходимости повторного ввода пароля после перезапуска FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
-"Когда разрешено, то символы, которые не поддерживаются локальной "
-"операционной системой будут заменены в именах загружаемых файлов."
+"Если включено, то символы, которые не поддерживаются локальной операционной "
+"системой в именах файлов, будут заменены в именах скачиваемых файлов."
 
-#: resources.h:857
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Широкоэкранный"
 
-#: resources.h:143
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Н&е сохранять пароли"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "За&пись"
 
@@ -7460,22 +7743,30 @@
 msgid "Yes"
 msgstr "Да"
 
-#: resources.h:251
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Кажется вы используете хост, поддерживающий только IPv6. Этот мастер не "
+"поддерживает это состояние."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "У вас самая последняя версия FileZilla. Проверьте обновления позже."
 
-#: resources.h:472
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Вы всегда можете открыть это окно снова из меню."
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 "Вы можете оставить поле порта пустым, чтобы использовать порт по умолчанию."
 
-#: resources.h:146
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7499,12 +7790,12 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "Вы не указали новое название файла. Заменить файл?"
 
-#: resources.h:453
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Вы выбрали по крайней мере одну символьную ссылку."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2032
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7512,7 +7803,7 @@
 "Вы выбрали более 10 файлов для редактирования, вы действительно хотите "
 "продолжить?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2152
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7520,12 +7811,12 @@
 "Вы выбрали более 10 файлов или каталогов для открытия, вы действительно "
 "хотите продолжить?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:426
-#: ../../locales/../src/interface/sitemanager.cpp:1045
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Укажите имя хоста."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Укажите локальный каталог."
 
@@ -7534,17 +7825,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Укажите правильный IP-адрес."
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Укажите локальный каталог с доступом на запись."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:513
-#: ../../locales/../src/interface/sitemanager.cpp:1142
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Укажите имя учетной записи"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:483
-#: ../../locales/../src/interface/sitemanager.cpp:1113
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Укажите имя пользователя"
 
@@ -7553,9 +7844,10 @@
 "You likely have a router or firewall which erroneously modified the "
 "transferred data."
 msgstr ""
-"Похоже, что ваш роутер или брандмауэр внес ошибки в передаваемые данные."
+"Похоже, что ваш маршрутизатор или брандмауэр внес ошибки в передаваемые "
+"данные."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 msgid "You need to enter a name for the bookmark."
 msgstr "Введите имя закладки."
 
@@ -7563,29 +7855,29 @@
 msgid "You need to enter a name for the log file."
 msgstr "Введите название лог-файла."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Необходимо ввести правильно сформулированную команду."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Укажите имя хоста прокси."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Укажите порт прокси в пределах от 1 до 65535"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1202
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 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."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1211
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7593,7 +7885,7 @@
 "Необходимо ввести локальный и удалённый путь, чтобы включить "
 "синхронизированный просмотр для этой закладки."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1167
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7601,19 +7893,19 @@
 "Необходимо ввести локальный и удалённый путь, чтобы включить "
 "синхронизированный просмотр для этого сайта."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr "Укажите локальный файл."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
 msgstr "Укажите удаленный файл."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
 msgstr "Укажите удаленный путь."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
 msgstr "Укажите сервер."
 
@@ -7625,44 +7917,49 @@
 "У вас не должно возникнуть проблем при соединении с другими серверами. "
 "Соединение должно работать нормально."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "после"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "до"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "начинается с"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "байт"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "содержит"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:72
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "не содержит"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:76
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:101
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "не равно"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "заканчивается на"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "эквивалентно"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "файл"
 
@@ -7681,82 +7978,127 @@
 "Убедитесь, что файл программы находится в том же каталоге, что и FileZilla."
 "ехе."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "Невозможно запустить fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers вернула отсутствие сертификатов"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "больше чем"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "исполняемый (для группы)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "только чтение (для группы)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "чтение и запись (для группы)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "эквивалентно"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:79
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "установлен"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "неустановлен"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "меньше чем"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "соответствует regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "исполняемый (для владельца)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "только чтение (для владельца)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "чтение и запись (для владельца)"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "неизвестен"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "исполняемый (для всех)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "только чтение (для всех)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "чтение и запись (для всех)"
 
-#: resources.h:164
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d КБ/сек)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d МБ/сек)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s байт (%d.%d КБ/сек)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s байт (%d.%d МБ/сек)"
+
+#~ msgid "&Copy"
+#~ msgstr "&Копировать"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Автопроверка обновлений"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "&Число дней между проверками:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Минимум 7 дней)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Автопроверка обновлений"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "&Проверить бета-версии и релиз-кандидаты"
+
+#~ msgid "Cop&y"
+#~ msgstr "Коп&ировать"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Введите периодичность обновления (не менее 7 дней)"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Политика безопасности:"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Дублировать имя фильтра"
+
 #~ msgid "Please enter a upload speedlimit greater or equal to 0 KB/s."
 #~ msgstr ""
 #~ "Пожалуйста, введите ограничение скорости загрузки (больше или равно 0 КБ/"
@@ -7764,6 +8106,3 @@
 
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Невозможно загрузить главное меню из файла ресурсов"
-
-#~ msgid "bytes"
-#~ msgstr "байт"
diff -Nru filezilla-3.5.3/locales/sv.po filezilla-3.7.3~precise/locales/sv.po
--- filezilla-3.5.3/locales/sv.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/sv.po	2013-06-27 20:03:27.000000000 +0000
@@ -7,26 +7,28 @@
 msgstr ""
 "Project-Id-Version: FileZilla 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-02 07:42+0100\n"
+"POT-Creation-Date: 2013-06-24 19:29+0200\n"
+"PO-Revision-Date: 2013-06-27 20:02+0100\n"
 "Last-Translator: Magnus Nilsson <magnus.nilsson@telia.com>\n"
 "Language-Team: Swedish <tp-sv@listor.tp-sv.se>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: sv\n"
 "Plural-Forms: nplurals=2; plural=(n != 1);\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S förflutet"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S kvar"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -44,9 +46,9 @@
 msgstr[0] "%d katalog"
 msgstr[1] "%d kataloger"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -55,9 +57,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -78,7 +80,7 @@
 msgstr[0] "%d fil. Total storlek: Minst %s"
 msgstr[1] "%d filer. Total storlek: Minst %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d filer tillagda i kön"
@@ -90,31 +92,21 @@
 msgstr[0] "%d sekund"
 msgstr[1] "%d sekunder"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Värd"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Lösenord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d,%d kB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d,%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -129,7 +121,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Ännu inte giltigt!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxyanvändare"
@@ -151,27 +143,17 @@
 msgstr[0] "%s byte"
 msgstr[1] "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s byte (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s byte (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s byte (%d.%d kB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s byte (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -185,7 +167,7 @@
 "\n"
 "Hämta FileZilla igen. Om detta problem kvarstår, skicka en felrapport."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -208,152 +190,148 @@
 msgid "%s with %d bits"
 msgstr "%s med %d bitar"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Användarnamn"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proxylösenord"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "&Om..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "&Konto:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "Akti&vt"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Lägg till bokmärke..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "&Lägg till filer i kön"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "&Lägg till nyckelfil..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Lägg till i kön"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "&Justera serverns tidszonsskillnad:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Lita alltid på certifikatet i framtida sessioner."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Lita alltid på denna värd, lägg till nyckeln i cachen"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "Använd alltid &standardredigeraren"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Använd alltid detta val för oassocierade filer"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "&Använd alltid denna åtgärd"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Fråga ditt operativsystem efter den externa IP-adressen"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "Aut&o"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Identifiera automatiskt"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "&Binär"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "&Binära prefix med SI-symboler. (t.ex. 1 kB = 1024 byte)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Bokmärken"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "&Bläddra..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "S&pridningstolerans:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Avbryt"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Sök efter betaversioner av FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Rensa ut känslig data..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "&Stäng FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "&Konfigurera hastighetsgränser..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Konfigurera..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Anslut"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopiera"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Kopiera aktuell anslutning till Platshanteraren..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Kopiera till urklipp"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "&Krascha"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "S&kapa katalog"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Skapa ny flik"
 
@@ -361,168 +339,168 @@
 msgid "&Debug"
 msgstr "&Felsök"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Felsökningsinformation i meddelandeloggen:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "&Standardredigerare:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "&Standardåtgärd om filen redan finns..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "&Fördröjning mellan misslyckade inloggningsförsök:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Ta bort"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "&Ta bort symbolisk länk"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "&Katalogjämförelse"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "&Förkasta den lokala filen, hämta därefter filen igen och redigera den"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Koppla från"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "&Koppla från servern"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "Visa mom&entan överföringshastighet istället för medelhastighet"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Visa storlek i bytes"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "Kom &inte ihåg lösenord"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Visa inte den här dialogrutan igen."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "Använd &inte den externa IP-adressen för lokala anslutningar."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "Åtgärd vid &dubbelklick på filer:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "&Hämta"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "&Hämta till:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "&Hämta..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "&Hämtningar:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "R&edigera"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "R&edigera filterregler..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Aktivera"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "A&ktivera automatisk uppdateringskontroll"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "A&ktivera hastighetsgränser"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Kodning:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Kryptering:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Ange anpassat kommando..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Kör"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "&Exportera Platshanterarens poster"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Exportera..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Fall tillbaka på aktivt läge"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Arkiv"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "&Filattribut..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "&Filrättigheter..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "&Arkiv:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "&Filtervillkor:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "&Filteruppsättningar:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "&Filter:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Slutför"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "&Slutför redigering och ta bort den lokala filen"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
@@ -530,478 +508,486 @@
 "&Platta till fjärrsökvägarna, hämta alla innehållande filer direkt till "
 "målkatalogen"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Följ den symboliska länken, ta bort innehållet i målkatalogen"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Hämta extern IP-adress från följande URL:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Få hjälp..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Globalt bokmärke"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 användandes metoden CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Hjälp"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "&Dölj identiska filer"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "&Högst"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "Hö&gsta tillgängliga port:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "&Värd:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Binära prefix enligt &IEC (t.ex. 1 KiB = 1024 byte)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (exempel: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Importera..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "A&nvänd systemets filtypsassociationer"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "&Behåll strukturen för fjärrsökvägen relativ jämte sökroten"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "&Layout för fil- och katalogpaneler:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Begränsa lokala portar som används av FileZilla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Begränsa antalet samtida anslutningar"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Lokalt katalogträd"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Lokal katalog:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "&Logga till fil"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "&Inloggningstyp:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "&Inloggningstyp:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "&Lågt"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Ordna bokmärken..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "&Manuell överföring..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "&Maximalt antal anslutningar:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "&Maximalt antal gånger att försöka igen:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Meddelandelogg"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "&Minimera till aktivitetsfältet"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "&Namn:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "&Nätverkskonfigurationsguide..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "&Ny"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "&Ny plats"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "&Ny version finns tillgänglig!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Nästa >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "&Nej"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "&Ingen"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "Antal &dagar mellan kontroll av uppdateringar:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "&Numeriskt värde:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "&OK"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&OPEN"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Öppna"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "&Skriv över"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Passivt"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "&Lösenord:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Spela ljud"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "&Port:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Placering av meddelandeloggen:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Bevara de överförda filernas tidsstämplar"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Kö"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Snabbanslut"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Snabbanslutningsrad"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "&Läsa"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "Återa&nslut"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Uppdatera"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "&Kom ihåg lösenordet för denna session"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "&Komma ihåg lösenord"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Fjärrkatalog:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "&Fjärrsökväg:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Ta bort"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Ta bort nyckel"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Ta bort markerad"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "&Byt namn"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "&Byt namn..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "&Öppna lokal fil på nytt"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Ersätt felaktiga tecken med:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Rapportera ett fel..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "&Återställ och lägg alla filer i kö på nytt"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Starta om guiden"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "Å&teruppta"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Kör kommando..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Kör konfigurationsguiden nu..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "Kör &uppdateringskontrollen nu..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Spara som..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Sök"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "&Sök fjärrfiler..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Välj post:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Välj språk:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Markera de kolumner som skall visas:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Server"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "In&ställningar"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Inställningar..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Visa felsökningsmenyn"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Visa meddelande"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Visa tidsstämplar i meddelandeloggen"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "&Platshanteraren..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Platsspecifikt bokmärke"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "&Hoppa över"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Hastighetsgränser"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "&Starta överföringen genast"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Växla lokal- och fjärrpanel"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS-chiffer"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Testa"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "&Överför"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "&Överföringsläge:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "&Överföringskö"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Behandla &punktfiler som ASCII-filer"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Ångra ändringar"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "&Uppdatera cachelagrad nyckel för denna värd"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "&Skicka"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "&Sändningar:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Använd anpassat program"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "&Använd synkroniserad bläddring"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "A&nvänd systemets standardredigerare för textfiler"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "A&nvänd följande IP-adress:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "A&nvänd serverns externa IP-adress istället"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "A&nvänd tusenavgränsare"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "&Användare:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "&Användarnamn:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Version %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Visa"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Visa/Redigera"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "B&evaka filer som redigerats lokalt och fråga om ändringarna skall skickas"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Vid sökning efter uppdateringar, sök efter:"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "&Skriva"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "&Ja"
 
@@ -1019,11 +1005,27 @@
 msgstr "\"%s\" är ingen katalog."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "Inloggningstypen \"Account\" stöds inte av valt protokoll"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga, använder "
+"\"Fråga efter lösenord\" istället."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga. Din post "
+"har ändrats till \"Fråga efter lösenord\"."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1041,120 +1043,116 @@
 msgstr[0] "(%d filtrerat objekt)"
 msgstr[1] "(%d filtrerade objekt)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 för ingen gräns)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 sekunder)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 för att inaktivera)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Åtminstone 7 dagar)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(exempel: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(exempel: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(i %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S kvar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- kvar"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- Felaktig router och/eller brandvägg"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- Skadad fil på speglingsservern"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- Sabotageprogram i ditt system"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- kvar"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c kan inte användas tillsammans med en URL för FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l kan bara användas tillsammans med en URL för FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s och -c kan inte användas samtidigt."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s kan inte användas tillsammans med en URL för FTP."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Ingenting"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - Varning"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Information"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - Utförlig"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32-bitars system"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - Felsökning"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64-bitars system"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Tillbaka"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1165,16 +1163,17 @@
 "Ett bokmärke med det angivna namnet finns redan. Ange ett namn som inte "
 "redan används."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "En standardredigerare måste ställas in."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "En katalog kan inte dras till en av dess underkataloger."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1184,28 +1183,28 @@
 "detta är fallet måste du ansluta i aktivt läge. I aktivt läge öppnar "
 "FileZilla en port och ber servern att ansluta till den."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "En tidigare öppnad fil har ändrats."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "En fil med det namnet redigeras redan. Vill du öppna \"%s\" på nytt?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "En fil med det namnet håller redan på att överföras."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "En fil med det namnet redigeras fortfarande. Stäng den och försök igen."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1220,11 +1219,11 @@
 "fillistningarna.\n"
 "Inga ytterligare varningar kommer att visas i den här sessionen."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "En ny version av FileZilla finns tillgänglig:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1233,7 +1232,7 @@
 "gömmer filer för användaren. Använd detta alternativ för att tvinga servern "
 "att visa alla filer."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1249,15 +1248,15 @@
 "En fjärråtgärd pågår och synkroniserad bläddring är aktiverat.\n"
 "Inaktivera synkroniserad bläddring och fortsätta byta den lokala katalogen?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Lägg till"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "T&illåt återupptagning av ASCII-filer"
 
@@ -1269,55 +1268,55 @@
 msgid "A&pply only to uploads"
 msgstr "V&erkställ endast på sändningar"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "V&erkställ på alla filer och kataloger"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Ta a&utomatiskt bort lyckade överföringar"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "Avbryt föregående anslutning och anslut i aktuell flik"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "Om FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Ovanför fillistorna"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Konto"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Åtgärd efter att kön &behandlats"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "Åtgärd för vald fil:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Åtgärd att utföra:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "Åtgärd:"
 
@@ -1352,23 +1351,23 @@
 "externa IP-adressen, men din router eller brandvägg har vilseledande ändrat "
 "på den utgående adressen."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "IP-adress för aktivt läge"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "Lägg bara till filer i &kön"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Lägg till markerad katalog i överföringskön"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Lägg till markerade filer och kataloger i överföringskön"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Lägg till i kön"
 
@@ -1376,47 +1375,61 @@
 msgid "Address type not supported"
 msgstr "Adresstypen stöds inte"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Avancerat"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Avancerade alternativ:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Råd: Om du inte vill testa nya funktioner, fortsätt använda endast stabila "
+"versioner. Betaversioner och dagliga byggen är versioner under utveckling "
+"menade för testsyften. Dagliga byggen av FileZilla fungerar eventuellt inte "
+"som de skall och de kan även skada ditt system. Använd betaversioner och "
+"dagliga byggen på egen risk."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Algoritm:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "Alla filer har överförts med lyckat resultat"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Alla portar i det angivna intervallet måste vara mellan 1024 och 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Alla överföringar har slutförts. %d fil kunde inte överföras."
 msgstr[1] "Alla överföringar har slutförts. %d filer kunde inte överföras."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Tillåt att &falla tillbaka på andra överföringslägen vid fel"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Tillåt att falla tillbaka på andra överföringslägen vid fel"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Redan ansluten"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1424,7 +1437,7 @@
 "Alternativt kan du använda verktyget Pageant från PuTTY för att hantera dina "
 "nycklar, FileZilla känner igen Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1432,7 +1445,7 @@
 "Alternativt kan du använda ditt systems SSH-agent. För att göra det, se till "
 "att miljövariabeln SSH_AUTH_SOCK är inställd."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1440,7 +1453,7 @@
 "Alternativt kan du besöka http://filezilla-project.org för att hämta den "
 "allra senaste versionen."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1449,7 +1462,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1458,33 +1471,33 @@
 "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:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 "Ett objekt med samma namn som objektet som dras finns redan på målplatsen."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonym"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "En annan fjärråtgärd pågår redan, kan inte byta katalog nu."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Ändringar gjorda i Platshanteraren kunde inte sparas."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1492,58 +1505,58 @@
 "Ändringar gjorda i Platshanteraren kommer inte att sparas såvida du inte "
 "reparerar filen."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "Ändringar av filtren kunde inte sparas."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Ändringar av filtren kommer inte att sparas."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Ve&rkställ endast på kataloger"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "Verkställ"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "Ver&kställ endast på aktuell kö"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Verkställ endast på &filer"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arkiv"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Som flik i panelen för överföringskön"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "Fråga efter åtgärd"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Fråga efter lösenord"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Fråga operativsystemet efter en port."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "Fråga ditt operativsystem efter den externa IP-adressen"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Ställ frågor i FileZillas forum"
 
@@ -1551,39 +1564,35 @@
 msgid "Associated program not found:"
 msgstr "Associerat program hittades inte:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Åtminstone ett filtervillkor är ofullständigt"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Nu har all nödvändig information samlats in."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Attribut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Autentiseringen misslyckades"
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Upphovsman:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Automatisk"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "Automatisk klassificering av filtyp"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Automatisk uppdateringskontroll"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Tillgängliga storlekar"
 
@@ -1592,66 +1601,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "&Kringgå proxyn"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Grundläggande användarinstruktioner"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Beteende"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Redigeras"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Prestandatesta textsträngshanteraren"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Se upp! Certifikatet har återkallats"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Binär"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Blackboard"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Bokmärke"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Bokmärke:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Bokmärken"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "Byggdatum:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "Bygginformation"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Verksamhetskategori:"
 
-#: resources.h:752
+#: resources.h:773
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
@@ -1661,63 +1670,63 @@
 "överföringar i aktivt läge. Om du vill begränsa FileZilla till att använda "
 "ett mindre portintervall kan du ange portintervallet här nedan."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "A&vbryt aktuell åtgärd"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "S&ök efter dagliga byggen av FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&Töm allt"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "K&opiera URL:en (URL:erna) till urklipp"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "A&npassad"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "An&passade filtypsassociationer:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "Beräknar serverns tidzonsskillnad..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "Kan inte läsa från filen"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "Kan inte skriva data till filen."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Kan inte skriva data till filen: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Avbryt"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Avbryt aktuell åtgärd"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Avbryter den aktuella åtgärden"
 
@@ -1728,11 +1737,11 @@
 "Kan inte komma åt \"%s\", inget media har matats in eller enheten är inte "
 "redo."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Kan inte lägga till servern i Platshanteraren"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1748,30 +1757,30 @@
 "Kan inte jämföra katalogerna, olika filter är aktiverade för lokala "
 "kataloger och fjärrkataloger"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Kan inte jämföra katalogerna, inte ansluten till en server."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Kan inte skapa nytt filter"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "Kan inte redigera filen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 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:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "Kan inte redigera filen, okänd fjärrsökväg."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1779,8 +1788,8 @@
 "Kan inte etablera FTP-anslutning till en SFTP-server. Välj det korrekta "
 "protokollet."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Kan inte läsa in snabbanslutningsraden ifrån resursfilen"
 
@@ -1792,44 +1801,48 @@
 msgid "Cannot load keyfile"
 msgstr "Kan inte läsa in nyckelfilen"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "Kan inte läsa in verktygsfält från resursfil"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Kan inte komma ihåg lösenord"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Kan inte byta namn på posten"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "Kan inte byta namn på filen"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Kan inte spara filteruppsättningen"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Filtret kan inte väljas"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Kan inte ställa in filassociationen"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Kan inte visa dialogrutan"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "Kan inte visa/redigera markerad fil"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Kategorier"
 
@@ -1837,59 +1850,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Certifikats- och sessionsdata är inte tillgänglig ännu."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Certifikatinformation"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "Certifikat i kedjan:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "Certifikatutfärdare"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Utmaning:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "Ändra filattribut"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "Ändra filens rättigheter."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Att ändra loggfilsinställningarna kräver att FileZilla startas om."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Teckenkodningsproblem"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "Teckenuppsättning"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Sök efter &betaversioner och releasekandidater"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Sök efter &uppdateringar..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Sök efter &uppdateringar av FileZilla automatiskt:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Sök efter nyare versioner av FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Sök efter uppdateringar"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "Sökningen efter uppdateringar misslyckades."
 
@@ -1897,21 +1910,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Söker efter den korrekta externa IP-adressen"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Söker efter uppdateringar"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "Kontrollsumman stämmer inte för den hämtade filen."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Välj den lokala standardkatalogen"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Välj den lokala katalogen"
 
@@ -1919,43 +1932,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Chunk-data felaktigt avslutad"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Chiffer:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "St&äng flik"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Klassisk"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "Töm &Platshanterarens poster"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Töm &layoutcachen"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Töm historiken för s&nabbanslutningar"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "Töm informationen om å&teranslutning"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Töm &överföringskön"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Töm historiken"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1963,11 +1976,11 @@
 msgid "Clear private data"
 msgstr "Rensa ut känslig data"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Töm snabbanslutningsraden"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Töm textsträngshanteraren"
 
@@ -1975,36 +1988,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "Klicka på Slutför för att spara din konfiguration."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Klicka på Nästa för att hämta den nya versionen."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Klient till server MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "Chiffer, klient till server:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Stäng &alla andra flikar"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Stäng FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Stäng alla instanser av FileZilla som körs"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Stänger aktuell flik"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Ko&mmentarer:"
 
@@ -2012,11 +2025,11 @@
 msgid "Column properties"
 msgstr "Kolumnegenskaper"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Spaltinställningar"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr ""
 "Kommandot och dess argument skall vara korrekt angivna med citationstecken."
@@ -2036,9 +2049,9 @@
 msgstr "Kommandot stöds inte av det här protokollet"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Kommando:"
 
@@ -2046,7 +2059,7 @@
 msgid "Comment"
 msgstr "Kommentar"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Namn:"
 
@@ -2055,15 +2068,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Anslutningen påverkad av en router eller brandvägg"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "Jämför &ändringstid"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "Jämför fil&storlek"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "&Tröskelvärde för jämförelse (i minuter):"
 
@@ -2071,60 +2084,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Tröskelvärdet för jämförelse måste vara mellan 0 och 1440 minuter."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "Byggd för:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "Byggd på:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "Byggd med:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "Kompilatorflaggor:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Komprimerad"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Samtidiga överföringar"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Villkoren är skiftläges&känsliga"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Konfigurationstest"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Konfigurera passivt läge"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Konfigurera portintervall"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Konfigurera FileZilla och ditt nätverk"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Bekräfta borttagning"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Bekräftelse krävs"
 
@@ -2132,7 +2145,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Gratulerar, din konfiguration verkar fungera."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Anslut men kringgå proxyinställningar"
 
@@ -2140,34 +2153,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Anslut till angiven plats i Platshanteraren"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Ansluten"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Ansluter"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Ansluter till %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Ansluter till %s genom proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Ansluter till %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Ansluter till servern"
 
@@ -2175,18 +2188,18 @@
 msgid "Connection"
 msgstr "Anslutning"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Anslutningsförsöket misslyckades"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Försöket att ansluta till \"%s\" misslyckades."
@@ -2200,12 +2213,12 @@
 msgid "Connection closed"
 msgstr "Anslutningen stängd"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Anslutningen stängdes av servern"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Anslutningen etablerad, initierar TLS..."
@@ -2214,7 +2227,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Anslutningen etablerad, skickar HTTP-begäran"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Anslutningen etablerad, väntar på välkomstmeddelande..."
 
@@ -2230,15 +2243,15 @@
 msgid "Connection refused"
 msgstr "Anslutningen nekades"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Tidsgränsen för anslutningen överstegs"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Tidsgränsen för anslutningen överstegs."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Anslutningen till servern tappad."
 
@@ -2258,27 +2271,23 @@
 msgid "Convert keyfile"
 msgstr "Konvertera nyckelfil"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Kopier&a"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Kopia (%d) av %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Kopia av %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 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:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Kunde inte tillåta anslutningen: %s"
@@ -2288,16 +2297,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Kunde inte lägga till anslutningen i Platshanteraren"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "Kunde inte slutföra åtgärden"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Kunde inte ansluta till servern"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "Kunde inte ansluta till servern: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "Kunde inte konvertera kommandot till serverns kodning"
 
@@ -2306,17 +2319,17 @@
 msgid "Could not convert private key"
 msgstr "Kunde inte konvertera den privata nyckeln"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Kunde inte kopiera URL:erna"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Kunde inte kopiera data"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2326,11 +2339,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:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Kunde inte etablera en anslutning till servern"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2342,11 +2355,11 @@
 "kommandoradsflaggan \"--datadir <anpassad sökväg>\" eller genom att ställa "
 "in miljövariabeln FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Kunde inte skapa anpassad inloggningssekvens."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
@@ -2354,7 +2367,7 @@
 "Fick inget unikt namn för certifikatsutfärdaren, gnutls_x509_get_issuer_dn "
 "misslyckades"
 
-#: ../../locales/../src/engine/tlssocket.cpp:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
@@ -2362,7 +2375,7 @@
 "Fick inget unikt namn för certifikatsobjektet, gnutls_x509_get_dn "
 "misslyckades"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Kunde inte komma åt den fullständiga fjärrsökvägen."
 
@@ -2371,17 +2384,17 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Fick inget svar ifrån fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2409,7 +2422,7 @@
 msgid "Could not load private key"
 msgstr "Kunde inte läsa in den privata nyckeln"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2420,7 +2433,7 @@
 "\".\n"
 "Inaktivera synkroniserad bläddring och fortsätta byta fjärrkatalogen?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2442,9 +2455,9 @@
 "\".\n"
 "Synkroniserad bläddring har inaktiverats."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Kunde inte öppna urklipp"
 
@@ -2459,11 +2472,11 @@
 msgid "Could not parse remote path."
 msgstr "Kunde inte tolka fjärrsökvägen."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Kunde inte tolka serveradressen:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Kunde inte läsa från uttaget: %s"
@@ -2472,12 +2485,12 @@
 msgid "Could not read server item."
 msgstr "Kunde inte läsa serverobjektet."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Kunde inte söka till slutet av filen"
 
@@ -2485,22 +2498,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Kunde inte skicka kommandot till fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Kunde inte starta I/O-tråd"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "Kunde inte starta handskakningen med proxyn: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Kunde inte starta överföring"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2520,7 +2533,7 @@
 msgstr ""
 "Kunde inte skriva till \"%s\", de globala bokmärkena kunde inte sparas: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2529,15 +2542,15 @@
 "Kunde inte skriva till \"%s\", kön kunde inte sparas.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr ""
 "Kunde inte skriva till \"%s\", de valda platserna kunde inte exporteras: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Kunde inte skriva till \"%s\": %s"
@@ -2547,7 +2560,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Kunde inte skriva till nyckelfilen: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "Kunde inte skriva till den lokala filen"
 
@@ -2557,39 +2570,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Kunde inte skriva till loggfilen: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "Kunde inte skriva till uttaget: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Land:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Kraschar FileZilla omedelbart. Används endast för att felsöka "
 "undantagshanteraren."
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "S&kapa ny fil"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Skapa en ny underkatalog i den aktuella katalogen"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Skapa en ny, tom fil i den aktuella katalogen"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Skapa katalog"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Skapa tom fil"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Skapar katalog"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Skapar katalogen \"%s\"..."
@@ -2607,7 +2632,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2628,52 +2653,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Aktuell inställning för överföringsläge är binärt."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "An&passad"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Anpassad filteruppsättning"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Anpassad server"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "D&atatyp"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "D&ecimala prefix med SI-symboler (t.ex. 1 kB = 1000 byte)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "&Standard"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "&Ta bort"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "&Inaktivera allt"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "Spara inte lösen&ord"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Åtgärd vid d&ubbelklick på kataloger:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "&Kopiera"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Som DOS med virtuella sökvägar"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "Farlig filtyp"
 
@@ -2681,16 +2710,16 @@
 msgid "Data"
 msgstr "Data"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Datauttaget stängdes för tidigt."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Datum"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Datumformatering"
 
@@ -2709,11 +2738,11 @@
 msgid "Debug"
 msgstr "Felsök"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Felsökningsinställningar"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Standardkatalog (&lokal):"
 
@@ -2721,19 +2750,19 @@
 msgid "Default (Autodetect)"
 msgstr "Standard (Identifiera automatiskt)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Standardredigeraren har inte angivits korrekt med citationstecken."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "Standardåtgärd om filen redan finns"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Standardkatalog (&fjärr):"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2745,15 +2774,15 @@
 msgid "Default system language"
 msgstr "Systemets standardspråk"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Standardfilöverföringsläge:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Standardöverföringstyp:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Standard: http://ip.filezilla-project.org/ip.php"
 
@@ -2779,57 +2808,57 @@
 "Fördröjer anslutningen med %d sekunder på grund av tidigare misslyckat "
 "anslutningsförsök..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Ta bort post i Platshanteraren"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Ta bort markerad katalog"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "Ta bort markerade filer och kataloger"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Tar bort kataloger"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Borttagning av flera orelaterade kataloger stöds ännu inte"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Tar bort den symboliska länken"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Skrivbord"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Detaljer"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Detaljer för ny nyckel:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Katalo&ger"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Riktning"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Katalog"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "Katalogjämförelse"
 
@@ -2848,11 +2877,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Kataloglistningen avbröts av användaren"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "Kataloglistningen mislyckades"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Kataloglistningsfilter"
 
@@ -2860,16 +2889,16 @@
 msgid "Directory listing successful"
 msgstr "Kataloglistningen lyckades"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "Ina&ktivera allt"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
@@ -2877,50 +2906,49 @@
 "Inaktivera det här alternativet igen om du inte längre kan se rätt "
 "kataloginnehåll."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Koppla från servern"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Frånkopplad från servern"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Frånkopplad från servern: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Kopplar från föregående server"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Kopplar från den för närvarande synliga servern"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "Visa Om-dialogrutan"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "Använd &inte standardredigeraren"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Gör &ingenting"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2929,8 +2957,8 @@
 "Såvida du inte vill testa nya funktioner rekommenderas det att du använder "
 "de stabila versionerna."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Vill du verkligen stänga FileZilla?"
 
@@ -2944,7 +2972,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Vill du verkligen ta bort alla poster i Platshanteraren?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Vill du verkligen ta bort markerad post?"
 
@@ -2952,32 +2980,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Vill du verkligen ta bort överföringskön?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Vill du verkligen skicka \"%s\" till servern?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Dokumentation"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Använd inte den externa IP-adressen för &lokala anslutningar."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "Punktfiler är filnamn som börjar med en punkt, t.ex. .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Åtgärd vid dubbelklick"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Hämta"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "Gräns för hä&mtning:"
 
@@ -2990,41 +3018,50 @@
 msgid "Download limit: none"
 msgstr "Gräns för hämtning: ingen"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Hämta sökresultat"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Hämta markerad katalog"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "Hämta markerade filer och kataloger"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Hämtningshastighet: %s/s\n"
+"Sändningshastighet: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Hämtar"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Hämtar %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Hämtar sökresultat"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3033,59 +3070,63 @@
 "Dra och s&läpp mellan olika instanser av FileZilla har ännu inte "
 "implementerats."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Dra och s&läpp mellan olika servrar har ännu inte implementerats."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Kop&iera"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "A&ktivera allt"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "G&å in i katalogen"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "Kö&r"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "A&vsluta"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "E-postadress:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Varje filter behöver minst ett villkor."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Redigera filter"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Redigera filen med den konfigurerade redigeraren och skicka ändringarna till "
 "servern."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "Redigeringen misslyckades"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "E-postadress:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Tomt kommando"
 
@@ -3093,7 +3134,7 @@
 msgid "Empty command."
 msgstr "Tomt kommando."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Listning av tomma kataloger"
 
@@ -3105,101 +3146,114 @@
 msgid "Empty file extension."
 msgstr "Tom filändelse."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Tomma filternamn tillåts inte."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Tomt namn"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Tom textsträng innanför citationstecken."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "Akt&ivera allt"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Aktivera &filtrering av felaktiga tecken"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Krypterad"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Kryptering"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Krypteringsinformation"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Avsluta jämförelsen och ändra sorteringsordning?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Ange an&passat kommando..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Ange 0 för obegränsad hastighet."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Ange kommando"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Ange anpassat kommando"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Gå in i katalogen"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Ange filternamn"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Ange namn för filteruppsättning"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Ange ett nytt namn för filteruppsättningen"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Ange lösenord"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Gå in i markerad katalog"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Ange adressen till servern.\n"
 "För att ange serverprotokollet, inled värden med protokollidentifieraren. Om "
 "inget protokoll anges kommer standardprotokollet (ftp://) att användas.\n"
 "Du kan även ange fullständiga URL:er i formatet protokoll://användare:"
-"lösenord@värd:port här, värdena i de andra fälten kommer då att skrivas över."
+"lösenord@värd:port här, värdena i de andra fälten kommer då att skrivas "
+"över.\n"
+"\n"
+"Protokoll som stöds:\n"
+"- ftp:// för vanlig FTP\n"
+"- sftp:// för SSH:s filöverföringsprotokoll\n"
+"- ftps:// för FTP över TLS (implicit)\n"
+"- ftpes:// för FTP över TLS (explicit)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3210,7 +3264,7 @@
 "Ange lösenord för filen \"%s\".\n"
 "Observera att den konverterade filen inte kommer att vara lösenordsskyddad."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3232,7 +3286,7 @@
 msgid "Error importing"
 msgstr "Importfel"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Fel vid inläsning av kön"
 
@@ -3241,27 +3295,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "Fel vid inläsning av XML-fil"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Fel vid sparande av kön"
 
@@ -3272,74 +3326,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "Fel vid skrivning av XML-fil"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Fel, filnamnet kan inte tolkas."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Fel, den lokala filen finns men kan inte tas bort"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Fel:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Etablera anslutning i en ny flik"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Varje månad"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Varannan vecka"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Exempel: png \"c:\\program\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Exempel"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "&Kör"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Körbar fil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Den körbara filen innehåller ingen versionsinformation, kan därför inte söka "
 "efter uppdateringar."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "Utforskare"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Exportera &kö"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Exportera &inställningar"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Exportera inställningar"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "F&ilternamn:"
 
@@ -3347,7 +3409,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Filöverföringsprotokoll"
 
@@ -3359,25 +3421,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Osäkert Filöverföringsprotokoll"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP-motorn är inte initierad, kan inte ansluta"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP-proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP-URL"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3393,26 +3455,26 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP över implicit TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Misslyckades med att byta katalog"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Misslyckades med att byta språk"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Misslyckades med att söka efter en nyare version av FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Misslyckades med att kopiera eller flytta platserna"
 
@@ -3420,46 +3482,46 @@
 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:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Misslyckades med att skapa ett lyssningsuttag, avbryter"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 "Misslyckades med att skapa ett lyssningsuttag för överföring i aktivt läge"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Misslyckades med att hämta den senaste versionen av FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "Misslyckades med att erhålla sökvägen till \"Mina dokument\""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Misslyckades med att erhålla sökvägen till Skrivbordet"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 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:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Misslyckades med att initiera FTP-motorn"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Misslyckades med att initiera TLS."
@@ -3473,24 +3535,24 @@
 msgid "Failed to load private key: %s"
 msgstr "Misslyckades med att läsa in den privata nyckeln: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Misslyckades med att öppna \"%s\" för skrivning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Misslyckades med att öppna \"%s\" för läsning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Misslyckades med att öppna \"%s\" för skrivning"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Misslyckades med att tolka returnerad sökväg."
 
@@ -3498,7 +3560,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Misslyckades med att tolka det tillförlitliga rotcertifikatet."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Misslyckades med att ta emot data"
 
@@ -3510,11 +3572,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Misslyckades med att hämta extern ip-adress, avbryter"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 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:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Misslyckades med att läsa av lokal ip-adress."
 
@@ -3530,14 +3592,14 @@
 msgid "Failed to send command."
 msgstr "Misslyckades med att skicka kommandot."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3545,14 +3607,14 @@
 "Misslyckades med att ställa in språket till %s (%s), använder systemets "
 "standardspråk (%s, %s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
@@ -3560,14 +3622,14 @@
 "Misslyckades med att ställa in språket till %s, använder systemets "
 "standardspråk"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3578,7 +3640,7 @@
 msgid "Failed to validate settings"
 msgstr "Misslyckades med att validera inställningarna"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Misslyckades med att verifiera andra partens certifikat"
 
@@ -3595,21 +3657,19 @@
 msgid "Failed transfers"
 msgstr "Misslyckade överföringar"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Fall tillbaka till aktivt läge"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "Fi&l:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "Fil&er"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Fil"
 
@@ -3625,7 +3685,7 @@
 msgid "File editing"
 msgstr "Filredigering"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "Filen finns"
 
@@ -3633,7 +3693,7 @@
 msgid "File exists action"
 msgstr "Åtgärd om filen finns"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "Filen har ändrats"
 
@@ -3641,14 +3701,14 @@
 msgid "File lists"
 msgstr "Fillistor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Filen hittades inte"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "Filsökning"
 
@@ -3683,25 +3743,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Filöverföringen lyckades, överförde %s på %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "Filöverföringar pågår fortfarande."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "Filen skulle gå att överföra som ASCII-data."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "Filen skulle gå att överföra som binär data."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla-fel"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3709,77 +3769,77 @@
 "FileZilla kan nu testa din konfiguration för att säkerställa att allt är "
 "korrekt konfigurerat."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla är redan anslutet till en server."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla körs i \"kiosk\"-läge.\n"
-"Inloggningstyperna \"Normal\" och \"Konto\" är inte tillgängliga i detta "
-"läge."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 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."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Uppdateringar av FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "Fillistornas status&rad"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Filnamn"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "Filnamns&filter..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "Filnamnet är ogiltigt"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Filnamn får inte innehålla något av följande tecken: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Filnamnet är oförändrat"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "Filnamn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Filnamn får inte innehålla något av följande tecken: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr ""
 "Filnamn får inte innehålla något av följande tecken: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "Filer som för närvarande redigeras"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Filstorlek"
@@ -3788,68 +3848,68 @@
 msgid "Filesize format"
 msgstr "Format för filstorlek"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Filtyp"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Filtypsassociationer"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Filtret gäller för:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "Filtrera felaktiga tecken i filnamn"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Filternamnet finns redan"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Filtrera ut objekt som matchar alla av följande"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Filtrera ut objekt som matchar något av följande"
 
-#: resources.h:223
+#: resources.h:233
 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:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Filteruppsättningen finns redan"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "Filtrera kataloglistningar"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Filtervalideringen misslyckades"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Fingeravtryck (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Fingeravtryck (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Fingeravtryck:"
 
@@ -3857,7 +3917,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Konfigurationsguide för brandvägg och router"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3865,12 +3925,12 @@
 "Kör nätverkskonfigurationsguiden för mer detaljerad information om vad dessa "
 "alternativ gör."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "För högre tillförlitlighet bör du ange ett intervall på minst 10 portar."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3878,33 +3938,33 @@
 "För denna session kommer standardinställningarna att användas. Ändringar i "
 "inställningarna kommer inte att sparas."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Tvinga &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "Tvinga visning av &dolda filer"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "Tvinga visning av dolda filer"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Formatspecifikationer:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Format: Filändelsen följd av kommando och argument korrekt angivna med "
 "citationstecken."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Vidare dokumentation"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Allmänt"
 
@@ -3912,21 +3972,21 @@
 msgid "General SOCKS server failure"
 msgstr "Allmänt SOCKS-serverfel"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Allmän proxy"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Läs av extern IP-adress från följande URL:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Få hjälp"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Angivet namn för filteruppsättning finns redan. Skriv över filteruppsättning?"
@@ -3935,15 +3995,15 @@
 msgid "Global bookmarks"
 msgstr "Globala bokmärken"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Grupprättigheter"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "H&ög"
 
@@ -3951,21 +4011,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP över TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hashsumma:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Dold"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Hög"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Högst"
 
@@ -3973,47 +4033,47 @@
 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."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Håll Skift-tangenten nedtryckt för att växla filtertillståndet på båda "
 "sidorna samtidigt."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Webbsida:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Värdnyckelns fingeravtryck:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Värdnyckeln stämmer inte"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
-msgstr "Värden börjar med \"[\" men ingen avslutande hakparantes hittades."
+msgstr "Värden börjar med \"[\" men ingen avslutande hakparentes hittades."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
 msgstr "Värden är inte tillgänglig"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Värd:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Timmar,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "IS&O 8601 (exempel: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -4023,12 +4083,12 @@
 "tid än den specificerade, kommer anslutningen att stängas och FileZilla "
 "kommer att försöka återansluta."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Tillhandahåll loggar med loggningsnivån \"Utförlig\" vid felrapportering."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4040,7 +4100,7 @@
 "och du bör prova det aktiva läget. Du kan ställa in överföringsläget för "
 "varje server i Platshanteraren."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4049,7 +4109,7 @@
 "ansluta till felkonfigurerade servrar som vägrar använda det valda "
 "överföringsläget."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4072,7 +4132,7 @@
 "Om problemet kvarstår, är det någon router och/eller brandvägg som avbryter "
 "anslutningen."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4082,7 +4142,7 @@
 "till \".1\" i slutet på filnamnet (möjligen skrivs äldre loggfiler över) och "
 "en ny fil skapas."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4103,7 +4163,7 @@
 msgstr ""
 "Om det här problemet kvarstår bör du kontakta tillverkaren av din router."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4113,7 +4173,7 @@
 "synkroniserad med serverns. Om tiden skiljer sig (t.ex. olika tidszoner), "
 "ange en tidszonsskillnad i Platshanteraren."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4121,11 +4181,11 @@
 "Om tidsstämpelbaserad jämförelse används, anse två filer som likvärdiga när "
 "deras tidsstämplar inte skiljer sig mer än detta tröskelvärde."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Om du ändrar språket måste du starta om FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4133,21 +4193,21 @@
 "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:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Om du stänger FileZilla kommer du att förlora dina ändringar."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "Om du anger fel filtyper kan dessa filer bli skadade när de överförs."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Om fel uppstår är din konfiguration inte korrekt."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4166,7 +4226,7 @@
 "fallet kan du prova att växla till passivt läge och kontakta "
 "serveradministratören för hjälp."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4174,7 +4234,7 @@
 "Om du lyckas slutföra guiden och det sista testet lyckas, bör de brandväggar "
 "och routrar som du har vara korrekt konfigurerade."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4182,7 +4242,7 @@
 "Om du använder en brandvägg bör du försäkra dig om att FileZilla tillåts att "
 "ta emot anslutningar på alla angivna portar."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4202,7 +4262,7 @@
 msgid "Import data from older version"
 msgstr "Importera data från tidigare version"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Importinställningar"
 
@@ -4216,7 +4276,7 @@
 msgid "Improperly quoted association."
 msgstr "Associeringen är inte korrekt angiven med citationstecken."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4224,7 +4284,7 @@
 "I aktivt läge kommer FileZilla att lyssna på en port för dataöverföringar. "
 "Du måste ange vilka portar som FileZilla ska använda."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4232,7 +4292,7 @@
 "Om du har en router måste du vidarebefordra alla tillgängliga portar "
 "eftersom FileZilla inte kan påverka vilka portar som väljs av ditt system."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4240,7 +4300,7 @@
 "Om du föredrar automatiska uppdateringar kan du aktivera automatiska "
 "uppdateringskontroller i inställningsdialogen."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4248,7 +4308,7 @@
 "För att kunna använda aktivt läge måste FileZilla känna till din externa IP-"
 "adress."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4258,7 +4318,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:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4266,20 +4326,20 @@
 "Ofullständig kedja, toppcertifikatet är inget självsignerat certifikat från "
 "en certifikatsutfärdare"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Fel lösenord"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Initierar TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 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:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Interaktiv"
@@ -4289,8 +4349,8 @@
 msgstr "Gränssnitt"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Avbröts av användaren"
 
@@ -4302,8 +4362,8 @@
 msgid "Invalid HTTP Response"
 msgstr "Ogiltigt HTTP-svar"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4326,12 +4386,13 @@
 msgid "Invalid date"
 msgstr "Ogiltigt datum"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Ogiltigt filnamn"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Ogiltig värd, efter avslutande hakparentes får bara kolon och port följa."
@@ -4340,28 +4401,35 @@
 msgid "Invalid input"
 msgstr "Ogiltig inmatning"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Ogiltig port angiven. Porten måste vara ett värde från 1 till 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "Ogiltigt protokoll angivet. Giltiga protokoll är:\n"
 "ftp:// för vanlig FTP,\n"
 "sftp:// för SSH:s filöverföringsprotokoll,\n"
-"ftps:// för FTP över SSL (implicit) och\n"
-"ftpes:// för FTP över SSL (explicit)."
+"ftps:// för FTP över TLS (implicit) och\n"
+"ftpes:// för FTP över TLS (explicit)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Ogiltigt reguljärt uttryck i sökvillkoren."
 
@@ -4369,7 +4437,7 @@
 msgid "Invalid response code"
 msgstr "Ogiltig svarskod"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Ogiltiga sökvillkor: %s"
@@ -4381,38 +4449,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Ogiltig sökväg för platsen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Ogiltig storlek i villkor"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Ogiltigt användarnamn angivet."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Rättskipningsland:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Rättskipningsplats:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Rättskipningsstat eller provins:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Lista kataloger överst"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4423,50 +4491,54 @@
 "FileZilla genomför vissa tester för att kontrollera om servern stöder den "
 "här funktionen, kan testet misslyckas."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Nyckelutbyte"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Nyckelutbyte:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "&Lägst"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Språk"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Språket har ändrats"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Senast ändrad"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Layout"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Gräns för samtidiga &hämtningar:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Gräns för samtidiga &sändningar:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Begränsa lokala portar"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "Begränsa loggfilens storlek"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Gräns:"
 
@@ -4474,7 +4546,7 @@
 msgid "Line length exceeded"
 msgstr "Radlängd överstigen"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Länkad mot"
 
@@ -4483,21 +4555,21 @@
 msgstr "Lyssningsuttag stängt"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Listning:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "&Lägsta tillgängliga port:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Lokal"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "Lokal fil"
 
@@ -4513,7 +4585,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Den lokala filen har inget giltigt filnamn."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Lokala filter:"
 
@@ -4521,7 +4593,7 @@
 msgid "Local site:"
 msgstr "Lokal plats:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Plats:"
 
@@ -4529,16 +4601,16 @@
 msgid "Log file"
 msgstr "Loggfil"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Logg för uppdateringskontrollen:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Loggning"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4547,7 +4619,7 @@
 "servern kan hantera UTF-8. Kan inte falla tillbaka på lokal "
 "teckenuppsättning eftersom proxy används."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4555,18 +4627,18 @@
 "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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Inloggningssekvensen fullständigt utförd, ändå inte inloggad. Avbryter."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Inloggningstyp måste antingen vara \"ask\" eller \"interactive\" (utan "
 "citationstecken)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4575,13 +4647,13 @@
 "Inloggningstyp, kan bara användas tillsammans med en URL för FTP. Argumentet "
 "måste antingen vara \"%s\" eller \"%s\""
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Låg"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Lägst"
 
@@ -4589,11 +4661,11 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 "Försäkra dig om att filen är åtkomlig och att den är ett välformat XML-"
@@ -4616,7 +4688,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Felaktigt svar, servern skickar inte korrekta radslut"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4627,58 +4699,58 @@
 msgid "Manual transfer"
 msgstr "Manuell överföring"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Matcha alla av följande"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Matcha något av följande"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Matcha inget av följande"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Maximalt antal samtidiga ö&verföringar:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Meddelandelogg"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Placering av meddelandeloggen"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Minuter"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Flytta &ner"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Flytta &upp"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Den här Datorn"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Mina Dokument"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Mina platser"
 
@@ -4687,33 +4759,33 @@
 msgid "N/a"
 msgstr "Inte tillgänglig"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Namn"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Namnet finns redan"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Ett bokmärke med det namnet finns redan."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Namn:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Du måste ange ett filternamn"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Du måste ange en giltig fjärrsökväg"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Du måste ange en teckenkodning"
 
@@ -4721,19 +4793,23 @@
 msgid "Network unreachable"
 msgstr "Nätverket är inte tillgängligt"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Aldrig"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Ny &katalog"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "Ny &flik"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Nytt Bok&märke"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4746,41 +4822,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Nytt bokmärke"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Ny katalog"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Nya funktioner och förbättringar i %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Nytt filter"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Ny katalog"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Ny plats"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Bredvid överföringskön"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Nej"
 
@@ -4788,25 +4864,25 @@
 msgid "No category to export selected"
 msgstr "Ingen kategori att exportera"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Inget kommando gavs, avbryter."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Ingen extern IP-adress inställd, provar standard."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Inga filer redigeras för närvarande."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Inget filternamn angivet"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Ingen värd angiven, ange en värd."
 
@@ -4814,26 +4890,26 @@
 msgid "No images available"
 msgstr "Inga bilder tillgängliga"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "Inga fler filer i kön!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Inget namn för filteruppsättning angivet."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Inget program är associerat med filtypen"
 
-#: resources.h:420
+#: resources.h:430
 #, 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/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Inga sökresultat"
 
@@ -4851,23 +4927,23 @@
 msgid "No username given."
 msgstr "Inget användarnamn angivet."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Ingen"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Ingenting markerat ännu"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4877,15 +4953,15 @@
 msgstr "Alla poster kunde inte återplaceras i kö för visning/redigering."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Inte ansluten"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "Inte ansluten till någon server"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Inte ansluten till någon server."
 
@@ -4893,22 +4969,22 @@
 msgid "Not connected."
 msgstr "Inte ansluten."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 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."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr ""
 "Observera: Detta fungerar bara med enkla, okrypterade FTP-anslutningar."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Observera: Att använda en allmän proxy påtvingar passivt läge för FTP-"
 "anslutningar."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Antal decimaler:"
 
@@ -4916,21 +4992,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Antal försök måste vara mellan 0 och 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "Ö&ppna fil"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "OK"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4938,119 +5014,123 @@
 "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:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "En gång"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Endast versionsinformation för FileZilla och det operativsystem du använder "
-"kommer att skickas till servern."
+#: resources.h:970
+msgid "Once a week"
+msgstr "En gång i veckan"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "Öppna katalogen i systemets filhanterare"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Öppna Platshanteraren"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Öppna Platshanteraren."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Öppna Platshanteraren. Högerklicka för en lista av platser."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "Öppna filen."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Öppna Inställningsdialogen för FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Öppnad som:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Öppnandet misslyckades"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Öppnar en ny flik"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Öppnar Platshanteraren"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Öppnar dialogrutan för filtrering av kataloglistning. Högerklicka för att "
 "aktivera/inaktivera filtrena."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Operativsystem"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Operativsystemetsproblem påträffades"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Organisation:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Övrigt:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Översikt"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Skriv över om källan är &nyare"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Skriv över filen"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Skriv över filen om storleken skiljer sig"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Skriv över filen om storleken skiljer sig eller källfilen är nyare"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Skriv över filen om källfilen är nyare"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Skriv över om storleken &skiljer sig"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Skriv över om storle&ken skiljer sig eller källan är nyare"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Ägarrättigheter"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Ägare/Grupp"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5058,7 +5138,7 @@
 "H&indra systemet från att försättas i vänteläge under överföringar och andra "
 "aktiviteter"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Proxy&värd:"
@@ -5067,27 +5147,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT-kommandot påverkat av en router eller brandvägg."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&ssivt läge (rekommenderas)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paket"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Parametern är ingen giltig URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Lösen&ord:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Passivt läge (rekommenderas)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Passivt läge"
@@ -5102,42 +5182,46 @@
 msgid "Password required"
 msgstr "Lösenord krävs"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Sökväg"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Sökvägen hittades inte:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Sökvägar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Borttagning pågår"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Rättighet"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Rättigheter"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Plattform:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5153,7 +5237,7 @@
 "Kontrollera på http://filezilla-project.org/probe.php att servern kör och "
 "kontrollera noga dina inställningar igen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5161,7 +5245,7 @@
 "Sök i pakethanteraren på ditt system efter ett uppdaterat paket eller besök "
 "http://filezilla-project.org för att hämta källkoden för FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5190,7 +5274,7 @@
 msgid "Please enter a custom time format."
 msgstr "Ange ett anpassat tidsformat."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Ange ett datum på formen ÅÅÅÅ-MM-DD såsom till exempel 2010-07-18."
@@ -5201,20 +5285,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Ange en hastighetsgräns större eller lika med 0 %s/s för hämtningar."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Ange ett namn för det nya filtret."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 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:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Ange ett nytt namn för filteruppsättningen \"%s\""
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Ange ett nytt namn för filtret."
 
@@ -5235,11 +5319,11 @@
 "transfers."
 msgstr "Ange en siffra mellan 0 och 10 för antalet samtidiga överföringar."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "Ange ett lösenord för denna server:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5256,11 +5340,11 @@
 "Ange en tidsgräns mellan 5 och 9999 sekunder eller 0 för att inaktivera "
 "tidsgränser."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Ange ett unikt namn för den här filteruppsättningen"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Ange ett användarnamn för den här servern:"
 
@@ -5272,17 +5356,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "Ange en URL från vilken man kan läsa av din externa IP-adress"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Ange ett uppdateringsintervall på minst 7 dagar"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Ange en hastighetsgräns större eller lika med 0 %s/s för sändningar."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5290,14 +5370,18 @@
 "Ange ett rått FTP-kommando.\n"
 "Användandet av råa FTP-kommandon kommer att tömma katalogcachen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Ange namnet på katalogen som skall skapas:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "Ange namnet på filen som skall skapas:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Ange användarnamn och lösenord för den här servern:"
 
@@ -5316,7 +5400,7 @@
 "fall du har en dynamisk adress eller inte känner till din externa adress kan "
 "du använda alternativet för externt uppslag."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5332,7 +5416,7 @@
 "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:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 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."
@@ -5349,7 +5433,7 @@
 "manuellt ställa in \"port forwarding\". Kom ihåg att inte köra din router i "
 "ett så kallat \"DMZ mode\" eller \"Game mode\"."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5361,7 +5445,7 @@
 "andra skadliga program. Det här kan ge upphov till ett falsklarm som du "
 "tryggt kan ignorera."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5369,7 +5453,7 @@
 "Observera att bevarande av tidsstämplar vid sändningar till FTP-, FTPS- och "
 "FTPES-servrar endast fungerar om de stöder kommandot MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5377,7 +5461,7 @@
 "Observera att vissa servrar kan bannlysa dig om du försöker återansluta för "
 "ofta eller med för korta intervall."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5386,7 +5470,7 @@
 "Se http://wiki.filezilla-project.org/Date_and_Time_formatting för mer "
 "information"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5403,38 +5487,38 @@
 "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."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Välj en åtgärd:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Välj kategori att importera."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Välj det överföringsläge du vill använda som standard."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Välj de nya attributen för katalogen \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Välj de nya attributen för filen \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Välj de nya attributen för de markerade katalogerna."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "Välj de nya attributen för de markerade filerna och katalogerna."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Välj de nya attributen för de markerade filerna."
 
@@ -5453,31 +5537,31 @@
 "Sådant som protokollinspektion eller protokollspecifika \"fixar\" måste vara "
 "inaktiverade."
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr "Besök http://filezilla-project.org för mer information om FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr ""
 "Besök http://filezilla-project.org för att hämta den allra senaste versionen."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Postnummer:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Fördefinierade platser"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "Bevarar tidsstämplar för filer"
 
@@ -5485,48 +5569,60 @@
 msgid "Preview:"
 msgstr "Förhandsgranska:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr ""
 "Certifikateten för primär anslutning och dataanslutning stämmer inte överens."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "Skriv ut diagnostisk information relaterad till uppstart av FileZilla"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "Skriv versionsinformation till stdout och avsluta"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Prioritera kataloger (standard)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Prioritet"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Sekretesspolicy:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Integritetspolicy: Bara din version av FileZilla, det operativsystem du "
+"använder och din CPU-arkitektur kommer att skickas till servern."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Privata &nycklar:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Pro&tokoll:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Proxy&lösenord:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Behandla &kön"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Protokoll:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Proxy&port:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Proxya&nvändare:"
 
@@ -5534,12 +5630,17 @@
 msgid "Proxy authentication failed"
 msgstr "Proxyns autentisering misslyckades"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Proxyhandskakningen misslyckades: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5554,23 +5655,23 @@
 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:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Proxyn är inställd men proxyns värd eller port är ogiltig"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Autentisering av publik nyckel"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Publik nyckel-algoritm:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Publika rättigheter"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Hela kön har behandlats"
 
@@ -5589,39 +5690,39 @@
 msgid "Queue: empty"
 msgstr "Kö: tom"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Filer i kö"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Köar:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "S&tarta om systemet"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "F&järrkatalogträd"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 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:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Rått FTP-kommando"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "&Läs"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "&Uppdatera"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "&Byt namn"
 
@@ -5633,65 +5734,79 @@
 "Kör guiden igen och kontrollera noggrant dina inställningar och konfigurera "
 "alla routrar och brandväggar i enlighet med dessa."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Lä&s"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Skrivskyddad"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "Vill du verkligen avbryta aktuell åtgärd?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Vill du verkligen ta bort %d katalog och dess innehåll?"
-msgstr[1] "Vill du verkligen ta bort %d kataloger och deras innehåll?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Vill du verkligen ta bort %d fil?"
-msgstr[1] "Vill du verkligen ta bort %d filer?"
+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] ""
+"Vill du verkligen ta bort %d katalog och dess innehåll från servern?"
+msgstr[1] ""
+"Vill du verkligen ta bort %d kataloger och deras innehåll från servern?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
+#, 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:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Vill du verkligen ta bort %s och %s?"
+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:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Vill du verkligen ta bort alla markerade filer och/eller kataloger?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Orsak"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Starta om nu"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "&Upprepa i underkataloger"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Mottog en rad som överskred 10000 tecken, avbryter."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Mottagen data är påverkad"
 
@@ -5703,11 +5818,11 @@
 "Återanslutningsinformation kan inte tömmas när du är ansluten till en\n"
 "server. Om du fortsätter kommer din anslutning av kopplas från."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Inställningar för återanslutning"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Återansluter till senaste använda servern"
 
@@ -5715,34 +5830,38 @@
 msgid "Redirection to invalid address"
 msgstr "Omdirigering till ogiltig adress"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "Uppdatera fil- och kataloglistor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Komma ihåg lösenord?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Fjärran"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Fjärrcertifikatet inte pålitligt."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Fjärrfil"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Fjärrfilsökning"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Fjärrfilter:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Fjärrsökväg"
 
@@ -5755,7 +5874,7 @@
 "Fjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig absolut "
 "sökväg och att den stöds av den aktuella platsens servertyp (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5766,7 +5885,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Fjärrsökvägen kan inte tolkas. Försäkra dig om att det är en giltig absolut "
@@ -5776,11 +5895,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Fjärrsökvägen kunde inte tolkas."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Hantering av fjärrsökväg:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Fjärrsökväg:"
 
@@ -5788,76 +5907,76 @@
 msgid "Remote site:"
 msgstr "Fjärrplats:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "&Ta bort alla"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Ta bort &markerade"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Byt namn på fil"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Byt namn på markerad katalog"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "Byt namn på markerade filer och kataloger"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Byter namn på \"%s\" till \"%s\""
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Rapportera fel och efterfråga funktioner"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "Kräv explicit FTP över TLS"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "Kräv implicit FTP över TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "&Återställ och lägg alla filer i kö på nytt"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Slår upp adressen för %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Slår upp värdnamnet"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Svar:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Resultat:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Återuppta filöverföringen"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5865,38 +5984,38 @@
 "Återupptagning av ASCII-filer kan skapa problem om servern använder ett "
 "annat radslutsformat än klienten."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Hämtar kataloglistning..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Hämtar extern IP-adress från %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Rotcertifikatet är inte pålitligt"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "V&isa filer som redigeras för närvarande..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "Visa Plats&hanteraren vid start"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "S&täng av systemet"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "S&toppa"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "S&ynkroniserad bläddring"
 
@@ -5904,31 +6023,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Spara inställningarna?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Sparande av lösenord har inaktiverats av dig."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 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:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "Söker efter filer att skicka"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Sök&villkor:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "Sök i &katalogen:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "Sök rekursivt efter filer"
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "Sök efter filer på servern"
 
@@ -5941,26 +6074,26 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Se även: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "Väl&j server"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Välj &sida:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Välj tema"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
 "Välj standardåtgärd att utföra om målfilen för en överföring redan finns."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Välj standardredigerare"
 
@@ -5980,7 +6113,7 @@
 "Välj standardåtgärd om filen redan finns (gäller bara för de för närvarande "
 "markerade filerna i kön)."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Välj hämtningsplats för paket"
 
@@ -6001,7 +6134,7 @@
 msgstr "Välj fil för exporterade inställningar"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Välj fil för exporterade platser"
 
@@ -6017,12 +6150,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Välj filnamn för den konverterade nyckelfilen"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Välj hur dessa filer skall öppnas."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Välj katalog att hämta till"
 
@@ -6030,15 +6163,15 @@
 msgid "Select target filename"
 msgstr "Välj målfilens namn"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Välj kategorier att exportera:"
 
-#: resources.h:282
+#: resources.h:292
 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:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6052,7 +6185,7 @@
 msgstr[0] "%d katalog markerad."
 msgstr[1] "%d kataloger markerade."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6073,7 +6206,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:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "%s och %s är markerade för överföring."
@@ -6088,13 +6221,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "%s och %s är markerade. Total storlek: Minst %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Vald redigerare existerar inte."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "Vald fil redigeras redan"
 
@@ -6102,15 +6235,15 @@
 msgid "Selected file is already loaded"
 msgstr "Vald fil är redan inläst"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "Vald fil är redan öppnad"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "Vald fil redigeras fortfarande"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Det valda filtret fungerar bara för lokala filer."
 
@@ -6127,54 +6260,59 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Varning: Vald port används ofta av ett annat protokoll."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Skicka &keep-alive kommandon för FTP"
 
-#: resources.h:543
+#: resources.h:560
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Skickar keep-alive kommando"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Serienummer:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "Server&typ:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "Servern stängde inte ner TLS-anslutningen korrekt"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Servern stöder inte icke-ASCII-tecken."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr "Servern saknar stöd för att återuppta filer > %d GB"
+msgstr "Servern stöder inte återupptagande av filer > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"Servern saknar stöd för att återuppta filer > %d GB. Avsluta överföringen "
+"Servern stöder inte återupptagande av filer > %d GB. Avsluta överföringen "
 "eftersom filerna är lika stora."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
-msgstr "Servern saknar stöd för att återuppta filer > 2 GB"
+msgstr "Servern stöder inte återupptagande av filer > 2 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
-msgstr "Servern saknar stöd för att återuppta filer > 4 GB"
+msgstr "Servern stöder inte återupptagande av filer > 4 GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6183,18 +6321,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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 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:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Servern returnerade en tom sökväg."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6202,13 +6340,13 @@
 "Servern skickade en extra inloggningsuppmaning. Du måste använda den "
 "interaktiva inloggningstypen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6228,101 +6366,112 @@
 msgid "Server sent unexpected reply."
 msgstr "Servern skickade ett oväntat svar."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Server till klient MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "Server till klient chiffer:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "Server&typ:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Server/Lokal fil"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Server:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Sessionsinformation"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "Ställ in &prioritet"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, 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:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize anropades utan uttag (socket)"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Inställningar"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Visa &rå kataloglistning"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Visa &välkomstdialogruta..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "Visa båda katalogträden och fortsätta med jämförelsen?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Visar tillgängliga TLS-chiffer"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Visar denna hjälpdialogruta"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Stäng av nu"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Signaturalgoritm:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "&Platshanterarens poster"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Platshanteraren"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Platshanteraren - Kan inte komma ihåg lösenord"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Platshanteraren - Felaktig data"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Platshanteraren är redan öppen"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Platsen existerar inte."
 
@@ -6332,8 +6481,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Platssökvägen är felaktig."
 
@@ -6351,11 +6500,11 @@
 "Platsspecifika bokmärken kräver att servern lagras i Platshanteraren.\n"
 "Lägga till nuvarande anslutning i Platshanteraren?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Storlek"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Storleksformatering"
 
@@ -6364,31 +6513,31 @@
 msgid "Size unknown"
 msgstr "Storleken är okänd"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Hoppa över filen"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Hoppar över hämtningen av %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Hoppar över sändningen av %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Några filer redigeras fortfarande eller behöver skickas."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6396,19 +6545,19 @@
 "Vissa felkonfigurerade fjärrservrar som finns bakom en router kan svara med "
 "sin lokala IP-adress."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Sortera kataloger som filer"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Sorteringsordningen kan inte ändras när kataloger jämförs."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Sortering"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Sorterings&läge:"
 
@@ -6420,20 +6569,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Källfilen och målfilen får inte vara identiska"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Källa och mål för släppåtgärden är identiska"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "Källfil:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Hastighetsgränser"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Hastighetsgränser"
 
@@ -6445,7 +6594,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Hastighetsgränser är aktiverade, klicka för att ändra."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Stabila versioner och betaversioner"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Endast stabila versioner"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Starta överföringen &genast"
 
@@ -6453,43 +6610,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Starta med Platshanteraren öppen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Påbörjar hämtning av %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Påbörjar sändning av %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "Startar lokal plats vid angiven sökväg"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "Stat eller provins:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Status"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Status:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Stoppa och ta bort &allt"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Gata:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Utfärdat till"
 
@@ -6497,11 +6658,11 @@
 msgid "Successful transfers"
 msgstr "Lyckade överföringar"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Sammanfattning av testresultatet:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
@@ -6509,44 +6670,45 @@
 "Symboliska länkar till filer påverkas inte av det här valet, sådana "
 "symboliska länkar tas alltid bort."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Synkroniserad bläddring"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Synkroniserad bläddring har inaktiverats."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Syntaxfel"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Syntaxfel i kommandoraden"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "System"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "&Verktygsfält"
 
@@ -6554,11 +6716,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Anslutningen över TSL/SSL etablerad, skickar HTTP-begäran"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL-anslutning etablerad, väntar på välkomstmeddelande..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL-anslutning etablerad."
 
@@ -6566,27 +6728,31 @@
 msgid "TTL expired"
 msgstr "TTL har förfallit"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "Målfilen finns redan"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "Målfil:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Målfilnamnet finns redan!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "Målfilnamnet finns redan, vill du verkligen fortsätta?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Testresultat"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Testar om servern klarar av att återuppta överföringar"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6603,7 +6769,7 @@
 "Platshanteraren är öppnad i en annan instans av FileZilla 3.\n"
 "Stäng den annars kan inte informationen tas bort."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "XML-dokumentet är inte välformat: %s"
@@ -6614,11 +6780,11 @@
 msgstr "Adressen som du angav var: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Bokmärket kunde inte läggas till."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Bokmärkerna kunde inte tömmas."
 
@@ -6630,19 +6796,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Den anpassade inloggningssekvensen får inte vara tom."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "Dataanslutningen kunde inte etableras: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Standardredigeraren för textfiler kunde inte hittas."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Standardredigeraren för textfiler är \"%s\"."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "Det angivna filternamnet finns redan, välj ett annat namn."
 
@@ -6661,9 +6832,9 @@
 "Filen %s finns redan.\n"
 "Ange ett nytt namn:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6681,14 +6852,14 @@
 "Filen \"%s\" kunde inte läsas in eller innehåller den inte någon privat "
 "nyckel."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Filen \"%s\" kunde inte läsas in."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6697,8 +6868,8 @@
 "Filen \"%s\" kunde inte öppnas:\n"
 "I ditt system är inget program associerat med den här filtypen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6740,7 +6911,7 @@
 "lösenordsskyddade nyckelfiler ännu.\n"
 "Vill du konvertera den till en oskyddad fil?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Den körbara filen som är vald som standardredigerare finns inte."
 
@@ -6776,11 +6947,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Följande tecken kommer att ersättas: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "Följande filer redigeras för närvarande:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Den fria öppenkällkodslösningen för FTP"
 
@@ -6788,7 +6959,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "De globala bokmärkena kunde inte sparas."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6819,7 +6990,7 @@
 "Den lägsta tillgängliga porten måste vara mindre än eller lika med den "
 "högsta tillgängliga porten."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6827,7 +6998,7 @@
 "Den senaste versionen har hämtats. Klicka på Slutför för att stänga "
 "FileZilla och starta installationen."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6835,11 +7006,11 @@
 "Den senaste versionen har hämtats. Installera den på samma sätt som du "
 "installerade den här versionen."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Kön kommer inte att sparas."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6852,23 +7023,23 @@
 msgid "The selected categories have been imported."
 msgstr "De valda kategorierna har importerats."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Den valda filen innehåller importerbar data för följande kategorier:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "Den valda filen redigeras redan:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Den markerade filen är fortfarande öppen i något annat program, stäng filen."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6886,7 +7057,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Servern skickade ett oväntat eller okänt svar."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Servern använder följande teckenkodning för filnamn:"
 
@@ -6898,7 +7069,7 @@
 "Serverns certifikat är okänt. Undersök certifikatet noggrant för att "
 "försäkra dig om att servern är pålitlig."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6909,7 +7080,7 @@
 "försöker du faktiskt ansluta till en annan dator som utger sig för att vara "
 "servern."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6925,17 +7096,17 @@
 "Inställningarna har importerats. Du måste starta om FileZilla för att "
 "inställningarna skall gälla."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "Systemet kommer snart att startas om ifall du inte väljer att klicka på "
 "Avbryt."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 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."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6943,7 +7114,7 @@
 "Målfilen finns redan.\n"
 "Välj en åtgärd."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "Testet misslyckades. Vill du verkligen spara inställningarna?"
 
@@ -6951,11 +7122,11 @@
 msgid "Themes"
 msgstr "Teman"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Den här filteruppsättningen kan inte tas bort."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Den här filteruppsättningens namn kan inte bytas."
 
@@ -6967,7 +7138,7 @@
 "Detta innebär att någon router och/eller brandvägg fortfarande stör "
 "FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6975,7 +7146,7 @@
 "Det här fungerar endast om du inte är bakom en router, annars skulle ditt "
 "system bara returnera din interna adress."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6983,25 +7154,25 @@
 "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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Tid"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Tidsformatering"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Tids&gräns i sekunder:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Tidsgräns"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -7010,19 +7181,19 @@
 "Tidszonsskillnader: Servern: %d sekunder. Lokalt: %d sekunder. Skillnad: %d "
 "sekunder."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Titel:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7030,7 +7201,7 @@
 "För att stödja autentisering med publika nycklar måste FileZilla veta vilka "
 "privata nycklar som skall användas."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7047,7 +7218,7 @@
 "Grön: Filen är nyare än den omarkerade filen på andra sidan\n"
 "Röd: Filstorleken skiljer sig"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7057,23 +7228,23 @@
 "Om aktiverat, kommer serverns katalog att ändras i enlighet med hur "
 "navigeringen i den lokala katalogstrukturen sker och vice versa."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Påbörja/avbryt behandling av överföringskön"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Visa/dölj det lokala katalogträdet"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Visa/dölj meddelandeloggen"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Visa/dölj fjärrkatalogträdet"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "Visa/dölj överföringskön"
 
@@ -7086,37 +7257,37 @@
 msgstr "För många omdirigeringar"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Spårning:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "Överför"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Överföringens &riktning"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Överförings&läge"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Överföringsläge"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Överföringskö"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Överföringsinställningar"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Överföringens anslutning avbröts: %s"
@@ -7125,8 +7296,8 @@
 msgid "Transferred data got tainted."
 msgstr "Överförd data blev påverkad."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Överför"
 
@@ -7134,69 +7305,69 @@
 msgid "Transfers"
 msgstr "Överföringar"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Slutförda överföringar"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "Behandla filer &utan filändelse som ASCII-filer"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Behandla &följande filtyper som ASCII-filer:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Lita på ändrad värdnyckel:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Lita på ny värdnyckel:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Lita på den nya nyckeln och fortsätt anslutningen?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Lita på det här certifikatet och fortsätta med anslutningen?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Lita på den här värden och fortsätt anslutningen?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Typ"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Typ av FTP-proxy:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Typ av allmän proxy:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "S&kicka"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Gräns för sä&ndning:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "An&vänd filtypsassociationer om tillgängligt"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "Använd s&ystemstandard"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -7205,16 +7376,16 @@
 msgid "Unassigned error code %d"
 msgstr "Okänd felkod %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Avdelning:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Okänd"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "Okänd typ av FTP-proxy, kan inte skapa inloggningssekvensen."
 
@@ -7227,7 +7398,7 @@
 msgid "Unknown certificate"
 msgstr "Okänt certifikat"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7235,7 +7406,7 @@
 "Okänt fel vid öppnandet av filen. Se till att filen är åtkomlig och att den "
 "är ett välformat XML-dokument."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Okänd värdnyckel"
 
@@ -7248,7 +7419,7 @@
 "Okänd protokollversion för SOCKS vidareförhandling av användarnamn/lösenord-"
 "autentisering: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "Okänt rotelement, filen verkar inte vara skapad av FileZilla."
@@ -7270,7 +7441,7 @@
 "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:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Certifikatstypen stöds inte"
 
@@ -7278,25 +7449,24 @@
 msgid "Unsupported redirect"
 msgstr "Omdirigeringen stöds inte"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Sk&icka och ångra ändringar"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Uppdateringskontroll"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Uppdateringsguide"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Uppdateringar"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Skicka"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Sändningen misslyckades"
 
@@ -7309,98 +7479,98 @@
 msgid "Upload limit: none"
 msgstr "Gräns för sändning: ingen"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Skicka markerad katalog"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "Skicka markerade filer och kataloger"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "Skicka tillbaka den här filen till servern?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "Skicka den här filen till servern?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Skickar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Skickar och borttagning pågår"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Skickar och ångrar ändringar"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Använd anpassad t&eckenuppsättning"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Använd an&passad redigerare:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "Använd &standardredigeraren för textfiler"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Använd &synkroniserad bläddring"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Använd UTF-8 om servern stöder det, använd annars lokal teckenuppsättning."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Använd standardåtgärden"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Använd enkel FTP"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Använd den aktuella anslutningens server"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Använd servern från Platshanteraren"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Använd &systemstandard"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Använd följande IP-adress:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Använd följande portintervall:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Använd serverns externa IP-adress istället"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Använd denna om du är bakom en router och har en statisk extern IP-adress."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7411,87 +7581,87 @@
 "läge för första gången. Endast versionen av FileZilla som du använder kommer "
 "att skickas till servern."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "Användare:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Användarnamnet får inte bestå av en följd av blanksteg"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Använder proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Användning av fel teckenuppsättning kan leda till att filnamn inte visas "
 "korrekt."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
-"Med hjälp av den här guiden kan du söka efter tillgängliga uppdateringar "
-"till FileZilla."
+"Med hjälp av den här guiden kan du söka efter tillgängliga uppdateringar av "
+"FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Giltigt från:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Giltigt till:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Utförliga loggmeddelanden från vxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Validerar certifikatet..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Version:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Mycket hög"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 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"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Visa/Redigera"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Synliga kolumner"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "S&kriv"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Väntar"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Väntar på anslutning för att bläddra"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Väntar på lösenord"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Väntar på att överföringen skall avbrytas"
 
@@ -7499,7 +7669,7 @@
 msgid "Waiting to retry..."
 msgstr "Väntar på att försöka igen..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7530,11 +7700,11 @@
 "kommer FileZilla att få problem med överstigna tidsgränser vid stora "
 "överföringar."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Varning, ignorerar dataanslutning från felaktig IP-adress."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7544,28 +7714,36 @@
 msgstr ""
 "Varning, använd dagliga byggen på egen risk.\n"
 "Ingen support ges till dessa versioner.\n"
-"Dagliga byggen kan eventuellt inte fungera som de ska och kan även skada "
+"Dagliga byggen fungerar eventuellt inte som de skall och de kan även skada "
 "ditt system.\n"
 "\n"
 "Vill du verkligen söka efter dagliga byggen?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Varning: Möjlig säkerhetsöverträdelse!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Välkommen till FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Vad är nytt"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Vad är nytt:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"När FileZilla tillåts att komma ihåg lösenord, kan du återansluta utan att "
+"behöva ange lösenord på nytt efter omstart av FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7573,11 +7751,15 @@
 "När aktiverad, tecken som inte stöds av det lokala operativsystemet i "
 "filnamn ersätts om en sådan fil hämtas."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Bredbild"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Vill du att FileZilla skall komma ihåg lösenord?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "Sk&riv"
 
@@ -7590,11 +7772,19 @@
 msgid "Wrong line endings"
 msgstr "Felaktiga radslut"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Ja"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Du verkar använda en värd som bara stödjer IPv6. Den här guiden stöder inte "
+"den här miljön."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7602,15 +7792,15 @@
 "Du använder redan den senaste versionen av FileZilla. Sök igen vid ett "
 "senare tillfälle."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Du kan alltid öppna den här dialogrutan igen ifrån hjälpmenyn."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Du kan lämna fältet för port tomt för att använda standardporten."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7636,19 +7826,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?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "Du har markerat minst en symbolisk länk."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 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:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7657,11 +7847,11 @@
 "verkligen fortsätta?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Du måste ange ett värdnamn."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Du måste ange en lokal katalog."
 
@@ -7670,17 +7860,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Du måste ange en giltig IP-adress."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "Du måste ange en skrivbar lokal katalog."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Du måste ange ett kontonamn"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Du måste ange ett användarnamn"
 
@@ -7700,28 +7890,28 @@
 msgid "You need to enter a name for the log file."
 msgstr "Du måste ange ett namn för loggfilen."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Du måste ange ett kommando korrekt med citationstecken."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Du måste ange en värd för proxyn."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Du måste ange en port för proxyn inom intervallet 1 till 65535"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Du måste åtminstone ange en sökväg, tomma bokmärken stöds inte."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7729,7 +7919,7 @@
 "Du måste ange både en lokal sökväg och en fjärrsökväg för att aktivera "
 "synkroniserad bläddring för det här bokmärket."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7761,44 +7951,49 @@
 "Du borde inte ha några problem med att ansluta till andra servrar, "
 "filöverföringar borde fungera korrekt."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "efter"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "före"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "börjar med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "innehåller"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "innehåller inte"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "är inte lika med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "slutar med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "är lika med"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "fil"
 
@@ -7817,82 +8012,130 @@
 "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:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp kunde inte startas"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers returnerade inga certifikat"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "är större än"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "körbar för gruppen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "läsbar för gruppen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "skrivbar för gruppen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "är lika med"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "är satt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "är inte satt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "är mindre än"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "matchar reguljära uttrycket"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "körbar för ägaren"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "läsbar för ägaren"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "skrivbar för ägaren"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "okänd"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "körbar för alla"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "läsbar för alla"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "skrivbar för alla"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Kopiera"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "A&ktivera automatisk uppdateringskontroll"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "Antal &dagar mellan kontroll av uppdateringar:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Åtminstone 7 dagar)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Automatisk uppdateringskontroll"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Sök efter &betaversioner och releasekandidater"
+
+#~ msgid "Cop&y"
+#~ msgstr "Kopier&a"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Ange ett uppdateringsintervall på minst 7 dagar"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Sekretesspolicy:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d,%d kB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d,%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s byte (%d.%d kB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s byte (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "&Kom ihåg detta och alla framtida lösenord"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "Fel opState: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Dubblett av filternamn"
 
@@ -7915,9 +8158,6 @@
 #~ msgid "Cannot load main menu from resource file"
 #~ msgstr "Kan inte läsa in huvudmeny från resursfil"
 
-#~ msgid "bytes"
-#~ msgstr "byte"
-
 #~ msgid "Downloads unlimited."
 #~ msgstr "Obegränsade hämtningar."
 
diff -Nru filezilla-3.5.3/locales/th_TH.po filezilla-3.7.3~precise/locales/th_TH.po
--- filezilla-3.5.3/locales/th_TH.po	2010-06-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/locales/th_TH.po	2012-10-21 20:00:08.000000000 +0000
@@ -1,86 +1,78 @@
-# SOME DESCRIPTIVE TITLE.
-# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
-# This file is distributed under the same license as the PACKAGE package.
 # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
 #
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla Thai\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
-"PO-Revision-Date: 2008-02-09 13:18+0700\n"
-"Last-Translator: จารักษ์ กริชเกียรติศักดิ์ <getlive.djar@hotmail.com>\n"
-"Language-Team: MyCOOL Application <LL@li.org>\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
+"PO-Revision-Date: 2012-08-28 19:23+0700\n"
+"Last-Translator: Teerapat Taechaiya <teerapat.top@gmail.com>\n"
+"Language-Team: \n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"X-Poedit-Language: Thai\n"
-"X-Poedit-Country: THAILAND\n"
 "X-Poedit-SourceCharset: utf-8\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"Language: th_TH\n"
+"X-Poedit-Language: Thai\n"
+"X-Poedit-Country: THAILAND\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:225
 msgid "%H:%M:%S elapsed"
-msgstr "ใช้เวลา %H:%M:%S"
+msgstr "ใช้เวลาไปแล้ว %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
 msgstr "เหลือเวลาอีก %H:%M:%S"
 
-#: resources.h:772
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
-msgstr ""
-"%a - บัญชี (Lines containing this will be omitted if not using Account "
-"logontype)"
+msgstr "%a - บัญชี (บรรทัดที่มีสิ่งนี้จะถูกตัดออกไปถ้าไม่ใช้ชนิดการเข้าสู่ระบบของบัญชี)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
 #: ../../locales/../src/interface/filelist_statusbar.cpp:86
-#, fuzzy, c-format
+#, c-format
 msgid "%d directory"
 msgid_plural "%d directories"
-msgstr[0] "ไดเรคทอรีใหม่"
-msgstr[1] "ไดเรคทอรีใหม่"
+msgstr[0] "%d ไดเรกทอรี"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
-msgstr[0] ""
+msgstr[0] "%d ไดเรกทอรีกับเนื้อหาของมัน"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
-#, fuzzy, c-format
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
+#, c-format
 msgid "%d file"
 msgid_plural "%d files"
-msgstr[0] "ไฟล์"
-msgstr[1] "ไฟล์"
+msgstr[0] "%d ไฟล์"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ไฟล์ ขนาดรวม: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "%d ไฟล์ ขนาดรวม: อย่างน้อย %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "เพิ่ม %d ไฟล์เข้าคิวงาน"
@@ -89,48 +81,48 @@
 #, c-format
 msgid "%d second"
 msgid_plural "%d seconds"
-msgstr[0] ""
+msgstr[0] "%d วินาที"
 
-#: resources.h:769
+#: resources.h:785
 msgid "%h - Host"
-msgstr "%h - ที่อยู่"
+msgstr "%h - โฮสต์"
 
-#: resources.h:771
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - รหัสผ่าน"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:181
+#, c-format
 msgid "%s (%d B/s)"
-msgstr "%s ไบท์ (%d B/s)"
+msgstr "%s (%d B/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:179
+#, c-format
 msgid "%s (%d.%d KB/s)"
-msgstr "%s ไบท์ (%d.%d KB/s)"
+msgstr "%s (%d.%d KB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#, c-format
 msgid "%s (%d.%d MB/s)"
-msgstr "%s ไบท์ (%d.%d MB/s)"
+msgstr "%s (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#, c-format
 msgid "%s (? B/s)"
-msgstr "%s ไบท์ (? B/s)"
+msgstr "%s (? B/s)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
-msgstr "%s - ใบรับรองดิจิตอล หมดอายุแล้ว"
+msgstr "%s - ใบรับรองหมดอายุ!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - ไม่ได้ผลตามต้องการ!"
 
-#: resources.h:773
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - ผู้ใช้พร๊อกซี่"
@@ -138,41 +130,40 @@
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
 msgid "%s and %s. Total size: %s"
-msgstr ""
+msgstr "%s และ %s ขนาดรวม: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:89
 #, c-format
 msgid "%s and %s. Total size: At least %s"
-msgstr ""
+msgstr "%s และ %s ขนาดรวม: อย่างน้อย %s"
 
 #: ../../locales/../src/engine/sizeformatting_base.cpp:31
-#, fuzzy, c-format
+#, c-format
 msgid "%s byte"
 msgid_plural "%s bytes"
-msgstr[0] "%s ไบท์"
-msgstr[1] "%s ไบท์"
+msgstr[0] "%s ไบต์"
 
 #: ../../locales/../src/interface/updatewizard.cpp:904
 #, c-format
 msgid "%s bytes"
-msgstr "%s ไบท์"
+msgstr "%s ไบต์"
 
 #: ../../locales/../src/interface/updatewizard.cpp:888
 #, c-format
 msgid "%s bytes (%d B/s)"
-msgstr "%s ไบท์ (%d B/s)"
+msgstr "%s ไบต์ (%d B/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:886
 #, c-format
 msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s ไบท์ (%d.%d KB/s)"
+msgstr "%s ไบต์ (%d.%d KB/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:884
 #, c-format
 msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s ไบท์ (%d.%d MB/s)"
+msgstr "%s ไบต์ (%d.%d MB/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -181,8 +172,11 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
+"ไม่พบ %s เมื่อปราศจากคอมโพเนนต์ของ FileZilla, SFTP จะไม่สามารถทำงานได้\n"
+"\n"
+"โปรดดาวน์โหลด FileZilla อีกครั้ง ถ้าปัญหานี้ยังมีอยู่, โปรดส่งรายงานข้อบกพร่อง"
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -192,534 +186,517 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"ไม่สามารถค้นหา %s . นี่นอกเหนือจากส่วนประกอบของ FileZilla , SFTP ไม่สามารถทำงานได้.\n"
+"ไม่พบ %s เมื่อปราศจากคอมโพเนนต์ของ FileZilla, SFTP จะไม่สามารถทำงานได้\n"
 "\n"
-"ทางออกที่เป็นไปได้ :\n"
-"- ดูให้แน่ %s ว่าถ้ารายการในไดเรคทอรีของคุณ มีภาวะแวดล้อมเปลี่ยนแปลงไป.\n"
-"- ตั้งค่าที่อยู่เต็มของ %s ใน FZ_FZSFTP."
+"วิธีแก้ปัญหาที่อาจเป็นไปได้:\n"
+"- ตรวจสอบให้แน่ใจว่า %s อยู่ในไดเรกทอรีที่ระบุไว้ในตัวแปรสภาพแวดล้อม PATH\n"
+"- ตั้งค่าเส้นทางเต็มของ %s ในตัวแปรสภาพแวดล้อม FZ_FZSFTP."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s กับ %d บิต"
 
-#: resources.h:770
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - ชื่อผู้ใช้"
 
-#: resources.h:774
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
-msgstr "%w - รหัสผ่านพร๊อกซี่"
+msgstr "%w - รหัสผ่านพร็อกซี่"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
-msgstr "&รายละเอียด..."
+msgstr "&เกี่ยวกับ..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "&บัญชี:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "&Active"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
-msgstr ""
+msgstr "&เพิ่มบุ๊คมาร์ค..."
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
-msgstr "&เพิ่มไฟล์ในคิวงาน"
+msgstr "&เพิ่มไฟล์ลงคิวงาน"
 
-#: resources.h:782
-#, fuzzy
+#: resources.h:798
 msgid "&Add keyfile..."
-msgstr "&แก้ใขตัวกรอง"
+msgstr "&เพิ่มไฟล์กุญแจ..."
 
-#: resources.h:624 resources.h:643
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
-msgstr "&เพิ่มลงคิวงาน"
+msgstr "&เพิ่มลงในคิวงาน"
 
-#: resources.h:94
+#: resources.h:95
 msgid "&Adjust server timezone offset:"
-msgstr ""
+msgstr "&ปรับแต่งการชดเชยเขตเวลาของแม่ข่าย:"
 
 #: resources.h:23
 msgid "&Always trust certificate in future sessions."
-msgstr ""
+msgstr "&เชื่อถือใบรับรองเสมอสำหรับช่วงเวลาในอนาคต"
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
-msgstr ""
+msgstr "&เชื่อถือโฮสต์นี้เสมอ, เพิ่มกุญแจนี้ไปยังแคช"
 
-#: resources.h:932
+#: resources.h:950
 msgid "&Always use default editor"
-msgstr ""
+msgstr "&ใช้ตัวแก้ไขมาตรฐานทุกครั้ง"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
-msgstr ""
+msgstr "&ใช้การเลือกสำหรับไฟล์ที่ไม่สัมพันธ์กันเสมอ"
 
 #: resources.h:65
 msgid "&Always use this action"
-msgstr "&กระทำอย่างนี้ทุกครั้ง"
+msgstr "&ใช้การกระทำนี้ทุกครั้ง"
 
-#: resources.h:750
-#, fuzzy
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
-msgstr "IP address ภายนอกไม่ถูกต้อง"
+msgstr "&ถามระบบปฏิบัติการของคุณสำหรับที่อยู่ IP ภายนอก"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "&อัตโนมัติ"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
-msgstr "&ตรวจพบอัตโนมัติ"
-
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "&ลบอัตโนมัติทันทีที่ส่งข้อมูลสำเร็จ"
+msgstr "&ตรวจพบโดยอัตโนมัติ"
 
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "&Binary"
 
-#: resources.h:892
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
-msgstr "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
+msgstr "&เลขนำหน้าเลขฐานสองที่ใช้สัญลักษณ์ SI (ตัวอย่าง 1 KB = 1024 ไบต์)"
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
-msgstr ""
+msgstr "&บุ๊คมาร์ค"
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
-msgstr "&Ask for action"
+msgstr "&เรียกดู..."
 
-#: resources.h:809
-#, no-c-format
+#: resources.h:825
+#, fuzzy, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Burst tolerance:"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "&ยกเลิก"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
-msgstr "&ตรวจสอบรุ่นทดลองของ Filezilla"
+msgstr "&ตรวจสอบรุ่นเบต้าของ Filezilla"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
-msgstr "&ล้างข้อมูลระบบ"
+msgstr "&ล้างข้อมูลส่วนตัว..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&ปิด FileZilla"
 
-#: resources.h:664
+#: resources.h:680
 msgid "&Configure speed limits..."
-msgstr ""
+msgstr "&กำหนดค่าการจำกัดความเร็ว..."
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
-msgstr ""
+msgstr "&กำหนดค่า..."
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "&เชื่อมต่อ"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "&คัดลอก"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
-msgstr ""
+msgstr "&คัดลอกการเชื่อมต่อปัจจุบันไปยังตัวจัดการที่ตั้ง..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "&คัดลอกไปยังคลิปบอร์ด"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
-msgstr "&เร่งด่วน"
+msgstr "&ล้มเหลว"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "&สร้างไดเรกทอรี"
 
-#: resources.h:659
-#, fuzzy
+#: resources.h:675
 msgid "&Create new tab"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "&สร้างแท็บใหม่"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
-msgstr ""
+msgstr "&Debug"
 
-#: resources.h:959
+#: resources.h:977
+#, fuzzy
 msgid "&Debug information in message log:"
-msgstr "&Debug information in message log:"
+msgstr "&ข้อมูล Debug ในข้อความแจ้งเตือน:"
 
-#: resources.h:925
+#: resources.h:943
 msgid "&Default editor:"
-msgstr "&ตัวแก้ใขเริ่มต้น"
+msgstr "&ตัวแก้ไขเริ่มต้น:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
-msgstr "&Default file exists action..."
+msgstr "&ค่าเริ่มต้นของการกระทำเมื่อไฟล์มีอยู่แล้ว..."
 
-#: resources.h:732
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
-msgstr ""
+msgstr "&หน่วงเวลาระหว่างความพยายามเข้าสู่ระบบเมื่อล้มเหลว:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "&ลบ"
 
-#: resources.h:456
-#, fuzzy
+#: resources.h:458
 msgid "&Delete symlink"
-msgstr "&ลบ"
+msgstr "&ลบลิงก์เสมือน"
 
-#: resources.h:510
+#: resources.h:519
 msgid "&Directory comparison"
-msgstr "&Directory comparison"
+msgstr "&เปรียบเทียบไดเรกทอรี"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
-msgstr ""
+msgstr "&ละทิ้งไฟล์ในเครื่อง จากนั้นดาวน์โหลดและแก้ไขไฟล์ใหม่อีกครั้ง"
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
-msgstr "&หยุดการเชื่อมต่อ"
+msgstr "&ตัดการเชื่อมต่อ"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
-msgstr "&ตัดการเชื่อมต่อจากเซอร์เวอร์"
+msgstr "&ตัดการเชื่อมต่อจากแม่ข่าย"
 
-#: resources.h:868
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
-msgstr ""
+msgstr "&แสดงความเร็วชั่วขณะในการโอนถ่ายแทนความเร็วเฉลี่ย"
 
-#: resources.h:890
+#: resources.h:908
 msgid "&Display size in bytes"
-msgstr "&แสดงขนาดในไบต์"
+msgstr "&แสดงขนาดในหน่วยไบต์"
+
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "ไ&ม่บันทึกรหัสผ่าน"
 
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
-msgstr "&ไม่ต้องแสดงอีก"
+msgstr "&ไม่ต้องแสดงหน้าต่างนี้อีก"
 
-#: resources.h:755
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
-msgstr ""
+msgstr "&อย่าใช้ที่อยู่ IP ภายนอกบนการเชื่อมต่อในเครื่อง"
 
-#: resources.h:912
+#: resources.h:930
 msgid "&Double-click action on files:"
-msgstr ""
+msgstr "&การกระทำเมื่อคลิกสองครั้งบนไฟล์:"
 
-#: resources.h:572 resources.h:622
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "&ดาวน์โหลด"
 
-#: resources.h:442
-#, fuzzy
+#: resources.h:444
 msgid "&Download to:"
-msgstr "&ดาวน์โหลด"
+msgstr "&ดาวน์โหลดไปที่:"
 
-#: resources.h:657
-#, fuzzy
+#: resources.h:673
 msgid "&Download..."
-msgstr "&ดาวน์โหลด"
+msgstr "&ดาวน์โหลด..."
 
-#: resources.h:256 resources.h:831
-#, fuzzy
+#: resources.h:258 resources.h:847
 msgid "&Downloads:"
-msgstr "รับข้อมูล"
+msgstr "&ดาวน์โหลด:"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
-msgstr "แ&ก้ใข"
+msgstr "แ&ก้ไข"
 
-#: resources.h:209
-#, fuzzy
+#: resources.h:211
 msgid "&Edit filter rules..."
-msgstr "&แก้ใขตัวกรอง"
+msgstr "&แก้ไขกฏตัวกรอง..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
 msgstr "&เปิดใช้งาน"
 
-#: resources.h:940
+#: resources.h:958
 msgid "&Enable automatic update check"
-msgstr "&เปิดใช้งานตรวจสอบรุ่นใหม่อัตโนมัติ"
+msgstr "&เปิดใช้งานการตรวจสอบการปรับรุ่นโดยอัตโนมัติ"
 
-#: resources.h:480 resources.h:804
+#: resources.h:482 resources.h:820
 msgid "&Enable speed limits"
-msgstr ""
+msgstr "&เปิดใช้งานการจำกัดความเร็ว"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
-msgstr "&เข้ารหัส"
+msgstr "&การเข้ารหัส:"
 
-#: resources.h:609
+#: resources.h:82
+msgid "&Encryption:"
+msgstr "&การเข้ารหัส:"
+
+#: resources.h:621
 msgid "&Enter custom command..."
-msgstr "&เขียนคำสั่งเอง"
+msgstr "&ใส่คำสั่งที่กำหนดเอง..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
-msgstr "&Execute"
+msgstr "&ประมวลผล"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
-msgstr "&ส่งออก Site Manager"
+msgstr "&ส่งออกทางเข้าตัวจัดการที่ตั้ง"
 
-#: resources.h:497 resources.h:653
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "&ส่งออก..."
 
-#: resources.h:760
+#: resources.h:776
 msgid "&Fall back to active mode"
-msgstr "&Fall back to active mode"
+msgstr "&ย้อนกลับไปเป็นโหมด active"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "แ&ฟ้ม"
 
-#: resources.h:634
+#: resources.h:650
 msgid "&File Attributes..."
-msgstr "&สิทธิการเข้าถึงแฟ้ม"
+msgstr "&คุณสมบัติของไฟล์..."
 
-#: resources.h:588
-#, fuzzy
+#: resources.h:600
 msgid "&File permissions..."
-msgstr "สิทธิความเป็นเจ้าของ"
+msgstr "&สิทธิการเข้าถึงไฟล์..."
 
-#: resources.h:364
-#, fuzzy
+#: resources.h:366
 msgid "&File:"
-msgstr "แ&ฟ้ม"
+msgstr "&ไฟล์:"
 
-#: resources.h:219
-#, fuzzy
+#: resources.h:221
 msgid "&Filter conditions:"
-msgstr "&ค่าตัวกรอง:"
+msgstr "&เงื่อนไขตัวกรอง:"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "&ค่าตัวกรอง:"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&ตัวกรอง:"
 
 #: ../../locales/../src/interface/updatewizard.cpp:29
-#, fuzzy
 msgid "&Finish"
-msgstr "&แก้ใขสำเร็จ"
+msgstr "&เสร็จสิ้น"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
-msgstr "&แก้ใขสำเร็จและลบไฟล์ต้นฉบับแล้ว"
+msgstr "&เสร็จสิ้นการแก้ไขและลบไฟล์ในเครื่อง"
 
-#: resources.h:446
+#: resources.h:448
+#, fuzzy
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
-msgstr ""
+msgstr "&Flattenเส้นทางระยะไกล ดาวน์โหลดไฟล์ทั้งหมดที่มีอยู่ลงในไดเรกทอรีเป้าหมายโดยตรง"
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
-msgstr ""
+msgstr "&ทำตามลิงก์เสมือน, ลบเนื้อหาของไดเรกทอรีเป้าหมาย"
 
-#: resources.h:753
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
-msgstr ""
+msgstr "&นำที่อยู่ IP ภายนอกมาจาก URL ดังต่อไปนี้:"
 
-#: resources.h:551
-#, fuzzy
+#: resources.h:561
 msgid "&Getting help..."
-msgstr "&การตั้งค่า..."
+msgstr "&รับความช่วยเหลือ..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
-msgstr ""
+msgstr "&บุ๊คมาร์คส่วนกลาง"
 
-#: resources.h:789
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
-msgstr ""
+msgstr "&HTTP/1.1 โดยใช้วิธีการเชื่อมต่อ"
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "&ช่วยเหลือ"
 
-#: resources.h:514 resources.h:640
-#, fuzzy
+#: resources.h:523 resources.h:656
 msgid "&Hide identical files"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "&ซ่อนไฟล์ที่เหมือนกัน"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "&สูงสุด"
 
-#: resources.h:748
+#: resources.h:764
 msgid "&Highest available port:"
-msgstr "&พอร์ตสูงสุดที่ทำได้"
+msgstr "&พอร์ตสูงสุดที่ใช้ได้:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
-msgstr "&โฮสต์"
+msgstr "&โฮสต์:"
 
-#: resources.h:891
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
-msgstr "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
+msgstr "&เลขนำหน้าเลขฐานสอง IEC (ตัวอย่าง 1 KiB = 1024 ไบต์)"
 
-#: resources.h:879
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
-msgstr "&ISO 8601 (example: 2007-09-15)"
+msgstr "&ISO 8601 (ตัวอย่าง: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
-msgstr "&นำเข้า"
+msgstr "&นำเข้า..."
 
-#: resources.h:934
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
-msgstr "&Inherit system's filetype associations"
+msgstr "&รับช่วงค่าความสัมพันธ์ของชนิดไฟล์ของระบบ"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
-msgstr ""
+msgstr "&คงโครงสร้างของเส้นทางระยะไกลให้สัมพันธ์กับการค้นหาราก"
 
-#: resources.h:854
-#, fuzzy
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
-msgstr "ย&อมทุกไฟล์และไดเรคทอรี"
+msgstr "&เค้าโครงของแผงไฟล์และไดเรกทอรี:"
 
-#: resources.h:745
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
-msgstr "&จำกัดพอร์ตบ้านใช้งานโดย FileZilla"
+msgstr "&จำกัดพอร์ตในเครื่องที่ถูกใช้งานโดย FileZilla"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
-msgstr "&จำกัดจำนวนการเชื่อมต่อ"
+msgstr "&จำกัดจำนวนของการเชื่อมต่อพร้อมกัน"
 
-#: resources.h:519
-#, fuzzy
+#: resources.h:529
 msgid "&Local directory tree"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "&ไดเรกทอรีต้นไม้ในเครื่อง"
 
-#: resources.h:401 resources.h:407
-#, fuzzy
+#: resources.h:403 resources.h:409
 msgid "&Local directory:"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "&ไดเรกทอรีในเครื่อง:"
 
-#: resources.h:949
-#, fuzzy
+#: resources.h:967
 msgid "&Log to file"
-msgstr "ไฟล์ระยะไกล"
+msgstr "&เก็บประวัติเป็นไฟล์"
 
-#: resources.h:82
-#, fuzzy
+#: resources.h:83
 msgid "&Logon Type:"
-msgstr "&Logontype:"
+msgstr "&ชนิดการเข้าสู่ระบบ:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
-msgstr "&Logontype:"
+msgstr "&ชนิดการเข้าสู่ระบบ:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "&ต่ำ"
 
-#: resources.h:545
-#, fuzzy
+#: resources.h:555
 msgid "&Manage bookmarks..."
-msgstr "&จัดการที่อยู่..."
+msgstr "&จัดการบุ๊คมาร์ค..."
 
-#: resources.h:533
-#, fuzzy
+#: resources.h:543
 msgid "&Manual transfer..."
-msgstr "รับส่งข้อมูลไม่สำเร็จ"
+msgstr "&โอนถ่ายข้อมูลด้วยตนเอง..."
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
-msgstr "&จำนวนการเชื่อมต่อสูงสุด"
+msgstr "&จำนวนการเชื่อมต่อสูงสุด:"
 
-#: resources.h:730
-#, fuzzy
+#: resources.h:746
 msgid "&Maximum number of retries:"
-msgstr "&จำนวนการเชื่อมต่อสูงสุด"
+msgstr "&จำนวนครั้งสูงสุดของการลองใหม่:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
-msgstr ""
+msgstr "&ประวัติข้อความ"
 
-#: resources.h:866
+#: resources.h:883
 msgid "&Minimize to tray"
-msgstr ""
+msgstr "&ย่อไปที่ถาดระบบ"
 
-#: resources.h:399
-#, fuzzy
+#: resources.h:401
 msgid "&Name:"
-msgstr "ชื่อ:"
+msgstr "&ชื่อ:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
-msgstr "&วิซาร์ทตั้งค่าเชื่อมต่อ"
+msgstr "&ตัวช่วยสร้างการกำหนดค่าเครือข่าย..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
-msgstr "&สร้าง"
+msgstr "&ใหม่"
 
 #: resources.h:72
 msgid "&New Site"
-msgstr "&สร้างที่ตั้งใหม่"
+msgstr "&ที่ตั้งใหม่"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1043
 msgid "&New version available!"
-msgstr "&ค้นพบเวอร์ชั่นใหม่"
+msgstr "&มีรุ่นใหม่ที่พร้อมใช้งาน!"
 
 #: ../../locales/../src/interface/updatewizard.cpp:27
-#, fuzzy
 msgid "&Next >"
-msgstr "&สร้าง"
+msgstr "&ถัดไป >"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "&ไม่"
 
-#: resources.h:763 resources.h:788
+#: resources.h:779 resources.h:804
 msgid "&None"
-msgstr "&ว่าง"
+msgstr "&ไม่มี"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "&ปกติ"
 
-#: resources.h:941
+#: resources.h:959
 msgid "&Number of days between update checks:"
-msgstr ""
+msgstr "&จำนวนวันระหว่างการตรวจสอบการอัพเดต:"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
-msgstr "&Numeric value:"
+msgstr "&ค่าตัวเลข:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&ตกลง"
 
-#: resources.h:766
+#: resources.h:782
 msgid "&OPEN"
-msgstr "&เปิด"
+msgstr ""
 
-#: resources.h:561 resources.h:645
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr "&เปิด"
 
@@ -727,328 +704,323 @@
 msgid "&Overwrite"
 msgstr "&เขียนทับ"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "&Passive"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "&รหัสผ่าน:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "&เล่นเสียง"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "&พอร์ต:"
 
-#: resources.h:860
-#, fuzzy
+#: resources.h:876
 msgid "&Position of the message log:"
-msgstr "&Debug information in message log:"
+msgstr "&ตำแหน่งของข้อความแจ้งเตือน:"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
-msgstr "&Preserve timestamps of transferred files"
+msgstr "&เก็บการประทับเวลาสำหรับไฟล์ที่โอนถ่ายแล้ว"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
-msgstr "&คิว"
+msgstr "&คิวงาน"
 
-#: resources.h:718
+#: resources.h:734
 msgid "&Quickconnect"
-msgstr "เชื่อมต่อ&ด่วน"
+msgstr "&เชื่อมต่อด่วน"
 
-#: resources.h:517
-#, fuzzy
+#: resources.h:527
 msgid "&Quickconnect bar"
-msgstr "เชื่อมต่อ&ด่วน"
+msgstr "&แถบเชื่อมต่อด่วน"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "&อ่าน"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "&เชื่อมต่อใหม่"
 
-#: resources.h:508 resources.h:662
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
-msgstr ""
+msgstr "&รีเฟรช"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
-msgstr "&จดจำรหัสผ่านของเซสชั่นนี้"
+msgstr "&จดจำรหัสผ่านสำหรับช่วงเวลานี้"
 
-#: resources.h:403 resources.h:409
-#, fuzzy
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 msgid "&Remote directory:"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "&ไดเรกทอรีระยะไกล:"
 
-#: resources.h:367
-#, fuzzy
+#: resources.h:369
 msgid "&Remote path:"
-msgstr "ที่ตั้งระยะไกล"
+msgstr "&เส้นทางระยะไกล:"
 
-#: resources.h:825
+#: resources.h:841
 msgid "&Remove"
 msgstr "&เอาออก"
 
-#: resources.h:783
-#, fuzzy
+#: resources.h:799
 msgid "&Remove key"
-msgstr "&เอาออก"
+msgstr "&เอากุญแจออก"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "&เอาที่เลือกออก"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "&เปลี่ยนชื่อ"
 
-#: resources.h:200
-#, fuzzy
+#: resources.h:202
 msgid "&Rename..."
-msgstr "&เปลี่ยนชื่อ"
+msgstr "&เปลี่ยนชื่อ..."
 
-#: resources.h:323
-#, fuzzy
+#: resources.h:325
 msgid "&Reopen local file"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "&เปิดไฟล์ในเครื่องอีกครั้ง"
 
-#: resources.h:816
+#: resources.h:832
 msgid "&Replace invalid characters with:"
-msgstr ""
+msgstr "&แทนที่อักขระที่ไม่ถูกต้องด้วย:"
 
-#: resources.h:552
-#, fuzzy
+#: resources.h:562
 msgid "&Report a bug..."
-msgstr "&ส่งออก..."
+msgstr "&รายงานข้อบกพร่อง..."
 
-#: resources.h:711
+#: resources.h:630
+msgid "&Reset and requeue all"
+msgstr "&เริ่มใหม่และเริ่มคิวงานใหม่ทั้งหมด"
+
+#: resources.h:727
 msgid "&Restart Wizard"
-msgstr "&Restart Wizard"
+msgstr "&เริ่มตัวช่วยสร้างใหม่"
 
 #: resources.h:62
 msgid "&Resume"
-msgstr "&ลองใหม่"
+msgstr "&ทำต่อ"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
-msgstr "&เริ่มคำสั่ง"
+msgstr "&ใช้งานคำสั่ง..."
 
-#: resources.h:725
+#: resources.h:741
 msgid "&Run configuration wizard now..."
-msgstr "&ใช้งานวิซาร์ดการตั้งค่าทันที"
+msgstr "&ใช้งานตัวช่วยสร้างการกำหนดค่าทันที..."
 
-#: resources.h:943
+#: resources.h:961
 msgid "&Run update check now..."
-msgstr "&ตรวจสอบรุ่นทันที"
+msgstr "&ใช้งานการตรวจสอบการอัพเดตทันที..."
 
-#: resources.h:765
+#: resources.h:781
 msgid "&SITE"
-msgstr "&ที่อยู่"
+msgstr ""
 
-#: resources.h:790
+#: resources.h:806
 msgid "&SOCKS 5"
 msgstr ""
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&บันทึกเป็น..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
-msgstr ""
+msgstr "&ค้นหา"
 
-#: resources.h:538
+#: resources.h:548
 msgid "&Search remote files..."
-msgstr ""
+msgstr "&ค้นหาไฟล์ระยะไกล..."
 
 #: resources.h:71
-#, fuzzy
 msgid "&Select Entry:"
-msgstr "&เลือกภาษา"
+msgstr "&เลือกทางเข้า:"
 
-#: resources.h:923
+#: resources.h:941
 msgid "&Select language:"
-msgstr "&เลือกภาษา"
+msgstr "&เลือกภาษา:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
-msgstr ""
+msgstr "&เลือกคอลัมน์ที่จะให้แสดงผล:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
-msgstr "แ&ม่ข่าย"
+msgstr "&แม่ข่าย"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "&การตั้งค่า"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "&การตั้งค่า..."
 
-#: resources.h:958
+#: resources.h:976
 msgid "&Show debug menu"
-msgstr "&Show debug menu"
+msgstr "&แสดงเมนู debug"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr "&แสดงข้อความ"
 
-#: resources.h:948
-#, fuzzy
+#: resources.h:966
 msgid "&Show timestamps in message log"
-msgstr "&Debug information in message log:"
+msgstr "&แสดงการประทับเวลาในประวัติข้อความ"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
-msgstr "&จัดการที่อยู่..."
+msgstr "&ตัวจัดการที่ตั้ง..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
-msgstr ""
+msgstr "&บุ๊คมาร์คเจาะจงที่ตั้ง"
 
 #: resources.h:64
 msgid "&Skip"
 msgstr "&ข้าม"
 
-#: resources.h:532
+#: resources.h:542
 msgid "&Speed limits"
-msgstr ""
+msgstr "&จำกัดความเร็ว"
 
-#: resources.h:448
+#: resources.h:450
 msgid "&Start transfer immediately"
-msgstr ""
+msgstr "&เริ่มการโอนถ่ายไฟล์โดยทันที"
 
-#: resources.h:859
+#: resources.h:875
 msgid "&Swap local and remote panes"
-msgstr "&Swap local and remote panes"
+msgstr "&สลับแผงในเครื่องและระยะไกล"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
-msgstr "&ลอง"
+msgstr "&ทดสอบ"
 
-#: resources.h:871
+#: resources.h:889
 msgid "&Theme:"
-msgstr "&ธีม"
+msgstr "&ธีม:"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
-msgstr "&ส่ง"
+msgstr "โ&อนถ่าย"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
-msgstr "&โหมดการส่ง"
+msgstr "&โหมดการโอนถ่าย:"
 
-#: resources.h:521
-#, fuzzy
+#: resources.h:531
 msgid "&Transfer queue"
-msgstr "&ส่ง"
+msgstr "&คิวการโอนถ่าย"
 
-#: resources.h:828
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
-msgstr ""
+msgstr "&ถือว่าไฟล์จุดเป็นไฟล์ ASCII"
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
-msgstr "&ยกเลิกการแก้ใข"
+msgstr "&ยกเลิกการแก้ไข"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
-msgstr ""
+msgstr "&อัพเดตกุญแจแคชสำหรับโฮสต์นี้"
 
-#: resources.h:555 resources.h:641
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "&อัพโหลด"
 
-#: resources.h:266 resources.h:840
-#, fuzzy
+#: resources.h:268 resources.h:856
 msgid "&Uploads:"
-msgstr "ส่งข้อมูล"
+msgstr "&อัพโหลด:"
 
-#: resources.h:424
+#: resources.h:426
 msgid "&Use custom program"
-msgstr ""
+msgstr "&ใช้โปรแกรมที่กำหนดเอง"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
-msgstr ""
+msgstr "&ใช้การซิงโครไนซ์ตัวเรียกดู"
 
-#: resources.h:927
+#: resources.h:945
 msgid "&Use system's default editor for text files"
-msgstr ""
+msgstr "&ใช้ตัวแก้ไขไฟล์ข้อความเริ่มต้นของระบบ"
 
-#: resources.h:751
+#: resources.h:767
 msgid "&Use the following IP address:"
-msgstr ""
+msgstr "&ใช้ที่อยู่ IP ดังต่อไปนี้:"
 
-#: resources.h:759
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
-msgstr ""
+msgstr "&ใช้ที่อยู่ IP ภายนอกของแม่ข่ายแทน"
 
-#: resources.h:894
+#: resources.h:912
 msgid "&Use thousands separator"
-msgstr ""
+msgstr "&ใช้เครื่องหมายจุลภาคคั่นตัวเลขในหลักพัน"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
-msgstr "&ผู้ใช้"
+msgstr "&ผู้ใช้:"
 
-#: resources.h:714
+#: resources.h:730
 msgid "&Username:"
-msgstr "&ชื่อผู้ใช้"
+msgstr "&ชื่อผู้ใช้:"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1039
 #, c-format
 msgid "&Version %s"
-msgstr "&เวอร์ชั่น %s"
+msgstr "&รุ่น %s"
 
-#: resources.h:507
+#: resources.h:516
 msgid "&View"
-msgstr "&แสดง"
+msgstr "&มุมมอง"
 
-#: resources.h:578
-#, fuzzy
+#: resources.h:588
 msgid "&View/Edit"
-msgstr "&แสดง/แก้ใข"
+msgstr "&ดู/แก้ไข"
 
-#: resources.h:933
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr ""
+msgstr "ดูไฟล์ที่แก้ไขในเครื่องและแจ้งเตือนเพื่ออัพโหลดการเปลี่ยนแปลง"
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "&เขียน"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "&ใช่"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "'%s' ไม่พบหรือไม่สามารถเข้าถึงได้"
+msgstr "'%s' ไม่มีอยู่หรือไม่สามารถเข้าถึงได้"
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
-#, fuzzy, c-format
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
+#, c-format
 msgid "'%s' is not a directory."
-msgstr "ไดเรคทอรีใหม่"
+msgstr "'%s' ไม่ใช่ไดเรกทอรี"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "รูปแบบ 'บัญชี' ไม่รองรับกับ Protocal ที่เลือก "
+msgstr "ชนิดการเข้าสู่ระบบ 'บัญชี' ไม่รองรับโดยโปรโตคอลที่เลือก"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1060,167 +1032,171 @@
 #, c-format
 msgid "(%d object filtered)"
 msgid_plural "(%d objects filtered)"
-msgstr[0] ""
+msgstr[0] "(%d วัตถุถูกกรองไว้)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
-msgstr "(0 สำหรับ ไม่จำกัด)"
+msgstr "(0 คือไม่จำกัด)"
 
-#: resources.h:731
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 วินาที)"
 
-#: resources.h:798
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
-msgstr "(5-9999, 0=ไม่ใช้งาน)"
+msgstr "(5-9999, 0 คือไม่ใช้งาน)"
 
-#: resources.h:942
+#: resources.h:960
 msgid "(At least 7 days)"
-msgstr "(ที่สัญญาเช่า 7 วัน)"
+msgstr "(ขั้นต่ำ 7 วัน)"
 
-#: resources.h:887
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(ตัวอย่าง: %H:%M)"
 
-#: resources.h:881
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr "(ตัวอย่าง: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
-#, fuzzy, c-format
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
+#, c-format
 msgid "(in %s/s)"
-msgstr "(ใน KB/s)"
+msgstr "(ใน %s/s)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:896
 msgid ", %H:%M:%S left"
-msgstr ",เหลือเวลาอีก %H:%M:%S"
+msgstr ", เหลือเวลาอีก %H:%M:%S"
 
 #: ../../locales/../src/interface/updatewizard.cpp:900
 msgid ", --:--:-- left"
-msgstr ",เหลือเวลาอีก --:--:--"
+msgstr ", เหลือเวลาอีก --:--:--"
 
-#: resources.h:699
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
-msgstr ""
+msgstr "- เราเตอร์และ/หรือไฟร์วอลล์เสียหาย"
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
-msgstr ""
+msgstr "- ไฟล์เสียหายบนหน้าต่าง"
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
-msgstr ""
+msgstr "- มีมัลแวร์ในระบบของคุณ"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
 msgstr "เหลือเวลาอีก --:--:--"
 
 #: ../../locales/../src/interface/cmdline.cpp:80
 msgid "-c cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-c ไม่สามารถใช้ร่วมกับ URL ของ FTP"
 
 #: ../../locales/../src/interface/cmdline.cpp:89
 msgid "-l can only be used together with an FTP URL."
-msgstr ""
+msgstr "-l สามารถใช้ร่วมกับ URL ของ FTP เท่านั้น"
 
 #: ../../locales/../src/interface/cmdline.cpp:68
 msgid "-s and -c cannot be present at the same time."
-msgstr ""
+msgstr "-s และ -c ไม่สามารถแสดงได้ในเวลาเดียวกัน"
 
 #: ../../locales/../src/interface/cmdline.cpp:74
 msgid "-s cannot be used together with an FTP URL."
-msgstr ""
+msgstr "-s ไม่สามารถใช้ร่วมกับ URL ของ FTP"
 
-#: resources.h:960
+#: resources.h:978
 msgid "0 - None"
-msgstr "0 - ว่าง"
+msgstr "0 - ไม่มี"
 
-#: resources.h:961
+#: resources.h:979
+#, fuzzy
 msgid "1 - Warning"
-msgstr "1 - อันตราย"
+msgstr "1 - เตือน"
 
-#: resources.h:962
+#: resources.h:980
+#, fuzzy
 msgid "2 - Info"
-msgstr "2 - รายละเอียด"
+msgstr "2 - ข้อมูล"
 
-#: resources.h:963
+#: resources.h:981
+#, fuzzy
 msgid "3 - Verbose"
 msgstr "3 - ฟุ่มเฟือย"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
-msgstr ""
+msgstr "ระบบ 32 บิต"
 
-#: resources.h:964
+#: resources.h:982
+#, fuzzy
 msgid "4 - Debug"
-msgstr "4 - แก้ปัญหา"
+msgstr "4 - ดีบั๊ก"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
-msgstr ""
+msgstr "ระบบ 64 บิต"
 
 #: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "< &Back"
-msgstr ""
+msgstr "< &ย้อนกลับ"
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
-msgstr ""
+msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
-msgstr ""
+msgstr "ชื่อของบุ๊คมาร์คที่ใส่มีอยู่แล้ว โปรดใส่ชื่อที่ยังไม่ได้ใช้"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
 msgid "A default editor needs to be set."
-msgstr ""
+msgstr "จำเป็นต้องตั้งค่าตัวแก้ไขเริ่มต้น"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
 msgid "A directory cannot be dragged into one of its subdirectories."
-msgstr ""
+msgstr "ไดเรกทอรีนี้ไม่สามารถลากไปสู่ไดเรกทอรีย่อยของมันได้"
 
-#: resources.h:671
+#: resources.h:687
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
-msgstr ""
+msgstr "ไฟล์ที่เปิดก่อนหน้านี้ได้ถูกเปลี่ยนแปลง"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
-msgstr ""
+msgstr "ชื่อของไฟล์นี้ได้ถูกแก้ไขแล้ว คุณต้องการที่จะเปิด '%s' อีกครั้ง?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
-msgstr ""
+msgstr "ชื่อของไฟล์นี้ได้ถูกโอนถ่ายแล้ว"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
-msgstr ""
+msgstr "ชื่อของไฟล์นี้ยังคงกำลังถูกแก้ไข โปรดปิดไฟล์และลองใหม่อีกครั้ง"
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1229,21 +1205,23 @@
 "No further warning will be displayed this session."
 msgstr ""
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
-msgstr ""
+msgstr "รุ่นใหม่กว่าของ FileZilla ที่พร้อมใช้งาน:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
+"แม่ข่ายที่เหมาะสมจะต้องแสดงไฟล์ทั้งหมดเสมอ, แต่บางแม่ข่ายที่ไม่เหมาะสมจะซ่อนไฟล์จากผู้ใช้ "
+"ใช้ตัวเลือกนี้เพื่อบังคับให้แม่ข่ายแสดงไฟล์ทั้งหมดที่มีอยู่"
 
-#: resources.h:743
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
-msgstr ""
+msgstr "แม่ข่ายที่เหมาะสมจะไม่ต้องการสิ่งนี้ ติดต่อผู้ดูแลแม่ข่ายหากคุณต้องการสิ่งนี้"
 
 #: ../../locales/../src/interface/state.cpp:284
 msgid ""
@@ -1251,90 +1229,95 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:824
+#: resources.h:840
 msgid "A&dd"
 msgstr "เ&พิ่ม"
 
-#: resources.h:851
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
-msgstr ""
+msgstr "อ&นุญาตให้เริ่มต้นไฟล์ ASCII ใหม่"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
-msgstr "ย&อมเฉพาะดาวน์โหลด"
+msgstr "นำ&ไปใช้เฉพาะการดาวน์โหลด"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "ย&อมเฉพาะอัพโหลด"
+msgstr "นำ&ไปใช้เฉพาะการอัพโหลด"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
-msgstr "ย&อมทุกไฟล์และไดเรคทอรี"
+msgstr "นำ&ไปใช้กับทุกไฟล์และไดเรกทอรี"
 
-#: resources.h:388
-#, fuzzy
+#: resources.h:637
+msgid "A&utomatically remove successful transfers"
+msgstr "เอาการโอนถ่ายที่ประสบความสำเร็จออกโดยอั&ตโนมัติ"
+
+#: resources.h:390
 msgid "ASCII"
-msgstr "A&SCII"
+msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:480
 msgid "Abort previous connection and connect in current tab"
-msgstr ""
+msgstr "ยกเลิกการเชื่อมต่อก่อนหน้าและเชื่อมต่อในแท็บปัจจุบัน"
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
-msgstr "รายละเอียด FileZilla"
+msgstr "เกี่ยวกับ FileZilla"
 
-#: resources.h:861
+#: resources.h:877
 msgid "Above the file lists"
-msgstr ""
+msgstr "ด้านบนของรายชื่อไฟล์"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "บัญชี"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
-msgstr ""
+msgstr "การกระทำหลังจาก&เสร็จสิ้นคิวงาน"
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
-msgstr "การกระทำบนไฟล์ที่เลือก"
+msgstr "การกระทำของไฟล์ที่เลือก:"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
-msgstr ""
+msgstr "การกระทำที่จะดำเนินการ:"
 
 #: resources.h:57
 msgid "Action:"
-msgstr "การกระทำ"
+msgstr "การกระทำ:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
-msgstr ""
+msgstr "โหมด Active"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:605
 msgid ""
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
-msgstr ""
+msgstr "การทดสอบ FTP ในโหมด Active ล้มเหลว FileZilla ไม่ทราบที่อยู่ IP ภายนอกที่ถูกต้อง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:592
 msgid ""
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address. In addition to that, your router has modified the sent address."
 msgstr ""
+"การทดสอบ FTP ในโหมด Active ล้มเหลว FileZilla ไม่ทราบที่อยู่ IP ภายนอกที่ถูกต้อง "
+"นอกจากนี้, เราเตอร์ของคุณได้ถูกปรับเปลี่ยนที่อยู่ที่จะส่ง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:580
 msgid ""
@@ -1342,80 +1325,78 @@
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
+"การทดสอบ FTP ในโหมด Active ล้มเหลว FileZilla ทราบที่อยู่ IP ภายนอกที่ถูกต้อง, "
+"แต่เราเตอร์หรือไฟร์วอลล์ของคุณถูกปรับเปลี่ยนที่อยู่ที่จะส่งให้เข้าใจผิด"
 
-#: resources.h:756
+#: resources.h:772
 msgid "Active mode IP"
-msgstr ""
+msgstr "IP ของโหมด Active"
 
-#: resources.h:449
-#, fuzzy
+#: resources.h:451
 msgid "Add files to &queue only"
-msgstr "&เพิ่มไฟล์ในคิวงาน"
+msgstr "เพิ่มไฟล์ไปยังคิวงานเท่านั้น"
 
-#: resources.h:625 resources.h:644
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
-msgstr "เพิ่มไดเรคทอรีที่เลือกลงคิวส่งข้อมูล"
+msgstr "เพิ่มไดเรกทอรีที่เลือกลงในคิวการโอนถ่าย"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
-msgstr "เพิ่มไฟล์หรือโฟลเดอร์ที่เลือกลงคิวส่งข้อมูล"
+msgstr "เพิ่มไฟล์หรือโฟลเดอร์ที่เลือกลงในคิวการโอนถ่าย"
 
-#: resources.h:914 resources.h:920
-#, fuzzy
+#: resources.h:932 resources.h:938
 msgid "Add to queue"
-msgstr "&เพิ่มลงคิวงาน"
+msgstr "เพิ่มลงในคิวงาน"
 
 #: ../../locales/../src/engine/proxy.cpp:451
 msgid "Address type not supported"
-msgstr ""
+msgstr "ชนิดของที่อยู่ไม่รองรับ"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "ขั้นสูง"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
-msgstr ""
+msgstr "ตัวเลือกขั้นสูง:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
-msgstr ""
+msgstr "อัลกอริทึม:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "All files have been successfully transferred"
-msgstr "&ลบอัตโนมัติทันทีที่ส่งข้อมูลสำเร็จ"
+msgstr "ไฟล์ทั้งหมดได้รับการโอนถ่ายเรียบร้อยแล้ว"
 
-#: resources.h:700
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr ""
+msgstr "พอร์ตทั้งหมดในช่วงที่ให้มาจำเป็นต้องอยู่ระหว่าง 1024 และ 65535"
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
-msgstr[0] ""
+msgstr[0] "การโอนถ่ายทั้งหมดเสร็จสิ้น %d ไฟล์ไม่สามารถโอนถ่ายได้"
 
-#: resources.h:739
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr ""
+msgstr "อนุญาตให้&ถอยกลับไปที่โหมดการโอนถ่ายอื่นเมื่อล้มเหลว"
 
-#: resources.h:675
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
-msgstr ""
+msgstr "อนุญาตให้ถอยกลับไปที่โหมดการโอนถ่ายอื่นเมื่อล้มเหลว"
 
-#: resources.h:475
-#, fuzzy
+#: resources.h:477
 msgid "Already connected"
-msgstr "เชื่อมต่อสำเร็จ"
+msgstr "เชื่อมต่อแล้ว"
 
-#: resources.h:784
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
 
-#: resources.h:785
+#: resources.h:801
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1425,781 +1406,790 @@
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
+msgstr "หรืออีกวิธีหนึ่ง, เยี่ยมชม http://filezilla-project.org เพื่อดาวน์โหลดรุ่นล่าสุด"
+
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
-msgstr ""
+msgstr "ไม่ระบุชื่อ"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
+"การดำเนินการระยะไกลอื่นอยู่ในระหว่างการดำเนินการ, ไม่สามารถเปลี่ยนไดเรกทอรีได้ในขณะนี้"
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
-msgstr ""
+msgstr "ไม่สามารถบันทึกการเปลี่ยนแปลงใด ๆ ที่ได้กระทำไว้ในตัวจัดการที่ตั้ง"
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../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 ""
+"การเปลี่ยนแปลงใด ๆ ที่ได้กระทำไว้ในตัวจัดการที่ตั้งจะไม่ถูกบันทึกจนกว่าคุณจะทำการซ่อมแซมไฟล์"
 
-#: ../../locales/../src/interface/filter.cpp:194
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
-msgstr ""
+msgstr "ไม่สามารถบันทึกการเปลี่ยนแปลงใด ๆ ที่เกิดขึ้นกับตัวกรอง"
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
-msgstr ""
+msgstr "การเปลี่ยนแปลงใด ๆ ที่เกิดขึ้นกับตัวกรองจะไม่ถูกบันทึก"
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
-msgstr ""
+msgstr "นำไป&ใช้กับไดเรกทอรีเท่านั้น"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
-msgstr ""
+msgstr "นำไปใช้"
 
 #: resources.h:66
 msgid "Apply to &current queue only"
-msgstr ""
+msgstr "นำไปใช้กับคิวงาน&ปัจจุบันเท่านั้น"
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
-msgstr ""
+msgstr "นำไปใช้กับ&ไฟล์เท่านั้น"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
-msgstr ""
+msgstr "จัดเก็บ"
 
-#: resources.h:863
-#, fuzzy
+#: resources.h:879
 msgid "As tab in the transfer queue pane"
-msgstr "เพิ่มไดเรคทอรีที่เลือกลงคิวส่งข้อมูล"
+msgstr "เป็นแท็บในแผงคิวการโอนถ่าย"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
-#, fuzzy
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 msgid "Ask for action"
-msgstr "&ถามสำหรับการกระทำ"
+msgstr "ถามสำหรับการกระทำ"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
-msgstr ""
+msgstr "ถามสำหรับรหัสผ่าน"
 
-#: resources.h:696
+#: resources.h:712
 msgid "Ask operating system for a port."
-msgstr ""
+msgstr "ถามระบบปฏิบัติการสำหรับพอร์ต"
 
-#: resources.h:686
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
-msgstr ""
+msgstr "ถามระบบปฏิบัติการของคุณสำหรับที่อยู่ IP ภายนอก"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
-msgstr ""
+msgstr "ถามคำถามในฟอรั่มของ FileZilla"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:64
 msgid "Associated program not found:"
-msgstr ""
+msgstr "ไม่พบโปรแกรมที่เกี่ยวข้อง:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
-msgstr ""
+msgstr "ตัวกรองอย่างน้อยหนึ่งเงื่อนไขไม่สมบูรณ์"
 
-#: resources.h:705
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
-msgstr "&สิทธิการเข้าถึงแฟ้ม"
+msgstr "คุณสมบัติ"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 msgid "Authentication failed."
-msgstr ""
+msgstr "ใบรับรองความถูกต้องล้มเหลว"
 
-#: resources.h:872
+#: resources.h:890
 msgid "Author:"
-msgstr ""
+msgstr "ผู้สร้าง:"
 
-#: resources.h:385
-#, fuzzy
+#: resources.h:387
 msgid "Auto"
-msgstr "&อัตโนมัติ"
+msgstr "อัตโนมัติ"
 
-#: resources.h:822
+#: resources.h:838
 msgid "Automatic file type classification"
-msgstr ""
+msgstr "จำแนกชนิดของไฟล์โดยอัตโนมัติ"
 
-#: resources.h:939
+#: resources.h:957
 msgid "Automatic update check"
-msgstr ""
+msgstr "ตรวจสอบการอัพเดตโดยอัตโนมัติ"
 
-#: resources.h:876
+#: resources.h:894
 msgid "Available sizes"
-msgstr ""
+msgstr "ขนาดที่ใช้ได้"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
-msgstr ""
+msgstr "ข้&ามพร็อกซี่"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
-msgstr ""
+msgstr "แนะนำการใช้งานเบื้องต้น"
 
-#: resources.h:865
+#: resources.h:881
 msgid "Behaviour"
-msgstr ""
+msgstr "พฤติกรรม"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
+msgstr "กำลังถูกแก้ไข"
+
+#: resources.h:626
+msgid "Benchmark string coalescer"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
-msgstr ""
+msgstr "ระวัง! ใบรับรองถูกเพิกถอน"
 
-#: resources.h:389
-#, fuzzy
+#: resources.h:391
 msgid "Binary"
-msgstr "&Binary"
+msgstr "Binary"
 
-#: resources.h:858
+#: resources.h:874
 msgid "Blackboard"
-msgstr ""
+msgstr "กระดานดำ"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
-msgstr ""
+msgstr "บุ๊คมาร์ค"
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
-msgstr ""
+msgstr "บุ๊คมาร์ค:"
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
-msgstr ""
+msgstr "บุ๊คมาร์ค"
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
-msgstr ""
+msgstr "วันที่สร้าง:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
-msgstr ""
+msgstr "ข้อมูลการสร้าง"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
-msgstr ""
+msgstr "หมวดหมู่ของบริษัท:"
 
-#: resources.h:746
+#: resources.h:762
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
+"โดยค่าเริ่มต้น พอร์ตใด ๆ ในเครื่องที่ใช้ได้จะถูกใช้เพื่อสร้างการโอนถ่ายในโหมด active "
+"ถ้าคุณต้องการจำกัด FileZilla เพื่อให้ใช้เฉพาะช่วงพอร์ตขนาดเล็ก, โปรดใส่ช่วงพอร์ตต่อไปนี้"
 
-#: resources.h:535
-#, fuzzy
+#: resources.h:545
 msgid "C&ancel current operation"
-msgstr "หยุดการเชื่อมต่อที่ใช้อยู่ ?"
+msgstr "ย&กเลิกการดำเนินการล่าสุด"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
-msgstr ""
+msgstr "ต&รวจสอบสำหรับการสร้างล่าสุดของ FileZilla"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
-msgstr ""
+msgstr "ล้&างทั้งหมด"
 
-#: resources.h:586 resources.h:632
-#, fuzzy
+#: resources.h:598 resources.h:648
 msgid "C&opy URL(s) to clipboard"
-msgstr "&คัดลอกไปยังคลิปบอร์ด"
+msgstr "คั&ดลอก URL ไปยังคลิปบอร์ด"
 
-#: resources.h:880
+#: resources.h:898
 msgid "C&ustom"
-msgstr ""
+msgstr "กำ&หนดเอง"
 
-#: resources.h:935
+#: resources.h:953
 msgid "C&ustom filetype associations:"
-msgstr ""
+msgstr "ความสัมพันธ์ของชนิดไฟล์ที่กำ&หนดเอง:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
-msgstr "กำลังคำนวนเพื่อชดเชยความแตกต่างของเขตเวลา..."
+msgstr "กำลังคำนวณเพื่อชดเชยความแตกต่างเขตเวลาของแม่ข่าย..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
 msgstr "ไม่สามารถอ่านจากไฟล์"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:712
+#: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
-msgstr "ไม่สามารถเขียนไปยังไฟล์"
+msgstr "ไม่สามารถเขียนข้อมูลไปยังไฟล์"
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
 #, c-format
 msgid "Can't write data to file: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเขียนข้อมูลไปยังไฟล์: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "ยกเลิก"
 
-#: resources.h:982
+#: resources.h:1000
 msgid "Cancel current operation"
-msgstr ""
+msgstr "ยกเลิกการดำเนินการปัจจุบัน"
 
-#: resources.h:983
+#: resources.h:1001
 msgid "Cancels the current operation"
-msgstr ""
+msgstr "ยกเลิกการดำเนินการปัจจุบัน"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
-msgstr ""
+msgstr "ไม่สามารถเข้าถึง '%s', ไม่มีสื่อถูกใส่อยู่หรือไดรฟ์ไม่พร้อม"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
-msgstr "ไม่สามารถแก้ใขไฟล์"
+msgstr "ไม่สามารถเพิ่มแม่ข่ายไปยังตัวจัดการที่ตั้งได้"
 
 #: ../../locales/../src/interface/context_control.cpp:345
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
 msgstr ""
+"ไม่สามารถปิดแท็บในขณะที่กำลังทำงาน\n"
+"ยกเลิกการดำเนินการล่าสุดและปิดแท็บ?"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
 msgstr ""
+"ไม่สามารถเปรียบเทียบไดเรกทอรี, "
+"ตัวกรองสำหรับไดเรกทอรีในเครื่องและระยะไกลที่แตกต่างกันถูกเปิดใช้งาน"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
-msgstr ""
+msgstr "ไม่สามารถเปรียบเทียบไดเรกทอรี, ไม่มีการเชื่อมต่อไปยังแม่ข่าย"
 
 #: ../../locales/../src/interface/filteredit.cpp:141
 msgid "Cannot create new filter"
-msgstr ""
+msgstr "ไม่สามารถสร้างตัวกรองใหม่ได้"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
-msgstr "ไม่สามารถแก้ใขไฟล์"
+msgstr "ไม่สามารถแก้ไขไฟล์"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 msgid "Cannot edit file, not connected to any server."
-msgstr "ไม่มีการเชื่อมต่อไปยัง แม่ข่ายใด ๆ"
+msgstr "ไม่สามารถแก้ไขไฟล์ได้, ไม่มีการเชื่อมต่อไปยังแม่ข่ายใด ๆ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
-msgstr ""
+msgstr "ไม่สามารถแก้ไขไฟล์, เส้นทางระยะไกลที่ไม่รู้จัก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr ""
+msgstr "ไม่สามารถโหลดแถบเชื่อมต่อด่วนจากไฟล์ทรัพยากร"
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr ""
+msgstr "ไม่สามารถโหลดไฟล์, ไฟล์ XML ไม่ถูกต้อง"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
-#, fuzzy
 msgid "Cannot load keyfile"
-msgstr "ไม่สามารถแก้ใขไฟล์"
+msgstr "ไม่สามารถโหลดไฟล์กุญแจ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
-msgstr ""
+msgstr "ไม่สามารถโหลดแถบเครื่องมือจากไฟล์ทรัพยากร"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
-msgstr ""
+msgstr "ไม่สามารถเปลี่ยนชื่อทางเข้า"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
-msgstr ""
+msgstr "ไม่สามารถเปลี่ยนชื่อไฟล์"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
-msgstr ""
+msgstr "ไม่สามารถบันทึกค่าตัวกรอง"
 
-#: ../../locales/../src/interface/filter.cpp:295
-#, fuzzy
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
-msgstr "ไม่สามารถแก้ใขไฟล์"
+msgstr "ไม่สามารถเลือกตัวกรอง"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 msgid "Cannot set file association"
-msgstr "&Inherit system's filetype associations"
+msgstr "ไม่สามารถตั้งค่าความสัมพันธ์ของไฟล์"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
-msgstr "ไม่สาารถแสดงหน้าต่างได้"
+msgstr "ไม่สามารถแสดงหน้าต่าง"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "Cannot view/edit selected file"
-msgstr "ไม่สามารถแสดงหรือแกใขไฟล์ที่เลือกได้"
+msgstr "ไม่สามารถดู/แก้ไขไฟล์ที่เลือกได้"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
-msgstr ""
+msgstr "หมวดหมู่"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
-msgstr ""
+msgstr "ข้อมูลใบรับรองและช่วงเวลายังใช้ไม่ได้"
 
 #: resources.h:26
-#, fuzzy
 msgid "Certificate details"
-msgstr "%s - ใบรับรองดิจิตอล หมดอายุแล้ว"
+msgstr "รายละเอียดใบรับรอง"
 
 #: resources.h:3 resources.h:27
 #, fuzzy
 msgid "Certificate in chain:"
-msgstr "%s - ใบรับรองดิจิตอล หมดอายุแล้ว"
+msgstr "ใบรับรองในห่วงโซ่:"
 
 #: resources.h:13 resources.h:37
 msgid "Certificate issuer"
-msgstr ""
+msgstr "ผู้ออกใบรับรอง"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
-msgstr ""
+msgstr "ความท้าทาย:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
-msgstr ""
+msgstr "เปลี่ยนคุณสมบัติของไฟล์"
 
-#: resources.h:589 resources.h:635
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
-msgstr ""
+msgstr "เปลี่ยนสิทธิของไฟล์"
 
-#: resources.h:956
-#, fuzzy
+#: resources.h:974
 msgid "Changing logfile settings requires restart of FileZilla."
-msgstr "เปิดหน้าต่างตั้งค่า"
+msgstr "การเปลี่ยนการตั้งค่าของไฟล์ประวัติจำเป็นต้องเริ่ม FileZilla ใหม่"
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
-msgstr ""
+msgstr "ปัญหาการเข้ารหัสอักขระ"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
-msgstr "รหัสตัวอีกษร"
+msgstr "รหัสอักขระ"
 
-#: resources.h:944
-#, fuzzy
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
-msgstr "&ตรวจสอบรุ่นทดลองของ Filezilla"
+msgstr "ตรวจสอบสำหรับรุ่น&เบต้าและ RC ของ Filezilla"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
-msgstr "ตรวจสอบการเ&ปลี่ยนรุ่น"
+msgstr "ตรวจสอบสำหรับการ&อัพเดต..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
-msgstr ""
+msgstr "ตรวจสอบสำหรับรุ่นที่ใหม่กว่าของ FileZilla"
 
 #: ../../locales/../src/interface/updatewizard.cpp:163
 msgid "Check for updates"
-msgstr "ตรวจสอบการเปลี่ยนรุ่น"
+msgstr "ตรวจสอบสำหรับการอัพเดต"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
-msgstr "ตรวจสอบการเปลี่ยนรุ่น"
+msgstr "การตรวจสอบการอัพเดตล้มเหลว"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
-msgstr ""
+msgstr "กำลังตรวจสอบสำหรับที่อยู่ IP ภายนอกที่ถูกต้อง"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
-msgstr "กำลังตรวจสอบการเปลี่ยนรุ่น"
+msgstr "กำลังตรวจสอบการอัพเดต"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1241
 msgid "Checksum mismatch of downloaded file."
-msgstr ""
+msgstr "การตรวจสอบผลรวมของไฟล์ที่ถูกดาวน์โหลดมาไม่ตรงกัน"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
-msgstr ""
+msgstr "เลือกไดเรกทอรีในเครื่องเริ่มต้น"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 msgid "Choose the local directory"
-msgstr "สร้างไดเรคทอรี"
+msgstr "เลือกไดเรกทอรีในเครื่อง"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
-msgstr ""
+msgstr "กลุ่มข้อมูลหยุดการทำงานไม่ถูกต้อง"
 
 #: resources.h:18 resources.h:42
+#, fuzzy
 msgid "Cipher:"
-msgstr ""
+msgstr "การเข้ารหัส:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
-msgstr ""
+msgstr "ปิ&ดแท็บ"
 
-#: resources.h:855
+#: resources.h:871
 msgid "Classic"
-msgstr ""
+msgstr "คลาสสิก"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
-msgstr ""
+msgstr "ล้างทางเข้าตัวจัดการ&ที่ตั้ง"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
-msgstr ""
+msgstr "ล้างแคชของ&เค้าโครง"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
-msgstr ""
+msgstr "ล้างประวัติการเชื่อมต่อ&ด่วน"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
-msgstr ""
+msgstr "ล้างข้อมูลการเชื่อมต่อ&ใหม่"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
-msgstr ""
+msgstr "ล้างคิวการ&โอนถ่าย"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
-msgstr "ล้างข้อมูล"
+msgstr "ล้างประวัติ"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
-msgstr ""
+msgstr "ล้างข้อมูลส่วนตัว"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "ล้างแถบเชื่อมต่อด่วน"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr ""
+msgstr "คลิก เสร็จสิ้น เพื่อบันทึกการกำหนดค่าของคุณ"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1096
 msgid "Click on next to download the new version."
-msgstr ""
+msgstr "คลิก ถัดไป เพื่อดาวน์โหลดรุ่นใหม่"
 
-#: resources.h:346
-#, fuzzy
+#: resources.h:348
 msgid "Client to server MAC:"
-msgstr "เชื่อมต่อไปยังแม่ข่าย"
+msgstr "ลูกข่ายไปยังแม่ข่าย MAC:"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
-msgstr ""
+msgstr "การเข้ารหัสลูกข่ายไปยังแม่ข่าย:"
 
-#: resources.h:661
+#: resources.h:677
 msgid "Close &all other tabs"
-msgstr ""
+msgstr "ปิดแท็บอื่น&ทั้งหมด"
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "ปิด Filezilla"
 
 #: ../../locales/../src/interface/cmdline.cpp:14
+#, fuzzy
 msgid "Close all running instances of FileZilla"
-msgstr ""
+msgstr "ปิดกรณีที่กำลังทำงานอยู่ทั้งหมดของ FileZilla"
 
-#: resources.h:496
+#: resources.h:505
 msgid "Closes current tab"
-msgstr ""
+msgstr "ปิดแท็บปัจจุบัน"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
-msgstr "ค&อมเม้นต์"
+msgstr "ข้อ&คิดเห็น:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
-msgstr ""
+msgstr "คุณสมบัติคอลัมน์"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
-msgstr ""
+msgstr "ตั้งค่าคอลัมน์"
 
-#: resources.h:930
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
-msgstr ""
+msgstr "คำสั่งและอาร์กิวเมนต์ของมันควรจะถูกอ้างถึงอย่างถูกต้อง"
 
 #: ../../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
-#, fuzzy
 msgid "Command failed"
-msgstr "คำสั่ง:"
+msgstr "คำสั่งล้มเหลว"
 
 #: ../../locales/../src/engine/proxy.cpp:448
 msgid "Command not supported"
-msgstr ""
+msgstr "คำสั่งไม่รองรับ"
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr ""
+msgstr "คำสั่งไม่รองรับโดยโปรโตคอลนี้"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "คำสั่ง:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:40
-#, fuzzy
 msgid "Comment"
-msgstr "ค&อมเม้นต์"
+msgstr "ข้อคิดเห็น"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
 msgid "Common name:"
-msgstr ""
+msgstr "ชื่อทั่วไป:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:426
 #: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
 msgstr ""
 
-#: resources.h:513 resources.h:639
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
-msgstr ""
+msgstr "เปรียบเทียบเวลาที่&แก้ไข"
 
-#: resources.h:512 resources.h:638
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
-msgstr ""
+msgstr "เปรียบเทียบ&ขนาดไฟล์"
 
-#: resources.h:910
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
-msgstr ""
+msgstr "เกณฑ์การเปรียบเทียบ (เป็นนาที):"
 
 #: ../../locales/../src/interface/settings/optionspage_filelists.cpp:39
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
-msgstr ""
+msgstr "เกณฑ์การเปรียบเทียบต้องอยู่ระหว่าง 0 และ 1440 นาที"
 
-#: resources.h:159
+#: resources.h:160
 msgid "Compiled for:"
-msgstr ""
+msgstr "คอมไพล์สำหรับ:"
 
-#: resources.h:160
+#: resources.h:161
 msgid "Compiled on:"
-msgstr ""
+msgstr "คอมไพล์บน:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
-msgstr ""
+msgstr "คอมไพล์ด้วย:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
-msgstr ""
+msgstr "ค่าคอมไพเลอร์:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
-msgstr ""
+msgstr "ถูกบีบอัด"
 
-#: resources.h:796
+#: resources.h:812
 msgid "Concurrent transfers"
-msgstr ""
+msgstr "การโอนถ่ายพร้อมกัน"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
+#, fuzzy
 msgid "Conditions are c&ase sensitive"
-msgstr ""
+msgstr "เงื่อนไขนั้นเป็นกร&ณีสำคัญ"
 
-#: resources.h:704
+#: resources.h:720
 msgid "Configuration test"
-msgstr ""
+msgstr "ทดสอบการกำหนดค่า"
 
-#: resources.h:678
+#: resources.h:694
 msgid "Configure passive mode"
-msgstr ""
+msgstr "กำหนดค่าโหมด passive"
 
-#: resources.h:694
+#: resources.h:710
 msgid "Configure port range"
-msgstr ""
+msgstr "กำหนดค่าช่วงพอร์ต"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
-msgstr ""
+msgstr "การกำหนดค่า FileZilla และเครือข่ายของคุณ"
 
-#: ../../locales/../src/interface/search.cpp:1054
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1033
 msgid "Confirm deletion"
-msgstr "เชื่อมต่อ"
+msgstr "ยืนยันการลบ"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
-msgstr ""
+msgstr "ต้องการการยืนยัน"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:567
 msgid "Congratulations, your configuration seems to be working."
-msgstr ""
+msgstr "ขอแสดงความยินดี, การกำหนดค่าของคุณดูเหมือนว่าจะทำงานได้"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr ""
+msgstr "เชื่อมต่อโดยข้ามการตั้งค่าของพร็อกซี"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
-msgstr ""
+msgstr "เชื่อมต่อไปยังที่ตั้งของตัวจัดการที่ตั้งที่ถูกระบุ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
-msgstr "เชื่อมต่อสำเร็จ"
+msgstr "เชื่อมต่อแล้ว"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "กำลังเชื่อมต่อ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
-msgstr "เชื่อมต่อไปยัง %s"
+msgstr "กำลังเชื่อมต่อไปยัง %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1163
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s through proxy"
-msgstr "เชื่อมต่อไปยัง %s"
+msgstr "การเชื่อมต่อไปยัง %s ผ่านทางพร็อกซี"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1034
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
-#, fuzzy, c-format
+#, c-format
 msgid "Connecting to %s..."
-msgstr "เชื่อมต่อไปยัง %s:%d..."
+msgstr "กำลังเชื่อมต่อไปยัง %s..."
 
 #: ../../locales/../src/interface/updatewizard.cpp:424
 #: ../../locales/../src/interface/updatewizard.cpp:998
 msgid "Connecting to server"
-msgstr "เชื่อมต่อไปยังแม่ข่าย"
+msgstr "กำลังเชื่อมต่อไปยังแม่ข่าย"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:116
 msgid "Connection"
-msgstr "เชื่อมต่อ"
+msgstr "การเชื่อมต่อ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
-msgstr "ความพยายามเชื่อมต่อล้มเหลว"
+msgstr "ความพยายามในการเชื่อมต่อล้มเหลว"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1039
 #: ../../locales/../src/engine/proxy.cpp:176
-#, fuzzy, c-format
+#, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "ความพยายามเชื่อมต่อล้มเหลว"
+msgstr "ความพยายามเข้าสู่ระบบ \"%s\" ล้มเหลว, กำลังลองที่อยู่ถัดไป"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1044
-#, fuzzy, c-format
+#, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "ความพยายามเชื่อมต่อล้มเหลว"
+msgstr "ความพยายามเข้าสู่ระบบ \"%s\" ล้มเหลว"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
 msgid "Connection attempt interrupted by user"
-msgstr "ความพยายามเชื่อมต่อถูกขัดขวางจากผู้ใช้"
+msgstr "ความพยายามในการเชื่อมต่อถูกขัดจังหวะโดยผู้ใช้"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:543
 msgid "Connection closed"
 msgstr "การเชื่อมต่อถูกปิด"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
-#, fuzzy
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
-msgstr "การเชื่อมต่อถูกปิด"
+msgstr "การเชื่อมต่อถูกปิดโดยแม่ข่าย"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
-msgstr ""
+msgstr "การเชื่อมต่อถูกสร้าง, กำลังเตรียมใช้งาน TLS..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
-msgstr ""
+msgstr "การเชื่อมต่อถูกสร้าง, กำลังส่งคำร้องขอ HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
-msgstr "เชื่อมต่อสำเร็จ กำลังรอข้อความต้อนรับ"
+msgstr "การเชื่อมต่อถูกสร้าง,กำลังรอข้อความต้อนรับ..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
-msgstr "การเชื่อมต่อล้มเหลว"
+msgstr "การเชื่อมต่อสูญหาย"
 
 #: ../../locales/../src/engine/proxy.cpp:433
 #, fuzzy
 msgid "Connection not allowed by ruleset"
-msgstr "การเชื่อมต่อหมดเวลา"
+msgstr "การเชื่อมต่อไม่อนุญาตโดยค่าของกฎ"
 
 #: ../../locales/../src/engine/proxy.cpp:442
-#, fuzzy
 msgid "Connection refused"
-msgstr "การเชื่อมต่อถูกปิด"
+msgstr "การเชื่อมต่อถูกปฏิเสธ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:681
 msgid "Connection timed out"
@@ -2207,12 +2197,11 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:1070
 msgid "Connection timed out."
-msgstr "การเชื่อมต่อหมดเวลา."
+msgstr "การเชื่อมต่อหมดเวลา"
 
-#: ../../locales/../src/interface/search.cpp:702
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:676
 msgid "Connection to server lost."
-msgstr "เชื่อมต่อไปยังแม่ข่าย"
+msgstr "การเชื่อมต่อไปยังแม่ข่ายสูญหาย"
 
 #: ../../locales/../src/engine/proxy.cpp:188
 #, fuzzy
@@ -2225,86 +2214,82 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:552
 msgid "Connection with the test server failed."
-msgstr ""
+msgstr "การเชื่อมต่อกับแม่ข่ายทดสอบล้มเหลว"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
-msgstr ""
+msgstr "แปลงไฟล์กุญแจ"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
-msgstr "&คัดลอก"
+msgstr "คัดลอ&ก"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
-msgstr "คัดลอก(%d) จาก %s"
+msgstr "คัดลอก (%d) จาก %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
-#, fuzzy, c-format
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
+#, c-format
 msgid "Copy of %s"
-msgstr "คัดลอกจาก %s "
+msgstr "สำเนาของ %s"
 
-#: resources.h:587 resources.h:633
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr ""
+msgstr "คัดลอก URL ของรายการที่เลือกไปยังคลิปบอร์ด"
 
 #: ../../locales/../src/engine/transfersocket.cpp:207
-#, fuzzy, c-format
+#, c-format
 msgid "Could not accept connection: %s"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถยอมรับการเชื่อมต่อ: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 msgid "Could not add connection to Site Manager"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถเพิ่มการเชื่อมต่อไปยังตัวจัดการที่ตั้ง"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1205
-#, fuzzy, c-format
+#, c-format
 msgid "Could not connect to server: %s"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 msgid "Could not convert command to server encoding"
-msgstr ""
+msgstr "ไม่สามารถแปลงคำสั่งไปเป็นการเข้ารหัสของแม่ข่าย"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy
 msgid "Could not convert private key"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถแปลงกุญแจส่วนตัวได้"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not copy URLs"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถคัดลอก URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถคัดลอกข้อมูล"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 msgid ""
 "Could not determine the target of the Drag&Drop operation.\n"
 "Either the shell extension is not installed properly or you didn't drop the "
 "files into an Explorer window."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
-msgstr ""
+msgstr "ไม่สามารถสร้างการเชื่อมต่อกับแม่ข่าย"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2312,63 +2297,66 @@
 "variable."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 msgid "Could not generate custom login sequence."
-msgstr ""
+msgstr "ไม่สามารถสร้างลำดับการเข้าสู่ระบบแบบกำหนดเอง"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1015
 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:170
 msgid "Could not get reply from fzputtygen."
-msgstr ""
+msgstr "ไม่สามารถรับการตอบกลับจาก fzputtygen"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
-msgstr ""
+msgstr "ไม่สามารถรับไดเรกทอรีชั่วคราวเพื่อดาวน์โหลดไฟล์ลงใน"
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
-msgstr ""
+msgstr "ไม่สามารถนำเข้าใบรับรองที่เกี่ยวข้อง, gnutls_x509_crt_import failed"
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
+"ไม่สามารถเตรียมการใช้งานโครงสร้างใบรับรองที่เกี่ยวข้อง, gnutls_x509_crt_init failed"
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
+"ไม่สามารถโหลด \"%s\", โปรดตรวจสอบให้แน่ใจว่าไฟล์ถูกต้องและสามารถเข้าถึงได้\n"
+"การเปลี่ยนแปลงใด ๆ ที่ได้กระทำไว้ในตัวจัดการที่ตั้งจะไม่ถูกบันทึกไว้"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
-msgstr ""
+msgstr "ไม่สามารถโหลดไฟล์กุญแจ"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
 msgid "Could not load private key"
-msgstr ""
+msgstr "ไม่สามารถโหลดกุญแจส่วนตัว"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1041
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2392,167 +2380,181 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
-#, fuzzy
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 msgid "Could not open clipboard"
-msgstr "&คัดลอกไปยังคลิปบอร์ด"
+msgstr "ไม่สามารถเปิดคลิปบอร์ดได้"
 
 #: ../../locales/../src/engine/logging.cpp:208
 #: ../../locales/../src/engine/logging.cpp:276
 #: ../../locales/../src/engine/logging.cpp:307
-#, fuzzy, c-format
+#, c-format
 msgid "Could not open log file: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเปิดไฟล์ประวัติ: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 msgid "Could not parse remote path."
-msgstr ""
+msgstr "ไม่สามารถแยกวิเคราะห์เส้นทางระยะไกล"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
-msgstr ""
+msgstr "ไม่สามารถแยกวิเคราะห์ที่อยู่แม่ข่าย:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#, c-format
 msgid "Could not read from socket: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถอ่านจากซ็อกเก็ต: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:487
 msgid "Could not read server item."
-msgstr "ไม่สามารถเชื่อมต่อไปยังแม่ข่าย"
+msgstr "ไม่สามารถอ่านรายการแม่ข่าย"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
-msgstr ""
+msgstr "ไม่สามารถไปหาจุดสิ้นสุดของไฟล์"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
-msgstr ""
+msgstr "ไม่สามารถส่งคำสั่งไปยัง fzputtygen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
+#, fuzzy
 msgid "Could not spawn IO thread"
-msgstr ""
+msgstr "ไม่สามารถ spawn เธรด IO"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1178
 #, fuzzy, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเริ่มการแฮนด์เชคพร็อกซี่: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
-msgstr ""
+msgstr "ไม่สามารถเริ่มการโอนถ่ายได้"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
+"ไม่สามารถเขียน \"%s\", ไม่สามารถบันทึกการเปลี่ยนแปลงใด ๆ ที่ได้ทำไว้ในตัวจัดการที่ตั้ง: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr ""
+msgstr "ไม่สามารถเขียน \"%s\", ไม่สามารถเพิ่มบุ๊คมาร์ค: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr ""
+msgstr "ไม่สามารถเขียน \"%s\", ไม่สามารถบันทึกบุ๊คมาร์คส่วนกลาง: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
 msgstr ""
+"ไม่สามารถเขียน \"%s\", ไม่สามารถบันทึกคิวงาน\n"
+"%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr ""
+msgstr "ไม่สามารถเขียน \"%s\", ไม่สามารถส่งออกที่ตั้งที่เลือก: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr ""
+msgstr "ไม่สามารถเขียน \"%s\": %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write keyfile: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเขียนไฟล์กุญแจ: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเขียนไฟล์ในเครื่อง"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write to log file: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเขียนไฟล์ประวัติ: %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:999
 #: ../../locales/../src/engine/ControlSocket.cpp:1097
-#, fuzzy, c-format
+#, c-format
 msgid "Could not write to socket: %s"
-msgstr "ไม่สามารถเขียนไปยังไฟล์: %s"
+msgstr "ไม่สามารถเขียนซ็อกเก็ต: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr "ประเทศ:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "ไม่สามารถสร้างตัวกรองใหม่ได้"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
-msgstr ""
+msgstr "สร้างไดเรกทอรีย่อยใหม่ในไดเรกทอรีปัจจุบัน"
+
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "สร้างไดเรกทอรีย่อยใหม่ในไดเรกทอรีปัจจุบัน"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
-msgstr "สร้างไดเรคทอรี"
+msgstr "สร้างไดเรกทอรี"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "ไม่สามารถแก้ไขไฟล์"
+
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
-msgstr "กำลังสร้างไดเรคทอรี"
+msgstr "กำลังสร้างไดเรกทอรี"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "กำลังสร้างไดเรคทอรี '%s'..."
+msgstr "กำลังสร้างไดเรกทอรี '%s'..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
-msgstr "การวิเคราะผิดพลาด"
+msgstr "ผิดพลาดร้ายแรง"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:137
-#, fuzzy
 msgid "Critical file transfer error"
-msgstr "การวิเคราะผิดพลาด"
+msgstr "การโอนถ่ายไฟล์ผิดพลาดร้ายแรง"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:120
-#, fuzzy, c-format
+#, c-format
 msgid "Critical file transfer error after transferring %s in %s"
-msgstr "การวิเคราะผิดพลาด"
+msgstr "การโอนถ่ายไฟล์ผิดพลาดร้ายแรงหลังจากโอนถ่าย %s ใน %s"
 
 #: ../../locales/../src/interface/state.cpp:370
 #, c-format
@@ -2560,76 +2562,84 @@
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
 "Synchronized browsing has been disabled."
 msgstr ""
+"ไดเรกทอรีระยะไกลปัจจุบัน (%s) ไม่ตรงกับการซิงโครไนซ์ราก (%s)\n"
+"การซิงโครไนซ์ตัวเรียกดูถูกปิดใช้งาน"
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
-msgstr ""
+msgstr "ชนิดของการโอนถ่ายปัจจุบันถูกตั้งเป็น ASCII"
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
-msgstr ""
+msgstr "ชนิดของการโอนถ่ายปัจจุบันถูกตั้งเป็นตรวจพบอัตโนมัติ"
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
-msgstr ""
+msgstr "ชนิดของการโอนถ่ายปัจจุบันถูกตั้งเป็น binary"
 
-#: resources.h:767 resources.h:886
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
-msgstr "ส่วนตัว"
+msgstr "กำ&หนดเอง"
 
 #: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
-msgstr "ตั้งค่าตัวกรองส่วนตัว"
+msgstr "ค่าตัวกรองที่กำหนดเอง"
 
-#: resources.h:375 resources.h:376
-#, fuzzy
+#: resources.h:377 resources.h:378
 msgid "Custom server"
-msgstr "ตั้งค่าตัวกรองส่วนตัว"
+msgstr "แม่ข่ายที่กำหนดเอง"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
-msgstr ""
+msgstr "ชนิดของข้&อมูล"
 
-#: resources.h:893
-#, fuzzy
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
-msgstr "&Decimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
+msgstr "เลขนำหน้าท&ศนิยมที่ใช้สัญลักษณ์ SI (ตัวอย่าง 1 KB = 1000 ไบต์)"
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "ค่าเ&ริ่มต้น"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
-msgstr "&ลบ"
+msgstr "ล&บ"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
-msgstr "&ปิดการใช้งานทั้งหมด"
+msgstr "ปิดการใ&ช้งานทั้งหมด"
+
+#: resources.h:882
+msgid "D&o not save passwords"
+msgstr "ไ&ม่บันทึกรหัสผ่าน"
 
-#: resources.h:917
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
-msgstr ""
+msgstr "การกระทำเมื่อคลิกส&องครั้งบนไดเรกทอรี:"
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
-msgstr ""
+msgstr "DOS-like กับเส้นทางเสมือน"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
-msgstr ""
+msgstr "ชนิดไฟล์อันตราย"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
 msgid "Data"
-msgstr ""
+msgstr "ข้อมูล"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:985
 #: ../../locales/../src/interface/netconfwizard.cpp:1051
 msgid "Data socket closed too early."
-msgstr ""
+msgstr "ซ็อกเก็ตข้อมูลถูกปิดเร็วเกินไป"
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+msgid "Date"
+msgstr "วันที่"
+
+#: resources.h:895
 msgid "Date formatting"
 msgstr "รูปแบบวัน"
 
@@ -2637,70 +2647,73 @@
 msgid "Date/time format"
 msgstr "รูปแบบวัน/เวลา"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "วัน/เวลาที่ไม่รู้จัก"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:141
+#, fuzzy
 msgid "Debug"
-msgstr ""
+msgstr "ดีบั๊ก"
 
-#: resources.h:957
+#: resources.h:975
+#, fuzzy
 msgid "Debugging settings"
-msgstr ""
+msgstr "ตั้งค่า Debugging"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
-msgstr ""
+msgstr "ไดเรกทอรี&ในเครื่องเริ่มต้น:"
 
-#: ../../locales/../src/engine/server.cpp:23
-#, fuzzy
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
-msgstr "&ตรวจพบอัตโนมัติ"
+msgstr "มาตรฐาน (ตรวจพบอัตโนมัติ)"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
 msgid "Default editor not properly quoted."
-msgstr ""
+msgstr "ตัวแก้ไขเริ่มต้นถูกอ้างถึงอย่างไม่ถูกต้อง"
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
-msgstr ""
+msgstr "การกระทำเริ่มต้นเมื่อไฟล์มีอยู่แล้ว"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
-msgstr ""
+msgstr "ไดเรกทอรีระยะไก&ลเริ่มต้น:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 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:78
 msgid "Default system language"
-msgstr ""
+msgstr "ภาษาของระบบเริ่มต้น"
 
-#: resources.h:672
+#: resources.h:688
 msgid "Default transfer mode:"
-msgstr ""
+msgstr "โหมดการโอนถ่ายเริ่มต้น:"
 
-#: resources.h:818
+#: resources.h:834
 msgid "Default transfer type:"
-msgstr ""
+msgstr "ชนิดการโอนถ่ายเริ่มต้น:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
-msgstr ""
+msgstr "ค่าเริ่มต้น: http://ip.filezilla-project.org/ip.php"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:41
 msgid ""
 "Delay between failed connection attempts has to be between 1 and 999 seconds."
-msgstr ""
+msgstr "การหน่วงเวลาระหว่างความพยายามเข้าสู่ระบบเมื่อล้มเหลวต้องอยู่ระหว่าง 1 และ 999 วินาที"
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2710,145 +2723,142 @@
 "attempt..."
 msgstr[0] ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
-msgstr ""
+msgstr "ลบทางเข้าตัวจัดการที่ตั้ง"
 
-#: resources.h:629 resources.h:650
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
-msgstr ""
+msgstr "ลบไดเรกทอรีที่เลือก"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
-msgstr ""
+msgstr "ลบไฟล์และไดเรกทอรีที่เลือก"
 
-#: ../../locales/../src/interface/search.cpp:1038
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting directories"
-msgstr "กำลังสร้างไดเรคทอรี"
+msgstr "กำลังลบไดเรกทอรี"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
-msgstr "เดสทอป"
+msgstr "เดสก์ท็อป"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "รายละเอียด"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
-msgstr ""
+msgstr "รายละเอียดสำหรับกุญแจใหม่:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
-msgstr "ไดเ&รคทอรี"
+msgstr "ไดเ&รกทอรี"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "ทิศทาง"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
-#, fuzzy
+#: ../../locales/../src/interface/filelistctrl.cpp:523
 msgid "Directory"
-msgstr "ทิศทาง"
+msgstr "ไดเรกทอรี"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
+#: resources.h:652 resources.h:926 resources.h:1009
+#: ../../locales/../src/interface/filelistctrl.cpp:445
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
-msgstr ""
+msgstr "เปรียบเทียบไดเรกทอรี"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 #: ../../locales/../src/interface/listingcomparison.cpp:82
 #: ../../locales/../src/interface/listingcomparison.cpp:88
 msgid "Directory comparison failed"
-msgstr ""
+msgstr "การเปรียบเทียบไดเรกทอรีล้มเหลว"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr ""
+msgstr "ไดเรกทอรีที่มีไฟล์ประวัติไม่มีอยู่หรือชื่อไฟล์ไม่ถูกต้อง"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "การรับรายการไดเรคทอรีถูกยกเลิกโดยผู้ใช้"
+msgstr "การรับรายการไดเรกทอรีถูกยกเลิกโดยผู้ใช้"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
-msgstr "รับรายการไดเรคทอรีไม่สำเร็จ"
+msgstr "การรับรายการไดเรกทอรีล้มเหลว"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
-msgstr "ตัวกรองรายการไดเรคทอรี"
+msgstr "ตัวกรองรายการไดเรกทอรี"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:196
 msgid "Directory listing successful"
-msgstr "รับรายการไดเรคทอรีสำเร็จ"
+msgstr "รับรายการไดเรกทอรีสำเร็จ"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
-msgstr "ปิดการใช้งานทั้งหมด"
+msgstr "ปิดการ&ใช้งานทั้งหมด"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
-msgstr ""
+msgstr "ปิดการซิงโครไนซ์ตัวเรียกดูและทำการเปลี่ยนไดเรกทอรีระยะไกลต่อไป?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
-msgstr ""
+msgstr "ปิดการใช้งานตัวเลือกนี้อีกครั้ง ถ้าคุณไม่ต้องการที่จะดูเนื้อหาของไดเรกทอรีที่ถูกต้องอีกต่อไป"
 
-#: resources.h:984
+#: resources.h:1002
 msgid "Disconnect from server"
-msgstr "การเชื่อมต่อถูกยกเลิกจากแม่ข่าย"
+msgstr "ตัดการเชื่อมต่อจากแม่ข่าย"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "ถูกตัดการเชื่อมต่อจากแม่ข่าย"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1134
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
-#, fuzzy, c-format
+#, c-format
 msgid "Disconnected from server: %s"
-msgstr "ถูกตัดการเชื่อมต่อจากแม่ข่าย"
+msgstr "ตัดการเชื่อมต่อจากแม่ข่าย: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1429
+#: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
-msgstr ""
+msgstr "กำลังตัดการเชื่อมต่อจากแม่ข่ายก่อนหน้านี้"
 
-#: resources.h:985
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
-msgstr ""
+msgstr "ตัดการเชื่อมต่อจากแม่ข่ายปัจจุบันที่มองเห็น"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
-msgstr ""
+msgstr "แสดงหน้าต่างเกี่ยวกับ"
 
-#: resources.h:926
-#, fuzzy
+#: resources.h:944
 msgid "Do &not use default editor"
-msgstr "&ตัวแก้ใขเริ่มต้น"
+msgstr "ไ&ม่ใช้ตัวแก้ไขเริ่มต้น"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
-msgstr ""
+msgstr "ไม่ต้องทำสิ่ง&ใด"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
 #: ../../locales/../src/interface/updatewizard.cpp:251
@@ -2856,277 +2866,262 @@
 "Do you really want to check for beta versions?\n"
 "Unless you want to test new features, keep using stable versions."
 msgstr ""
+"คุณแน่ใจหรือไม่ที่จะตรวจสอบรุ่นเบต้า?\n"
+"นอกจากว่าคุณต้องการที่จะทดสอบคุณลักษณะใหม่, โปรดใช้รุ่นที่เสถียร"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะปิด FileZilla?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../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:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะลบทางเข้าตัวจัดการที่ตั้งทั้งหมด?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะลบทางเข้าที่เลือก?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะลบคิวการโอนถ่าย?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะส่ง '%s' ไปยังแม่ข่าย?"
 
-#: resources.h:465
-#, fuzzy
+#: resources.h:467
 msgid "Documentation"
-msgstr "เอกสารของฉัน"
+msgstr "เอกสารประกอบการใช้งาน"
 
-#: resources.h:693
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
-msgstr ""
+msgstr "อย่าใช้ที่อยู่ IP ภายนอกบนการเชื่อมต่อในเครื่อง"
 
-#: resources.h:829
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr ""
+msgstr "ไฟล์จุดเป็นชื่อไฟล์ที่ขึ้นต้นด้วยจุด, เช่น .htaccess"
 
-#: resources.h:911
+#: resources.h:929
 msgid "Double-click action"
-msgstr ""
+msgstr "การกระทำเมื่อคลิกสองครั้ง"
 
-#: resources.h:361
-#, fuzzy
+#: resources.h:363
 msgid "Download"
-msgstr "&ดาวน์โหลด"
+msgstr "ดาวน์โหลด"
 
-#: resources.h:481 resources.h:805
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
-msgstr "&จำกัดการรับข้อมูล"
+msgstr "&จำกัดการดาวน์โหลด:"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:604
+#, c-format
 msgid "Download limit: %s/s"
-msgstr "&จำกัดการรับข้อมูล"
+msgstr "จำกัดการดาวน์โหลด: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:606
 msgid "Download limit: none"
-msgstr "&จำกัดการรับข้อมูล"
+msgstr "จำกัดการดาวน์โหลด: ไม่จำกัด"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 msgid "Download search results"
-msgstr "รับข้อมูลจากไดเรคทอรีที่เลือก"
+msgstr "ดาวน์โหลดผลการค้นหา"
 
-#: resources.h:623
+#: resources.h:639
 msgid "Download selected directory"
-msgstr "รับข้อมูลจากไดเรคทอรีที่เลือก"
+msgstr "ดาวน์โหลดไดเรกทอรีที่เลือก"
 
-#: resources.h:573
+#: resources.h:583
 msgid "Download selected files and directories"
-msgstr "รับข้อมูลจากไฟล์และไดเรคทอรีที่เลือก"
+msgstr "ดาวน์โหลดไฟล์และไดเรกทอรีที่เลือก"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
-msgstr "กำลังรับข้อมูล"
+msgstr "กำลังดาวน์โหลด"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
 #: ../../locales/../src/interface/updatewizard.cpp:415
 #, c-format
 msgid "Downloading %s"
-msgstr "กำลังรับข้อมูล %s"
+msgstr "กำลังดาวน์โหลด %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
-msgstr ""
+msgstr "ยังไม่รองรับการดาวน์โหลดหลายไดเรกทอรีที่ไม่เกี่ยวข้อง"
 
-#: ../../locales/../src/interface/search.cpp:952
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading search results"
-msgstr "กำลังรับข้อมูล %s"
+msgstr "กำลังดาวน์โหลดผลการค้นหา"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
-msgstr ""
-
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr ""
+msgstr "การลากและ&ปล่อยระหว่างแม่ข่ายที่แตกต่างกันยังไม่ได้รับการใช้งาน"
 
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "เปิดใ&ช้งานทั้งหมด"
 
-#: resources.h:559 resources.h:576
-#, fuzzy
+#: resources.h:569 resources.h:586
 msgid "E&nter directory"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "เ&ปิดไดเรกทอรี"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
-msgstr ""
+msgstr "ป&ระมวลผล"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
-msgstr "อ&อก"
+msgstr "ออ&ก"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "E-Mail:"
-msgstr "อีเมลล์:"
+msgstr "อีเมล:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
-msgstr ""
+msgstr "แต่ละตัวกรองจำเป็นต้องมีอย่างน้อยหนึ่งเงื่อนไข"
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
-msgstr ""
+msgstr "แก้ไขตัวกรอง"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
-msgstr ""
+msgstr "แก้ไขไฟล์ด้วยตัวแก้ไขที่กำหนด และอัพโหลดการเปลี่ยนแปลงไปยังแม่ข่าย"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
-#, fuzzy
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Editing failed"
-msgstr "รับรายการไดเรคทอรีไม่สำเร็จ"
+msgstr "การแก้ไขล้มเหลว"
 
-#: resources.h:874
+#: resources.h:892
 msgid "Email:"
-msgstr "อีเมลล์:"
+msgstr "อีเมล:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
 msgstr "ไม่มีคำสั่ง"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:60
 msgid "Empty command."
-msgstr "ไม่มีคำสั่ง."
+msgstr "ไม่มีคำสั่ง"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
-msgstr "ไม่มีรายการไดเรคทอรี"
+msgstr "ไม่มีรายการไดเรกทอรี"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:26
-#, fuzzy
 msgid "Empty directory."
-msgstr "ไม่มีรายการไดเรคทอรี"
+msgstr "ไม่มีรายการไดเรกทอรี"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
-msgstr ""
+msgstr "ไม่มีนามสกุลไฟล์"
 
 #: ../../locales/../src/interface/filteredit.cpp:206
 #: ../../locales/../src/interface/filteredit.cpp:248
 msgid "Empty filter names are not allowed."
-msgstr ""
+msgstr "ไม่อนุญาตให้ไม่มีชื่อตัวกรอง"
 
 #: ../../locales/../src/interface/filteredit.cpp:206
 #: ../../locales/../src/interface/filteredit.cpp:248
 msgid "Empty name"
-msgstr ""
+msgstr "ไม่มีชื่อ"
 
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
 msgid "Empty quoted string."
 msgstr ""
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "เ&ปิดใช้งานทั้งหมด"
 
-#: resources.h:814
+#: resources.h:830
 msgid "Enable invalid character &filtering"
-msgstr ""
+msgstr "เปิดใช้งานการกรองอักขระที่ไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
-msgstr ""
+msgstr "ถูกเข้ารหัส"
 
-#: resources.h:343
-#, fuzzy
+#: resources.h:345
 msgid "Encryption"
-msgstr "เชื่อมต่อ"
+msgstr "การเข้ารหัส"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
-msgstr ""
+msgstr "รายละเอียดการเข้ารหัส"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
-msgstr ""
+msgstr "สิ้นสุดการเปรียบเทียบและเปลี่ยนการเรียงลำดับ?"
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
-msgstr ""
+msgstr "ใส่คำสั่งที่กำหนดเอง..."
 
-#: resources.h:485
+#: resources.h:487
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
-msgstr ""
+msgstr "ใส่ 0 คือไม่จำกัดความเร็ว"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
-msgstr "ป้อนคำสัง"
+msgstr "ใส่คำสั่ง"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
-msgstr "ป้นคำสั่งส่วนตัว"
+msgstr "ใส่คำสั่งที่กำหนดเอง"
 
-#: resources.h:918
-#, fuzzy
+#: resources.h:936
 msgid "Enter directory"
-msgstr "ไดเรคทอรีใหม่"
+msgstr "เปิดไดเรกทอรี"
 
 #: ../../locales/../src/interface/filteredit.cpp:134
 #: ../../locales/../src/interface/filteredit.cpp:194
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Enter filter name"
-msgstr ""
+msgstr "ใส่ชื่อตัวกรอง"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
-msgstr ""
+msgstr "ใส่ชื่อสำหรับค่าตัวกรอง"
 
-#: ../../locales/../src/interface/filter.cpp:390
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
-msgstr ""
+msgstr "ใส่ชื่อใหม่สำหรับค่าตัวกรอง"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
-msgstr "ป้นรหัสผ่าน"
+msgstr "ใส่รหัสผ่าน"
 
-#: resources.h:560 resources.h:577
-#, fuzzy
+#: resources.h:570 resources.h:587
 msgid "Enter selected directory"
-msgstr "รับข้อมูลจากไดเรคทอรีที่เลือก"
+msgstr "เปิดไดเรกทอรีที่เลือก"
 
-#: resources.h:713
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3142,217 +3137,239 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
+"ใส่รหัสผ่านสำหรับไฟล์ '%s'\n"
+"โปรดจำไว้ว่าไฟล์ที่ถูกแปลงแล้วจะไม่ถูกป้องกันด้วยรหัสผ่าน"
 
-#: resources.h:717
+#: resources.h:733
+#, fuzzy
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
 msgstr ""
+"ใส่พอร์ตที่แม่ข่ายฟัง\n"
+"ค่าเริ่มต้นสำหรับ FTP คือ 21, ค่าเริ่มต้นสำหรับ SFTP คือ 22"
 
 #: ../../locales/../src/interface/loginmanager.cpp:63
-#, fuzzy
 msgid "Enter username and password"
-msgstr "ป้นรหัสผ่าน"
+msgstr "ใส่ชื่อผู้ใช้และรหัสผ่าน"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "Error exporting settings"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการส่งออกการตั้งค่า"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการนำเข้า"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
+#: ../../locales/../src/interface/QueueView.cpp:2052
+msgid "Error loading queue"
+msgstr "เกิดข้อผิดพลาดในการโหลดคิวงาน"
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
-msgstr ""
+msgstr "เกิดข้อผืดพลาดในการโหลดไฟล์ xml"
+
+#: ../../locales/../src/interface/QueueView.cpp:1951
+msgid "Error saving queue"
+msgstr "เกิดข้อผิดพลาดในการบันทึกคิวงาน"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการเริ่มต้นโปรแกรม"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
-msgstr ""
+msgstr "เกิดข้อผิดพลาดในการเขียนไฟล์ xml"
 
 #: ../../locales/../src/interface/updatewizard.cpp:335
-#, fuzzy
 msgid "Error, file name cannot be parsed."
-msgstr "เชื่อมต่อระยะไกลนี้ ใบรับรองไม่น่าเชื่อถือ"
+msgstr "ผิดพลาด, ไม่สามารถแยกวิเคราะห์ชื่อไฟล์ได้"
 
 #: ../../locales/../src/interface/updatewizard.cpp:351
 msgid "Error, local file exists but cannot be removed"
-msgstr ""
+msgstr "ผิดพลาด, ไฟล์ในเครื่องมีอยู่แล้วแต่ไม่สามารถเอาออกได้"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "ผิดพลาด:"
 
-#: resources.h:477
+#: resources.h:479
 msgid "Establish connection in a new tab"
-msgstr ""
+msgstr "สร้างการเชื่อมต่อในแท็บใหม่"
 
-#: resources.h:937
+#: resources.h:955
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
-msgstr ""
+msgstr "ตัวอย่าง: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:896
-#, fuzzy
+#: resources.h:914
 msgid "Examples"
-msgstr "ตัวอย่าง:"
+msgstr "ตัวอย่าง"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
-msgstr ""
+msgstr "ประ&มวลผล"
 
 #: ../../locales/../src/interface/updatewizard.cpp:320
 msgid "Executable"
-msgstr ""
+msgstr "ประมวลผล"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
-msgstr ""
+msgstr "การประมวลผลไม่มีข้อมูลของรุ่น, ไม่สามารถตรวจสอบการอัพเดต"
 
-#: resources.h:856
+#: resources.h:872
 msgid "Explorer"
-msgstr "หน้าต้าง"
+msgstr "สำรวจ"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
-msgstr "ส่ง&ออกคิวงาน"
+msgstr "ส่งออก&คิวงาน"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
-msgstr ""
+msgstr "ส่งออก&การตั้งค่า"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
-msgstr ""
+msgstr "ตั้งค่าการส่งออก"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
-msgstr ""
+msgstr "ชื่อตัวก&รอง:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
+msgstr "FTP"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
-msgid "FTP Engine not initialized, can't connect"
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
 msgstr ""
 
-#: resources.h:741
-msgid "FTP Keep-alive"
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
 msgstr ""
 
-#: resources.h:761
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
+#, fuzzy
+msgid "FTP Engine not initialized, can't connect"
+msgstr "FTP Engine เริ่มต้นไม่ได้, ไม่สามารถเชื่อมต่อ"
+
+#: resources.h:757
+msgid "FTP Keep-alive"
+msgstr "FTP Keep-alive"
+
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
-msgstr ""
+msgstr "พร็อกซี่ FTP"
 
 #: ../../locales/../src/interface/cmdline.cpp:19
 msgid "FTP URL"
-msgstr ""
+msgstr "URL FTP"
 
-#: resources.h:669
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
+#, fuzzy
 msgid "FTPES - FTP over explicit TLS/SSL"
-msgstr ""
+msgstr "FTPES - FTP ผ่าน TLS/SSL ที่ชัดเจน"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
+#, fuzzy
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr ""
+msgstr "FTPS - FTP ผ่าน TLS/SSL ปริยาย"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
-msgstr ""
+msgstr "ไม่สามารถเปลี่ยนไดเรกทอรี"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 msgid "Failed to change language"
-msgstr ""
+msgstr "ไม่สามารถเปลี่ยนภาษา"
 
 #: ../../locales/../src/interface/updatewizard.cpp:453
 msgid "Failed to check for newer version of FileZilla."
-msgstr ""
+msgstr "ไม่สามารถตรวจสอบรุ่นที่ใหม่กว่าของ FileZilla"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
-msgstr ""
+msgstr "ไม่สามารถคัดลอกหรือย้ายที่ตั้ง"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
-msgstr ""
+msgstr "ไม่สามารถสร้างสำเนาสำรองของไฟล์ xml"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:791
 msgid "Failed to create listen socket, aborting"
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr ""
 
 #: ../../locales/../src/interface/updatewizard.cpp:455
 msgid "Failed to download the latest version of FileZilla."
-msgstr ""
+msgstr "ไม่สามารถดาวน์โหลดรุ่นล่าสุดของ FileZilla"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:665
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
-msgstr ""
+msgstr "ไม่สามารถรับเส้นทางของ 'เอกสารของฉัน'"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:651
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
-msgstr ""
+msgstr "ไม่สามารถรับเส้นทางของเดสก์ท็อป"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:950
 msgid "Failed to get peer address of control connection, connection closed."
@@ -3364,564 +3381,584 @@
 
 #: ../../locales/../src/interface/context_control.cpp:77
 msgid "Failed to initialize FTP engine"
-msgstr ""
+msgstr "ไม่สามารถเริ่มการทำงานของเอนจิ้น FTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
-msgstr ""
+msgstr "ไม่สามารถเริ่มการทำงาน TLS"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
-msgstr ""
+msgstr "ไม่สามารถโหลดแผงควบคุม, ไฟล์ทรัพยากรไม่ถูกต้อง?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
-msgstr ""
+msgstr "ไม่สามารถโหลดกุญแจส่วนตัว: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
-msgstr ""
+msgstr "ไม่สามารถเปิด \"%s\" สำหรับการผนวก/เขียน"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr ""
+msgstr "ไม่สามารถเปิด \"%s\" สำหรับการอ่าน"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr ""
+msgstr "ไม่สามารถเปิด \"%s\" สำหรับการเขียน"
+
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+msgid "Failed to parse returned path."
+msgstr "ไม่สามารถแยกวิเคราะห์เส้นทางที่ส่งกลับได้"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
-msgstr ""
+msgstr "ไม่สามารถแยกวิเคราะห์ใบรับรองรากที่เชื่อถือได้"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:1014
 msgid "Failed to receive data"
-msgstr ""
+msgstr "ไม่สามารถรับข้อมูล"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
-msgstr ""
+msgstr "ไม่สามารถเรียกรายชื่อไดเรกทอรี"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr ""
+msgstr "ไม่สามารถเรียกใช้ที่อยู่ ip ภายนอก, กำลังยกเลิก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
-msgstr ""
+msgstr "ไม่สามารถเรียกใช้ที่อยู่ ip ภายนอก, กำลังใช้ที่อยู่ในเครื่อง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
-msgstr ""
+msgstr "ไม่สามารถเรียกใช้ที่อยู่ ip ในเครื่อง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr ""
+msgstr "ไม่สามารถเรียกใช้ที่อยู่ ip ในเครื่อง กำลังยกเลิก"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
-msgstr ""
+msgstr "ไม่สามารถเรียกใช้ที่อยู่ IP ภายนอก"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
-msgstr ""
+msgstr "ไม่สามารถส่งคำสั่ง"
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
+#: ../../locales/../src/interface/FileZilla.cpp:267
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s (%s), กำลังใช้ภาษาเริ่มต้นของระบบ"
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s (%s), กำลังใช้ภาษาเริ่มต้นของระบบ (%s, %s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
+#: ../../locales/../src/interface/FileZilla.cpp:240
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s (%s), กำลังใช้ภาษาเริ่มต้นของระบบ"
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s, กำลังใช้ภาษาเริ่มต้นของระบบ"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:248
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s, กำลังใช้ภาษาเริ่มต้นของระบบ (%s, %s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:237
 #, c-format
 msgid "Failed to set language to %s, using default system language."
-msgstr ""
+msgstr "ไม่สามารถตั้งค่าภาษาเป็น %s, กำลังใช้ภาษาเริ่มต้นของระบบ"
 
 #: ../../locales/../src/interface/settings/optionspage.cpp:215
 msgid "Failed to validate settings"
-msgstr ""
+msgstr "ไม่สามารถตรวจสอบการตั้งค่า"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:896
 msgid "Failed to verify peer certificate"
-msgstr ""
+msgstr "ไม่สามารถตรวจสอบใบรับรองของอีกฝั่ง"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
-msgstr ""
+msgstr "ไม่สามารถเขียนไปยังไฟล์ %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
-msgstr ""
+msgstr "ไม่สามารถเขียนไฟล์ xml"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
-msgstr "รับส่งข้อมูลไม่สำเร็จ"
+msgstr "โอนถ่ายล้มเหลว"
 
-#: resources.h:684
+#: resources.h:700
 msgid "Fall back to active mode"
-msgstr ""
+msgstr "ย้อนกลับไปเป็นโหมด active"
 
-#: resources.h:368
-#, fuzzy
+#: resources.h:370
 msgid "Fil&e:"
-msgstr "ไฟ&ล์"
+msgstr "ไฟ&ล์:"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "ไฟ&ล์"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:500
+#: ../../locales/../src/interface/filelistctrl.cpp:518
+#: ../../locales/../src/interface/filelistctrl.cpp:527
 msgid "File"
-msgstr "wa]N"
+msgstr "ไฟล์"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:124
 msgid "File Types"
-msgstr "ประเภทไฟล์"
+msgstr "ชนิดไฟล์"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr ""
+msgstr "ไฟล์ไม่มีข้อมูลการนำเข้าใด ๆ"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
-msgstr ""
+msgstr "แก้ไขไฟล์"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
-msgstr ""
+msgstr "ไฟล์มีอยู่แล้ว"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:125
 msgid "File exists action"
-msgstr ""
+msgstr "การกระทำเมื่อไฟล์มีอยู่แล้ว"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
-msgstr ""
+msgstr "ไฟล์ได้รับการเปลี่ยนแปลง"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
-#, fuzzy
 msgid "File lists"
-msgstr "&ค่าตัวกรอง:"
+msgstr "รายการไฟล์"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "ไม่พบไฟล์"
 
-#: resources.h:995
-#, fuzzy
+#: resources.h:1013
 msgid "File search"
-msgstr "ขนาดไฟล์"
+msgstr "ค้นหาไฟล์"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
-#, fuzzy
 msgid "File transfer aborted by user"
-msgstr "การรับส่งข้อมูลถูกยกเลิกโดยผู้ใช้"
+msgstr "การโอนถ่ายข้อมูลถูกยกเลิกโดยผู้ใช้"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
-msgstr ""
+msgstr "การโอนถ่ายไฟล์ถูกยกเลิกโดยผู้ใช้หลังจากโอนถ่าย %s ใน %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
-#, fuzzy
 msgid "File transfer failed"
-msgstr "รับส่งไฟล์สำเร็จ"
+msgstr "การโอนถ่ายไฟล์ล้มเหลว"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:122
 #, c-format
 msgid "File transfer failed after transferring %s in %s"
-msgstr ""
+msgstr "การโอนถ่ายไฟล์ล้มเหลวหลังจากทำการโอนถ่าย %s ใน %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
-#, fuzzy
 msgid "File transfer skipped"
-msgstr "รับส่งข้อมูลไม่สำเร็จ"
+msgstr "การโอนถ่ายไฟล์ถูกข้าม"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
-msgstr "รับส่งไฟล์สำเร็จ"
+msgstr "โอนถ่ายไฟล์สำเร็จ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:115
-#, fuzzy, c-format
+#, c-format
 msgid "File transfer successful, transferred %s in %s"
-msgstr "รับส่งไฟล์สำเร็จ"
+msgstr "การโอนถ่ายไฟล์สำเร็จ, โอนถ่ายทั้งหมด %s ใน %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
-msgstr ""
+msgstr "การโอนถ่ายไฟล์ยังอยู่ระหว่างการดำเนินการ"
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
-msgstr ""
+msgstr "ไฟล์จะถูกโอนถ่ายโดยใช้ชนิดข้อมูลแบบ ASCII"
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
-msgstr ""
+msgstr "ไฟล์จะถูกโอนถ่ายโดยใช้ชนิดข้อมูลแบบ binary"
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla เกิดข้อผิดพลาด"
 
-#: resources.h:706
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
+"FileZilla สามารถทดสอบการกำหนดค่าของคุณ เพื่อให้แน่ใจว่าการกำหนดค่าทุกอย่างถูกต้องในขณะนี้"
 
-#: resources.h:476
-#, fuzzy
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 msgid "FileZilla is already connected to a server."
-msgstr "ไม่มีการเชื่อมต่อไปยัง แม่ข่ายใด ๆ"
+msgstr "FileZilla เชื่อมต่อไปยังแม่ข่ายแล้ว"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
-msgstr ""
+msgstr "FileZilla จำเป็นต้องเริ่มใหม่เพื่อให้การเปลี่ยนภาษามีผล"
 
-#: resources.h:516
+#: resources.h:525
 msgid "Filelist status &bars"
-msgstr ""
+msgstr "&แถบสถานะรายการไฟล์"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "ชื่อไฟล์"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
-msgstr ""
+msgstr "&ตัวกรองชื่อไฟล์..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
-msgstr ""
+msgstr "ชื่อไฟล์ไม่ถูกต้อง"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "ชื่อไฟล์ต้องไม่มีอักขระตัวใดตัวหนึ่งดังต่อไปนี้: / \\ : * ? \" < > |"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
-msgstr ""
+msgstr "ชื่อไฟล์ไม่ถูกเปลี่ยนแปลง"
 
-#: resources.h:306 resources.h:950
-#, fuzzy
+#: resources.h:308 resources.h:968
 msgid "Filename:"
-msgstr "ชื่อไฟล์"
+msgstr "ชื่อไฟล์:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
-msgstr ""
+msgstr "ชื่อไฟล์ต้องไม่มีอักขระตัวใดตัวหนึ่งดังต่อไปนี้: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
-msgstr ""
+msgstr "ชื่อไฟล์ต้องไม่มีอักขระตัวใดตัวหนึ่งดังต่อไปนี้: / \\ : * ? \" < > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
-msgstr ""
+msgstr "ไฟล์ที่กำลังถูกแก้ไขในขณะนี้"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "ขนาดไฟล์"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
 msgid "Filesize format"
-msgstr ""
+msgstr "รูปแบบของขนาดไฟล์"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
-msgstr "ประเภทไฟล์"
+msgstr "ชนิดไฟล์"
 
-#: resources.h:938
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr ""
+msgstr "ความสัมพันธ์ของชนิดไฟล์"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
-msgstr ""
+msgstr "ตัวกรองนำไปใช้กับ:"
 
-#: resources.h:813
+#: resources.h:829
 msgid "Filter invalid characters in filenames"
-msgstr ""
+msgstr "กรองอักขระที่ไม่ถูกต้องในชื่อไฟล์"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
-msgstr ""
+msgstr "ชื่อตัวกรองนี้มีอยู่แล้ว"
 
-#: resources.h:220
+#: resources.h:222
 msgid "Filter out items matching all of the following"
 msgstr ""
 
-#: resources.h:221
+#: resources.h:223
 msgid "Filter out items matching any of the following"
 msgstr ""
 
-#: resources.h:222
+#: resources.h:224
 msgid "Filter out items matching none of the following"
 msgstr ""
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
-msgstr ""
+msgstr "ค่าตัวกรองนี้มีอยู่แล้ว"
 
-#: resources.h:988
+#: resources.h:1006
 msgid "Filter the directory listings"
-msgstr ""
+msgstr "กรองรายการไดเรกทอรี"
 
 #: ../../locales/../src/interface/filteredit.cpp:338
 #: ../../locales/../src/interface/filteredit.cpp:347
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter validation failed"
-msgstr ""
+msgstr "การตรวจสอบตัวกรองล้มเหลว"
 
 #: resources.h:9 resources.h:33
 msgid "Fingerprint (MD5):"
-msgstr ""
+msgstr "ลายนิ้วมือ (MD5):"
 
 #: resources.h:10 resources.h:34
 msgid "Fingerprint (SHA-1):"
-msgstr ""
+msgstr "ลายนิ้วมือ (SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
-msgstr ""
+msgstr "ลายนิ้วมือ:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
-msgstr ""
+msgstr "ตัวช่วยสร้างการกำหนดค่าไฟร์วอลล์และเราเตอร์"
 
-#: resources.h:724
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
+"สำหรับรายละเอียดเพิ่มเติมเกี่ยวกับตัวเลือกเหล่านี้, โปรดเรียกใช้ตัวช่วยสร้างการกำหนดค่าเครือข่าย"
 
-#: resources.h:701
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr ""
+msgstr "เพื่อความน่าเชื่อถือ คุณควรจะระบุช่วงของพอร์ตอย่างน้อย 10 พอร์ต"
 
-#: ../../locales/../src/interface/Options.cpp:194
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
-msgstr ""
+msgstr "สำหรับช่วงเวลานี้การตั้งค่าเริ่มต้นจะถูกใช้ การเปลี่ยนแปลงใด ๆ ในการตั้งค่าจะไม่ถูกบันทึก"
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
-msgstr ""
+msgstr "บังคับให้เป็น &UTF-8"
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
-msgstr ""
+msgstr "บังคับให้แสดงไฟล์ที่&ซ่อนอยู่"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
-msgstr ""
+msgstr "บังคับให้แสดงไฟล์ที่ซ่อนอยู่"
 
-#: resources.h:768
+#: resources.h:784
 msgid "Format specifications:"
-msgstr ""
+msgstr "ข้อมูลจำเพาะของรูปแบบ:"
 
-#: resources.h:936
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
-msgstr ""
+msgstr "รูปแบบ: นามสกุลตามด้วยคำสั่งและอาร์กิวเมนต์ที่อ้างถึงอย่างถูกต้อง"
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
-msgstr ""
+msgstr "เอกสารประกอบเพิ่มเติม"
 
 #: resources.h:78
 msgid "General"
-msgstr ""
+msgstr "ทั่วไป"
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
-msgstr ""
+msgstr "ความล้มเหลวของแม่ข่าย SOCKS ทั่วไป"
 
-#: resources.h:786
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr ""
+msgstr "พร็อกซี่ทั่วไป"
 
-#: resources.h:690
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
-msgstr ""
+msgstr "รับที่อยู่ IP ภายนอกมาจาก URL ดังต่อไปนี้:"
 
-#: resources.h:469
-#, fuzzy
+#: resources.h:471
 msgid "Getting help"
-msgstr "&การตั้งค่า..."
+msgstr "รับความช่วยเหลือ"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
-msgstr ""
+msgstr "ชื่อค่าตัวกรองที่ให้มามีอยู่แล้ว, เขียนทับค่าตัวกรอง?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
-msgstr ""
+msgstr "บุ๊คมาร์คส่วนกลาง"
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
-msgstr ""
+msgstr "GnuTLS:"
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
-msgstr ""
+msgstr "สิทธิของกลุ่ม"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
-msgstr "&สูง"
+msgstr "สู&ง"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
+#, fuzzy
 msgid "HTTPS - HTTP over TLS"
-msgstr ""
+msgstr "HTTPS - HTTP ผ่าน TLS"
 
-#: resources.h:339
-#, fuzzy
+#: resources.h:341
 msgid "Hash:"
-msgstr "โฮสต์:"
+msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
-msgstr ""
+msgstr "ซ่อนอยู่"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "สูง"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
-msgstr "สูงสุึด"
+msgstr "สูงสุด"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 msgid "Highest available port has to be a number between 1024 and 65535."
-msgstr ""
+msgstr "พอร์ตที่ใช้ได้สูงสุดจะต้องเป็นตัวเลขระหว่าง 1024 และ 65535"
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
-msgstr "โฮมเพจ:"
+msgstr "หน้าแรก:"
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
-msgstr ""
+msgstr "ลายนิ้วมือกุญแจโฮสต์:"
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
-msgstr ""
+msgstr "กุญแจโฮสต์ไม่ตรงกัน"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
-msgstr ""
+msgstr "โฮสต์ขึ้นต้นด้วย '[' แต่ไม่พบวงเล็บปิด"
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
-msgstr ""
+msgstr "ไม่สามารถเข้าถึงโฮสต์"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "โฮสต์:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "ชั่วโมง,"
 
-#: resources.h:885
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (ตัวอย่าง: 15:47)"
 
-#: resources.h:728
+#: resources.h:744
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
+"ถ้าไม่มีข้อมูลถูกส่งหรือรับระหว่างการดำเนินการนานกว่าระยะเวลาที่ระบุไว้, การเชื่อมต่อจะถูกปิดและ "
+"FileZilla จะพยายามเชื่อมต่อใหม่"
 
-#: resources.h:966
+#: resources.h:984
+#, fuzzy
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
-msgstr ""
+msgstr "ถ้ารายงานข้อบกพร่อง, โปรดใส่บันทึกด้วยระดับความรุนแรง \"Verbose\""
 
-#: resources.h:681
+#: resources.h:697
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
 "you should try active mode. You can set the transfer mode on a per-server "
 "basis in the Site Manager."
 msgstr ""
+"ถ้าการทดสอบอัตโนมัติเมื่อตัวช่วยสร้างนี้เสร็จสิ้นประสบความสำเร็จ, "
+"แต่คุณไม่สามารถโอนถ่ายไฟล์ไปยังแม่ข่าย, แม่ข่ายอาจถูกกำหนดค่าผิดพลาด และคุณควรลองใช้โหมด "
+"active คุณสามารถตั้งค่าโหมดการโอนถ่ายพื้นฐานกับแม่ข่ายได้ในตัวจัดการที่ตั้ง"
 
-#: resources.h:676
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
 msgstr ""
+"ถ้าเปิดใช้งานตัวเลือกการย้อนกลับ, "
+"คุณจะสามารถเชื่อมต่อไปยังแม่ข่ายที่กำหนดค่าผิดพลาดซึ่งปฏิเสธโหมดการโอนถ่ายที่เลือก"
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3931,22 +3968,24 @@
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
-msgstr ""
+msgstr "ถ้าปัญหายังคงมีอยู่, บางเราเตอร์และ/หรือไฟร์วอลล์ยังคงทำการบล็อก FileZilla"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
-msgstr ""
+msgstr "ถ้าปัญหายังคงมีอยู่, บางเราเตอร์และ/หรือไฟร์วอลล์ยังคงทำการขัดจังหวะการเชื่อมต่อ"
 
-#: resources.h:955
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
+"ถ้าขนาดของไฟล์ประวัติถึงขีดจำกัด, มันจะได้รับการเปลี่ยนชื่อโดยเพิ่ม \".1\" ต่อท้ายชื่อไฟล์ "
+"(อาจเขียนทับไฟล์ประวัติเก่า) และไฟล์ใหม่จะได้รับการสร้างขึ้น"
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3956,54 +3995,60 @@
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
-msgstr ""
+msgstr "ถ้าปัญหานี้ยังคงมีอยู่, โปรดติดต่อผู้ผลิตเราเตอร์หรือไฟร์วอลล์ของคุณ สำหรับการแก้ไขปัญหา"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr ""
+msgstr "ถ้าปัญหานี้ยังคงมีอยู่, โปรดติดต่อผู้ผลิตเราเตอร์ของคุณ"
 
-#: resources.h:277 resources.h:850
+#: resources.h:279 resources.h:866
 msgid ""
 "If using 'overwrite if newer', your system time has to be synchronized with "
 "the server. If the time differs (e.g. different timezone), specify a "
 "timezone offset in the site manager."
 msgstr ""
+"ถ้าใช้การ 'เขียนทับไฟล์ถ้าใหม่กว่า', เวลาในระบบของคุณจะถูกซิงโครไนซ์กับแม่ข่าย ถ้าเวลาแตกต่าง "
+"(เช่น เขตเวลาแตกต่าง), ระบุการชดเชยเขตเวลาในตัวจัดการที่ตั้ง"
 
-#: resources.h:909
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
+"ถ้าใช้การเปรียบเทียบตามการประทับเวลา, พิจารณาความเท่ากันของสองไฟล์ "
+"ถ้าการประทับเวลาแตกต่างกันจะต้องไม่เกินกว่าเกณฑ์นี้"
 
-#: resources.h:924
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
-msgstr ""
+msgstr "ถ้าคุณเปลี่ยนภาษา, คุณจำเป็นต้องเริ่ม FileZilla ใหม่"
 
-#: resources.h:707
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
-msgstr ""
+msgstr "ถ้าคุณปิด FileZilla, การเปลี่ยนแปลงของคุณจะสูญหาย"
 
-#: resources.h:826
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
-msgstr ""
+msgstr "ถ้าคุณใส่ชนิดไฟล์ไม่ถูกต้อง, ไฟล์เหล่านั้นอาจได้รับความเสียหาย เมื่อทำการโอนถ่าย"
 
-#: resources.h:708
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
-msgstr ""
+msgstr "ถ้าคุณได้รับข้อผิดพลาดใด ๆ, แสดงว่าการกำหนดค่าของคุณไม่ถูกต้อง"
 
-#: resources.h:740
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
+"ถ้าคุณมีปัญหาในการเรียกรายการไดเรกทอรีหรือในการโอนถ่ายไฟล์, "
+"ให้ลองเปลี่ยนโหมดการโอนถ่ายเริ่มต้น"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:569
 msgid ""
@@ -4012,19 +4057,23 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 
-#: resources.h:667
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
+"ถ้าคุณดำเนินการตัวช่วยสร้างเสร็จสมบูรณ์และการทดสอบขั้นสุดท้ายประสบความสำเร็จ, "
+"ไฟร์วอลล์และเราเตอร์ที่คุณมีควรที่จะถูกกำหนดค่าอย่างถูกต้อง"
 
-#: resources.h:703
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
+"ถ้าคุณใช้ไฟร์วอลล์, ตรวจสอบให้แน่ใจว่า FileZilla "
+"ได้รับอนุญาตให้ยอมรับการเชื่อมต่อบนพอร์ตที่ให้มาทั้งหมด"
 
-#: resources.h:702
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4034,94 +4083,103 @@
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
-msgstr ""
+msgstr "ถ้าเราเตอร์ของคุณเปลี่ยนที่อยู่ IP, โปรดติดต่อผู้ผลิตเราเตอร์ของคุณ"
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
-msgstr ""
+msgstr "นำเข้าข้อมูลจากรุ่นที่เก่ากว่า"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
-msgstr ""
+msgstr "ตั้งค่าการนำเข้า"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
-msgstr ""
+msgstr "นำเข้าสำเร็จ"
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:50
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:57
 msgid "Improperly quoted association."
-msgstr ""
+msgstr "ความสัมพันธ์ถูกอ้างถึงอย่างไม่ถูกต้อง"
 
-#: resources.h:695
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
+"ในโหมด active, FileZilla จะรอรับการเชื่อมต่อบนพอร์ตสำหรับการโอนถ่ายข้อมูล "
+"คุณจำเป็นต้องระบุพอร์ตที่ FileZilla จะใช้"
 
-#: resources.h:697
+#: resources.h:713
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr ""
+"ในกรณีที่คุณต้องการให้ทำการอัพเดตโดยอัตโนมัติ, "
+"คุณสามารถเปิดใช้งานการตรวจสอบการอัพเดตโดยอัตโนมัติได้ในหน้าต่างการตั้งค่า"
 
-#: resources.h:685 resources.h:749
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
-msgstr ""
+msgstr "เพื่อใช้งานโหมด active, FileZilla จำเป็นต้องทราบที่อยู่ IP ภายนอกของคุณ"
 
-#: resources.h:670
+#: resources.h:686
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
 msgstr "รหัสผ่านไม่ถูกต้อง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
-msgstr ""
+msgstr "กำลังเตรียมใช้งาน TLS..."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#, fuzzy
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr "แม่ข่ายไม่ปลอดภัย, มันไม่รองรับ FTP ผ่าน TLS"
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
-msgstr ""
+msgstr "โต้ตอบ"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:126
 msgid "Interface"
-msgstr ""
+msgstr "อินเทอร์เฟซ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
-msgstr ""
+msgstr "ถูกขัดจังหวะโดยผู้ใช้"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 msgid "Invalid Content-Length"
-msgstr ""
+msgstr "ความยาวของเนื้อหาไม่ถูกต้อง"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:623
 msgid "Invalid HTTP Response"
-msgstr ""
+msgstr "การตอบสนองของ HTTP ไม่ถูกต้อง"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:544
 #: ../../locales/../src/engine/ControlSocket.cpp:604
@@ -4129,44 +4187,47 @@
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
+"ลำดับอักขระที่ได้รับไม่ถูกต้อง, ปิดการใช้งาน UTF-8 เลือกตัวเลือก UTF-8 ในตัวจัดการที่ตั้ง "
+"เพื่อบังคับใช้ UTF-8"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
-msgstr ""
+msgstr "ขนาดของกลุ่มข้อมูลไม่ถูกต้อง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:353
 #: ../../locales/../src/interface/netconfwizard.cpp:363
 #: ../../locales/../src/interface/netconfwizard.cpp:372
 msgid "Invalid data received"
-msgstr ""
+msgstr "ข้อมูลที่รับไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
-msgstr "วันที่ผิดพลาด"
+msgstr "วันที่ไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
-msgstr "ชื่อไฟล์ผิดพลาด"
+msgstr "ชื่อไฟล์ไม่ถูกต้อง"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
-#, fuzzy
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
-msgstr "วันที่ผิดพลาด"
+msgstr "ข้อมูลที่ป้อนไม่ถูกต้อง"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
-msgstr ""
+msgstr "พอร์ตที่ให้มาไม่ถูกต้อง พอร์ตจะต้องมีค่าจาก 1 ถึง 65535"
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#, fuzzy
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4174,195 +4235,208 @@
 "ftps:// for FTP over SSL (implicit) and\n"
 "ftpes:// for FTP over SSL (explicit)."
 msgstr ""
+"โปรโตคอลที่ระบุไม่ถูกต้อง โปรโตคอลที่ถูกต้องคือ:\n"
+"ftp:// สำหรับ FTP ปกติ,\n"
+"sftp:// สำหรับโปรโตคอลการโอนถ่ายไฟล์ SSH,\n"
+"ftps:// สำหรับ FTP ผ่าน SSL (ปริยาย) และ\n"
+"ftpes:// สำหรับ FTP ผ่าน SSL (ชัดเจน)"
 
-#: ../../locales/../src/interface/search.cpp:724
-msgid "Invalid regular expression in search conditions."
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
 msgstr ""
 
+#: ../../locales/../src/interface/search.cpp:698
+msgid "Invalid regular expression in search conditions."
+msgstr "นิพจน์ทั่วไปในเงื่อนไขการค้นหาไม่ถูกต้อง"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
-msgstr ""
+msgstr "โค้ดของการตอบสนองไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:692
 #, c-format
 msgid "Invalid search conditions: %s"
-msgstr ""
+msgstr "เงื่อนไขของการค้นหาไม่ถูกต้อง: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
-msgstr "วันที่ผิดพลาด"
+msgstr "เส้นทางของที่ตั้งไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
-msgstr ""
+msgstr "ขนาดในเงื่อนไขไม่ถูกต้อง"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
-msgstr ""
+msgstr "ชื่อผู้ใช้ที่ให้มาไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#, fuzzy
 msgid "Jurisdiction country:"
-msgstr ""
+msgstr "ประเทศสังกัด:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#, fuzzy
 msgid "Jurisdiction locality:"
-msgstr ""
+msgstr "สถานที่สังกัด:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
-msgstr ""
+msgstr "รัฐสังกัดหรือจังหวัด:"
 
-#: resources.h:906
+#: resources.h:924
 msgid "Keep directories on top"
-msgstr ""
+msgstr "นำไดเรกทอรีไปไว้ด้านบนสุด"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
+"โปรดจำไว้ว่าไม่ใช่ทุกแม่ข่ายที่รองรับคุณลักษณะนี้ "
+"และอาจส่งกลับรายการที่ไม่ถูกต้องถ้าตัวเลือกนี้ถูกเปิดใช้งาน แม้ว่า FileZilla "
+"ทำการทดสอบบางอย่างเพื่อตรวจสอบว่าแม่ข่ายรองรับคุณลักษณะนี้, การทดสอบอาจล้มเหลว"
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
-msgstr ""
+msgstr "การแลกเปลี่ยนกุญแจ"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
-msgstr ""
+msgstr "ต่ำ&สุด"
 
-#: resources.h:922
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "ภาษา"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
-msgstr "เปลี่ยนภาษา"
+msgstr "เปลี่ยนภาษาแล้ว"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
-msgstr "ใช้งานล่าสุดเมื่อ"
+msgstr "แก้ไขล่าสุดเมื่อ"
 
-#: resources.h:853
+#: resources.h:869
 msgid "Layout"
-msgstr ""
+msgstr "เค้าโครง"
 
-#: resources.h:799
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
-msgstr ""
+msgstr "จำกัดการ&ดาวน์โหลดพร้อมกันไม่เกิน:"
 
-#: resources.h:801
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
-msgstr ""
+msgstr "จำกัดการ&อัพโหลดพร้อมกันไม่เกิน:"
 
-#: resources.h:744
+#: resources.h:760
 msgid "Limit local ports"
-msgstr ""
+msgstr "จำกัดพอร์ตในเครื่อง"
 
-#: resources.h:952
+#: resources.h:970
 msgid "Limit size of logfile"
-msgstr ""
+msgstr "จำกัดขนาดของไฟล์ประวัติ"
 
-#: resources.h:953
+#: resources.h:971
 msgid "Limit:"
-msgstr ""
+msgstr "จำกัด:"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:839
 msgid "Line length exceeded"
-msgstr ""
+msgstr "เกินความยาวของบรรทัดแล้ว"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
-msgstr ""
+msgstr "เชื่อมโยงกับ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:267
 msgid "Listen socket closed"
 msgstr ""
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
-msgstr "รวบรวมรายการ:"
+msgstr "รายการ:"
 
-#: resources.h:747
-#, fuzzy
+#: resources.h:763
 msgid "Lo&west available port:"
-msgstr "&พอร์ตสูงสุดที่ทำได้"
+msgstr "พอร์ตต่ำ&สุดที่ใช้ได้:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
-msgstr "เครื่องคุณ"
+msgstr "ในเครื่อง"
 
-#: resources.h:363
-#, fuzzy
+#: resources.h:365
 msgid "Local file"
-msgstr "ตัวกรองในเครื่อง:"
+msgstr "ไฟล์ในเครื่อง"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
-msgstr "ตัวกรองในเครื่อง:"
+msgstr "ไฟล์ในเครื่องไม่มีอยู่"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
-msgstr ""
+msgstr "ไฟล์ในเครื่องเป็นไดเรกทอรีแทนไฟล์ปกติ"
 
-#: resources.h:202
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+msgid "Local file is not a valid filename."
+msgstr "ไฟล์ในเครื่องไม่ใช่ชื่อไฟล์ที่ถูกต้อง"
+
+#: resources.h:204
 msgid "Local filters:"
 msgstr "ตัวกรองในเครื่อง:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "ที่ตั้งในเครื่อง:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Locality:"
-msgstr ""
+msgstr "ตำแหน่งที่อยู่:"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
-#, fuzzy
 msgid "Log file"
-msgstr "ไฟล์"
+msgstr "ไฟล์ประวัติ"
 
-#: resources.h:250
-#, fuzzy
+#: resources.h:252
 msgid "Log of update check:"
-msgstr "ตรวจสอบการปรับรุ่น"
+msgstr "ประวัติของการตรวจสอบการอัพเดต:"
 
-#: resources.h:947
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
-msgstr ""
+msgstr "ประวัติ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 
@@ -4377,15 +4451,15 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
-msgstr ""
+msgstr "ต่ำ"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
-msgstr ""
+msgstr "ต่ำสุด"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 msgid "Lowest available port has to be a number between 1024 and 65535."
@@ -4393,9 +4467,9 @@
 
 #: resources.h:20 resources.h:44
 msgid "MAC:"
-msgstr ""
+msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4405,625 +4479,626 @@
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 #, c-format
 msgid "Malformed chunk data: %s"
-msgstr ""
+msgstr "รูปแบบกลุ่มข้อมูลไม่ถูกต้อง: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:772
 #, c-format
 msgid "Malformed header: %s"
-msgstr ""
+msgstr "รูปแบบหัวเรื่องไม่ถูกต้อง: %s"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:593
 msgid "Malformed reply, server not sending proper line endings"
-msgstr ""
+msgstr "รูปแบบการตอบกลับไม่ถูกต้อง, แม่ข่ายไม่ได้ส่งการสิ้นสุดของบรรทัดแบบปกติ"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: resources.h:395 ../../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
 msgid "Manual transfer"
-msgstr "รับส่งข้อมูลไม่สำเร็จ"
+msgstr "โอนถ่ายข้อมูลด้วยตนเอง"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
-msgstr ""
+msgstr "ตรงกันกับทั้งหมดดังต่อไปนี้"
 
-#: resources.h:434
+#: resources.h:436
 msgid "Match any of the following"
-msgstr ""
+msgstr "ตรงกันกับบางส่วนดังต่อไปนี้"
 
-#: resources.h:435
+#: resources.h:437
 msgid "Match none of the following"
-msgstr ""
+msgstr "ไม่ตรงกันกับทั้งหมดดังต่อไปนี้"
 
-#: resources.h:797
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
-msgstr ""
+msgstr "&การโอนถ่ายพร้อมกันสูงสุด:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
-msgstr ""
+msgstr "ประวัติข้อความ"
 
-#: resources.h:864
+#: resources.h:880
 msgid "Message log position"
-msgstr ""
+msgstr "ตำแหน่งประวัติข้อความ"
 
-#: resources.h:954
+#: resources.h:972
 msgid "MiB"
-msgstr ""
+msgstr "MiB"
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "นาที"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
-msgstr ""
+msgstr "เลื่อน&ลง"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
-msgstr ""
+msgstr "เลื่อน&ขึ้น"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "คอมพิวเตอร์ของฉัน"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "เอกสารของฉัน"
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "ที่ตั้งของฉัน"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:176
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:178
 msgid "N/a"
-msgstr "ไม่รู้"
+msgstr "ไม่ทราบ"
 
-#: resources.h:398
-#, fuzzy
+#: resources.h:400
 msgid "Name"
-msgstr "ชื่อ:"
+msgstr "ชื่อ"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "ชื่อนี้มีอยู่แล้ว"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
-#, fuzzy
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
-msgstr "ชื่อนี้มีอยู่แล้ว"
+msgstr "ชื่อของบุ๊คมาร์คนี้มีอยู่แล้ว"
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "ชื่อ:"
 
 #: ../../locales/../src/interface/filteredit.cpp:347
 msgid "Need to enter filter name"
-msgstr ""
+msgstr "จำเป็นต้องใส่ชื่อตัวกรอง"
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:682
 msgid "Need to enter valid remote path"
-msgstr ""
+msgstr "จำเป็นต้องใส่เส้นทางระยะไกลที่ถูกต้อง"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
-msgstr ""
+msgstr "จำเป็นต้องระบุการเข้ารหัสอักขระ"
 
 #: ../../locales/../src/engine/proxy.cpp:436
 msgid "Network unreachable"
-msgstr ""
+msgstr "ไม่สามารถเข้าถึงเครือข่าย"
 
 #: resources.h:73
 msgid "New &Folder"
-msgstr "โ&ฟล์เดอร์ใหม่"
+msgstr "&โฟลเดอร์ใหม่"
 
-#: resources.h:493
-#, fuzzy
+#: resources.h:502
 msgid "New &tab"
-msgstr "ที่ตั้งใหม่"
+msgstr "&แท็บใหม่"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
-msgstr ""
+msgstr "บุ๊ค&มาร์คใหม่"
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
-msgstr ""
+msgstr "บุ๊คมาร์คใหม่"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
-msgstr "ไดเรคทอรีใหม่"
+msgstr "ไดเรกทอรีใหม่"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
-msgstr ""
+msgstr "คุณลักษณะใหม่และการปรับปรุงใน %s"
 
 #: ../../locales/../src/interface/filteredit.cpp:129
 msgid "New filter"
 msgstr "ตัวกรองใหม่"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
-msgstr "โฟล์เดอร์ใหม่"
+msgstr "โฟลเดอร์ใหม่"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "ที่ตั้งใหม่"
 
-#: resources.h:862
-#, fuzzy
+#: resources.h:878
 msgid "Next to the transfer queue"
-msgstr "เพิ่มไดเรคทอรีที่เลือกลงคิวส่งข้อมูล"
+msgstr "ถัดไปจากคิวการโอนถ่าย"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
 msgid "No"
 msgstr "ไม่"
 
 #: ../../locales/../src/interface/export.cpp:26
 msgid "No category to export selected"
-msgstr ""
+msgstr "ไม่มีหมวดหมู่ที่จะส่งออกถูกเลือก"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
-msgstr ""
+msgstr "ไม่มีคำสั่งที่ให้มา, กำลังยกเลิก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
-msgstr ""
+msgstr "ไม่มีการตั้งที่อยู่ IP ภายนอกไว้, กำลังลองใช้ค่าเริ่มต้น"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
-msgstr ""
+msgstr "ไม่มีไฟล์ใด ๆ ที่กำลังแก้ไขอยู่ในขณะนี้"
 
 #: ../../locales/../src/interface/filteredit.cpp:141
 msgid "No filter name given"
-msgstr ""
+msgstr "ไม่มีชื่อตัวกรองที่ให้มา"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
-msgstr ""
+msgstr "ไม่มีโฮสต์ที่ให้มา, โปรดใส่โฮสต์"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:101
 msgid "No images available"
-msgstr ""
+msgstr "ไม่มีภาพที่ใช้ได้"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
-msgstr ""
+msgstr "ไม่มีไฟล์เพิ่มเติมในคิวงาน!"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
-msgstr ""
+msgstr "ไม่มีชื่อสำหรับค่าตัวกรองที่ให้มา"
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
-msgstr ""
+msgstr "ไม่มีโปรแกรมที่สัมพันธ์กับชนิดไฟล์"
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:566
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:540
 msgid "No search results"
-msgstr "รับข้อมูลจากไดเรคทอรีที่เลือก"
+msgstr "ไม่พบผลลัพธ์การค้นหา"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
-msgstr "ที่ตั้งนี้ไม่มีอยู่"
+msgstr "ไม่มีที่ตั้งที่ใช้ได้"
 
 #: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
 msgstr ""
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
-msgstr ""
+msgstr "ไม่มีชื่อผู้ใช้ที่ให้มา"
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:934 resources.h:939
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "ไม่มี"
 
-#: resources.h:373
-#, fuzzy
+#: resources.h:375
 msgid "None selected yet"
-msgstr "&เอาที่เลือกออก"
+msgstr "ยังไม่ได้เลือก"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "ปกติ"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
 msgid "Not all items could be requeued for viewing/editing."
 msgstr ""
 
 #: ../../locales/../src/interface/state.cpp:199
 #: ../../locales/../src/interface/state.cpp:504
-#, fuzzy
 msgid "Not connected"
-msgstr "เชื่อมต่อสำเร็จ"
+msgstr "ไม่มีการเชื่อมต่อ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
-msgstr "ไม่มีการเชื่อมต่อไปยัง แม่ข่ายใด ๆ"
+msgstr "ไม่มีการเชื่อมต่อไปยังแม่ข่ายใด ๆ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
-#, fuzzy
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
-msgstr "ไม่มีการเชื่อมต่อไปยัง แม่ข่ายใด ๆ"
+msgstr "ไม่มีการเชื่อมต่อไปยังแม่ข่ายใด ๆ"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:27
-#, fuzzy
 msgid "Not connected."
-msgstr "เชื่อมต่อสำเร็จ"
+msgstr "ไม่ได้เชื่อมต่อ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
-msgstr ""
+msgstr "โปรดทราบว่าคุณลักษณะนี้รองรับการใช้งานด้วยโปรโตคอล FTP เท่านั้น"
 
-#: resources.h:778
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
-msgstr ""
+msgstr "หมายเหตุ: ใช้ได้เฉพาะกับการเชื่อมต่อธรรมดา, การเชื่อมต่อ FTP ที่ไม่ถูกเข้ารหัส"
 
-#: resources.h:795
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
-msgstr ""
+msgstr "หมายเหตุ: การใช้พร็อกซีทั่วไปจะถูกบังคับให้ใช้โหมด passive บนการเชื่อมต่อ FTP"
 
-#: resources.h:895
+#: resources.h:913
 msgid "Number of decimal places:"
-msgstr ""
+msgstr "จำนวนของตำแหน่งทศนิยม:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
-msgstr ""
+msgstr "จำนวนครั้งของการลองใหม่ต้องอยู่ระหว่าง 0 และ 99"
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "เ&ปิดไฟล์"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "ตกลง"
 
-#: resources.h:677
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 msgid "Once"
-msgstr ""
+msgstr "ครั้งเดียว"
 
-#: resources.h:946
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
-msgstr ""
+msgstr "เฉพาะรุ่นของ FileZilla และระบบปฏิบัติการที่คุณใช้จะถูกส่งไปยังแม่ข่าย"
 
-#: resources.h:646
+#: resources.h:662
 msgid "Open directory in system's file manager"
-msgstr ""
+msgstr "เปิดไดเรกทอรีในตัวจัดการไฟล์ของระบบ"
 
-#: resources.h:968 resources.h:969
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "เปิดตัวจัดการที่ตั้ง"
 
-#: resources.h:562
+#: resources.h:572
 msgid "Open the file."
 msgstr "เปิดไฟล์"
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
-msgstr "เปิดหน้าต่างตั้งค่า"
+msgstr "เปิดหน้าต่างการตั้งค่าของ FileZilla"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
-msgstr ""
+msgstr "เปิดเป็น:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
-msgstr ""
+msgstr "การเปิดล้มเหลว"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
-msgstr ""
+msgstr "เปิดในแท็บใหม่"
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
-msgstr ""
+msgstr "เปิดตัวจัดการที่ตั้ง"
 
-#: resources.h:989
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
-msgstr ""
+msgstr "เปิดหน้าต่างที่ตั้งของรายการตัวกรอง คลิกขวาเพื่อสลับตัวกรอง"
 
-#: resources.h:170
+#: resources.h:172
 msgid "Operating system"
-msgstr ""
+msgstr "ระบบปฏิบัติการ"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
-msgstr ""
+msgstr "ตรวจพบปัญหากับระบบปฏิบัติการ"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
-msgstr ""
+msgstr "องค์กร:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
 msgid "Other:"
-msgstr ""
+msgstr "อื่น ๆ:"
 
-#: resources.h:723
+#: resources.h:739
 msgid "Overview"
-msgstr "ดูตัวอย่าง"
+msgstr "ภาพรวม"
 
 #: resources.h:59
 msgid "Overwrite &if source newer"
-msgstr ""
+msgstr "เขียนทับ&ถ้าต้นฉบับใหม่กว่า"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
-#, fuzzy
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 msgid "Overwrite file"
-msgstr "&เขียนทับ"
+msgstr "เขียนทับไฟล์"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 msgid "Overwrite file if size differs"
-msgstr ""
+msgstr "เขียนทับไฟล์ถ้ามีขนาดแตกต่างกัน"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 msgid "Overwrite file if size differs or source file is newer"
-msgstr ""
+msgstr "เขียนทับไฟล์ถ้ามีขนาดแตกต่างกันหรือไฟล์ต้นฉบับใหม่กว่า"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 msgid "Overwrite file if source file newer"
-msgstr ""
+msgstr "เขียนทับไฟล์ถ้าไฟล์ต้นฉบับใหม่กว่า"
 
 #: resources.h:60
-#, fuzzy
 msgid "Overwrite if &different size"
-msgstr "&เขียนทับ"
+msgstr "เขียนทับถ้ามีขนาด&แตกต่างกัน"
 
 #: resources.h:61
 msgid "Overwrite if different si&ze or source newer"
-msgstr ""
+msgstr "เขียนทับถ้ามีข&นาดแตกต่างกันหรือต้นฉบับใหม่กว่า"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
-msgstr "สิทธิความเป็นเจ้าของ"
+msgstr "สิทธิของเจ้าของ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
-#, fuzzy
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "เจ้าของ/กลุ่ม"
 
-#: resources.h:867
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
-msgstr ""
+msgstr "ป้&องกันระบบจากการเข้าสู่โหมดนอนระหว่างการโอนถ่ายและการดำเนินการอื่น ๆ"
 
-#: resources.h:775 resources.h:791
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
-msgstr ""
+msgstr "โฮสต์พ&ร็อกซี่:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
-msgstr ""
+msgstr "คำสั่ง PORT ถูกกีดกันโดยเราเตอร์หรือไฟร์วอลล์"
 
-#: resources.h:737
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
-msgstr ""
+msgstr "Pa&ssive (แนะนำ)"
 
 #: ../../locales/../src/interface/updatewizard.cpp:324
 msgid "Package"
-msgstr "แพจเกจ"
+msgstr "แพ็คเกจ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
-msgstr ""
+msgstr "พารามิเตอร์ไม่ใช่ URL ที่ถูกต้อง"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
-msgstr "ร&หัสผ่าน"
+msgstr "รหัส&ผ่าน:"
 
-#: resources.h:673
+#: resources.h:689
 msgid "Passive (recommended)"
-msgstr ""
+msgstr "Passive (แนะนำ)"
 
-#: resources.h:757
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
-msgstr ""
+msgstr "โหมด Passive"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:588
 #: ../../locales/../src/interface/netconfwizard.cpp:601
 #: ../../locales/../src/interface/netconfwizard.cpp:612
 msgid "Passive mode has been set as default transfer mode."
-msgstr ""
+msgstr "โหมด Passive ถูกตั้งเป็นค่าเริ่มต้นของโหมดการโอนถ่าย"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
-msgstr ""
+msgstr "ต้องการรหัสผ่าน"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
-msgstr ""
+msgstr "เส้นทาง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
-msgstr ""
+msgstr "เส้นทางไม่สามารถสร้างเป็นไดเรกทอรี %s และไดเรกทอรีย่อย %s"
 
-#: resources.h:400
+#: resources.h:402
 msgid "Paths"
-msgstr ""
+msgstr "เส้นทาง"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
-msgstr ""
+msgstr "รอการเอาออก"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
-#, fuzzy
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "สิทธิ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "สิทธิ"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
-msgstr ""
+msgstr "แพลตฟอร์ม:"
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
-msgstr ""
+msgstr "โปรดตรวจสอบ http://filezilla-project.org สำหรับรุ่นล่าสุดของ FileZilla"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
 "Please check on http://filezilla-project.org/probe.php that the server is "
 "running and carefully check your settings again."
 msgstr ""
+"โปรดตรวจสอบบน http://filezilla-project.org/probe.php ว่าแม่ข่ายนั้นกำลังทำงาน "
+"และตรวจสอบการตั้งค่าของคุณอีกครั้งอย่างระมัดระวัง"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1076
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
+"โปรดตรวจสอบตัวจัดการแพ็คเกจในระบบของคุณสำหรับแพ็คเกจรุ่นล่าสุด หรือไปที่ http://filezilla-"
+"project.org เพื่อดาวน์โหลดซอร์สโค้ดของ FileZilla"
 
-#: resources.h:679
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
+"โปรดกำหนดค่าไฟร์วอลล์และเราเตอร์ เพื่อให้ FileZilla "
+"สามารถสร้างการเชื่อมต่อขาออกไปยังพอร์ตที่กำหนดเอง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
-msgstr ""
+msgstr "โปรดปิดการตั้งค่าที่เกี่ยวกับ 'โหมด DMZ' หรือ 'โหมด Game' บนเราเตอร์ของคุณ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
 msgid ""
 "Please ensure you have a stable internet connection and carefully check your "
 "settings again."
 msgstr ""
+"โปรดตรวจสอบให้แน่ใจว่าคุณมีการเชื่อมต่ออินเทอร์เน็ตที่มีความเสถียร "
+"และตรวจสอบการตั้งค่าของคุณอีกครั้งอย่างระมัดระวัง"
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:70
 msgid "Please enter a custom date format."
-msgstr ""
+msgstr "โปรดใส่รูปแบบวันที่ที่กำหนดเอง"
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
+msgstr "โปรดใส่รูปแบบเวลาที่กำหนดเอง"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr ""
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
-msgstr ""
+msgstr "โปรดใส่ค่าของการจำกัดความเร็วมากกว่าหรือเท่ากับ 0 %s/s"
 
 #: ../../locales/../src/interface/filteredit.cpp:134
 msgid "Please enter a name for the new filter."
-msgstr ""
+msgstr "โปรดใส่ชื่อสำหรับตัวกรองใหม่"
 
 #: ../../locales/../src/interface/filteredit.cpp:241
 msgid "Please enter a new name for the copied filter."
-msgstr ""
+msgstr "โปรดใส่ชื่อใหม่สำหรับตัวกรองที่ถูกคัดลอก"
 
-#: ../../locales/../src/interface/filter.cpp:388
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
-msgstr ""
+msgstr "โปรดใส่ชื่อใหม่สำหรับชุดตัวกรอง \"%s\""
 
 #: ../../locales/../src/interface/filteredit.cpp:194
 msgid "Please enter a new name for the filter."
-msgstr ""
+msgstr "โปรดใส่ชื่อใหม่สำหรับตัวกรอง"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:101
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent "
 "downloads."
-msgstr ""
+msgstr "โปรดใส่ตัวเลขระหว่าง 0 และ 10 สำหรับจำนวนการดาวน์โหลดพร้อมกัน"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:105
 msgid ""
 "Please enter a number between 0 and 10 for the number of concurrent uploads."
-msgstr ""
+msgstr "โปรดใส่ตัวเลขระหว่าง 0 และ 10 สำหรับจำนวนการอัพโหลดพร้อมกัน"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:97
 msgid ""
 "Please enter a number between 1 and 10 for the number of concurrent "
 "transfers."
-msgstr ""
+msgstr "โปรดใส่ตัวเลขระหว่าง 0 และ 10 สำหรับจำนวนการโอนถ่ายพร้อมกัน"
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
-msgstr ""
+msgstr "โปรดใส่รหัสผ่านสำหรับแม่ข่ายนี้:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
@@ -5033,54 +5108,59 @@
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
 msgid ""
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
-msgstr ""
+msgstr "โปรดใส่ระยะหมดเวลาระหว่าง 5 และ 9999 วินาที หรือ 0 เพื่อปิดใช้งานระยะหมดเวลา"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
-msgstr ""
+msgstr "โปรดใส่ชื่อที่ไม่ซ้ำกันสำหรับชุดตัวกรองนี้"
 
-#: resources.h:117
+#: resources.h:118
 msgid "Please enter a username for this server:"
-msgstr ""
+msgstr "โปรดใส่ชื่อผู้ใช้สำหรับแม่ข่ายนี้:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
-msgstr ""
+msgstr "โปรดใส่ช่วงพอร์ตที่ถูกต้อง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr ""
+msgstr "โปรดใส่ URL ที่ใช้รับที่อยู่ภายนอกของคุณ"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
 msgid "Please enter an update interval of at least 7 days"
-msgstr ""
+msgstr "โปรดใส่ระยะห่างของการตรวจสอบการอัพเดตอย่างน้อยที่ 7 วัน"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
-msgstr ""
+msgstr "โปรดใส่การจำกัดความเร็วในการอัพโหลดมากกว่าหรือเท่ากับ 0 ถึง %s/วินาที"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
-msgstr ""
+msgstr "โปรดใส่ชื่อของไดเรกทอรีที่จะสร้าง:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "โปรดใส่ชื่อของไดเรกทอรีที่จะสร้าง:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
-msgstr ""
+msgstr "โปรดใส่ชื่อผู้ใช้และรหัสผ่านสำหรับแม่ข่ายนี้:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:142
 msgid "Please enter your external IP address"
-msgstr ""
+msgstr "โปรดใส่ที่อยู่ IP ภายนอกของคุณ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:593
 #: ../../locales/../src/interface/netconfwizard.cpp:606
@@ -5089,8 +5169,10 @@
 "wizard. In case you have a dynamic address or don't know your external "
 "address, use the external resolver option."
 msgstr ""
+"โปรดใส่ที่อยู่ IP ภายนอกของคุณในหน้าโหมด active ของตัวช่วยสร้างนี้ ในกรณีที่คุณมีที่อยู่แบบแปรผัน "
+"หรือไม่ทราบที่อยู่ภายนอกของคุณ, ใช้ตัวเลือกการแก้ปัญหาภายนอก"
 
-#: resources.h:666
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5102,9 +5184,9 @@
 "make sure you typed the address of the address resolver correctly."
 msgstr ""
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
-msgstr ""
+msgstr "โปรดตรวจสอบให้แน่ใจว่าตำแหน่งที่ตั้งที่ร้องขอถูกติดตั้งบนระบบของคุณ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:594
 msgid ""
@@ -5114,7 +5196,7 @@
 "'game mode'."
 msgstr ""
 
-#: resources.h:680
+#: resources.h:696
 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 "
@@ -5122,30 +5204,35 @@
 "discard."
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
 msgstr ""
 
-#: resources.h:734
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
+"โปรดทราบว่าบางแม่ข่ายอาจแบนคุณหากคุณพยายามเชื่อมต่อบ่อยเกินไป หรือในช่วงเวลาที่สั้นเกินไป"
 
-#: resources.h:882 resources.h:888
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
+"โปรดอ่าน http://wiki.filezilla-project.org/Date_and_Time_formatting "
+"สำหรับรายละเอียดเพิ่มเติม"
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
 msgstr ""
+"โปรดลองดาวน์โหลดไฟล์อัพเดตใหม่ เหตุผลที่เป็นไปได้ถ้าปัญหายังคงมีอยู่ "
+"(เรียงลำดับความน่าจะเป็นจากมากไปหาน้อย):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5153,42 +5240,43 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
+"โปรดเรียกใช้ตัวช่วยสร้างนี้อีกครั้ง คุณควรเปลี่ยนระบบเครือข่ายของคุณ "
+"หรือในกรณีที่คุณพบปัญหาเกี่ยวกับแม่ข่ายไม่ทำงานก่อนหน้านี้ในทันที"
 
-#: resources.h:455
-#, fuzzy
+#: resources.h:457
 msgid "Please select an action:"
-msgstr "&กระทำอย่างนี้ทุกครั้ง"
+msgstr "โปรดเลือกการกระทำ:"
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
-msgstr ""
+msgstr "โปรดเลือกหมวดหมู่ที่คุณต้องการจะนำเข้า"
 
-#: resources.h:668
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
-msgstr ""
+msgstr "โปรดเลือกโหมดการโอนถ่ายเริ่มต้นที่คุณต้องการจะใช้"
 
 #: ../../locales/../src/interface/chmoddialog.cpp:38
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr ""
+msgstr "โปรดเลือกคุณสมบัติใหม่สำหรับไดเรกทอรี \"%s\""
 
 #: ../../locales/../src/interface/chmoddialog.cpp:27
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr ""
+msgstr "โปรดเลือกคุณสมบัติใหม่สำหรับไฟล์ \"%s\""
 
 #: ../../locales/../src/interface/chmoddialog.cpp:41
 msgid "Please select the new attributes for the selected directories."
-msgstr ""
+msgstr "โปรดเลือกคุณสมบัติใหม่สำหรับไดเรกทอรีที่เลือก"
 
 #: ../../locales/../src/interface/chmoddialog.cpp:44
 msgid ""
 "Please select the new attributes for the selected files and directories."
-msgstr ""
+msgstr "โปรดเลือกคุณสมบัติใหม่สำหรับไฟล์และไดเรกทอรีที่เลือก"
 
 #: ../../locales/../src/interface/chmoddialog.cpp:30
 msgid "Please select the new attributes for the selected files."
-msgstr ""
+msgstr "โปรดเลือกคุณสมบัติใหม่สำหรับไฟล์ที่เลือก"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:581
 msgid ""
@@ -5198,722 +5286,767 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
+"โปรดอัพเดตไฟร์วอลล์ของคุณและตรวจสอบให้แน่ใจว่าเราเตอร์ของคุณกำลังใช้เฟิร์มแวร์ล่าสุดที่มี "
+"นอกจากนี้, เราเตอร์ของคุณจะต้องถูกกำหนดค่าอย่างถูกต้อง คุณจะต้องใช้การส่งต่อพอร์ตด้วยตนเอง "
+"อย่าใช้เราเตอร์ของคุณใน 'โหมด DMZ' หรือ 'โหมด game' "
+"สิ่งที่คล้ายกับการตรวจสอบโปรโตคอลหรือโปรโตคอลที่ระบุว่า 'fixups' จำเป็นต้องถูกปิดการใช้งาน"
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
-msgstr ""
+msgstr "โปรดไปที่ http://filezilla-project.org สำหรับข้อมูลเพิ่มเติมเกี่ยวกับ FileZilla"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1074
 #: ../../locales/../src/interface/updatewizard.cpp:1090
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
-msgstr ""
+msgstr "โปรดเยี่ยมชม http://filezilla-project.org เพื่อดาวน์โหลดรุ่นล่าสุด"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
-msgstr ""
+msgstr "รหัสไปรษณีย์:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
-msgstr ""
+msgstr "ที่ตั้งที่กำหนดไว้ล่วงหน้า"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
-msgstr ""
+msgstr "รักษาการประทับเวลาของไฟล์"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
 msgid "Preview:"
 msgstr "แสดงตัวอย่าง:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
-msgstr ""
+msgstr "ใบรับรองการเชื่อมต่อหลักและการเชื่อมต่อข้อมูลไม่ตรงกัน"
 
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
-msgstr ""
+msgstr "พิมพ์ข้อมูลรุ่นไปที่ stdout และออก"
 
-#: resources.h:905
+#: resources.h:923
 msgid "Prioritize directories (default)"
-msgstr ""
+msgstr "จัดลำดับความสำคัญของไดเรกทอรี (ค่าเริ่มต้น)"
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
-msgstr "สิทธิพิเศษ"
+msgstr "ลำดับความสำคัญ"
 
-#: resources.h:945
+#: resources.h:963
 msgid "Privacy policy:"
-msgstr ""
+msgstr "นโยบายความเป็นส่วนตัว:"
 
-#: resources.h:781
+#: resources.h:797
 msgid "Private &keys:"
-msgstr ""
+msgstr "&กุญแจส่วนตัว:"
 
-#: resources.h:777 resources.h:794
-#, fuzzy
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr "โปร&โตคอล:"
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
-msgstr "รหัสผ่านพร๊อกซี่"
+msgstr "รหัสผ่านพร็อก&ซี่:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
-msgstr "ดำเนินการคิวงาน"
+msgstr "ดำเนินการ&คิวงาน"
 
-#: resources.h:792
-#, fuzzy
+#: resources.h:808
 msgid "Proxy &port:"
-msgstr "รหัสผ่านพร๊อกซี่"
+msgstr "&พอร์ตพร็อกซี่:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
-msgstr ""
+msgstr "&ผู้ใช้พร็อกซี่:"
 
 #: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
-msgstr ""
+msgstr "การรับรองความถูกต้องของพร็อกซีล้มเหลว"
 
 #: ../../locales/../src/engine/transfersocket.cpp:132
 #: ../../locales/../src/engine/transfersocket.cpp:146
-#, c-format
+#, fuzzy, c-format
 msgid "Proxy handshake failed: %s"
-msgstr ""
+msgstr "การจับมือของพร็อกซีล้มเหลว: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "โฮสต์ขึ้นต้นด้วย '[' แต่ไม่พบวงเล็บปิด"
 
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr ""
+msgstr "การตอบกลับของพร็อกซี่: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr ""
+msgstr "คำร้องขอพร็อกซี่ล้มเหลว: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
-msgstr ""
+msgstr "คำร้องขอของพร็อกซีล้มเหลว: ไม่รู้จักชนิดของที่อยู่ในการตอบกลับ CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
-msgstr ""
+msgstr "พร็อกซีถูกตั้งค่า แต่โฮสต์พร็อกซี่หรือพอร์ตไม่ถูกต้อง"
 
-#: resources.h:779
+#: resources.h:795
 msgid "Public Key Authentication"
-msgstr ""
+msgstr "ใบรับรองของกุญแจสาธารณะ"
 
 #: resources.h:8 resources.h:32
 msgid "Public key algorithm:"
-msgstr ""
+msgstr "อัลกอริทึมของกุญแจสาธารณะ:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
-msgstr ""
+msgstr "สิทธิของสาธารณะ"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
-msgstr ""
+msgstr "คิวงานได้รับการประมวลผลอย่างเต็มรูปแบบ"
 
-#: ../../locales/../src/interface/statusbar.cpp:458
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:462
+#, c-format
 msgid "Queue: %s MiB"
-msgstr "คิวงาน: %s%d เมกกะไบต์"
+msgstr "คิวงาน: %s MiB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:392
+#, c-format
 msgid "Queue: %s%s"
-msgstr "คิวงาน: %s%d เมกกะไบต์"
+msgstr "คิวงาน: %s%s"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "คิวงาน: ว่าง"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "คิวไฟล์"
 
-#: resources.h:447
-#, fuzzy
+#: resources.h:449
 msgid "Queueing:"
-msgstr "&คิว"
+msgstr "คิวงาน:"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
-msgstr ""
+msgstr "เริ่มระบบใ&หม่"
 
-#: resources.h:520
-#, fuzzy
+#: resources.h:530
 msgid "R&emote directory tree"
-msgstr "&สร้างไดเรคทอรี"
+msgstr "ไดเรกทอรีต้นไม้ระยะไ&กล"
+
+#: resources.h:632 resources.h:636
+msgid "R&eset and requeue selected files"
+msgstr "เ&ริ่มใหม่และเริ่มคิวงานไฟล์ที่เลือกใหม่"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
-msgstr ""
+msgstr "คำสั่ง FTP ใหม่"
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
-msgstr "&อ่าน"
+msgstr "อ่า&น"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 msgid "Re&fresh"
-msgstr ""
+msgstr "รี&เฟรช"
 
 #: resources.h:63
 msgid "Re&name"
-msgstr "เ&ปลี่ยนชื่อ"
+msgstr "เปลี่ยน&ชื่อ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:576
 msgid ""
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
+"เรียกใช้ตัวช่วยสร้างอีกครั้ง "
+"และตรวจสอบการตั้งค่าและการกำหนดค่าเราเตอร์และไฟร์วอลล์ทั้งหมดของคุณตามลำดับอย่างระมัดระวัง"
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "อ่า&น"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
-msgstr ""
+msgstr "อ่านเท่านั้น"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะยกเลิกการดำเนินการปัจจุบัน?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] ""
+msgstr[0] "คุณแน่ใจหรือไม่ที่จะลบไดเรกทอรี %d กับเนื้อหาของมัน?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
-msgstr[0] ""
+msgstr[0] "คุณแน่ใจหรือไม่ที่จะลบไฟล์ %d?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะลบ %s และ %s?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
-msgstr ""
+msgstr "คุณแน่ใจหรือไม่ที่จะลบไฟล์และ/หรือไดเรกทอรีที่เลือกทั้งหมด?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
-msgstr ""
+msgstr "เหตุผล"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
-msgstr ""
+msgstr "เริ่มระบบใหม่ทันที"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
+msgstr "ทำ&ซ้ำลงไปในไดเรกทอรีย่อย"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
 msgstr ""
 
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr "ได้รับบรรทัดที่มีความยาวเกิน 10000 อักขระ, กำลังยกเลิก"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
 #: ../../locales/../src/interface/netconfwizard.cpp:1031
 msgid "Received data tainted"
-msgstr ""
+msgstr "ข้อมูลที่ได้รับเกิดความเสียหาย"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
 msgstr ""
 
-#: resources.h:735
+#: resources.h:751
 msgid "Reconnection settings"
-msgstr ""
+msgstr "การตั้งค่าการเชื่อมต่อใหม่"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
-msgstr ""
+msgstr "เชื่อมต่อใหม่ไปยังแม่ข่ายที่ใช้ล่าสุด"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:715
 msgid "Redirection to invalid address"
-msgstr ""
+msgstr "เปลี่ยนเส้นทางไปยังที่อยู่ที่ไม่ถูกต้อง"
 
-#: resources.h:978 resources.h:979
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
-msgstr ""
+msgstr "รีเฟรชรายการไฟล์และโฟลเดอร์"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "ใส่รหัสผ่าน"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
-msgstr "เชื่อมต่อระยะไกล"
+msgstr "ระยะไกล"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
-msgstr "เชื่อมต่อระยะไกลนี้ ใบรับรองไม่น่าเชื่อถือ"
+msgstr "ใบรับรองระยะไกลไม่น่าเชื่อถือ"
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "ไฟล์ระยะไกล"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
-#, fuzzy
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 msgid "Remote file search"
-msgstr "ไฟล์ระยะไกล"
+msgstr "ค้นหาไฟล์ระยะไกล"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "ตัวกรองระยะไกล:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
-msgstr "เชื่อมต่อระยะไกล"
+msgstr "เส้นทางระยะไกล"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
 "supported by the current site's servertype (%s)."
 msgstr ""
+"ไม่สามารถแยกวิเคราะห์เส้นทางระยะไกล ตรวจสอบให้แน่ใจว่ามันเป็นเส้นทางที่ถูกต้องสมบูรณ์ "
+"และรองรับโดยชนิดแม่ข่ายของที่ตั้งปัจจุบัน (%s)"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, 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) ที่เลือกบนที่ตั้งแม่"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
-msgstr ""
+msgstr "ไม่สามารถแยกวิเคราะห์เส้นทางระยะไกล ตรวจสอบให้แน่ใจว่ามันเป็นเส้นทางที่ถูกต้องสมบูรณ์"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
-msgstr "เชื่อมต่อระยะไกลนี้ ใบรับรองไม่น่าเชื่อถือ"
+msgstr "เส้นทางระยะไกลไม่สามารถแยกวิเคราะห์ได้"
 
-#: resources.h:444
-#, fuzzy
+#: resources.h:446
 msgid "Remote path handling:"
-msgstr "ที่ตั้งระยะไกล"
+msgstr "การจัดการเส้นทางระยะไกล:"
 
-#: resources.h:312
-#, fuzzy
+#: resources.h:314
 msgid "Remote path:"
-msgstr "ที่ตั้งระยะไกล"
+msgstr "เส้นทางระยะไกล:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
-msgstr "ที่ตั้งระยะไกล"
+msgstr "ที่ตั้งระยะไกล:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
-msgstr "ลบ&ทั้งหมด"
+msgstr "เอา&ทั้งหมดออก"
 
-#: resources.h:616 resources.h:619
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
-msgstr "ลบที่เ&ลือก"
+msgstr "เอาที่&เลือกออก"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
-msgstr ""
+msgstr "เปลี่ยนชื่อไฟล์"
 
-#: resources.h:631 resources.h:652
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
-msgstr ""
+msgstr "เปลี่ยนชื่อไดเรกทอรีที่เลือก"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
-msgstr ""
+msgstr "เปลี่ยนชื่อไฟล์และไดเรกทอรีที่เลือก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
-msgstr ""
+msgstr "กำลังเปลี่ยนชื่อ '%s' เป็น '%s'"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
-msgstr ""
+msgstr "รายงานข้อบกพร่องและคุณลักษณะที่ต้องการ"
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
-msgstr ""
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#, fuzzy
+msgid "Require explicit FTP over TLS"
+msgstr "ต้องการ FTP ผ่าน TLS ที่ชัดเจน"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+#, fuzzy
+msgid "Require implicit FTP over TLS"
+msgstr "ต้องการ FTP ผ่าน TLS ปริยาย"
+
+#: resources.h:634
+msgid "Reset and requeue &all"
+msgstr "เริ่มใหม่และเริ่มคิวงานใหม่&ทั้งหมด"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
-#, fuzzy, c-format
+#, c-format
 msgid "Resolving address of %s"
-msgstr "กำลังรอรับ IP-Address ของ %s"
+msgstr "กำลังแก้ปัญหาที่อยู่ของ %s"
 
 #: ../../locales/../src/interface/updatewizard.cpp:1159
+#, fuzzy
 msgid "Resolving hostname"
-msgstr ""
+msgstr "กำลังแก้ไขชื่อโฮสต์"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
-msgstr "ผลตอบกลับ:"
+msgstr "การตอบสนอง:"
 
-#: resources.h:438
+#: resources.h:440
 msgid "Results:"
-msgstr ""
+msgstr "ผลลัพธ์:"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
-#, fuzzy
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 msgid "Resume file transfer"
-msgstr "ไฟล์ระยะไกล"
+msgstr "โอนถ่ายข้อมูลต่อ"
 
-#: resources.h:852
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
+"การทำต่อไฟล์ ASCII อาจทำให้เกิดปัญหา ถ้าแม่ข่ายใช้รูปแบบการสิ้นสุดของบรรทัดแตกต่างจากลูกข่าย"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
-msgstr "กำลังรอรับข้อมูลไดเรคทอรี..."
+msgstr "กำลังเรียกรายการไดเรกทอรี..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
-msgstr ""
+msgstr "กำลังเรียกข้อมูลที่อยู่ IP ภายนอกจาก %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:917
 msgid "Root certificate is not trusted"
-msgstr "เชื่อมต่อระยะไกลนี้ ใบรับรองไม่น่าเชื่อถือ"
+msgstr "ใบรับรองรากไม่น่าเชื่อถือ"
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
-msgstr ""
+msgstr "แส&ดงไฟล์ที่กำลังแก้ไขในขณะนี้..."
 
-#: resources.h:607
+#: resources.h:885
+msgid "S&how the Site Manager on startup"
+msgstr "แส&ดงตัวจัดการที่ตั้งเมื่อเริ่มโปรแกรม"
+
+#: resources.h:619
 msgid "S&hutdown system"
-msgstr "&ปิดระบบ"
+msgstr "ปิ&ดระบบ"
 
-#: resources.h:436
-#, fuzzy
+#: resources.h:438
 msgid "S&top"
-msgstr "&อัตโนมัติ"
+msgstr "ห&ยุด"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
-msgstr ""
+msgstr "ซิ&งโครไนซ์ตัวเรียกดู"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:121
 msgid "SFTP"
-msgstr ""
+msgstr "SFTP"
+
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "จำกัด:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
-msgstr "บันทึกการตั้งค่า ?"
+msgstr "บันทึกการตั้งค่า?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
-msgstr ""
+msgstr "กำลังสแกนสำหรับไฟล์ที่จะเพิ่มลงไปในคิวงาน"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
-msgstr ""
+msgstr "กำลังสแกนสำหรับไฟล์ที่จะอัพโหลด"
 
-#: resources.h:432
-#, fuzzy
+#: resources.h:434
 msgid "Search &conditions:"
-msgstr "ไดเรคทอรีใหม่"
+msgstr "ค้นหา&เงื่อนไข:"
 
-#: resources.h:430
-#, fuzzy
+#: resources.h:432
 msgid "Search &directory:"
-msgstr "ไดเรคทอรีใหม่"
+msgstr "ค้นหา&ไดเรกทอรี:"
 
-#: resources.h:994
+#: resources.h:1012
 msgid "Search for files recursively."
-msgstr ""
+msgstr "ค้นหาสำหรับไฟล์ที่ซ้ำกัน"
 
-#: resources.h:539
-#, fuzzy
+#: resources.h:549
 msgid "Search server for files"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "ค้นหาไฟล์ในแม่ข่าย"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
-msgstr ""
+msgstr "ข้อมูลความปลอดภัย"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:564
 #: ../../locales/../src/interface/netconfwizard.cpp:577
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
-msgstr ""
+msgstr "ดูเพิ่มเติมที่: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:374
+#: resources.h:376
 msgid "Sele&ct server"
-msgstr ""
+msgstr "เลือ&กแม่ข่าย"
 
-#: resources.h:720
+#: resources.h:736
 msgid "Select &page:"
-msgstr ""
+msgstr "เลือก&หน้า:"
 
-#: resources.h:870
+#: resources.h:888
 msgid "Select Theme"
-msgstr ""
+msgstr "เลือกธีม"
 
-#: resources.h:830
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
-msgstr ""
+msgstr "เลือกการกระทำเริ่มต้นเพื่อดำเนินการ ถ้าไฟล์เป้าหมายของการโอนถ่ายมีอยู่แล้ว"
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
-msgstr ""
+msgstr "เลือกตัวแก้ไขเริ่มต้น"
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:18
 msgid ""
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
+"เลือกการกระทำเริ่มต้นถ้าไฟล์เป้าหมายมีอยู่แล้ว "
+"การเลือกนี้สามารถใช้ได้เฉพาะกับช่วงเวลาปัจจุบันเท่านั้น"
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
 msgid ""
 "Select default file exists action only for the currently selected files in "
 "the queue."
-msgstr ""
+msgstr "เลือกการกระทำเริ่มต้นเมื่อไฟล์มีอยู่แล้ว เฉพาะสำหรับไฟล์ที่เลือกในคิวงานปัจจุบันเท่านั้น"
 
 #: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Select download location for package"
-msgstr ""
+msgstr "เลือกตำแหน่งการดาวน์โหลดสำหรับแพ็คเกจ"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
-msgstr ""
+msgstr "เลือกไฟล์ที่มีกุญแจส่วนตัว"
 
 #: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
-msgstr ""
+msgstr "เลือกไฟล์ที่จะส่งออกข้อมูล"
 
 #: ../../locales/../src/interface/export.cpp:34
 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.cpp:2673
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
-msgstr ""
+msgstr "เลือกไฟล์ที่จะส่งออกที่ตั้ง"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
-msgstr ""
+msgstr "เลือกไฟล์ที่จะนำเข้าการตั้งค่าจาก"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "ย&อมเฉพาะอัพโหลด"
+msgstr "เลือกไฟล์ที่จะอัพโหลด"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
-msgstr ""
+msgstr "เลือกชื่อไฟล์ที่จะทำการแปลงไฟล์กุญแจ"
 
-#: resources.h:420
+#: resources.h:422
 #, no-c-format
 msgid "Select how these files should be opened."
-msgstr ""
+msgstr "เลือกวิธีที่จะเปิดไฟล์เหล่านี้"
 
-#: ../../locales/../src/interface/search.cpp:831
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:805
 msgid "Select target download directory"
-msgstr "ส่งข้อมูลไดเรคทอรีที่เลือก"
+msgstr "เลือกไดเรกทอรีเป้าหมายของการดาวน์โหลด"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
-msgstr ""
+msgstr "เลือกชื่อไฟล์เป้าหมาย"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
-msgstr ""
+msgstr "เลือกหมวดหมู่ที่จะส่งออก:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
-msgstr ""
+msgstr "เลือกข้อมูลส่วนตัวที่คุณต้องการจะลบ"
 
-#: ../../locales/../src/interface/search.cpp:798
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:772
+#, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
-msgstr[0] "เพิ่มไดเรคทอรีที่เลือกลงคิวส่งข้อมูล"
+msgstr[0] "เลือก %d ไดเรกทอรีกับเนื้อหาของมันสำหรับการโอนถ่าย"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:51
-#, fuzzy, c-format
+#, c-format
 msgid "Selected %d directory."
 msgid_plural "Selected %d directories."
-msgstr[0] "ส่งข้อมูลไดเรคทอรีที่เลือก"
-msgstr[1] "ส่งข้อมูลไดเรคทอรีที่เลือก"
+msgstr[0] "เลือก %d ไดเรกทอรี"
 
-#: ../../locales/../src/interface/search.cpp:796
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:770
+#, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
-msgstr[0] "ส่งข้อมูลไดเรคทอรีที่เลือก"
-msgstr[1] "ส่งข้อมูลไดเรคทอรีที่เลือก"
+msgstr[0] "เลือก %d ไฟล์ สำหรับการโอนถ่าย"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:58
 #, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "เลือก %d ไฟล์ ขนาดรวม: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:56
 #, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
-msgstr[0] ""
-msgstr[1] ""
+msgstr[0] "เลือก %d ไฟล์ ขนาดรวม: อย่างน้อย %s"
 
-#: ../../locales/../src/interface/search.cpp:803
-#, fuzzy, c-format
+#: ../../locales/../src/interface/search.cpp:777
+#, c-format
 msgid "Selected %s and %s for transfer."
-msgstr "เพิ่มไฟล์หรือโฟลเดอร์ที่เลือกลงคิวส่งข้อมูล"
+msgstr "เลือก %s และ %s สำหรับการโอนถ่าย"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:68
 #, c-format
 msgid "Selected %s and %s. Total size: %s"
-msgstr ""
+msgstr "เลือก %s และ %s ขนาดรวม: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:66
 #, c-format
 msgid "Selected %s and %s. Total size: At least %s"
-msgstr ""
+msgstr "เลือก %s และ %s ขนาดรวม: อย่างน้อย %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "Selected editor does not exist."
-msgstr ""
+msgstr "ตัวแก้ไขที่เลือกไม่มีอยู่"
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
-msgstr ""
-
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-msgid "Selected file already opened."
-msgstr ""
+msgstr "ไฟล์ที่เลือกได้ถูกแก้ไขไปแล้ว"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
-msgstr ""
+msgstr "ไฟล์ที่เลือกได้ถูกโหลดไปแล้ว"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
-msgstr ""
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+msgid "Selected file is already opened"
+msgstr "ไฟล์ที่เลือกได้ถูกเปิดไปแล้ว"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+msgid "Selected file is still being edited"
+msgstr "ไฟล์ที่เลือกยังคงกำลังถูกแก้ไข"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr ""
+msgstr "ตัวกรองที่เลือกจะทำงานเฉพาะกับไฟล์ในเครื่องเท่านั้น"
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
+"บุ๊คมาร์คส่วนกลางและแม่ข่ายปัจจุบันที่ถูกเลือกใช้ชนิดของแม่ข่ายที่แตกต่าง\n"
+"ใช้บุ๊คมาร์คเจาะจงที่ตั้งสำหรับแม่ข่ายนี้"
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr ""
+msgstr "พอร์ตที่เลือกมักจะถูกใช้งานในโปรโตคอลที่แตกต่าง"
 
-#: resources.h:742
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
-msgstr ""
+msgstr "ส่งคำสั่ง FTP &keep-alive"
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
-msgstr ""
+msgstr "การส่งคำสั่งที่กำหนดเองไปยังแม่ข่ายอื่นยังใช้ไม่ได้ในขณะนี้"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
-msgstr ""
+msgstr "กำลังส่งคำสั่ง keep-alive"
 
 #: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
-msgstr "Serial number:"
+msgstr "หมายเลขซีเรียล:"
 
-#: resources.h:81 resources.h:88
-#, fuzzy
+#: resources.h:89
 msgid "Server &Type:"
-msgstr "&ชนิดเซอร์เวอร์"
+msgstr "&ชนิดแม่ข่าย:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
-msgstr ""
+msgstr "แม่ข่ายไม่ได้ถูกปิดการเชื่อมต่อ TLS อย่างถูกต้อง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr "เซอร์เวอร์ไม่รองรับการเริ่มต้นใหม่ขิฃองไฟล์ใหญ่กว่า %d GB."
+msgstr "แม่ข่ายไม่รองรับการทำต่อของไฟล์ที่มีขนาด > %d GB"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
+#, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
-msgstr ""
-"เซอร์เวอร์ไม่รองรับการเริ่มต้นใหม่ขิฃองไฟล์ใหญ่กว่า %d GB. สิ้นสุดการส่งข้อมูลตั้งแต่ขนาดไฟล์ที่ตรงกัน"
+msgstr "แม่ข่ายไม่รองรับการทำต่อของไฟล์ > %d GB สิ้นสุดการโอนถ่ายเนื่องจากขนาดไฟล์ตรงกัน"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
-msgstr "เซอร์เวอร์ไม่รองรับการเริ่มต้นใหม่ขิฃองไฟล์ใหญ่กว่า 2 GB."
+msgstr "แม่ข่ายไม่รองรับการทำต่อของไฟล์ที่มีขนาด > 2GB"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
-msgstr "เซอร์เวอร์ไม่รองรับการเริ่มต้นใหม่ขิฃองไฟล์ใหญ่กว่า 4 GB."
+msgstr "แม่ข่ายไม่รองรับการทำต่อของไฟล์ที่มีขนาด > 4GB"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
-#, fuzzy, c-format
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
+#, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
-msgstr ""
-"เซอร์เวอร์ไม่รองรับการเริ่มต้นใหม่ขิฃองไฟล์ใหญ่กว่า %d GB. สิ้นสุดการส่งข้อมูลตั้งแต่ขนาดไฟล์ที่ตรงกัน"
+msgstr "แม่ข่ายอาจไม่รองรับการทำต่อของไฟล์ > %d GB. สิ้นสุดการโอนถ่ายเนื่องจากขนาดไฟล์ตรงกัน"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
-msgstr ""
+msgstr "เซิร์ฟเวอร์อาจต้องการบัญชี ลองระบุบัญชีโดยใช้ตัวจัดการที่ตั้ง"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+msgid "Server returned empty path."
+msgstr "แม่ข่ายได้ส่งกลับเส้นทางที่ว่างเปล่า"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
+"แม่ข่ายส่งการตอบกลับแบบ passive ด้วยที่อยู่ที่ไม่สามารถติดตามได้ การใช้โหมด Passive ล้มเหลว"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
-msgstr ""
+msgstr "แม่ข่ายส่งการตอบกลับแบบ passive ด้วยที่อยู่ที่ไม่สามารถติดตามได้ กำลังใช้ที่อยู่แม่ข่ายแทน"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:403
 #: ../../locales/../src/interface/netconfwizard.cpp:410
@@ -5924,153 +6057,149 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:501
 #: ../../locales/../src/interface/netconfwizard.cpp:510
 #: ../../locales/../src/interface/netconfwizard.cpp:521
-#, fuzzy
 msgid "Server sent unexpected reply."
-msgstr "เซอร์เวอร์ตอบกลับมาผิดพลาด"
+msgstr "แม่ข่ายส่งการตอบกลับที่ไม่คาดคิด"
 
-#: resources.h:350
-#, fuzzy
+#: resources.h:352
 msgid "Server to client MAC:"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "แม่ข่ายไปยังลูกข่าย MAC:"
 
-#: resources.h:348
-#, fuzzy
+#: resources.h:350
 msgid "Server to client cipher:"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "การเข้ารหัสแม่ข่ายไปยังลูกข่าย:"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
-msgstr "&ชนิดเซอร์เวอร์"
+msgstr "&ชนิดแม่ข่าย:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
-#, fuzzy
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
-msgstr "ไฟล์ใน แม่ข่าย/เครื่องคุณ"
+msgstr "ไฟล์ในเครื่อง/แม่ข่าย"
 
-#: resources.h:310 resources.h:372
-#, fuzzy
+#: resources.h:312 resources.h:374
 msgid "Server:"
-msgstr "แ&ม่ข่าย"
+msgstr "แม่ข่าย:"
 
 #: resources.h:15 resources.h:39
 msgid "Session details"
-msgstr ""
+msgstr "รายละเอียดของช่วงเวลา"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
-msgstr ""
+msgstr "ตั้ง&ลำดับความสำคัญ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
-msgstr "ตั้งค่าสิทธิจาก '%s' เป็น '%s'"
+msgstr "ตั้งค่าสิทธิของ '%s' เป็น '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
 msgstr ""
 
-#: resources.h:719
+#: resources.h:735
 msgid "Settings"
 msgstr "การตั้งค่า"
 
-#: resources.h:967
+#: resources.h:985
+#, fuzzy
 msgid "Show &raw directory listing"
-msgstr ""
+msgstr "แสดงรายการไดเรกทอรี&ดิบ"
 
-#: resources.h:550
+#: resources.h:560
 msgid "Show &welcome dialog..."
-msgstr ""
+msgstr "แสดงหน้าต่าง&ยินดีต้อนรับ..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
-msgstr ""
+msgstr "แสดงไดเรกทอรีต้นไม้ทั้งคู่และทำการเปรียบเทียบต่อไป?"
 
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
-msgstr ""
+msgstr "แสดงหน้าต่างช่วยเหลือนี้"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
-msgstr ""
+msgstr "ปิดเครื่องทันที"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
-msgstr ""
+msgstr "ทางเข้า&ตัวจัดการที่ตั้ง"
 
 #: resources.h:70
 msgid "Site Manager"
 msgstr "ตัวจัดการที่ตั้ง"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "Site Manager - Invalid data"
-msgstr "ตัวจัดการที่ตั้งเปิดแล้ว"
+msgstr "ตัวจัดการที่ตั้ง - ข้อมูลไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
-msgstr "ตัวจัดการที่ตั้งเปิดแล้ว"
+msgstr "ตัวจัดการที่ตั้งถูกเปิดอยู่แล้ว"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
-msgstr ""
+msgstr "ที่ตั้งไม่มีอยู่"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
-msgstr ""
+msgstr "เส้นทางของที่ตั้งต้องเริ่มต้นด้วย 0 หรือ 1"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
-msgstr ""
+msgstr "เส้นทางของที่ตั้งไม่ถูกต้อง"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
-msgstr ""
+msgstr "บุ๊คมาร์คเจาะจงที่ตั้ง"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
+"บุ๊คมาร์คเจาะจงที่ตั้งจำเป็นต้องมีแม่ข่ายที่จะใช้ในการจัดเก็บอยู่ในตัวจัดการที่ตั้ง\n"
+"เพิ่มการเชื่อมต่อปัจจุบันไปยังตัวจัดการที่ตั้ง?"
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "ขนาด"
 
-#: resources.h:889
+#: resources.h:907
 msgid "Size formatting"
-msgstr ""
+msgstr "รูปแบบของขนาด"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
-msgstr ""
+msgstr "ไม่ทราบขนาด"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
-#, fuzzy
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 msgid "Skip file"
-msgstr "เ&ปิดไฟล์"
+msgstr "ข้ามไฟล์"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1270
 #: ../../locales/../src/engine/ControlSocket.cpp:1289
@@ -6078,7 +6207,7 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:1380
 #, c-format
 msgid "Skipping download of %s"
-msgstr ""
+msgstr "กำลังข้ามการดาวน์โหลด %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1274
 #: ../../locales/../src/engine/ControlSocket.cpp:1293
@@ -6086,218 +6215,231 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:1384
 #, c-format
 msgid "Skipping upload of %s"
-msgstr ""
+msgstr "กำลังข้ามการอัพโหลด %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
-msgstr ""
+msgstr "บางไฟล์ยังคงกำลังถูกแก้ไขหรือจำเป็นต้องถูกอัพโหลด"
 
-#: resources.h:682 resources.h:758
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr ""
+"บางแม่ข่ายระยะไกลที่ถูกกำหนดค่าผิดพลาดซึ่งอยู่เบื้องหลังเราเตอร์, อาจตอบกลับด้วยที่อยู่ IP "
+"ในเครื่องของพวกเขา"
 
-#: resources.h:907
+#: resources.h:925
 msgid "Sort directories inline"
-msgstr ""
+msgstr "เรียงลำดับไดเรกทอรีในบรรทัด"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
-msgstr ""
+msgstr "การเรียงลำดับไม่สามารถเปลี่ยนได้ ถ้าเป็นการเปรียบเทียบไดเรกทอรี"
 
-#: resources.h:903
-#, fuzzy
+#: resources.h:921
 msgid "Sorting"
-msgstr "การตั้งค่า"
+msgstr "การเรียงลำดับ"
 
-#: resources.h:904
+#: resources.h:922
 msgid "Sorting &mode:"
-msgstr ""
+msgstr "&โหมดการเรียงลำดับ:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
-msgstr ""
+msgstr "ที่มาและเส้นทางของการดำเนินการปล่อยเหมือนกัน"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 msgid "Source and target file may not be the same"
-msgstr ""
+msgstr "ที่มาและเป้าหมายของไฟล์ไม่ควรเหมือนกัน"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
-msgstr ""
+msgstr "ที่มาและเป้าหมายของการดำเนินการปล่อยเหมือนกัน"
 
 #: resources.h:49
 msgid "Source file:"
-msgstr ""
+msgstr "ไฟล์ต้นฉบับ:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
-msgstr ""
+msgstr "จำกัดความเร็ว"
 
-#: resources.h:803
+#: resources.h:819
 msgid "Speed limits"
-msgstr ""
+msgstr "จำกัดความเร็ว"
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
-msgstr ""
+msgstr "การจำกัดความเร็วถูกปิด, คลิกเพื่อเปลี่ยน"
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
-msgstr ""
+msgstr "การจำกัดความเร็วถูกเปิด, คลิกเพื่อเปลี่ยน"
 
-#: resources.h:390
+#: resources.h:392
 msgid "Start transfer &immediately"
-msgstr ""
+msgstr "เริ่มต้นการโอนถ่ายข้อมูลใน&ทันที"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
-#, fuzzy
 msgid "Start with opened Site Manager"
-msgstr "เปิดตัวจัดการที่ตั้ง"
+msgstr "เริ่มพร้อมกับเปิดตัวจัดการที่ตั้ง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
-msgstr ""
+msgstr "กำลังเริ่มต้นการดาวน์โหลด %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
-msgstr ""
+msgstr "กำลังเริ่มต้นการอัพโหลด %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
-msgstr ""
+msgstr "รัฐหรือจังหวัด:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "สถานะ"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "สถานะ:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
-msgstr "หยุดและลบทั้ง&หมด"
+msgstr "หยุดและเอาออก&ทั้งหมด"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
-msgstr ""
+msgstr "ถนน:"
 
 #: resources.h:11 resources.h:35
 msgid "Subject of certificate"
-msgstr ""
+msgstr "หัวข้อของใบรับรอง"
 
 #: ../../locales/../src/interface/queueview_successful.cpp:12
 msgid "Successful transfers"
-msgstr "รับส่งข้อมูลสำเร็จ"
+msgstr "โอนถ่ายสำเร็จ"
 
-#: resources.h:710
+#: resources.h:726
 msgid "Summary of test results:"
-msgstr ""
+msgstr "สรุปผลการทดสอบ:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../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:373
 #: ../../locales/../src/interface/state.cpp:383
 #: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
-msgstr ""
+msgstr "ซิงโครไนซ์ตัวเรียกดู"
 
 #: ../../locales/../src/interface/state.cpp:391
 msgid "Synchronized browsing has been disabled."
-msgstr ""
+msgstr "การซิงโครไนซ์ตัวเรียกดูถูกปิดการใช้งาน"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
-msgstr ""
+msgstr "ข้อผิดพลาดไวยากรณ์"
 
 #: ../../locales/../src/interface/cmdline.cpp:68
 #: ../../locales/../src/interface/cmdline.cpp:74
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
-msgstr ""
+msgstr "ข้อผิดพลาดไวยากรณ์ในบรรทัดคำสั่ง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
-msgstr ""
+msgstr "ระบบ"
+
+#: resources.h:526
+msgid "T&oolbar"
+msgstr "แถบเ&ครื่องมือ"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 msgid "TLS/SSL connection established, sending HTTP request"
-msgstr ""
+msgstr "การเชื่อมต่อ TLS/SSL ถูกสร้างขึ้นแล้ว, กำลังส่งคำร้องขอ HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr ""
+msgstr "การเชื่อมต่อ TLS/SSL ถูกสร้างขึ้นแล้ว, กำลังรอข้อความต้อนรับ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
-msgstr ""
+msgstr "การเชื่อมต่อ TLS/SSL ถูกสร้างขึ้นแล้ว"
 
 #: ../../locales/../src/engine/proxy.cpp:445
 msgid "TTL expired"
-msgstr ""
+msgstr "TTL หมดอายุ"
 
 #: resources.h:47
 msgid "Target file already exists"
-msgstr ""
+msgstr "ไฟล์เป้าหมายมีอยู่แล้ว"
 
 #: resources.h:53
 msgid "Target file:"
-msgstr ""
+msgstr "ไฟล์เป้าหมาย:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "ไฟล์เป้าหมายมีอยู่แล้ว"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
-msgstr ""
+msgstr "ชื่อไฟล์เป้าหมายมีอยู่แล้ว, ทำต่อหรือไม่?"
 
-#: resources.h:709
+#: resources.h:725
 msgid "Test results"
-msgstr ""
+msgstr "ผลการทดสอบ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
+"ตัวจัดการที่ตั้งถูกเปิดในส่วนอื่นของ FileZilla 3\n"
+"คุณต้องการที่จะทำต่อ? การเปลี่ยนแปลงใด ๆ ที่ทำไว้ในตัวจัดการที่ตั้งจะไม่ถูกบันทึกไว้"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
+"ตัวจัดการที่ตั้งถูกเปิดอยู่ในหน้าต่างอื่นของ FileZilla 3.\n"
+"โปรดปิดมันหรือข้อมูลจะไม่สามารถลบได้"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr ""
@@ -6305,45 +6447,45 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:618
 #, c-format
 msgid "The address you entered was: %s"
-msgstr ""
+msgstr "ที่อยู่ที่คุณใส่คือ: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
-msgstr ""
+msgstr "ไม่สามารถเพิ่มบุ๊คมาร์คได้"
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
-msgstr ""
+msgstr "ไม่สามารถล้างบุ๊คมาร์คได้"
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr ""
+msgstr "การเชื่อมต่อถูกเข้ารหัส คลิกที่ไอคอนสำหรับรายละเอียด"
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
-msgstr ""
+msgstr "ลำดับการเข้าสู่ระบบที่กำหนดเองไม่สามารถเว้นว่างได้"
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, no-c-format
 msgid "The default editor for text files could not be found."
-msgstr ""
+msgstr "ไม่พบตัวแก้ไขไฟล์ข้อความเริ่มต้น"
 
-#: resources.h:422
+#: resources.h:424
 #, c-format
 msgid "The default editor for text files is '%s'."
-msgstr ""
+msgstr "ตัวแก้ไขไฟล์ข้อความเริ่มต้นคือ '%s'"
 
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
-msgstr ""
+msgid "The entered filter name already exists, please choose a different name."
+msgstr "ชื่อตัวกรองที่ใส่มีอยู่แล้ว, โปรดเลือกชื่อที่แตกต่าง"
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
-msgstr ""
+msgstr "นามสกุล '%s' มีในรายการอยู่แล้ว"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:246
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:253
@@ -6352,43 +6494,52 @@
 "The file %s already exists.\n"
 "Please enter a new name:"
 msgstr ""
+"ไฟล์ %s มีอยู่แล้ว\n"
+"โปรดใส่ชื่อใหม่:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
+"ไม่สามารถเปิดไฟล์ '%s':\n"
+"ไม่พบโปรแกรมที่เกี่ยวข้อง (%s)\n"
+"โปรดตรวจสอบความสัมพันธ์ของชนิดไฟล์ของคุณ"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr ""
+msgstr "ไฟล์ '%s' ไม่สามารถโหลดหรือไม่มีกุญแจส่วนตัว"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
-msgstr ""
+msgstr "ไม่สามารถโหลดไฟล์ '%s'"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
+"ไม่สามารถเปิดไฟล์ '%s':\n"
+"ไม่มีโปรแกรมที่สัมพันธ์กับชนิดไฟล์นี้ในระบบของคุณ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
+"ไม่สามารถเปิดไฟล์ '%s':\n"
+"คำสั่งที่สัมพันธ์ล้มเหลว"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
 #, c-format
@@ -6398,6 +6549,9 @@
 "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:266
 #, c-format
@@ -6405,6 +6559,8 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
+"ไฟล์ '%s' ไม่อยู่ในรูปแบบที่รองรับโดย FileZilla\n"
+"คุณต้องการจะแปลงมันไปเป็นรูปแบบที่รองรับ?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
 #, c-format
@@ -6413,12 +6569,14 @@
 "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:144
 msgid "The file selected as default editor does not exist."
-msgstr ""
+msgstr "ไฟล์ที่เลือกเป็นตัวแก้ไขเริ่มต้นไม่มีอยู่"
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6426,38 +6584,42 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
+"ไฟล์ที่คุณเลือกมีข้อมูลตัวจัดการที่ตั้งของ FileZilla รุ่นก่อนหน้า\n"
+"เนื่องจากความแตกต่างในรูปแบบของการจัดเก็บ, เฉพาะโฮสต์, พอร์ต, ชื่อผู้ใช้ "
+"และรหัสผ่านเท่านั้นที่จะถูกนำเข้า\n"
+"ดำเนินการนำเข้าต่อไป?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr ""
+msgstr "คอลัมน์ชื่อไฟล์ไม่สามารถซ่อนหรือเอาออกได้"
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
-msgstr ""
+msgstr "คอลัมน์ชื่อไฟล์ไม่สามารถซ่อนได้"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
 msgid "The following character will be replaced: %s"
-msgstr ""
+msgstr "อักขระดังต่อไปนี้จะถูกแทนที่ด้วย: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:65
 #, c-format
 msgid "The following characters will be replaced: %s"
-msgstr ""
+msgstr "อักขระดังต่อไปนี้จะถูกแทนที่ด้วย: %s"
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
-msgstr ""
+msgstr "ไฟล์ดังต่อไปนี้กำลังถูกแก้ไขอยู่ในขณะนี้:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 msgid "The global bookmarks could not be saved."
-msgstr ""
+msgstr "ไม่สามารถบันทึกบุ๊คมาร์คส่วนกลางได้"
 
-#: resources.h:965
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6466,7 +6628,7 @@
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:78
 msgid "The limit needs to be between 1 and 2000 MiB"
-msgstr ""
+msgstr "ค่าการจำกัดจำเป็นต้องอยู่ระหว่าง 1 และ 2000 MiB"
 
 #: ../../locales/../src/interface/state.cpp:275
 #, c-format
@@ -6474,74 +6636,77 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
+"ไดเรกทอรีในเครื่อง '%s' ไม่ได้อยู่ใต้การซิงโครไนซ์ราก (%s)\n"
+"ปิดใช้งานการซิงโครไนซ์ตัวเรียกดูและทำการเปลี่ยนไดเรกทอรีในเครื่องต่อไป?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
 msgid ""
 "The lowest available port has to be less or equal than the highest available "
 "port."
-msgstr ""
+msgstr "พอร์ตต่ำสุดที่ใช้ได้ต้องน้อยกว่าหรือเท่ากับพอร์ตสูงสุดที่ใช้ได้"
 
 #: ../../locales/../src/interface/updatewizard.cpp:607
 msgid ""
 "The most recent version has been downloaded. Click on Finish to close "
 "FileZilla and to start the installation."
-msgstr ""
+msgstr "รุ่นล่าสุดได้ถูกดาวน์โหลดแล้ว คลิก เสร็จสิ้น เพื่อปิด FileZilla และเริ่มต้นการติดตั้ง"
 
 #: ../../locales/../src/interface/updatewizard.cpp:609
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
-msgstr ""
+msgstr "รุ่นล่าสุดได้ถูกดาวน์โหลดแล้ว โปรดติดตั้งแบบเดียวกันกับที่คุณทำการติดตั้งรุ่นนี้"
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
+#: ../../locales/../src/interface/QueueView.cpp:1964
 msgid "The queue will not be saved."
-msgstr ""
+msgstr "คิวงานจะไม่ถูกบันทึก"
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1022
 #, 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"
+"ปิดใช้งานการซิงโครไนซ์ตัวเรียกดูและทำการเปลี่ยนไดเรกทอรีระยะไกลต่อไป?"
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
-msgstr ""
+msgstr "หมวดหมู่ที่เลือกได้ถูกนำเข้าเรียบร้อยแล้ว"
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
-msgstr ""
+msgstr "ไฟล์ที่เลือกมีข้อมูลการนำเข้าสำหรับหมวดหมู่ดังต่อไปนี้:"
 
-#: resources.h:320
+#: resources.h:322
 msgid "The selected file is already being edited:"
-msgstr ""
+msgstr "ไฟล์ที่เลือกที่ถูกแก้ไขไปแล้ว:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
-msgstr ""
+msgstr "ไฟล์ที่เลือกยังคงถูกเปิดอยู่ในโปรแกรมอื่น, โปรดปิดมัน"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
+#: ../../locales/../src/interface/sitemanager.cpp:602
 msgid "The server could not be added."
-msgstr ""
+msgstr "ไม่สามารถเพิ่มแม่ข่ายได้"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:574
 msgid "The server sent an unexpected or unrecognized reply."
-msgstr ""
+msgstr "แม่ข่ายส่งการตอบกลับที่ไม่คาดคิดหรือไม่รู้จัก"
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
-msgstr ""
+msgstr "แม่ข่ายใช้การเข้ารหัสอักขระดังต่อไปนี้สำหรับชื่อไฟล์:"
 
 #: resources.h:2
 msgid ""
@@ -6549,113 +6714,121 @@
 "certificate to make sure the server can be trusted."
 msgstr ""
 
-#: resources.h:186
+#: resources.h:188
 msgid ""
 "The server's host key does not match the key that has been cached. This "
 "means that either the administrator has changed the host key, or you are "
 "actually trying to connect to another computer pretending to be the server."
 msgstr ""
 
-#: resources.h:174
+#: resources.h:176
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3222
 msgid "The system will soon reboot unless you click Cancel."
-msgstr ""
+msgstr "ระบบจะทำการรีบู๊ตเร็ว ๆ นี้ เว้นแต่คลิกยกเลิก"
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3220
 msgid "The system will soon shut down unless you click Cancel."
-msgstr ""
+msgstr "ระบบจะทำการปิดเครื่องเร็ว ๆ นี้ เว้นแต่คลิกยกเลิก"
 
 #: resources.h:48
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
+"ไฟล์เป้าหมายมีอยู่แล้ว\n"
+"โปรดเลือกการกระทำ"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "The test did not succeed. Do you really want to save the settings?"
-msgstr ""
+msgstr "การทดสอบไม่ประสบความสำเร็จ คุณต้องการที่จะบันทึกการตั้งค่าหรือไม่?"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
-msgstr ""
+msgstr "ธีม"
 
-#: ../../locales/../src/interface/filter.cpp:447
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
-msgstr ""
+msgstr "ค่าตัวกรองนี้ไม่สามารถเอาออกได้"
 
-#: ../../locales/../src/interface/filter.cpp:382
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
-msgstr ""
+msgstr "ค่าตัวกรองนี้ไม่สามารถเปลี่ยนชื่อได้"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:575
 msgid ""
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
-msgstr ""
+msgstr "สิ่งนี้หมายความว่าบางเราเตอร์และ/หรือไฟร์วอลล์นั้นยังคงรบกวน FileZilla"
 
-#: resources.h:687
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 
-#: resources.h:665
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
+"ตัวช่วยสร้างนี้จะช่วยคุณในการกำหนดค่าเราเตอร์และไฟร์วอลล์ที่คุณมีอย่างถูกต้อง "
+"และทดสอบการกำหนดค่าของคุณ"
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+msgid "Time"
+msgstr "เวลา"
+
+#: resources.h:901
 msgid "Time formatting"
-msgstr ""
+msgstr "รูปแบบเวลา"
 
-#: resources.h:726
+#: resources.h:742
 msgid "Time&out in seconds:"
-msgstr ""
+msgstr "&หมดเวลาในวินาที:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
-msgstr ""
+msgstr "หมดเวลา"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
-msgstr "ชดเชยเขตเวลา : แม่ข่าย: %d วินาที. ในเครื่อง: %d วินาที. ความแตกต่าง: %d วินาที."
+msgstr "ชดเชยเขตเวลา: แม่ข่าย: %d วินาที ในเครื่อง: %d วินาที ความแตกต่าง: %d วินาที"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Title:"
-msgstr ""
+msgstr "หัวข้อ:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
-msgstr ""
+msgstr "เพื่อทำการเปรียบเทียบไดเรกทอรี, รายการไฟล์ทั้งสองจะต้องถูกจัดตำแหน่งให้ตรงกัน"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
-msgstr ""
+msgstr "ในการทำสิ่งนี้, ไดเรกทอรีต้นไม้จะต้องถูกแสดงหรือซ่อนทั้งคู่"
 
-#: resources.h:780
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
-msgstr ""
+msgstr "เพื่อรองรับใบรับรองของกุญแจสาธารณะ, FileZilla จำเป็นต้องทราบกุญแจส่วนตัวที่จะใช้"
 
-#: resources.h:990
+#: resources.h:1008
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6664,198 +6837,207 @@
 "Green: File is newer than the unmarked file on other side\n"
 "Red: File sizes different"
 msgstr ""
+"สลับการเปรียบเทียบไดเรกทอรี คลิกขวาเพื่อเปลี่ยนโหมดการเปรียบเทียบ\n"
+"\n"
+"สี:\n"
+"เหลือง: ไฟล์มีอยู่ฝั่งเดียวเท่านั้น\n"
+"เขียว: ไฟล์ใหม่กว่าไฟล์อีกด้านหนึ่งที่ไม่ได้ทำเครื่องหมาย\n"
+"แดง: ขนาดไฟล์แตกต่างกัน"
 
-#: resources.h:992
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
+"สลับการซิงโครไนซ์ตัวเรียกดู\n"
+"ถ้าเปิดใช้งาน, "
+"การนำทางไปยังลำดับชั้นของไดเรกทอรีในเครื่องจะเปลี่ยนไดเรกทอรีบนแม่ข่ายอย่างเหมาะสม "
+"และในทางกลับกัน"
 
-#: resources.h:980 resources.h:981
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
-msgstr ""
+msgstr "สลับการประมวลผลของคิวการโอนถ่าย"
 
-#: resources.h:972 resources.h:973
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
-msgstr ""
+msgstr "สลับการแสดงของไดเรกทอรีต้นไม้ในเครื่อง"
 
-#: resources.h:970 resources.h:971
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
-msgstr ""
+msgstr "สลับการแสดงของแถบข้อความแจ้งเตือน"
 
-#: resources.h:974 resources.h:975
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
-msgstr ""
+msgstr "สลับการแสดงของไดเรกทอรีต้นไม้ระยะไกล"
 
-#: resources.h:976 resources.h:977
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
-msgstr ""
+msgstr "สลับการแสดงของคิวการโอนถ่าย"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:605
 msgid "Too long header line"
-msgstr ""
+msgstr "บรรทัดหัวเรื่องยาวเกินไป"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:666
 msgid "Too many redirects"
-msgstr "เปลี่ยนทิคทางหลายครั้ง"
+msgstr "เปลี่ยนเส้นทางมากเกินไป"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
-msgstr ""
+msgstr "ติดตาม:"
 
-#: resources.h:913 resources.h:919
-#, fuzzy
+#: resources.h:931 resources.h:937
 msgid "Transfer"
-msgstr "&ส่ง"
+msgstr "การโอนถ่าย"
 
-#: resources.h:360
-#, fuzzy
+#: resources.h:362
 msgid "Transfer &direction"
-msgstr "ตั้งค่าการรับส่งข้อมูล"
+msgstr "&ทิศทางการโอนถ่าย"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
-msgstr "&ชนิดการรับส่ง"
+msgstr "&ชนิดการโอนถ่าย"
 
-#: resources.h:736
+#: resources.h:752
 msgid "Transfer Mode"
-msgstr "รูปแบบการรับส่ง"
+msgstr "โหมดการโอนถ่าย"
 
-#: resources.h:869
-#, fuzzy
+#: resources.h:887
 msgid "Transfer Queue"
-msgstr "&ส่ง"
+msgstr "คิวการโอนถ่าย"
 
-#: resources.h:97
-#, fuzzy
+#: resources.h:98
 msgid "Transfer Settings"
-msgstr "ตั้งค่าการรับส่งข้อมูล"
+msgstr "ตั้งค่าการโอนถ่าย"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
-#, fuzzy, c-format
+#: ../../locales/../src/engine/transfersocket.cpp:498
+#: ../../locales/../src/engine/transfersocket.cpp:522
+#, c-format
 msgid "Transfer connection interrupted: %s"
-msgstr "ความพยายามเชื่อมต่อถูกขัดขวางจากผู้ใช้"
+msgstr "การเชื่อมต่อการโอนถ่ายถูกขัดจังหวะ: %s"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:621
 msgid "Transferred data got tainted."
-msgstr ""
+msgstr "ข้อมูลที่โอนถ่ายได้รับความเสียหาย"
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1491
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
-msgstr "กำลังรับส่งข้อมูล"
+msgstr "กำลังโอนถ่าย"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:123
 msgid "Transfers"
-msgstr "รับส่งข้อมูล"
+msgstr "โอนถ่าย"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
-#, fuzzy
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 msgid "Transfers finished"
-msgstr "ตั้งค่าการรับส่งข้อมูล"
+msgstr "การโอนถ่ายเสร็จสิ้น"
 
-#: resources.h:827
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
-msgstr ""
+msgstr "ถือว่าไฟล์ที่&ไม่มีนามสกุลเป็นไฟล์ ASCII"
 
-#: resources.h:823
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr ""
-
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
-msgstr ""
+msgstr "ถือว่าชนิดไฟล์&ต่อไปนี้เป็นไฟล์ ASCII:"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
-msgstr ""
+#, fuzzy
+msgid "Trust changed Hostkey:"
+msgstr "กุญแจโฮสต์เปลี่ยนแปลงที่เชื่อถือ:"
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#, fuzzy
+msgid "Trust new Hostkey:"
+msgstr "กุญแจโฮสต์ใหม่ที่เชื่อถือ:"
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
-msgstr ""
+msgstr "เชื่อถือกุญแจใหม่และดำเนินการเชื่อมต่อ?"
 
 #: resources.h:22
 msgid "Trust this certificate and carry on connecting?"
-msgstr ""
+msgstr "เชื่อถือใบรับรองนี้และดำเนินการเชื่อมต่อ?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
-msgstr ""
+msgstr "เชื่อถือโฮสต์นี้และดำเนินการเชื่อมต่อ?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
-msgstr "รูปแบบ"
+msgstr "ชนิด"
 
-#: resources.h:762
+#: resources.h:778
 msgid "Type of FTP Proxy:"
-msgstr ""
+msgstr "ชนิดของพร็อกซี่ FTP:"
 
-#: resources.h:787
+#: resources.h:803
 msgid "Type of generic proxy:"
-msgstr ""
+msgstr "ชนิดของพร็อกซี่ทั่วไป:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
-msgstr ""
+msgstr "อั&พโหลด"
 
-#: resources.h:483 resources.h:807
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
-msgstr ""
+msgstr "การจำกัดการอั&พโหลด:"
 
-#: resources.h:931
+#: resources.h:949
 msgid "U&se filetype associations if available"
-msgstr ""
+msgstr "ใ&ช้ความสัมพันธ์ของชนิดไฟล์ถ้าใช้ได้"
 
-#: resources.h:884
+#: resources.h:902
 msgid "U&se system defaults"
-msgstr ""
+msgstr "ใ&ช้ค่าเริ่มต้นของระบบ"
 
-#: resources.h:764
+#: resources.h:780
 msgid "USER@&HOST"
 msgstr ""
 
 #: ../../locales/../src/engine/proxy.cpp:454
 #, c-format
 msgid "Unassigned error code %d"
-msgstr ""
+msgstr "รหัสข้อผิดพลาดที่ไม่ได้กำหนด %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Unit:"
-msgstr ""
+msgstr "หน่วย:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
-msgstr ""
+msgstr "ไม่รู้จัก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
-msgstr ""
+msgstr "ไม่รู้จักชนิดของพร็อกซี่ FTP, ไม่สามารถสร้างลำดับการเข้าสู่ระบบได้"
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr ""
+msgstr "ไม่รู้จักโปรโตคอล SOCKS รุ่น: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
-msgstr ""
+msgstr "ใบรับรองที่ไม่รู้จัก"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
+"เกิดข้อผิดพลาดที่ไม่รู้จักในการเปิดไฟล์ ตรวจสอบให้แน่ใจว่าไฟล์สามารถเข้าถึงได้ และเป็นเอกสาร "
+"XML ที่ถูกต้อง"
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
-msgstr ""
+msgstr "กุญแจโฮสต์ที่ไม่รู้จัก"
 
 #: ../../locales/../src/engine/proxy.cpp:378
 #, c-format
@@ -6864,7 +7046,7 @@
 "subnegotiation: %d"
 msgstr ""
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -6882,167 +7064,166 @@
 "mode has to be used."
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
-#, fuzzy
+#: ../../locales/../src/engine/tlssocket.cpp:888
 msgid "Unsupported certificate type"
-msgstr "เชื่อมต่อระยะไกลนี้ ใบรับรองไม่น่าเชื่อถือ"
+msgstr "ชนิดของใบรับรองที่ไม่รองรับ"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:650
 msgid "Unsupported redirect"
-msgstr ""
+msgstr "การเปลี่ยนเส้นทางที่ไม่รองรับ"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
-msgstr ""
+msgstr "อัพ&โหลดและยกเลิกการแก้ไข"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:137
 msgid "Update Check"
-msgstr "ตรวจสอบการปรับรุ่น"
+msgstr "ตรวจสอบการอัพเดต"
 
 #: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
 #: ../../locales/../src/interface/updatewizard.cpp:251
 #: ../../locales/../src/interface/updatewizard.cpp:264
 msgid "Update wizard"
-msgstr "วิซาร์ทการปรับรุ่น"
+msgstr "ตัวช่วยสร้างการอัพเดต"
 
-#: resources.h:362
-#, fuzzy
+#: resources.h:364
 msgid "Upload"
-msgstr "&อัพโหลด"
+msgstr "อัพโหลด"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
-#, fuzzy
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
-msgstr "ตรวจสอบการปรับรุ่นไม่สำเร็จ"
+msgstr "การอัพโหลดล้มเหลว"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
-#, fuzzy, c-format
+#: ../../locales/../src/interface/statusbar.cpp:609
+#, c-format
 msgid "Upload limit: %s/s"
-msgstr "&จำกัดการรับข้อมูล"
+msgstr "&จำกัดการอัพโหลด: %s/s"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
-#, fuzzy
+#: ../../locales/../src/interface/statusbar.cpp:611
 msgid "Upload limit: none"
-msgstr "&จำกัดการรับข้อมูล"
+msgstr "&จำกัดการอัพโหลด: ไม่จำกัด"
 
-#: resources.h:642
+#: resources.h:658
 msgid "Upload selected directory"
-msgstr "ส่งข้อมูลไดเรคทอรีที่เลือก"
+msgstr "อัพโหลดไดเรกทอรีที่เลือก"
 
-#: resources.h:556
+#: resources.h:566
 msgid "Upload selected files and directories"
-msgstr "ส่งข้อมูลไฟล์และไดเรคทอรีที่เลือก"
+msgstr "อัพโหลดไฟล์และไดเรกทอรีที่เลือก"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
-msgstr ""
+msgstr "อัพโหลดไฟล์นี้กลับไปยังแม่ข่าย?"
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
-msgstr ""
+msgstr "อัพโหลดไฟล์นี้ไปยังแม่ข่าย?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
-msgstr "กำลังส่งข้อมูล"
+msgstr "กำลังอัพโหลด"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
-msgstr ""
+msgstr "กำลังอัพโหลดและรอการลบ"
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
-msgstr ""
+msgstr "กำลังอัพโหลดและยกเลิกการแก้ไข"
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
-msgstr ""
+msgstr "ใช้รหัสอักขระที่&กำหนดเอง"
 
-#: resources.h:928
-#, fuzzy
+#: resources.h:946
 msgid "Use &custom editor:"
-msgstr "&ตัวแก้ใขเริ่มต้น"
+msgstr "ใช้ตัวแก้ไขที่&กำหนดเอง:"
 
-#: resources.h:421
+#: resources.h:423
 msgid "Use &default editor for text files"
-msgstr ""
+msgstr "ใช้ตัวแก้ไข&เริ่มต้นสำหรับไฟล์ข้อความ"
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
-msgstr ""
+msgstr "ใช้การ&ซิงโครไนซ์ตัวเรียกดู"
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
-msgstr ""
+msgstr "ใช้ UTF-8 ถ้าแม่ข่ายรองรับมัน, ถ้าไม่ ใช้รหัสอักขระในเครื่อง"
 
-#: resources.h:257 resources.h:267
-#, fuzzy
+#: resources.h:259 resources.h:269
 msgid "Use default action"
-msgstr "&กระทำอย่างนี้ทุกครั้ง"
+msgstr "ใช้การกระทำเริ่มต้น"
 
-#: resources.h:370
-#, fuzzy
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr "ใช้ FTP แบบธรรมดา"
+
+#: resources.h:372
 msgid "Use server currently connected to"
-msgstr "หยุดการเชื่อมต่อที่ใช้อยู่ ?"
+msgstr "ใช้แม่ข่ายปัจจุบันที่เชื่อมต่อกับ"
 
-#: resources.h:371
-#, fuzzy
+#: resources.h:373
 msgid "Use server from site manager"
-msgstr "ไม่สามารถแก้ใขไฟล์"
+msgstr "ใช้แม่ข่ายจากตัวจัดการที่ตั้ง"
 
-#: resources.h:878
+#: resources.h:896
 msgid "Use system &defaults"
-msgstr ""
+msgstr "ใช้&ค่าเริ่มต้นของระบบ"
 
-#: resources.h:688
+#: resources.h:704
 msgid "Use the following IP address:"
-msgstr ""
+msgstr "ใช้ที่อยู่ IP ดังต่อไปนี้:"
 
-#: resources.h:698
+#: resources.h:714
 msgid "Use the following port range:"
-msgstr ""
+msgstr "ใช้พอร์ตในช่วงดังต่อไปนี้:"
 
-#: resources.h:683
+#: resources.h:699
 msgid "Use the server's external IP address instead"
-msgstr ""
+msgstr "ใช้ที่อยู่ IP ภายนอกของแม่ข่ายแทน"
 
-#: resources.h:689 resources.h:752
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
-msgstr ""
+msgstr "ใช้สิ่งนี้ ถ้าคุณอยู่หลังเราเตอร์ และมีที่อยู่ IP ภายนอกแบบคงที่"
 
-#: resources.h:692
+#: resources.h:708
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
+"ใช้ตัวเลือกนี้ถ้าคุณมีที่อยู่ IP แบบแปรผัน FileZilla "
+"จะติดต่อกับแม่ข่ายข้างต้นหนึ่งครั้งแต่ละช่วงเวลาทันทีที่คุณใช้โหมด active เป็นครั้งแรก เฉพาะรุ่นของ "
+"FileZilla ที่คุณใช้จะถูกส่งไปยังแม่ข่าย"
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "ผู้ใช้:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
-msgstr ""
+msgstr "ชื่อผู้ใช้ต้องไม่มีช่องว่าง"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
-msgstr ""
+msgstr "กำลังใช้พร็อกซี่ %s"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
-msgstr ""
+msgstr "การใช้งานรหัสอักขระที่ไม่ถูกต้องอาจทำให้ชื่อไฟล์แสดงผลได้ไม่ถูกต้อง"
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
-msgstr ""
+msgstr "การใช้ตัวช่วยสร้างนี้ คุณจะสามารถตรวจสอบสำหรับการอัพเดตที่มีของ FileZilla ได้"
 
 #: resources.h:5 resources.h:29
 msgid "Valid from:"
@@ -7050,63 +7231,62 @@
 
 #: resources.h:6 resources.h:30
 msgid "Valid to:"
-msgstr "ถูกต้อง57':"
+msgstr "ถูกต้องถึง:"
 
 #: ../../locales/../src/interface/cmdline.cpp:16
+#, fuzzy
 msgid "Verbose log messages from wxWidgets"
-msgstr ""
+msgstr "ข้อความประวัติแบบฟุ่มเฟือยจาก wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
-msgstr "ตรวจสอบใบรับรอง..."
+msgstr "กำลังตรวจสอบใบรับรอง..."
 
-#: resources.h:168
-#, fuzzy
+#: resources.h:170
 msgid "Version:"
-msgstr "&เวอร์ชั่น %s"
+msgstr "รุ่น:"
 
-#: resources.h:812
+#: resources.h:828
 msgid "Very high"
-msgstr "สำคัญมาก"
+msgstr "สูงมาก"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
-msgstr ""
+msgstr "ดูตัวเลือกที่ซ่อน, แต่ไม่รองรับโดยแม่ข่าย"
 
-#: resources.h:915
-#, fuzzy
+#: resources.h:933
 msgid "View/Edit"
-msgstr "&แสดง/แก้ใข"
+msgstr "ดู/แก้ไข"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
-msgstr ""
+msgstr "คอลัมน์ที่มองเห็น"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "เ&ขียน"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
 msgstr "กำลังรอ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
-msgstr ""
+msgstr "กำลังรอเพื่อเรียกดูการเชื่อมต่อ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
-msgstr "กำลังรอรหัสผ่าน"
+msgstr "กำลังรอสำหรับรหัสผ่าน"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Waiting for transfer to be cancelled"
-msgstr ""
+msgstr "กำลังรอเพื่อยกเลิกการโอนถ่าย"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
-msgstr "กำลังรอเพื่อลองหใม่"
+msgstr "กำลังรอเพื่อลองใหม่..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
 "Warning!\n"
 "\n"
@@ -7122,10 +7302,22 @@
 "service,\n"
 "FileZilla will timeout on big transfers."
 msgstr ""
+"คำเตือน!\n"
+"\n"
+"มีจุดบกพร่องใน Windows ทำให้เกิดปัญหากับ FileZilla\n"
+"\n"
+"จุดบกพร่องนี้จะเกิดขึ้นหากคุณใช้\n"
+"- Windows Server 2003 หรือ XP 64\n"
+"- Windows Firewall ถูกเปิดใช้งาน\n"
+"- บริการ Application Layer Gateway ถูกเปิดใช้งาน\n"
+"ดูที่ http://support.microsoft.com/kb/931130 สำหรับข้อมูลพื้นหลัง\n"
+"\n"
+"หรือจนกว่าคุณจะปิด Windows Firewall หรือบริการ Application Layer Gateway,\n"
+"FileZilla จะหมดเวลาในการโอนถ่ายขนาดใหญ่"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:966
 msgid "Warning, ignoring data connection from wrong IP."
-msgstr ""
+msgstr "คำเตือน, มีการปฏิเสธการเชื่อมต่อข้อมูลจาก IP ที่ไม่ถูกต้อง"
 
 #: ../../locales/../src/interface/updatewizard.cpp:264
 msgid ""
@@ -7135,74 +7327,84 @@
 "\n"
 "Do you really want to check for nightly builds?"
 msgstr ""
+"คำเตือน, ใช้การสร้างล่าสุดโดยแบกรับความเสี่ยงของคุณเอง\n"
+"ไม่มีการสนับสนุนให้สำหรับการสร้างล่าสุด\n"
+"การสร้างล่าสุดอาจไม่ทำงานตามที่คาดไว้และอาจจะทำลายระบบของคุณ\n"
+"\n"
+"คุณต้องการที่จะตรวจสอบการสร้างล่าสุดหรือไม่?"
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
-msgstr ""
+msgstr "คำเตือน: ช่องโหว่ด้านความปลอดภัย!"
 
-#: resources.h:474
-#, fuzzy
+#: resources.h:476
 msgid "Welcome to FileZilla"
-msgstr "ปิด Filezilla"
+msgstr "ยินดีต้อนรับสู่ FileZilla"
 
-#: resources.h:463
+#: resources.h:465
 msgid "What's new"
-msgstr ""
+msgstr "มีอะไรใหม่"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
-msgstr ""
+msgstr "มีอะไรใหม่:"
 
-#: resources.h:815
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
+"เมื่อเปิดใช้งาน, อักขระในชื่อไฟล์ที่ไม่รองรับโดยระบบปฏิบัติการที่อยู่ในเครื่องจะถูกแทนที่ "
+"ถ้าดาวน์โหลดไฟล์ดังกล่าว"
 
-#: resources.h:857
+#: resources.h:873
 msgid "Widescreen"
-msgstr "Widescreen"
+msgstr "หน้าจอกว้าง"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "เขี&ยน"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:433
 #: ../../locales/../src/interface/netconfwizard.cpp:440
 msgid "Wrong external IP address"
-msgstr "IP address ภายนอกไม่ถูกต้อง"
+msgstr "ที่อยู่ IP ภายนอกไม่ถูกต้อง"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:827
 msgid "Wrong line endings"
-msgstr ""
+msgstr "การสิ้นสุดของบรรทัดไม่ถูกต้อง"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr "ใช่"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
-msgstr ""
+msgstr "คุณกำลังใช้รุ่นล่าสุดของ FileZilla อยู่แล้ว โปรดตรวจสอบอีกครั้งในอนาคต"
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
-msgstr ""
+msgstr "คุณสามารถเปิดหน้าต่างนี้ได้อีกครั้งจากเมนู 'ช่วยเหลือ'"
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
-msgstr ""
+msgstr "คุณสามารถเว้นช่องใส่พอร์ตให้ว่างไว้เพื่อใช้พอร์ตเริ่มต้น"
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
-msgstr ""
+msgstr "คุณสามารถใช้ x ที่ตำแหน่งใด ๆ เพื่อคงสิทธิการเข้าถึงไฟล์ไว้แบบเดิม"
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
-msgstr ""
+msgstr "คุณไม่สามารถนำเข้าการตั้งค่าจากไดเรกทอรีการตั้งค่าของตัวเองใน FileZilla ได้"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:137
 msgid ""
@@ -7212,54 +7414,52 @@
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
-msgstr ""
+msgstr "คุณไม่ได้ใส่ชื่อใหม่สำหรับไฟล์ เขียนทับไฟล์แทนหรือไม่?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
-msgstr ""
+msgstr "คุณได้เลือกมากกว่า 10 ไฟล์ที่จะแก้ไข, คุณต้องการจะดำเนินการต่อหรือไม่?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
-msgstr ""
+msgstr "คุณได้เลือกมากกว่า 10 ไฟล์หรือไดเรกทอรีที่จะเปิด, คุณต้องการจะดำเนินการต่อหรือไม่?"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่ชื่อโฮสต์"
 
-#: ../../locales/../src/interface/search.cpp:843
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:817
 msgid "You have to enter a local directory."
-msgstr "สร้างไดเรคทอรี"
+msgstr "คุณจำเป็นต้องใส่ไดเรกทอรีในเครื่อง"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:149
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:89
 msgid "You have to enter a valid IP address."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่ที่อยู่ IP ที่ถูกต้อง"
 
-#: ../../locales/../src/interface/search.cpp:849
-#, fuzzy
+#: ../../locales/../src/interface/search.cpp:823
 msgid "You have to enter a writable local directory."
-msgstr "สร้างไดเรคทอรี"
+msgstr "คุณจำเป็นต้องใส่ไดเรกทอรีในเครื่องที่เขียนได้"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่ชื่อบัญชี"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
-msgstr ""
+msgstr "คุณจำเป็นต้องระบุชื่อผู้ใช้"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:622
 msgid ""
@@ -7267,98 +7467,111 @@
 "transferred data."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 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 ""
+msgstr "คุณจำเป็นต้องใส่ชื่อสำหรับไฟล์ประวัติ"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
+#: ../../locales/../src/interface/edithandler.cpp:1640
 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:70
 msgid "You need to enter a proxy host."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่โฮสต์ของพร็อกซี่"
 
 #: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
 msgid "You need to enter a proxy port in the range from 1 to 65535"
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่พอร์ตของพร็อกซี่ในช่วงตั้งแต่ 1 ถึง 65535"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่อย่างน้อยหนึ่งเส้นทาง, ไม่รองรับบุ๊คมาร์คว่าง"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่ทั้งเส้นทางในเครื่องและระยะไกลเพื่อเปิดใช้งานการซิงโครไนซ์ตัวเรียกดูสำหรับบุ๊คมาร์คนี้"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
-msgstr ""
+msgstr "คุณจำเป็นต้องใส่ทั้งเส้นทางในเครื่องและระยะไกลเพื่อเปิดใช้งานการซิงโครไนซ์ตัวเรียกดูสำหรับที่ตั้งนี้"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
-msgstr ""
+msgstr "คุณจำเป็นต้องระบุไฟล์ในเครื่อง"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
-msgstr ""
+msgstr "คุณจำเป็นต้องระบุไฟล์ระยะไกล"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
-msgstr ""
+msgstr "คุณจำเป็นต้องระบุเส้นทางระยะไกล"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
-#, fuzzy
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
-msgstr "ไม่มีการเชื่อมต่อไปยัง แม่ข่ายใด ๆ"
+msgstr "คุณจำเป็นต้องระบุแม่ข่าย"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:568
 msgid ""
 "You should have no problems connecting to other servers, file transfers "
 "should work properly."
-msgstr ""
+msgstr "คุณไม่ควรมีปัญหาในการเชื่อมต่อไปยังแม่ข่ายอื่น ๆ, การโอนถ่ายไฟล์ควรทำงานได้อย่างถูกต้อง"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+msgid "after"
+msgstr "หลัง"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr "ก่อน"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
-msgstr ""
+msgstr "เริ่มต้นด้วย"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
-msgstr ""
+msgstr "ประกอบด้วย"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
-msgstr ""
+msgstr "ไม่ประกอบด้วย"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr "ไม่เท่ากับ"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
-msgstr ""
+msgstr "สิ้นสุดด้วย"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
-msgstr ""
+msgstr "เท่ากับ"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:497
+#: ../../locales/../src/interface/filelistctrl.cpp:515
+#: ../../locales/../src/interface/filelistctrl.cpp:540
+#: ../../locales/../src/interface/filelistctrl.cpp:556
 msgid "file"
 msgstr "ไฟล์"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr ""
 
@@ -7369,79 +7582,93 @@
 "Please make sure this executable exists in the same directory as the main "
 "FileZilla executable."
 msgstr ""
+"ไม่สามารถเริ่มต้น fzputtygen ได้\n"
+"โปรดตรวจสอบให้แน่ใจว่าตัวประมวลผลนี้มีอยู่ในไดเรกทอรีเดียวกันกับตัวประมวลผลหลักของ FileZilla"
 
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
 msgid "fzsftp could not be started"
-msgstr ""
+msgstr "ไม่สามารถเริ่มต้น fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
-msgstr ""
+msgstr "gnutls_certificate_get_peers กลับเป็นไม่มีใบรับรอง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
-msgstr ""
+msgstr "มากกว่า"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#, fuzzy
 msgid "group executable"
-msgstr ""
+msgstr "การประมวลผลของกลุ่ม"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#, fuzzy
 msgid "group readable"
-msgstr ""
+msgstr "การอ่านของกลุ่ม"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#, fuzzy
 msgid "group writeable"
-msgstr ""
+msgstr "การเขียนของกลุ่ม"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
-msgstr ""
+msgstr "เท่ากับ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
-msgstr ""
+msgstr "ถูกตั้ง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
-msgstr ""
+msgstr "ไม่ถูกตั้ง"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
-msgstr ""
+msgstr "น้อยกว่า"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
-msgstr ""
+msgstr "ตรงกับนิพจน์ปกติ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#, fuzzy
 msgid "owner executable"
-msgstr ""
+msgstr "การประมวลผลของเจ้าของ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#, fuzzy
 msgid "owner readable"
-msgstr ""
+msgstr "การอ่านของเจ้าของ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#, fuzzy
 msgid "owner writeable"
-msgstr ""
+msgstr "การเขียนของเจ้าของ"
 
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
-msgstr ""
+msgstr "ไม่รู้จัก"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#, fuzzy
 msgid "world executable"
-msgstr ""
+msgstr "การประมวลผลทั่วไป"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#, fuzzy
 msgid "world readable"
-msgstr ""
+msgstr "การอ่านทั่วไป"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#, fuzzy
 msgid "world writeable"
-msgstr ""
+msgstr "การเขียนทั่วไป"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
-msgstr ""
+msgstr "wxWidgets:"
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "ชื่อตัวกรองที่ซ้ำกัน"
diff -Nru filezilla-3.5.3/locales/tr.po filezilla-3.7.3~precise/locales/tr.po
--- filezilla-3.5.3/locales/tr.po	2011-11-01 16:41:51.000000000 +0000
+++ filezilla-3.7.3~precise/locales/tr.po	2013-04-29 03:30:05.000000000 +0000
@@ -7,29 +7,28 @@
 msgstr ""
 "Project-Id-Version: Filezilla 3 Turkish PO\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-01 16:26+0100\n"
-"PO-Revision-Date: 2011-10-26 07:17+0200\n"
-"Last-Translator: Kaya Zeren <kaya.zeren@zeron.net>\n"
+"POT-Creation-Date: 2013-04-28 22:31+0200\n"
+"PO-Revision-Date: 2013-01-24 01:02+0200\n"
+"Last-Translator: Kaya Zeren <kayazeren@gmail.com>\n"
 "Language-Team: Zeron <kaya.zeren@zeron.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
-"Language: \n"
-"X-Poedit-Country: TURKEY\n"
-"X-Poedit-Language: Turkish\n"
+"Language: tr_TR\n"
 "Plural-Forms: nplurals=1; plural=0;\n"
+"X-Generator: Poedit 1.5.4\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "Geçen: %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "Kalan: %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:798
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -46,9 +45,9 @@
 msgid_plural "%d directories"
 msgstr[0] "%d klasör"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1719
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -56,9 +55,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1718
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -76,7 +75,7 @@
 msgid_plural "%d files. Total size: At least %s"
 msgstr[0] "%d dosya. Toplam boyut: En az %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2941
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d dosya aktarım kuyruğuna eklendi"
@@ -87,31 +86,21 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d saniye"
 
-#: resources.h:775
+#: resources.h:795
 msgid "%h - Host"
 msgstr "%h - Sunucu"
 
-#: resources.h:777
+#: resources.h:797
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Parola"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -126,10 +115,10 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - Henüz onaylanmadı!"
 
-#: resources.h:779
+#: resources.h:799
 #, no-c-format
 msgid "%s - Proxy user"
-msgstr "%s - Proxy kullanıcısı"
+msgstr "%s - Vekil sunucu kullanıcısı"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
@@ -147,27 +136,17 @@
 msgid_plural "%s bytes"
 msgstr[0] "%s bayt"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bayt"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bayt (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bayt (%d.%d KB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bayt (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bayt (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -176,12 +155,12 @@
 "Please download FileZilla again. If this problem persists, please submit a "
 "bug report."
 msgstr ""
-"%s bulunamadı. FileZilla'nın bu bileşeni olmadan SFTP çalışmaz.\n"
+"%s bulunamadı. Bu FileZilla bileşeni olmadan SFTP çalışmaz.\n"
 "\n"
-"Lütfen FileZilla'yı yeniden indirin ve kurun. Eğer sorun çözülmezse, lütfen "
-"bir hata raporu gönderin."
+"Lütfen FileZilla'yı yeniden indirin ve kurun. Sorun çözülmezse, lütfen bir "
+"hata raporu gönderin."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -191,7 +170,7 @@
 "- Make sure %s is in a directory listed in your PATH environment variable.\n"
 "- Set the full path to %s in the FZ_FZSFTP environment variable."
 msgstr ""
-"%s bulunamıyor. FileZilla'nın bu bileşeni olmadan, SFTP çalışmaz.\n"
+"%s bulunamıyor. Bu FileZilla bileşeni olmadan, SFTP çalışmaz.\n"
 "\n"
 "Olası çözümler:\n"
 "- %s klasörün PATH çevre değişkeninde listelenmiş olduğundan emin olun.\n"
@@ -202,152 +181,148 @@
 msgid "%s with %d bits"
 msgstr "%s ve %d bit"
 
-#: resources.h:776
+#: resources.h:796
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - Kullanıcı adı"
 
-#: resources.h:780
+#: resources.h:800
 #, no-c-format
 msgid "%w - Proxy password"
-msgstr "%w - Proxy şifresi"
+msgstr "%w - Vekil sunucu parolası"
 
-#: resources.h:555
+#: resources.h:571
 msgid "&About..."
 msgstr "H&akkında..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:94 resources.h:393
 msgid "&Account:"
 msgstr "Hes&ap:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:109 resources.h:700 resources.h:764
 msgid "&Active"
 msgstr "&Aktif"
 
-#: resources.h:546
+#: resources.h:562
 msgid "&Add bookmark..."
 msgstr "Yer imi &ekle..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:575 resources.h:592
 msgid "&Add files to queue"
 msgstr "&Aktarım kuyruğuna ekle"
 
-#: resources.h:788
+#: resources.h:808
 msgid "&Add keyfile..."
 msgstr "&Anahtar dosyası ekle..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:650 resources.h:669
 msgid "&Add to queue"
 msgstr "&Aktarım kuyruğuna ekle"
 
-#: resources.h:95
+#: resources.h:103
 msgid "&Adjust server timezone offset:"
-msgstr "Sunucu z&aman dilimi farkını ayarla:"
+msgstr "Sunucu s&aat dilimi farkını ayarla:"
 
-#: resources.h:23
+#: resources.h:27
 msgid "&Always trust certificate in future sessions."
 msgstr "Sonr&aki oturumlarda bu sertifikaya güven."
 
-#: resources.h:182
+#: resources.h:191
 msgid "&Always trust this host, add this key to the cache"
 msgstr "Bu sunucuy&a her zaman güven ve anahtarını belleğe ekle"
 
-#: resources.h:939
+#: resources.h:960
 msgid "&Always use default editor"
 msgstr "Her z&aman varsayılan düzenleyiciyi kullan"
 
-#: resources.h:427
+#: resources.h:436
 msgid "&Always use selection for unassociated files"
 msgstr "Bu seçimi tüm ilişkilendirilmemiş dosy&alar için kullan"
 
-#: resources.h:65
+#: resources.h:73
 msgid "&Always use this action"
 msgstr "Her z&aman bu işlemi yap"
 
-#: resources.h:756
+#: resources.h:776
 msgid "&Ask your operating system for the external IP address"
 msgstr "Dış IP &adresini işletim sistemine sor"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:544 resources.h:680 resources.h:845
 msgid "&Auto"
 msgstr "Otom&atik"
 
-#: resources.h:107
+#: resources.h:115
 msgid "&Autodetect"
 msgstr "Kendiliğinden &Algıla"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "&Binary"
 msgstr "İk&ili"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "SI sem&bollerini kullanan ikili önekler. (e.g. 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:561
 msgid "&Bookmarks"
 msgstr "&Yer İmleri"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:936 resources.h:958
+#: resources.h:100 resources.h:375 resources.h:412 resources.h:418
+#: resources.h:435 resources.h:453 resources.h:957 resources.h:983
 msgid "&Browse..."
 msgstr "&Gözat..."
 
-#: resources.h:815
+#: resources.h:835
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Hoşgörü:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:136 resources.h:139 resources.h:206 resources.h:497
+#: resources.h:504 resources.h:748
 msgid "&Cancel"
 msgstr "İ&ptal"
 
-#: resources.h:235
+#: resources.h:244
 msgid "&Check for beta versions of FileZilla"
-msgstr "FileZilla'nın &BETA sürümlerine de bak"
+msgstr "FileZilla &Beta sürümlerini de denetle"
 
-#: resources.h:505
+#: resources.h:521
 msgid "&Clear private data..."
 msgstr "&Kişisel verileri sil..."
 
-#: resources.h:603
+#: resources.h:621
 msgid "&Close FileZilla"
 msgstr "FileZilla'yı &Kapat"
 
-#: resources.h:670
+#: resources.h:690
 msgid "&Configure speed limits..."
 msgstr "Hız &sınırlarını yapılandır..."
 
-#: resources.h:533
+#: resources.h:549
 msgid "&Configure..."
 msgstr "&Yapılandır..."
 
-#: resources.h:113
+#: resources.h:121
 msgid "&Connect"
 msgstr "&Bağlan"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "&Kopyala"
-
-#: resources.h:493
+#: resources.h:509
 msgid "&Copy current connection to Site Manager..."
 msgstr "Geçerli bağlantıyı Site Yöneti&cisine kopyala..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:181 resources.h:630
 msgid "&Copy to clipboard"
 msgstr "Panoya &kopyala"
 
-#: resources.h:617
+#: resources.h:635
 msgid "&Crash"
 msgstr "Çö&küş"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:583 resources.h:597 resources.h:652 resources.h:673
 msgid "&Create directory"
 msgstr "&Klasör oluştur"
 
-#: resources.h:665
+#: resources.h:685
 msgid "&Create new tab"
 msgstr "Yeni &sekme aç"
 
@@ -355,647 +330,655 @@
 msgid "&Debug"
 msgstr "&Hata ayıkla"
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Debug information in message log:"
 msgstr "İleti günlüğün&deki hata ayıklama bilgisi:"
 
-#: resources.h:932
+#: resources.h:953
 msgid "&Default editor:"
 msgstr "Varsayılan &düzenleyici:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:542 resources.h:613
 msgid "&Default file exists action..."
 msgstr "Varsayılan &dosya var işlemi..."
 
-#: resources.h:738
+#: resources.h:758
 msgid "&Delay between failed login attempts:"
-msgstr "Başarısız bağlantılar arası &bekleme:"
+msgstr "Başarısız bağlantılar arası &bekleme süresi:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:84 resources.h:211 resources.h:225 resources.h:425
+#: resources.h:586 resources.h:675
 msgid "&Delete"
 msgstr "&Sil"
 
-#: resources.h:457
+#: resources.h:466
 msgid "&Delete symlink"
 msgstr "&Sembolik bağlantıyı sil"
 
-#: resources.h:511
+#: resources.h:527
 msgid "&Directory comparison"
 msgstr "&Klasör karşılaştırma"
 
-#: resources.h:325
+#: resources.h:334
 msgid "&Discard local file then download and edit file anew"
 msgstr "Yerel &dosyayı boşver, yeni dosyayı indir ve düzenle"
 
-#: resources.h:539
+#: resources.h:555
 msgid "&Disconnect"
 msgstr "&Bağlantıyı Kes"
 
-#: resources.h:604
+#: resources.h:622
 msgid "&Disconnect from server"
 msgstr "Sunucu ile &bağlantıyı kes"
 
-#: resources.h:875
+#: resources.h:896
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "Ortalama aktarım hızı yerine &anlık aktarım hızını göster"
 
-#: resources.h:897
+#: resources.h:918
 msgid "&Display size in bytes"
 msgstr "&Boyutu göster (bayt)"
 
+#: resources.h:502
+msgid "&Do not remember passwords"
+msgstr "Parolaları &hatırlama"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "Bu pencereyi bir &daha gösterme."
 
-#: resources.h:761
+#: resources.h:781
 msgid "&Don't use external IP address on local connections."
 msgstr "Yerel bağlantılar için &dış IP adreslerini kullanma."
 
-#: resources.h:919
+#: resources.h:940
 msgid "&Double-click action on files:"
 msgstr "&Dosyalara çift tıklayınca ne olsun:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:590 resources.h:648
 msgid "&Download"
 msgstr "İn&dir"
 
-#: resources.h:443
+#: resources.h:452
 msgid "&Download to:"
 msgstr "Şuraya İn&dir:"
 
-#: resources.h:663
+#: resources.h:683
 msgid "&Download..."
 msgstr "İn&dir..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:266 resources.h:857
 msgid "&Downloads:"
 msgstr "İn&dirilen:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:519 resources.h:581
 msgid "&Edit"
 msgstr "Düz&enle"
 
-#: resources.h:210
+#: resources.h:219
 msgid "&Edit filter rules..."
 msgstr "Süzg&eç kurallarını düzenle..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:528 resources.h:548 resources.h:663 resources.h:689
 msgid "&Enable"
 msgstr "&Etkinleştir"
 
-#: resources.h:947
-msgid "&Enable automatic update check"
-msgstr "Günc&ellemeleri kendiliğinden denetle"
-
-#: resources.h:481 resources.h:810
+#: resources.h:490 resources.h:830
 msgid "&Enable speed limits"
 msgstr "Hız sınırlarını &etkinleştir"
 
-#: resources.h:111
+#: resources.h:119
 msgid "&Encoding:"
 msgstr "&Kodlama:"
 
-#: resources.h:82
+#: resources.h:90
 msgid "&Encryption:"
 msgstr "Şifr&eleme:"
 
-#: resources.h:611
+#: resources.h:629
 msgid "&Enter custom command..."
 msgstr "Öz&el komut yaz..."
 
-#: resources.h:137
+#: resources.h:145
 msgid "&Execute"
 msgstr "Ç&alıştır"
 
-#: resources.h:292
+#: resources.h:301
 msgid "&Export Site Manager entries"
 msgstr "Sit&e bilgilerini ver"
 
-#: resources.h:498 resources.h:659
+#: resources.h:514 resources.h:679
 msgid "&Export..."
 msgstr "V&er..."
 
-#: resources.h:766
+#: resources.h:786
 msgid "&Fall back to active mode"
 msgstr "Akti&f kipe geç"
 
-#: resources.h:490
+#: resources.h:506
 msgid "&File"
 msgstr "&Dosya"
 
-#: resources.h:640
+#: resources.h:660
 msgid "&File Attributes..."
 msgstr "&Dosya İzinleri..."
 
-#: resources.h:590
+#: resources.h:608
 msgid "&File permissions..."
 msgstr "&Dosya izinleri..."
 
-#: resources.h:365
+#: resources.h:374
 msgid "&File:"
 msgstr "&Dosya:"
 
-#: resources.h:220
+#: resources.h:229
 msgid "&Filter conditions:"
 msgstr "&Süzme kısıtları:"
 
-#: resources.h:199
+#: resources.h:208
 msgid "&Filter sets:"
 msgstr "&Süzme setleri:"
 
-#: resources.h:214
+#: resources.h:223
 msgid "&Filters:"
 msgstr "&Süzgeçler"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Son"
 
-#: resources.h:317
+#: resources.h:326
 msgid "&Finish editing and delete local file"
 msgstr "Düzenlemeyi &bitir ve yerel dosyayı sil"
 
-#: resources.h:447
+#: resources.h:456
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 "Uzak yollara aldırma, bulunan tüm dosyaları doğrudan hede&f klasöre indir"
 
-#: resources.h:458
+#: resources.h:467
 msgid "&Follow symlink, delete target directory contents"
 msgstr "Sembolik bağlantıyı izle, hede&f klasörün içeriğini sil"
 
-#: resources.h:759
+#: resources.h:779
 msgid "&Get external IP address from the following URL:"
-msgstr "Dış IP adresini bu URL'den &getir:"
+msgstr "Dış I&P adresini şu İnternet adresinden al:"
 
-#: resources.h:553
+#: resources.h:569
 msgid "&Getting help..."
 msgstr "&Yardım al..."
 
-#: resources.h:397
+#: resources.h:406
 msgid "&Global bookmark"
 msgstr "&Küresel yer imi"
 
-#: resources.h:795
+#: resources.h:815
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "CONNECT yöntemi kullanarak &HTTP/1.1"
 
-#: resources.h:549
+#: resources.h:565
 msgid "&Help"
 msgstr "&Yardım"
 
-#: resources.h:515 resources.h:646
+#: resources.h:531 resources.h:666
 msgid "&Hide identical files"
 msgstr "Eş dosyaları &gizle"
 
-#: resources.h:597
+#: resources.h:615
 msgid "&Highest"
 msgstr "&En büyük"
 
-#: resources.h:754
+#: resources.h:774
 msgid "&Highest available port:"
-msgstr "&En büyük port:"
+msgstr "&Kullanılabilecek en büyük kapı:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:87 resources.h:387 resources.h:738
 msgid "&Host:"
 msgstr "&Sunucu:"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC ikili önekleri (örneğin 1KiB = 1024 bayt)"
 
-#: resources.h:886
+#: resources.h:907
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (örneğin: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:515
 msgid "&Import..."
 msgstr "&Al..."
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Inherit system's filetype associations"
 msgstr "Sistemin dosya tipi &ilişkilerini devral"
 
-#: resources.h:446
+#: resources.h:455
 msgid "&Keep remote path structure relative to search root"
 msgstr "Arama &köküne göre uzaktaki yol yapısını koru"
 
-#: resources.h:860
+#: resources.h:880
 msgid "&Layout of file and directory panes:"
 msgstr "Dosya ve k&lasör pencerelerinin yerleşimi:"
 
-#: resources.h:751
+#: resources.h:771
 msgid "&Limit local ports used by FileZilla"
-msgstr "FileZilla tarafından ku&llanılan yerel portları sınırlandır"
+msgstr "FileZilla tarafından ku&llanılabilecek yerel kapıları sınırla"
 
-#: resources.h:103
+#: resources.h:111
 msgid "&Limit number of simultaneous connections"
 msgstr "Eş zaman&lı bağlantı sayısını sınırlandır"
 
-#: resources.h:521
+#: resources.h:537
 msgid "&Local directory tree"
 msgstr "Yere&l klasör ağacı"
 
-#: resources.h:402 resources.h:408
+#: resources.h:411 resources.h:417
 msgid "&Local directory:"
 msgstr "Yere&l klasör:"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Log to file"
 msgstr "Gün&lüğü dosyala"
 
-#: resources.h:83
+#: resources.h:91
 msgid "&Logon Type:"
 msgstr "&Giriş Türü:"
 
-#: resources.h:381
+#: resources.h:390
 msgid "&Logontype:"
 msgstr "&Giriş türü:"
 
-#: resources.h:600
+#: resources.h:618
 msgid "&Low"
 msgstr "&Düşük"
 
-#: resources.h:547
+#: resources.h:563
 msgid "&Manage bookmarks..."
 msgstr "Yer i&mlerini yönet..."
 
-#: resources.h:535
+#: resources.h:551
 msgid "&Manual transfer..."
 msgstr "El ile aktarı&m..."
 
-#: resources.h:104
+#: resources.h:112
 msgid "&Maximum number of connections:"
 msgstr "&En fazla bağlantı sayısı:"
 
-#: resources.h:736
+#: resources.h:756
 msgid "&Maximum number of retries:"
 msgstr "&En fazla bağlanma denemesi:"
 
-#: resources.h:520
+#: resources.h:536
 msgid "&Message log"
 msgstr "İ&leti günlüğü"
 
-#: resources.h:873
+#: resources.h:893
 msgid "&Minimize to tray"
 msgstr "Siste&m tepsisine küçült"
 
-#: resources.h:400
+#: resources.h:409
 msgid "&Name:"
 msgstr "&Ad:"
 
-#: resources.h:504
+#: resources.h:520
 msgid "&Network configuration wizard..."
-msgstr "Ağ yapıla&ndırma sihirbazı..."
+msgstr "Ağ yapıla&ndırma yardımcısı..."
 
-#: resources.h:215
+#: resources.h:224
 msgid "&New"
 msgstr "Ye&ni"
 
-#: resources.h:72
+#: resources.h:80
 msgid "&New Site"
 msgstr "Ye&ni Site"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
-msgstr "Ye&ni bir sürüm bulundu!"
+msgstr "Ye&ni bir sürüm yayınlanmış!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "İ&leri >"
 
-#: resources.h:319
+#: resources.h:328
 msgid "&No"
 msgstr "&Hayır"
 
-#: resources.h:769 resources.h:794
+#: resources.h:789 resources.h:814
 msgid "&None"
 msgstr "&Yok"
 
-#: resources.h:599
+#: resources.h:617
 msgid "&Normal"
 msgstr "&Normal"
 
-#: resources.h:948
-msgid "&Number of days between update checks:"
-msgstr "Gü&ncellemeleri şu kadar günde bir denetle:"
-
-#: resources.h:146
+#: resources.h:154
 msgid "&Numeric value:"
 msgstr "&Sayısal değer:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:122 resources.h:135 resources.h:427
 msgid "&OK"
 msgstr "&Tamam"
 
-#: resources.h:772
+#: resources.h:792
 msgid "&OPEN"
 msgstr "&AÇIK"
 
-#: resources.h:563 resources.h:651
+#: resources.h:579 resources.h:671
 msgid "&Open"
 msgstr "&Aç"
 
-#: resources.h:58
+#: resources.h:66
 msgid "&Overwrite"
 msgstr "Ü&zerine Yaz"
 
-#: resources.h:102
+#: resources.h:110
 msgid "&Passive"
 msgstr "&Pasif"
 
-#: resources.h:125
+#: resources.h:133
 msgid "&Password:"
 msgstr "&Parola:"
 
-#: resources.h:607
+#: resources.h:625
 msgid "&Play sound"
 msgstr "&Sesi çal"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:88 resources.h:388 resources.h:742
 msgid "&Port:"
-msgstr "&Port:"
+msgstr "Ka&pı:"
 
-#: resources.h:866
+#: resources.h:886
 msgid "&Position of the message log:"
 msgstr "İleti &günlüğünün konumu:"
 
-#: resources.h:531
+#: resources.h:547
 msgid "&Preserve timestamps of transferred files"
 msgstr "Dosyaların zaman damgalarını &koru"
 
-#: resources.h:301
+#: resources.h:310
 msgid "&Queue"
 msgstr "Aktarım &kuyruğu"
 
-#: resources.h:724
+#: resources.h:744
 msgid "&Quickconnect"
 msgstr "&Hızlı bağlan"
 
-#: resources.h:519
+#: resources.h:535
 msgid "&Quickconnect bar"
 msgstr "&Hızlı bağlan çubuğu"
 
-#: resources.h:135
+#: resources.h:143
 msgid "&Read"
 msgstr "&Oku"
 
-#: resources.h:538
+#: resources.h:554
 msgid "&Reconnect"
 msgstr "&Yeniden Bağlan"
 
-#: resources.h:509 resources.h:668
+#: resources.h:525 resources.h:688
 msgid "&Refresh"
 msgstr "&Yenile"
 
-#: resources.h:126
+#: resources.h:134
 msgid "&Remember password for this session"
-msgstr "Bu otu&rum süresince parolayı anımsa"
+msgstr "Bu otu&rum süresince parolayı hatırla"
 
-#: resources.h:404 resources.h:410
+#: resources.h:501
+msgid "&Remember passwords"
+msgstr "Pa&rolaları hatırla"
+
+#: resources.h:413 resources.h:419
 msgid "&Remote directory:"
 msgstr "Uzak klasö&r:"
 
-#: resources.h:368
+#: resources.h:377
 msgid "&Remote path:"
 msgstr "&Uzak yol:"
 
-#: resources.h:831
+#: resources.h:851
 msgid "&Remove"
 msgstr "&Sil"
 
-#: resources.h:789
+#: resources.h:809
 msgid "&Remove key"
 msgstr "Anahta&rı Sil"
 
-#: resources.h:594
+#: resources.h:612
 msgid "&Remove selected"
 msgstr "Seçiliyi kaldı&r"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:83 resources.h:226 resources.h:424 resources.h:588
+#: resources.h:604 resources.h:656 resources.h:677
 msgid "&Rename"
 msgstr "Yeniden adlandı&r"
 
-#: resources.h:201
+#: resources.h:210
 msgid "&Rename..."
 msgstr "Yeniden Adlandı&r..."
 
-#: resources.h:324
+#: resources.h:333
 msgid "&Reopen local file"
 msgstr "Ye&rel dosyayı yeniden aç"
 
-#: resources.h:822
+#: resources.h:842
 msgid "&Replace invalid characters with:"
 msgstr "Geçe&rsiz karakterleri şununla değiştir:"
 
-#: resources.h:554
+#: resources.h:570
 msgid "&Report a bug..."
 msgstr "Hata bildi&rin (İngilizce)..."
 
-#: resources.h:620
+#: resources.h:640
 msgid "&Reset and requeue all"
 msgstr "Bu&rayı boşalt ve tümünü yeniden kuyruğa al"
 
-#: resources.h:717
+#: resources.h:737
 msgid "&Restart Wizard"
 msgstr "Ya&rdımcıyı yeniden başlat"
 
-#: resources.h:62
+#: resources.h:70
 msgid "&Resume"
 msgstr "Sü&rdür"
 
-#: resources.h:605
+#: resources.h:623
 msgid "&Run command..."
 msgstr "Komut çalıştı&r..."
 
-#: resources.h:731
+#: resources.h:751
 msgid "&Run configuration wizard now..."
 msgstr "Ağ yapılandı&rma yardımcısını çalıştır..."
 
-#: resources.h:950
+#: resources.h:976
 msgid "&Run update check now..."
 msgstr "Güncellemele&ri denetle..."
 
-#: resources.h:771
+#: resources.h:791
 msgid "&SITE"
 msgstr "&SITE"
 
-#: resources.h:796
+#: resources.h:816
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:209
 msgid "&Save as..."
 msgstr "&Farklı kaydet..."
 
-#: resources.h:432
+#: resources.h:441
 msgid "&Search"
 msgstr "&Ara"
 
-#: resources.h:540
+#: resources.h:556
 msgid "&Search remote files..."
 msgstr "&Uzak dosyaları ara..."
 
-#: resources.h:71
+#: resources.h:79
 msgid "&Select Entry:"
 msgstr "Kayıt &Seçin:"
 
-#: resources.h:930
+#: resources.h:951
 msgid "&Select language:"
 msgstr "Dil &seçimi:"
 
-#: resources.h:356
+#: resources.h:365
 msgid "&Select the columns that should be displayed:"
 msgstr "Gösterilmesini istediğiniz &sütunları seçin:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:379 resources.h:552
 msgid "&Server"
 msgstr "&Sunucu"
 
-#: resources.h:300
+#: resources.h:309
 msgid "&Settings"
 msgstr "Aya&rlar"
 
-#: resources.h:506
+#: resources.h:522
 msgid "&Settings..."
 msgstr "Aya&rlar..."
 
-#: resources.h:965
+#: resources.h:990
 msgid "&Show debug menu"
 msgstr "Hata ayıklama menü&sünü göster"
 
-#: resources.h:606
+#: resources.h:624
 msgid "&Show message"
 msgstr "İletiyi gö&ster"
 
-#: resources.h:955
+#: resources.h:980
 msgid "&Show timestamps in message log"
 msgstr "İleti günlüğüne &zaman damgalarını da ekle"
 
-#: resources.h:491
+#: resources.h:507
 msgid "&Site Manager..."
 msgstr "&Site Yöneticisi..."
 
-#: resources.h:398
+#: resources.h:407
 msgid "&Site-specific bookmark"
 msgstr "&Siteye özgü yer imi"
 
-#: resources.h:64
+#: resources.h:72
 msgid "&Skip"
 msgstr "&Atla"
 
-#: resources.h:534
+#: resources.h:550
 msgid "&Speed limits"
 msgstr "Hız &sınırları"
 
-#: resources.h:449
+#: resources.h:458
 msgid "&Start transfer immediately"
 msgstr "Aktarıma &hemen başla"
 
-#: resources.h:865
+#: resources.h:885
 msgid "&Swap local and remote panes"
 msgstr "&Yerel ve Uzak bölümlerinin yerini değiştir"
 
+#: resources.h:637
+msgid "&TLS Ciphers"
+msgstr "&TLS Şifreleri"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "&Sına"
 
-#: resources.h:878
+#: resources.h:899
 msgid "&Theme:"
 msgstr "&Tema:"
 
-#: resources.h:524
+#: resources.h:540
 msgid "&Transfer"
 msgstr "Ak&tarım"
 
-#: resources.h:99
+#: resources.h:107
 msgid "&Transfer mode:"
 msgstr "Ak&tarım yöntemi:"
 
-#: resources.h:523
+#: resources.h:539
 msgid "&Transfer queue"
 msgstr "Ak&tarım kuyruğu"
 
-#: resources.h:834
+#: resources.h:854
 msgid "&Treat dotfiles as ASCII files"
 msgstr "Noktadosyaları ASCII dosyalar olarak kabul e&t"
 
-#: resources.h:330
+#: resources.h:339
 msgid "&Unedit"
 msgstr "&Düzeltme"
 
-#: resources.h:195
+#: resources.h:204
 msgid "&Update cached key for this host"
 msgstr "B&u sunucunun önbellekteki anahtarını güncelle"
 
-#: resources.h:557 resources.h:647
+#: resources.h:573 resources.h:667
 msgid "&Upload"
 msgstr "&Karşıya yükle"
 
-#: resources.h:267 resources.h:846
+#: resources.h:276 resources.h:866
 msgid "&Uploads:"
 msgstr "&Karşıya yüklenen:"
 
-#: resources.h:425
+#: resources.h:434
 msgid "&Use custom program"
 msgstr "Özel program k&ullan"
 
-#: resources.h:94
+#: resources.h:102
 msgid "&Use synchronized browsing"
 msgstr "Eş zamanlı taramayı k&ullan"
 
-#: resources.h:934
+#: resources.h:955
 msgid "&Use system's default editor for text files"
 msgstr "Text dosyaları için varsayılan sistem düzenleyicisini k&ullan"
 
-#: resources.h:757
+#: resources.h:777
 msgid "&Use the following IP address:"
 msgstr "Ş&u IP adresini kullan:"
 
-#: resources.h:765
+#: resources.h:785
 msgid "&Use the server's external IP address instead"
 msgstr "Onun yerine s&unucunun dış IP adresini kullan"
 
-#: resources.h:901
+#: resources.h:922
 msgid "&Use thousands separator"
 msgstr "Binlik basamak ayracı k&ullan"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:92 resources.h:132 resources.h:391
 msgid "&User:"
 msgstr "K&ullanıcı:"
 
-#: resources.h:720
+#: resources.h:740
 msgid "&Username:"
 msgstr "K&ullanıcı Adı:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Sürüm %s"
 
-#: resources.h:508
+#: resources.h:524
 msgid "&View"
 msgstr "&Görünüm"
 
-#: resources.h:580
+#: resources.h:596
 msgid "&View/Edit"
 msgstr "&Göster/Düzenle"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 "&Yerel olarak düzenlenen dosyaları izle ve değişiklikleri karşıya yüklemek "
 "için sor"
 
-#: resources.h:136
+#: resources.h:972
+msgid "&When checking for updates, check for:"
+msgstr "&Güncellemeler denetlenirken şu da denetlensin:"
+
+#: resources.h:144
 msgid "&Write"
 msgstr "&Yaz"
 
-#: resources.h:318
+#: resources.h:327
 msgid "&Yes"
 msgstr "&Evet"
 
@@ -1003,7 +986,7 @@
 #: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "'%s' yok veya erişilemiyor."
+msgstr "'%s' yok ya da erişilemiyor."
 
 #: ../../locales/../src/engine/local_path.cpp:477
 #: ../../locales/../src/engine/local_path.cpp:498
@@ -1013,19 +996,35 @@
 msgstr "'%s' bir klasör adı değil."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "'Hesap' ile giriş tipi bu protokol için desteklenmiyor"
+msgstr "'Hesap' ile giriş tipi bu iletişim kuralı için desteklenmiyor"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask ask for "
+"password' instead."
+msgstr ""
+"'Normal' ve 'Hesap' oturum açma tipleri kullanılamaz. 'Parola sor' tipi "
+"kullanılıyor."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask ask for password'."
+msgstr ""
+"'Normal' ve 'Hesap' oturum açma tipleri kullanılamaz. Kaydınız 'Parola sor' "
+"şeklinde değiştirildi."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:598
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'komut' genellikle komut satırı istemcileri tarafından sunucuya "
+"'quote' genellikle komut satırı istemcileri tarafından sunucuya "
 "parametreleri göndermek için kullanılan bir yerel komuttur. Başlangıçtaki "
-"'komut' olmadan standart bir komut yazmak isteyebilirsiniz."
+"'quote' olmadan ham bir komut yazmak isteyebilirsiniz."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
@@ -1034,120 +1033,116 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d nesne süzüldü)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:826 resources.h:828
 msgid "(0 for no limit)"
 msgstr "(Sınırsız için 0)"
 
-#: resources.h:737
+#: resources.h:757
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:759
 msgid "(0-999 seconds)"
 msgstr "(0-999 saniye)"
 
-#: resources.h:804
+#: resources.h:824
 msgid "(1-10)"
 msgstr "(En çok: 1-10)"
 
-#: resources.h:733
+#: resources.h:753
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, kapatmak için 0)"
 
-#: resources.h:949
-msgid "(At least 7 days)"
-msgstr "(En az 7 gün)"
-
-#: resources.h:894
+#: resources.h:915
 msgid "(example: %H:%M)"
 msgstr "(örneğin: %H:%M)"
 
-#: resources.h:888
+#: resources.h:909
 msgid "(example: %Y-%m-%d)"
 msgstr "(örneğin: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:492 resources.h:494 resources.h:832 resources.h:834
 #, c-format
 msgid "(in %s/s)"
 msgstr "(ile %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", %H:%M:%S kaldı"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", --:--:-- kaldı"
 
-#: resources.h:705
+#: resources.h:725
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:257
 msgid "- Broken router and/or firewall"
-msgstr "- Bozuk yöneltici ve/veya güvenlik duvarı"
+msgstr "- Bozuk yöneltici ya da güvenlik duvarı"
 
-#: resources.h:249
+#: resources.h:258
 msgid "- File corrupted on mirror"
 msgstr "- Yansı üzerindeki dosya bozuk"
 
-#: resources.h:247
+#: resources.h:256
 msgid "- Malware on your system"
 msgstr "- Sisteminizde zararlı yazılım var"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "--:--:-- kaldı"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:83
 msgid "-c cannot be used together with an FTP URL."
-msgstr "-c ile FTP URL si beraber kullanılamaz."
+msgstr "-c ile FTP İnternet adresi birlikte kullanılamaz."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:92
 msgid "-l can only be used together with an FTP URL."
-msgstr "-l sadece bir FTP adresi ile birlikte kullanılabilir."
+msgstr "-l yalnız bir FTP İnternet adresi ile birlikte kullanılabilir."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:71
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s ve -c aynı anda kullanılamaz."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:77
 msgid "-s cannot be used together with an FTP URL."
-msgstr "-s ile FTP URL si beraber kullanılamaz."
+msgstr "-s ile FTP İnternet adresi birlikte kullanılamaz."
 
-#: resources.h:967
+#: resources.h:992
 msgid "0 - None"
 msgstr "0 - Yok"
 
-#: resources.h:968
+#: resources.h:993
 msgid "1 - Warning"
 msgstr "1 - Uyarı"
 
-#: resources.h:969
+#: resources.h:994
 msgid "2 - Info"
 msgstr "2 - Bilgi"
 
-#: resources.h:970
+#: resources.h:995
 msgid "3 - Verbose"
 msgstr "3 - Ayrıntılı"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 bit sistem"
 
-#: resources.h:971
+#: resources.h:996
 msgid "4 - Debug"
 msgstr "4 - Hata ayıklama"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 bit sistem"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Geri"
 
-#: resources.h:548
+#: resources.h:564
 msgid "?"
 msgstr "?"
 
@@ -1156,47 +1151,48 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "Aynı adlı bir yer imi var. Lütfen farklı bir ad yazın:"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Varsayılan bir düzenleyici ayarlamalısınız."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Bir klasör kendi alt klasörlerinden birine sürüklenemez."
 
-#: resources.h:677
+#: resources.h:697
 msgid ""
 "A few servers don't allow passive mode or are misconfigured. In such cases "
 "you would have to use active mode. In active mode, FileZilla opens a port "
 "and asks the server to connect to it."
 msgstr ""
-"Bazı sunucular pasif moda izin vermez ya da yanlış ayarlanmışlardır. Böyle "
-"durumlarda aktif modu kullanmalısınız. Aktif modda, FileZilla bir port açar "
-"ve sunucuya buna bağlanmasını söyler."
+"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."
 
-#: resources.h:306
+#: resources.h:315
 msgid "A file previously opened has been changed."
 msgstr "Önceden açılmış olan bir dosya değiştirilmiş."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/LocalListView.cpp:2062
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "'%s' adında bir dosya zaten düzenleniyor. Yeniden açmak ister misiniz?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "A file with that name is already being transferred."
 msgstr "Aynı adlı bir dosya zaten aktarıldı."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr ""
 "Aynı adlı bir dosya zaten düzenleniyor. Lütfen kapatıp yeniden deneyin."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1209,11 +1205,11 @@
 "Bu sorunu çözmezseniz listelemelerde bazı dosyalar görünmeyebilir.\n"
 "Bu oturum boyunca başka uyarı almayacaksınız."
 
-#: resources.h:237
+#: resources.h:246
 msgid "A newer version of FileZilla is available:"
-msgstr "FileZilla'nın yeni bir sürümü yayınlanmış:"
+msgstr "Yeni bir FileZilla sürümü yayınlanmış:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 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."
@@ -1222,13 +1218,13 @@
 "sunucular dosyaları kullanıcıdan gizleyebilir. Sunucuyu tüm dosyaları "
 "göstermeye zorlamak için bu seçeneği kullanın."
 
-#: resources.h:749
+#: resources.h:769
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
 msgstr ""
-"Normal bir sunucu buna gerek duymaz. Eğer kullanmanız gerekiyorsa sunucu "
-"yöneticisi ile iletişim kurun."
+"Normal bir sunucu buna gerek duymaz. Kullanmak zorundaysanız sunucu "
+"yöneticisi ile görüşün."
 
 #: ../../locales/../src/interface/state.cpp:284
 msgid ""
@@ -1239,95 +1235,95 @@
 "Eşzamanlı taramayı devre dışı bırakıp yerel klasörlerde gezinmeye devam "
 "etmek ister misiniz?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:850
 msgid "A&dd"
 msgstr "E&kle"
 
-#: resources.h:857
+#: resources.h:877
 msgid "A&llow resume of ASCII files"
-msgstr "ASCII dosya&larının devam etmesine izin ver"
+msgstr "ASCII dosya&lar sürdürülebilsin"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
-msgstr "S&adece indirmelere uygula"
+msgstr "Y&alnız indirmelere uygula"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
-msgstr "S&adece karşıya yüklemelere uygula"
+msgstr "Y&alnız karşıya yüklemelere uygula"
 
-#: resources.h:149
+#: resources.h:157
 msgid "A&pply to all files and directories"
 msgstr "Tüm dosy&a ve klasörlere uygula"
 
-#: resources.h:627
+#: resources.h:647
 msgid "A&utomatically remove successful transfers"
-msgstr "B&aşarılı aktarımları kendiliğinden sil"
+msgstr "T&amamlanan aktarımları kendiliğinden sil"
 
-#: resources.h:389
+#: resources.h:398
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:488
 msgid "Abort previous connection and connect in current tab"
 msgstr "Önceki bağlantıyı iptal et ve geçerli sekmeden bağlan"
 
-#: resources.h:154
+#: resources.h:162
 msgid "About FileZilla"
 msgstr "FileZilla Hakkında"
 
-#: resources.h:867
+#: resources.h:887
 msgid "Above the file lists"
 msgstr "Yerel ve uzak dosya gezginlerinin üzerinde"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Hesap"
 
-#: resources.h:602
+#: resources.h:620
 msgid "Action after queue &completion"
 msgstr "Kuyruk tamamlandıktan sonra yapıla&cak işlem"
 
-#: resources.h:329
+#: resources.h:338
 msgid "Action on selected file:"
 msgstr "Seçili dosyaya yapılacak işlem:"
 
-#: resources.h:323
+#: resources.h:332
 msgid "Action to perform:"
 msgstr "Yapılacak işlem:"
 
-#: resources.h:57
+#: resources.h:65
 msgid "Action:"
 msgstr "İşlem:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
-msgstr "Aktif mod"
+msgstr "Aktif kip"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:605
 msgid ""
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
 msgstr ""
-"Aktif mod FTP sınaması başarısız. FileZilla doğru dış IP adresini bilmiyor."
+"Aktif kip FTP sınaması yapılamadı. FileZilla doğru dış IP adresini bilmiyor."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:592
 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 ""
-"Aktif mod FTP sınaması başarısız. FileZilla doğru dış IP adresini bilmiyor. "
+"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:580
@@ -1336,26 +1332,26 @@
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
-"Aktif mod FTP sınaması başarısız. FileZilla doğru dış IP adresini biliyor, "
-"ama yönelticiniz veya güvenlik duvarınız giden adresi değiştirdi."
+"Aktif kip FTP sınaması yapılamadı. FileZilla doğru dış IP adresini biliyor, "
+"ama yönelticiniz ya da güvenlik duvarınız giden adresi değiştirdi."
 
-#: resources.h:762
+#: resources.h:782
 msgid "Active mode IP"
-msgstr "Aktif mod IP"
+msgstr "Aktif kip IP"
 
-#: resources.h:450
+#: resources.h:459
 msgid "Add files to &queue only"
-msgstr "Dosyaları sadece &kuyruğa ekle"
+msgstr "Dosyaları yalnız &kuyruğa ekle"
 
-#: resources.h:631 resources.h:650
+#: resources.h:651 resources.h:670
 msgid "Add selected directory to the transfer queue"
 msgstr "Seçili klasörleri aktarım kuyruğuna ekle"
 
-#: resources.h:560 resources.h:577
+#: resources.h:576 resources.h:593
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Seçili dosya ve klasörleri aktarım kuyruğuna ekle"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Add to queue"
 msgstr "Aktarım kuyruğuna ekle"
 
@@ -1363,45 +1359,60 @@
 msgid "Address type not supported"
 msgstr "Adres tipi desteklenmiyor"
 
-#: resources.h:88
+#: resources.h:96
 msgid "Advanced"
 msgstr "Gelişmiş"
 
-#: resources.h:234
+#: resources.h:243
 msgid "Advanced options:"
 msgstr "Gelişmiş seçenekler:"
 
-#: resources.h:338
+#: resources.h:975
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly versions of FileZilla may not work as "
+"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, lütfen "
+"kararlı sürümleri kullanın. Beta sürümleri ve gecelik yapımlar, sınama "
+"amacıyla kullanılabilecek geliştirme sürümleridir. Gecelik FileZilla "
+"sürümleri beklendiği gibi çalışmayarak sisteminize zarar verebilir. Beta "
+"sürümleri ve gecelik yapımları kullanmaktan doğabilecek zararların riski "
+"size aittir."
+
+#: resources.h:347
 msgid "Algorithm:"
 msgstr "Algoritma:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "All files have been successfully transferred"
 msgstr "Tüm dosyalar aktarıldı"
 
-#: resources.h:706
+#: resources.h:726
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "Yazılan tüm portlar 1024 ile 65535 arasında olmalı."
+msgstr "Yazılan tüm kapılar 1024 ile 65535 arasında olmalı."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "Tüm aktarımlar bitti. %d dosya aktarılamadı."
 
-#: resources.h:745
+#: resources.h:765
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Hata durumunda diğer aktarım yöntemine &başvur"
 
-#: resources.h:681
+#: resources.h:701
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Hata durumunda diğer aktarım yöntemine başvur"
 
-#: resources.h:476
+#: resources.h:485
 msgid "Already connected"
 msgstr "Zaten bağlı"
 
-#: resources.h:790
+#: resources.h:810
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1409,7 +1420,7 @@
 "Alternatif olarak PuTTY anahtarlarınızı yönetmek için Pageant aracını "
 "kullanabilirsiniz. FileZilla Pageant ile çalışır."
 
-#: resources.h:791
+#: resources.h:811
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1417,7 +1428,7 @@
 "Alternatif olarak sisteminizdeki SSH programını kullanabilirsiniz. Bunu "
 "yapmak için SSH_AUTH_SOCK değişkeninin ayarlandığından emin olun."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
@@ -1425,7 +1436,7 @@
 "Ayrıca, en güncel sürümü indirmek için http://filezilla-project.org adresini "
 "ziyaret edin."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2055
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1434,7 +1445,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1954
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1443,33 +1454,33 @@
 "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:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 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."
+msgstr "Hedefte, sürüklediğiniz nesne ile aynı adı taşıyan bir nesne var."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Anonim"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 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:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "Site Yöneticisi'nde yapılan değişiklikler kaydedilemeyecek."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
 msgid ""
 "Any changes made in the Site Manager will not be saved unless you repair the "
 "file."
@@ -1477,58 +1488,58 @@
 "Dosyayı onarmadıkça Site Yöneticisinde yaptığınız değişiklikler "
 "kaydedilmeyecek."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "Süzgeçlerd yaptığınız değişikliklr kaydeileyecek."
 
-#: resources.h:151
+#: resources.h:159
 msgid "App&ly to directories only"
-msgstr "Sadece k&lasörlere uygula"
+msgstr "Yalnız k&lasörlere uygula"
 
-#: resources.h:213
+#: resources.h:222
 msgid "Apply"
 msgstr "Uygula"
 
-#: resources.h:66
+#: resources.h:74
 msgid "Apply to &current queue only"
-msgstr "Sade&ce geçerli aktarım kuyruğuna uygula"
+msgstr "Yal&nız geçerli aktarım kuyruğuna uygula"
 
-#: resources.h:150
+#: resources.h:158
 msgid "Apply to &files only"
-msgstr "Sadece &dosyalara uygula"
+msgstr "Yalnız &dosyalara uygula"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Arşiv"
 
-#: resources.h:869
+#: resources.h:889
 msgid "As tab in the transfer queue pane"
 msgstr "Aktarım kuyruğu bölümünde sekme olarak"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:268 resources.h:278 resources.h:858 resources.h:867
 msgid "Ask for action"
 msgstr "Ne yapılacağını sor"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Parola sor"
 
-#: resources.h:702
+#: resources.h:722
 msgid "Ask operating system for a port."
-msgstr "İşletim sisteminden bir port iste."
+msgstr "İşletim sisteminden bir kapı iste."
 
-#: resources.h:692
+#: resources.h:712
 msgid "Ask your operating system for the external IP address"
 msgstr "İşletim sistemine dış IP adresini sor"
 
-#: resources.h:471
+#: resources.h:480
 msgid "Asking questions in the FileZilla forums"
 msgstr "FileZilla forumlarında soru sorabilirsiniz"
 
@@ -1536,39 +1547,35 @@
 msgid "Associated program not found:"
 msgstr "İlgili program bulunamadı:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "En az bir süzme kısıtı eksik kalmış"
 
-#: resources.h:711
+#: resources.h:731
 msgid "At this point, all required information has been gathered."
 msgstr "Artık tüm yapılandırma bilgileri toplanmış durumda."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "İzin"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Kimlik denetimi başarısız oldu."
 
-#: resources.h:879
+#: resources.h:900
 msgid "Author:"
 msgstr "Yazar:"
 
-#: resources.h:386
+#: resources.h:395
 msgid "Auto"
 msgstr "Kendiliğinden"
 
-#: resources.h:828
+#: resources.h:848
 msgid "Automatic file type classification"
 msgstr "Kendiliğinden dosya türü sınıflandırması"
 
-#: resources.h:946
-msgid "Automatic update check"
-msgstr "Kendiliğinden güncelleme denetimi"
-
-#: resources.h:883
+#: resources.h:904
 msgid "Available sizes"
 msgstr "Geçerli boyutlar"
 
@@ -1577,145 +1584,145 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B"
 
-#: resources.h:90
+#: resources.h:98
 msgid "B&ypass proxy"
-msgstr "Prox&y sunucuyu atla"
+msgstr "&Vekil sunucuyu atla"
 
-#: resources.h:467
+#: resources.h:476
 msgid "Basic usage instructions"
 msgstr "Basit kullanım bilgileri"
 
-#: resources.h:871
+#: resources.h:891
 msgid "Behaviour"
 msgstr "Davranış"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Düzenlendi"
 
-#: resources.h:616
+#: resources.h:634
 msgid "Benchmark string coalescer"
 msgstr "Dizge birleştiriciyi işaretle"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:951
 msgid "Beware! Certificate has been revoked"
 msgstr "Dikkat! Sertifika geçersiz kılınmış"
 
-#: resources.h:390
+#: resources.h:399
 msgid "Binary"
 msgstr "İkili"
 
-#: resources.h:864
+#: resources.h:884
 msgid "Blackboard"
 msgstr "Karatahta"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "Yer imi"
 
-#: resources.h:413
+#: resources.h:422
 msgid "Bookmark:"
 msgstr "Yer imi:"
 
-#: resources.h:412
+#: resources.h:421
 msgid "Bookmarks"
 msgstr "Yer imleri"
 
-#: resources.h:162
+#: resources.h:170
 msgid "Build date:"
 msgstr "Üretim tarihi:"
 
-#: resources.h:159
+#: resources.h:167
 msgid "Build information"
 msgstr "Üretim bilgisi"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Business category:"
 msgstr "İş kategorisi:"
 
-#: resources.h:752
+#: resources.h:772
 msgid ""
 "By default uses any available local port to establish transfers in active "
 "mode. If you want to limit FileZilla to use only a small range of ports, "
 "please enter the port range below."
 msgstr ""
-"Varsayılan olarak aktif modda aktarım için varolan herhangi bir yerel port "
-"kullanılabilir. Eğer FileZilla'nın sadece belli bir aralıktaki portları "
+"Varsayılan olarak, aktif kipte aktarım için varolan herhangi bir yerel kapı "
+"kullanılabilir. Yalnız belli bir aralıktaki kapıların FileZilla tarafından "
 "kullanmasını istiyorsanız, bu aralığı aşağıya yazın."
 
-#: resources.h:537
+#: resources.h:553
 msgid "C&ancel current operation"
 msgstr "Yürürlükteki işlemi ipt&al et"
 
-#: resources.h:236
+#: resources.h:245
 msgid "C&heck for nightly builds of FileZilla"
-msgstr "FileZilla'nın gecelik sürümlerine de &bak"
+msgstr "Gecelik FileZilla sürümlerine de &bak"
 
-#: resources.h:613
+#: resources.h:631
 msgid "C&lear all"
 msgstr "Hepsini temiz&le"
 
-#: resources.h:588 resources.h:638
+#: resources.h:606 resources.h:658
 msgid "C&opy URL(s) to clipboard"
-msgstr "Web adresini pan&oya kopyala"
+msgstr "İnternet adresini pan&oya kopyala"
 
-#: resources.h:887
+#: resources.h:908
 msgid "C&ustom"
 msgstr "İsteğe &Bağlı"
 
-#: resources.h:942
+#: resources.h:963
 msgid "C&ustom filetype associations:"
 msgstr "Ö&zel dosya türü ilişkileri:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
-msgstr "Sunucunun zaman dilimi kayması hesaplanıyor..."
+msgstr "Sunucunun saat dilimi farkı hesaplanıyor..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:734
 msgid "Can't read from file"
 msgstr "Dosya okunamıyor"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:713
+#: ../../locales/../src/engine/transfersocket.cpp:787
 msgid "Can't write data to file."
 msgstr "Veri dosyaya yazılamıyor."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:711
+#: ../../locales/../src/engine/transfersocket.cpp:785
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Veri %s dosyasına yazılamıyor"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:29 resources.h:77 resources.h:123 resources.h:161
+#: resources.h:193 resources.h:221 resources.h:238 resources.h:289
+#: resources.h:298 resources.h:305 resources.h:313 resources.h:336
+#: resources.h:369 resources.h:402 resources.h:416 resources.h:428
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:489
 msgid "Cancel"
 msgstr "İptal"
 
-#: resources.h:989
+#: resources.h:1015
 msgid "Cancel current operation"
 msgstr "Yürürlükteki işlemi iptal et"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancels the current operation"
 msgstr "Yürürlükteki işlemi iptal eder"
 
 #: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
-msgstr "'%s' erişilemiyor, sürücü hazır değil veya bir medya takılmamış."
+msgstr "'%s' erişilemiyor, sürücü hazır değil ya da bir ortam takılmamış."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Cannot add server to Site Manager"
 msgstr "Sunucuyu Site Yöneticisine ekleyemiyor"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1731,37 +1738,38 @@
 "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:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2805
 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:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Yeni süzgeç oluşturulamıyor"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2171
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
+#: ../../locales/../src/interface/RemoteListView.cpp:2681
 msgid "Cannot edit file"
 msgstr "Dosya düzenlenemiyor"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1956
 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:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Cannot edit file, remote path unknown."
 msgstr "Uzaktaki yol bilinmediğinden dosya düzenlenemiyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
-msgstr "SFTP sunucusu ile bağlantı kurulamadı. Lütfen uygun protokolü seçin"
+msgstr ""
+"SFTP sunucusu ile bağlantı kurulamadı. Lütfen uygun iletişim kuralını seçin"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Hızlı Bağlan çubuğu kaynak dosyasından yüklenemiyor"
 
@@ -1773,44 +1781,48 @@
 msgid "Cannot load keyfile"
 msgstr "Anahtar dosya yüklenemiyor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1102
 msgid "Cannot load toolbar from resource file"
 msgstr "Araç çubuğu kaynak dosyasından yüklenemiyor"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Parolalar hatırlanmıyor"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Yeniden adlandırılamıyor"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Cannot rename file"
 msgstr "Dosya yeniden adlandırılamıyor"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Filtre seti kaydedilemiyor"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Filtre seçilemiyor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "Dosya ilişkisi ayarlanamıyor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Sonucu gösteremiyor"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../locales/../src/interface/RemoteListView.cpp:2701
 msgid "Cannot view/edit selected file"
 msgstr "Seçilen dosyada görüntüleme/düzenleme yapılamıyor"
 
-#: resources.h:283
+#: resources.h:292
 msgid "Categories"
 msgstr "Kategoriler"
 
@@ -1818,61 +1830,60 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Sertifika ve oturum verileri henüz bilinmiyor."
 
-#: resources.h:26
+#: resources.h:30
 msgid "Certificate details"
-msgstr "Sertifika detayları"
+msgstr "Sertifika ayrıntıları"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:31
 msgid "Certificate in chain:"
 msgstr "Sertifika bağlantısı:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:13 resources.h:41
 msgid "Certificate issuer"
 msgstr "Sertifikayı yayınlayan"
 
-#: resources.h:123
+#: resources.h:131
 msgid "Challenge:"
 msgstr "Kimlik Sor:"
 
-#: resources.h:132
+#: resources.h:140
 msgid "Change file attributes"
 msgstr "Dosya izinlerini değiştir"
 
-#: resources.h:591 resources.h:641
+#: resources.h:609 resources.h:661
 msgid "Change the file permissions."
 msgstr "Dosya izinlerini değiştir."
 
-#: resources.h:963
+#: resources.h:988
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr ""
-"Günlük dosyası ayarlarını değiştirmek için FileZilla'yı yeniden "
-"başlatmalısınız."
+"Günlük dosyası ayarlarını değiştirmek için FileZilla yeniden başlatılmalı."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Karakter kodlaması sorunu"
 
-#: resources.h:105
+#: resources.h:113
 msgid "Charset"
 msgstr "Karakter seti"
 
-#: resources.h:951
-msgid "Check for &beta versions and release candidates"
-msgstr "&Beta ve yayına hazırlanan sürümlere de bak"
-
-#: resources.h:550
+#: resources.h:566
 msgid "Check for &updates..."
 msgstr "Güncellemeleri &denetle..."
 
-#: resources.h:551
+#: resources.h:967
+msgid "Check for FileZilla &updates automatically:"
+msgstr "FileZilla güncellemeleri &kendiliğinden denetlensin:"
+
+#: resources.h:567
 msgid "Check for newer versions of FileZilla"
-msgstr "FileZilla'nın yeni sürümlerini denetle"
+msgstr "Yeni FileZilla sürümlerini denetle"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Güncellemeleri denetle"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Check for updates failed"
 msgstr "Güncellemeler denetlenemedi"
 
@@ -1880,21 +1891,21 @@
 msgid "Checking for correct external IP address"
 msgstr "Doğru dış IP adresi denetleniyor"
 
-#: resources.h:232
+#: resources.h:241
 msgid "Checking for updates"
 msgstr "Güncellemeler denetleniyor"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "İndirilen dosyanın sağlaması tutmuyor."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Varsayılan yerel klasörü seç"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Yerel klasörü seç"
 
@@ -1902,43 +1913,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "İri veri uygunsuz olarak sonlandırıldı"
 
-#: resources.h:18 resources.h:42
+#: resources.h:22 resources.h:50
 msgid "Cipher:"
 msgstr "Şifre:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:512 resources.h:686
 msgid "Cl&ose tab"
 msgstr "Sekmeyi &kapat"
 
-#: resources.h:861
+#: resources.h:881
 msgid "Classic"
 msgstr "Klasik"
 
-#: resources.h:286
+#: resources.h:295
 msgid "Clear &Site Manager entries"
 msgstr "&Site Yöneticisi kayıtlarını sil"
 
-#: resources.h:614
+#: resources.h:632
 msgid "Clear &layout cache"
 msgstr "Arayüzün önbelleğini temiz&le"
 
-#: resources.h:284
+#: resources.h:293
 msgid "Clear &quickconnect history"
 msgstr "&Hızlı bağlan geçmişini sil"
 
-#: resources.h:285
+#: resources.h:294
 msgid "Clear &reconnect information"
 msgstr "&Yeniden bağlanma bilgisini sil"
 
-#: resources.h:287
+#: resources.h:296
 msgid "Clear &transfer queue"
 msgstr "Ak&tarım kuyruğunu sil"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Eski hızlı bağlan bilgilerini sil"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:290 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1946,48 +1957,48 @@
 msgid "Clear private data"
 msgstr "Özel veriyi sil"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Hızlı bağlan çubuğunu temizle"
 
-#: resources.h:615
+#: resources.h:633
 msgid "Clear string coalescer"
 msgstr "Dizge birleştiriciyi sil"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
-msgstr "Yapılandırmanızı kaydetmek için \"Bitir\"e tıklayın."
+msgstr "Yapılandırmanızı kaydetmek için Bitir düğmesine tıklayın."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
-msgstr "FileZilla'nın son sürümü indirmek için \"Sonra\" tıklayın."
+msgstr "Son FileZilla sürümünü indirmek için ilerleyin."
 
-#: resources.h:347
+#: resources.h:356
 msgid "Client to server MAC:"
 msgstr "İstemciden sunucunun MAC adresine:"
 
-#: resources.h:345
+#: resources.h:354
 msgid "Client to server cipher:"
 msgstr "İstemciden sunucuya şifre:"
 
-#: resources.h:667
+#: resources.h:687
 msgid "Close &all other tabs"
 msgstr "Diğer tüm sekmeleri k&apat"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:518 ../../locales/../src/interface/Mainfrm.cpp:1247
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Close FileZilla"
 msgstr "FileZilla'yı kapat"
 
 #: ../../locales/../src/interface/cmdline.cpp:14
 msgid "Close all running instances of FileZilla"
-msgstr "FileZilla'nın çalışan bütün öğelerini kapat"
+msgstr "Çalışan tüm FileZilla kopyalarını kapat"
 
-#: resources.h:497
+#: resources.h:513
 msgid "Closes current tab"
 msgstr "Geçerli sekmeyi kapatır"
 
-#: resources.h:87
+#: resources.h:95
 msgid "Co&mments:"
 msgstr "No&tlar:"
 
@@ -1995,11 +2006,11 @@
 msgid "Column properties"
 msgstr "Sütun özellikleri"
 
-#: resources.h:354
+#: resources.h:363
 msgid "Column setup"
 msgstr "Sütun ayarları"
 
-#: resources.h:937
+#: resources.h:958
 msgid "Command and its arguments should be properly quoted."
 msgstr "Komut ve parametreleri düzgün yazılmış olmalı."
 
@@ -2007,7 +2018,7 @@
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:153
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:170
 msgid "Command failed"
-msgstr "Komut başarısız oldu"
+msgstr "Komut yürütülemedi"
 
 #: ../../locales/../src/engine/proxy.cpp:448
 msgid "Command not supported"
@@ -2015,12 +2026,12 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:183
 msgid "Command not supported by this protocol"
-msgstr "Komut bu protokol için desteklenmiyor"
+msgstr "Bu iletişim kuralı bu komutu desteklemiyor"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Komut:"
 
@@ -2028,24 +2039,24 @@
 msgid "Comment"
 msgstr "Not"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Common name:"
 msgstr "Genel ad:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:426
 #: ../../locales/../src/interface/netconfwizard.cpp:441
 msgid "Communication tainted by router or firewall"
-msgstr "İletişim yöneltici veya güvenlik duvarı tarafından bozuldu"
+msgstr "İletişim yöneltici ya da güvenlik duvarı tarafından bozuldu"
 
-#: resources.h:514 resources.h:645
+#: resources.h:530 resources.h:665
 msgid "Compare &modification time"
 msgstr "Son değişiklik za&manlarını karşılaştır"
 
-#: resources.h:513 resources.h:644
+#: resources.h:529 resources.h:664
 msgid "Compare file&size"
 msgstr "Do&sya boyutlarını karşılaştır"
 
-#: resources.h:917
+#: resources.h:938
 msgid "Comparison &threshold (in minutes):"
 msgstr "Karşılaş&tırma eşiği (dakika cinsinden):"
 
@@ -2053,60 +2064,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Karşılaştırma eşiğinin 0 ile 1.440 dakika arasında olması gerekir."
 
-#: resources.h:160
+#: resources.h:168
 msgid "Compiled for:"
 msgstr "Çalışacağı ortam:"
 
-#: resources.h:161
+#: resources.h:169
 msgid "Compiled on:"
 msgstr "Derleme ortamı:"
 
-#: resources.h:163
+#: resources.h:171
 msgid "Compiled with:"
 msgstr "Birlikte derlendi:"
 
-#: resources.h:164
+#: resources.h:172
 msgid "Compiler flags:"
 msgstr "Derleyici bayrakları:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Sıkıştırılmış"
 
-#: resources.h:802
+#: resources.h:822
 msgid "Concurrent transfers"
 msgstr "Eşzamanlı aktarım"
 
-#: resources.h:224 resources.h:438
+#: resources.h:233 resources.h:447
 msgid "Conditions are c&ase sensitive"
 msgstr "Kısıtlar büyük küçük h&arf duyarlıdır"
 
-#: resources.h:710
+#: resources.h:730
 msgid "Configuration test"
 msgstr "Yapılandırma sınaması"
 
-#: resources.h:684
+#: resources.h:704
 msgid "Configure passive mode"
-msgstr "Pasif modu yapılandır"
+msgstr "Pasif kipi yapılandır"
 
-#: resources.h:700
+#: resources.h:720
 msgid "Configure port range"
-msgstr "Port aralığını yapılandır"
+msgstr "Kapı aralığını ayarla"
 
-#: resources.h:468
+#: resources.h:477
 msgid "Configuring FileZilla and your network"
 msgstr "Filezilla ve ağınızın yapılandırılması"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Silme işlemini onaylayın"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../locales/../src/interface/LocalListView.cpp:2011
+#: ../../locales/../src/interface/LocalListView.cpp:2131
+#: ../../locales/../src/interface/RemoteListView.cpp:1723
+#: ../../locales/../src/interface/RemoteListView.cpp:2652
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
 msgid "Confirmation needed"
 msgstr "Onay gerekiyor"
 
@@ -2114,42 +2125,42 @@
 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:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
-msgstr "Proxy ayarlarını atlayarak bağlan"
+msgstr "Vekil sunucu ayarlarını atlayarak bağlan"
 
 #: ../../locales/../src/interface/cmdline.cpp:8
 msgid "Connect to specified Site Manager site"
 msgstr "Site Yöneticisinde belirtilen siteye bağlan"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Bağlandı"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1458
 msgid "Connecting"
 msgstr "Bağlanıyor"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "%s sunucusuna bağlanıyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
-msgstr "%s sunucusuna proxy üzerinden bağlanıyor"
+msgstr "%s sunucusuna vekil sunucu ile bağlanıyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "%s bağlantısı kuruluyor..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Sunucuya bağlanıyor"
 
@@ -2157,20 +2168,20 @@
 msgid "Connection"
 msgstr "Bağlantı"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1074
 msgid "Connection attempt failed"
-msgstr "Bağlantı denemesi başarısız"
+msgstr "Bağlantı kurulamadı"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
-msgstr "\"%s\" ile bağlantı denemesi başarısız oldu, sonraki adres deneniyor."
+msgstr "\"%s\" ile bağlantı kurulamadı, sonraki adres deneniyor."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
-msgstr "\"%s\" ile bağlantı denemesi başarısız oldu."
+msgstr "\"%s\" ile bağlantı kurulamadı."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:186
 #: ../../locales/../src/engine/engineprivate.cpp:320
@@ -2181,12 +2192,12 @@
 msgid "Connection closed"
 msgstr "Bağlantı kapandı"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Bağlantı sunucu tarafından kapatıldı"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Bağlandı, TLS yükleniyor..."
@@ -2195,7 +2206,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "Bağlandı, HTTP isteği gönderiliyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "Bağlandı, hoşgeldin iletisi bekleniyor..."
 
@@ -2211,21 +2222,21 @@
 msgid "Connection refused"
 msgstr "Bağlantı reddedildi"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Bağlantı zaman aşımına uğradı"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Bağlantı zaman aşımına uğradı."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "Sunucuyla bağlantı kesildi."
 
 #: ../../locales/../src/engine/proxy.cpp:188
 msgid "Connection with proxy established, performing handshake..."
-msgstr "Proxy ile bağlantı sağlandı, iletişim kuruluyor..."
+msgstr "Vekil sunucu ile bağlantı sağlandı, iletişim kuruluyor..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:561
 msgid "Connection with server got closed prematurely."
@@ -2239,27 +2250,23 @@
 msgid "Convert keyfile"
 msgstr "Anahtar dosyasını dönüştür"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "Kop&yala"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "%d / (%s) kopyala"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "%s kopyası"
 
-#: resources.h:589 resources.h:639
+#: resources.h:607 resources.h:659
 msgid "Copy the URLs of the selected items to clipboard."
-msgstr "Seçili ögelerin web adreslerini panoya kopyala."
+msgstr "Seçili ögelerin İnternet adreslerini panoya kopyala."
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:206
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "%s bağlantısı kabul edilemedi"
@@ -2269,35 +2276,39 @@
 msgid "Could not add connection to Site Manager"
 msgstr "Bağlantı Site Yöneticisine eklenemedi"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "İşlem tamamlanamadı"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Sunucuyla bağlantı kurulamıyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "%s sunucusuyla bağlantı kurulamadı"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
-msgstr "Komut, sunucu şifrelemesine dönüştürülemedi"
+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
 msgid "Could not convert private key"
 msgstr "Özel anahtar dönüştürülemedi"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
-msgstr "Web adresleri kopyalanamadı"
+msgstr "İnternet adresleri kopyalanamadı"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Veri kopyalanamadı"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2574
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2307,11 +2318,11 @@
 "Ya kabuk eklentileri yüklü değil ya da dosyaları bir Gezgin penceresine "
 "sürüklemediniz."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "Sunucu ile bağlantı kurulamadı"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2319,28 +2330,27 @@
 "variable."
 msgstr ""
 "FileZilla kaynak dosyaları bulunamıyor, FileZilla kapatılacak.\n"
-"FileZilla'nın veri klasörünü '--datadir <custompath>' komut satırı "
-"seçeneğini ya da FZ_DATADIR ortam değişkenini değiştirerek "
-"ayarlayabilirsiniz."
+"FileZilla veri klasörünü '--datadir <custompath>' komut satırı seçeneği ile "
+"ya da FZ_DATADIR ortam değişkenini değiştirerek ayarlayabilirsiniz."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "Özel giriş yapma sıralaması üretilemedi."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1081
 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:982
+#: ../../locales/../src/engine/tlssocket.cpp:1056
 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:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Uzaktaki yolun tamamı okunamadı."
 
@@ -2349,15 +2359,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "fzputtygen yanıt vermiyor."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2635
 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:935
+#: ../../locales/../src/engine/tlssocket.cpp:1009
 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:928
+#: ../../locales/../src/engine/tlssocket.cpp:1002
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2385,7 +2395,7 @@
 msgid "Could not load private key"
 msgstr "Özel anahtar yüklenemedi"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2395,7 +2405,7 @@
 "Uzaktaki '%s' klasörüne karşı gelen yerel klasöre geçilemedi.\n"
 "Eşzamanlı taramayı devre dışı bırakıp uzak klasörü değiştirmek ister misiniz?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2415,9 +2425,9 @@
 "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:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3086
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Pano açılamadı"
 
@@ -2432,11 +2442,11 @@
 msgid "Could not parse remote path."
 msgstr "Uzaktaki yola gidilemedi."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Sunucu adresi çözülemedi:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Soketten okuyamadı: %s"
@@ -2445,12 +2455,12 @@
 msgid "Could not read server item."
 msgstr "Sunucu nesnesi okunamıyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Dosya içinde %s satırına ulaşılamıyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "Dosyanın sonuna erişilemiyor"
 
@@ -2458,67 +2468,67 @@
 msgid "Could not send command to fzputtygen."
 msgstr "fzputtygen e komut gönderilemedi."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "IO işlemi başlatılamamakta:"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
-msgstr "Proxy is iletişim kurulamadı: %s"
+msgstr "Vekil sunucu ile iletişim kurulamadı: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1125
+#: ../../locales/../src/interface/QueueView.cpp:1130
 msgid "Could not start transfer"
 msgstr "Aktarım işlemi başlatılamadı"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
 "s"
 msgstr ""
-"\"%s\" yazılamıyor, Site Yöneticisi'nde yapılan değişiklikler %s e "
-"kaydedilemeyecek."
+"\"%s\" dosyasına yazılamıyor, Site Yöneticisi'nde yapılan değişiklikler "
+"kaydedilemeyecek: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
-msgstr "\"%s\" yazılamıyor, yer imi kaydedilemedi: %s"
+msgstr "\"%s\" dosyasına yazılamıyor, yer imi kaydedilemedi: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
-msgstr "\"%s\" yazılamıyor, küresel yer imleri kaydedilemedi: %s"
+msgstr "\"%s\" dosyasına yazılamıyor, küresel yer imleri kaydedilemedi: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1989
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
 "%s"
 msgstr ""
-"\"%s\" yazılamıyor, aktarım kuyruğu kaydedilemez.\n"
+"\"%s\" dosyasına yazılamıyor, aktarım kuyruğu kaydedilemedi.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, 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 %s dosyasına verilemedi"
+msgstr "\"%s\" dosyasına yazılamıyor, seçilen siteler verilemedi: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
-msgstr "\"%s\" yazılamıyor: %s"
+msgstr "\"%s\" dosyasına yazılamıyor: %s"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
 msgstr "%s anahtar dosyasına yazılamadı"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1119
 msgid "Could not write to local file"
 msgstr "Yerel dosyaya yazılamıyor"
 
@@ -2528,39 +2538,51 @@
 msgid "Could not write to log file: %s"
 msgstr "%s günlük dosyasına yazılamıyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "%s soketine yazılamıyor"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Country:"
 msgstr "Ülke:"
 
-#: resources.h:618
+#: resources.h:636
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
-"FileZilla'yı anlık olarak çökertir. Sadece istisna yakalayıcı ile hata "
-"ayıklamak için kullanılır"
+"FileZilla'yı hemen çökertir. Yalnız istisna yakalayıcı ile hata ayıklamak "
+"için kullanılır"
+
+#: resources.h:599
+msgid "Crea&te new file"
+msgstr "&Yeni bir dosya oluştur"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "Create a new subdirectory in the current directory"
 msgstr "Geçerli klasörde yeni bir alt klasör oluştur"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:600
+msgid "Create a new, empty file in the current directory"
+msgstr "Geçerli klasörde yeni bir boş dosya oluşturur"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Klasör oluştur"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Create empty file"
+msgstr "Boş dosya oluştur"
+
+#: ../../locales/../src/interface/QueueView.cpp:1531
 msgid "Creating directory"
 msgstr "Klasör oluşturuluyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "'%s' klasörü oluşturuluyor..."
@@ -2578,7 +2600,7 @@
 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:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2599,52 +2621,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "Geçerli aktarım tipi ikili olarak ayarlandı."
 
-#: resources.h:773 resources.h:893
+#: resources.h:793 resources.h:914
 msgid "Cus&tom"
 msgstr "Ö&zel"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Özel süzme seti"
 
-#: resources.h:376 resources.h:377
+#: resources.h:385 resources.h:386
 msgid "Custom server"
 msgstr "Özel sunucu"
 
-#: resources.h:385
+#: resources.h:394
 msgid "D&ata type"
 msgstr "V&eri tipi"
 
-#: resources.h:900
+#: resources.h:921
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Ondalık ön&eklerini kullanan SI sembolleri (e.g. 1 KB = 1.000 bayt)"
 
-#: resources.h:100
+#: resources.h:108
 msgid "D&efault"
 msgstr "V&arsayılan"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:602 resources.h:654 resources.h:684
 msgid "D&elete"
 msgstr "S&il"
 
-#: resources.h:205
+#: resources.h:214
 msgid "D&isable all"
 msgstr "Tü&mü devre dışı"
 
-#: resources.h:872
+#: resources.h:892
 msgid "D&o not save passwords"
 msgstr "Par&olaları kaydetme"
 
-#: resources.h:924
+#: resources.h:945
 msgid "D&ouble-click action on directories:"
 msgstr "Klasörlerlere çift &tıklayınca ne olsun:"
 
+#: resources.h:227 resources.h:426
+msgid "D&uplicate"
+msgstr "Ç&oğalt"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS benzeri sanal yollar"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid "Dangerous filetype"
 msgstr "Tehlikeli dosya tipi"
 
@@ -2652,22 +2678,22 @@
 msgid "Data"
 msgstr "Veri"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Veri soketi çok erken kapandı."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Tarih"
 
-#: resources.h:884
+#: resources.h:905
 msgid "Date formatting"
 msgstr "Tarih biçimi"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:128
 msgid "Date/time format"
-msgstr "Tarih / Zaman biçimi"
+msgstr "Tarih/zaman biçimi"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:88
 #: ../../locales/../src/interface/fileexistsdlg.cpp:107
@@ -2680,11 +2706,11 @@
 msgid "Debug"
 msgstr "Hata ayıklama"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Debugging settings"
 msgstr "Hata ayıklama ayarları"
 
-#: resources.h:91
+#: resources.h:99
 msgid "Default &local directory:"
 msgstr "Varsayılan yere&l klasör:"
 
@@ -2692,19 +2718,19 @@
 msgid "Default (Autodetect)"
 msgstr "Varsayılan (Kendiliğinden algıla)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Varsayılan editör düzgün yazılmamış."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:264 resources.h:286 resources.h:875
 msgid "Default file exists action"
 msgstr "Varsayılan dosya var işlemi"
 
-#: resources.h:93
+#: resources.h:101
 msgid "Default r&emote directory:"
 msgstr "Varsayılan &uzak klasör:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2716,15 +2742,15 @@
 msgid "Default system language"
 msgstr "Varsayılan sistem dili"
 
-#: resources.h:678
+#: resources.h:698
 msgid "Default transfer mode:"
-msgstr "Varsayılan aktarım modu:"
+msgstr "Varsayılan aktarım kipi:"
 
-#: resources.h:824
+#: resources.h:844
 msgid "Default transfer type:"
 msgstr "Varsayılan aktarım tipi:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:717 resources.h:780
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Varsayılan: http://ip.filezilla-project.org/ip.php"
 
@@ -2747,57 +2773,57 @@
 "Bir önceki bağlantının kurulamaması nedeniyle bağlantı %d saniye "
 "bekletiliyor..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "Site Yöneticisi kaydını sil"
 
-#: resources.h:635 resources.h:656
+#: resources.h:655 resources.h:676
 msgid "Delete selected directory"
 msgstr "Seçili klasörü sil"
 
-#: resources.h:571 resources.h:585
+#: resources.h:587 resources.h:603
 msgid "Delete selected files and directories"
 msgstr "Seçili dosya ve klasörleri sil"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Klasörler siliniyor"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "Birden fazla bağlantısız klasörü silme işlemi henüz desteklenmiyor"
 
-#: resources.h:453
+#: resources.h:462
 msgid "Deleting symbolic link"
 msgstr "Sembolik bağlantı siliniyor"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Masaüstü"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:32 resources.h:185
 msgid "Details"
-msgstr "Detaylar"
+msgstr "Ayrıntılar"
 
-#: resources.h:189
+#: resources.h:198
 msgid "Details for new key:"
-msgstr "Yeni anahtarın detayları:"
+msgstr "Yeni anahtarın ayrıntıları:"
 
-#: resources.h:227
+#: resources.h:236
 msgid "Dire&ctories"
 msgstr "K&lasörler"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Yön"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Klasör"
 
-#: resources.h:642 resources.h:915 resources.h:998
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:662 resources.h:936 resources.h:1024
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "Directory comparison"
 msgstr "Klasör karşılaştırma"
 
@@ -2809,17 +2835,17 @@
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr "Günlük dosyasını içeren klasör yok veya dosya adı geçersiz."
+msgstr "Günlük dosyasını içeren klasör yok ya da dosya adı geçersiz."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
 msgstr "Kullanıcı klasör listelemeyi durdurdu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2376
 msgid "Directory listing failed"
 msgstr "Klasör listelenemedi"
 
-#: resources.h:198
+#: resources.h:207
 msgid "Directory listing filters"
 msgstr "Klasör listeleme süzgeçleri"
 
@@ -2827,66 +2853,65 @@
 msgid "Directory listing successful"
 msgstr "Klasör listelendi"
 
-#: resources.h:208
+#: resources.h:217
 msgid "Disa&ble all"
 msgstr "Tümü &devre dışı"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:669
+#: ../../locales/../src/interface/Mainfrm.cpp:683
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 "Doğru klasör içeriğini göremiyorsanız bu seçeneği tekrar devre dışı bırakın."
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Disconnect from server"
 msgstr "Sunucu ile bağlantıyı kes"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1072
+#: ../../locales/../src/interface/QueueView.cpp:1116
 msgid "Disconnected from server"
 msgstr "Sunucu ile bağlantı kesildi"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "%s sunucusu ile bağlantı kesildi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1433
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Önceki sunucu ile bağlantı kesiliyor"
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnects from the currently visible server"
 msgstr "Geçerli görünen sunucu bağlantısını kes"
 
-#: resources.h:556
+#: resources.h:572
 msgid "Display about dialog"
 msgstr "Hakkında penceresini göster"
 
-#: resources.h:933
+#: resources.h:954
 msgid "Do &not use default editor"
 msgstr "Varsayılan düzenleyiciyi kulla&nma"
 
-#: resources.h:610
+#: resources.h:628
 msgid "Do &nothing"
 msgstr "&Hiç bir şey yapma"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2894,10 +2919,10 @@
 "Beta sürümlerine de bakmak istediğinize emin misiniz??\n"
 "Yeni özellikleri sınamak istemediğiniz sürece, kararlı sürümü kullanın."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1250
+#: ../../locales/../src/interface/Mainfrm.cpp:1274
 msgid "Do you really want to close FileZilla?"
-msgstr "FileZilla'yı gerçekten kapatmak istiyor musunuz?"
+msgstr "FileZilla kapatılsın mı?"
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
@@ -2910,7 +2935,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Site Yöneticisi kayıtlarını silmek istediğinizden emin misiniz?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Seçili kayıdı silmek istiyor musunuz?"
 
@@ -2918,32 +2943,32 @@
 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:593
+#: ../../locales/../src/interface/Mainfrm.cpp:599
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr "'%s' 'i sunucuya gerçekten göndermek istiyor musunuz?"
+msgstr "'%s' sunucuya gönderilsin mi?"
 
-#: resources.h:466
+#: resources.h:475
 msgid "Documentation"
 msgstr "Belgeler"
 
-#: resources.h:699
+#: resources.h:719
 msgid "Don't use external IP address on &local connections."
 msgstr "Yere&l bağlantılar için dış IP adresini kullanma."
 
-#: resources.h:835
+#: resources.h:855
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "Noktadosyalar .htaccess gibi adı nokta ile başlayan dosyalardır"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Double-click action"
 msgstr "Çift tıklayınca ne olsun?"
 
-#: resources.h:362
+#: resources.h:371
 msgid "Download"
 msgstr "İndir"
 
-#: resources.h:482 resources.h:811
+#: resources.h:491 resources.h:831
 msgid "Download &limit:"
 msgstr "Karşıdan indirme &sınırı:"
 
@@ -2956,102 +2981,114 @@
 msgid "Download limit: none"
 msgstr "İndirme sınırı: yok"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:450 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Arama sonuçlarını indir"
 
-#: resources.h:629
+#: resources.h:649
 msgid "Download selected directory"
 msgstr "Seçili klasörü indir"
 
-#: resources.h:575
+#: resources.h:591
 msgid "Download selected files and directories"
 msgstr "Seçili dosya ve klasörleri indir"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1074
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"İndirme hızı: %s/s\n"
+"Yükleme hızı: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "İndiriliyor"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "%s indiriliyor"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Arama sonuçları indiriliyor"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr ""
-"Aynı anda çalışan farklı FileZilla'lar arasında Sürükle&Bırak henüz "
-"desteklenmiyor."
+"Henüz farklı FileZilla kopyaları arasında sürükleyip bırakma desteklenmiyor."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "Farklı sunucular arasında Sürükle&Bırak henüz desteklenmiyor."
 
-#: resources.h:204
+#: resources.h:85
+msgid "Dupl&icate"
+msgstr "Çoğa&lt"
+
+#: resources.h:213
 msgid "E&nable all"
 msgstr "Tümü&nü etkinleştir"
 
-#: resources.h:561 resources.h:578
+#: resources.h:577 resources.h:594
 msgid "E&nter directory"
 msgstr "K&lasöre gir"
 
-#: resources.h:141
+#: resources.h:149
 msgid "E&xecute"
 msgstr "Ç&alıştır"
 
-#: resources.h:501
+#: resources.h:517
 msgid "E&xit"
 msgstr "FileZilla'yı &kapat"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "E-Mail:"
 msgstr "E-posta:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Her süzgeç en az bir kısıta sahip olmalı."
 
-#: resources.h:230
+#: resources.h:239
 msgid "Edit filters"
 msgstr "Süzgeçleri düzenle"
 
-#: resources.h:566
+#: resources.h:582
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Dosyayı ayarlanmış olan düzenleyici ile düzenle ve değişiklikleri sunucuya "
 "yükle."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1956
+#: ../../locales/../src/interface/LocalListView.cpp:1967
 msgid "Editing failed"
 msgstr "Düzenleme yapılamadı"
 
-#: resources.h:881
+#: resources.h:902
 msgid "Email:"
 msgstr "Eposta:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "Empty command"
 msgstr "Boş komut"
 
@@ -3059,7 +3096,7 @@
 msgid "Empty command."
 msgstr "Boş komut."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Empty directory listing"
 msgstr "Klasör listesi boş"
 
@@ -3071,102 +3108,115 @@
 msgid "Empty file extension."
 msgstr "Boş dosya uzantısı."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Süzgeç adını boş bırakamazsınız."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Boş işim"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Boş ifade."
 
-#: resources.h:207
+#: resources.h:216
 msgid "En&able all"
 msgstr "&Tümünü etkinleştir"
 
-#: resources.h:820
+#: resources.h:840
 msgid "Enable invalid character &filtering"
 msgstr "Geçersiz karakter &süzgecini etkinleştir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Şifreli"
 
-#: resources.h:344
+#: resources.h:353
 msgid "Encryption"
 msgstr "Şifreleme"
 
-#: resources.h:336
+#: resources.h:345
 msgid "Encryption details"
-msgstr "Şifreleme detayları"
+msgstr "Şifreleme ayrıntıları"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Karşılaştırmayı bitir ve sıralama düzenini değiştir?"
 
-#: resources.h:542
+#: resources.h:558
 msgid "Enter &custom command..."
 msgstr "Özel &komut yaz..."
 
-#: resources.h:486
+#: resources.h:495
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Sınırsız hız için 0 yazın."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid "Enter command"
 msgstr "Komutu yazın"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid "Enter custom command"
 msgstr "Özel komutu yazın"
 
-#: resources.h:925
+#: resources.h:946
 msgid "Enter directory"
 msgstr "Klasöre gir"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Süzgeç adı yazın"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Süzmeseti için bir ad yazın"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Süzme seti için ad yazın"
 
-#: resources.h:116
+#: resources.h:124
 msgid "Enter password"
 msgstr "Parolayı yazın"
 
-#: resources.h:562 resources.h:579
+#: resources.h:578 resources.h:595
 msgid "Enter selected directory"
 msgstr "Seçili klasöre gir"
 
-#: resources.h:719
+#: resources.h:739
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Sunucu adresini yazın.\n"
-"Sunucu protokolünü belirtmek için, sunucu adının önüne protokol belirtecini "
-"ekleyin. Eğer protokol belirtilmemişse, varsayılan protokol (ftp://) "
-"kullanılacaktır.\n"
-"Aynı zamanda tam URL'leri protokol://kullanıcı:parola@sunucu:port şekilnde "
-"yazabilirsiniz, bu durumda diğer alanlardaki değerlerin üzerine yazılacaktır."
+"Sunucu iletişim kuralını belirtmek için, sunucu adının önüne iletişim kuralı "
+"belirtecini ekleyin. İletişim kuralı belirtilmemişse, varsayılan iletişim "
+"kuralı (ftp://) kullanılır.\n"
+"Aynı zamanda tam İnternet adresini, iletişimkuralı://kullanıcı:parola@sunucu:"
+"kapı şeklinde yazabilirsiniz. Bu durumda diğer alanlardaki değerler hesaba "
+"katılmaz.\n"
+"\n"
+"Desteklenen iletişim kuralları:\n"
+"- ftp:// normal FTP için\n"
+"- sftp:// SSH dosya aktarım iletişim kuralı için\n"
+"- ftps:// TLS (örtülü) üzerinden FTP için\n"
+"- ftpes:// TLS (açıkta) üzerinden FTP"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3177,13 +3227,13 @@
 "'%s' dosyası için parolayı yazın.\n"
 "Lütfen dikkat: Dönüştürülecek olan dosya parola korumalı olmayacak."
 
-#: resources.h:723
+#: resources.h:743
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
 msgstr ""
-"Sunucunun dinlediği portu yazın.\n"
-"Varsayılan portlar FTP için 21, SFTP için 22'dir."
+"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:63
 msgid "Enter username and password"
@@ -3199,7 +3249,7 @@
 msgid "Error importing"
 msgstr "Alırken hata"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2056
 msgid "Error loading queue"
 msgstr "Kuyruk yüklenirken hata oluştu"
 
@@ -3208,27 +3258,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:214
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1969
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "XML dosyasının okunmasında hata"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "Error saving queue"
 msgstr "Kuyruk kaydedilirken hata oluştu"
 
@@ -3239,74 +3289,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1990
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "XML dosyasının yazılmasında hata"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "Hata, dosya adı anlaşılamadı."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "Hata, yerel dosya var fakat silinemiyor"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Hata:"
 
-#: resources.h:478
+#: resources.h:487
 msgid "Establish connection in a new tab"
 msgstr "Bağlantıyı yeni sekmede aç"
 
-#: resources.h:944
+#: resources.h:971
+msgid "Every month"
+msgstr "Ayda bir"
+
+#: resources.h:970
+msgid "Every two weeks"
+msgstr "İki haftada bir"
+
+#: resources.h:965
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Örnek: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:903
+#: resources.h:924
 msgid "Examples"
 msgstr "Örnekler"
 
-#: resources.h:145
+#: resources.h:153
 msgid "Exe&cute"
 msgstr "Çal&ıştır"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Çalıştırılabilir"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1835
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Kullandığınız uygulama sürüm bilgisi içermiyor, güncelleme denetimi "
 "yapılamıyor."
 
-#: resources.h:862
+#: resources.h:882
 msgid "Explorer"
 msgstr "Gezgin"
 
-#: resources.h:294
+#: resources.h:303
 msgid "Export &Queue"
 msgstr "&Aktarım kuyruğunu ver"
 
-#: resources.h:293
+#: resources.h:302
 msgid "Export &Settings"
 msgstr "Ayarları &Ver"
 
-#: resources.h:290
+#: resources.h:299
 msgid "Export settings"
 msgstr "Ayarları ver"
 
-#: resources.h:219
+#: resources.h:228
 msgid "F&ilter name:"
 msgstr "Sü&zgeç adı:"
 
@@ -3314,7 +3372,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - Dosya aktarımı iletişim kuralı"
 
@@ -3326,25 +3384,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - Güvenliksiz dosya aktarımı iletişim kuralı"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP motoru başlatılamadı, bağlanamıyor"
 
-#: resources.h:747
+#: resources.h:767
 msgid "FTP Keep-alive"
 msgstr "FTP Canlı-kal"
 
-#: resources.h:767
+#: resources.h:787
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
-msgstr "FTP Proxy"
+msgstr "FTP Vekil Sunucusu"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:20
 msgid "FTP URL"
-msgstr "FTP URL"
+msgstr "FTP İnternet Adresi"
 
-#: resources.h:675
+#: resources.h:695
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3354,74 +3412,74 @@
 
 #: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
-msgstr "FTPES - FTP üzerinden açık TLS/SSL"
+msgstr "FTPES - FTP üzerinden açıkta TLS/SSL"
 
 #: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
-msgstr "FTPS - FTP üzerinden kapalı TLS/SSL"
+msgstr "FTPS - FTP üzerinden örtülü TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/LocalListView.cpp:548
+#: ../../locales/../src/interface/LocalListView.cpp:628
+#: ../../locales/../src/interface/LocalListView.cpp:2252
+#: ../../locales/../src/interface/LocalTreeView.cpp:900
 #: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Klasör değiştirilemedi"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
-msgstr "Dil değişimi başarısız"
+msgstr "Dil değiştirilemedi"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
-msgstr "FileZilla'nın güncel sürümü denetlenemedi."
+msgstr "Güncel FileZilla sürümü denetlenemedi."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
-msgstr "Siteleri kopyalama veya taşıma başarısız oldu"
+msgstr "Siteler kopyalanamadı ya da taşınamadı"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr "Xml dosyasının yedeği alınamadı"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "Dinleme soketi oluşturulamadı, iptal ediliyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "Aktif mod aktarımı için dinleme soketi oluşturulamadı"
+msgstr "Aktif kip aktarımı için dinleme soketi oluşturulamadı"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
-msgstr "FileZilla'nın son sürümü indirilemedi."
+msgstr "Son FileZilla sürümü indirilemedi."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "'Belgelerim' klasörüne erişilemedi"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
-msgstr "Masaüstü'nün veri yolu alınmadı"
+msgstr "Masaüstü yolu alınamadı"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "Veri bağlantısının denklik adresi alınamadı, bağlantı kapandı."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "FTP motoru başlatılamadı"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "TLS başlatılamadı"
@@ -3433,26 +3491,26 @@
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
-msgstr "Kişisel anahtar yükleme başarısız: %s"
+msgstr "Kişisel anahtar yüklenemedi: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "\"%s\" ekleme/yazma için açılamıyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "\"%s\" okuma için açılamıyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "\"%s\" yazma için açılamıyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Döndürülen yol çözülemedi."
 
@@ -3460,9 +3518,9 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Kök güvenlik sertifikası işlenemedi."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
-msgstr "Veri alımı başarısız"
+msgstr "Veri alınamadı"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:194
 msgid "Failed to retrieve directory listing"
@@ -3470,13 +3528,13 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "Dış IP adresi alımı başarısız, iptal ediliyor"
+msgstr "Dış IP adresi alınamadı, iptal ediliyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Dış IP adresi okunamadı, yerel IP deneniyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Yerel IP adresi okunamadı."
 
@@ -3490,15 +3548,15 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:307
 msgid "Failed to send command."
-msgstr "Komut gönderimi başarısız."
+msgstr "Komut gönderilemedi."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, 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:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3506,25 +3564,25 @@
 "Dil %s (%s) olarak değiştirilemedi, sistem varsayılan dili kullanılacak (%s, "
 "%s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, 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:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, 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:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, 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:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Dil %s olarak değiştirilemiyor, sistem varsayılan dil kullanılacak."
@@ -3533,14 +3591,14 @@
 msgid "Failed to validate settings"
 msgstr "Ayarların geçerliliği sağlanamadı"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:944
 msgid "Failed to verify peer certificate"
 msgstr "Denklik sertifikası doğrulanamadı"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
-msgstr "%s dosyasına yazım başarısız"
+msgstr "%s dosyasına yazılamadı"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
@@ -3550,21 +3608,19 @@
 msgid "Failed transfers"
 msgstr "Aktarılamayanlar"
 
-#: resources.h:690
+#: resources.h:710
 msgid "Fall back to active mode"
-msgstr "Aktif moda başvur"
+msgstr "Aktif kipe başvur"
 
-#: resources.h:369
+#: resources.h:378
 msgid "Fil&e:"
 msgstr "Dos&ya:"
 
-#: resources.h:226
+#: resources.h:235
 msgid "Fil&es"
 msgstr "Dos&yalar"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "Dosya"
 
@@ -3580,7 +3636,7 @@
 msgid "File editing"
 msgstr "Dosya düzenleme"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "File exists"
 msgstr "Dosya var"
 
@@ -3588,7 +3644,7 @@
 msgid "File exists action"
 msgstr "Dosya var işlemi"
 
-#: resources.h:305
+#: resources.h:314
 msgid "File has changed"
 msgstr "Dosya değiştirildi"
 
@@ -3596,14 +3652,14 @@
 msgid "File lists"
 msgstr "Dosya listeleri"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "Dosya bulunamadı"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "File search"
 msgstr "Dosya ara"
 
@@ -3638,102 +3694,101 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Dosya aktarıldı, %s/%s kadarı aktarıldı"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1249
 msgid "File transfers still in progress."
 msgstr "Dosya aktarımı henüz bitmedi."
 
-#: resources.h:387
+#: resources.h:396
 msgid "File would transfer with ASCII data type."
 msgstr "Dosya ASCII veri tipiyle aktarılsa olurdu."
 
-#: resources.h:388
+#: resources.h:397
 msgid "File would transfer with binary data type."
 msgstr "Dosya ikili veri tipiyle aktarılsa olurdu."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla Hatası"
 
-#: resources.h:712
+#: resources.h:732
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr ""
 "FileZilla artık tüm ayarlarının doğru yapılıp yapılmadığını sınayabilir."
 
-#: resources.h:477
+#: resources.h:486
 msgid "FileZilla is already connected to a server."
 msgstr "Filezilla şu anda bir sunucuya bağlı."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla köşk modunda çalışıyor.\n"
-"'Normal' ve 'Hesap' giriş tipleri bu modda kullanılamaz."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
-"Dil değişikliğinin etkili olabilmesi için FileZilla'yı yeniden "
-"başlatmalısınız."
+"Dil değişikliğinin etkili olabilmesi için FileZilla yeniden başlatılmalı."
 
-#: resources.h:517
+#: resources.h:978
+msgid "FileZilla updates"
+msgstr "FileZilla güncellemeleri"
+
+#: resources.h:533
 msgid "Filelist status &bars"
 msgstr "Dosya listesi durum &çubukları"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "Dosya Adı"
 
-#: resources.h:510
+#: resources.h:526
 msgid "Filename &filters..."
 msgstr "&Dosya adı süzgeçleri..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Dosya adı %s klasörü için ve %s dosya adı için oluşturulamıyor"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1919
 msgid "Filename invalid"
 msgstr "Dosya adı geçersiz"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Dosya adı şu karakterleri barındıramaz: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Dosya adı değiştirilmedi"
 
-#: resources.h:307 resources.h:957
+#: resources.h:316 resources.h:982
 msgid "Filename:"
 msgstr "Dosya Adı:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1364
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "Dosya adları şu karakterleri barındıramaz: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1339
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "Dosya adları şu karakterleri barındıramaz: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:344
 msgid "Files currently being edited"
 msgstr "Şu an düzenlenen dosyalar"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "Boyut"
@@ -3742,88 +3797,88 @@
 msgid "Filesize format"
 msgstr "Dosya boyutu biçimi"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Tür"
 
-#: resources.h:945
+#: resources.h:966
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Dosya türü ilişkileri"
 
-#: resources.h:225
+#: resources.h:234
 msgid "Filter applies to:"
 msgstr "Süzgecin uygulanacağı:"
 
-#: resources.h:819
+#: resources.h:839
 msgid "Filter invalid characters in filenames"
 msgstr "Dosya adlarındaki geçersiz karakterleri süz"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "Aynı adlı bir süzgeç var"
 
-#: resources.h:221
+#: resources.h:230
 msgid "Filter out items matching all of the following"
 msgstr "Şunların tümüne uyan ögeleri süz"
 
-#: resources.h:222
+#: resources.h:231
 msgid "Filter out items matching any of the following"
 msgstr "Şunların herhangi birine uyan ögeleri süz"
 
-#: resources.h:223
+#: resources.h:232
 msgid "Filter out items matching none of the following"
 msgstr "Şunların hiçbirine uymayan ögeleri süz"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Aynı adlı bir süzme seti var"
 
-#: resources.h:995
+#: resources.h:1021
 msgid "Filter the directory listings"
 msgstr "Klasör listesini süz"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Süzgeç geçersiz"
 
-#: resources.h:9 resources.h:33
+#: resources.h:9 resources.h:37
 msgid "Fingerprint (MD5):"
 msgstr "Parmak İzi (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (SHA-1):"
 msgstr "Parmak İzi (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:188 resources.h:201
 msgid "Fingerprint:"
 msgstr "Parmak İzi:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:42
 msgid "Firewall and router configuration wizard"
-msgstr "Güvenlik duvarı ve yöneltici ayar sihirbazı"
+msgstr "Güvenlik duvarı ve yöneltici ayar yardımcısı"
 
-#: resources.h:730
+#: resources.h:750
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr ""
 "Bu seçeneklerin ne işe yaradığını daha iyi anlamak için, lütfen ağ "
-"yapılandırma sihirbazını çalıştırın."
+"yapılandırma yardımcısını çalıştırın."
 
-#: resources.h:707
+#: resources.h:727
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr "Güvenilirlik açısından en az 10 portluk bir aralık belirtilmeli."
+msgstr "Güvenilirlik açısından en az 10 kapılık bir aralık belirtilmeli."
 
-#: ../../locales/../src/interface/Options.cpp:213
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3831,33 +3886,33 @@
 "Bu oturum süresince varsayılan ayarlar kullanılacak ve yapılan değişiklikler "
 "kalıcı olmayacak."
 
-#: resources.h:109
+#: resources.h:117
 msgid "Force &UTF-8"
-msgstr "UTF-8i &zorla"
+msgstr "UTF-8 &dayat"
 
-#: resources.h:544
+#: resources.h:560
 msgid "Force showing &hidden files"
 msgstr "&Gizli dosyaları göster"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Force showing hidden files"
 msgstr "Gizli dosyaları göstermeye zorla"
 
-#: resources.h:774
+#: resources.h:794
 msgid "Format specifications:"
 msgstr "Biçim özellikleri:"
 
-#: resources.h:943
+#: resources.h:964
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Yazım biçimi: Dosya türünü izleyecek şekilde tırnak içine alınmış komut ve "
 "sonra parametreler."
 
-#: resources.h:469
+#: resources.h:478
 msgid "Further documentation"
-msgstr "Detaylı bilgiler"
+msgstr "Ayrıntılı bilgiler"
 
-#: resources.h:78
+#: resources.h:86
 msgid "General"
 msgstr "Genel"
 
@@ -3865,21 +3920,21 @@
 msgid "General SOCKS server failure"
 msgstr "Genel SOCKS sunucu hatası"
 
-#: resources.h:792
+#: resources.h:812
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
-msgstr "Genel proxy"
+msgstr "Genel vekil sunucu"
 
-#: resources.h:696
+#: resources.h:716
 msgid "Get external IP address from the following URL:"
-msgstr "Dış IP adresini bu URL'den al:"
+msgstr "Dış IP adresini şu İnternet adresinden al:"
 
-#: resources.h:470
+#: resources.h:479
 msgid "Getting help"
 msgstr "Yardım istiyorsanız"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "Verilen süzme seti adı zaten var, üzerine yazılsın mıi?"
 
@@ -3887,15 +3942,15 @@
 msgid "Global bookmarks"
 msgstr "Küresel yer imleri"
 
-#: resources.h:166
+#: resources.h:174
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:146
 msgid "Group permissions"
 msgstr "Grup izinleri"
 
-#: resources.h:598
+#: resources.h:616
 msgid "H&igh"
 msgstr "&Yüksek"
 
@@ -3903,96 +3958,96 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP üzerinden TLS"
 
-#: resources.h:340
+#: resources.h:349
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Gizli"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:837 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Yüksek"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "En Yüksek"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:73
 msgid "Highest available port has to be a number between 1024 and 65535."
-msgstr "En büyük port numarası 1024 ila 65535 arasında olmalı."
+msgstr "En büyük kapı numarası 1024 ila 65535 arasında olmalı."
 
-#: resources.h:209
+#: resources.h:218
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Her iki tarafta da aynı anda süzgeç durumunu açıp kapamak için shift tuşuna "
 "basın."
 
-#: resources.h:157
+#: resources.h:165
 msgid "Homepage:"
 msgstr "Giriş Sayfası:"
 
-#: resources.h:342
+#: resources.h:351
 msgid "Host key fingerprint:"
 msgstr "Sunucu anahtarı parmak izi:"
 
-#: resources.h:185
+#: resources.h:194
 msgid "Host key mismatch"
 msgstr "Sunucu anahtarı uyuşmazlığı"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
-msgstr "Sunucu '[' ile başlıyor ama kapatma parantezi bulunamadı."
+msgstr "Sunucu adı '[' ile başlıyor ama kapatma parantezi bulunamadı."
 
 #: ../../locales/../src/engine/proxy.cpp:439
 msgid "Host unreachable"
 msgstr "Sunucuya ulaşılamıyor"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:16 resources.h:44 resources.h:129 resources.h:186
+#: resources.h:199
 msgid "Host:"
 msgstr "Sunucu:"
 
-#: resources.h:96
+#: resources.h:104
 msgid "Hours,"
 msgstr "Saat,"
 
-#: resources.h:892
+#: resources.h:913
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (örneğin: 15:47)"
 
-#: resources.h:734
+#: resources.h:754
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
-"Eğer bir işlem sırasında belirtilen sürede hiç veri gönderilip alınamazsa, "
-"bağlantı kapatılacak ve FileZilla yeniden bağlanmayı deneyecek."
+"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."
 
-#: resources.h:973
+#: resources.h:998
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
-"Eğer hata rapor ediyorsanız, lütfen günlükleri \"Verbose\" günlükleme "
-"düzeyinde gönderiniz."
+"Hata bildiriyorsanız, lütfen günlükleri \"Ayrıntılı\" günlükleme düzeyinde "
+"gönderiniz."
 
-#: resources.h:687
+#: resources.h:707
 msgid ""
 "If the automatic test at the end of this wizard succeeds, but you cannot "
 "transfer files to a particular server, the server might be misconfigured and "
 "you should try active mode. You can set the transfer mode on a per-server "
 "basis in the Site Manager."
 msgstr ""
-"Bu sihirbazın sonundaki deneme başarılı olduğu halde bazı sunuculara dosya "
-"aktarımı yapamazsanız, sunucu yanlış yapılandırılmıştır ve aktif modu "
-"denemeniz gereklidir. Site Yöneticisi'nden her sunucu için aktarım modunu "
-"ayrı ayrı ayarlayabilirsiniz."
+"Bu yardımcının sonundaki deneme başarılı olduğu halde bazı sunuculara dosya "
+"aktarımı yapamazsanız, sunucu yanlış yapılandırılmıştır ve aktif kipi "
+"denemeniz gerekir. Site Yöneticisi'nden her sunucu için aktarım kipini ayrı "
+"ayrı ayarlayabilirsiniz."
 
-#: resources.h:682
+#: resources.h:702
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4000,7 +4055,7 @@
 "Başvurma seçeneği etkin ise, varsayılan aktarım kipinizi kabul etmeyen, "
 "hatalı ayarlanmış sunuculara da bağlanabilirsiniz."
 
-#: resources.h:188
+#: resources.h:197
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4013,7 +4068,7 @@
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
 msgstr ""
-"Eğer bu sorun devam ederse, bir yöneltici veya güvenlik duvarı FileZilla'yı "
+"Bu sorun devam ederse, bir yöneltici ya da güvenlik duvarı FileZilla'yı "
 "engellemeye devam ediyor demektir."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
@@ -4021,10 +4076,10 @@
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
 msgstr ""
-"Eğer bu sorun devam ederse, bir yöneltici veya güvenlik duvarı bağlantıyı "
+"Bu sorun devam ederse, bir yöneltici ya da güvenlik duvarı bağlantıyı "
 "kesmeye devam ediyor demektir."
 
-#: resources.h:962
+#: resources.h:987
 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 "
@@ -4034,38 +4089,37 @@
 "\" eklenerek (daha eski günlük dosyalarının üstüne yazılabilir) yeniden "
 "adlandırılır ve yeni bir dosya oluşturulur."
 
-#: resources.h:455
+#: resources.h:464
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
 msgstr ""
-"Sembolik bağlantı bir klasörü gösteriyorsa Filezilla sembolik bağlantıyı "
-"veya bağlı klasörün içini silebilir."
+"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:624
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
 msgstr ""
-"Eğer bu sorun devam ederse, çözüm için lütfen yöneltici veya güvenlik duvarı "
-"üreticinizle iletişim kurun."
+"Bu sorun devam ederse, çözüm için lütfen yöneltici ya da güvenlik duvarı "
+"üreticinizle görüşün."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr ""
-"Eğer bu sorun devam ederse, lütfen yöneltici üreticinizle iletişim kurun."
+msgstr "Bu sorun devam ederse, lütfen yöneltici üreticinizle görüşün."
 
-#: resources.h:278 resources.h:856
+#: resources.h:287 resources.h:876
 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' seçeneğini kullanmak için sistem saatiniz sunucu "
-"ile aynı olmalı. Eğer sunucu ile farklı zaman dilimlerindeyseniz, Site "
-"Yöneticisi'nden zaman dilimi farkını ayarlayın."
+"ile aynı olmalı. Sunucu ile farklı saat dilimlerindeyseniz, Site "
+"Yöneticisi'nden saat dilimi farkını ayarlayın."
 
-#: resources.h:916
+#: resources.h:937
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4074,41 +4128,40 @@
 "eşik değerini aşmıyorsa, farklı zaman damgasına sahip dosyaları aynı kabul "
 "et."
 
-#: resources.h:931
+#: resources.h:952
 msgid "If you change the language, you should restart FileZilla."
-msgstr "Dili değiştirirseniz FileZilla'yı yeniden başlatmalısınız."
+msgstr "Dili değiştirmek için FileZilla yeniden başlatılmalı."
 
-#: resources.h:713
+#: resources.h:733
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
 msgstr ""
-"Sına'ya basarsanız FileZilla, probe.filezilla-project.org adresine bağlanıp "
-"bazı sıradan sınamalar yapacaktır."
+"Sına'ya tıklarsanız, FileZilla, probe.filezilla-project.org adresine "
+"bağlanıp bazı basit sınamalar yapar."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1273
 msgid "If you close FileZilla, your changes will be lost."
-msgstr ""
-"Eğer FileZilla'yı şimdi kapatırsanız yaptığınız değişiklikler kaybolacak."
+msgstr "FileZilla'yı şimdi kapatırsanız, yaptığınız değişiklikler kaybolacak."
 
-#: resources.h:832
+#: resources.h:852
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
 "Yanlış dosya türü yazarsanız, bu dosyalar aktarım sırasında bozulabilir."
 
-#: resources.h:714
+#: resources.h:734
 msgid "If you get any errors, your configuration is not correct."
 msgstr "Herhangi bir hata alıyorsanız yapılandırmanız yanlış demektir."
 
-#: resources.h:746
+#: resources.h:766
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"Eğer klasörleri listelemede veya dosya aktarımında sorun yaşıyorsanız, "
-"varsayılan aktarım modunu değiştirmeyi deneyin."
+"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:569
 msgid ""
@@ -4117,46 +4170,46 @@
 "passive mode and contact the server administrator for help."
 msgstr ""
 "Belirli bir sunucu ile sorun yaşamaya devam ediyorsanız, sunucu, yöneltici "
-"veya güvenlik duvarı uygun şekilde ayarlanmamış olabilir.Bu durumda pasif "
-"modu ve yardım için sunucu yöneticisi ile iletişime geçmeyi deneyin."
+"ya da güvenlik duvarı uygun şekilde ayarlanmamış olabilir. Bu durumda pasif "
+"kipi ve yardım için sunucu yöneticisi ile iletişime geçmeyi deneyin."
 
-#: resources.h:673
+#: resources.h:693
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"Eğer sihirbazı başarıyla bitirmişseniz ve son sınama başarılı olmuşsa, "
-"güvenlik duvarlarınız ve yönelticileriniz doğru yapılandırılmış demektir."
+"Yardımcıyı sorunsuz bitirdiğinizde, son sınama başarılı olmuşsa, güvenlik "
+"duvarlarınız ve yönelticileriniz doğru yapılandırılmış demektir."
 
-#: resources.h:709
+#: resources.h:729
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr ""
-"Bir güvenlik duvarı kullanıyorsanız FileZilla'nın belirtilen portlardan "
+"Bir güvenlik duvarı kullanıyorsanız FileZilla'nın belirtilen kapılardan "
 "bağlanma izni olduğuna emin olun."
 
-#: resources.h:708
+#: resources.h:728
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"Bir yöneltici kullanıyorsanız bu portların FileZilla'nın çalıştığı "
-"bilgisayara yönlendirildiğinden emin olun."
+"Bir yöneltici kullanıyorsanız bu kapıların FileZilla çalışan bilgisayara "
+"yönlendirildiğinden emin olun."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
 "If your router keeps changing the IP address, please contact your router "
 "manufacturer."
 msgstr ""
-"Eğer yönelticiniz IP adresini değiştirmeye devam ediyorsa, lütfen "
-"yönelticinizin üreticisiyle iletişim kurun."
+"Yönelticiniz IP adresini değiştirmeye devam ediyorsa, lütfen yönelticinizin "
+"üreticisiyle görüşün."
 
 #: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Daha eski sürümden veri al"
 
-#: resources.h:297
+#: resources.h:306
 msgid "Import settings"
 msgstr "Al ayarları"
 
@@ -4170,23 +4223,23 @@
 msgid "Improperly quoted association."
 msgstr "Düzgün olmayan şekilde tırnak içinde yazılmış ilişki."
 
-#: resources.h:701
+#: resources.h:721
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
 msgstr ""
-"Aktif modda FileZilla veri aktarımı için bir portu dinleyebilmelidir. "
-"FileZilla'nın hangi portu dinleyeceğini belirtiniz."
+"FileZilla, aktif kipte, veri aktarımı için bir kapıyı dinleyebilmelidir. "
+"FileZilla'nın hangi kapıyı dinleyeceğini belirtin."
 
-#: resources.h:703
+#: resources.h:723
 msgid ""
 "In case you have a router, you will have to forward all available ports, as "
 "FileZilla has no influence on the ports your system chooses."
 msgstr ""
-"Bir yönelticiniz varsa, FileZilla'nın sisteminizin seçtiği portlarda "
-"bağlanma şansı olmadığından, varolan tüm portları yönlendirmeniz gerekir."
+"Bir yönelticiniz varsa, FileZilla'nın sisteminizin seçtiği kapılarda "
+"bağlanma şansı olmadığından, varolan tüm kapıları yönlendirmeniz gerekir."
 
-#: resources.h:254
+#: resources.h:263
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4195,25 +4248,24 @@
 "Denetimi/Güncelleştirmeleri kendiliğinden denetle' seçeneğini "
 "etkinleştirebilirsiniz."
 
-#: resources.h:691 resources.h:755
+#: resources.h:711 resources.h:775
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr ""
-"Aktif modu kullanabilmesi için, FileZilla'nın dış IP adresinizi bilmesi "
-"gerekir."
+"Aktif kipi kullanabilmek için, FileZilla, dış IP adresinizi bilmelidir."
 
-#: resources.h:676
+#: resources.h:696
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
-"Çoğu kullanıcı için tavsiye edilen pasif modda FileZilla sunucuya bir port "
-"sorar ve verilen porttan bağlantı kurulur. Bunun için pek bir ayar "
-"yapılmasına gerek yoktur."
+"Çoğu kullanıcı için önerilen pasif kipte FileZilla sunucuya bir kapı sorar "
+"ve bağlantı verilen kapıdan kurulur. Bunun için pek bir ayar yapılmasına "
+"gerek yoktur."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:958
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4221,20 +4273,20 @@
 "Kopuk zincir, üst sertifika kendiliğinden imzalanmış bir yetki sertifikası "
 "değil"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1068
 msgid "Incorrect password"
 msgstr "Yanlış parola"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "TLS başlatılıyor..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "Güvenliksiz sunucu, TLS üzerinden FTP desteklenmiyor."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Etkileşimli"
@@ -4244,8 +4296,8 @@
 msgstr "Arayüz"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1025
+#: ../../locales/../src/interface/QueueView.cpp:1601
 msgid "Interrupted by user"
 msgstr "Kullanıcı tarafından durduruldu"
 
@@ -4257,14 +4309,14 @@
 msgid "Invalid HTTP Response"
 msgstr "Geçersiz HTTP yanıtı"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
 "Geçersiz karater dizilimi alındı, UTF-8 devre dışı bırakılıyor. UTF-8 "
-"karakter setini zorlamak için Site Yöneticisinde 'UTF-8 zorla' seçeneğini "
+"karakter setini dayatmak için Site Yöneticisinde 'UTF-8 dayat' seçeneğini "
 "etkinleştirin."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
@@ -4282,43 +4334,51 @@
 msgid "Invalid date"
 msgstr "Tarih geçersiz"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1339
+#: ../../locales/../src/interface/LocalListView.cpp:1364
+#: ../../locales/../src/interface/RemoteListView.cpp:3202
 msgid "Invalid filename"
 msgstr "Dosya adı geçersiz"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Sunucu geçersiz. Parantezi kapattıktan sonra yalnızca iki nokta üstüste ve "
-"port yazılabilir."
+"kapı yazılabilir."
 
 #: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Geçersiz giriş"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
-msgstr "Yazılan port yanlış. Port değeri 1 ile 65535 arasında olmalıdır."
+msgstr "Yazılan kapı yanlış. Kapı değeri 1 ile 65535 arasında olmalıdır."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Geçersiz protokol belirtildi. Geçerli protokller şunlardır:\n"
+"Geçersiz iletişim kuralı belirtildi. Geçerli iletişim kuralları şunlardır:\n"
 "ftp:// normal FTP için,\n"
-"sftp:// SSH dosya aktarım protokolü için,\n"
-"ftps:// SSL üzerinden FTP (örtülü) ve\n"
-"ftpes:// SSL üzerinde FTP (açıkta)."
+"sftp:// SSH dosya aktarım iletişim kuralı için,\n"
+"ftps:// TLS (örtülü) üzerinden FTP ve\n"
+"ftpes:// TLS (açıkta) üzerinde FTP."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Arama kısıtlarında geçersiz ifade."
 
@@ -4326,7 +4386,7 @@
 msgid "Invalid response code"
 msgstr "Geçersiz yanıt kodu"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Geçersiz arama kısıtları: %s"
@@ -4338,92 +4398,97 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Geçersiz site yolu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Kısıttaki boyut geçersiz"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Kullanıcı adı geçersiz."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction country:"
 msgstr "Yetkili ülke:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction locality:"
 msgstr "Yetkili yerleşim:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction state or province:"
 msgstr "Yetkili şehir:"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Keep directories on top"
 msgstr "Klasörleri üstte göster"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:682
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
 "some tests to check if the server supports this feature, the test may fail."
 msgstr ""
-"Bu özelliği bazı sunucuların desteklemeyebileceğini ve bu nedenle hatalı "
-"listeleler görebileceğinizi unutmayın. Filezilla sunucunun bu özelliği "
+"Bazı sunucuların bu özelliği desteklemeyebileceğini ve bu nedenle hatalı "
+"listeleler görebileceğinizi unutmayın. Filezilla, sunucunun bu özelliği "
 "destekleyip desteklemediğini anlamak için bazı sınamalar yapsa da başarısız "
 "olabilir."
 
-#: resources.h:337
+#: resources.h:346
 msgid "Key exchange"
 msgstr "Anahtar değişimi"
 
-#: resources.h:601
+#: resources.h:20 resources.h:48
+#, fuzzy
+msgid "Key exchange:"
+msgstr "Anahtar değişimi"
+
+#: resources.h:619
 msgid "L&owest"
 msgstr "E&n düşük"
 
-#: resources.h:929
+#: resources.h:950
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Dil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1584
 msgid "Language changed"
 msgstr "Dil değişti"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Son değişiklik"
 
-#: resources.h:859
+#: resources.h:879
 msgid "Layout"
 msgstr "Yerleşim"
 
-#: resources.h:805
+#: resources.h:825
 msgid "Limit for concurrent &downloads:"
 msgstr "Eşzamanlı karşıdan in&dirme:"
 
-#: resources.h:807
+#: resources.h:827
 msgid "Limit for concurrent &uploads:"
 msgstr "Eşzamanlı &karşıya yükleme:"
 
-#: resources.h:750
+#: resources.h:770
 msgid "Limit local ports"
-msgstr "Yerel portları sınırlandır"
+msgstr "Yerel kapıları sınırlandır"
 
-#: resources.h:959
+#: resources.h:984
 msgid "Limit size of logfile"
 msgstr "Günlük dosyası boyutunun sınırı"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit:"
 msgstr "Sınır:"
 
@@ -4431,7 +4496,7 @@
 msgid "Line length exceeded"
 msgstr "Satır uzunluğu aşıldı"
 
-#: resources.h:167
+#: resources.h:176
 msgid "Linked against"
 msgstr "Bağlantılı"
 
@@ -4440,21 +4505,21 @@
 msgstr "Dinleme soketi kapandı"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Sıralama:"
 
-#: resources.h:753
+#: resources.h:773
 msgid "Lo&west available port:"
-msgstr "E&n küçük port:"
+msgstr "Kullanılabilecek e&n küçük kapı:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Yerel"
 
-#: resources.h:364
+#: resources.h:373
 msgid "Local file"
 msgstr "Yerel dosya"
 
@@ -4470,7 +4535,7 @@
 msgid "Local file is not a valid filename."
 msgstr "Yerel dosyanın geçerli bir adı yok."
 
-#: resources.h:203
+#: resources.h:212
 msgid "Local filters:"
 msgstr "Yerel süzgeçler:"
 
@@ -4478,7 +4543,7 @@
 msgid "Local site:"
 msgstr "Yerel site:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Locality:"
 msgstr "Yer:"
 
@@ -4486,24 +4551,24 @@
 msgid "Log file"
 msgstr "Günlük dosyası"
 
-#: resources.h:251
+#: resources.h:260
 msgid "Log of update check:"
 msgstr "Güncelleme denetimi günlüğü:"
 
-#: resources.h:954
+#: resources.h:979
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Günlük"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
 "Giriş verisi ASCII olmayan karakterler içeriyor ve sunucu UTF-8 anlamıyor "
-"olabilir. Proxy kullanıldığı için yerel karakter setine başvurulamıyor."
+"olabilir. Vekil sunucu kullanıldığı için yerel karakter seti kullanılamıyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4511,15 +4576,15 @@
 "Giriş verisi ASCII olmayan karakterler içeriyor ve sunucu UTF-8 anlamıyor "
 "olabilir. Yerel karakter seti deneniyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Oturum açma işlemleri eksiksiz yapıldı ama hala oturum açılamadı. "
 "Vazgeçiliyor."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:98
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
-msgstr "Giriş tipi \"sor\" veya \"etkileşimli\" olmalıdır (tırnaklar olmadan)."
+msgstr "Giriş tipi 'sor' ya da 'etkileşimli' olmalıdır (tırnaklar olmadan)."
 
 #: ../../locales/../src/interface/cmdline.cpp:10
 #, c-format
@@ -4527,28 +4592,28 @@
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr ""
-"Giriş tipi sadece FTP adresi ile birlikte kullanılabilir. Seçenek '%s' veya "
-"'%s' olmalıdır."
+"Giriş tipi yalnız FTP İnternet adresi ile birlikte kullanılabilir. Seçenek '%"
+"s' ya da '%s' olmalıdır."
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Düşük"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "En Düşük"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:67
 msgid "Lowest available port has to be a number between 1024 and 65535."
-msgstr "En düşük kullanılabilir port 1024 ile 65535 arasında olmalıdır."
+msgstr "Kullanılabilecek en küçük kapı 1024 ile 65535 arasında olmalıdır."
 
-#: resources.h:20 resources.h:44
+#: resources.h:24 resources.h:52
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 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 beesi olduğundan emin "
@@ -4571,7 +4636,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Uygunsuz yanıt, sunucu uygun satır sonu karakterleri göndermiyor"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:403 ../../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
@@ -4582,58 +4647,58 @@
 msgid "Manual transfer"
 msgstr "El ile aktarım"
 
-#: resources.h:434
+#: resources.h:443
 msgid "Match all of the following"
 msgstr "Şunların hepsini eşle"
 
-#: resources.h:435
+#: resources.h:444
 msgid "Match any of the following"
 msgstr "Şunların herhangi birine uyan"
 
-#: resources.h:436
+#: resources.h:445
 msgid "Match none of the following"
 msgstr "Şunların hiçbirine uymayan"
 
-#: resources.h:803
+#: resources.h:823
 msgid "Maximum simultaneous &transfers:"
 msgstr "Eşzamanlı ak&tarım:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:380
+#: ../../locales/../src/interface/Mainfrm.cpp:1912
 msgid "Message log"
 msgstr "İleti günlüğü"
 
-#: resources.h:870
+#: resources.h:890
 msgid "Message log position"
 msgstr "İleti günlüğü konumu"
 
-#: resources.h:961
+#: resources.h:986
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:105
 msgid "Minutes"
 msgstr "Dakika"
 
-#: resources.h:358
+#: resources.h:367
 msgid "Move &down"
 msgstr "&Aşağı taşı"
 
-#: resources.h:357
+#: resources.h:366
 msgid "Move &up"
 msgstr "Y&ukarı taşı"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Bilgisayarım"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Belgelerim"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Sitelerim"
 
@@ -4642,33 +4707,33 @@
 msgid "N/a"
 msgstr "Yok"
 
-#: resources.h:399
+#: resources.h:408
 msgid "Name"
 msgstr "Ad"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "Bu ad daha önce verilmiş"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "Yer imi adı zaten var."
 
-#: resources.h:120 resources.h:168
+#: resources.h:128 resources.h:177
 msgid "Name:"
 msgstr "Ad:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Süzgeç adını yazmalısınız"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Geçerli bir yol yazmalısınız"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Karakter kodlaması belirtilmeli"
 
@@ -4676,19 +4741,23 @@
 msgid "Network unreachable"
 msgstr "Ağ ulaşılamaz"
 
-#: resources.h:73
+#: resources.h:968
+msgid "Never"
+msgstr "Hiçbir zaman"
+
+#: resources.h:81
 msgid "New &Folder"
 msgstr "Yeni &Klasör"
 
-#: resources.h:494
+#: resources.h:510
 msgid "New &tab"
 msgstr "Yeni &Sekme"
 
-#: resources.h:74 resources.h:414
+#: resources.h:82 resources.h:423
 msgid "New Book&mark"
 msgstr "Yeni yer i&mi"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:404 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4701,41 +4770,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Yeni yer imi"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1639
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Yeni klasör"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "%s sürümündeki yeni özellik ve geliştirmeler"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Yeni süzgeç"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Yeni klasör"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Yeni site"
 
-#: resources.h:868
+#: resources.h:888
 msgid "Next to the transfer queue"
 msgstr "Aktarım kuyruğu bölümünün yanına"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Hayır"
 
@@ -4743,25 +4812,25 @@
 msgid "No category to export selected"
 msgstr "Vermek içi seçili bir kategori yok"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2301
 msgid "No command given, aborting."
 msgstr "Komut verilmedi, yarıda kesiliyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Dış IP adresi belirtilmemiş, varsayılan deneniyor."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "Şu an düzenlenen bir dosya yok."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Süzgeç adı verilmemiş"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Sunucu belirtilmemiş. Lütfen sunucuyu yazın."
 
@@ -4769,26 +4838,26 @@
 msgid "No images available"
 msgstr "Hiç resim yok"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3172
 msgid "No more files in the queue!"
 msgstr "Kuyrukta dosya yok!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Süzme setine ad verilmemiş"
 
-#: resources.h:430
+#: resources.h:439
 msgid "No program associated with filetype"
 msgstr "Bu dosya tipi ile ilişkili bir program bulunamadı"
 
-#: resources.h:420
+#: resources.h:429
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
-"'%s' uzantılı dosyaları düzenlemek için bir program ilişkilendirilmemiş."
+"%s' uzantılı dosyaları düzenlemek için ilişkilendirilmiş bir yazılım yok."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Arama sonuç vermedi"
 
@@ -4800,29 +4869,29 @@
 
 #: ../../locales/../src/engine/proxy.cpp:404
 msgid "No supported SOCKS5 auth method"
-msgstr "Desteklenmeyen SOCKS5 kimlik denetimi modu"
+msgstr "Desteklenmeyen SOCKS5 kimlik denetimi kipi"
 
 #: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Kullanıcı adı yazılmadı."
 
-#: resources.h:923 resources.h:928
+#: resources.h:944 resources.h:949
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Hiçbir şey"
 
-#: resources.h:374
+#: resources.h:383
 msgid "None selected yet"
 msgstr "Henüz seçilmemiş"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:836 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Normal"
 
@@ -4832,15 +4901,15 @@
 msgstr "Bütün nesneler görüntüleme/düzenleme için yeniden okunamamış olabilir."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Bağlı değil"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2374
 msgid "Not connected to any server"
 msgstr "Sunucuya bağlı değil"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:568
 msgid "Not connected to any server."
 msgstr "Sunucuya bağlı değil."
 
@@ -4848,21 +4917,23 @@
 msgid "Not connected."
 msgstr "Bağlı değil."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid "Note that this feature is only supported using the FTP protocol."
-msgstr "Dikkat bu özellik sadece FTP protokolü kullanılırken desteklenir."
+msgstr ""
+"Dikkat bu özellik yalnız FTP iletişim kuralı kullanılırken desteklenir."
 
-#: resources.h:784
+#: resources.h:804
 msgid "Note: This only works with plain, unencrypted FTP connections."
-msgstr "Not: Bu sadece düz ve şifrelenmemiş bir FTP bağlantısı ile çalışır."
+msgstr ""
+"Not: Bu özellik yalnız düz ve şifrelenmemiş bir FTP bağlantısı ile çalışır."
 
-#: resources.h:801
+#: resources.h:821
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
-"Not: Soysal bir proxy kullanmak FTP bağlantılarının pasif mod ile "
+"Not: Soysal bir vekil sunucu kullanmak, FTP bağlantılarının pasif kip ile "
 "yapılmasını zorunlu kılar."
 
-#: resources.h:902
+#: resources.h:923
 msgid "Number of decimal places:"
 msgstr "Ondalık basamak sayısı:"
 
@@ -4870,232 +4941,235 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Yeniden deneme sayısı 0 ile 99 arasında olmak zorundadır."
 
-#: resources.h:333
+#: resources.h:342
 msgid "O&pen file"
 msgstr "Dosyayı &aç"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:28 resources.h:54 resources.h:76 resources.h:138
+#: resources.h:160 resources.h:182 resources.h:192 resources.h:205
+#: resources.h:220 resources.h:237 resources.h:288 resources.h:297
+#: resources.h:304 resources.h:312 resources.h:335 resources.h:343
+#: resources.h:362 resources.h:368 resources.h:401 resources.h:415
+#: resources.h:437 resources.h:460 resources.h:469 resources.h:483
+#: resources.h:496 resources.h:503 resources.h:747
 msgid "OK"
 msgstr "Tamam"
 
-#: resources.h:683
+#: resources.h:703
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr ""
-"İzleyen sayfalarda aktarım ve -seçtiyseniz- başvuru modları ayarlanacak."
+"İzleyen sayfalarda aktarım ve -seçtiyseniz- başvuru kipleri ayarlanacak."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Bir kez"
 
-#: resources.h:953
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Sisteminizden sadece FileZilla sürümü ve kullandığınız işletim sistemi "
-"bilgisi iletilecektir."
+#: resources.h:969
+msgid "Once a week"
+msgstr "Haftada bir"
 
-#: resources.h:652
+#: resources.h:672
 msgid "Open directory in system's file manager"
 msgstr "Sistem dosya yöneticisinde açık dosya"
 
-#: resources.h:975 resources.h:976
+#: resources.h:1000
 msgid "Open the Site Manager"
 msgstr "Site Yöneticisi'ni aç"
 
-#: resources.h:564
+#: resources.h:1001
+msgid "Open the Site Manager."
+msgstr "Site Yöneticisi'ni aç."
+
+#: resources.h:1002
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Site Yöneticisini aç. Site listesi için sağ tıklayın."
+
+#: resources.h:580
 msgid "Open the file."
 msgstr "Dosyayı aç."
 
-#: resources.h:507
+#: resources.h:523
 msgid "Open the settings dialog of FileZilla"
-msgstr "FileZilla'nın ayarlar penceresini aç"
+msgstr "FileZilla ayarları penceresini aç"
 
-#: resources.h:309
+#: resources.h:318
 msgid "Opened as:"
 msgstr "Olarak aç:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 msgid "Opening failed"
-msgstr "Açma işlemi başarısız oldu"
+msgstr "Açılamadı"
 
-#: resources.h:495
+#: resources.h:511
 msgid "Opens a new tab"
 msgstr "Yeni bir sekme açar"
 
-#: resources.h:492
+#: resources.h:508
 msgid "Opens the Site Manager"
 msgstr "Site Yöneticisi'ni açar"
 
-#: resources.h:996
+#: resources.h:1022
 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ğ "
 "tıklayın."
 
-#: resources.h:171
+#: resources.h:180
 msgid "Operating system"
 msgstr "İşletim sistemi"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "İşletim sistemi hatası!"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Organization:"
 msgstr "Firma:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:201
 msgid "Other:"
 msgstr "Diğer:"
 
-#: resources.h:729
+#: resources.h:749
 msgid "Overview"
 msgstr "Genel Açıklama"
 
-#: resources.h:59
+#: resources.h:67
 msgid "Overwrite &if source newer"
 msgstr "Kaynak daha yen&iyse üstüne yaz"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Overwrite file"
 msgstr "Üzerine Yaz"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if size differs"
 msgstr "Boyut farklı ise üstüne yaz"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs or source file is newer"
-msgstr "Boyut farklı ise veya kaynak daha yeniyse üstüne yaz"
+msgstr "Boyut farklı ya da kaynak daha yeni ise üstüne yaz"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file if source file newer"
 msgstr "Kaynak daha yeniyse üstüne yaz"
 
-#: resources.h:60
+#: resources.h:68
 msgid "Overwrite if &different size"
 msgstr "&Boyut farklı ise üstüne yaz"
 
-#: resources.h:61
+#: resources.h:69
 msgid "Overwrite if different si&ze or source newer"
-msgstr "Boyut farklı ise veya kaynak daha yeniyse üstüne ya&z"
+msgstr "Boyut farklı ya da kaynak daha yeni ise üstüne ya&z"
 
-#: resources.h:134
+#: resources.h:142
 msgid "Owner permissions"
 msgstr "Sahip izinleri"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Sahip/Grup"
 
-#: resources.h:874
+#: resources.h:894
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 "Akta&rımlar ve diğer işlemler sırasında sistemin askıya alınmasına engel ol."
 
-#: resources.h:781 resources.h:797
+#: resources.h:801 resources.h:817
 #, no-c-format
 msgid "P&roxy host:"
-msgstr "P&roxy sunucu:"
+msgstr "&Vekil sunucu:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:488
 msgid "PORT command tainted by router or firewall."
-msgstr "PORT komutu yöneltici veya güvenlik duvarı tarafından bozuldu."
+msgstr "PORT komutu yöneltici ya da güvenlik duvarı tarafından bozuldu."
 
-#: resources.h:743
+#: resources.h:763
 msgid "Pa&ssive (recommended)"
 msgstr "Pa&sif (önerilen)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Paket"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2471
+#: ../../locales/../src/interface/Mainfrm.cpp:2549
 msgid "Parameter not a valid URL"
-msgstr "Parametre geçerli bir URL değil"
+msgstr "Parametre geçerli bir İnternet adresi değil"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:93 resources.h:392 resources.h:741
 msgid "Pass&word:"
 msgstr "Parol&a:"
 
-#: resources.h:679
+#: resources.h:699
 msgid "Passive (recommended)"
 msgstr "Pasif (önerilen)"
 
-#: resources.h:763
+#: resources.h:783
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
-msgstr "Pasif mod"
+msgstr "Pasif kip"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:588
 #: ../../locales/../src/interface/netconfwizard.cpp:601
 #: ../../locales/../src/interface/netconfwizard.cpp:612
 msgid "Passive mode has been set as default transfer mode."
-msgstr "Varsayılan olarak Pasif Mod seçildi."
+msgstr "Varsayılan aktarım kipi olarak Pasif Kip seçildi."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:281
 msgid "Password required"
-msgstr "Parola gerekli"
+msgstr "Parola zorunlu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Yol"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: resources.h:410
 msgid "Paths"
 msgstr "Yollar"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Silinmesi bekleniyor"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "İzin"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "İzinler"
 
-#: resources.h:170
+#: resources.h:179
 msgid "Platform:"
 msgstr "Platform:"
 
-#: resources.h:250
+#: resources.h:259
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
 msgstr ""
-"FileZilla'nın en son sürümü için http://filezilla-project.org adresine "
-"bakınız."
+"En son FileZilla sürümü için http://filezilla-project.org adresine bakın."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:553
 msgid ""
@@ -5105,27 +5179,27 @@
 "Lütfen http://filezilla-project.org/probe.php adresinden sunucunun "
 "çalıştığını denetleyin ve ayarlarınızı yeniden dikkatlice gözden geçirin."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
 msgstr ""
 "Lütfen güncellenmiş bir paket için sisteminizdeki paket yöneticisini "
-"denetleyin veya FileZilla kaynak kodunu indirmek için http://filezilla-"
+"denetleyin ya da FileZilla kaynak kodunu indirmek için http://filezilla-"
 "project.org adresine gidin."
 
-#: resources.h:685
+#: resources.h:705
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
 msgstr ""
-"Lütfen tüm güvenlik duvarlarınızı ve yönelticilerinizi, dışarı giden "
-"bağlantılarda FileZilla'nın keyfi portları kullanabileceği şekilde ayarlayın."
+"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:623
 msgid "Please disable settings like 'DMZ mode' or 'Game mode' on your router."
 msgstr ""
-"Lütfen yöneltici ayarlarından 'DMZ mode' veya 'Game mode' ayarlarını "
+"Lütfen yöneltici ayarlarından 'DMZ kipi' ya da 'Oyun kipi' ayarlarını "
 "devredışı bırakın."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:562
@@ -5142,9 +5216,9 @@
 
 #: ../../locales/../src/interface/settings/optionspage_dateformatting.cpp:73
 msgid "Please enter a custom time format."
-msgstr "Lütfen özel bir zaman biçimi yazın."
+msgstr "Lütfen özel zaman biçimini yazın."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 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."
@@ -5153,22 +5227,23 @@
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, c-format
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
-msgstr "Lütfen 0 %s/s ye eşit veya daha büyük bir indirme hızı sınırı yazın."
+msgstr ""
+"Lütfen 0 %s/s değerine eşit ya da daha büyük bir indirme hızı sınırı yazın."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Lütfen yeni süzgeç için bir ad yazın."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "Lütfen kopyalanmış süzgeç için bir ad yazın."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Lütfen \"%s\" süzme seti için yeni bir ad yazın"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Lütfen bu süzgeç için bir ad yazın."
 
@@ -5191,18 +5266,18 @@
 "transfers."
 msgstr "Lütfen aynı anda 1 ile 10 arasında kaç aktarım yapılacağını yazın."
 
-#: resources.h:117
+#: resources.h:125
 msgid "Please enter a password for this server:"
 msgstr "Lütfen bu sunucu için parolayı yazın:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2290
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
 "You can also optionally specify program arguments."
 msgstr ""
 "Lütfen bir yol ve çalıştırılabilir bir dosya adı yazın.\n"
-"Örneğin: Windows için c:\\yol\\dosya.exe veya Unix için /yol/dosya.\n"
+"Örneğin: Windows için c:\\yol\\dosya.exe ya da Unix için /yol/dosya.\n"
 "Ayrıca isterseniz programa özel parametreleri de yazabilirsiniz."
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:46
@@ -5212,34 +5287,31 @@
 "Lütfen 5 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:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Lütfen bu süzme seti için özgün bir ad yazın"
 
-#: resources.h:118
+#: resources.h:126
 msgid "Please enter a username for this server:"
 msgstr "Lütfen bu sunucu için kullanıcı adını yazın:"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:182
 msgid "Please enter a valid portrange."
-msgstr "Lütfen geçerli bir port aralığı yazın."
+msgstr "Lütfen geçerli bir kapı aralığı yazın."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:161
 msgid "Please enter an URL where to get your external address from"
-msgstr "Lütfen sizin dış adresinizin alınabileceği bir URL yazın"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Lütfen en az 7 günlük bir güncelleme sıklığı yazın"
+msgstr "Lütfen dış adresinizin alınabileceği bir İnternet adresi yazın"
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr ""
-"Lütfen 0 %s/s den büyük veya eşit bir karşıya yükleme hızı sınırı yazın."
+"Lütfen 0 %s/s değerinden büyük ya da eşit bir karşıya yükleme hızı sınırı "
+"yazın."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:580
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5247,14 +5319,18 @@
 "Lütfen standart FTP komutunu yazın.\n"
 "Standart ftp komutları kullanmak klasör önbelleğini siler."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1185
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1625
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Lütfen oluşturulacak klasörün adını yazın:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3177
+msgid "Please enter the name of the file which should be created:"
+msgstr "Lütfen oluşturulacak dosyanın adını yazın:"
+
+#: resources.h:127
 msgid "Please enter username and password for this server:"
 msgstr "Lütfen bu sunucu için bir kullanıcı adı ve parola yazın:"
 
@@ -5269,11 +5345,11 @@
 "wizard. In case you have a dynamic address or don't know your external "
 "address, use the external resolver option."
 msgstr ""
-"Lütfen bu sihirbazdaki aktif mod sayfasına dış IP adresinizi yazın. Adresi "
-"bilmemeniz veya dinamik olması durumunda dış IP adresi bulucu seçeneğini "
+"Lütfen bu yardımcıdaki aktif kip sayfasına dış IP adresinizi yazın. Adresi "
+"bilmemeniz ya da dinamik olması durumunda, dış IP adresi bulucu seçeneğini "
 "kullanın."
 
-#: resources.h:672
+#: resources.h:692
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5289,7 +5365,7 @@
 "Lütfen FileZilla'nın dışarı giden bağlantılarına izin verildiğinden ve adres "
 "bulucudaki adresi doğru yazdığınızdan emin olun.i"
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Lütfen istenen yerel dosyaların sisteminize kurulmuş olduğundan emin olun."
@@ -5302,22 +5378,23 @@
 "'game mode'."
 msgstr ""
 "Lütfen yönelticinizin son yazılım sürümünü kullandığından emin olun. Ayrıca "
-"yönelticiniz düzgün şekilde ayarlanmış olmalıdır. El ile port yönlendirmesi "
-"yapmalı, 'DMZ modu' veya 'Oyun modu' seçeneklerini kullanmamalısınız."
+"yönelticiniz düzgün şekilde ayarlanmış olmalıdır. El ile kapı yönlendirmesi "
+"yapmalı, yönelticinizde 'DMZ kipi' ya da 'Oyun kipi' seçeneklerini "
+"kullanmamalısınız."
 
-#: resources.h:686
+#: resources.h:706
 msgid ""
 "Please note that FileZilla has no influence on the port the server chooses. "
 "So the server might choose a port which your firewall thinks is only used by "
 "trojans or other malware. This might raise a false alarm you can safely "
 "discard."
 msgstr ""
-"FileZilla'nın sunucuların kullandığı portlar üzerinde hiçbir etkisi "
-"olmadığını bilmelisiniz. Güvenlik duvarınız sunucunun seçtiği portu zararlı "
-"bir bağlantı tarafından kullanılıyor sanabilir. Bu şekilde bir güvenlik "
-"uyarısı alırsanız görmezden gelebilirsiniz."
+"FileZilla'nın, sunucuların seçtiği kapılar üzerinde hiçbir etkisi yoktur. "
+"Güvenlik duvarınız sunucunun seçtiği kapıyı zararlı bir bağlantı tarafından "
+"kullanılıyor sanabilir. Bu şekilde bir güvenlik uyarısı alırsanız görmezden "
+"gelebilirsiniz."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:730
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5326,7 +5403,7 @@
 "sunucularının MFMT komutunu desteklemesi durumunda geçerli olacağını "
 "unutmayın."
 
-#: resources.h:740
+#: resources.h:760
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5334,16 +5411,16 @@
 "Kısa aralıklarla üstüste bağlanmaya çalışacağınız bazı sunucuların sizi "
 "yasaklayabileceğini unutmayın."
 
-#: resources.h:889 resources.h:895
+#: resources.h:910 resources.h:916
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
 "details"
 msgstr ""
-"Detaylı bilgi için lütfen http://filezilla-project.org/wiki/index.php/"
+"Ayrıntılı bilgi için lütfen http://filezilla-project.org/wiki/index.php/"
 "Date_and_Time_formatting (İngilizce) makalesine başvurun"
 
-#: resources.h:246
+#: resources.h:255
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5357,41 +5434,41 @@
 "in case you suddenly encounter problems with servers that did work "
 "previously."
 msgstr ""
-"Ağ ortamınızı değiştirir veya çalıştığınız sunucular ile aniden sorunlar "
-"yaşamaya başlarsanız bu sihirbazı yeniden çalıştırın."
+"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."
 
-#: resources.h:456
+#: resources.h:465
 msgid "Please select an action:"
 msgstr "Lütfen bir işlem seçin:"
 
-#: resources.h:302
+#: resources.h:311
 msgid "Please select the categories you would like to import."
 msgstr "Lütfen almak istediğiniz kategorileri seçin."
 
-#: resources.h:674
+#: resources.h:694
 msgid "Please select the default transfer mode you would like to use."
-msgstr "Lütfen varsayılan aktarım modunu seçiniz."
+msgstr "Lütfen varsayılan aktarım kipini seçin."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Lütfen \"%s\" klasörü için yeni izinleri belirleyin."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "Lütfen \"%s\" dosyası için yeni izinleri belirleyin."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Lütfen seçili klasörlerin izinlerini belirleyin."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 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:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "Lütfen seçili dosyaların izinlerini belirleyin."
 
@@ -5405,21 +5482,21 @@
 msgstr ""
 "Lütfen güvenlik duvarınızı güncelleyin ve yönelticinizin son yazılım "
 "sürümünü kullandığından emin olun. Ayrıca yönelticiniz düzgün şekilde "
-"ayarlanmış olmalıdır. El ile port yönlendirmesi yapmalı, 'DMZ modu' veya "
-"'Oyun modu' seçeneklerini kullanmamalısınız. Kullandığınız protokol inceleme "
-"veya protokollere özgü 'düzeltme' yazılımları varsa bunları devre dışı "
-"bırakmalısınız."
+"ayarlanmış olmalıdır. El ile kapı yönlendirmesi yapmalı, yönelticinizde 'DMZ "
+"kipi' ya da 'Oyun kipi' seçeneklerini kullanmamalısınız. Kullandığınız "
+"iletişim kuralı, inceleme ya da iletişim kurallarına özgü 'düzeltme' "
+"yazılımları varsa bunları devre dışı bırakmalısınız."
 
-#: resources.h:253
+#: resources.h:262
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr ""
-"FileZilla hakkında detaylıı bilgi almak için http://filezilla-project.org "
+"FileZilla hakkında ayrıntılı bilgi almak için http://filezilla-project.org "
 "adresini ziyaret edebilirsiniz."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5427,17 +5504,17 @@
 "Lütfen güncel sürümü indirmek için http://filezilla-project.org adresini "
 "ziyaret edin."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "Postal code:"
 msgstr "Posta kodu:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Öntanımlı Siteler"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:729
 msgid "Preserving file timestamps"
 msgstr "Dosya zaman damgaları korunuyor"
 
@@ -5445,91 +5522,109 @@
 msgid "Preview:"
 msgstr "Önizleme:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:984
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Birincil bağlantı ve veri bağlantı sertifikaları uyuşmuyor."
 
+#: ../../locales/../src/interface/cmdline.cpp:18
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "FileZilla başlangıcıile ilgili tanılama bilgilerini yazdır"
+
 #: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Print version information to stdout and exit"
 msgstr "Sürüm bilgisini konsola gönder ve çık"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Prioritize directories (default)"
 msgstr "Klasörler öncelikli (varsayılan)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Öncelik"
 
-#: resources.h:952
-msgid "Privacy policy:"
-msgstr "Gizlilik politikası:"
+#: resources.h:977
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Gizlilik politikası: Sunucuya yalnızca kullandığınız FileZilla sürümü, "
+"kullandığınız işletim sistemi ve işlemci mimarinizin bilgileri iletilecektir."
 
-#: resources.h:787
+#: resources.h:807
 msgid "Private &keys:"
 msgstr "Özel &anahtarlar:"
 
-#: resources.h:81
+#: resources.h:89
 msgid "Pro&tocol:"
 msgstr "İle&tişim Kuralı:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:803 resources.h:820
 msgid "Pro&xy password:"
-msgstr "Pro&xy parolası:"
+msgstr "Ve&kil sunucu parolası:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:541 resources.h:610
 msgid "Process &Queue"
 msgstr "Aktarım &Kuyruğunu İşle"
 
-#: resources.h:798
+#: resources.h:18 resources.h:46
+#, fuzzy
+msgid "Protocol:"
+msgstr "İle&tişim Kuralı:"
+
+#: resources.h:818
 msgid "Proxy &port:"
-msgstr "Proxy &portu:"
+msgstr "Vekil sunucu ka&pısı:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:802 resources.h:819
 msgid "Proxy &user:"
-msgstr "Proxy k&ullanıcısı:"
+msgstr "Vekil sunucu k&ullanıcı adı:"
 
 #: ../../locales/../src/engine/proxy.cpp:415
 msgid "Proxy authentication failed"
-msgstr "Proxy kimlik doğrulaması başarısız oldu"
+msgstr "Vekil sunucu oturumu açılamadı"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
-msgstr "Proxy anlaşması başarısız oldu: %s"
+msgstr "Vekil sunucu ile iletişim kurulamadı: %s"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
-msgstr "Proxy yanıtı: %s"
+msgstr "Vekil sunucu yanıtı: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:458
 #, c-format
 msgid "Proxy request failed: %s"
-msgstr "Proxy isteği başarısız oldu: %s"
+msgstr "Vekil sunucu isteği başarısız oldu: %s"
 
 #: ../../locales/../src/engine/proxy.cpp:480
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
-msgstr "Proxy isteği başarısız: CONNECT yanıtında bilinmeyen adres tipi"
+msgstr ""
+"Vekil sunucu isteği başarısız oldu: CONNECT yanıtında bilinmeyen adres tipi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
-msgstr "Proxy ayarlandı ama proxy sunucusu veya port geçersiz"
+msgstr "Vekil sunucu ayarlanmış ancak vekil sunucu adı ya da kapı geçersiz"
 
-#: resources.h:785
+#: resources.h:805
 msgid "Public Key Authentication"
 msgstr "Genel Anahtar Kimlik Doğrulaması"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:36
 msgid "Public key algorithm:"
 msgstr "Genel anahtar algoritması:"
 
-#: resources.h:142
+#: resources.h:150
 msgid "Public permissions"
 msgstr "Genel izinler"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3228
 msgid "Queue has been fully processed"
 msgstr "Kuyruk tamamen işlendi"
 
@@ -5548,39 +5643,39 @@
 msgid "Queue: empty"
 msgstr "Aktarım Kuyruğu: boş"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "Kuyruktakiler"
 
-#: resources.h:448
+#: resources.h:457
 msgid "Queueing:"
 msgstr "Sıralanıyor:"
 
-#: resources.h:608
+#: resources.h:626
 msgid "R&eboot system"
 msgstr "Sistemi y&eniden başlat"
 
-#: resources.h:522
+#: resources.h:538
 msgid "R&emote directory tree"
 msgstr "U&zak klasör ağacı"
 
-#: resources.h:622 resources.h:626
+#: resources.h:642 resources.h:646
 msgid "R&eset and requeue selected files"
 msgstr "Burayı boşalt ve s&eçili dosyaları yeniden kuyrukla"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid "Raw FTP command"
 msgstr "Standart FTP komutu"
 
-#: resources.h:139
+#: resources.h:147
 msgid "Re&ad"
 msgstr "Ok&u"
 
-#: resources.h:569 resources.h:583
+#: resources.h:585 resources.h:601
 msgid "Re&fresh"
 msgstr "&Yenile"
 
-#: resources.h:63
+#: resources.h:71
 msgid "Re&name"
 msgstr "Ye&niden Adlandır"
 
@@ -5589,66 +5684,76 @@
 "Re-run the wizard and carefully check your settings and configure all "
 "routers and firewalls accordingly."
 msgstr ""
-"Sihirbazı yeniden çalıştırın ve ayarlarınızı dikkatle gözden geçirerek tüm "
+"Yardımcıyı yeniden çalıştırın ve ayarlarınızı dikkatle gözden geçirerek tüm "
 "yöneltici ve güvenlik duvarlarınızı uygun şekilde yapılandırın."
 
-#: resources.h:143
+#: resources.h:151
 msgid "Rea&d"
 msgstr "Ok&u"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Salt-okunur"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1131
 msgid "Really cancel current operation?"
 msgstr "Yürürlükteki işlem iptal edilsin mi?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "%d klasörü içindekilerle beraber silmek istiyor musunuz?"
+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] ""
+"Gerçekten sunucudaki %d klasörü içindekilerle beraber silmek istiyor musunuz?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "%d dosyayı silmek istiyor musunuz?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "%s ve %s silinsin mi?"
+msgid "Really delete %s and %s from the server?"
+msgstr "Gerçekten sunucudaki %s ve %s silinsin mi?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr ""
+"Gerçekten sunucudaki seçili tüö dosya ve klasörleri silmek istiyor musunuz?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Seçili dosya ve/veya klasörleri silmek istiyor musunuz?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Neden:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3235
 msgid "Reboot now"
 msgstr "Yeniden başlat"
 
-#: resources.h:148
+#: resources.h:156
 msgid "Rec&urse into subdirectories"
 msgstr "Alt klasörlere de &uygula"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 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:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Alınan veri bozuk"
 
@@ -5658,13 +5763,13 @@
 "If you continue, your connection will be disconnected."
 msgstr ""
 "Bir sunucuya bağlı iken yeniden bağlanma bilgisi silinemez.\n"
-"Eğer devam ederseniz bağlantınız kesilecek."
+"Devam ederseniz bağlantınız kesilecek."
 
-#: resources.h:741
+#: resources.h:761
 msgid "Reconnection settings"
 msgstr "Yeniden bağlanma ayarları"
 
-#: resources.h:993 resources.h:994
+#: resources.h:1019 resources.h:1020
 msgid "Reconnects to the last used server"
 msgstr "Son kullanılan sunucuya bağlanır"
 
@@ -5672,34 +5777,38 @@
 msgid "Redirection to invalid address"
 msgstr "Geçersiz adrese yönlendirme"
 
-#: resources.h:985 resources.h:986
+#: resources.h:1011 resources.h:1012
 msgid "Refresh the file and folder lists"
 msgstr "Dosya ve klasör listelerini yenile"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:505
+msgid "Remember passwords?"
+msgstr "Parolalar hatırlansın mı?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Uzaktaki"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:907
 msgid "Remote certificate not trusted."
 msgstr "Uzaktaki sertifikaya güvenilmiyor."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:376 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Uzaktaki dosya"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:449 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "Uzak dosya ara"
 
-#: resources.h:206
+#: resources.h:215
 msgid "Remote filters:"
 msgstr "Uzaktaki süzgeçler:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Uzaktaki yol"
 
@@ -5712,7 +5821,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:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5724,7 +5833,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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."
 
@@ -5732,11 +5841,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Uzaktaki yola gidilemedi."
 
-#: resources.h:445
+#: resources.h:454
 msgid "Remote path handling:"
 msgstr "Uzaktaki yolun işlenişi:"
 
-#: resources.h:313
+#: resources.h:322
 msgid "Remote path:"
 msgstr "Uzaktaki yol:"
 
@@ -5744,143 +5853,161 @@
 msgid "Remote site:"
 msgstr "Uzaktaki site:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:639 resources.h:643
 msgid "Remove &all"
 msgstr "Tümünü &sil"
 
-#: resources.h:621 resources.h:625
+#: resources.h:641 resources.h:645
 msgid "Remove &selected"
 msgstr "&Seçilileri sil"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Dosyayı yeniden adlandır"
 
-#: resources.h:637 resources.h:658
+#: resources.h:657 resources.h:678
 msgid "Rename selected directory"
 msgstr "Seçilen klasörü yeniden adlandır"
 
-#: resources.h:573 resources.h:587
+#: resources.h:589 resources.h:605
 msgid "Rename selected files and directories"
 msgstr "Seçilen dosya ve klasörleri yeniden adlandır"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "'%s' adı '%s' olarak değiştiriliyor"
 
-#: resources.h:472
+#: resources.h:481
 msgid "Reporting bugs and feature requests"
 msgstr "Hataları ve isteklerinizi iletebilirsiniz"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
-msgstr "TLS üzerinden açık FTP iste"
+msgstr "TLS üzerinden açıkta FTP iste"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "TLS üzerinden örtülü FTP iste"
 
-#: resources.h:624
+#: resources.h:644
 msgid "Reset and requeue &all"
 msgstr "Bur&ayı boşalt ve tümünü yeniden kuyruğa al"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "%s için adres çözümleniyor"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Sunucu adı çözümleniyor"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Yanıt:"
 
-#: resources.h:439
+#: resources.h:448
 msgid "Results:"
 msgstr "Sonuçlar:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Resume file transfer"
-msgstr "Dosya aktarımına devam et"
+msgstr "Dosya aktarımını sürdür"
 
-#: resources.h:858
+#: resources.h:878
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
-"Eğer sunucu istemciden farklı bir satır sonu karakteri kullanıyorsa ASCII "
-"dosyalarını devam ettirmek sorunlara yol açabilir."
+"Sunucu, istemciden farklı bir satır sonu karakteri kullanıyorsa, ASCII "
+"dosyalarını sürdürmek sorunlara yol açabilir."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Klasör listesi alınıyor..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "%s üzerinden dış IP adresi okunuyor"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:965
 msgid "Root certificate is not trusted"
 msgstr "Kök sertifikaya güvenilmiyor."
 
-#: resources.h:500
+#: resources.h:516
 msgid "S&how files currently being edited..."
 msgstr "Şu anda düzenlenen dosyaları g&öster..."
 
-#: resources.h:609
+#: resources.h:895
+msgid "S&how the Site Manager on startup"
+msgstr "Başlangıçta Sit&e Yöneticisi görünsün"
+
+#: resources.h:627
 msgid "S&hutdown system"
 msgstr "Sistemi &kapat"
 
-#: resources.h:437
+#: resources.h:446
 msgid "S&top"
 msgstr "&Dur"
 
-#: resources.h:516
+#: resources.h:532
 msgid "S&ynchronized browsing"
-msgstr "Eş&zamanlı tarama."
+msgstr "Eş&zamanlı tarama"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:121
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:175
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Ayarları kaydet?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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
+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:1835
 msgid "Scanning for files to add to queue"
 msgstr "Aktarım Kuyruğuna eklenecek dosyalar taranıyor"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1837
 msgid "Scanning for files to upload"
 msgstr "Karşıya yüklenecek dosyalar taranıyor"
 
-#: resources.h:433
+#: resources.h:442
 msgid "Search &conditions:"
 msgstr "Arama &kısıtları:"
 
-#: resources.h:431
+#: resources.h:440
 msgid "Search &directory:"
 msgstr "Arama &klasörü:"
 
-#: resources.h:1001
+#: resources.h:1027
 msgid "Search for files recursively."
 msgstr "Yinelenen dosyaları ara."
 
-#: resources.h:541
+#: resources.h:557
 msgid "Search server for files"
 msgstr "Sunucuda dosya ara"
 
@@ -5895,27 +6022,27 @@
 "Ayrıca http://wiki.filezilla-project.org/Network_Configuration (İngilizce) "
 "yazısına bakın."
 
-#: resources.h:375
+#: resources.h:384
 msgid "Sele&ct server"
 msgstr "Sunucu &seçin"
 
-#: resources.h:726
+#: resources.h:746
 msgid "Select &page:"
 msgstr "Sayfa &seçin:"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Select Theme"
 msgstr "Tema Seçimi"
 
-#: resources.h:836
+#: resources.h:856
 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 varsayılan "
 "işlemi seçin."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Varsayılan düzenleyiciyi seç"
 
@@ -5924,7 +6051,7 @@
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
-"Varsayılan 'hedef dosya var' işleminin ne olacağını seçin. Bu seçim sadece "
+"Varsayılan 'Hedef Dosya Var' işleminin ne olacağını seçin. Bu seçim yalnız "
 "şu andaki oturum için geçerli olacaktır."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
@@ -5935,7 +6062,7 @@
 "Şu anda kuyruktaki seçilmiş dosyalar için varsayılan 'Hedef Dosya Var' "
 "işlemini seçin."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Paketin indirileceği yeri seçin"
 
@@ -5956,7 +6083,7 @@
 msgstr "Ayarların verileceği dosyayı seçin"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "Verilecek siteler için bir dosya seçin"
 
@@ -5972,12 +6099,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "Dönüüştürülmüş anahtar dosyası için bir dosya adı seçin"
 
-#: resources.h:421
+#: resources.h:430
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Bu dosyalar nasıl açılmalı seçin."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Hedef indirme klasörünü seçin"
 
@@ -5985,15 +6112,15 @@
 msgid "Select target filename"
 msgstr "Hedef dosya adı seçin"
 
-#: resources.h:291
+#: resources.h:300
 msgid "Select the categories to export:"
 msgstr "Verilecek kategorileri seçin."
 
-#: resources.h:282
+#: resources.h:291
 msgid "Select the private data you would like to delete."
 msgstr "Lütfen silmek istediğin özel verinizi seçin."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6005,7 +6132,7 @@
 msgid_plural "Selected %d directories."
 msgstr[0] "%d klasör seçili."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6023,7 +6150,7 @@
 msgid_plural "Selected %d files. Total size: At least %s"
 msgstr[0] "Seçili dosya %d. Toplam boyut: En az %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Aktarım için %s ve %s seçili."
@@ -6038,13 +6165,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Seçili %s ve %s. Toplam boyut: En az %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "Seçili düzenleyici bulunamadı."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:329 ../../locales/../src/interface/LocalListView.cpp:2062
 msgid "Selected file already being edited"
 msgstr "Seçili dosya zaten düzenleniyor"
 
@@ -6052,17 +6179,17 @@
 msgid "Selected file is already loaded"
 msgstr "Seçili dosya zaten yüklenmiş"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2706
 msgid "Selected file is already opened"
 msgstr "Seçili dosya zaten açık"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 msgid "Selected file is still being edited"
-msgstr "Seçili dosya hala düzenleniyor"
+msgstr "Seçili dosya şu anda düzenleniyor"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
-msgstr "Seçilen süzgeç sadece yerel dosyalar için çalışır."
+msgstr "Seçilen süzgeç yalnız yerel dosyalar için çalışır."
 
 #: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
@@ -6075,90 +6202,96 @@
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr "Seçilen port genellikle başka bir protokol tarafından kullanılıyor."
+msgstr ""
+"Seçilen kapı genellikle başka bir iletişim kuralı tarafından kullanılır."
 
-#: resources.h:748
+#: resources.h:768
 msgid "Send FTP &keep-alive commands"
 msgstr "FTP canlı-&kal komutları gönder"
 
-#: resources.h:543
+#: resources.h:559
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Canlı-kal komutu gönderiliyor"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:35
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Serial number:"
 msgstr "Seri No:"
 
-#: resources.h:89
+#: resources.h:97
 msgid "Server &Type:"
 msgstr "Sunucu &Türü:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:787
 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:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "Sunucu ASCII dışındaki karakterleri desteklemiyor."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
-msgstr "Sunucu %d GB'tan büyük dosyaların devam edebilmesini desteklemiyor."
+msgstr "Sunucu %d GB boyutundan büyük dosyaların sürdürülmesini desteklemiyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"Sunucu %d GB'tan büyük dosyaların devam edebilmesini desteklemiyor. Aktarımı "
-"dosya boyut eşleşmesi ile bitir."
+"Sunucu %d GB boyutundan büyük dosyaların sürdürülmesini desteklemiyor. Dosya "
+"boyutları eşleştiğinde aktarımı bitir."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
-msgstr "Sunucu 2GB'tan büyük dosyaların devam edebilmesini desteklemiyor."
+msgstr "Sunucu 2GB boyutundan büyük dosyaların sürdürülmesini desteklemiyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
-msgstr "Sunucu 4GB'tan büyük dosyaların devam edebilmesini desteklemiyor."
+msgstr "Sunucu 4GB boyutundan büyük dosyaların sürdürülmesini desteklemiyor."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"Sunucu %d GB'tan büyük dosyaların devam edebilmesini desteklemiyor olabilir. "
-"Aktarımı dosya boyut eşleşmesi ile bitir."
+"Sunucu %d GB boyutundan büyük dosyaların sürdürülmesini desteklemiyor "
+"olabilir. Dosya boyutları eşleştiğinde aktarımı bitir."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr ""
-"Sunucu bir hesap gereksiniyor olabilir. Site Yöneticisi'ni kullanarak bir "
-"hesap belirtmeyi deneyin."
+"Sunucu bir hesaba gerek duyuyor olabilir. Site Yöneticisi'nde bir hesap "
+"oluşturmayı deneyin."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Sunucu boş bir yol döndürdü."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr ""
 "Sunucu ek giriş soruları soruyor. Etkileşimli giriş tipini kullanmalısınız."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
-"Sunucu yöneltilemeyen bir adresle pasif bir yanıt verdi. Pasif mod "
+"Sunucu yöneltilemeyen bir adresle pasif bir yanıt verdi. Pasif kip "
 "kullanılamadı."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6178,112 +6311,119 @@
 msgid "Server sent unexpected reply."
 msgstr "Sunucu beklenmeyen bir yanıt verdi."
 
-#: resources.h:351
+#: resources.h:360
 msgid "Server to client MAC:"
 msgstr "Sunucudan istemcinin MAC adresine:"
 
-#: resources.h:349
+#: resources.h:358
 msgid "Server to client cipher:"
 msgstr "Sunucudan istemciye şifre:"
 
-#: resources.h:380
+#: resources.h:389
 msgid "Server&type:"
 msgstr "Sunucu &Türü:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "Sunucu/Yerel dosya"
 
-#: resources.h:311 resources.h:373
+#: resources.h:320 resources.h:382
 msgid "Server:"
 msgstr "Sunucu:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:15 resources.h:43
 msgid "Session details"
-msgstr "Oturum detayları"
+msgstr "Oturum ayrıntıları"
 
-#: resources.h:596
+#: resources.h:614
 msgid "Set &Priority"
 msgstr "Öncelik &Belirle"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "'%s' izinlerini '%s' e ata"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:861
 msgid "SetSocketBufferSize called without socket"
 msgstr "Soket olmadan SetSocketBufferSize çağrıldı"
 
-#: resources.h:725
+#: resources.h:745
 msgid "Settings"
 msgstr "Ayarlar"
 
-#: resources.h:974
+#: resources.h:999
 msgid "Show &raw directory listing"
 msgstr "Ham klasö&r listesini göster"
 
-#: resources.h:552
+#: resources.h:568
 msgid "Show &welcome dialog..."
 msgstr "&Hoşgeldiniz penceresini görüntüle..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2401
 msgid "Show both directory trees and continue comparing?"
 msgstr "Her iki klasör ağacını göstererek karşılaştırmaya devam et?"
 
+#: resources.h:638
+msgid "Shows available TLS ciphers"
+msgstr "Kullanılabilecek TLS şifrelerini gösterir"
+
 #: ../../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:3233
+#: ../../locales/../src/interface/QueueView.cpp:3237
 msgid "Shutdown now"
 msgstr "Şimdi kapat"
 
-#: resources.h:299
+#: resources.h:308
 msgid "Site &Manager entries"
 msgstr "&Site Yöneticisi kayıtları"
 
-#: resources.h:70
+#: resources.h:78
 msgid "Site Manager"
 msgstr "Site Yöneticisi"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Site Yöneticisi - Parolalar hatırlanmıyor"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "Site Yöneticisi - Geçersiz veri"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Site Yöneticisi zaten açık"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Site bulunamadı."
 
 #: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
-msgstr "Site yolu 0 veya 1 ile başlamalı."
+msgstr "Site yolu 0 ya da 1 ile başlamalı."
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Site yolu bozuk."
 
@@ -6302,11 +6442,11 @@
 "kullanılabilir.\n"
 "Geçerli bağlantıyı Site Yöneticisine eklemek istiyor musunuz?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Boyut"
 
-#: resources.h:896
+#: resources.h:917
 msgid "Size formatting"
 msgstr "Boyut biçimi"
 
@@ -6315,31 +6455,32 @@
 msgid "Size unknown"
 msgstr "Boyut bilinmiyor"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 msgid "Skip file"
 msgstr "Dosyayı atla"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "%s indirilmesi geçiliyor"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "%s karşıya yüklemesi atlanıyor"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Some files are still being edited or need to be uploaded."
-msgstr "Bazı dosyalar hala düzenleniyor veya karşıya yüklenmeleri gerekli."
+msgstr ""
+"Şu anda düzenlenen bazı dosyalar var ya da karşıya yüklenmeleri gerekli."
 
-#: resources.h:688 resources.h:764
+#: resources.h:708 resources.h:784
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6347,19 +6488,19 @@
 "Yönelticilerin arkasında çalışan, bazı hatalı ayarlanmış sunucular kendi "
 "yerel IP adresleri ile yanıt verebilirler."
 
-#: resources.h:914
+#: resources.h:935
 msgid "Sort directories inline"
 msgstr "Klasörleri sırala"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 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."
 
-#: resources.h:910
+#: resources.h:931
 msgid "Sorting"
 msgstr "Sıralanıyor"
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting &mode:"
 msgstr "Sırala&ma kipi:"
 
@@ -6371,20 +6512,20 @@
 msgid "Source and target file may not be the same"
 msgstr "Kaynak ve hedef dosya aynı olmayabilir"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Bırakma operasyonunun kaynak ve hedefi aynı"
 
-#: resources.h:49
+#: resources.h:57
 msgid "Source file:"
 msgstr "Kaynak dosya:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:498 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Hız sınırları"
 
-#: resources.h:809
+#: resources.h:829
 msgid "Speed limits"
 msgstr "Hız sınırları"
 
@@ -6396,7 +6537,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Hız sınırları etkin, değiştirmek için tıklayın."
 
-#: resources.h:391
+#: resources.h:974
+msgid "Stable and beta versions"
+msgstr "Kararlı ve beta sürümleri"
+
+#: resources.h:973
+msgid "Stable versions only"
+msgstr "Yalnız kararlı sürümler"
+
+#: resources.h:400
 msgid "Start transfer &immediately"
 msgstr "Aktarıma &hemen başla"
 
@@ -6404,43 +6553,43 @@
 msgid "Start with opened Site Manager"
 msgstr "Açılmış Site Yöneticisi ile başla"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "%s indirilmesine başlanıyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "%s karşıya yüklemesi başlıyor"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "State or province:"
 msgstr "Şehir:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Durum"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Durum:"
 
-#: resources.h:593
+#: resources.h:611
 msgid "Stop and remove &all"
 msgstr "Durdur ve hepsini &sil"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Street:"
 msgstr "Sokak:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:11 resources.h:39
 msgid "Subject of certificate"
 msgstr "Sertifika konusu"
 
@@ -6448,56 +6597,56 @@
 msgid "Successful transfers"
 msgstr "Aktarılanlar"
 
-#: resources.h:716
+#: resources.h:736
 msgid "Summary of test results:"
 msgstr "Sınama sonuçları özeti:"
 
-#: resources.h:459
+#: resources.h:468
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
-"Dosyalara sembolik bağlantılar bu seçimden etkilenmez. Bu şekilde tüm "
-"sembolik bağlantılar herzaman silinir."
+"Dosya sembolik bağlantıları bu seçimden etkilenmez. Bu şekilde tüm sembolik "
+"bağlantılar herzaman silinir."
 
-#: resources.h:1000 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1026 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
-msgstr "Eşzamanlı tarama."
+msgstr "Eşzamanlı tarama"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Eşzamanlı tarama devre dışı."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Sözdizimi hatası"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2473
+#: ../../locales/../src/interface/cmdline.cpp:71
+#: ../../locales/../src/interface/cmdline.cpp:77
+#: ../../locales/../src/interface/cmdline.cpp:83
+#: ../../locales/../src/interface/cmdline.cpp:92
+#: ../../locales/../src/interface/cmdline.cpp:98
+#: ../../locales/../src/interface/Mainfrm.cpp:2551
 msgid "Syntax error in command line"
 msgstr "Komut satırında sözdizimi hatası"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Sistem"
 
-#: resources.h:518
+#: resources.h:534
 msgid "T&oolbar"
 msgstr "A&raç Çubuğu"
 
@@ -6505,11 +6654,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL bağlantısı kuruldu, HTTP isteği gönderiliyor"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TSL/SSL bağlantısı sağlandı, hoşgeldin iletisi bekleniyor..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL bağlantısı sağlandı."
 
@@ -6517,33 +6666,37 @@
 msgid "TTL expired"
 msgstr "TTL sona erdi"
 
-#: resources.h:47
+#: resources.h:55
 msgid "Target file already exists"
 msgstr "Hedef dosya zaten var"
 
-#: resources.h:53
+#: resources.h:61
 msgid "Target file:"
 msgstr "Hedef Dosya:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3211
+msgid "Target filename already exists!"
+msgstr "Hedef dosya zaten var!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1933
 msgid "Target filename already exists, really continue?"
 msgstr "Hedef dosya adı zaten var, devam edilsin mi?"
 
-#: resources.h:715
+#: resources.h:735
 msgid "Test results"
 msgstr "Sınama sonuçları"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
-msgstr "Sunucunun devam edebilme yeteneği sınanıyor."
+msgstr "Sunucunun aktarımı sürdürebilme yeteneği sınanıyor."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
-"Site Yöneticisi FileZilla 3'ün başka bir oturumunda açık.\n"
+"Site Yöneticisi başka bir FileZilla 3 oturumunda açık.\n"
 "Devam etmek istiyor musunuz? Devam ederseniz Site Yöneticisi'nde yapılan "
 "değişiklikler kaydedilemez."
 
@@ -6552,10 +6705,10 @@
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
 msgstr ""
-"Site Yöneticisi FileZilla 3'ün başka bir oturumunda açık.\n"
+"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:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "%s XML dosyası uygun şekilde hazırlanmamış."
@@ -6566,35 +6719,35 @@
 msgstr "Yazdığınız adres: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Yer imi eklenemedi."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Yer imleri silinemedi."
 
 #: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
-msgstr "Bu bağlantı şifrelenmiş. Detaylar için simgeye tıklayın."
+msgstr "Bu bağlantı şifrelenmiş. Ayrıntılar için simgeye tıklayın."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:89
 msgid "The custom login sequence cannot be empty."
 msgstr "Özel giriş sıralaması boş olamaz."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: resources.h:433 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Text dosyaları için varsayılan düzenleyici bulunamadı."
 
-#: resources.h:423
+#: resources.h:432
 #, c-format
 msgid "The default editor for text files is '%s'."
-msgstr "Text dosyaları için varsayılan düzenleyici: '%s'."
+msgstr "Metin dosyaları için varsayılan düzenleyici: '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 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."
 
@@ -6613,9 +6766,9 @@
 "%s adında bir dosya zaten var.\n"
 "Lütfen yeni bir ad yazın:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2039
+#: ../../locales/../src/interface/LocalListView.cpp:2170
+#: ../../locales/../src/interface/RemoteListView.cpp:2680
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6629,26 +6782,26 @@
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "'%s' dosyası yüklenemedi veya özel bir anahtar içermiyor."
+msgstr "'%s' dosyası yüklenemedi ya da özel bir anahtar içermiyor."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "'%s' dosyası yüklenemedi."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2033
+#: ../../locales/../src/interface/LocalListView.cpp:2165
+#: ../../locales/../src/interface/RemoteListView.cpp:2674
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
 "'%s' dosyası açılamıyor:\n"
-"Sisteminizde bu dosya tipi ile hiç bir program ilişkilendirilmemiş."
+"Sisteminizde bu dosya tipi ile ilişkilendirilmiş bir program yok."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2078
+#: ../../locales/../src/interface/LocalListView.cpp:2178
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6666,8 +6819,8 @@
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
 "'%s' dosyası FilzeZilla tarafından desteklenen bir biçimde değil.\n"
-"Dosya ayrıca şifre ile korunmuş. Şifre korumalı anahtar dosyaları henüz "
-"FileZilla tarafından desteklenmiyor.\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?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:266
@@ -6676,8 +6829,8 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
-"'%s' dosyası FilzeZilla tarafından desteklenen bir biçimde değil.\n"
-"Dosyayı desteklenen biçime dönüştürmek ister misiniz?"
+"'%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
@@ -6686,11 +6839,11 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
-"'%s' dosyası şifre ile korunmuş. Şifre korumalı anahtar dosyaları henüz "
-"FileZilla tarafından desteklenmiyor.\n"
-"Dosyayı desteklenen korumasız düzene dönüştürmek ister misiniz?"
+"'%s' dosyası parola ile korunmuş. FileZilla henüz ğarola 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:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "Varsayılan olarak seçilmiş olan düzenleyici bulunamadı."
 
@@ -6702,15 +6855,15 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"Seçtiğiniz dosyadaki Site Yöneticisi verisi FileZilla'nın önceki bir "
-"sürümüne ait.\n"
-"Veri saklama biçimindeki farklılıklar nedeniyle sadece sunucu, port, "
+"Seçtiğiniz dosyadaki Site Yöneticisi verisi önceki bir FileZilla sürümüne "
+"ait.\n"
+"Veri saklama biçimindeki farklılıklar nedeniyle yalnız sunucu, kapı, "
 "kullanıcı adı ve parola bilgileri alınacak.\n"
 "Almaya devam etmek istiyor musunuz?"
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr "Dosya adı sütunu gizlenemez veya kaldırılamaz."
+msgstr "Dosya adı sütunu gizlenemez ya da kaldırılamaz."
 
 #: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
@@ -6726,11 +6879,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Şu karakterler değiştirilecek: %s"
 
-#: resources.h:328
+#: resources.h:337
 msgid "The following files are currently being edited:"
 msgstr "Şu anda aşağıdaki dosyalar düzenleniyor:"
 
-#: resources.h:463
+#: resources.h:472
 msgid "The free open source FTP solution"
 msgstr "Ücretsiz açık kaynak kodlu FTP çözümü"
 
@@ -6738,7 +6891,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Küresel yer imleri kaydedilemedi."
 
-#: resources.h:972
+#: resources.h:997
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6764,27 +6917,27 @@
 msgid ""
 "The lowest available port has to be less or equal than the highest available "
 "port."
-msgstr "En küçük port, en büyük port sayısından küçük ya da eşit olmalı."
+msgstr "En küçük kapı, en büyük kapı sayısından küçük ya da eşit olmalı."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 ""
-"Güncel sürüm indirildi. FileZilla'yı kapatıp yüklemeyi başlatmak için \"Bitir"
-"\"e tıklayın."
+"Güncel sürüm indirildi. FileZilla'yı kapatıp yüklemeyi başlatmak için Bitir "
+"düğmesine tıklayın."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 "Güncel sürüm indirildi. Lütfen bu sürümü kurduğunuz şekilde kurun."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1968
 msgid "The queue will not be saved."
 msgstr "Kuyruk kaydedilemedi."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6797,24 +6950,24 @@
 msgid "The selected categories have been imported."
 msgstr "Seçilen kategoriler alındı."
 
-#: resources.h:298
+#: resources.h:307
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Seçilen dosya şu kategoriler için alınabilir veriler içeriyor:"
 
-#: resources.h:321
+#: resources.h:330
 msgid "The selected file is already being edited:"
 msgstr "Seçilen dosya zaten düzenleniyor:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2734
 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/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2045
+#: ../../locales/../src/interface/RemoteListView.cpp:2686
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6832,7 +6985,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Sunucu anlaşılamayan bir yanıt verdi."
 
-#: resources.h:106
+#: resources.h:114
 msgid "The server uses following charset encoding for filenames:"
 msgstr "Sunucu dosya adları için şu karakter setini kullan:"
 
@@ -6844,7 +6997,7 @@
 "Sunucu sertifikası tanınmıyor. Lütfen sunucunun güvenilir olup olmadığını "
 "anlamak için sertifikayı dikkatle inceleyin."
 
-#: resources.h:187
+#: resources.h:196
 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 "
@@ -6854,7 +7007,7 @@
 "anahtarı değiştirdi ya da siz kendisini bağlanmak istediğiniz sunucu gibi "
 "gösteren başka bir bilgisayara bağlanmaya çalışıyorsunuz."
 
-#: resources.h:175
+#: resources.h:184
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6867,18 +7020,18 @@
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
 msgstr ""
-"Ayarlar alındı. Bütün ayarların etkin olabilmesi için FileZilla'yı yeniden "
-"başlatmalısınız."
+"Ayarlar alındı. Bütün ayarların etkin olabilmesi için FileZilla yeniden "
+"başlatılmalı."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3226
 msgid "The system will soon reboot unless you click Cancel."
-msgstr "İptal'e tıklamazsanız sistem yeniden başlatılacak."
+msgstr "İptal düğmesine tıklamazsanız sistem yeniden başlatılacak."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "The system will soon shut down unless you click Cancel."
-msgstr "İptal'e tıklamazsanız sistem birazdan kapanacak."
+msgstr "İptal düğmesine tıklamazsanız sistem birazdan kapanacak."
 
-#: resources.h:48
+#: resources.h:56
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6886,19 +7039,19 @@
 "Hedef dosya zaten var.\n"
 "Lütfen bir işlem seçin:"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
-msgstr "Sınama başarılı olamadı. Ayarları kaydetmek istediğinize emin misiniz?"
+msgstr "Sınama başarısız oldu. Ayarları kaydetmek istediğinize emin misiniz?"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:127
 msgid "Themes"
 msgstr "Temalar"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Bu süzme seti silinemiyor."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Bu süzme seti yeniden adlandırılamaz."
 
@@ -6907,67 +7060,65 @@
 "This means that some router and/or firewall is still interfering with "
 "FileZilla."
 msgstr ""
-"Bunun anlamı bir yöneltici veya güvenlik duvarı hala FileZilla ile sorun "
-"çıkarıyor olduğudur."
+"Yani bir yöneltici ya da güvenlik duvarı hala FileZilla ile sorun çıkarıyor."
 
-#: resources.h:693
+#: resources.h:713
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
-"Bu yalnızca bir yöneltici arkasında değilseniz çalışır, aksi takdirde sistem "
-"sadece iç IP adresinizi bulur."
+"Bu özellik, yalnızca bir yöneltici arkasında değilseniz çalışır, aksi "
+"durumda sistem yalnız iç IP adresinizi bulur."
 
-#: resources.h:671
+#: resources.h:691
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr ""
-"Bu sihirbaz sahip olduğunuz tüm güvenlik duvarları ve yönelticilerinizi "
-"düzgün şekilde ayarlamanıza yardım ederek, yapılandırmanızı oluşturacak ve "
-"sınayacak."
+"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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
-msgstr "Zaman"
+msgstr "Saat"
 
-#: resources.h:890
+#: resources.h:911
 msgid "Time formatting"
-msgstr "Zaman biçimi"
+msgstr "Saat biçimi"
 
-#: resources.h:732
+#: resources.h:752
 msgid "Time&out in seconds:"
 msgstr "Zaman &aşımı (saniye):"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:755 ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1114
 msgid "Timeout"
 msgstr "Zaman aşımı"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr ""
-"Zaman dilimi farkı: Sunucu: %d saniye. Yerel: %d saniye. Fark: %d saniye."
+"Saat dilimi farkı: Sunucu: %d saniye. Yerel: %d saniye. Fark: %d saniye."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Title:"
 msgstr "Başlık:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 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:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2400
 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 veya gizlenmeli."
+"Bunu yapabilmek için klasör ağaçlarının ikisi de görünmeli ya da gizlenmeli."
 
-#: resources.h:786
+#: resources.h:806
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -6975,7 +7126,7 @@
 "Açık anahtar yetkilendirmesini kullanabilmek için FileZilla kullandığınız "
 "özel anahtarı bilmek zorunda."
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6984,7 +7135,7 @@
 "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ştir. Karşılaştırma modunu değiştirmek için sağ "
+"Klasör karşılaştırmasını değiştir. Karşılaştırma kipini değiştirmek için sağ "
 "tıklayın.\n"
 "\n"
 "Renkler:\n"
@@ -6992,7 +7143,7 @@
 "Yeşil: Dosya öbür taraftaki işaretlenmemiş dosyadan yeni\n"
 "Kırmızı: Dosya boyutları farklı"
 
-#: resources.h:999
+#: resources.h:1025
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7002,23 +7153,23 @@
 "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."
 
-#: resources.h:987 resources.h:988
+#: resources.h:1013 resources.h:1014
 msgid "Toggles processing of the transfer queue"
 msgstr "Kuyruktaki aktarımları başlat/durdur"
 
-#: resources.h:979 resources.h:980
+#: resources.h:1005 resources.h:1006
 msgid "Toggles the display of the local directory tree"
 msgstr "Yerel klasör ağacını göster/gizle"
 
-#: resources.h:977 resources.h:978
+#: resources.h:1003 resources.h:1004
 msgid "Toggles the display of the message log"
 msgstr "İleti kaydını göster/gizle"
 
-#: resources.h:981 resources.h:982
+#: resources.h:1007 resources.h:1008
 msgid "Toggles the display of the remote directory tree"
 msgstr "Uzak klasör ağacını göster/gizle"
 
-#: resources.h:983 resources.h:984
+#: resources.h:1009 resources.h:1010
 msgid "Toggles the display of the transfer queue"
 msgstr "Aktarım kuyruğunu göster/gizle"
 
@@ -7031,37 +7182,37 @@
 msgstr "Çok fazla yönlendirme"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Yolu İzle:"
 
-#: resources.h:920 resources.h:926
+#: resources.h:941 resources.h:947
 msgid "Transfer"
 msgstr "Aktarım"
 
-#: resources.h:361
+#: resources.h:370
 msgid "Transfer &direction"
 msgstr "Aktarım &yönü"
 
-#: resources.h:527
+#: resources.h:543
 msgid "Transfer &type"
 msgstr "Aktarım &tipi"
 
-#: resources.h:742
+#: resources.h:762
 msgid "Transfer Mode"
-msgstr "Aktarım modu"
+msgstr "Aktarım Kipi"
 
-#: resources.h:876
+#: resources.h:897
 msgid "Transfer Queue"
 msgstr "Aktarım Kuyruğu"
 
-#: resources.h:98
+#: resources.h:106
 msgid "Transfer Settings"
 msgstr "Aktarım Ayarları"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:500
+#: ../../locales/../src/engine/transfersocket.cpp:524
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Aktarım bağlantısı kesildi: %s"
@@ -7070,8 +7221,8 @@
 msgid "Transferred data got tainted."
 msgstr "Aktarılan veri bozuldu."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1495
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Aktarılıyor"
 
@@ -7079,69 +7230,69 @@
 msgid "Transfers"
 msgstr "Aktarımlar"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3140
+#: ../../locales/../src/interface/QueueView.cpp:3143
 msgid "Transfers finished"
 msgstr "Aktarımlar bitti"
 
-#: resources.h:833
+#: resources.h:853
 msgid "Treat files &without extension as ASCII file"
 msgstr "Uzantısı &olmayan dosyalara ASCII dosyası olarak davran"
 
-#: resources.h:829
+#: resources.h:849
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Şu dosya türlerini ASCII &dosyaları olarak algıla:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Değiştirilmiş sunucu anahtarına güven:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Yeni sunucu anahtarına güven:"
 
-#: resources.h:194
+#: resources.h:203
 msgid "Trust the new key and carry on connecting?"
 msgstr "Yeni anahtara güvenip bağlantı sağlansın mı?"
 
-#: resources.h:22
+#: resources.h:26
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Sertifakaya güvenip bağlanmaya devam et?"
 
-#: resources.h:181
+#: resources.h:190
 msgid "Trust this host and carry on connecting?"
 msgstr "Bu sunucuya güvenilip bağlantı sağlansın mı?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:405 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Tip"
 
-#: resources.h:768
+#: resources.h:788
 msgid "Type of FTP Proxy:"
-msgstr "FTP Proxy tipi:"
+msgstr "FTP vekil sunucu tipi:"
 
-#: resources.h:793
+#: resources.h:813
 msgid "Type of generic proxy:"
-msgstr "Genel proxy tipi:"
+msgstr "Genel vekil sunucu tipi:"
 
-#: resources.h:331
+#: resources.h:340
 msgid "U&pload"
 msgstr "Karşıya Yü&kle"
 
-#: resources.h:484 resources.h:813
+#: resources.h:493 resources.h:833
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "&Karşıya yükleme sınırı:"
 
-#: resources.h:938
+#: resources.h:959
 msgid "U&se filetype associations if available"
 msgstr "Var&sa dosya ilişkilendirmelerini kullan"
 
-#: resources.h:891
+#: resources.h:912
 msgid "U&se system defaults"
 msgstr "Sistem var&sayılanlarını kullan"
 
-#: resources.h:770
+#: resources.h:790
 msgid "USER@&HOST"
 msgstr "KULLANICI@&SUNUCU"
 
@@ -7150,29 +7301,30 @@
 msgid "Unassigned error code %d"
 msgstr "Atanmamış hata kodu %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Unit:"
 msgstr "Birim:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Bilinmeyen"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
-msgstr "Bilinmeyen FTP proxy tipi yüzünden giriş işlemi sıralaması yapılamadı."
+msgstr ""
+"Bilinmeyen FTP vekil sunucu tipi yüzünden giriş işlemi sıralaması yapılamadı."
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
 msgid "Unknown SOCKS protocol version: %d"
-msgstr "Bilinmeyen SOCKS protokolü sürümü: %d"
+msgstr "Bilinmeyen SOCKS iletişim kuralı sürümü: %d"
 
 #: resources.h:1
 msgid "Unknown certificate"
 msgstr "Bilinmeyen sertifika"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
@@ -7180,7 +7332,7 @@
 "Dosya açılırken bilinmeyen bir hata oluştu. Dosyanın erişilebilir ve uygun "
 "şekilde düzenlenmiş bir XML belgesi olduğundan emin olun."
 
-#: resources.h:174
+#: resources.h:183
 msgid "Unknown host key"
 msgstr "Bilinmeyen sunucu anahtarı"
 
@@ -7189,9 +7341,10 @@
 msgid ""
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
-msgstr "SOCKS Kullanıcı Adı/Parola iletişiminde bilinmeyen protokol sürümü: %d"
+msgstr ""
+"SOCKS Kullanıcı Adı/Parola iletişiminde bilinmeyen iletişim kuralı sürümü: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7204,16 +7357,16 @@
 "Unless these problems get fixed, active mode FTP will not work and passive "
 "mode has to be used."
 msgstr ""
-"Bu sorunlar çözülmeden aktif mod çalışmaz, sadece pasif mod kullanılabilir."
+"Bu sorunlar çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:583
 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 mod çalışmaz, sadece pasif mod kullanılabilir."
+"Bu sorun çözülmeden aktif kip çalışmaz, yalnız pasif kip kullanılabilir."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Unsupported certificate type"
 msgstr "Desteklenmeyen sertifika tipi"
 
@@ -7221,25 +7374,24 @@
 msgid "Unsupported redirect"
 msgstr "Desteklenmeyen yönlendirme"
 
-#: resources.h:332
+#: resources.h:341
 msgid "Up&load and unedit"
 msgstr "Karşıya yük&le ve kapat"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Güncelleme Denetimi"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
-msgstr "Güncelleme sihirbazı"
+msgstr "Güncelleme yardımcısı"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Güncellemeler"
+
+#: resources.h:372
 msgid "Upload"
 msgstr "Karşıya Yükle"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "Karşıya yüklenemedi"
 
@@ -7252,188 +7404,188 @@
 msgid "Upload limit: none"
 msgstr "Karşıya yükleme sınırı: yok"
 
-#: resources.h:648
+#: resources.h:668
 msgid "Upload selected directory"
 msgstr "Seçili klasörü karşıya yükle"
 
-#: resources.h:558
+#: resources.h:574
 msgid "Upload selected files and directories"
 msgstr "Seçili dosya ve klasörleri karşıya yükle"
 
-#: resources.h:316
+#: resources.h:325
 msgid "Upload this file back to the server?"
 msgstr "Bu dosya sunucuya geri yüklensin mi?"
 
-#: resources.h:315
+#: resources.h:324
 msgid "Upload this file to the server?"
 msgstr "Bu dosya sunucuya yüklensin mi?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Yükleme"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Karşıya yükleniyor ve silinmesi bekleniyor"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Karşıya yüklenip kapatılıyor"
 
-#: resources.h:110
+#: resources.h:118
 msgid "Use &custom charset"
 msgstr "Özel &karakter seti kullan"
 
-#: resources.h:935
+#: resources.h:956
 msgid "Use &custom editor:"
 msgstr "Şu özel &düzenleyiciyi kullan:"
 
-#: resources.h:422
+#: resources.h:431
 msgid "Use &default editor for text files"
 msgstr "Text dosyaları için varsayılan &düzenleyiciyi kullan"
 
-#: resources.h:405 resources.h:411
+#: resources.h:414 resources.h:420
 msgid "Use &synchronized browsing"
 msgstr "Eş&zamanlı taramayı kullan"
 
-#: resources.h:108
+#: resources.h:116
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
-"Sunucu destekliyorsa UTF-8'i, desteklemiyorsa yerel karakter setini kullanın."
+"Sunucu destekliyorsa UTF-8, desteklemiyorsa yerel karakter setini kullanın."
 
-#: resources.h:258 resources.h:268
+#: resources.h:267 resources.h:277
 msgid "Use default action"
 msgstr "Varsayılanı işlemi kullan"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "Normal FTP kullan"
 
-#: resources.h:371
+#: resources.h:380
 msgid "Use server currently connected to"
 msgstr "Şu anda bağlı olan sunucuyu kullan"
 
-#: resources.h:372
+#: resources.h:381
 msgid "Use server from site manager"
 msgstr "Site yöneticisinden sunucuyu kullan"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Use system &defaults"
 msgstr "&Varsayılanları kullan"
 
-#: resources.h:694
+#: resources.h:714
 msgid "Use the following IP address:"
 msgstr "Şu IP adresini kullan:"
 
-#: resources.h:704
+#: resources.h:724
 msgid "Use the following port range:"
-msgstr "Şu port aralığını kullan:"
+msgstr "Şu kapı aralığını kullan:"
 
-#: resources.h:689
+#: resources.h:709
 msgid "Use the server's external IP address instead"
 msgstr "Yerine sunucunun dış IP adresini kullan"
 
-#: resources.h:695 resources.h:758
+#: resources.h:715 resources.h:778
 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 adresine sahip iseniz bunu "
 "seçin."
 
-#: resources.h:698
+#: resources.h:718
 msgid ""
 "Use this option if you have a dynamic IP address. FileZilla will contact the "
 "above server once each session as soon as you use active mode for the first "
 "time. Only the version of FileZilla you're using is submitted to the server."
 msgstr ""
-"Dinamik IP adresiniz varsa bu seçeneği kullanın. FileZilla, aktif modu ilk "
+"Dinamik IP adresiniz varsa bu seçeneği kullanın. FileZilla, aktif kipi ilk "
 "kez kullandığınızda, yukarıdaki sunucuyla her oturumda bir kere bağlantı "
-"kuracaktır. Sunucuya sadece FileZilla'nın hangi sürümünü kullandığınız "
+"kuracaktır. Sunucuya yalnız hangi FileZilla hangi sürümünü kullandığınız "
 "bilgisi gönderilir."
 
-#: resources.h:122
+#: resources.h:130
 msgid "User:"
 msgstr "Kullanıcı:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Kullanıcı adı bir dizi boşluk olamaz"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
-msgstr "Proxy %s kullanılıyor"
+msgstr "%s vekil sunucusu kullanılıyor"
 
-#: resources.h:112
+#: resources.h:120
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Yanlış karakter seti kullanımı dosya adlarının düzgün görüntülenmemesine yol "
 "açabilir."
 
-#: resources.h:231
+#: resources.h:240
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
-"Bu sihirbazı kullanarak FileZilla güncelleştirmelerini denetleyebilirsiniz."
+"Bu yardımcıyı kullanarak FileZilla güncelleştirmelerini denetleyebilirsiniz."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:33
 msgid "Valid from:"
 msgstr "Geçerlilik Başlangıcı:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:34
 msgid "Valid to:"
 msgstr "Geçerlilik Sonu:"
 
 #: ../../locales/../src/interface/cmdline.cpp:16
 msgid "Verbose log messages from wxWidgets"
-msgstr "wxWidgets'den Verbose günlük iletileri"
+msgstr "Ayrıntılı wxWidgets günlük iletileri"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1128
 msgid "Verifying certificate..."
 msgstr "Sertifika onaylanıyor..."
 
-#: resources.h:169
+#: resources.h:178
 msgid "Version:"
 msgstr "Sürüm:"
 
-#: resources.h:818
+#: resources.h:838
 msgid "Very high"
 msgstr "Çok yüksek"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "Gizli dosyaları göster seçili, ama sunucu desteklemiyor"
 
-#: resources.h:922
+#: resources.h:943
 msgid "View/Edit"
 msgstr "Göster/Düzenle"
 
-#: resources.h:355
+#: resources.h:364
 msgid "Visible columns"
 msgstr "Gösterilecek sütunlar"
 
-#: resources.h:140
+#: resources.h:148
 msgid "W&rite"
 msgstr "Y&az"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1794
 msgid "Waiting"
 msgstr "Bekliyor"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1402
 msgid "Waiting for browsing connection"
 msgstr "Tarama bağlantısı için bekliyor"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1445
 msgid "Waiting for password"
 msgstr "Parola yazmanız bekleniyor"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Aktarımın iptal edilmesi bekleniyor"
 
@@ -7441,7 +7593,7 @@
 msgid "Waiting to retry..."
 msgstr "Yeniden denemek için bekleniyor..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7462,21 +7614,21 @@
 "Windowsdaki bir hata Filezilla için sorun yaratıyor\n"
 "\n"
 "Hata şu durumlarda oluşuyor\n"
-"- Windows Server 2003 veya XP 64 kullanıyorsanız\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 veya Uygulama Katmanı Ağ geçidi hizmetini devre dışı "
+"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:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "Uyarı, yanlış IP adresinden yapılan veri bağlantısı yok sayılıyor."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7490,23 +7642,31 @@
 "\n"
 "Gerçekten gecelik sürümleri denetlemek istiyor musunuz?"
 
-#: resources.h:186
+#: resources.h:195
 msgid "Warning: Potential security breach!"
 msgstr "Dikkat: Olası güvenlik ihlali!"
 
-#: resources.h:475
+#: resources.h:484
 msgid "Welcome to FileZilla"
 msgstr "FileZilla'ya Hoşgeldiniz"
 
-#: resources.h:464
+#: resources.h:473
 msgid "What's new"
 msgstr "Yenilikler:"
 
-#: resources.h:241
+#: resources.h:250
 msgid "What's new:"
 msgstr "Yenilikler:"
 
-#: resources.h:821
+#: resources.h:500
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"Parola hatırlamayı etkinleştirdiğinizde, FileZilla yeniden başlatıldığında, "
+"parolayı yeniden yazmanız gerekmeden bağlanabilirsiniz."
+
+#: resources.h:841
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
@@ -7514,11 +7674,15 @@
 "Etkinleştirildiğinde yerel işletim sistemi tarafından desteklenmeyen dosya "
 "adı karakterleri indirme sırasında değiştirilir."
 
-#: resources.h:863
+#: resources.h:883
 msgid "Widescreen"
 msgstr "Geniş Ekran"
 
-#: resources.h:144
+#: resources.h:499
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Parola hatırlamayı etkinleştirmek ister misiniz?"
+
+#: resources.h:152
 msgid "Wr&ite"
 msgstr "Ya&z"
 
@@ -7531,27 +7695,35 @@
 msgid "Wrong line endings"
 msgstr "Yanlış satır sonu"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Evet"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Kullandığınız bilgisayar yalnız IPv6 kullanıyor gibi. Bu yardımcı, bu ortamı "
+"desteklemiyor."
+
+#: resources.h:261
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr ""
-"FileZilla'nın en son sürümünü kullanıyorsunuz. Yeni sürümleri daha sonra "
-"yeniden denetleyebilirsiniz."
+"En son FileZilla sürümünü kullanıyorsunuz. Yeni sürümleri daha sonra yeniden "
+"denetleyebilirsiniz."
 
-#: resources.h:473
+#: resources.h:482
 msgid "You can always open this dialog again through the help menu."
 msgstr "Bu pencereyi yardım menüsünden açabilirsiniz"
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
-msgstr "Varsayılan portu kullanmak için Port alanını boş bırakın."
+msgstr "Varsayılan kapıyı kullanmak için Kapı alanını boş bırakın."
 
-#: resources.h:147
+#: resources.h:155
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7575,12 +7747,12 @@
 "Dosya için yeni bir ad yazmadınız. Onun yerine dosyanın üzerine yazmak ister "
 "misiniz?"
 
-#: resources.h:454
+#: resources.h:463
 msgid "You have selected at least one symbolic link."
 msgstr "En az bir sembolik bağlantı seçmelisiniz."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2012
+#: ../../locales/../src/interface/RemoteListView.cpp:2653
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
@@ -7588,20 +7760,20 @@
 "Düzenleme için 10 taneden fazla dosya seçtiniz. Bunu gerçekten yapmak "
 "istiyor musunuz?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2132
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
-"Açmak için 10 taneden fazla dosya veya klasör seçtiniz. Bunu gerçekten "
+"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:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Bir sunucu adı yazmalısınız."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Yerel bir klasör yazmalısınız."
 
@@ -7610,17 +7782,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Geçerli bir IP adresi yazmalısınız."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 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:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "Bir hesap adı yazmalısınız"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "Bir kullanıcı adı yazmalısınız"
 
@@ -7629,7 +7801,7 @@
 "You likely have a router or firewall which erroneously modified the "
 "transferred data."
 msgstr ""
-"Aktarılan veriyi değiştiren bir yönelticiniz veya güvenlik duvarınız var "
+"Aktarılan veriyi değiştiren bir yönelticiniz ya da güvenlik duvarınız var "
 "gibi görünüyor."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:55
@@ -7640,28 +7812,28 @@
 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:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Uygun şekilde düzenlenmiş bir komut yazmalısınız."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
-msgstr "Bir proxy sunucu adı yazmalısınız."
+msgstr "Bir vekil sunucu adı yazmalısınız."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
-msgstr "1 ile 65535 arasında bir proxy portu yazmalısınız"
+msgstr "1 ile 65535 arasında bir vekil sunucu kapısı yazmalısınız"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 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:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7669,7 +7841,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:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7701,44 +7873,49 @@
 "Diğer sunuculara bağlanmakta bir sorununuz olmamalı. Dosya aktarımları "
 "düzgün çalışıyor olmalı."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "sonra"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "önce"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "şununla başlıyor:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bayt"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "içerir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "içermeyen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "eşit olmayan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "şununla bitiyor:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "eşittir"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "dosya"
 
@@ -7757,82 +7934,127 @@
 "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:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp başlatılamıyor"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:974
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers hiç bir sertifika bulamadı"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "daha büyüktür"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "grup çalıştırabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "grup okuyabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "grup yazabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "eşittir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "ayarlanmış"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "ayarlanmamış"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "daha azdır"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
-msgstr "regex'e uyar"
+msgstr "düzenli ifadelere uyan"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "sahibi çalıştırabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "sahibi okuyabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "sahibi yazabilir"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1139
+#: ../../locales/../src/engine/tlssocket.cpp:1150
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "bilinmeyen"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "Herkes çalıştırabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "Herkes okuyabilir"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "Herkes yazabilir"
 
-#: resources.h:165
+#: resources.h:173
 msgid "wxWidgets:"
 msgstr "wxEklentileri:"
 
+#~ msgid "&Copy"
+#~ msgstr "&Kopyala"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "Günc&ellemeleri kendiliğinden denetle"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "Gü&ncellemeleri şu kadar günde bir denetle:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(En az 7 gün)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Kendiliğinden güncelleme denetimi"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "&Beta ve yayına hazırlanan sürümlere de bak"
+
+#~ msgid "Cop&y"
+#~ msgstr "Kop&yala"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Lütfen en az 7 günlük bir güncelleme sıklığı yazın"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Gizlilik politikası:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bayt (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bayt (%d.%d MB/s)"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "Hatalı işlem durumu: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Çift süzgeç adı"
 
diff -Nru filezilla-3.5.3/locales/uk_UA.po filezilla-3.7.3~precise/locales/uk_UA.po
--- filezilla-3.5.3/locales/uk_UA.po	2010-06-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/locales/uk_UA.po	2012-10-21 20:00:08.000000000 +0000
@@ -2,7 +2,7 @@
 msgstr ""
 "Project-Id-Version: FileZilla\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2010-06-20 11:35+0200\n"
+"POT-Creation-Date: 2012-10-21 20:19+0200\n"
 "PO-Revision-Date: \n"
 "Last-Translator: Igor Chomko <igorchomko@gmail.com>\n"
 "Language-Team: Ihor Chomko <igorchomko@gmail.com>\n"
@@ -17,16 +17,16 @@
 "10<=4 && (n%100<10 || n%100>=20) ? 1 : 2);\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:221
+#: ../../locales/../src/interface/statuslinectrl.cpp:225
 msgid "%H:%M:%S elapsed"
 msgstr "%H:%M:%S минуло"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:229
+#: ../../locales/../src/interface/statuslinectrl.cpp:233
 msgid "%H:%M:%S left"
 msgstr "%H:%M:%S залишилось"
 
-#: resources.h:772
+#: resources.h:788
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -45,9 +45,9 @@
 msgstr[1] "%d directories"
 msgstr[2] "%d directories"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1661
-#: ../../locales/../src/interface/search.cpp:802
-#: ../../locales/../src/interface/search.cpp:1050
+#: ../../locales/../src/interface/RemoteListView.cpp:1709
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, 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:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1660
-#: ../../locales/../src/interface/search.cpp:801
-#: ../../locales/../src/interface/search.cpp:1049
+#: ../../locales/../src/interface/RemoteListView.cpp:1708
+#: ../../locales/../src/interface/search.cpp:775
+#: ../../locales/../src/interface/search.cpp:1028
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -83,7 +83,7 @@
 msgstr[1] "%d files. Total size: At least %s"
 msgstr[2] "%d files. Total size: At least %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2823
+#: ../../locales/../src/interface/QueueView.cpp:2937
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d файли додані до черги"
@@ -96,46 +96,46 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: resources.h:769
+#: resources.h:785
 msgid "%h - Host"
 msgstr "%h - Хост"
 
-#: resources.h:771
+#: resources.h:787
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Пароль"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:181
 #, fuzzy, c-format
 msgid "%s (%d B/s)"
 msgstr "%s байт (%d Б/с)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:175
+#: ../../locales/../src/interface/statuslinectrl.cpp:179
 #, fuzzy, c-format
 msgid "%s (%d.%d KB/s)"
 msgstr "%s байт(%d.%d KБ/с)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:173
+#: ../../locales/../src/interface/statuslinectrl.cpp:177
 #, fuzzy, c-format
 msgid "%s (%d.%d MB/s)"
 msgstr "%sбайт (%d.%d MБ/с)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:180
+#: ../../locales/../src/interface/statuslinectrl.cpp:184
 #, fuzzy, c-format
 msgid "%s (? B/s)"
 msgstr "%sбайт (? Б/с)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:38
+#: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
 msgstr "%s - Дія сертифікату вичерпана"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:22
+#: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - Все ще не дійсний!"
 
-#: resources.h:773
+#: resources.h:789
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Користувач проксі"
@@ -178,7 +178,7 @@
 msgid "%s bytes (%d.%d MB/s)"
 msgstr "%sбайт (%d.%d MБ/с)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:804
+#: ../../locales/../src/interface/FileZilla.cpp:701
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -192,7 +192,7 @@
 "Завантажте FileZilla повторно. Якщо ця проблема повториться - повідомте,"
 "будь- ласка, про неполадку."
 
-#: ../../locales/../src/interface/FileZilla.cpp:898
+#: ../../locales/../src/interface/FileZilla.cpp:795
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -209,50 +209,50 @@
 "маршрутного імені змінної конфігурації.\n"
 "- Встановіть повний маршрут до %s у змінній конфігурації FZ_FZSFTP."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:55
+#: ../../locales/../src/interface/verifycertdialog.cpp:56
 #, c-format
 msgid "%s with %d bits"
 msgstr "%s with %d біти"
 
-#: resources.h:770
+#: resources.h:786
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u -Ім'я користувача"
 
-#: resources.h:774
+#: resources.h:790
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Пароль проксі"
 
-#: resources.h:553
+#: resources.h:563
 msgid "&About..."
 msgstr "&Про..."
 
-#: resources.h:85 resources.h:383
+#: resources.h:86 resources.h:385
 msgid "&Account:"
 msgstr "&Акаунт:"
 
-#: resources.h:100 resources.h:674 resources.h:738
+#: resources.h:101 resources.h:690 resources.h:754
 msgid "&Active"
 msgstr "&Активний"
 
-#: resources.h:544
+#: resources.h:554
 msgid "&Add bookmark..."
 msgstr ""
 
-#: resources.h:557 resources.h:574
+#: resources.h:567 resources.h:584
 msgid "&Add files to queue"
 msgstr "&Додати файли до черги"
 
-#: resources.h:782
+#: resources.h:798
 msgid "&Add keyfile..."
 msgstr "&Додати файл ключа..."
 
-#: resources.h:624 resources.h:643
+#: resources.h:640 resources.h:659
 msgid "&Add to queue"
 msgstr "&Додати до черги"
 
-#: resources.h:94
+#: resources.h:95
 #, fuzzy
 msgid "&Adjust server timezone offset:"
 msgstr "Узгодити налаштування часового поясу за сервером"
@@ -261,15 +261,15 @@
 msgid "&Always trust certificate in future sessions."
 msgstr "&У майбутніх сесіях завжди довіряти сертифікату."
 
-#: resources.h:181
+#: resources.h:183
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Завжди довіряти цьому хосту,додати вказаний ключ у каше"
 
-#: resources.h:932
+#: resources.h:950
 msgid "&Always use default editor"
 msgstr "&Завжди використовувати редактор за замовчуванням"
 
-#: resources.h:426
+#: resources.h:428
 msgid "&Always use selection for unassociated files"
 msgstr ""
 
@@ -277,259 +277,265 @@
 msgid "&Always use this action"
 msgstr "&Завжди виконувати цю дію"
 
-#: resources.h:750
+#: resources.h:766
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Здійснювати запит в операційної системи щодо завнішньої ІР адреси"
 
-#: resources.h:526 resources.h:654 resources.h:819
+#: resources.h:536 resources.h:670 resources.h:835
 msgid "&Auto"
 msgstr "&Автоматично"
 
-#: resources.h:106
+#: resources.h:107
 msgid "&Autodetect"
 msgstr "&Автовизначення"
 
-#: resources.h:621
-msgid "&Automatically remove successful transfers"
-msgstr "&Автоматично видаляти успішну передачу даних"
-
-#: resources.h:528 resources.h:656 resources.h:821
+#: resources.h:538 resources.h:672 resources.h:837
 msgid "&Binary"
 msgstr "&Бінарний"
 
-#: resources.h:892
+#: resources.h:910
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr ""
 "&Бінарні префікси з використанням символів SI.(наприклад 1 КБ = 1024 байти)"
 
-#: resources.h:543
+#: resources.h:553
 msgid "&Bookmarks"
 msgstr ""
 
-#: resources.h:91 resources.h:365 resources.h:402 resources.h:408
-#: resources.h:425 resources.h:443 resources.h:929 resources.h:951
+#: resources.h:92 resources.h:367 resources.h:404 resources.h:410
+#: resources.h:427 resources.h:445 resources.h:947 resources.h:969
 msgid "&Browse..."
 msgstr "&Перегляд..."
 
-#: resources.h:809
+#: resources.h:825
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Стійкість пакету:"
 
-#: resources.h:127 resources.h:130 resources.h:196 resources.h:487
-#: resources.h:722
+#: resources.h:128 resources.h:131 resources.h:198 resources.h:489
+#: resources.h:496 resources.h:738
 msgid "&Cancel"
 msgstr "&Скасувати"
 
-#: resources.h:234
+#: resources.h:236
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Перевірте на наявність бета версії FileZilla"
 
-#: resources.h:504
+#: resources.h:513
 msgid "&Clear private data..."
 msgstr "&Очистити особисті дані..."
 
-#: resources.h:601
+#: resources.h:613
 msgid "&Close FileZilla"
 msgstr "&Завершити FileZilla"
 
-#: resources.h:664
+#: resources.h:680
 msgid "&Configure speed limits..."
 msgstr ""
 
-#: resources.h:531
+#: resources.h:541
 msgid "&Configure..."
 msgstr ""
 
-#: resources.h:112
+#: resources.h:113
 msgid "&Connect"
 msgstr "&З'єднати"
 
-#: resources.h:217
+#: resources.h:219
 msgid "&Copy"
 msgstr "&Копіювати"
 
-#: resources.h:492
+#: resources.h:501
 msgid "&Copy current connection to Site Manager..."
 msgstr "&Скопіювати діюче з'єднання до Менеджера Сайту..."
 
-#: resources.h:171 resources.h:610
+#: resources.h:173 resources.h:622
 msgid "&Copy to clipboard"
 msgstr "&Скопіювати до буферу обміну"
 
-#: resources.h:613
+#: resources.h:627
 msgid "&Crash"
 msgstr "&Аварійна відмова"
 
-#: resources.h:565 resources.h:579 resources.h:626 resources.h:647
+#: resources.h:575 resources.h:589 resources.h:642 resources.h:663
 msgid "&Create directory"
 msgstr "&Створити директорію"
 
-#: resources.h:659
+#: resources.h:675
 #, fuzzy
 msgid "&Create new tab"
 msgstr "&Створити директорію"
 
-#: ../../locales/../src/interface/menu_bar.cpp:70
+#: ../../locales/../src/interface/menu_bar.cpp:72
 msgid "&Debug"
 msgstr "&Відлагодити"
 
-#: resources.h:959
+#: resources.h:977
 msgid "&Debug information in message log:"
 msgstr "&Відлагодити інформацію в журналі повідомлень:"
 
-#: resources.h:925
+#: resources.h:943
 msgid "&Default editor:"
 msgstr "&Редактор за замовчуванням:"
 
-#: resources.h:524 resources.h:593
+#: resources.h:534 resources.h:605
 msgid "&Default file exists action..."
 msgstr "&Дія за замовчуванням щодо існуючого файлу..."
 
-#: resources.h:732
+#: resources.h:748
 msgid "&Delay between failed login attempts:"
 msgstr "&Затримка між невдалими спробами входу:"
 
-#: resources.h:76 resources.h:201 resources.h:215 resources.h:415
-#: resources.h:568 resources.h:649
+#: resources.h:76 resources.h:203 resources.h:217 resources.h:417
+#: resources.h:578 resources.h:665
 msgid "&Delete"
 msgstr "&Видалити"
 
-#: resources.h:456
+#: resources.h:458
 #, fuzzy
 msgid "&Delete symlink"
 msgstr "&Видалити"
 
-#: resources.h:510
+#: resources.h:519
 msgid "&Directory comparison"
 msgstr "&Порівняння директорій"
 
-#: resources.h:324
+#: resources.h:326
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
 "&Проігнорувати локальний файл з подальшим його завантаженням та поновленям "
 "редагуванням"
 
-#: resources.h:537
+#: resources.h:547
 msgid "&Disconnect"
 msgstr "&Від'єднати"
 
-#: resources.h:602
+#: resources.h:614
 msgid "&Disconnect from server"
 msgstr "&Від'єднати від сервера"
 
-#: resources.h:868
+#: resources.h:886
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr ""
 
-#: resources.h:890
+#: resources.h:908
 msgid "&Display size in bytes"
 msgstr "&Показати розмір в байтах"
 
+#: resources.h:494
+#, fuzzy
+msgid "&Do not remember passwords"
+msgstr "Введіть пароль"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Даний діалог більше не показувати."
 
-#: resources.h:755
+#: resources.h:771
 msgid "&Don't use external IP address on local connections."
 msgstr "&Не використовувати зовнішню ІР адресу при локальному з'єднанні"
 
-#: resources.h:912
+#: resources.h:930
 msgid "&Double-click action on files:"
 msgstr ""
 
-#: resources.h:572 resources.h:622
+#: resources.h:582 resources.h:638
 msgid "&Download"
 msgstr "&Завантажити"
 
-#: resources.h:442
+#: resources.h:444
 #, fuzzy
 msgid "&Download to:"
 msgstr "&Завантажити"
 
-#: resources.h:657
+#: resources.h:673
 #, fuzzy
 msgid "&Download..."
 msgstr "&Завантажити"
 
-#: resources.h:256 resources.h:831
+#: resources.h:258 resources.h:847
 #, fuzzy
 msgid "&Downloads:"
 msgstr "Завантаження"
 
-#: resources.h:502 resources.h:563
+#: resources.h:511 resources.h:573
 msgid "&Edit"
 msgstr "&Редагувати"
 
-#: resources.h:209
+#: resources.h:211
 #, fuzzy
 msgid "&Edit filter rules..."
 msgstr "&Редагувати фільтри..."
 
-#: resources.h:511 resources.h:530 resources.h:637 resources.h:663
+#: resources.h:520 resources.h:540 resources.h:653 resources.h:679
 msgid "&Enable"
 msgstr "&Розблокувати"
 
-#: resources.h:940
+#: resources.h:958
 msgid "&Enable automatic update check"
 msgstr "&Розблокувати автоматичну перевірку оновлень"
 
-#: resources.h:480 resources.h:804
+#: resources.h:482 resources.h:820
 #, fuzzy
 msgid "&Enable speed limits"
 msgstr "Обмеження швидкості"
 
-#: resources.h:110
+#: resources.h:111
 msgid "&Encoding:"
 msgstr "&Кодування:"
 
-#: resources.h:609
+#: resources.h:82
+#, fuzzy
+msgid "&Encryption:"
+msgstr "Кодування"
+
+#: resources.h:621
 msgid "&Enter custom command..."
 msgstr "&Введіть клієнтську команду..."
 
-#: resources.h:136
+#: resources.h:137
 msgid "&Execute"
 msgstr "&Виконати"
 
-#: resources.h:291
+#: resources.h:293
 msgid "&Export Site Manager entries"
 msgstr "&Експортувати введені дані до Менеджера Сайту"
 
-#: resources.h:497 resources.h:653
+#: resources.h:506 resources.h:669
 msgid "&Export..."
 msgstr "&Експорт..."
 
-#: resources.h:760
+#: resources.h:776
 msgid "&Fall back to active mode"
 msgstr "&Повернутись до активного стану"
 
-#: resources.h:489
+#: resources.h:498
 msgid "&File"
 msgstr "&Файл"
 
-#: resources.h:634
+#: resources.h:650
 msgid "&File Attributes..."
 msgstr "&Атрибути файлу..."
 
-#: resources.h:588
+#: resources.h:600
 #, fuzzy
 msgid "&File permissions..."
 msgstr "Дозволи власника"
 
-#: resources.h:364
+#: resources.h:366
 msgid "&File:"
 msgstr "&Файл:"
 
-#: resources.h:219
+#: resources.h:221
 #, fuzzy
 msgid "&Filter conditions:"
 msgstr "&Установки фільтру:"
 
-#: resources.h:198
+#: resources.h:200
 msgid "&Filter sets:"
 msgstr "&Установки фільтру:"
 
-#: resources.h:213
+#: resources.h:215
 msgid "&Filters:"
 msgstr "&Фільтри:"
 
@@ -538,151 +544,151 @@
 msgid "&Finish"
 msgstr "&Завершити редагування"
 
-#: resources.h:316
+#: resources.h:318
 msgid "&Finish editing and delete local file"
 msgstr "&Завершити редагування і видалити локальний файл"
 
-#: resources.h:446
+#: resources.h:448
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
 
-#: resources.h:457
+#: resources.h:459
 msgid "&Follow symlink, delete target directory contents"
 msgstr ""
 
-#: resources.h:753
+#: resources.h:769
 msgid "&Get external IP address from the following URL:"
 msgstr "&Отримати зовнішню ІР адресу з такого URL:"
 
-#: resources.h:551
+#: resources.h:561
 msgid "&Getting help..."
 msgstr "&Отримання допомоги..."
 
-#: resources.h:396
+#: resources.h:398
 msgid "&Global bookmark"
 msgstr ""
 
-#: resources.h:789
+#: resources.h:805
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 використовує метод CONNECT"
 
-#: resources.h:547
+#: resources.h:557
 msgid "&Help"
 msgstr "&Допомога"
 
-#: resources.h:514 resources.h:640
+#: resources.h:523 resources.h:656
 #, fuzzy
 msgid "&Hide identical files"
 msgstr "&Перевідкрити локальний файл"
 
-#: resources.h:595
+#: resources.h:607
 msgid "&Highest"
 msgstr "&Найвищий"
 
-#: resources.h:748
+#: resources.h:764
 msgid "&Highest available port:"
 msgstr "&Найвищий доступний порт:"
 
-#: resources.h:79 resources.h:377 resources.h:712
+#: resources.h:79 resources.h:379 resources.h:728
 msgid "&Host:"
 msgstr "&Хост:"
 
-#: resources.h:891
+#: resources.h:909
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&Бінарні префікси ІЕС (наприклад 1 KiБ = 1024 байт)"
 
-#: resources.h:879
+#: resources.h:897
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (приклад: 2007-09-15)"
 
-#: resources.h:498
+#: resources.h:507
 msgid "&Import..."
 msgstr "&Імпорт..."
 
-#: resources.h:934
+#: resources.h:952
 msgid "&Inherit system's filetype associations"
 msgstr "&Зберегти асоціації типів файлів"
 
-#: resources.h:445
+#: resources.h:447
 msgid "&Keep remote path structure relative to search root"
 msgstr ""
 
-#: resources.h:854
+#: resources.h:870
 msgid "&Layout of file and directory panes:"
 msgstr "&Розташування файлів та панелей директорії:"
 
-#: resources.h:745
+#: resources.h:761
 msgid "&Limit local ports used by FileZilla"
 msgstr "&Обмежити локальні порти,що використовуються FileZill-ою"
 
-#: resources.h:102
+#: resources.h:103
 msgid "&Limit number of simultaneous connections"
 msgstr "&Обмежити кількість одночасних з'єднань"
 
-#: resources.h:519
+#: resources.h:529
 msgid "&Local directory tree"
 msgstr "&Локальне дерево директорій"
 
-#: resources.h:401 resources.h:407
+#: resources.h:403 resources.h:409
 #, fuzzy
 msgid "&Local directory:"
 msgstr "&Локальне дерево директорій"
 
-#: resources.h:949
+#: resources.h:967
 #, fuzzy
 msgid "&Log to file"
 msgstr "Локальний файл"
 
-#: resources.h:82
+#: resources.h:83
 #, fuzzy
 msgid "&Logon Type:"
 msgstr "&Тип входження:"
 
-#: resources.h:380
+#: resources.h:382
 msgid "&Logontype:"
 msgstr "&Тип входження:"
 
-#: resources.h:598
+#: resources.h:610
 msgid "&Low"
 msgstr "&Низький"
 
-#: resources.h:545
+#: resources.h:555
 #, fuzzy
 msgid "&Manage bookmarks..."
 msgstr "&Сайт Менеджер..."
 
-#: resources.h:533
+#: resources.h:543
 msgid "&Manual transfer..."
 msgstr "&Ручна передача...і"
 
-#: resources.h:103
+#: resources.h:104
 msgid "&Maximum number of connections:"
 msgstr "&Максимальна кількість з'єднань:"
 
-#: resources.h:730
+#: resources.h:746
 msgid "&Maximum number of retries:"
 msgstr "&Максимальна кількість спроб:"
 
-#: resources.h:518
+#: resources.h:528
 msgid "&Message log"
 msgstr "&Журнал повідомлень"
 
-#: resources.h:866
+#: resources.h:883
 msgid "&Minimize to tray"
 msgstr ""
 
-#: resources.h:399
+#: resources.h:401
 #, fuzzy
 msgid "&Name:"
 msgstr "Ім'я:"
 
-#: resources.h:503
+#: resources.h:512
 msgid "&Network configuration wizard..."
 msgstr "&Майстер налаштування мережі..."
 
-#: resources.h:214
+#: resources.h:216
 msgid "&New"
 msgstr "&Нове"
 
@@ -699,35 +705,35 @@
 msgid "&Next >"
 msgstr "&Нове"
 
-#: resources.h:318
+#: resources.h:320
 msgid "&No"
 msgstr "&Ні"
 
-#: resources.h:763 resources.h:788
+#: resources.h:779 resources.h:804
 msgid "&None"
 msgstr "&Жодного"
 
-#: resources.h:597
+#: resources.h:609
 msgid "&Normal"
 msgstr "&Звичайний"
 
-#: resources.h:941
+#: resources.h:959
 msgid "&Number of days between update checks:"
 msgstr "&Кількість днів між перевірками оновлень:"
 
-#: resources.h:145
+#: resources.h:146
 msgid "&Numeric value:"
 msgstr "&Числове значення:"
 
-#: resources.h:113 resources.h:126 resources.h:417
+#: resources.h:114 resources.h:127 resources.h:419
 msgid "&OK"
 msgstr "&ДОБРЕ"
 
-#: resources.h:766
+#: resources.h:782
 msgid "&OPEN"
 msgstr "&ВІДКРИТИ"
 
-#: resources.h:561 resources.h:645
+#: resources.h:571 resources.h:661
 msgid "&Open"
 msgstr "&Відкрити"
 
@@ -735,104 +741,113 @@
 msgid "&Overwrite"
 msgstr "&Переписати"
 
-#: resources.h:101
+#: resources.h:102
 msgid "&Passive"
 msgstr "&Пасивний"
 
-#: resources.h:124
+#: resources.h:125
 msgid "&Password:"
 msgstr "&Пароль:"
 
-#: resources.h:605
+#: resources.h:617
 msgid "&Play sound"
 msgstr "&Відтворити звук"
 
-#: resources.h:80 resources.h:378 resources.h:716
+#: resources.h:80 resources.h:380 resources.h:732
 msgid "&Port:"
 msgstr "&Порт:"
 
-#: resources.h:860
+#: resources.h:876
 #, fuzzy
 msgid "&Position of the message log:"
 msgstr "Переключає відображення журналу повідомлень"
 
-#: resources.h:529
+#: resources.h:539
 msgid "&Preserve timestamps of transferred files"
 msgstr "&Зберегти часові позначки переданих файлів"
 
-#: resources.h:300
+#: resources.h:302
 msgid "&Queue"
 msgstr "&Черга"
 
-#: resources.h:718
+#: resources.h:734
 msgid "&Quickconnect"
 msgstr "&Швидке з'єднання"
 
-#: resources.h:517
+#: resources.h:527
 msgid "&Quickconnect bar"
 msgstr "&Панель швидкого з'єднання"
 
-#: resources.h:134
+#: resources.h:135
 msgid "&Read"
 msgstr "&Читати"
 
-#: resources.h:536
+#: resources.h:546
 msgid "&Reconnect"
 msgstr "&Відновити з'єднання"
 
-#: resources.h:508 resources.h:662
+#: resources.h:517 resources.h:678
 msgid "&Refresh"
 msgstr "&Поновити"
 
-#: resources.h:125
+#: resources.h:126
 msgid "&Remember password for this session"
 msgstr "&Запам'ятати пароль для даного з'єднання"
 
-#: resources.h:403 resources.h:409
+#: resources.h:493
+msgid "&Remember this and all future passwords"
+msgstr ""
+
+#: resources.h:405 resources.h:411
 #, fuzzy
 msgid "&Remote directory:"
 msgstr "&Створити директорію"
 
-#: resources.h:367
+#: resources.h:369
 msgid "&Remote path:"
 msgstr "&Віддалений шлях:"
 
-#: resources.h:825
+#: resources.h:841
 msgid "&Remove"
 msgstr "&Забрати"
 
-#: resources.h:783
+#: resources.h:799
 msgid "&Remove key"
 msgstr "&Забрати ключ"
 
-#: resources.h:592
+#: resources.h:604
 msgid "&Remove selected"
 msgstr "&Забрати вибране"
 
-#: resources.h:75 resources.h:216 resources.h:414 resources.h:570
-#: resources.h:584 resources.h:630 resources.h:651
+#: resources.h:75 resources.h:218 resources.h:416 resources.h:580
+#: resources.h:596 resources.h:646 resources.h:667
 msgid "&Rename"
 msgstr "&Перейменувати"
 
-#: resources.h:200
+#: resources.h:202
 #, fuzzy
 msgid "&Rename..."
 msgstr "&Перейменувати"
 
-#: resources.h:323
+#: resources.h:325
 msgid "&Reopen local file"
 msgstr "&Перевідкрити локальний файл"
 
-#: resources.h:816
+#: resources.h:832
 #, fuzzy
 msgid "&Replace invalid characters with:"
 msgstr "Відмова перевірки достовірності фільтру"
 
-#: resources.h:552
+#: resources.h:562
 msgid "&Report a bug..."
 msgstr "&Повідомити про недолік..."
 
-#: resources.h:711
+#: resources.h:630
+#, fuzzy
+msgid "&Reset and requeue all"
+msgstr "Перевстановити і поновити в черзі обрані файли"
+
+#: resources.h:727
 msgid "&Restart Wizard"
 msgstr "&Перезавантажити майстра"
 
@@ -840,35 +855,35 @@
 msgid "&Resume"
 msgstr "&Відновити"
 
-#: resources.h:603
+#: resources.h:615
 msgid "&Run command..."
 msgstr "&Команда на виконання..."
 
-#: resources.h:725
+#: resources.h:741
 msgid "&Run configuration wizard now..."
 msgstr "&Запустити майстра налаштувань..."
 
-#: resources.h:943
+#: resources.h:961
 msgid "&Run update check now..."
 msgstr "&Виконати перевірку оновлень..."
 
-#: resources.h:765
+#: resources.h:781
 msgid "&SITE"
 msgstr "&САЙТ"
 
-#: resources.h:790
+#: resources.h:806
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:199
+#: resources.h:201
 msgid "&Save as..."
 msgstr "&Зберегти як..."
 
-#: resources.h:431
+#: resources.h:433
 msgid "&Search"
 msgstr ""
 
-#: resources.h:538
+#: resources.h:548
 #, fuzzy
 msgid "&Search remote files..."
 msgstr "Фільт&рувати усі файли,що:"
@@ -878,43 +893,43 @@
 msgid "&Select Entry:"
 msgstr "Обрати Введення:"
 
-#: resources.h:923
+#: resources.h:941
 msgid "&Select language:"
 msgstr "&Вибрати мову:"
 
-#: resources.h:355
+#: resources.h:357
 msgid "&Select the columns that should be displayed:"
 msgstr "&Вибрати стовпці для:"
 
-#: resources.h:369 resources.h:534
+#: resources.h:371 resources.h:544
 msgid "&Server"
 msgstr "&Сервер"
 
-#: resources.h:299
+#: resources.h:301
 msgid "&Settings"
 msgstr "&Установки"
 
-#: resources.h:505
+#: resources.h:514
 msgid "&Settings..."
 msgstr "&Установки..."
 
-#: resources.h:958
+#: resources.h:976
 msgid "&Show debug menu"
 msgstr "&Показати меню відлагоджування"
 
-#: resources.h:604
+#: resources.h:616
 msgid "&Show message"
 msgstr "&Показати повідомлення"
 
-#: resources.h:948
+#: resources.h:966
 msgid "&Show timestamps in message log"
 msgstr "&Показати часові позначки в журналі повідомлень"
 
-#: resources.h:490
+#: resources.h:499
 msgid "&Site Manager..."
 msgstr "&Сайт Менеджер..."
 
-#: resources.h:397
+#: resources.h:399
 msgid "&Site-specific bookmark"
 msgstr ""
 
@@ -922,17 +937,17 @@
 msgid "&Skip"
 msgstr "&Оминути"
 
-#: resources.h:532
+#: resources.h:542
 #, fuzzy
 msgid "&Speed limits"
 msgstr "Обмеження швидкості"
 
-#: resources.h:448
+#: resources.h:450
 #, fuzzy
 msgid "&Start transfer immediately"
 msgstr "Розпочати передачу &негайно"
 
-#: resources.h:859
+#: resources.h:875
 msgid "&Swap local and remote panes"
 msgstr "&Обміняти локальні та віддалені панелі"
 
@@ -940,74 +955,74 @@
 msgid "&Test"
 msgstr "&Тест"
 
-#: resources.h:871
+#: resources.h:889
 msgid "&Theme:"
 msgstr "&Тема:"
 
-#: resources.h:522
+#: resources.h:532
 msgid "&Transfer"
 msgstr "&Передача"
 
-#: resources.h:98
+#: resources.h:99
 msgid "&Transfer mode:"
 msgstr "&Спосіб передачі:"
 
-#: resources.h:521
+#: resources.h:531
 msgid "&Transfer queue"
 msgstr "&Почерговість передачі"
 
-#: resources.h:828
+#: resources.h:844
 msgid "&Treat dotfiles as ASCII files"
 msgstr "&Трактувати файли з розширенням .dot як файли ASCII"
 
-#: resources.h:329
+#: resources.h:331
 msgid "&Unedit"
 msgstr "&Відмінити редагування"
 
-#: resources.h:194
+#: resources.h:196
 msgid "&Update cached key for this host"
 msgstr "&Обновити кешований ключ для даного хосту"
 
-#: resources.h:555 resources.h:641
+#: resources.h:565 resources.h:657
 msgid "&Upload"
 msgstr "&Завантажити на сервер"
 
-#: resources.h:266 resources.h:840
+#: resources.h:268 resources.h:856
 #, fuzzy
 msgid "&Uploads:"
 msgstr "Відвантаження"
 
-#: resources.h:424
+#: resources.h:426
 #, fuzzy
 msgid "&Use custom program"
 msgstr "Використати &користувацький набір шрифтів"
 
-#: resources.h:93
+#: resources.h:94
 msgid "&Use synchronized browsing"
 msgstr ""
 
-#: resources.h:927
+#: resources.h:945
 #, fuzzy
 msgid "&Use system's default editor for text files"
 msgstr "Обраний файл,як редактор по замовчувнню не існує."
 
-#: resources.h:751
+#: resources.h:767
 msgid "&Use the following IP address:"
 msgstr "&Використовувати наступні ІР адреси:"
 
-#: resources.h:759
+#: resources.h:775
 msgid "&Use the server's external IP address instead"
 msgstr "&Використати натомість зовнішню ІР адресу"
 
-#: resources.h:894
+#: resources.h:912
 msgid "&Use thousands separator"
 msgstr "&Використати розділювач тисячних"
 
-#: resources.h:83 resources.h:123 resources.h:381
+#: resources.h:84 resources.h:124 resources.h:383
 msgid "&User:"
 msgstr "&Користувач:"
 
-#: resources.h:714
+#: resources.h:730
 msgid "&Username:"
 msgstr "&Ім'я користувача:"
 
@@ -1016,46 +1031,46 @@
 msgid "&Version %s"
 msgstr "&Версія %s"
 
-#: resources.h:507
+#: resources.h:516
 msgid "&View"
 msgstr "&Переглянути"
 
-#: resources.h:578
+#: resources.h:588
 #, fuzzy
 msgid "&View/Edit"
 msgstr "&Переглянути / Редагувати"
 
-#: resources.h:933
+#: resources.h:951
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr ""
 
-#: resources.h:135
+#: resources.h:136
 msgid "&Write"
 msgstr "&Писати"
 
-#: resources.h:317
+#: resources.h:319
 msgid "&Yes"
 msgstr "&Так"
 
-#: ../../locales/../src/engine/local_path.cpp:441
-#: ../../locales/../src/engine/local_path.cpp:491
+#: ../../locales/../src/engine/local_path.cpp:461
+#: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
 msgstr "'%s'не існує або нема доступу."
 
-#: ../../locales/../src/engine/local_path.cpp:457
-#: ../../locales/../src/engine/local_path.cpp:478
-#: ../../locales/../src/engine/local_path.cpp:485
+#: ../../locales/../src/engine/local_path.cpp:477
+#: ../../locales/../src/engine/local_path.cpp:498
+#: ../../locales/../src/engine/local_path.cpp:505
 #, fuzzy, c-format
 msgid "'%s' is not a directory."
 msgstr "%d директорія"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:429
-#: ../../locales/../src/interface/sitemanager.cpp:1052
+#: ../../locales/../src/interface/manual_transfer.cpp:445
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "'Акаунт' за типом входження не підтримується вибраним протоколом"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:591
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 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 "
@@ -1074,39 +1089,39 @@
 msgstr[1] "(%d objects filtered)"
 msgstr[2] "(%d objects filtered)"
 
-#: resources.h:800 resources.h:802
+#: resources.h:816 resources.h:818
 msgid "(0 for no limit)"
 msgstr "(0 для безліміту)"
 
-#: resources.h:731
+#: resources.h:747
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:733
+#: resources.h:749
 msgid "(0-999 seconds)"
 msgstr "(0-999 секунд)"
 
-#: resources.h:798
+#: resources.h:814
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:727
+#: resources.h:743
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 щоб заблокувати)"
 
-#: resources.h:942
+#: resources.h:960
 msgid "(At least 7 days)"
 msgstr "(Щонайменше 7 днів)"
 
-#: resources.h:887
+#: resources.h:905
 msgid "(example: %H:%M)"
 msgstr "(приклад: %H:%M)"
 
-#: resources.h:881
+#: resources.h:899
 msgid "(example: %Y-%m-%d)"
 msgstr "(приклад: %Y-%m-%d)"
 
-#: resources.h:482 resources.h:484 resources.h:806 resources.h:808
+#: resources.h:484 resources.h:486 resources.h:822 resources.h:824
 #, fuzzy, c-format
 msgid "(in %s/s)"
 msgstr "(в KБ/с)"
@@ -1119,23 +1134,23 @@
 msgid ", --:--:-- left"
 msgstr ", --:--:-- залишилось"
 
-#: resources.h:699
+#: resources.h:715
 msgid "-"
 msgstr "-"
 
-#: resources.h:247
+#: resources.h:249
 msgid "- Broken router and/or firewall"
 msgstr ""
 
-#: resources.h:248
+#: resources.h:250
 msgid "- File corrupted on mirror"
 msgstr ""
 
-#: resources.h:246
+#: resources.h:248
 msgid "- Malware on your system"
 msgstr ""
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:232
+#: ../../locales/../src/interface/statuslinectrl.cpp:236
 msgid "--:--:-- left"
 msgstr "--:--:-- залишилось"
 
@@ -1156,32 +1171,32 @@
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s не можна використовувати разом з FTP URL."
 
-#: resources.h:960
+#: resources.h:978
 msgid "0 - None"
 msgstr "0 - Жодного"
 
-#: resources.h:961
+#: resources.h:979
 msgid "1 - Warning"
 msgstr "1 - Попередження"
 
-#: resources.h:962
+#: resources.h:980
 msgid "2 - Info"
 msgstr "2 - Інформація"
 
-#: resources.h:963
+#: resources.h:981
 msgid "3 - Verbose"
 msgstr "3 - Багатошаровий"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 #, fuzzy
 msgid "32 bit system"
 msgstr "Пере&завантажити систему"
 
-#: resources.h:964
+#: resources.h:982
 msgid "4 - Debug"
 msgstr "4 - Відлагодити"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 #, fuzzy
 msgid "64 bit system"
 msgstr "Пере&завантажити систему"
@@ -1190,11 +1205,11 @@
 msgid "< &Back"
 msgstr ""
 
-#: resources.h:546
+#: resources.h:556
 msgid "?"
 msgstr "?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
 #, fuzzy
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
@@ -1206,13 +1221,13 @@
 msgid "A default editor needs to be set."
 msgstr "Потрібно встановити редактор за замовчуванням."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:153
-#: ../../locales/../src/interface/RemoteTreeView.cpp:114
+#: ../../locales/../src/interface/RemoteListView.cpp:155
+#: ../../locales/../src/interface/RemoteTreeView.cpp:115
 #, fuzzy
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "Директорію неможливо перетягнути до однієї з її піддиректорій ."
 
-#: resources.h:671
+#: resources.h:687
 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 "
@@ -1222,27 +1237,27 @@
 "сконфігуровані.В таких випадках вам необхідно використати активний режим.А "
 "активному режимі FileZilla відкриває порт і просить сервер про з'єднання."
 
-#: resources.h:305
+#: resources.h:307
 msgid "A file previously opened has been changed."
 msgstr "Попередньо відкритий файл було змінено."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2086
+#: ../../locales/../src/interface/LocalListView.cpp:2069
 #, c-format
 msgid ""
 "A file with that name is already being edited. Do you want to reopen '%s'?"
 msgstr "Файл з цим іменем уже редагується. Бажаєте перевідкрити '%s'?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 msgid "A file with that name is already being transferred."
 msgstr "Файл з цим іменем знаходиться у процесі завантаження"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "Файл з цим іменем знаходиться в процесі редагування"
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1256,11 +1271,11 @@
 "Якщо ви не полагодите цієї проблеми,файли будуть відсутні у списках файлів.\n"
 "Більше попереджень упродовж цього з'єднання не буде."
 
-#: resources.h:236
+#: resources.h:238
 msgid "A newer version of FileZilla is available:"
 msgstr "В наявності нова версія FileZilla: "
 
-#: ../../locales/../src/interface/Mainfrm.cpp:656
+#: ../../locales/../src/interface/Mainfrm.cpp:669
 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."
@@ -1269,7 +1284,7 @@
 "неправильно налаштовані будуть ховати файли від користувача.Використовуйте "
 "дану опцію щоб змусити сервер показувати усі файли."
 
-#: resources.h:743
+#: resources.h:759
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1283,69 +1298,74 @@
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
 
-#: resources.h:527 resources.h:655 resources.h:820
+#: resources.h:537 resources.h:671 resources.h:836
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:824
+#: resources.h:840
 msgid "A&dd"
 msgstr "До&дати"
 
-#: resources.h:851
+#: resources.h:867
 msgid "A&llow resume of ASCII files"
 msgstr "До&зволити поновлення файлів ASCII"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:113
+#: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
 msgstr "За&стосувати лише для завантажень"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:159
+#: ../../locales/../src/interface/fileexistsdlg.cpp:160
 msgid "A&pply only to uploads"
 msgstr "За&стосувати лише для відвантажень"
 
-#: resources.h:148
+#: resources.h:149
 msgid "A&pply to all files and directories"
 msgstr "За&стосувати до всіх файлів та директорій"
 
-#: resources.h:388
+#: resources.h:637
+#, fuzzy
+msgid "A&utomatically remove successful transfers"
+msgstr "&Автоматично видаляти успішну передачу даних"
+
+#: resources.h:390
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:478
+#: resources.h:480
 #, fuzzy
 msgid "Abort previous connection and connect in current tab"
 msgstr "Первинне з'єднання та сертифікати передачі даних не співпадають."
 
-#: resources.h:153
+#: resources.h:154
 msgid "About FileZilla"
 msgstr "Про FileZilla"
 
-#: resources.h:861
+#: resources.h:877
 #, fuzzy
 msgid "Above the file lists"
 msgstr "Поновити списки файлу та папки"
 
-#: ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:157
-#: ../../locales/../src/interface/manual_transfer.cpp:190
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/manual_transfer.cpp:545
-#: ../../locales/../src/interface/sitemanager.cpp:1387
-#: ../../locales/../src/interface/sitemanager.cpp:1388
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:161
+#: ../../locales/../src/interface/manual_transfer.cpp:194
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/manual_transfer.cpp:561
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
 msgid "Account"
 msgstr "Акаунт"
 
-#: resources.h:600
+#: resources.h:612
 msgid "Action after queue &completion"
 msgstr "Дія після &завершення черги "
 
-#: resources.h:328
+#: resources.h:330
 msgid "Action on selected file:"
 msgstr "Дія над вибраним файлом"
 
-#: resources.h:322
+#: resources.h:324
 msgid "Action to perform:"
 msgstr "Дія до виконання:"
 
@@ -1383,24 +1403,24 @@
 "адресу,однак ваш маршрутизатор або файєрвол помилково змінили відправлену "
 "адресу."
 
-#: resources.h:756
+#: resources.h:772
 msgid "Active mode IP"
 msgstr "ІР активного режиму"
 
-#: resources.h:449
+#: resources.h:451
 #, fuzzy
 msgid "Add files to &queue only"
 msgstr "&Додати файли до черги"
 
-#: resources.h:625 resources.h:644
+#: resources.h:641 resources.h:660
 msgid "Add selected directory to the transfer queue"
 msgstr "Додати вибрану директорію до черги передачі"
 
-#: resources.h:558 resources.h:575
+#: resources.h:568 resources.h:585
 msgid "Add selected files and folders to the transfer queue"
 msgstr "Додати вибрані файли і папки до черги передачі"
 
-#: resources.h:914 resources.h:920
+#: resources.h:932 resources.h:938
 #, fuzzy
 msgid "Add to queue"
 msgstr "&Додати до черги"
@@ -1409,29 +1429,29 @@
 msgid "Address type not supported"
 msgstr "Тип адреси не підтримується"
 
-#: resources.h:87
+#: resources.h:88
 msgid "Advanced"
 msgstr "Для досвідчених"
 
-#: resources.h:233
+#: resources.h:235
 msgid "Advanced options:"
 msgstr "Розширені опції:"
 
-#: resources.h:337
+#: resources.h:339
 msgid "Algorithm:"
 msgstr "Алгоритм:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, fuzzy
 msgid "All files have been successfully transferred"
 msgstr "&Автоматично видаляти успішну передачу даних"
 
-#: resources.h:700
+#: resources.h:716
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr ""
 "Усі порти в заданому діапазоні повинні знаходитись в межах від 1024 до 65535."
 
-#: ../../locales/../src/interface/QueueView.cpp:3021
+#: ../../locales/../src/interface/QueueView.cpp:3135
 #, fuzzy, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
@@ -1445,20 +1465,20 @@
 "Неможливо вписати \"%s\",будь-які зміни в Сайт Менеджері не можуть бути "
 "збереженими: %s"
 
-#: resources.h:739
+#: resources.h:755
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Дозволити &звернутися до іншого режиму передачі при виникненні збою"
 
-#: resources.h:675
+#: resources.h:691
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "Дозволити звернутися до іншого режиму передачі при виникненні збою"
 
-#: resources.h:475
+#: resources.h:477
 #, fuzzy
 msgid "Already connected"
 msgstr "З'єднано"
 
-#: resources.h:784
+#: resources.h:800
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1466,7 +1486,7 @@
 "Ви можете використати у якості альтернативи інструмент Pageant з PuTTY щоб "
 "управляти своїми ключами. FileZilla розпізнає Pageant."
 
-#: resources.h:785
+#: resources.h:801
 #, fuzzy
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
@@ -1483,7 +1503,21 @@
 "Щоб завантажити найновішу версію,в якості альтернативи, відвідайте http://"
 "filezilla-project.org ."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/QueueView.cpp:2051
+#, c-format
+msgid ""
+"An error occurred loading the transfer queue from \"%s\".\n"
+"Some queue items might not have been restored."
+msgstr ""
+
+#: ../../locales/../src/interface/QueueView.cpp:1950
+#, c-format
+msgid ""
+"An error occurred saving the transfer queue to \"%s\".\n"
+"Some queue items might not have been saved."
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
@@ -1491,50 +1525,50 @@
 "Елемент, що перетягується, позначений схожим іменем з елементом,що вже існує "
 "у вказаній позиції."
 
-#: ../../locales/../src/engine/server.cpp:873
-#: ../../locales/../src/interface/manual_transfer.cpp:155
-#: ../../locales/../src/interface/manual_transfer.cpp:193
-#: ../../locales/../src/interface/manual_transfer.cpp:209
-#: ../../locales/../src/interface/manual_transfer.cpp:543
-#: ../../locales/../src/interface/sitemanager.cpp:1386
-#: ../../locales/../src/interface/sitemanager.cpp:1628
+#: ../../locales/../src/engine/server.cpp:879
+#: ../../locales/../src/interface/manual_transfer.cpp:159
+#: ../../locales/../src/interface/manual_transfer.cpp:197
+#: ../../locales/../src/interface/manual_transfer.cpp:213
+#: ../../locales/../src/interface/manual_transfer.cpp:559
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
 msgid "Anonymous"
 msgstr "Анонімний"
 
-#: ../../locales/../src/interface/state.cpp:1027
+#: ../../locales/../src/interface/state.cpp:1031
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:880
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 #, fuzzy
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr ""
 "Неможливо вписати \"%s\",будь-які зміни в Сайт Менеджері не можуть бути "
 "збереженими: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:727
+#: ../../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 ""
 
-#: ../../locales/../src/interface/filter.cpp:194
+#: ../../locales/../src/interface/filter.cpp:209
 #, fuzzy
 msgid "Any changes made to the filters could not be saved."
 msgstr ""
 "Неможливо вписати \"%s\",будь-які зміни в Сайт Менеджері не можуть бути "
 "збереженими: %s"
 
-#: ../../locales/../src/interface/filter.cpp:992
+#: ../../locales/../src/interface/filter.cpp:1044
 msgid "Any changes made to the filters will not be saved."
 msgstr ""
 
-#: resources.h:150
+#: resources.h:151
 msgid "App&ly to directories only"
 msgstr "За&стосувати лише для директорій"
 
-#: resources.h:212
+#: resources.h:214
 msgid "Apply"
 msgstr "Застосувати"
 
@@ -1542,40 +1576,40 @@
 msgid "Apply to &current queue only"
 msgstr "Застосувати лише до &поточної черги "
 
-#: resources.h:149
+#: resources.h:150
 msgid "Apply to &files only"
 msgstr "Застосувати лише до &файлів"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:80
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 #: ../../locales/../src/interface/updatewizard.cpp:322
 msgid "Archive"
 msgstr "Архів"
 
-#: resources.h:863
+#: resources.h:879
 #, fuzzy
 msgid "As tab in the transfer queue pane"
 msgstr "Переключає відображення черги передачі"
 
-#: resources.h:258 resources.h:268 resources.h:832 resources.h:841
+#: resources.h:260 resources.h:270 resources.h:848 resources.h:857
 #, fuzzy
 msgid "Ask for action"
 msgstr "&Запитувати перед виконанням"
 
-#: ../../locales/../src/engine/server.cpp:848
-#: ../../locales/../src/engine/server.cpp:867
-#: ../../locales/../src/interface/manual_transfer.cpp:184
+#: ../../locales/../src/engine/server.cpp:854
+#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Запит на пароль"
 
-#: resources.h:696
+#: resources.h:712
 msgid "Ask operating system for a port."
 msgstr "Запит операційної системи про порт"
 
-#: resources.h:686
+#: resources.h:702
 msgid "Ask your operating system for the external IP address"
 msgstr "Запит своєї операційної системи про зовнішню ІР адресу"
 
-#: resources.h:470
+#: resources.h:472
 msgid "Asking questions in the FileZilla forums"
 msgstr ""
 
@@ -1583,103 +1617,107 @@
 msgid "Associated program not found:"
 msgstr "Допоміжної програми не знайдено"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:623
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
 msgid "At least one filter condition is incomplete"
 msgstr "Принаймні одна умова фільтрації не повна"
 
-#: resources.h:705
+#: resources.h:721
 msgid "At this point, all required information has been gathered."
 msgstr "На цьому етапі усю необхідну інформацію зібрано"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
 msgid "Attribute"
 msgstr "Атрибут"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
 msgid "Authentication failed."
 msgstr "Автентичність не опізнано"
 
-#: resources.h:872
+#: resources.h:890
 msgid "Author:"
 msgstr "Автор:"
 
-#: resources.h:385
+#: resources.h:387
 msgid "Auto"
 msgstr "Авто"
 
-#: resources.h:822
+#: resources.h:838
 msgid "Automatic file type classification"
 msgstr "Автоматичне класифікування типу файлів"
 
-#: resources.h:939
+#: resources.h:957
 msgid "Automatic update check"
 msgstr "Автоматична перевірка оновлень"
 
-#: resources.h:876
+#: resources.h:894
 msgid "Available sizes"
 msgstr "Наявні розміри"
 
-#: ../../locales/../src/engine/sizeformatting_base.cpp:127
-#: ../../locales/../src/engine/sizeformatting_base.cpp:186
+#: ../../locales/../src/engine/sizeformatting_base.cpp:129
+#: ../../locales/../src/engine/sizeformatting_base.cpp:188
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr ""
 
-#: resources.h:89
+#: resources.h:90
 msgid "B&ypass proxy"
 msgstr "Про&міжний проксі"
 
-#: resources.h:466
+#: resources.h:468
 msgid "Basic usage instructions"
 msgstr ""
 
-#: resources.h:865
+#: resources.h:881
 msgid "Behaviour"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1279
+#: ../../locales/../src/interface/edithandler.cpp:1262
+#: ../../locales/../src/interface/edithandler.cpp:1290
 msgid "Being edited"
 msgstr "В процесі редагування"
 
-#: ../../locales/../src/engine/tlssocket.cpp:887
+#: resources.h:626
+msgid "Benchmark string coalescer"
+msgstr ""
+
+#: ../../locales/../src/engine/tlssocket.cpp:903
 msgid "Beware! Certificate has been revoked"
 msgstr ""
 
-#: resources.h:389
+#: resources.h:391
 msgid "Binary"
 msgstr "Бінарний"
 
-#: resources.h:858
+#: resources.h:874
 msgid "Blackboard"
 msgstr "Панель оголошень"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:264
-#: ../../locales/../src/interface/menu_bar.cpp:305
-#: ../../locales/../src/interface/sitemanager.cpp:390
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:272
+#: ../../locales/../src/interface/menu_bar.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr ""
 
-#: resources.h:412
+#: resources.h:414
 msgid "Bookmark:"
 msgstr ""
 
-#: resources.h:411
+#: resources.h:413
 msgid "Bookmarks"
 msgstr ""
 
-#: resources.h:161
+#: resources.h:162
 msgid "Build date:"
 msgstr "Дата створення:"
 
-#: resources.h:158
+#: resources.h:159
 msgid "Build information"
 msgstr "Інформація по конструкції"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:172
+#: ../../locales/../src/interface/verifycertdialog.cpp:178
 msgid "Business category:"
 msgstr ""
 
-#: resources.h:746
+#: resources.h:762
 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, "
@@ -1690,73 +1728,73 @@
 "до використання лише невеликого діапазону портів,вкажіть,будь-ласка,діапазон "
 "портів нижче."
 
-#: resources.h:535
+#: resources.h:545
 msgid "C&ancel current operation"
 msgstr "Від&мінити дану операцію"
 
-#: resources.h:235
+#: resources.h:237
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "Пе&ревірити нічні зборки FileZilla"
 
-#: resources.h:611
+#: resources.h:623
 msgid "C&lear all"
 msgstr "О&чистити усе"
 
-#: resources.h:586 resources.h:632
+#: resources.h:598 resources.h:648
 #, fuzzy
 msgid "C&opy URL(s) to clipboard"
 msgstr "&Скопіювати до буферу обміну"
 
-#: resources.h:880
+#: resources.h:898
 msgid "C&ustom"
 msgstr "К&лієнтський"
 
-#: resources.h:935
+#: resources.h:953
 msgid "C&ustom filetype associations:"
 msgstr "К&лієнтські асоціації типів файлів:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1607
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1633
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
 msgid "Calculating timezone offset of server..."
 msgstr "Обчислення зсуву часового поясу відносно сервера..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:731
+#: ../../locales/../src/engine/transfersocket.cpp:733
 msgid "Can't read from file"
 msgstr "Не можу прочитати з файлу"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:712
+#: ../../locales/../src/engine/transfersocket.cpp:786
 msgid "Can't write data to file."
 msgstr "Не можу записати дані в файл."
 
-#: ../../locales/../src/engine/transfersocket.cpp:708
-#: ../../locales/../src/engine/transfersocket.cpp:782
+#: ../../locales/../src/engine/transfersocket.cpp:710
+#: ../../locales/../src/engine/transfersocket.cpp:784
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "Не можу записати дані в файл: %s"
 
-#: resources.h:25 resources.h:69 resources.h:114 resources.h:152
-#: resources.h:183 resources.h:211 resources.h:228 resources.h:279
-#: resources.h:288 resources.h:295 resources.h:303 resources.h:326
-#: resources.h:359 resources.h:392 resources.h:406 resources.h:418
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:479
+#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
+#: resources.h:185 resources.h:213 resources.h:230 resources.h:281
+#: resources.h:290 resources.h:297 resources.h:305 resources.h:328
+#: resources.h:361 resources.h:394 resources.h:408 resources.h:420
+#: resources.h:430 resources.h:453 resources.h:462 resources.h:481
 msgid "Cancel"
 msgstr "Скасувати"
 
-#: resources.h:982
+#: resources.h:1000
 msgid "Cancel current operation"
 msgstr "Скасувати дану операцію"
 
-#: resources.h:983
+#: resources.h:1001
 msgid "Cancels the current operation"
 msgstr "Скасовує дану операцію"
 
-#: ../../locales/../src/engine/local_path.cpp:451
+#: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "Нема доступу '%s', не встановлені носії або диск не готовий."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Cannot add server to Site Manager"
 msgstr "Неможливо додати сервер до Сайт Менеджера"
 
@@ -1774,7 +1812,7 @@
 "Неможливо порівняти директорії,увімкнені різні фільтри та віддалені "
 "директорії"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2760
+#: ../../locales/../src/interface/RemoteListView.cpp:2791
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Неможливо порівняти директорії,нема підключення до серверу."
 
@@ -1782,23 +1820,23 @@
 msgid "Cannot create new filter"
 msgstr "Неможливо створити новий фільтр"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2064
-#: ../../locales/../src/interface/LocalListView.cpp:2195
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
-#: ../../locales/../src/interface/RemoteListView.cpp:2640
+#: ../../locales/../src/interface/LocalListView.cpp:2047
+#: ../../locales/../src/interface/LocalListView.cpp:2178
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
+#: ../../locales/../src/interface/RemoteListView.cpp:2667
 msgid "Cannot edit file"
 msgstr "Неможливо редагувати файл"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
+#: ../../locales/../src/interface/LocalListView.cpp:1963
 #, fuzzy
 msgid "Cannot edit file, not connected to any server."
 msgstr "Неможливо порівняти директорії,нема підключення до серверу."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 msgid "Cannot edit file, remote path unknown."
 msgstr ""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:331
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1806,12 +1844,12 @@
 "Неможливо встановити з'єднання з SFTP сервером.Виберіть,будь-ласка,властивий "
 "протокол."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:35
-#: ../../locales/../src/interface/quickconnectbar.cpp:53
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "Неможливо завантажити панель Швидкого завантаження вихідного файлу"
 
-#: ../../locales/../src/interface/import.cpp:39
+#: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
 msgstr "Неможливо завантажити файл,недійсний XML файл."
 
@@ -1819,50 +1857,50 @@
 msgid "Cannot load keyfile"
 msgstr "Неможливо завантажити контрольний файл"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1034
+#: ../../locales/../src/interface/Mainfrm.cpp:1066
 msgid "Cannot load toolbar from resource file"
 msgstr "Неможливо завантажити панель інструментів з вихідного файлу"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Cannot rename entry"
 msgstr "Неможливо перейменувати компонент"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Cannot rename file"
 msgstr "Неможливо перейменувати файл"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Неможливо зберегти налаштування фільтру"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Неможливо вибрати фільтр"
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1673
+#: ../../locales/../src/interface/edithandler.cpp:1640
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1684
 #, fuzzy
 msgid "Cannot set file association"
 msgstr "К&лієнтські асоціації типів файлів:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "Cannot show dialog"
 msgstr "Неможливо показати діалог"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2082
-#: ../../locales/../src/interface/RemoteListView.cpp:2660
+#: ../../locales/../src/interface/LocalListView.cpp:2065
+#: ../../locales/../src/interface/RemoteListView.cpp:2687
 #, fuzzy
 msgid "Cannot view/edit selected file"
 msgstr "Неможливо переглядати / редагувати обрані файли"
 
-#: resources.h:282
+#: resources.h:284
 msgid "Categories"
 msgstr "Категорії"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Certificate and session data are not available yet."
 msgstr "Сертифікату і даних по з'єднанню ще немає."
 
@@ -1879,40 +1917,40 @@
 msgid "Certificate issuer"
 msgstr "Видавець сертифікату"
 
-#: resources.h:122
+#: resources.h:123
 msgid "Challenge:"
 msgstr "Виклик:"
 
-#: resources.h:131
+#: resources.h:132
 msgid "Change file attributes"
 msgstr "Змінити атрибути"
 
-#: resources.h:589 resources.h:635
+#: resources.h:601 resources.h:651
 msgid "Change the file permissions."
 msgstr "Змінити дозволи для файлу."
 
-#: resources.h:956
+#: resources.h:974
 #, fuzzy
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Відкрити діалог установок FileZilla"
 
-#: ../../locales/../src/interface/FileZilla.cpp:784
+#: ../../locales/../src/interface/FileZilla.cpp:681
 msgid "Character encoding issue"
 msgstr "Подача кодування символів"
 
-#: resources.h:104
+#: resources.h:105
 msgid "Charset"
 msgstr "Сукупність символів"
 
-#: resources.h:944
+#: resources.h:962
 msgid "Check for &beta versions and release candidates"
 msgstr "Перевірте на наявність бета версії FileZilla"
 
-#: resources.h:548
+#: resources.h:558
 msgid "Check for &updates..."
 msgstr "Перевірити &оновлення..."
 
-#: resources.h:549
+#: resources.h:559
 msgid "Check for newer versions of FileZilla"
 msgstr "Перевірити наявність новішої версії FileZilla"
 
@@ -1920,7 +1958,7 @@
 msgid "Check for updates"
 msgstr "Перевірити оновлення"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Check for updates failed"
 msgstr "Перевірити невдалі оновлення"
 
@@ -1928,7 +1966,7 @@
 msgid "Checking for correct external IP address"
 msgstr "Перевірка правильності зовнішньої ІР адреси"
 
-#: resources.h:231
+#: resources.h:233
 msgid "Checking for updates"
 msgstr "Перевірка оновлень"
 
@@ -1936,13 +1974,13 @@
 msgid "Checksum mismatch of downloaded file."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1558
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
 msgid "Choose the default local directory"
 msgstr "Виберіть локальну директорію по замовчуванню"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:127
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:370
-#: ../../locales/../src/interface/sitemanager.cpp:2710
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:130
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:378
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
 #, fuzzy
 msgid "Choose the local directory"
 msgstr "Виберіть локальну директорію по замовчуванню"
@@ -1955,50 +1993,54 @@
 msgid "Cipher:"
 msgstr "Шифр:"
 
-#: resources.h:495 resources.h:660
+#: resources.h:504 resources.h:676
 msgid "Cl&ose tab"
 msgstr ""
 
-#: resources.h:855
+#: resources.h:871
 msgid "Classic"
 msgstr "Класичний"
 
-#: resources.h:285
+#: resources.h:287
 msgid "Clear &Site Manager entries"
 msgstr "Очистити &вміст Сайт Менеджера"
 
-#: resources.h:612
+#: resources.h:624
 msgid "Clear &layout cache"
 msgstr "Очистити &каше формату"
 
-#: resources.h:283
+#: resources.h:285
 msgid "Clear &quickconnect history"
 msgstr "Очистити &історію Швидкого з'єднання"
 
-#: resources.h:284
+#: resources.h:286
 msgid "Clear &reconnect information"
 msgstr "Очистити &інформацію повторних з'єднань"
 
-#: resources.h:286
+#: resources.h:288
 msgid "Clear &transfer queue"
 msgstr "Очистити &чергу передач"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Очистити історію"
 
-#: resources.h:280 ../../locales/../src/interface/clearprivatedata.cpp:35
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: resources.h:282 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid "Clear private data"
 msgstr "Очистити особисті дані"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Очистити панель Швидкого З'єднання"
 
+#: resources.h:625
+msgid "Clear string coalescer"
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:571
 msgid "Click on Finish to save your configuration."
 msgstr "Щоб зберегти свою конфігурацію натисніть кнопку Завершити."
@@ -2007,20 +2049,20 @@
 msgid "Click on next to download the new version."
 msgstr "Щоб завантажити нову версію натисніть кнопку Далі "
 
-#: resources.h:346
+#: resources.h:348
 msgid "Client to server MAC:"
 msgstr "Клієнт для МАС сервера:"
 
-#: resources.h:344
+#: resources.h:346
 msgid "Client to server cipher:"
 msgstr "Клієнт для серверного шифру:"
 
-#: resources.h:661
+#: resources.h:677
 msgid "Close &all other tabs"
 msgstr ""
 
-#: resources.h:501 ../../locales/../src/interface/Mainfrm.cpp:1106
-#: ../../locales/../src/interface/Mainfrm.cpp:1129
+#: resources.h:510 ../../locales/../src/interface/Mainfrm.cpp:1195
+#: ../../locales/../src/interface/Mainfrm.cpp:1218
 msgid "Close FileZilla"
 msgstr "Закрити FileZilla"
 
@@ -2028,24 +2070,24 @@
 msgid "Close all running instances of FileZilla"
 msgstr "Закрити всі діючі екземпляри FileZilla"
 
-#: resources.h:496
+#: resources.h:505
 #, fuzzy
 msgid "Closes current tab"
 msgstr "Поточні передачі"
 
-#: resources.h:86
+#: resources.h:87
 msgid "Co&mments:"
 msgstr "Ко&ментарі:"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "Column properties"
 msgstr "Властивості стовпців"
 
-#: resources.h:353
+#: resources.h:355
 msgid "Column setup"
 msgstr "Встановлення стовпців"
 
-#: resources.h:930
+#: resources.h:948
 msgid "Command and its arguments should be properly quoted."
 msgstr "Команда та її аргументи мають бути правильно залапковані "
 
@@ -2064,8 +2106,8 @@
 msgstr "Команда не підтримується даним протоколом"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
+#: ../../locales/../src/interface/StatusView.cpp:286
+#: ../../locales/../src/interface/StatusView.cpp:336
 #: ../../locales/../src/interface/updatewizard.cpp:541
 msgid "Command:"
 msgstr "Команда:"
@@ -2074,7 +2116,7 @@
 msgid "Comment"
 msgstr "Коментар"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:170
+#: ../../locales/../src/interface/verifycertdialog.cpp:176
 msgid "Common name:"
 msgstr "Прозивне ім'я"
 
@@ -2083,15 +2125,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "Зв'язок блокується маршрутизатором або файєрволом"
 
-#: resources.h:513 resources.h:639
+#: resources.h:522 resources.h:655
 msgid "Compare &modification time"
 msgstr "Порівняти &час модифікації"
 
-#: resources.h:512 resources.h:638
+#: resources.h:521 resources.h:654
 msgid "Compare file&size"
 msgstr "Порівняти розмір &файлу"
 
-#: resources.h:910
+#: resources.h:928
 msgid "Comparison &threshold (in minutes):"
 msgstr "Порівняння &порогової величини (в хвилинах):"
 
@@ -2100,61 +2142,61 @@
 msgstr ""
 "Порівняння порогової величини повинно бути у проміжку поміж 0 та 1440 хвилин "
 
-#: resources.h:159
+#: resources.h:160
 msgid "Compiled for:"
 msgstr "Зібрано для:"
 
-#: resources.h:160
+#: resources.h:161
 msgid "Compiled on:"
 msgstr "Зібрано на:"
 
-#: resources.h:162
+#: resources.h:163
 msgid "Compiled with:"
 msgstr "Зібрано з:"
 
-#: resources.h:163
+#: resources.h:164
 msgid "Compiler flags:"
 msgstr "Ознаки компілятора:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:81
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "Compressed"
 msgstr "Стиснуто"
 
-#: resources.h:796
+#: resources.h:812
 msgid "Concurrent transfers"
 msgstr "Поточні передачі"
 
-#: resources.h:223 resources.h:437
+#: resources.h:225 resources.h:439
 msgid "Conditions are c&ase sensitive"
 msgstr "Умови чутливі до роз&міру літер"
 
-#: resources.h:704
+#: resources.h:720
 msgid "Configuration test"
 msgstr "Тестування конфігурації"
 
-#: resources.h:678
+#: resources.h:694
 msgid "Configure passive mode"
 msgstr "Сконфігурувати пасивний режим"
 
-#: resources.h:694
+#: resources.h:710
 msgid "Configure port range"
 msgstr "Сконфігурувати діапазон портів"
 
-#: resources.h:467
+#: resources.h:469
 msgid "Configuring FileZilla and your network"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:1054
+#: ../../locales/../src/interface/search.cpp:1033
 #, fuzzy
 msgid "Confirm deletion"
 msgstr "Необхідне підтвердження"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2155
-#: ../../locales/../src/interface/RemoteListView.cpp:1665
-#: ../../locales/../src/interface/RemoteListView.cpp:2611
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/LocalListView.cpp:2018
+#: ../../locales/../src/interface/LocalListView.cpp:2138
+#: ../../locales/../src/interface/RemoteListView.cpp:1713
+#: ../../locales/../src/interface/RemoteListView.cpp:2638
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Confirmation needed"
 msgstr "Необхідне підтвердження"
 
@@ -2162,7 +2204,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Вітаємо! Ваша конфігурація працездатна."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:140
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Під'єднати налаштування обхідного проксі"
 
@@ -2170,16 +2212,16 @@
 msgid "Connect to specified Site Manager site"
 msgstr "Під'єднати до сайту вказаного Сайт Менеджером"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:918
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
 msgid "Connected"
 msgstr "З'єднано"
 
-#: ../../locales/../src/interface/QueueView.cpp:1431
+#: ../../locales/../src/interface/QueueView.cpp:1454
 msgid "Connecting"
 msgstr "Під'єднуюсь"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:271
+#: ../../locales/../src/interface/statuslinectrl.cpp:275
 #, c-format
 msgid "Connecting to %s"
 msgstr "Під'єднуюсь до %s"
@@ -2205,7 +2247,7 @@
 msgid "Connection"
 msgstr "Під'єднання"
 
-#: ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1070
 msgid "Connection attempt failed"
 msgstr "Невдала спроба під'єднання"
 
@@ -2230,11 +2272,11 @@
 msgstr "З'єднання завершено"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
 msgid "Connection closed by server"
 msgstr "З'єднання завершено сервером"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "З'єднання встановлено,ініціюється TLS..."
@@ -2243,7 +2285,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "З'єднання встановлено, відсилається запит HTTP "
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
 msgid "Connection established, waiting for welcome message..."
 msgstr "З'єднання встановлено,очікуємо на вітальне повідомлення..."
 
@@ -2267,7 +2309,7 @@
 msgid "Connection timed out."
 msgstr "Час з 'єднання вичерпано."
 
-#: ../../locales/../src/interface/search.cpp:702
+#: ../../locales/../src/interface/search.cpp:676
 #, fuzzy
 msgid "Connection to server lost."
 msgstr "Під'єднуюсь до серверу"
@@ -2288,23 +2330,23 @@
 msgid "Convert keyfile"
 msgstr "Конвертувати файл ключа"
 
-#: resources.h:77 resources.h:416
+#: resources.h:77 resources.h:418
 msgid "Cop&y"
 msgstr "Копі&ювати"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:643
-#: ../../locales/../src/interface/sitemanager.cpp:1858
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:651
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Копія (%d) з %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:620
-#: ../../locales/../src/interface/sitemanager.cpp:1835
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:628
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
 #, c-format
 msgid "Copy of %s"
 msgstr "Копія з %s"
 
-#: resources.h:587 resources.h:633
+#: resources.h:599 resources.h:649
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr ""
 
@@ -2313,8 +2355,8 @@
 msgid "Could not accept connection: %s"
 msgstr "Неможливо прийняти з'єднання:%s "
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
 #, fuzzy
 msgid "Could not add connection to Site Manager"
 msgstr "&Скопіювати діюче з'єднання до Менеджера Сайту..."
@@ -2328,7 +2370,7 @@
 msgid "Could not connect to server: %s"
 msgstr "Неможливо під'єднатися до сервера: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
 msgid "Could not convert command to server encoding"
 msgstr "Неможливо сконвертувати команду до серверного кодування"
 
@@ -2337,19 +2379,19 @@
 msgid "Could not convert private key"
 msgstr "Неможливо сконвертувати приватний ключ"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not copy URLs"
 msgstr "Неможливо під'єднатися до серверу"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 #, fuzzy
 msgid "Could not copy data"
 msgstr "Неможливо викликати нитку IO "
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2514
-#: ../../locales/../src/interface/RemoteTreeView.cpp:895
+#: ../../locales/../src/interface/RemoteListView.cpp:2560
+#: ../../locales/../src/interface/RemoteTreeView.cpp:897
 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 "
@@ -2359,11 +2401,11 @@
 "Або неправильно встановлено розширення оболонки,або ви не помістили файли у "
 "вікно Провідника."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4238
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4267
 msgid "Could not establish connection to server"
 msgstr "Неможливо встановити з'єднання з сервером"
 
-#: ../../locales/../src/interface/FileZilla.cpp:497
+#: ../../locales/../src/interface/FileZilla.cpp:486
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2375,23 +2417,23 @@
 "командної лінійки '--datadir <custompath>' або, встановивши зміну режиму "
 "FZ_DATADIR ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:692
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
 msgid "Could not generate custom login sequence."
 msgstr "Неможливо згенерувати користувацьку послідовність логінування."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1017
+#: ../../locales/../src/engine/tlssocket.cpp:1033
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:992
+#: ../../locales/../src/engine/tlssocket.cpp:1008
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/state.cpp:1011
+#: ../../locales/../src/interface/state.cpp:1015
 #, fuzzy
 msgid "Could not get full remote path."
 msgstr "Неможливо отримати відповідь від fzputtygen."
@@ -2401,22 +2443,22 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Неможливо отримати відповідь від fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2594
+#: ../../locales/../src/interface/RemoteListView.cpp:2621
 msgid "Could not get temporary directory to download file into."
 msgstr "Неможливо отримати тимчасову директорію для завантаження файлів"
 
-#: ../../locales/../src/engine/tlssocket.cpp:945
+#: ../../locales/../src/engine/tlssocket.cpp:961
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr ""
 
-#: ../../locales/../src/engine/tlssocket.cpp:938
+#: ../../locales/../src/engine/tlssocket.cpp:954
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:120
-#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/import.cpp:119
+#: ../../locales/../src/interface/import.cpp:310
 #, c-format
 msgid ""
 "Could not load \"%s\", please make sure the file is valid and can be "
@@ -2435,7 +2477,7 @@
 msgid "Could not load private key"
 msgstr "Неможливо завантажити приватний ключ"
 
-#: ../../locales/../src/interface/state.cpp:1037
+#: ../../locales/../src/interface/state.cpp:1041
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2459,9 +2501,9 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3062
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1450
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3072
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
 #, fuzzy
 msgid "Could not open clipboard"
 msgstr "&Скопіювати до буферу обміну"
@@ -2473,31 +2515,31 @@
 msgid "Could not open log file: %s"
 msgstr "Неможливо вписати файл ключа: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #, fuzzy
 msgid "Could not parse remote path."
 msgstr "Неможливо визначити адресу сервера :"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:83
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Неможливо визначити адресу сервера :"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:221
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Неможливо читати з гнізда проксі: %s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2629
+#: ../../locales/../src/interface/sitemanager.cpp:487
 #, fuzzy
 msgid "Could not read server item."
 msgstr "Неможливо визначити адресу сервера :"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2677
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2705
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "Неможливо знайти початковий номер %s у файлі"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2610
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2638
 msgid "Could not seek to the end of the file"
 msgstr "Неможливо знайти кінець файлу"
 
@@ -2505,7 +2547,7 @@
 msgid "Could not send command to fzputtygen."
 msgstr "Неможливо надіслати команду до fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2708
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2736
 msgid "Could not spawn IO thread"
 msgstr "Неможливо викликати нитку IO "
 
@@ -2514,13 +2556,13 @@
 msgid "Could not start proxy handshake: %s"
 msgstr "Неможливо розпочати обмін вітаннями з проксі: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1100
-#: ../../locales/../src/interface/QueueView.cpp:1105
+#: ../../locales/../src/interface/QueueView.cpp:1121
+#: ../../locales/../src/interface/QueueView.cpp:1126
 msgid "Could not start transfer"
 msgstr "Неможливо розпочати передачу"
 
-#: ../../locales/../src/interface/sitemanager.cpp:904
-#: ../../locales/../src/interface/sitemanager.cpp:2926
+#: ../../locales/../src/interface/sitemanager.cpp:657
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2529,22 +2571,21 @@
 "Неможливо вписати \"%s\",будь-які зміни в Сайт Менеджері не можуть бути "
 "збереженими: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:850
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:858
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the bookmark could not be added: %s"
 msgstr ""
 "Неможливо записати \"%s\" Чергу зберегти неможливо.\n"
 "%s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:322
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:330
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr ""
 "Неможливо записати \"%s\" Чергу зберегти неможливо.\n"
 "%s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1941
-#: ../../locales/../src/interface/QueueView.cpp:1977
+#: ../../locales/../src/interface/QueueView.cpp:1985
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2553,14 +2594,14 @@
 "Неможливо записати \"%s\" Чергу зберегти неможливо.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2691
-#: ../../locales/../src/interface/sitemanager.cpp:3053
-#: ../../locales/../src/interface/sitemanager.cpp:3115
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
 #, fuzzy, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Неможливо записати \"%s\", обрані сайти неможливо експортувати: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1103
+#: ../../locales/../src/interface/wrapengine.cpp:1136
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Неможливо вписати \"%s\": %s"
@@ -2570,7 +2611,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "Неможливо вписати файл ключа: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1094
+#: ../../locales/../src/interface/QueueView.cpp:1115
 msgid "Could not write to local file"
 msgstr "Неможливо записати в локальний файл"
 
@@ -2586,33 +2627,48 @@
 msgid "Could not write to socket: %s"
 msgstr "Неможливо записати в гніздо: \"%s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:175
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Country:"
 msgstr "Країна:"
 
-#: resources.h:614
+#: resources.h:628
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "Призводить FileZilla до аварії миттєво. Використовується лише для "
 "відлагодження обробника винятків"
 
-#: resources.h:566 resources.h:580 resources.h:627 resources.h:648
+#: resources.h:591
+#, fuzzy
+msgid "Crea&te new file"
+msgstr "Неможливо створити новий фільтр"
+
+#: resources.h:576 resources.h:590 resources.h:643 resources.h:664
 msgid "Create a new subdirectory in the current directory"
 msgstr "Створити нову піддиректорію в даній директорії"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: resources.h:592
+#, fuzzy
+msgid "Create a new, empty file in the current directory"
+msgstr "Створити нову піддиректорію в даній директорії"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Create directory"
 msgstr "Створити директорію"
 
-#: ../../locales/../src/interface/QueueView.cpp:1504
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Create empty file"
+msgstr "Неможливо редагувати файл"
+
+#: ../../locales/../src/interface/QueueView.cpp:1527
 msgid "Creating directory"
 msgstr "Створення директорії"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3281
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2049
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3310
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Створення директорії '%s'..."
@@ -2638,19 +2694,19 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:419
+#: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
 msgstr "Поточний тип передачі встановлено в ASCII."
 
-#: ../../locales/../src/interface/statusbar.cpp:429
+#: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
 msgstr "Тип поточної передачі встановлено за параметром автовизначення."
 
-#: ../../locales/../src/interface/statusbar.cpp:424
+#: ../../locales/../src/interface/statusbar.cpp:428
 msgid "Current transfer type is set to binary."
 msgstr "Тип поточної передачі встановлено за бінарним параметром."
 
-#: resources.h:767 resources.h:886
+#: resources.h:783 resources.h:904
 msgid "Cus&tom"
 msgstr "Клієнт&ський"
 
@@ -2658,42 +2714,47 @@
 msgid "Custom filter set"
 msgstr "Втановлено клієнтський фільтр"
 
-#: resources.h:375 resources.h:376
+#: resources.h:377 resources.h:378
 msgid "Custom server"
 msgstr "Клієнтський сервер"
 
-#: resources.h:384
+#: resources.h:386
 msgid "D&ata type"
 msgstr "Т&ип Дати"
 
-#: resources.h:893
+#: resources.h:911
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr ""
 "Де&сятиричні префікси, що використовують SI символи (наприклад 1 KБ = 1000 "
 "байт)"
 
-#: resources.h:99
+#: resources.h:100
 msgid "D&efault"
 msgstr "По &замовчуванню"
 
-#: resources.h:582 resources.h:628 resources.h:658
+#: resources.h:594 resources.h:644 resources.h:674
 msgid "D&elete"
 msgstr "Ви&далити"
 
-#: resources.h:204
+#: resources.h:206
 msgid "D&isable all"
 msgstr "Бло&кувати все"
 
-#: resources.h:917
+#: resources.h:882
+#, fuzzy
+msgid "D&o not save passwords"
+msgstr "Введіть пароль"
+
+#: resources.h:935
 msgid "D&ouble-click action on directories:"
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:31
+#: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS- подібний з віртуальними шляхами"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid "Dangerous filetype"
 msgstr "Небезпечний тип файлу"
 
@@ -2706,7 +2767,12 @@
 msgid "Data socket closed too early."
 msgstr "Гніздо даних закрилось дочасно."
 
-#: resources.h:877
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#, fuzzy
+msgid "Date"
+msgstr "Дані"
+
+#: resources.h:895
 msgid "Date formatting"
 msgstr "Форматування даних"
 
@@ -2714,10 +2780,10 @@
 msgid "Date/time format"
 msgstr "Формат дати/часу"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:87
-#: ../../locales/../src/interface/fileexistsdlg.cpp:106
-#: ../../locales/../src/interface/fileexistsdlg.cpp:133
-#: ../../locales/../src/interface/fileexistsdlg.cpp:152
+#: ../../locales/../src/interface/fileexistsdlg.cpp:88
+#: ../../locales/../src/interface/fileexistsdlg.cpp:107
+#: ../../locales/../src/interface/fileexistsdlg.cpp:134
+#: ../../locales/../src/interface/fileexistsdlg.cpp:153
 msgid "Date/time unknown"
 msgstr "Дата/час невідомі"
 
@@ -2725,15 +2791,15 @@
 msgid "Debug"
 msgstr "Відлагодити"
 
-#: resources.h:957
+#: resources.h:975
 msgid "Debugging settings"
 msgstr "Установки відлагодження"
 
-#: resources.h:90
+#: resources.h:91
 msgid "Default &local directory:"
 msgstr "Локальна &директорія по замовчуванню:"
 
-#: ../../locales/../src/engine/server.cpp:23
+#: ../../locales/../src/engine/server.cpp:26
 msgid "Default (Autodetect)"
 msgstr "По замовчуванню (Автовизначення)"
 
@@ -2741,15 +2807,15 @@
 msgid "Default editor not properly quoted."
 msgstr "Редактор по замовчуванню неправильно взятий в лапки."
 
-#: resources.h:254 resources.h:276 resources.h:849
+#: resources.h:256 resources.h:278 resources.h:865
 msgid "Default file exists action"
 msgstr "Дія щодо file exists по замовчуванню"
 
-#: resources.h:92
+#: resources.h:93
 msgid "Default r&emote directory:"
 msgstr "Віддалена ди&ректорія по замовчуванню:"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1151
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
 #, fuzzy
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
@@ -2762,15 +2828,15 @@
 msgid "Default system language"
 msgstr "Мова системи по замовчуванню"
 
-#: resources.h:672
+#: resources.h:688
 msgid "Default transfer mode:"
 msgstr "Режим передачі по замовчуванню:"
 
-#: resources.h:818
+#: resources.h:834
 msgid "Default transfer type:"
 msgstr "Тип передачі по замовчуванню:"
 
-#: resources.h:691 resources.h:754
+#: resources.h:707 resources.h:770
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "По замовчуванню: http://ip.filezilla-project.org/ip.php"
 
@@ -2781,7 +2847,7 @@
 "Затримка між невдалими спробами з'єднання повинна бути у проміжку між 1 та "
 "999 секундами."
 
-#: ../../locales/../src/engine/engineprivate.cpp:633
+#: ../../locales/../src/engine/engineprivate.cpp:630
 #, fuzzy, c-format
 msgid ""
 "Delaying connection for %d second due to previously failed connection "
@@ -2796,58 +2862,58 @@
 msgstr[2] ""
 "Затримка з'єднання пов'язана з попередньо невдалою спробою з'єднання..."
 
-#: ../../locales/../src/interface/sitemanager.cpp:1313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
 msgid "Delete Site Manager entry"
 msgstr "Видалити введені дані з Сайт Менеджера"
 
-#: resources.h:629 resources.h:650
+#: resources.h:645 resources.h:666
 msgid "Delete selected directory"
 msgstr "Видалити обрану директорію"
 
-#: resources.h:569 resources.h:583
+#: resources.h:579 resources.h:595
 msgid "Delete selected files and directories"
 msgstr "Видалити обрані файли і директорії"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 #, fuzzy
 msgid "Deleting directories"
 msgstr "Створення директорії"
 
-#: ../../locales/../src/interface/search.cpp:1038
+#: ../../locales/../src/interface/search.cpp:1017
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: resources.h:452
+#: resources.h:454
 msgid "Deleting symbolic link"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1052
+#: ../../locales/../src/interface/LocalTreeView.cpp:1048
 msgid "Desktop"
 msgstr "Робочий стіл"
 
-#: resources.h:4 resources.h:28 resources.h:175
+#: resources.h:4 resources.h:28 resources.h:177
 msgid "Details"
 msgstr "Подробиці"
 
-#: resources.h:188
+#: resources.h:190
 msgid "Details for new key:"
 msgstr "Подробиці стосовно нового ключа:"
 
-#: resources.h:226
+#: resources.h:228
 msgid "Dire&ctories"
 msgstr "Дире&кторії"
 
-#: ../../locales/../src/interface/queue.cpp:1185
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "Напрямок"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:607
+#: ../../locales/../src/interface/filelistctrl.cpp:523
 msgid "Directory"
 msgstr "Директорія"
 
-#: resources.h:636 resources.h:908 resources.h:991
-#: ../../locales/../src/interface/filelistctrl.cpp:529
-#: ../../locales/../src/interface/Mainfrm.cpp:2321
+#: resources.h:652 resources.h:926 resources.h:1009
+#: ../../locales/../src/interface/filelistctrl.cpp:445
+#: ../../locales/../src/interface/Mainfrm.cpp:2343
 msgid "Directory comparison"
 msgstr "Порівняння директорій"
 
@@ -2865,11 +2931,11 @@
 msgid "Directory listing aborted by user"
 msgstr "Список директорій припинено користувачем"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2314
+#: ../../locales/../src/interface/RemoteListView.cpp:2362
 msgid "Directory listing failed"
 msgstr "Невдалий список директорій"
 
-#: resources.h:197
+#: resources.h:199
 msgid "Directory listing filters"
 msgstr "Фільтри списку директорій"
 
@@ -2877,34 +2943,34 @@
 msgid "Directory listing successful"
 msgstr "Вдалий список директорій"
 
-#: resources.h:207
+#: resources.h:209
 msgid "Disa&ble all"
 msgstr "За&блокувати всеl"
 
-#: ../../locales/../src/interface/state.cpp:1045
+#: ../../locales/../src/interface/state.cpp:1049
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/Mainfrm.cpp:658
+#: ../../locales/../src/interface/Mainfrm.cpp:671
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 "Заблокувати дану опцію ще раз, якщо вміст директорії припинить бути видимим"
 
-#: resources.h:984
+#: resources.h:1002
 msgid "Disconnect from server"
 msgstr "Від'єднати від сервера"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
 #: ../../locales/../src/engine/ControlSocket.cpp:1000
 #: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:223
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1047
-#: ../../locales/../src/interface/QueueView.cpp:1091
+#: ../../locales/../src/interface/QueueView.cpp:1068
+#: ../../locales/../src/interface/QueueView.cpp:1112
 msgid "Disconnected from server"
 msgstr "Від'єднано від сервера"
 
@@ -2914,25 +2980,25 @@
 msgid "Disconnected from server: %s"
 msgstr "Від'єднано від сервера: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1406
-#: ../../locales/../src/interface/statuslinectrl.cpp:265
+#: ../../locales/../src/interface/QueueView.cpp:1429
+#: ../../locales/../src/interface/statuslinectrl.cpp:269
 msgid "Disconnecting from previous server"
 msgstr "Від'єднання від попереднього сервера"
 
-#: resources.h:985
+#: resources.h:1003
 msgid "Disconnects from the currently visible server"
 msgstr "Від'єднання від поточного видимого сервера"
 
-#: resources.h:554
+#: resources.h:564
 msgid "Display about dialog"
 msgstr "Показати діалог Про"
 
-#: resources.h:926
+#: resources.h:944
 #, fuzzy
 msgid "Do &not use default editor"
 msgstr "&Завжди використовувати редактор за замовчуванням"
 
-#: resources.h:608
+#: resources.h:620
 msgid "Do &nothing"
 msgstr "Не робити &нічого"
 
@@ -2946,86 +3012,86 @@
 "За винятком,якщо ви бажаєте протестувати нові елементи,продовжуйте "
 "користуватися стабільною версією."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1109
-#: ../../locales/../src/interface/Mainfrm.cpp:1133
+#: ../../locales/../src/interface/Mainfrm.cpp:1198
+#: ../../locales/../src/interface/Mainfrm.cpp:1222
 msgid "Do you really want to close FileZilla?"
 msgstr "Ви дійсно бажаєте закрити FileZilla?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:35
+#: ../../locales/../src/interface/clearprivatedata.cpp:34
 msgid ""
 "Do you really want to delete all Site Manager entries and the transfer queue?"
 msgstr ""
 "Ви дійсно бажаєте видалити усі введення в Сайт Менеджер та чергу передачі?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:47
+#: ../../locales/../src/interface/clearprivatedata.cpp:46
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Ви дійсно бажаєте видалити усі введення в Сайт Менеджер?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
 msgid "Do you really want to delete selected entry?"
 msgstr "Ви дійсно бажаєте видалити вибране введення?"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:41
+#: ../../locales/../src/interface/clearprivatedata.cpp:40
 msgid "Do you really want to delete the transfer queue?"
 msgstr "Ви дійсно бажаєте видалити чергу передач?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:595
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "Ви дійсно бажаєте надіслати '%s' до сервера?"
 
-#: resources.h:465
+#: resources.h:467
 #, fuzzy
 msgid "Documentation"
 msgstr "Мої Документи"
 
-#: resources.h:693
+#: resources.h:709
 msgid "Don't use external IP address on &local connections."
 msgstr "Не використовувати зовнішню ІР адресу при &локальних з'єднаннях."
 
-#: resources.h:829
+#: resources.h:845
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr ""
 "Дот файли є файлами чиї імена РОЗПОЧИНАЮТЬСЯ з розширенням крапка ,"
 "наприклад: .htaccess"
 
-#: resources.h:911
+#: resources.h:929
 msgid "Double-click action"
 msgstr ""
 
-#: resources.h:361
+#: resources.h:363
 msgid "Download"
 msgstr "Завантажити"
 
-#: resources.h:481 resources.h:805
+#: resources.h:483 resources.h:821
 msgid "Download &limit:"
 msgstr "Завантажити &обмеження:"
 
-#: ../../locales/../src/interface/statusbar.cpp:598
+#: ../../locales/../src/interface/statusbar.cpp:604
 #, fuzzy, c-format
 msgid "Download limit: %s/s"
 msgstr "Завантажити &обмеження:"
 
-#: ../../locales/../src/interface/statusbar.cpp:600
+#: ../../locales/../src/interface/statusbar.cpp:606
 #, fuzzy
 msgid "Download limit: none"
 msgstr "Завантажити &обмеження:"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:843
-#: ../../locales/../src/interface/search.cpp:849
+#: resources.h:442 ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:823
 #, fuzzy
 msgid "Download search results"
 msgstr "Завантажити обрану директорію"
 
-#: resources.h:623
+#: resources.h:639
 msgid "Download selected directory"
 msgstr "Завантажити обрану директорію"
 
-#: resources.h:573
+#: resources.h:583
 msgid "Download selected files and directories"
 msgstr "Завантажити обрані файли і директорії"
 
-#: ../../locales/../src/interface/edithandler.cpp:1236
+#: ../../locales/../src/interface/edithandler.cpp:1247
 msgid "Downloading"
 msgstr "Завантаження"
 
@@ -3035,20 +3101,20 @@
 msgid "Downloading %s"
 msgstr "Завантаження %s"
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:952
+#: ../../locales/../src/interface/search.cpp:926
 #, fuzzy
 msgid "Downloading search results"
 msgstr "Завантаження %s"
 
-#: ../../locales/../src/interface/LocalListView.cpp:102
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:100
-#: ../../locales/../src/interface/RemoteTreeView.cpp:87
+#: ../../locales/../src/interface/RemoteListView.cpp:102
+#: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
@@ -3056,69 +3122,63 @@
 "Функцію Перетягнути&Скинути між різними елементами у FileZilla-і ще не "
 "реалізовано."
 
-#: ../../locales/../src/interface/LocalListView.cpp:108
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:106
-#: ../../locales/../src/interface/RemoteTreeView.cpp:93
+#: ../../locales/../src/interface/RemoteListView.cpp:108
+#: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "Функцію Перетягнути&Скинути між різними серверами у FileZill-і ще не "
 "реалізовано."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-msgid "Duplicate filter name"
-msgstr "Дублювання імені фільтру"
-
-#: resources.h:203
+#: resources.h:205
 msgid "E&nable all"
 msgstr "Роз&блокувати все"
 
-#: resources.h:559 resources.h:576
+#: resources.h:569 resources.h:586
 #, fuzzy
 msgid "E&nter directory"
 msgstr "&Створити директорію"
 
-#: resources.h:140
+#: resources.h:141
 msgid "E&xecute"
 msgstr "Ви&конати"
 
-#: resources.h:500
+#: resources.h:509
 msgid "E&xit"
 msgstr "Ви&йти"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
 msgid "E-Mail:"
 msgstr "Електронна пошта:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:605
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
 msgid "Each filter needs at least one condition."
 msgstr "Кожен фільтр потребує щонайменше однієї умови."
 
-#: resources.h:229
+#: resources.h:231
 msgid "Edit filters"
 msgstr "Редагувати фільтри"
 
-#: resources.h:564
+#: resources.h:574
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr ""
 "Редагувати файл з відконфігурованим редактором і відвантажити зміни на "
 "сервер."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1980
-#: ../../locales/../src/interface/LocalListView.cpp:1991
+#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1974
 #, fuzzy
 msgid "Editing failed"
 msgstr "Невдале відкриття"
 
-#: resources.h:874
+#: resources.h:892
 msgid "Email:"
 msgstr "Електронна пошта:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "Empty command"
 msgstr "Порожня команда"
 
@@ -3126,7 +3186,7 @@
 msgid "Empty command."
 msgstr "Порожня команда."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2316
+#: ../../locales/../src/interface/RemoteListView.cpp:2364
 msgid "Empty directory listing"
 msgstr "Порожній список директорій"
 
@@ -3152,49 +3212,49 @@
 msgid "Empty quoted string."
 msgstr "Пуста залапкована послідовність."
 
-#: resources.h:206
+#: resources.h:208
 msgid "En&able all"
 msgstr "Роз&блокувати все"
 
-#: resources.h:814
+#: resources.h:830
 #, fuzzy
 msgid "Enable invalid character &filtering"
 msgstr "Відмова перевірки достовірності фільтру"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:82
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
 msgid "Encrypted"
 msgstr "Закодовано"
 
-#: resources.h:343
+#: resources.h:345
 msgid "Encryption"
 msgstr "Кодування"
 
-#: resources.h:335
+#: resources.h:337
 msgid "Encryption details"
 msgstr "Подробиці кодування"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:531
+#: ../../locales/../src/interface/filelistctrl.cpp:447
 msgid "End comparison and change sorting order?"
 msgstr "Завершити порівняння та змінити порядок сортування"
 
-#: resources.h:540
+#: resources.h:550
 msgid "Enter &custom command..."
 msgstr "Введіть &користувацьку команду ..."
 
-#: resources.h:485
+#: resources.h:487
 #, fuzzy, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Введіть команду для установок фільтру"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Enter command"
 msgstr "Введіть команду"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid "Enter custom command"
 msgstr "Введіть користувацьку команду"
 
-#: resources.h:918
+#: resources.h:936
 #, fuzzy
 msgid "Enter directory"
 msgstr "Нова директорія"
@@ -3205,25 +3265,25 @@
 msgid "Enter filter name"
 msgstr "Введіть ім'я файлу"
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Введіть команду для установок фільтру"
 
-#: ../../locales/../src/interface/filter.cpp:390
+#: ../../locales/../src/interface/filter.cpp:405
 #, fuzzy
 msgid "Enter new name for filterset"
 msgstr "Введіть команду для установок фільтру"
 
-#: resources.h:115
+#: resources.h:116
 msgid "Enter password"
 msgstr "Введіть пароль"
 
-#: resources.h:560 resources.h:577
+#: resources.h:570 resources.h:587
 #, fuzzy
 msgid "Enter selected directory"
 msgstr "Видалити обрану директорію"
 
-#: resources.h:713
+#: resources.h:729
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
@@ -3248,7 +3308,7 @@
 "Введіть пароль для файлу '%s'.\n"
 "Будь-ласка, майте на увазі,що конвертований файл не буде захищений паролем."
 
-#: resources.h:717
+#: resources.h:733
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3264,53 +3324,61 @@
 msgid "Error exporting settings"
 msgstr "Помилка експорту установок"
 
-#: ../../locales/../src/interface/import.cpp:29
-#: ../../locales/../src/interface/import.cpp:39
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:28
+#: ../../locales/../src/interface/import.cpp:38
+#: ../../locales/../src/interface/import.cpp:108
 msgid "Error importing"
 msgstr "Помилка імпорту"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:166
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:291
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:723
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:764
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:813
-#: ../../locales/../src/interface/filter.cpp:195
-#: ../../locales/../src/interface/filter.cpp:993
-#: ../../locales/../src/interface/import.cpp:121
-#: ../../locales/../src/interface/import.cpp:312
-#: ../../locales/../src/interface/Options.cpp:195
-#: ../../locales/../src/interface/QueueView.cpp:1931
-#: ../../locales/../src/interface/QueueView.cpp:1958
+#: ../../locales/../src/interface/QueueView.cpp:2052
+#, fuzzy
+msgid "Error loading queue"
+msgstr "Помилка завантаження файлу xml "
+
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:172
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:299
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:731
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:772
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:821
+#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/import.cpp:120
+#: ../../locales/../src/interface/import.cpp:311
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1965
+#: ../../locales/../src/interface/search.cpp:1094
 #: ../../locales/../src/interface/search.cpp:1115
-#: ../../locales/../src/interface/search.cpp:1136
-#: ../../locales/../src/interface/sitemanager.cpp:728
-#: ../../locales/../src/interface/sitemanager.cpp:881
-#: ../../locales/../src/interface/sitemanager.cpp:2092
-#: ../../locales/../src/interface/sitemanager.cpp:2590
-#: ../../locales/../src/interface/sitemanager.cpp:2766
-#: ../../locales/../src/interface/sitemanager.cpp:2872
-#: ../../locales/../src/interface/sitemanager.cpp:2992
-#: ../../locales/../src/interface/sitemanager.cpp:3079
-#: ../../locales/../src/interface/wrapengine.cpp:945
+#: ../../locales/../src/interface/sitemanager.cpp:250
+#: ../../locales/../src/interface/sitemanager.cpp:448
+#: ../../locales/../src/interface/sitemanager.cpp:544
+#: ../../locales/../src/interface/sitemanager.cpp:603
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:978
 msgid "Error loading xml file"
 msgstr "Помилка завантаження файлу xml "
 
+#: ../../locales/../src/interface/QueueView.cpp:1951
+#, fuzzy
+msgid "Error saving queue"
+msgstr "Помилка завантаження файлу xml "
+
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:97
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:119
 msgid "Error starting program"
 msgstr "Помилка запуску програми"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:323
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:851
-#: ../../locales/../src/interface/QueueView.cpp:1942
-#: ../../locales/../src/interface/QueueView.cpp:1978
-#: ../../locales/../src/interface/sitemanager.cpp:905
-#: ../../locales/../src/interface/sitemanager.cpp:2692
-#: ../../locales/../src/interface/sitemanager.cpp:2927
-#: ../../locales/../src/interface/sitemanager.cpp:3054
-#: ../../locales/../src/interface/sitemanager.cpp:3116
-#: ../../locales/../src/interface/wrapengine.cpp:1104
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:331
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:859
+#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/sitemanager.cpp:658
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
+#: ../../locales/../src/interface/wrapengine.cpp:1137
 msgid "Error writing xml file"
 msgstr "Помилка запису файлу xml"
 
@@ -3325,27 +3393,27 @@
 msgstr "Встановлений фільтр неможливо перемістити."
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
+#: ../../locales/../src/interface/StatusView.cpp:284
+#: ../../locales/../src/interface/StatusView.cpp:332
 #: ../../locales/../src/interface/updatewizard.cpp:535
 msgid "Error:"
 msgstr "Помилка:"
 
-#: resources.h:477
+#: resources.h:479
 #, fuzzy
 msgid "Establish connection in a new tab"
 msgstr "Неможливо встановити з'єднання з сервером"
 
-#: resources.h:937
+#: resources.h:955
 #, fuzzy
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:896
+#: resources.h:914
 msgid "Examples"
 msgstr "Приклади"
 
-#: resources.h:144
+#: resources.h:145
 msgid "Exe&cute"
 msgstr "Вико&нати"
 
@@ -3353,46 +3421,57 @@
 msgid "Executable"
 msgstr "Виконуваний"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1751
+#: ../../locales/../src/interface/Mainfrm.cpp:1783
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "У виконуваному відсутня інформація про версію,неможливо перевірити оновлення."
 
-#: resources.h:856
+#: resources.h:872
 msgid "Explorer"
 msgstr "Провідник"
 
-#: resources.h:293
+#: resources.h:295
 msgid "Export &Queue"
 msgstr "Експорт &Черги"
 
-#: resources.h:292
+#: resources.h:294
 msgid "Export &Settings"
 msgstr "Експорт &Установок"
 
-#: resources.h:289
+#: resources.h:291
 msgid "Export settings"
 msgstr "Експорт установок"
 
-#: resources.h:218
+#: resources.h:220
 msgid "F&ilter name:"
 msgstr "І&м'я фільтру:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:117
-#: ../../locales/../src/interface/sitemanager.cpp:1626
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
+msgid "FTP - File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:15
+msgid "FTP - File Transfer Protocol with optional encryption"
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:21
+msgid "FTP - Insecure File Transfer Protocol"
+msgstr ""
+
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Двигун FTP не ініціалізується, неможливо з'єднатись"
 
-#: resources.h:741
+#: resources.h:757
 msgid "FTP Keep-alive"
 msgstr "Дежурний FTP "
 
-#: resources.h:761
+#: resources.h:777
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP Проксі"
@@ -3401,7 +3480,7 @@
 msgid "FTP URL"
 msgstr "FTP URL-адреса"
 
-#: resources.h:669
+#: resources.h:685
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3409,25 +3488,25 @@
 "Для передачі даних FTP використовує вторинне з'єднання. Такі додаткові "
 "з'єднання можна встановити двома шляхами."
 
-#: ../../locales/../src/engine/server.cpp:18
+#: ../../locales/../src/engine/server.cpp:20
 msgid "FTPES - FTP over explicit TLS/SSL"
 msgstr "FTPES - FTP через визначений TLS/SSL"
 
-#: ../../locales/../src/engine/server.cpp:17
+#: ../../locales/../src/engine/server.cpp:19
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - FTP через не явний TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:535
-#: ../../locales/../src/interface/LocalListView.cpp:617
-#: ../../locales/../src/interface/LocalListView.cpp:2276
-#: ../../locales/../src/interface/LocalTreeView.cpp:910
-#: ../../locales/../src/interface/viewheader.cpp:520
+#: ../../locales/../src/interface/LocalListView.cpp:545
+#: ../../locales/../src/interface/LocalListView.cpp:625
+#: ../../locales/../src/interface/LocalListView.cpp:2259
+#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../locales/../src/interface/viewheader.cpp:535
 msgid "Failed to change directory"
 msgstr "Відмова зміни директорії"
 
-#: ../../locales/../src/interface/FileZilla.cpp:270
-#: ../../locales/../src/interface/FileZilla.cpp:278
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 msgid "Failed to change language"
 msgstr "Відмова зміни мови"
@@ -3436,11 +3515,11 @@
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Відмова перевірки новішої версії FileZilla."
 
-#: ../../locales/../src/interface/sitemanager.cpp:2304
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
 msgid "Failed to copy or move sites"
 msgstr "Відмова копіювати або переміщувати сайти"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:512
+#: ../../locales/../src/interface/xmlfunctions.cpp:524
 msgid "Failed to create backup copy of xml file"
 msgstr "Відмова створення резервної копії xml файлу"
 
@@ -3448,8 +3527,8 @@
 msgid "Failed to create listen socket, aborting"
 msgstr "Відмова створення гнізда слухання,аварійне завершення"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4214
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4218
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4243
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4247
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "Відмова створення гнізда слухання для передачі в активному режимі"
 
@@ -3457,11 +3536,11 @@
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Відмова завантаження останньої версії FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:665
+#: ../../locales/../src/interface/LocalTreeView.cpp:660
 msgid "Failed to get 'My Documents' path"
 msgstr "Відмова витягнути шлях 'Мої документи' "
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:651
+#: ../../locales/../src/interface/LocalTreeView.cpp:646
 msgid "Failed to get desktop path"
 msgstr "Відмова витягнути шлях до Робочого столу"
 
@@ -3480,8 +3559,8 @@
 msgid "Failed to initialize FTP engine"
 msgstr "Відмова ініціалізації FTP двигуна"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:391
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:760
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Відмова ініціалізації TLS."
@@ -3495,23 +3574,28 @@
 msgid "Failed to load private key: %s"
 msgstr "Відмова завантаження приватного ключа: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2599
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2627
 #, fuzzy, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "Відмова відкрити \"%s\" для додавання / запису"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2661
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "Відмова відкрити \"%s\" для читання"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2640
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2668
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "Відмова відкрити \"%s\"для запису"
 
+#: ../../locales/../src/engine/ControlSocket.cpp:415
+#, fuzzy
+msgid "Failed to parse returned path."
+msgstr "Неможливо визначити адресу сервера :"
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:321
 msgid "Failed to parse trusted root cert."
 msgstr ""
@@ -3528,11 +3612,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "Відмова видобути зовнішню ІР адресу,аварійне завершення"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3912
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3941
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Відмова видобути зовнішню ІР адресу, використовуючи локальну адресу"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3934
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3963
 msgid "Failed to retrieve local ip address."
 msgstr "Відмова видобути локальну ІР адресу."
 
@@ -3548,14 +3632,14 @@
 msgid "Failed to send command."
 msgstr "Відмова надіслати команду."
 
-#: ../../locales/../src/interface/FileZilla.cpp:278
+#: ../../locales/../src/interface/FileZilla.cpp:267
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr ""
 "Відмова встановити мову на %s (%s), використовуючи мову системи по "
 "замовчуванню."
 
-#: ../../locales/../src/interface/FileZilla.cpp:263
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
@@ -3563,28 +3647,28 @@
 "Відмова встановити мову на %s (%s), використовуючи мову системи по "
 "замовчуванню (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:251
+#: ../../locales/../src/interface/FileZilla.cpp:240
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr ""
 "Відмова встановити мову на %s (%s), використовуючи мову системи по "
 "замовчуванню."
 
-#: ../../locales/../src/interface/FileZilla.cpp:280
+#: ../../locales/../src/interface/FileZilla.cpp:269
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr ""
 "Відмова встановити мову на %s, використовуючи мову системи по замовчуванню."
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
+#: ../../locales/../src/interface/FileZilla.cpp:248
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr ""
 "Відмова встановити мову на %s, використовуючи мову системи по замовчуванню (%"
 "s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:237
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr ""
@@ -3594,7 +3678,7 @@
 msgid "Failed to validate settings"
 msgstr "Відмова перевірки достовірності налаштувань"
 
-#: ../../locales/../src/engine/tlssocket.cpp:880
+#: ../../locales/../src/engine/tlssocket.cpp:896
 #, fuzzy
 msgid "Failed to verify peer certificate"
 msgstr "Відмова отримання даних"
@@ -3604,29 +3688,29 @@
 msgid "Failed to write to file %s"
 msgstr "Відмова запису у файл %s"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:530
+#: ../../locales/../src/interface/xmlfunctions.cpp:542
 msgid "Failed to write xml file"
 msgstr "Відмова запису xml файлу"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:15
+#: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Відмова передачі"
 
-#: resources.h:684
+#: resources.h:700
 msgid "Fall back to active mode"
 msgstr "Повернутись до активного режиму"
 
-#: resources.h:368
+#: resources.h:370
 msgid "Fil&e:"
 msgstr "Фай&л:"
 
-#: resources.h:225
+#: resources.h:227
 msgid "Fil&es"
 msgstr "Фай&ли"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:584
-#: ../../locales/../src/interface/filelistctrl.cpp:602
-#: ../../locales/../src/interface/filelistctrl.cpp:611
+#: ../../locales/../src/interface/filelistctrl.cpp:500
+#: ../../locales/../src/interface/filelistctrl.cpp:518
+#: ../../locales/../src/interface/filelistctrl.cpp:527
 msgid "File"
 msgstr "Файл"
 
@@ -3634,7 +3718,7 @@
 msgid "File Types"
 msgstr "Типи файлів"
 
-#: ../../locales/../src/interface/import.cpp:109
+#: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
 msgstr "У файлі відсутні будь-які дані, гідні імпортування."
 
@@ -3642,7 +3726,7 @@
 msgid "File editing"
 msgstr "Редагування файлу"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "File exists"
 msgstr "Файл існує"
 
@@ -3650,7 +3734,7 @@
 msgid "File exists action"
 msgstr "Дія стосовно наявного файлу"
 
-#: resources.h:304
+#: resources.h:306
 msgid "File has changed"
 msgstr "Файл змінився"
 
@@ -3659,14 +3743,14 @@
 msgid "File lists"
 msgstr "Списки файлів"
 
-#: ../../locales/../src/interface/edithandler.cpp:1713
-#: ../../locales/../src/interface/FileZilla.cpp:805
-#: ../../locales/../src/interface/FileZilla.cpp:899
+#: ../../locales/../src/interface/edithandler.cpp:1724
+#: ../../locales/../src/interface/FileZilla.cpp:702
+#: ../../locales/../src/interface/FileZilla.cpp:796
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 msgid "File not found"
 msgstr "Файл не знайдено"
 
-#: resources.h:995
+#: resources.h:1013
 #, fuzzy
 msgid "File search"
 msgstr "Розмір файлу"
@@ -3705,25 +3789,25 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "Файл передано успішно"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1108
+#: ../../locales/../src/interface/Mainfrm.cpp:1197
 msgid "File transfers still in progress."
 msgstr "Передачі файлу усе ще виконуються."
 
-#: resources.h:386
+#: resources.h:388
 msgid "File would transfer with ASCII data type."
 msgstr "Файл пропонує свою передачу через тип даних ASCII."
 
-#: resources.h:387
+#: resources.h:389
 msgid "File would transfer with binary data type."
 msgstr "Файл пропонує свою передачу через бінарний тип даних."
 
-#: ../../locales/../src/interface/FileZilla.cpp:498
-#: ../../locales/../src/interface/quickconnectbar.cpp:67
-#: ../../locales/../src/interface/quickconnectbar.cpp:189
+#: ../../locales/../src/interface/FileZilla.cpp:487
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Помилка FilеZilla "
 
-#: resources.h:706
+#: resources.h:722
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
@@ -3731,13 +3815,19 @@
 "FileZilla тепер може відтестувати вашу конфігурацію,щоб переконатися у її "
 "правильностії."
 
-#: resources.h:476
+#: resources.h:492
+msgid ""
+"FileZilla can remember passwords so that you can later reconnect without "
+"having to reenter your password after restarting FileZilla."
+msgstr ""
+
+#: resources.h:478
 #, fuzzy
 msgid "FileZilla is already connected to a server."
 msgstr "Неможливо порівняти директорії,нема підключення до серверу."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:437
-#: ../../locales/../src/interface/sitemanager.cpp:1061
+#: ../../locales/../src/interface/manual_transfer.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
 msgid ""
 "FileZilla is running in kiosk mode.\n"
 "'Normal' and 'Account' logontypes are not available in this mode."
@@ -3745,53 +3835,61 @@
 "FileZilla працює в режимі кіоку.\n"
 "У цьому режимі \"Нормальний\" та \"Акаунт\" відсутні."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr ""
 "FileZilla потребує перезавантаження для того, щоб зміни у виборі мови набули "
 "чинності."
 
-#: resources.h:516
+#: resources.h:525
 msgid "Filelist status &bars"
 msgstr "Секції статусу списку &файлів"
 
-#: ../../locales/../src/interface/edithandler.cpp:1221
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
-#: ../../locales/../src/interface/LocalListView.cpp:264
-#: ../../locales/../src/interface/RemoteListView.cpp:357
-#: ../../locales/../src/interface/search.cpp:385
+#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
+#: ../../locales/../src/interface/LocalListView.cpp:276
+#: ../../locales/../src/interface/RemoteListView.cpp:370
+#: ../../locales/../src/interface/search.cpp:379
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:39
 msgid "Filename"
 msgstr "Ім'я файлу"
 
-#: resources.h:509
+#: resources.h:518
 msgid "Filename &filters..."
 msgstr "Фільтри &імені файлу..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3079
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2312
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3107
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "Для директорії %s та файлу %s імені створити неможливо "
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1859
+#: ../../locales/../src/interface/RemoteListView.cpp:1907
 msgid "Filename invalid"
 msgstr "Ім'я файлу не дійсне"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
+#, fuzzy
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr ""
+"Імена файлу не можуть вміщувати будь-які з наступних символів: / \\ : * ? \" "
+"< > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "Ім'я файлу не змінено"
 
-#: resources.h:306 resources.h:950
+#: resources.h:308 resources.h:968
 msgid "Filename:"
 msgstr "Ім'я файлу:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1373
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr ""
 "Імена файлу не можуть вміщувати будь-які з наступних сиволів: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
+#: ../../locales/../src/interface/LocalListView.cpp:1348
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
@@ -3799,14 +3897,14 @@
 "Імена файлу не можуть вміщувати будь-які з наступних символів: / \\ : * ? \" "
 "< > |"
 
-#: resources.h:334
+#: resources.h:336
 msgid "Files currently being edited"
 msgstr "Файли зараз редагуються"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
-#: ../../locales/../src/interface/search.cpp:387
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
+#: ../../locales/../src/interface/LocalListView.cpp:277
+#: ../../locales/../src/interface/RemoteListView.cpp:371
+#: ../../locales/../src/interface/search.cpp:381
 msgid "Filesize"
 msgstr "Розмір файлу"
 
@@ -3814,51 +3912,54 @@
 msgid "Filesize format"
 msgstr "Формат розміру файла"
 
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
-#: ../../locales/../src/interface/search.cpp:388
+#: ../../locales/../src/interface/LocalListView.cpp:278
+#: ../../locales/../src/interface/RemoteListView.cpp:372
+#: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "Тип файлу"
 
-#: resources.h:938
+#: resources.h:956
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "Асоціації типу файла"
 
-#: resources.h:224
+#: resources.h:226
 msgid "Filter applies to:"
 msgstr "Фільтр застосовується до:"
 
-#: resources.h:813
+#: resources.h:829
 #, fuzzy
 msgid "Filter invalid characters in filenames"
 msgstr "Відмова перевірки достовірності фільтру"
 
+#: ../../locales/../src/interface/filteredit.cpp:147
+#: ../../locales/../src/interface/filteredit.cpp:215
+#: ../../locales/../src/interface/filteredit.cpp:254
 #: ../../locales/../src/interface/filteredit.cpp:356
 msgid "Filter name already exists"
 msgstr "Ім'я фільтру вже існує"
 
-#: resources.h:220
+#: resources.h:222
 #, fuzzy
 msgid "Filter out items matching all of the following"
 msgstr "Звірити все з наступного"
 
-#: resources.h:221
+#: resources.h:223
 #, fuzzy
 msgid "Filter out items matching any of the following"
 msgstr "Звірити все з наступного"
 
-#: resources.h:222
+#: resources.h:224
 #, fuzzy
 msgid "Filter out items matching none of the following"
 msgstr "Звірити все з наступного"
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Встановлений фільтр вже існує"
 
-#: resources.h:988
+#: resources.h:1006
 msgid "Filter the directory listings"
 msgstr "Фільтрувати списки директорій"
 
@@ -3876,7 +3977,7 @@
 msgid "Fingerprint (SHA-1):"
 msgstr "Ключ шифру(SHA-1):"
 
-#: resources.h:178 resources.h:191
+#: resources.h:180 resources.h:193
 msgid "Fingerprint:"
 msgstr "Ключ шифру:"
 
@@ -3884,7 +3985,7 @@
 msgid "Firewall and router configuration wizard"
 msgstr "Майстер конфігурування файєрволу та маршрутизатора"
 
-#: resources.h:724
+#: resources.h:740
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3892,12 +3993,12 @@
 "Щоб отримати детальнішу інформацію про те,що дані опції роблять,запустіть "
 "майстра конфігурування мережі."
 
-#: resources.h:701
+#: resources.h:717
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr ""
 "Задля надійності вам необхідно вказати діапазон ,щонайменше, 10 портів."
 
-#: ../../locales/../src/interface/Options.cpp:194
+#: ../../locales/../src/interface/Options.cpp:215
 #, fuzzy
 msgid ""
 "For this session the default settings will be used. Any changes to the "
@@ -3907,29 +4008,29 @@
 "Для цього з'єднання будуть використані установки по замовчуванню і будь-які "
 "зміни в установках не будуть постійними."
 
-#: resources.h:108
+#: resources.h:109
 msgid "Force &UTF-8"
 msgstr "Примусити &UTF-8"
 
-#: resources.h:542
+#: resources.h:552
 msgid "Force showing &hidden files"
 msgstr "Примусити показ &прихованих файлів"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:653
+#: ../../locales/../src/interface/Mainfrm.cpp:666
 msgid "Force showing hidden files"
 msgstr "Примусити показ прихованих файлів"
 
-#: resources.h:768
+#: resources.h:784
 msgid "Format specifications:"
 msgstr "Специфікації формату:"
 
-#: resources.h:936
+#: resources.h:954
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Формат: Розширення,після якого ідуть правильно залапковані команда і "
 "аргументи."
 
-#: resources.h:468
+#: resources.h:470
 msgid "Further documentation"
 msgstr ""
 
@@ -3941,62 +4042,62 @@
 msgid "General SOCKS server failure"
 msgstr "Загальна відмова сервера SOCKS"
 
-#: resources.h:786
+#: resources.h:802
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Загальний проксі"
 
-#: resources.h:690
+#: resources.h:706
 msgid "Get external IP address from the following URL:"
 msgstr "Отримати зовнішню ІР адресу з наступного URL:"
 
-#: resources.h:469
+#: resources.h:471
 #, fuzzy
 msgid "Getting help"
 msgstr "&Отримання допомоги..."
 
-#: ../../locales/../src/interface/filter.cpp:350
-#: ../../locales/../src/interface/filter.cpp:411
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr ""
 "Ім'я установки даного фільтру вже існує,переписати налаштування фільтру?"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:250
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:258
 msgid "Global bookmarks"
 msgstr ""
 
-#: resources.h:165
+#: resources.h:166
 msgid "GnuTLS:"
 msgstr ""
 
-#: resources.h:137
+#: resources.h:138
 msgid "Group permissions"
 msgstr "Дозволи для груп"
 
-#: resources.h:596
+#: resources.h:608
 msgid "H&igh"
 msgstr "Ви&сокий"
 
-#: ../../locales/../src/engine/server.cpp:16
+#: ../../locales/../src/engine/server.cpp:18
 #, fuzzy
 msgid "HTTPS - HTTP over TLS"
 msgstr "FTPS - FTP через не явний TLS/SSL"
 
-#: resources.h:339
+#: resources.h:341
 msgid "Hash:"
 msgstr "Хешований:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:83
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
 msgid "Hidden"
 msgstr "Прихований"
 
-#: resources.h:811 ../../locales/../src/interface/queue.cpp:892
-#: ../../locales/../src/interface/queue.cpp:973
+#: resources.h:827 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Високий"
 
-#: ../../locales/../src/interface/queue.cpp:894
-#: ../../locales/../src/interface/queue.cpp:975
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Найвищий"
 
@@ -4004,25 +4105,25 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "Найвищий наявний порт повинен стояти під номером поміж 1024 та 65535."
 
-#: resources.h:208
+#: resources.h:210
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Утримуйте клавішу shift, щоб перемикнути стан фільтру з обох боків одночасно."
 
-#: resources.h:156
+#: resources.h:157
 msgid "Homepage:"
 msgstr ""
 
-#: resources.h:341
+#: resources.h:343
 msgid "Host key fingerprint:"
 msgstr "Головний ключ шифрування хосту:"
 
-#: resources.h:184
+#: resources.h:186
 msgid "Host key mismatch"
 msgstr "Ключ хоста не співпадає"
 
-#: ../../locales/../src/engine/server.cpp:152
+#: ../../locales/../src/engine/server.cpp:166
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "Хост стартує з '[',однак заключної дужки не знайдено."
 
@@ -4030,20 +4131,20 @@
 msgid "Host unreachable"
 msgstr "Хост недосяжний"
 
-#: resources.h:16 resources.h:40 resources.h:120 resources.h:176
-#: resources.h:189
+#: resources.h:16 resources.h:40 resources.h:121 resources.h:178
+#: resources.h:191
 msgid "Host:"
 msgstr "Хост:"
 
-#: resources.h:95
+#: resources.h:96
 msgid "Hours,"
 msgstr "Години,"
 
-#: resources.h:885
+#: resources.h:903
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (приклад: 15:47)"
 
-#: resources.h:728
+#: resources.h:744
 #, fuzzy
 msgid ""
 "If no data is sent or received during an operation for longer than the "
@@ -4054,13 +4155,13 @@
 "тоді з'єднання буде припинено і FileZilla намагатиметься підключитися "
 "повторно."
 
-#: resources.h:966
+#: resources.h:984
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Якщо з'явиться повідомлення про дефект, тоді для логів встановіть "
 "\"Багатошаровий\" рівень логування."
 
-#: resources.h:681
+#: resources.h:697
 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 "
@@ -4073,7 +4174,7 @@
 "скористатися активним режимом.Ви можете встановити спосіб передачі в Сайт "
 "Менеджері на основі одного сервера."
 
-#: resources.h:676
+#: resources.h:692
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4082,7 +4183,7 @@
 "під'єднатися до тих неправильно сконфігурованих серверів,що не сприймають "
 "обраний спосіб передачі."
 
-#: resources.h:187
+#: resources.h:189
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4106,14 +4207,14 @@
 "Якщо дана проблема не зникає, тоді зверніться до виробника вашого "
 "маршрутизатора або файєрволу у пошуку рішення."
 
-#: resources.h:955
+#: resources.h:973
 msgid ""
 "If the size of the logfile reaches the limit, it gets renamed by adding \".1"
 "\" to the end of the filename (possibly overwriting older logfiles) and a "
 "new file gets created."
 msgstr ""
 
-#: resources.h:454
+#: resources.h:456
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4133,7 +4234,7 @@
 "Якщо дана проблема не зникає, тоді зверніться до виробника вашого "
 "маршрутизатора."
 
-#: resources.h:277 resources.h:850
+#: resources.h:279 resources.h:866
 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 "
@@ -4142,7 +4243,7 @@
 "При використанні 'переписати якщо новіший',необхідно синхронізувати ваш "
 "системний час з серверним ."
 
-#: resources.h:909
+#: resources.h:927
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
@@ -4150,11 +4251,11 @@
 "При використанні порівняння на основі дати/часу,розглядайте два файли як "
 "одинакові, при умові, що різниця їхньої дати/часу не перевищує цієї межі."
 
-#: resources.h:924
+#: resources.h:942
 msgid "If you change the language, you should restart FileZilla."
 msgstr "При заміні мови вам необхідно перезапустити FileZilla."
 
-#: resources.h:707
+#: resources.h:723
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4162,11 +4263,11 @@
 "Якщо ви натисните кнопку тест, FileZilla з'єднається з probe.filezilla-"
 "project.org і виконає кілька простих тестів."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1132
+#: ../../locales/../src/interface/Mainfrm.cpp:1221
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "Якщо ви закриєте FileZilla,ваші зміни будуть втрачені."
 
-#: resources.h:826
+#: resources.h:842
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
@@ -4174,13 +4275,13 @@
 "При введенні неправильного типу файлів,при передачі, ці файли можуть "
 "пошкодитися."
 
-#: resources.h:708
+#: resources.h:724
 msgid "If you get any errors, your configuration is not correct."
 msgstr ""
 "При виникненні будь-якої помилки,майте на увазі,що ваша конфігурація не "
 "коректна."
 
-#: resources.h:740
+#: resources.h:756
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4199,7 +4300,7 @@
 "В такому випадку спробуйте переключити пасивний спосіб і сконтактуйте з "
 "адміністратором сервера."
 
-#: resources.h:667
+#: resources.h:683
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4207,7 +4308,7 @@
 "Якщо роботу майстра завершено і результат кінцевого тесту має успіх, тоді "
 "правильно сконфігуруйте свої файєрвол і маршрутизатор."
 
-#: resources.h:703
+#: resources.h:719
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4215,7 +4316,7 @@
 "Якщо ви користуєтесь файєрволом, переконайтесь, що FileZilla має дозвіл на "
 "отримання з'єднання по всіх наявних портах."
 
-#: resources.h:702
+#: resources.h:718
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4231,16 +4332,16 @@
 "Якщо ваш маршрутизатор постійно змінює ІР адреси,зверніться до вашого "
 "виробника маршрутизатора."
 
-#: ../../locales/../src/interface/import.cpp:97
+#: ../../locales/../src/interface/import.cpp:96
 msgid "Import data from older version"
 msgstr "Імпортувати дані зі старої версії"
 
-#: resources.h:296
+#: resources.h:298
 msgid "Import settings"
 msgstr "Імпортувати установки"
 
-#: ../../locales/../src/interface/import.cpp:82
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:81
+#: ../../locales/../src/interface/import.cpp:84
 msgid "Import successful"
 msgstr "Імпорт успішний"
 
@@ -4249,7 +4350,7 @@
 msgid "Improperly quoted association."
 msgstr "Неправильно залапковані асоціації."
 
-#: resources.h:695
+#: resources.h:711
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4257,7 +4358,7 @@
 "В активному режимі FileZilla - і необхідно слухати порт передачі даних.Вам "
 "необхідно вказати який порт FileZilla використовуватиме."
 
-#: resources.h:697
+#: resources.h:713
 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."
@@ -4266,7 +4367,7 @@
 "оскільки FileZilla не в стані вплинути на порти, що обираються вашою "
 "системою."
 
-#: resources.h:253
+#: resources.h:255
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4274,13 +4375,13 @@
 "Якщо ви надаєте перевагу автоматичним оновленням, ви можете розблокувати "
 "автоматичні перевірки оновлень у вікні налаштувань."
 
-#: resources.h:685 resources.h:749
+#: resources.h:701 resources.h:765
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "Щоб використати активний режим, FileZilla мусить знати вашу ІР адресу."
 
-#: resources.h:670
+#: resources.h:686
 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 "
@@ -4290,23 +4391,27 @@
 "FileZilla запитує у сервера порт і під'єднується до нього.Це не вимагає "
 "великого конфігурування."
 
-#: ../../locales/../src/engine/tlssocket.cpp:894
+#: ../../locales/../src/engine/tlssocket.cpp:910
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr ""
 
-#: ../../locales/../src/interface/QueueView.cpp:1043
+#: ../../locales/../src/interface/QueueView.cpp:1064
 msgid "Incorrect password"
 msgstr "Неправильний пароль"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:750
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
 msgid "Initializing TLS..."
 msgstr "Ініціалазація TLS..."
 
-#: ../../locales/../src/engine/server.cpp:850
-#: ../../locales/../src/engine/server.cpp:869
-#: ../../locales/../src/interface/manual_transfer.cpp:187
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+msgid "Insecure server, it does not support FTP over TLS."
+msgstr ""
+
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Інтерактивний"
 
@@ -4315,8 +4420,8 @@
 msgstr "Інтерфейс"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1000
-#: ../../locales/../src/interface/QueueView.cpp:1574
+#: ../../locales/../src/interface/QueueView.cpp:1021
+#: ../../locales/../src/interface/QueueView.cpp:1597
 msgid "Interrupted by user"
 msgstr "Перервано користувачем"
 
@@ -4347,35 +4452,36 @@
 msgid "Invalid data received"
 msgstr "Отримано недійсні дані"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:47
+#: ../../locales/../src/interface/verifycertdialog.cpp:32
+#: ../../locales/../src/interface/verifycertdialog.cpp:48
 msgid "Invalid date"
 msgstr "Недійсні дані"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1343
-#: ../../locales/../src/interface/LocalListView.cpp:1368
+#: ../../locales/../src/interface/LocalListView.cpp:1348
+#: ../../locales/../src/interface/LocalListView.cpp:1373
+#: ../../locales/../src/interface/RemoteListView.cpp:3188
 msgid "Invalid filename"
 msgstr "Недійсне ім'я файлу"
 
-#: ../../locales/../src/engine/server.cpp:159
+#: ../../locales/../src/engine/server.cpp:173
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Недійсний хост.Після заключної дужки може слідувати лише кома або "
 "перенесення."
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "Invalid input"
 msgstr "Недійсне введення"
 
-#: ../../locales/../src/engine/server.cpp:47
-#: ../../locales/../src/engine/server.cpp:180
-#: ../../locales/../src/engine/server.cpp:192
+#: ../../locales/../src/engine/server.cpp:61
+#: ../../locales/../src/engine/server.cpp:194
+#: ../../locales/../src/engine/server.cpp:206
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr ""
 "Недійсний заданий порт. Значення порту повинно становити від 1 до 65535."
 
-#: ../../locales/../src/engine/server.cpp:77
-#: ../../locales/../src/interface/quickconnectbar.cpp:120
+#: ../../locales/../src/engine/server.cpp:91
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
@@ -4389,7 +4495,15 @@
 "ftps:// для FTP через SSL (не явний) і\n"
 "ftpes://для FTP через SSL (явний)."
 
-#: ../../locales/../src/interface/search.cpp:724
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4394
+#, fuzzy
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr ""
+"Недійсний хост.Після заключної дужки може слідувати лише кома або "
+"перенесення."
+
+#: ../../locales/../src/interface/search.cpp:698
 #, fuzzy
 msgid "Invalid regular expression in search conditions."
 msgstr "Недійсний розмір в умовах"
@@ -4398,50 +4512,50 @@
 msgid "Invalid response code"
 msgstr "Недійсний код відгуку"
 
-#: ../../locales/../src/interface/search.cpp:718
+#: ../../locales/../src/interface/search.cpp:692
 #, fuzzy, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Недійсний розмір в умовах"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:2629
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3091
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:419
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:487
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Недійсний шлях до сайту"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:638
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
 msgid "Invalid size in condition"
 msgstr "Недійсний розмір в умовах"
 
-#: ../../locales/../src/engine/server.cpp:122
+#: ../../locales/../src/engine/server.cpp:136
 msgid "Invalid username given."
 msgstr "Подано недійсне ім'я користувача."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Jurisdiction country:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Jurisdiction locality:"
 msgstr ""
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "Jurisdiction state or province:"
 msgstr ""
 
-#: resources.h:906
+#: resources.h:924
 msgid "Keep directories on top"
 msgstr "Директорії тримати зверху"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:657
+#: ../../locales/../src/interface/Mainfrm.cpp:670
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4452,50 +4566,50 @@
 "виконує деякі тести з метою перевірки серверної підтримки даного елементу,"
 "тест може бути невдалим."
 
-#: resources.h:336
+#: resources.h:338
 msgid "Key exchange"
 msgstr "Обмін ключами"
 
-#: resources.h:599
+#: resources.h:611
 msgid "L&owest"
 msgstr "Най&нижчий"
 
-#: resources.h:922
+#: resources.h:940
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Мова"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1496
+#: ../../locales/../src/interface/Mainfrm.cpp:1532
 msgid "Language changed"
 msgstr "Зміна мови"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
-#: ../../locales/../src/interface/search.cpp:389
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:373
+#: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Востаннє модифіковано"
 
-#: resources.h:853
+#: resources.h:869
 msgid "Layout"
 msgstr "Формат"
 
-#: resources.h:799
+#: resources.h:815
 msgid "Limit for concurrent &downloads:"
 msgstr "Обмеження для одночасних &завантажень:"
 
-#: resources.h:801
+#: resources.h:817
 msgid "Limit for concurrent &uploads:"
 msgstr "Обмеження для одночасних &відвантажень:"
 
-#: resources.h:744
+#: resources.h:760
 msgid "Limit local ports"
 msgstr "Обмежити локальні порти"
 
-#: resources.h:952
+#: resources.h:970
 msgid "Limit size of logfile"
 msgstr ""
 
-#: resources.h:953
+#: resources.h:971
 msgid "Limit:"
 msgstr ""
 
@@ -4503,7 +4617,7 @@
 msgid "Line length exceeded"
 msgstr "Перевищено довжину лінійки"
 
-#: resources.h:166
+#: resources.h:168
 msgid "Linked against"
 msgstr ""
 
@@ -4512,41 +4626,46 @@
 msgstr "Гніздо слухання закрито"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:295
+#: ../../locales/../src/interface/StatusView.cpp:360
 msgid "Listing:"
 msgstr "Список:"
 
-#: resources.h:747
+#: resources.h:763
 msgid "Lo&west available port:"
 msgstr "Най&нижчийt доступний порт:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1269
-#: ../../locales/../src/interface/edithandler.cpp:1523
+#: ../../locales/../src/interface/edithandler.cpp:1280
+#: ../../locales/../src/interface/edithandler.cpp:1534
 msgid "Local"
 msgstr "Локальний"
 
-#: resources.h:363
+#: resources.h:365
 msgid "Local file"
 msgstr "Локальний файл"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:324
+#: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
 msgstr "Локальний файл не існує."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:319
+#: ../../locales/../src/interface/manual_transfer.cpp:323
 msgid "Local file is a directory instead of a regular file."
 msgstr "Локальний файл є директорією, а не просто звичайним файлом."
 
-#: resources.h:202
+#: ../../locales/../src/interface/manual_transfer.cpp:369
+#, fuzzy
+msgid "Local file is not a valid filename."
+msgstr "Неможливо завантажити файл,недійсний XML файл."
+
+#: resources.h:204
 msgid "Local filters:"
 msgstr "Локальні фільтри:"
 
-#: ../../locales/../src/interface/viewheader.cpp:347
+#: ../../locales/../src/interface/viewheader.cpp:360
 msgid "Local site:"
 msgstr "Локальний сайт:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Locality:"
 msgstr "Розташування:"
 
@@ -4555,17 +4674,17 @@
 msgid "Log file"
 msgstr "Локальний файл"
 
-#: resources.h:250
+#: resources.h:252
 #, fuzzy
 msgid "Log of update check:"
 msgstr "Автоматична перевірка оновлень"
 
-#: resources.h:947
+#: resources.h:965
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Логування"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:803
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4574,7 +4693,7 @@
 "кодування UTF-8. Неможливо повернутись до локальних установок кодування "
 "знаків."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:810
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4582,7 +4701,7 @@
 "Дані логування містять нон-ASCII знаки і,можливо, сервер не сприймає "
 "кодування UTF-8. Спроба використати локальні установки кодування знаків."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr ""
 "Послідовність логування виконана повністю, проте залогування не відбулось. "
@@ -4599,13 +4718,13 @@
 "'%s' or '%s'"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:887
-#: ../../locales/../src/interface/queue.cpp:968
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Низький"
 
-#: ../../locales/../src/interface/queue.cpp:885
-#: ../../locales/../src/interface/queue.cpp:966
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Найнижчий"
 
@@ -4617,7 +4736,7 @@
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:64
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
 
@@ -4638,71 +4757,72 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Спотворена відповідь,сервер не надсилає правильних закінчень лінійки"
 
-#: resources.h:393 ../../locales/../src/interface/manual_transfer.cpp:305
-#: ../../locales/../src/interface/manual_transfer.cpp:312
-#: ../../locales/../src/interface/manual_transfer.cpp:319
-#: ../../locales/../src/interface/manual_transfer.cpp:324
-#: ../../locales/../src/interface/manual_transfer.cpp:332
-#: ../../locales/../src/interface/manual_transfer.cpp:339
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: resources.h:395 ../../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
 msgid "Manual transfer"
 msgstr "Ручна передача"
 
-#: resources.h:433
+#: resources.h:435
 msgid "Match all of the following"
 msgstr "Звірити все з наступного"
 
-#: resources.h:434
+#: resources.h:436
 #, fuzzy
 msgid "Match any of the following"
 msgstr "Звірити все з наступного"
 
-#: resources.h:435
+#: resources.h:437
 #, fuzzy
 msgid "Match none of the following"
 msgstr "Звірити все з наступного"
 
-#: resources.h:797
+#: resources.h:813
 msgid "Maximum simultaneous &transfers:"
 msgstr "Максимум одночасних &передач:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:375
-#: ../../locales/../src/interface/Mainfrm.cpp:1834
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1860
 msgid "Message log"
 msgstr "Журнал повідомлень"
 
-#: resources.h:864
+#: resources.h:880
 #, fuzzy
 msgid "Message log position"
 msgstr "Журнал повідомлень"
 
-#: resources.h:954
+#: resources.h:972
 msgid "MiB"
 msgstr ""
 
-#: resources.h:96
+#: resources.h:97
 msgid "Minutes"
 msgstr "Хвилини"
 
-#: resources.h:357
+#: resources.h:359
 msgid "Move &down"
 msgstr "Перемістити &вниз"
 
-#: resources.h:356
+#: resources.h:358
 msgid "Move &up"
 msgstr "Перемістити &вверх"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1071
+#: ../../locales/../src/interface/LocalTreeView.cpp:1067
 msgid "My Computer"
 msgstr "Мій Комп'ютер"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1061
+#: ../../locales/../src/interface/LocalTreeView.cpp:1057
 msgid "My Documents"
 msgstr "Мої Документи"
 
-#: ../../locales/../src/interface/sitemanager.cpp:715
-#: ../../locales/../src/interface/sitemanager.cpp:717
-#: ../../locales/../src/interface/sitemanager.cpp:2132
+#: ../../locales/../src/interface/sitemanager.cpp:290
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "Мої Сайти"
 
@@ -4711,23 +4831,23 @@
 msgid "N/a"
 msgstr "Не акцептовано"
 
-#: resources.h:398
+#: resources.h:400
 #, fuzzy
 msgid "Name"
 msgstr "Ім'я:"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:705
-#: ../../locales/../src/interface/sitemanager.cpp:1280
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:713
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
 msgid "Name already exists"
 msgstr "Ім'я вже існує"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
 #, fuzzy
 msgid "Name of bookmark already exists."
 msgstr "Ім'я вже існує"
 
-#: resources.h:119 resources.h:167
+#: resources.h:120 resources.h:169
 msgid "Name:"
 msgstr "Ім'я:"
 
@@ -4735,12 +4855,12 @@
 msgid "Need to enter filter name"
 msgstr "Потрібно ввести ім'я фільтру"
 
-#: ../../locales/../src/interface/search.cpp:708
+#: ../../locales/../src/interface/search.cpp:682
 #, fuzzy
 msgid "Need to enter valid remote path"
 msgstr "Потрібно ввести ім'я фільтру"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1095
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
 msgid "Need to specify a character encoding"
 msgstr "Потрібно вказати спосіб кодування знаків"
 
@@ -4752,40 +4872,40 @@
 msgid "New &Folder"
 msgstr "Нова &Папка"
 
-#: resources.h:493
+#: resources.h:502
 #, fuzzy
 msgid "New &tab"
 msgstr "Новий сайт"
 
-#: resources.h:74 resources.h:413
+#: resources.h:74 resources.h:415
 msgid "New Book&mark"
 msgstr ""
 
-#: resources.h:394 ../../locales/../src/interface/bookmarks_dialog.cpp:52
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:66
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:96
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:105
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:543
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:549
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:572
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:828
-#: ../../locales/../src/interface/sitemanager.cpp:2469
-#: ../../locales/../src/interface/sitemanager.cpp:3028
+#: resources.h:396 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:69
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:99
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:108
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:551
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:557
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:580
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:836
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
 msgid "New bookmark"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1191
-#: ../../locales/../src/interface/RemoteListView.cpp:1583
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1286
+#: ../../locales/../src/interface/LocalTreeView.cpp:1185
+#: ../../locales/../src/interface/RemoteListView.cpp:1631
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
 msgid "New directory"
 msgstr "Нова директорія"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:43
+#: ../../locales/../src/interface/welcome_dialog.cpp:53
 #, c-format
 msgid "New features and improvements in %s"
 msgstr ""
@@ -4794,22 +4914,22 @@
 msgid "New filter"
 msgstr "Новий фільтр"
 
-#: ../../locales/../src/interface/sitemanager.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "Нова папка"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2445
-#: ../../locales/../src/interface/sitemanager.cpp:2891
-#: ../../locales/../src/interface/sitemanager.cpp:2905
+#: ../../locales/../src/interface/sitemanager.cpp:622
+#: ../../locales/../src/interface/sitemanager.cpp:636
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
 msgid "New site"
 msgstr "Новий сайт"
 
-#: resources.h:862
+#: resources.h:878
 #, fuzzy
 msgid "Next to the transfer queue"
 msgstr "Переключає відображення черги передачі"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
 msgid "No"
 msgstr "Ні"
 
@@ -4817,15 +4937,15 @@
 msgid "No category to export selected"
 msgstr "Не обрано категорії для експортування"
 
-#: ../../locales/../src/interface/QueueView.cpp:2205
+#: ../../locales/../src/interface/QueueView.cpp:2297
 msgid "No command given, aborting."
 msgstr "Відсутня команда, аварійне завершення."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3879
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3908
 msgid "No external IP address set, trying default."
 msgstr "Не встановлено зовнішньої IP адреси,проба адреси по замовчуванню."
 
-#: ../../locales/../src/interface/edithandler.cpp:1210
+#: ../../locales/../src/interface/edithandler.cpp:1221
 msgid "No files are currently being edited."
 msgstr "Ніякі файли зараз не редагуються."
 
@@ -4833,9 +4953,9 @@
 msgid "No filter name given"
 msgstr "Не задано імені фільтру"
 
-#: ../../locales/../src/engine/server.cpp:62
-#: ../../locales/../src/engine/server.cpp:173
-#: ../../locales/../src/engine/server.cpp:202
+#: ../../locales/../src/engine/server.cpp:76
+#: ../../locales/../src/engine/server.cpp:187
+#: ../../locales/../src/engine/server.cpp:216
 msgid "No host given, please enter a host."
 msgstr "Не вказаний хост,введіть ім'я хосту,будь-ласка."
 
@@ -4843,32 +4963,32 @@
 msgid "No images available"
 msgstr "Відсутні зображення"
 
-#: ../../locales/../src/interface/QueueView.cpp:3054
+#: ../../locales/../src/interface/QueueView.cpp:3168
 msgid "No more files in the queue!"
 msgstr "Чергу файлів вичерпано повністю!"
 
-#: ../../locales/../src/interface/filter.cpp:335
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Не задано імені установок фільтру."
 
-#: resources.h:429
+#: resources.h:431
 msgid "No program associated with filetype"
 msgstr ""
 
-#: resources.h:419
+#: resources.h:421
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr ""
 
-#: ../../locales/../src/interface/search.cpp:566
+#: ../../locales/../src/interface/search.cpp:540
 #, fuzzy
 msgid "No search results"
 msgstr "Завантажити обрану директорію"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2098
-#: ../../locales/../src/interface/sitemanager.cpp:2110
-#: ../../locales/../src/interface/sitemanager.cpp:2141
+#: ../../locales/../src/interface/sitemanager.cpp:256
+#: ../../locales/../src/interface/sitemanager.cpp:268
+#: ../../locales/../src/interface/sitemanager.cpp:299
 msgid "No sites available"
 msgstr "Сайти відсутні"
 
@@ -4876,31 +4996,32 @@
 msgid "No supported SOCKS5 auth method"
 msgstr "Непідтримуваний метод автентифікації для SOCKS5 "
 
-#: ../../locales/../src/interface/loginmanager.cpp:102
+#: ../../locales/../src/interface/loginmanager.cpp:104
 msgid "No username given."
 msgstr "Не задано імені користувача."
 
-#: resources.h:916 resources.h:921
-#: ../../locales/../src/interface/verifycertdialog.cpp:53
+#: resources.h:934 resources.h:939
+#: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Жодного"
 
-#: resources.h:373
+#: resources.h:375
 msgid "None selected yet"
 msgstr "Нічого не вибрано"
 
-#: resources.h:810 ../../locales/../src/engine/server.cpp:846
-#: ../../locales/../src/engine/server.cpp:865
-#: ../../locales/../src/interface/manual_transfer.cpp:156
-#: ../../locales/../src/interface/manual_transfer.cpp:181
-#: ../../locales/../src/interface/manual_transfer.cpp:544
-#: ../../locales/../src/interface/queue.cpp:890
-#: ../../locales/../src/interface/queue.cpp:971
-#: ../../locales/../src/interface/sitemanager.cpp:1387
+#: resources.h:826 ../../locales/../src/engine/server.cpp:852
+#: ../../locales/../src/engine/server.cpp:871
+#: ../../locales/../src/interface/manual_transfer.cpp:160
+#: ../../locales/../src/interface/manual_transfer.cpp:185
+#: ../../locales/../src/interface/manual_transfer.cpp:560
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
 msgid "Normal"
 msgstr "Звичайний"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:370
+#: ../../locales/../src/interface/queueview_failed.cpp:326
+#: ../../locales/../src/interface/queueview_failed.cpp:351
 #, fuzzy
 msgid "Not all items could be requeued for viewing/editing."
 msgstr ""
@@ -4912,11 +5033,11 @@
 msgid "Not connected"
 msgstr "З'єднано"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2312
+#: ../../locales/../src/interface/RemoteListView.cpp:2360
 msgid "Not connected to any server"
 msgstr "Нема під'єднання до жодного серверу"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:561
+#: ../../locales/../src/interface/Mainfrm.cpp:564
 msgid "Not connected to any server."
 msgstr "Нема під'єднання до жодного серверу."
 
@@ -4925,22 +5046,22 @@
 msgid "Not connected."
 msgstr "З'єднано"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:655
+#: ../../locales/../src/interface/Mainfrm.cpp:668
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr ""
 "Зауважте,що даний елемент підтримується лише при використанні FTP протоколу "
 
-#: resources.h:778
+#: resources.h:794
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Примітка:Це працює лише чистим,не кодованими FTP з'єднаннями."
 
-#: resources.h:795
+#: resources.h:811
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Примітка: Використання загального проксі форсує пасивний режим при "
 "з'єднаннях FTP."
 
-#: resources.h:895
+#: resources.h:913
 msgid "Number of decimal places:"
 msgstr "Кількість десяткових розташувань:"
 
@@ -4948,21 +5069,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Кількість повторів повинна знаходитись у проміжку між 0 та 99."
 
-#: resources.h:332
+#: resources.h:334
 msgid "O&pen file"
 msgstr "Від&крити файл"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:129
-#: resources.h:151 resources.h:172 resources.h:182 resources.h:195
-#: resources.h:210 resources.h:227 resources.h:278 resources.h:287
-#: resources.h:294 resources.h:302 resources.h:325 resources.h:333
-#: resources.h:352 resources.h:358 resources.h:391 resources.h:405
-#: resources.h:427 resources.h:450 resources.h:459 resources.h:473
-#: resources.h:486 resources.h:721
+#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
+#: resources.h:152 resources.h:174 resources.h:184 resources.h:197
+#: resources.h:212 resources.h:229 resources.h:280 resources.h:289
+#: resources.h:296 resources.h:304 resources.h:327 resources.h:335
+#: resources.h:354 resources.h:360 resources.h:393 resources.h:407
+#: resources.h:429 resources.h:452 resources.h:461 resources.h:475
+#: resources.h:488 resources.h:495 resources.h:737
 msgid "OK"
 msgstr "Добре"
 
-#: resources.h:677
+#: resources.h:693
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4970,11 +5091,11 @@
 "На наступних сторінках буде сконфігуровано обраний режим передач і режим "
 "нейтралізації неполадок, у випадку його включення."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
 msgid "Once"
 msgstr "Один раз"
 
-#: resources.h:946
+#: resources.h:964
 msgid ""
 "Only the versions of FileZilla and the operating system you are using will "
 "be submitted to the server."
@@ -4982,67 +5103,67 @@
 "На сервер буде передано лише версії FileZilla та операційну систему якими ви "
 "користуєтесь."
 
-#: resources.h:646
+#: resources.h:662
 msgid "Open directory in system's file manager"
 msgstr ""
 
-#: resources.h:968 resources.h:969
+#: resources.h:986 resources.h:987
 msgid "Open the Site Manager"
 msgstr "Відкрити Сайт Менеджер"
 
-#: resources.h:562
+#: resources.h:572
 msgid "Open the file."
 msgstr "Відкрити цей файл."
 
-#: resources.h:506
+#: resources.h:515
 msgid "Open the settings dialog of FileZilla"
 msgstr "Відкрити діалог установок FileZilla"
 
-#: resources.h:308
+#: resources.h:310
 msgid "Opened as:"
 msgstr "Відкрито з: "
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/LocalListView.cpp:2202
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/LocalListView.cpp:2185
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 msgid "Opening failed"
 msgstr "Невдале відкриття"
 
-#: resources.h:494
+#: resources.h:503
 msgid "Opens a new tab"
 msgstr ""
 
-#: resources.h:491
+#: resources.h:500
 msgid "Opens the Site Manager"
 msgstr "Відкриває Сайт Менеджер"
 
-#: resources.h:989
+#: resources.h:1007
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Відкриває список директорії діалогу фільтру. Клацніть правою мишкою, щоб "
 "перемикнути фільтри."
 
-#: resources.h:170
+#: resources.h:172
 #, fuzzy
 msgid "Operating system"
 msgstr "Відмічено проблему в операційній системі"
 
-#: ../../locales/../src/interface/FileZilla.cpp:317
+#: ../../locales/../src/interface/FileZilla.cpp:306
 msgid "Operating system problem detected"
 msgstr "Відмічено проблему в операційній системі"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:171
+#: ../../locales/../src/interface/verifycertdialog.cpp:177
 msgid "Organization:"
 msgstr "Організація:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:199
 msgid "Other:"
 msgstr "Інше:"
 
-#: resources.h:723
+#: resources.h:739
 msgid "Overview"
 msgstr "Переглянути"
 
@@ -5050,22 +5171,22 @@
 msgid "Overwrite &if source newer"
 msgstr "Переписати &якщо джерело новіше"
 
-#: resources.h:259 resources.h:269 resources.h:833 resources.h:842
+#: resources.h:261 resources.h:271 resources.h:849 resources.h:858
 #, fuzzy
 msgid "Overwrite file"
 msgstr "&Переписати"
 
-#: resources.h:261 resources.h:271 resources.h:835 resources.h:844
+#: resources.h:263 resources.h:273 resources.h:851 resources.h:860
 #, fuzzy
 msgid "Overwrite file if size differs"
 msgstr "Переписати якщо розмір відрізняється"
 
-#: resources.h:262 resources.h:272 resources.h:836 resources.h:845
+#: resources.h:264 resources.h:274 resources.h:852 resources.h:861
 #, fuzzy
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Переписати якщо розмір відрізняється або джерело новіше"
 
-#: resources.h:260 resources.h:270 resources.h:834 resources.h:843
+#: resources.h:262 resources.h:272 resources.h:850 resources.h:859
 #, fuzzy
 msgid "Overwrite file if source file newer"
 msgstr "Пе&реписати якщо джерело новіше"
@@ -5080,23 +5201,23 @@
 msgid "Overwrite if different si&ze or source newer"
 msgstr "Переписати якщо розмір відрізняється або джерело новіше"
 
-#: resources.h:133
+#: resources.h:134
 msgid "Owner permissions"
 msgstr "Дозволи власника"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
-#: ../../locales/../src/interface/search.cpp:391
+#: ../../locales/../src/interface/RemoteListView.cpp:375
+#: ../../locales/../src/interface/search.cpp:385
 #, fuzzy
 msgid "Owner/Group"
 msgstr "Власник / Група"
 
-#: resources.h:867
+#: resources.h:884
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr ""
 
-#: resources.h:775 resources.h:791
+#: resources.h:791 resources.h:807
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Про&ксі хості:"
@@ -5105,7 +5226,7 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "Команда ПОРТА заблокована маршрутизатором або файєрволом.."
 
-#: resources.h:737
+#: resources.h:753
 msgid "Pa&ssive (recommended)"
 msgstr "Па&сивний (рекомендовано)"
 
@@ -5113,19 +5234,19 @@
 msgid "Package"
 msgstr "Пакет"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2466
+#: ../../locales/../src/interface/Mainfrm.cpp:2494
 msgid "Parameter not a valid URL"
 msgstr "Значення параметру недійсної URL адреси"
 
-#: resources.h:84 resources.h:382 resources.h:715
+#: resources.h:85 resources.h:384 resources.h:731
 msgid "Pass&word:"
 msgstr "Па&роль:"
 
-#: resources.h:673
+#: resources.h:689
 msgid "Passive (recommended)"
 msgstr "Пасивний (рекомендовано)"
 
-#: resources.h:757
+#: resources.h:773
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Пасивний режим"
@@ -5140,43 +5261,43 @@
 msgid "Password required"
 msgstr "Вимагається пароль"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
-#: ../../locales/../src/interface/search.cpp:386
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Шлях"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3166
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2357
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3195
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "Для директорії %s та піддиректорії %s шлях створити неможливо "
 
-#: resources.h:400
+#: resources.h:402
 #, fuzzy
 msgid "Paths"
 msgstr "Шлях"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1391
-#: ../../locales/../src/interface/edithandler.cpp:1490
-#: ../../locales/../src/interface/edithandler.cpp:1503
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1402
+#: ../../locales/../src/interface/edithandler.cpp:1501
+#: ../../locales/../src/interface/edithandler.cpp:1514
 msgid "Pending removal"
 msgstr "Очікування ліквідовано"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
 msgid "Permission"
 msgstr "Дозвіл"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:361
-#: ../../locales/../src/interface/search.cpp:390
+#: ../../locales/../src/interface/RemoteListView.cpp:374
+#: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Дозволи"
 
-#: resources.h:169
+#: resources.h:171
 msgid "Platform:"
 msgstr ""
 
-#: resources.h:249
+#: resources.h:251
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5201,7 +5322,7 @@
 "оновленого пакету або відвідайте http://filezilla-project.org щоб "
 "завантажити вихідні коди FileZilla."
 
-#: resources.h:679
+#: resources.h:695
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5232,6 +5353,11 @@
 msgid "Please enter a custom time format."
 msgstr "Введіть,будь-ласка,користувацький формат часу."
 
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+msgid ""
+"Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
+msgstr ""
+
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:111
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #, fuzzy, c-format
@@ -5247,7 +5373,7 @@
 msgid "Please enter a new name for the copied filter."
 msgstr "Введіть нове ім'я для скопійованого фільтру."
 
-#: ../../locales/../src/interface/filter.cpp:388
+#: ../../locales/../src/interface/filter.cpp:403
 #, fuzzy, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Введіть нове ім'я для фільтру."
@@ -5279,11 +5405,11 @@
 "Введіть,будь-ласка,число між 0 і 10 для позначення кількості одночасних "
 "передач."
 
-#: resources.h:116
+#: resources.h:117
 msgid "Please enter a password for this server:"
 msgstr "Введіть,будь-ласка,пароль для даного серверу:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2194
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid ""
 "Please enter a path and executable to run.\n"
 "E.g. c:\\somePath\\file.exe under MS Windows or /somePath/file under Unix.\n"
@@ -5301,11 +5427,11 @@
 "Введіть,будь-ласка,обмеженя часу в проміжку між 5 і 9999 секунд або 0 для "
 "блокування обмеження часу.."
 
-#: ../../locales/../src/interface/filter.cpp:328
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "Введіть,будь-ласка,унікальне ім'я для цих установок фільтру"
 
-#: resources.h:117
+#: resources.h:118
 msgid "Please enter a username for this server:"
 msgstr "Введіть, будь-ласка,ім'я користувача для цього сервера:"
 
@@ -5328,7 +5454,7 @@
 msgstr ""
 "Введіть,будь-ласка,обмеження швидкості відвантаження більше або рівне 0 KБ/с."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:573
+#: ../../locales/../src/interface/Mainfrm.cpp:576
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5336,14 +5462,19 @@
 "Введіть,будь-ласка, пряму FTP команду.\n"
 "Використання прямих ftp команд очистить каше директорії."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1189
-#: ../../locales/../src/interface/LocalTreeView.cpp:1188
-#: ../../locales/../src/interface/RemoteListView.cpp:1569
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1272
+#: ../../locales/../src/interface/LocalListView.cpp:1194
+#: ../../locales/../src/interface/LocalTreeView.cpp:1182
+#: ../../locales/../src/interface/RemoteListView.cpp:1617
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
 msgid "Please enter the name of the directory which should be created:"
 msgstr "Введіть,будь-ласка,ім'я директорії,яку необхідно створити:"
 
-#: resources.h:118
+#: ../../locales/../src/interface/RemoteListView.cpp:3163
+#, fuzzy
+msgid "Please enter the name of the file which should be created:"
+msgstr "Введіть,будь-ласка,ім'я директорії,яку необхідно створити:"
+
+#: resources.h:119
 msgid "Please enter username and password for this server:"
 msgstr "Введіть,будь-ласка,ім'я користувача і пароль для даного серверу:"
 
@@ -5362,7 +5493,7 @@
 "цього майстра.У випадку, якщо ваша адреса динамічна або у вас нема "
 "зовнішньої адреси,скористайтеся опцією зовнішнього перетворювача."
 
-#: resources.h:666
+#: resources.h:682
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5378,7 +5509,7 @@
 "Переконайтесь,що FileZilla має дозвіл на встановлення вихідного з'єднання, а "
 "токож переконайтеся,що ви надрукували адресу перетворювача адрес правильно. "
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:258
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "Переконайтесь,що запитуваний локаль встановлено у вашу систему"
 
@@ -5394,7 +5525,7 @@
 "маршрутизатор.Вам доведеться використати ручний порт відправки.Не запускайте "
 "свого маршрутизатора в, так званому, 'режимі DMZ' або 'ігровому режимі'."
 
-#: resources.h:680
+#: resources.h:696
 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 "
@@ -5406,7 +5537,7 @@
 "використовується троянами або іншими шкідливими програмами.Це може викликати "
 "хибну тривогу,яку ви можете безпечно відмінити. "
 
-#: ../../locales/../src/interface/Mainfrm.cpp:705
+#: ../../locales/../src/interface/Mainfrm.cpp:718
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5415,7 +5546,7 @@
 "FTPS та FTPES, сервери спрацьовують лише у випадку, якщо вони підтримують "
 "команду MFMT."
 
-#: resources.h:734
+#: resources.h:750
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5424,7 +5555,7 @@
 "намагаєтесь або занадто часто перепід'єднатись або через занадто короткі "
 "проміжки часу."
 
-#: resources.h:882 resources.h:888
+#: resources.h:900 resources.h:906
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5433,7 +5564,7 @@
 "Дізнатися про подробиці ви можете тут: http://wiki.filezilla-project.org/"
 "Date_and_Time_formatting "
 
-#: resources.h:245
+#: resources.h:247
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5448,16 +5579,16 @@
 "Якщо ви змінили середовище своєї мережі або у випадку,якщо ви зіткнулися з "
 "проблемами на тих серверах,що раніше працювали - перезапустіть майстра. "
 
-#: resources.h:455
+#: resources.h:457
 #, fuzzy
 msgid "Please select an action:"
 msgstr "&Завжди виконувати цю дію"
 
-#: resources.h:301
+#: resources.h:303
 msgid "Please select the categories you would like to import."
 msgstr "Виберіть,будь-ласка, категорії які ви бажаєте імпортувати."
 
-#: resources.h:668
+#: resources.h:684
 msgid "Please select the default transfer mode you would like to use."
 msgstr ""
 "Виберіть,будь-ласка,той режим передачі по замовчуванню яким ви бажаєте "
@@ -5501,7 +5632,7 @@
 "званому, 'режимі DMZ' або 'ігровому режимі'.Такі речі як протокол інспекцій "
 "чи протокол специфічних 'полагоджень' повинні бути відключеними."
 
-#: resources.h:252
+#: resources.h:254
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5518,16 +5649,17 @@
 "Щоб завантажити найновішу версію FileZilla, відвідайте http://filezilla-"
 "project.org."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "Postal code:"
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1913
-#: ../../locales/../src/interface/sitemanager.cpp:2131
+#: ../../locales/../src/interface/sitemanager.cpp:289
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
 msgid "Predefined Sites"
 msgstr "Попередньо вказані Сайти"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:704
+#: ../../locales/../src/interface/Mainfrm.cpp:717
 msgid "Preserving file timestamps"
 msgstr "Збереження файлу часових позначок"
 
@@ -5535,7 +5667,7 @@
 msgid "Preview:"
 msgstr "Попередній перегляд:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:920
+#: ../../locales/../src/engine/tlssocket.cpp:936
 msgid "Primary connection and data connection certificates don't match."
 msgstr "Первинне з'єднання та сертифікати передачі даних не співпадають."
 
@@ -5543,35 +5675,39 @@
 msgid "Print version information to stdout and exit"
 msgstr ""
 
-#: resources.h:905
+#: resources.h:923
 msgid "Prioritize directories (default)"
 msgstr "Визначення пріоритетних директорій (по замовчуванню)"
 
-#: ../../locales/../src/interface/queue.cpp:1188
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Пріоритетність "
 
-#: resources.h:945
+#: resources.h:963
 msgid "Privacy policy:"
 msgstr "Політика приватності:"
 
-#: resources.h:781
+#: resources.h:797
 msgid "Private &keys:"
 msgstr "Приватні &ключі:"
 
-#: resources.h:777 resources.h:794
+#: resources.h:81
+msgid "Pro&tocol:"
+msgstr ""
+
+#: resources.h:793 resources.h:810
 msgid "Pro&xy password:"
 msgstr "Пароль проксі:"
 
-#: resources.h:523 resources.h:590
+#: resources.h:533 resources.h:602
 msgid "Process &Queue"
 msgstr "Опрацювати &Чергу"
 
-#: resources.h:792
+#: resources.h:808
 msgid "Proxy &port:"
 msgstr "Порт &проксі:"
 
-#: resources.h:776 resources.h:793
+#: resources.h:792 resources.h:809
 msgid "Proxy &user:"
 msgstr " Користувач &проксі:"
 
@@ -5585,6 +5721,11 @@
 msgid "Proxy handshake failed: %s"
 msgstr "Невдалий обмін вітаннями з проксі: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4386
+#, fuzzy
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Хост стартує з '[',однак заключної дужки не знайдено."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5599,11 +5740,11 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Невдалий запит проксі: Невідомий тип адреси у відповіді CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4363
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4419
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Проксі встановлено однак проксі хост або порт не дійсні."
 
-#: resources.h:779
+#: resources.h:795
 msgid "Public Key Authentication"
 msgstr "Ключ публічної автентифікації"
 
@@ -5611,55 +5752,60 @@
 msgid "Public key algorithm:"
 msgstr "Алгоритм публічного ключа:"
 
-#: resources.h:141
+#: resources.h:142
 msgid "Public permissions"
 msgstr "Публічні допуски"
 
-#: ../../locales/../src/interface/QueueView.cpp:3109
+#: ../../locales/../src/interface/QueueView.cpp:3224
 msgid "Queue has been fully processed"
 msgstr "Черга опрацьована не повністю"
 
-#: ../../locales/../src/interface/statusbar.cpp:458
+#: ../../locales/../src/interface/statusbar.cpp:462
 #, fuzzy, c-format
 msgid "Queue: %s MiB"
 msgstr "Черга: %s%d MiB"
 
-#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:392
 #, fuzzy, c-format
 msgid "Queue: %s%s"
 msgstr "Черга: %s%d %c"
 
-#: ../../locales/../src/interface/statusbar.cpp:384
-#: ../../locales/../src/interface/statusbar.cpp:449
+#: ../../locales/../src/interface/statusbar.cpp:388
+#: ../../locales/../src/interface/statusbar.cpp:453
 msgid "Queue: empty"
 msgstr "Черга: пусто"
 
-#: ../../locales/../src/interface/QueueView.cpp:448
+#: ../../locales/../src/interface/QueueView.cpp:453
 msgid "Queued files"
 msgstr "Файли в черзі"
 
-#: resources.h:447
+#: resources.h:449
 #, fuzzy
 msgid "Queueing:"
 msgstr "&Черга"
 
-#: resources.h:606
+#: resources.h:618
 msgid "R&eboot system"
 msgstr "Пере&завантажити систему"
 
-#: resources.h:520
+#: resources.h:530
 msgid "R&emote directory tree"
 msgstr "Від&далене дерево директорій"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:589
+#: resources.h:632 resources.h:636
+#, fuzzy
+msgid "R&eset and requeue selected files"
+msgstr "Перевстановити і поновити в черзі обрані файли"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:592
 msgid "Raw FTP command"
 msgstr "Проста команда FTP "
 
-#: resources.h:138
+#: resources.h:139
 msgid "Re&ad"
 msgstr "Чи&тати"
 
-#: resources.h:567 resources.h:581
+#: resources.h:577 resources.h:593
 #, fuzzy
 msgid "Re&fresh"
 msgstr "&Поновити"
@@ -5674,20 +5820,20 @@
 "routers and firewalls accordingly."
 msgstr ""
 
-#: resources.h:142
+#: resources.h:143
 msgid "Rea&d"
 msgstr "Чи&тати"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:84
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Read-only"
 msgstr "Лише-читати"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1063
+#: ../../locales/../src/interface/Mainfrm.cpp:1095
 msgid "Really cancel current operation?"
 msgstr "Дійсно скасувати дану операцію?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1657
-#: ../../locales/../src/interface/search.cpp:1046
+#: ../../locales/../src/interface/RemoteListView.cpp:1705
+#: ../../locales/../src/interface/search.cpp:1025
 #, c-format
 msgid "Really delete %d directory with its contents?"
 msgid_plural "Really delete %d directories with their contents?"
@@ -5695,8 +5841,8 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1655
-#: ../../locales/../src/interface/search.cpp:1044
+#: ../../locales/../src/interface/RemoteListView.cpp:1703
+#: ../../locales/../src/interface/search.cpp:1023
 #, c-format
 msgid "Really delete %d file?"
 msgid_plural "Really delete %d files?"
@@ -5704,36 +5850,45 @@
 msgstr[1] ""
 msgstr[2] ""
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1662
-#: ../../locales/../src/interface/search.cpp:1051
+#: ../../locales/../src/interface/RemoteListView.cpp:1710
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "Really delete %s and %s?"
 msgstr ""
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1121
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
 msgid "Really delete all selected files and/or directories?"
 msgstr "Дійсно видалити усі вибрані файли та/або директорії?"
 
-#: ../../locales/../src/interface/queueview_failed.cpp:17
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Причина"
 
-#: ../../locales/../src/interface/QueueView.cpp:3117
+#: ../../locales/../src/interface/QueueView.cpp:3231
 msgid "Reboot now"
 msgstr "Перезавантажити зараз"
 
-#: resources.h:147
+#: resources.h:148
 msgid "Rec&urse into subdirectories"
 msgstr "Про&ектувати в піддиректорії"
 
+#: ../../locales/../src/engine/directorylistingparser.cpp:3111
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr ""
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2124
+#: ../../locales/../src/engine/directorylistingparser.cpp:2139
+msgid "Received a line exceeding 10000 characters, aborting."
+msgstr ""
+
 #: ../../locales/../src/interface/netconfwizard.cpp:998
 #: ../../locales/../src/interface/netconfwizard.cpp:1007
 #: ../../locales/../src/interface/netconfwizard.cpp:1031
 msgid "Received data tainted"
 msgstr "Отримані дані заблоковано"
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:78
+#: ../../locales/../src/interface/clearprivatedata.cpp:77
 msgid ""
 "Reconnect information cannot be cleared while connected to a server.\n"
 "If you continue, your connection will be disconnected."
@@ -5741,11 +5896,11 @@
 "Перепід'єднана інформація не може бути очищена підчас з'єднання з сервером.\n"
 "У випадку продовження,ваш зв'язок буде перервано."
 
-#: resources.h:735
+#: resources.h:751
 msgid "Reconnection settings"
 msgstr "Установки перепід'єднання"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1004 resources.h:1005
 msgid "Reconnects to the last used server"
 msgstr "Перепід'єднання до останнього використовуваного серверу"
 
@@ -5753,39 +5908,44 @@
 msgid "Redirection to invalid address"
 msgstr "Перескерування до недійсної адреси"
 
-#: resources.h:978 resources.h:979
+#: resources.h:996 resources.h:997
 msgid "Refresh the file and folder lists"
 msgstr "Поновити списки файлу та папки"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: resources.h:497
+#, fuzzy
+msgid "Remember password?"
+msgstr "Введіть пароль"
+
+#: ../../locales/../src/interface/edithandler.cpp:1243
 msgid "Remote"
 msgstr "Віддалений"
 
-#: ../../locales/../src/engine/tlssocket.cpp:843
+#: ../../locales/../src/engine/tlssocket.cpp:859
 msgid "Remote certificate not trusted."
 msgstr "Не довіряти віддаленому сертифікату."
 
-#: resources.h:366 ../../locales/../src/interface/queue.cpp:1186
+#: resources.h:368 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "Віддалений файл"
 
-#: resources.h:439 ../../locales/../src/interface/search.cpp:702
-#: ../../locales/../src/interface/search.cpp:708
-#: ../../locales/../src/interface/search.cpp:718
-#: ../../locales/../src/interface/search.cpp:724
+#: resources.h:441 ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:698
 #, fuzzy
 msgid "Remote file search"
 msgstr "Віддалений файл"
 
-#: resources.h:205
+#: resources.h:207
 msgid "Remote filters:"
 msgstr "Віддалені фільтри:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1234
 msgid "Remote path"
 msgstr "Віддалений шлях"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:422
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:430
 #, fuzzy, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5794,7 +5954,7 @@
 "Віддалений шлях не піддається аналізу. Переконайтеся,що він дійсний і "
 "підтримується вибраним типом серверу. "
 
-#: ../../locales/../src/interface/sitemanager.cpp:1184
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
 #, fuzzy, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5803,65 +5963,74 @@
 "Віддалений шлях не піддається аналізу. Переконайтеся,що він дійсний і "
 "підтримується вибраним типом серверу. "
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:424
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:428
-#: ../../locales/../src/interface/sitemanager.cpp:1186
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:432
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:436
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
 #, fuzzy
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr ""
 "Віддалений шлях не піддається аналізу. Переконайтеся,що він дійсний і "
 "підтримується вибраним типом серверу. "
 
-#: ../../locales/../src/interface/manual_transfer.cpp:346
+#: ../../locales/../src/interface/manual_transfer.cpp:350
 msgid "Remote path could not be parsed."
 msgstr "ВІддалений шлях неможливо проаналізувати."
 
-#: resources.h:444
+#: resources.h:446
 #, fuzzy
 msgid "Remote path handling:"
 msgstr "Віддалений шлях:"
 
-#: resources.h:312
+#: resources.h:314
 msgid "Remote path:"
 msgstr "Віддалений шлях:"
 
-#: ../../locales/../src/interface/viewheader.cpp:545
+#: ../../locales/../src/interface/viewheader.cpp:560
 msgid "Remote site:"
 msgstr "Віддалений сайт:"
 
-#: resources.h:615 resources.h:618
+#: resources.h:629 resources.h:633
 msgid "Remove &all"
 msgstr "Видалити &все"
 
-#: resources.h:616 resources.h:619
+#: resources.h:631 resources.h:635
 msgid "Remove &selected"
 msgstr "Видалити &обране"
 
-#: resources.h:264 resources.h:274 resources.h:838 resources.h:847
+#: resources.h:266 resources.h:276 resources.h:854 resources.h:863
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "Перейменувати файл"
 
-#: resources.h:631 resources.h:652
+#: resources.h:647 resources.h:668
 msgid "Rename selected directory"
 msgstr "Перейменувати обрану директорію"
 
-#: resources.h:571 resources.h:585
+#: resources.h:581 resources.h:597
 msgid "Rename selected files and directories"
 msgstr "Перейменувати обрані файли і директорії"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3512
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2559
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3541
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Перейменування '%s' в '%s'"
 
-#: resources.h:471
+#: resources.h:473
 msgid "Reporting bugs and feature requests"
 msgstr ""
 
-#: resources.h:617 resources.h:620
-msgid "Reset and requeue selected files"
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+msgid "Require explicit FTP over TLS"
+msgstr ""
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
+msgid "Require implicit FTP over TLS"
+msgstr ""
+
+#: resources.h:634
+#, fuzzy
+msgid "Reset and requeue &all"
 msgstr "Перевстановити і поновити в черзі обрані файли"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:1198
@@ -5876,23 +6045,23 @@
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
+#: ../../locales/../src/interface/StatusView.cpp:289
+#: ../../locales/../src/interface/StatusView.cpp:343
 #: ../../locales/../src/interface/updatewizard.cpp:544
 msgid "Response:"
 msgstr "Відповідь:"
 
-#: resources.h:438
+#: resources.h:440
 #, fuzzy
 msgid "Results:"
 msgstr "Результати тестування"
 
-#: resources.h:263 resources.h:273 resources.h:837 resources.h:846
+#: resources.h:265 resources.h:275 resources.h:853 resources.h:862
 #, fuzzy
 msgid "Resume file transfer"
 msgstr "Віддалений файл"
 
-#: resources.h:852
+#: resources.h:868
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
@@ -5900,36 +6069,41 @@
 "Поновлення файлів ASCII може створити проблеми,якщо сервер використовує "
 "інший формат завершення лінійки ніж клієнт."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1276
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
 msgid "Retrieving directory listing..."
 msgstr "Видобування списку директорій..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3897
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3926
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Видобування зовнішньої ІР адреси з %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:901
+#: ../../locales/../src/engine/tlssocket.cpp:917
 #, fuzzy
 msgid "Root certificate is not trusted"
 msgstr "Не довіряти віддаленому сертифікату."
 
-#: resources.h:499
+#: resources.h:508
 msgid "S&how files currently being edited..."
 msgstr "По&казати файли, що зараз редагуються..."
 
-#: resources.h:607
+#: resources.h:885
+#, fuzzy
+msgid "S&how the Site Manager on startup"
+msgstr "&Експортувати введені дані до Менеджера Сайту"
+
+#: resources.h:619
 msgid "S&hutdown system"
 msgstr "Ви&мкнення системи"
 
-#: resources.h:436
+#: resources.h:438
 #, fuzzy
 msgid "S&top"
 msgstr "&Автоматично"
 
-#: resources.h:515
+#: resources.h:524
 msgid "S&ynchronized browsing"
 msgstr ""
 
@@ -5937,38 +6111,43 @@
 msgid "SFTP"
 msgstr "SFTP"
 
+#: resources.h:167
+#, fuzzy
+msgid "SQLite:"
+msgstr "Назва:"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:846
 msgid "Save settings?"
 msgstr "Зберегти налаштування?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1808
+#: ../../locales/../src/interface/QueueView.cpp:1831
 msgid "Scanning for files to add to queue"
 msgstr "Сканування файлів,що додаються до черги"
 
-#: ../../locales/../src/interface/QueueView.cpp:1810
+#: ../../locales/../src/interface/QueueView.cpp:1833
 msgid "Scanning for files to upload"
 msgstr "Сканування файлів до відвантаження"
 
-#: resources.h:432
+#: resources.h:434
 #, fuzzy
 msgid "Search &conditions:"
 msgstr "Недійсний розмір в умовах"
 
-#: resources.h:430
+#: resources.h:432
 #, fuzzy
 msgid "Search &directory:"
 msgstr "Нова директорія"
 
-#: resources.h:994
+#: resources.h:1012
 msgid "Search for files recursively."
 msgstr ""
 
-#: resources.h:539
+#: resources.h:549
 #, fuzzy
 msgid "Search server for files"
 msgstr "Фільт&рувати усі файли,що:"
 
-#: ../../locales/../src/interface/statusbar.cpp:525
+#: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
 msgstr "Інформація безпеки"
 
@@ -5978,24 +6157,24 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "По замовчуванню: http://ip.filezilla-project.org/ip.php"
 
-#: resources.h:374
+#: resources.h:376
 msgid "Sele&ct server"
 msgstr "Обр&ати сервер"
 
-#: resources.h:720
+#: resources.h:736
 msgid "Select &page:"
 msgstr "Обрати &сторінку:"
 
-#: resources.h:870
+#: resources.h:888
 msgid "Select Theme"
 msgstr "Обрати тему"
 
-#: resources.h:830
+#: resources.h:846
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "Обрати дію для випадку, якщо пошукуваний файл передачі вже існує."
 
-#: ../../locales/../src/interface/edithandler.cpp:1693
+#: ../../locales/../src/interface/edithandler.cpp:1704
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
 msgid "Select default editor"
 msgstr "Вибери редактора по замовленню"
@@ -6035,15 +6214,15 @@
 msgstr "Вибери файл для експортованих налаштувань"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager.cpp:2673
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
 msgid "Select file for exported sites"
 msgstr "Вибрати файл для експортованих сайтів"
 
-#: ../../locales/../src/interface/import.cpp:16
+#: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
 msgstr "Вибери файл для імпортування налаштувань з -..."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:246
+#: ../../locales/../src/interface/manual_transfer.cpp:250
 #, fuzzy
 msgid "Select file to upload"
 msgstr "Сканування файлів до відвантаження"
@@ -6052,29 +6231,29 @@
 msgid "Select filename for converted keyfile"
 msgstr "Обери назву імені файлу для конвертованого ключового імені файлу."
 
-#: resources.h:420
+#: resources.h:422
 #, fuzzy, no-c-format
 msgid "Select how these files should be opened."
 msgstr "Обраний файл уже відкрито."
 
-#: ../../locales/../src/interface/search.cpp:831
+#: ../../locales/../src/interface/search.cpp:805
 #, fuzzy
 msgid "Select target download directory"
 msgstr "Обрана %d директорія."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:241
+#: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "Обрати адресне ім'я файлу"
 
-#: resources.h:290
+#: resources.h:292
 msgid "Select the categories to export:"
 msgstr "Обери категорію для відправки:"
 
-#: resources.h:281
+#: resources.h:283
 msgid "Select the private data you would like to delete."
 msgstr "Обери свої приватні дані для знищення."
 
-#: ../../locales/../src/interface/search.cpp:798
+#: ../../locales/../src/interface/search.cpp:772
 #, fuzzy, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6090,7 +6269,7 @@
 msgstr[1] "Selected %d directories."
 msgstr[2] "Selected %d directories."
 
-#: ../../locales/../src/interface/search.cpp:796
+#: ../../locales/../src/interface/search.cpp:770
 #, fuzzy, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -6114,7 +6293,7 @@
 msgstr[1] "Selected %d files. Total size: At least %s"
 msgstr[2] "Selected %d files. Total size: At least %s"
 
-#: ../../locales/../src/interface/search.cpp:803
+#: ../../locales/../src/interface/search.cpp:777
 #, fuzzy, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Обраний %s і %s. Загальний розмір: %s"
@@ -6129,34 +6308,36 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Обраний %s і %s. Загальний розмір: Принаймні %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1634
-#: ../../locales/../src/interface/edithandler.cpp:1713
+#: ../../locales/../src/interface/edithandler.cpp:1645
+#: ../../locales/../src/interface/edithandler.cpp:1724
 #: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
 #, fuzzy
 msgid "Selected editor does not exist."
 msgstr "Обраний редактор не існує"
 
-#: resources.h:319 ../../locales/../src/interface/LocalListView.cpp:2086
+#: resources.h:321 ../../locales/../src/interface/LocalListView.cpp:2069
 msgid "Selected file already being edited"
 msgstr "Обраний файл в роботі"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2665
-msgid "Selected file already opened."
-msgstr "Обраний файл уже відкрито."
-
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
 msgstr "Обраний файл уже завантажений"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
-msgid "Selected file still being edited"
+#: ../../locales/../src/interface/RemoteListView.cpp:2692
+#, fuzzy
+msgid "Selected file is already opened"
+msgstr "Обраний файл уже відкрито."
+
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
+#, fuzzy
+msgid "Selected file is still being edited"
 msgstr "Обраний файл усе ще редагується"
 
-#: ../../locales/../src/interface/filter.cpp:295
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "Обраний фільтр працює лише з локальними файлами."
 
-#: ../../locales/../src/interface/menu_bar.cpp:305
+#: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
@@ -6166,37 +6347,38 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Обраний порт зазвичай використовується іншим протоколом."
 
-#: resources.h:742
+#: resources.h:758
 msgid "Send FTP &keep-alive commands"
 msgstr "Надіслати FTP команди &keep-alive "
 
-#: resources.h:541
+#: resources.h:551
 msgid "Send custom command to the server otherwise not available"
 msgstr "Надіслати клієнтську команду на сервер"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4445
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4501
 msgid "Sending keep-alive command"
 msgstr "Відправка команди keep-alive"
 
 #: resources.h:7 resources.h:31
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Serial number:"
 msgstr "Серійний номерr:"
 
-#: resources.h:81 resources.h:88
+#: resources.h:89
 #, fuzzy
 msgid "Server &Type:"
 msgstr "Типr&сервера:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:727
+#: ../../locales/../src/engine/tlssocket.cpp:743
 msgid "Server did not properly shut down TLS connection"
 msgstr "Сервер неправильно завершив з'єднання TLS "
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4296
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4325
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "Сервер не підтримує поновлення файлів > %d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4292
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4321
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
@@ -6205,15 +6387,15 @@
 "Сервер не підтримує відновлення файлів > %d Гб. Завершення передачі, "
 "оскільки розміри файлів співпадають."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2528
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2556
 msgid "Server does not support resume of files > 2GB."
 msgstr "Сервер не підтримує поновлення файлів > 2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2523
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2551
 msgid "Server does not support resume of files > 4GB."
 msgstr "Сервер не підтримує поновлення файлів > 4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4307
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4336
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
@@ -6222,7 +6404,7 @@
 "Сервер може не підтримувати відновлення файлів > %d Гб. Завершення передачі,"
 "оскільки розміри файлів співпадають."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:841
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:856
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6230,7 +6412,12 @@
 "Сервер може потребувати акаунту. Спробуйте уточнити акаунт,використовуючи "
 "Сайт Менеджер"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:677
+#: ../../locales/../src/engine/ControlSocket.cpp:417
+#, fuzzy
+msgid "Server returned empty path."
+msgstr "Сервер надіслав недійсну відповідь."
+
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
@@ -6238,13 +6425,13 @@
 "Сервер надіслав додаткову підказку логінування.Вам потрібно скористатися "
 "інтерактивним типом логінування."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3839
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3868
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr ""
 "Сервер надіслав пасивну відповідь з відсутньою адресою маршруту.Пасивний "
 "режим недійсний."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3833
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3862
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6265,24 +6452,24 @@
 msgid "Server sent unexpected reply."
 msgstr "Сервер надіслав недійсну відповідь."
 
-#: resources.h:350
+#: resources.h:352
 msgid "Server to client MAC:"
 msgstr "Сервер до клієнта MAC:"
 
-#: resources.h:348
+#: resources.h:350
 msgid "Server to client cipher:"
 msgstr "Сервер до клієнтських символів:"
 
-#: resources.h:379
+#: resources.h:381
 msgid "Server&type:"
 msgstr "Типr&сервера:"
 
-#: ../../locales/../src/interface/queue.cpp:1184
+#: ../../locales/../src/interface/queue.cpp:1225
 #, fuzzy
 msgid "Server/Local file"
 msgstr "Сервер / Локальний файл"
 
-#: resources.h:310 resources.h:372
+#: resources.h:312 resources.h:374
 msgid "Server:"
 msgstr "Сервер:"
 
@@ -6290,34 +6477,34 @@
 msgid "Session details"
 msgstr "Подробиці з'єднання"
 
-#: resources.h:594
+#: resources.h:606
 msgid "Set &Priority"
 msgstr "Встановити &пріоритет "
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3664
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2437
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3693
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "Встановити дозволи '%s' до '%s'"
 
-#: ../../locales/../src/engine/transfersocket.cpp:858
+#: ../../locales/../src/engine/transfersocket.cpp:860
 msgid "SetSocketBufferSize called without socket"
 msgstr "Встановлений розмір буферу - каже мене - нема..."
 
-#: resources.h:719
+#: resources.h:735
 msgid "Settings"
 msgstr "Налаштування"
 
-#: resources.h:967
+#: resources.h:985
 msgid "Show &raw directory listing"
 msgstr "Показати список &сирих (простих) директорій "
 
-#: resources.h:550
+#: resources.h:560
 #, fuzzy
 msgid "Show &welcome dialog..."
 msgstr "Та каже, що показує допомогу"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2346
 msgid "Show both directory trees and continue comparing?"
 msgstr "Показати обидва дерева директорій і продовжити порівняння?"
 
@@ -6325,11 +6512,11 @@
 msgid "Shows this help dialog"
 msgstr "Та каже, що показує допомогу"
 
-#: ../../locales/../src/interface/QueueView.cpp:3119
+#: ../../locales/../src/interface/QueueView.cpp:3233
 msgid "Shutdown now"
 msgstr "Вимкнути негайно"
 
-#: resources.h:298
+#: resources.h:300
 msgid "Site &Manager entries"
 msgstr "Введені дані &в Сайт Менеджер"
 
@@ -6337,72 +6524,72 @@
 msgid "Site Manager"
 msgstr "Сайт Менеджер "
 
-#: ../../locales/../src/interface/sitemanager.cpp:1040
-#: ../../locales/../src/interface/sitemanager.cpp:1052
-#: ../../locales/../src/interface/sitemanager.cpp:1061
-#: ../../locales/../src/interface/sitemanager.cpp:1078
-#: ../../locales/../src/interface/sitemanager.cpp:1095
-#: ../../locales/../src/interface/sitemanager.cpp:1108
-#: ../../locales/../src/interface/sitemanager.cpp:1127
-#: ../../locales/../src/interface/sitemanager.cpp:1137
-#: ../../locales/../src/interface/sitemanager.cpp:1151
-#: ../../locales/../src/interface/sitemanager.cpp:1162
-#: ../../locales/../src/interface/sitemanager.cpp:1187
-#: ../../locales/../src/interface/sitemanager.cpp:1197
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 #, fuzzy
 msgid "Site Manager - Invalid data"
 msgstr "Сайт Менеджер вже відчинений"
 
-#: ../../locales/../src/interface/sitemanager.cpp:313
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "Сайт Менеджер вже відчинений"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2581
-#: ../../locales/../src/interface/sitemanager.cpp:2598
-#: ../../locales/../src/interface/sitemanager.cpp:2612
-#: ../../locales/../src/interface/sitemanager.cpp:3011
-#: ../../locales/../src/interface/sitemanager.cpp:3098
+#: ../../locales/../src/interface/sitemanager.cpp:439
+#: ../../locales/../src/interface/sitemanager.cpp:456
+#: ../../locales/../src/interface/sitemanager.cpp:470
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Сайт не існує"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2561
+#: ../../locales/../src/interface/sitemanager.cpp:419
 msgid "Site path has to begin with 0 or 1."
 msgstr "Шлях сайту має розпочинатися з 0 або 1"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2605
-#: ../../locales/../src/interface/sitemanager.cpp:2778
-#: ../../locales/../src/interface/sitemanager.cpp:3004
-#: ../../locales/../src/interface/sitemanager.cpp:3091
+#: ../../locales/../src/interface/sitemanager.cpp:463
+#: ../../locales/../src/interface/sitemanager.cpp:556
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:255
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:263
 msgid "Site-specific bookmarks"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:90
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:537
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:93
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:545
 msgid ""
 "Site-specific bookmarks require the server to be stored in the Site "
 "Manager.\n"
 "Add current connection to the site manager?"
 msgstr ""
 
-#: ../../locales/../src/interface/queue.cpp:1187
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Розмір"
 
-#: resources.h:889
+#: resources.h:907
 msgid "Size formatting"
 msgstr "Форматування розміру"
 
-#: ../../locales/../src/interface/fileexistsdlg.cpp:61
-#: ../../locales/../src/interface/fileexistsdlg.cpp:67
+#: ../../locales/../src/interface/fileexistsdlg.cpp:62
+#: ../../locales/../src/interface/fileexistsdlg.cpp:68
 msgid "Size unknown"
 msgstr "Розмір невідомий"
 
-#: resources.h:265 resources.h:275 resources.h:839 resources.h:848
+#: resources.h:267 resources.h:277 resources.h:855 resources.h:864
 #, fuzzy
 msgid "Skip file"
 msgstr "Від&крити файл"
@@ -6423,11 +6610,11 @@
 msgid "Skipping upload of %s"
 msgstr "Оминаємо відвантаження %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1131
+#: ../../locales/../src/interface/Mainfrm.cpp:1220
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "Деякі файли усе ще редагуються або потребують оновлення."
 
-#: resources.h:682 resources.h:758
+#: resources.h:698 resources.h:774
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6435,24 +6622,24 @@
 "Деякі, неправильно сконфігуровані, віддалені сервери позаду свого "
 "маршрутизатора, при відповіді, можуть видати свою локальну ІР адресу"
 
-#: resources.h:907
+#: resources.h:925
 msgid "Sort directories inline"
 msgstr "Сортувати директорії inline"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:446
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "Послідовність сортування неможливо змінити при порівнянні директорій."
 
-#: resources.h:903
+#: resources.h:921
 #, fuzzy
 msgid "Sorting"
 msgstr "Налаштування"
 
-#: resources.h:904
+#: resources.h:922
 msgid "Sorting &mode:"
 msgstr "Спосіб &сортування:"
 
-#: ../../locales/../src/interface/RemoteTreeView.cpp:100
+#: ../../locales/../src/interface/RemoteTreeView.cpp:101
 msgid "Source and path of the drop operation are identical"
 msgstr "Джерело і шлях операції drop ідентичні"
 
@@ -6460,7 +6647,7 @@
 msgid "Source and target file may not be the same"
 msgstr "Вихідний і віддалений файли не можуть бути тими самими "
 
-#: ../../locales/../src/interface/RemoteListView.cpp:139
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Вихідний і віддалений файли операції drop ідентичні"
 
@@ -6468,25 +6655,25 @@
 msgid "Source file:"
 msgstr "Вихідний файл:"
 
-#: resources.h:488 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:490 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, fuzzy
 msgid "Speed Limits"
 msgstr "Обмеження швидкості"
 
-#: resources.h:803
+#: resources.h:819
 msgid "Speed limits"
 msgstr "Обмеження швидкості"
 
-#: ../../locales/../src/interface/statusbar.cpp:591
+#: ../../locales/../src/interface/statusbar.cpp:597
 msgid "Speed limits are disabled, click to change."
 msgstr ""
 
-#: ../../locales/../src/interface/statusbar.cpp:595
+#: ../../locales/../src/interface/statusbar.cpp:601
 msgid "Speed limits are enabled, click to change."
 msgstr ""
 
-#: resources.h:390
+#: resources.h:392
 msgid "Start transfer &immediately"
 msgstr "Розпочати передачу &негайно"
 
@@ -6494,39 +6681,39 @@
 msgid "Start with opened Site Manager"
 msgstr "Розпочати з відкритим Менеджером Сайту"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2209
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2235
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
 #, c-format
 msgid "Starting download of %s"
 msgstr "Розпочинаємо завантаження %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2213
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2239
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Розпочинаємо відвантаження %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "State or province:"
 msgstr ""
 
-#: ../../locales/../src/interface/edithandler.cpp:1224
-#: ../../locales/../src/interface/QueueView.cpp:474
+#: ../../locales/../src/interface/edithandler.cpp:1235
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Статус"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
+#: ../../locales/../src/interface/StatusView.cpp:298
+#: ../../locales/../src/interface/StatusView.cpp:367
 #: ../../locales/../src/interface/updatewizard.cpp:538
 msgid "Status:"
 msgstr "Статус:"
 
-#: resources.h:591
+#: resources.h:603
 msgid "Stop and remove &all"
 msgstr "Зупинити і видалити &все"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Street:"
 msgstr "Вулиця:"
 
@@ -6538,28 +6725,28 @@
 msgid "Successful transfers"
 msgstr "Успішні передачі"
 
-#: resources.h:710
+#: resources.h:726
 msgid "Summary of test results:"
 msgstr "Підсумок результатів тесту:"
 
-#: resources.h:458
+#: resources.h:460
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
 
-#: resources.h:993 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1011 ../../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:373
 #: ../../locales/../src/interface/state.cpp:383
 #: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1012
-#: ../../locales/../src/interface/state.cpp:1021
-#: ../../locales/../src/interface/state.cpp:1028
-#: ../../locales/../src/interface/state.cpp:1039
-#: ../../locales/../src/interface/state.cpp:1046
+#: ../../locales/../src/interface/state.cpp:1016
+#: ../../locales/../src/interface/state.cpp:1025
+#: ../../locales/../src/interface/state.cpp:1032
+#: ../../locales/../src/interface/state.cpp:1043
+#: ../../locales/../src/interface/state.cpp:1050
 msgid "Synchronized browsing"
 msgstr ""
 
@@ -6567,8 +6754,8 @@
 msgid "Synchronized browsing has been disabled."
 msgstr ""
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:86
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Помилка синтаксису"
 
@@ -6577,24 +6764,28 @@
 #: ../../locales/../src/interface/cmdline.cpp:80
 #: ../../locales/../src/interface/cmdline.cpp:89
 #: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2468
+#: ../../locales/../src/interface/Mainfrm.cpp:2496
 msgid "Syntax error in command line"
 msgstr "Помилка синтаксису у командній лінійці"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:85
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "System"
 msgstr "Система"
 
+#: resources.h:526
+msgid "T&oolbar"
+msgstr ""
+
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:332
 #, fuzzy
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "З'єднання встановлено, відсилається запит HTTP "
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:403
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Встановлено зв'зок TLS/SSL,очікування вітального повідомлення..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
 msgid "TLS/SSL connection established."
 msgstr "Встановлено зв'зок TLS/SSL."
 
@@ -6610,19 +6801,24 @@
 msgid "Target file:"
 msgstr "Віддалений файл:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1873
+#: ../../locales/../src/interface/RemoteListView.cpp:3197
+#, fuzzy
+msgid "Target filename already exists!"
+msgstr "Віддалений файл уже існує"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Target filename already exists, really continue?"
 msgstr "Ім'я віддаленого файлу вже існує,продовжувати далі?"
 
-#: resources.h:709
+#: resources.h:725
 msgid "Test results"
 msgstr "Результати тестування"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4313
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4342
 msgid "Testing resume capabilities of server"
 msgstr "Спроможність сервера до відновлення тестування."
 
-#: ../../locales/../src/interface/sitemanager.cpp:312
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 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 "
@@ -6632,7 +6828,7 @@
 "Бажаєте продовжити? Будь-які зміни проведені в цьому Сайт Менеджері,у цьому "
 "випадку, не будуть збереженими."
 
-#: ../../locales/../src/interface/clearprivatedata.cpp:104
+#: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Please close it or the data cannot be deleted."
@@ -6640,7 +6836,7 @@
 "Цей Сайт Менеджер відкритий в іншій версії FileZilla 3.\n"
 "Закрийте його,будь-ласка,інакше ці дані неможливо буде видалити."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:422
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr ""
@@ -6650,18 +6846,18 @@
 msgid "The address you entered was: %s"
 msgstr "Введена вами адреса була: %s"
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:812
-#: ../../locales/../src/interface/sitemanager.cpp:2991
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:820
+#: ../../locales/../src/interface/sitemanager.cpp:720
 #, fuzzy
 msgid "The bookmark could not be added."
 msgstr "ВІддалений шлях неможливо проаналізувати."
 
-#: ../../locales/../src/interface/sitemanager.cpp:3078
+#: ../../locales/../src/interface/sitemanager.cpp:805
 #, fuzzy
 msgid "The bookmarks could not be cleared."
 msgstr "ВІддалений шлях неможливо проаналізувати."
 
-#: ../../locales/../src/interface/statusbar.cpp:487
+#: ../../locales/../src/interface/statusbar.cpp:490
 msgid "The connection is encrypted. Click icon for details."
 msgstr "З'єднання криптоване.Клацніть на іконку задля отримання подробиць."
 
@@ -6669,12 +6865,12 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Клієнтська послідовність логінування не може бути пустою."
 
-#: resources.h:423 ../../locales/../src/interface/edithandler.cpp:1673
+#: resources.h:425 ../../locales/../src/interface/edithandler.cpp:1684
 #, fuzzy, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "Потрібно встановити редактор за замовчуванням."
 
-#: resources.h:422
+#: resources.h:424
 #, fuzzy, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Потрібно встановити редактор за замовчуванням."
@@ -6682,7 +6878,8 @@
 #: ../../locales/../src/interface/filteredit.cpp:147
 #: ../../locales/../src/interface/filteredit.cpp:215
 #: ../../locales/../src/interface/filteredit.cpp:254
-msgid "The entered filter name already exists."
+#, fuzzy
+msgid "The entered filter name already exists, please choose a different name."
 msgstr "Введене ім'я фільтру вже існує."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
@@ -6700,9 +6897,9 @@
 "Файл %s вже існує.\n"
 "Введіть,будь-ласка,нове ім'я:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2063
-#: ../../locales/../src/interface/LocalListView.cpp:2194
-#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/LocalListView.cpp:2046
+#: ../../locales/../src/interface/LocalListView.cpp:2177
+#: ../../locales/../src/interface/RemoteListView.cpp:2666
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6715,14 +6912,14 @@
 msgid "The file '%s' could not be loaded or does not contain a private key."
 msgstr "Файл '%s' не підлягає завантаженню або не вміщує приватного ключа."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:60
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, fuzzy, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "Файл '%s' не підлягає завантаженню або не вміщує приватного ключа."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2057
-#: ../../locales/../src/interface/LocalListView.cpp:2189
-#: ../../locales/../src/interface/RemoteListView.cpp:2633
+#: ../../locales/../src/interface/LocalListView.cpp:2040
+#: ../../locales/../src/interface/LocalListView.cpp:2172
+#: ../../locales/../src/interface/RemoteListView.cpp:2660
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6731,8 +6928,8 @@
 "Файл '%s' не підлягає відкриванню:\n"
 "У вашій системі жодна програма не асоціюється з даним типом файлів."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2102
-#: ../../locales/../src/interface/LocalListView.cpp:2202
+#: ../../locales/../src/interface/LocalListView.cpp:2085
+#: ../../locales/../src/interface/LocalListView.cpp:2185
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6778,7 +6975,7 @@
 msgid "The file selected as default editor does not exist."
 msgstr "Обраний файл,як редактор по замовчувнню не існує."
 
-#: ../../locales/../src/interface/import.cpp:96
+#: ../../locales/../src/interface/import.cpp:95
 msgid ""
 "The file you have selected contains site manager data from a previous "
 "version of FileZilla.\n"
@@ -6792,11 +6989,11 @@
 "пароль будуть імпортованими.\n"
 "Продовжити імпорт?"
 
-#: ../../locales/../src/interface/listctrlex.cpp:734
+#: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
 msgstr "Стовпець імен файлів не можна, ані приховати, ані перемістити."
 
-#: ../../locales/../src/interface/listctrlex.cpp:784
+#: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
 msgstr "Стовпець імен файлів неможливо приховати."
 
@@ -6810,20 +7007,20 @@
 msgid "The following characters will be replaced: %s"
 msgstr ""
 
-#: resources.h:327
+#: resources.h:329
 msgid "The following files are currently being edited:"
 msgstr "Дані файли зараз редагуються:"
 
-#: resources.h:462
+#: resources.h:464
 msgid "The free open source FTP solution"
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:290
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:298
 #, fuzzy
 msgid "The global bookmarks could not be saved."
 msgstr "ВІддалений шлях неможливо проаналізувати."
 
-#: resources.h:965
+#: resources.h:983
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6871,40 +7068,39 @@
 "Останню версію завантажено. Проведіть,будь-ласка,інсталяцію так як ви це "
 "робили з наявною у вас версією."
 
-#: ../../locales/../src/interface/QueueView.cpp:1930
-#: ../../locales/../src/interface/QueueView.cpp:1957
+#: ../../locales/../src/interface/QueueView.cpp:1964
 #, fuzzy
 msgid "The queue will not be saved."
 msgstr "Неможливо вписати \"%s\", черга не може бути збереженою."
 
-#: ../../locales/../src/interface/state.cpp:1018
+#: ../../locales/../src/interface/state.cpp:1022
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
 
-#: ../../locales/../src/interface/import.cpp:85
+#: ../../locales/../src/interface/import.cpp:84
 msgid "The selected categories have been imported."
 msgstr "Обрані категорії імпортовано."
 
-#: resources.h:297
+#: resources.h:299
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "Обраний файл вміщує імпортабельні дані для наступних категорій:"
 
-#: resources.h:320
+#: resources.h:322
 msgid "The selected file is already being edited:"
 msgstr "Обраний файл уже знаходиться в процесі редагування:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2693
+#: ../../locales/../src/interface/RemoteListView.cpp:2720
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
 "Обраний файл усе ще відкритий у якійсь іншій програм.Закрийте її,будь-ласка."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2069
-#: ../../locales/../src/interface/RemoteListView.cpp:2645
+#: ../../locales/../src/interface/LocalListView.cpp:2052
+#: ../../locales/../src/interface/RemoteListView.cpp:2672
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6914,7 +7110,7 @@
 "Це може становити небезпеку і пошкодити вашу систему.\n"
 "Ви дійсно бажаєте продовжити?"
 
-#: ../../locales/../src/interface/sitemanager.cpp:2871
+#: ../../locales/../src/interface/sitemanager.cpp:602
 #, fuzzy
 msgid "The server could not be added."
 msgstr "Стовпець імен файлів неможливо приховати."
@@ -6924,7 +7120,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "Сервер надіслав неопізнану відповідь."
 
-#: resources.h:105
+#: resources.h:106
 msgid "The server uses following charset encoding for filenames:"
 msgstr "The server uses following charset encoding for filenames:"
 
@@ -6936,7 +7132,7 @@
 "Невідомий сертифікат сервера. Для того щоб довіряти серверу ретельно "
 "перевірте сертифікат."
 
-#: resources.h:186
+#: resources.h:188
 #, fuzzy
 msgid ""
 "The server's host key does not match the key that has been cached. This "
@@ -6949,7 +7145,7 @@
 "Якщо зміна ключа хоста не була очікуваною,сконтактуєтеся,будь-ласка,з "
 "адміністратором серверу."
 
-#: resources.h:174
+#: resources.h:176
 #, fuzzy
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
@@ -6958,7 +7154,7 @@
 "Ключ хоста сервера не кешовано в реєстрі. У вас немає гарантії того,що даний "
 "сервер являє собою той комп'ютер який ви мали на увазі."
 
-#: ../../locales/../src/interface/import.cpp:82
+#: ../../locales/../src/interface/import.cpp:81
 msgid ""
 "The settings have been imported. You have to restart FileZilla for all "
 "settings to have effect."
@@ -6966,13 +7162,13 @@
 "Налаштування імпортовано. Для того щоб всі налаштування вступили в дію вам "
 "необхідно перезавантажити FileZilla."
 
-#: ../../locales/../src/interface/QueueView.cpp:3107
+#: ../../locales/../src/interface/QueueView.cpp:3222
 #, fuzzy
 msgid "The system will soon reboot unless you click Cancel."
 msgstr ""
 "Система незабаром перезавантажиться.Для відміни натисніть кнопку Скасувати."
 
-#: ../../locales/../src/interface/QueueView.cpp:3105
+#: ../../locales/../src/interface/QueueView.cpp:3220
 #, fuzzy
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "Система незабаром вимкнеться.Для відміни натисніть кнопку Скасувати."
@@ -6993,11 +7189,11 @@
 msgid "Themes"
 msgstr "Теми"
 
-#: ../../locales/../src/interface/filter.cpp:447
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Встановлений фільтр неможливо перемістити."
 
-#: ../../locales/../src/interface/filter.cpp:382
+#: ../../locales/../src/interface/filter.cpp:397
 #, fuzzy
 msgid "This filter set cannot be renamed."
 msgstr "Встановлений фільтр неможливо перемістити."
@@ -7008,7 +7204,7 @@
 "FileZilla."
 msgstr ""
 
-#: resources.h:687
+#: resources.h:703
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -7016,7 +7212,7 @@
 "Це спрацьовує лише у випадку,якщо ви не в позиції позаду маршрутизатора,а "
 "також якщо ваша система лише повертає внутрішню адресу."
 
-#: resources.h:665
+#: resources.h:681
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -7024,20 +7220,25 @@
 "Цей майстер допоможе вам правильно сконфігурувати будь-який ваш "
 "маршрутизатор чи файєрвол та протестувати вашу конфігурацію."
 
-#: resources.h:883
+#: ../../locales/../src/interface/queue.cpp:1225
+#, fuzzy
+msgid "Time"
+msgstr "Час вичерпано"
+
+#: resources.h:901
 msgid "Time formatting"
 msgstr "Форматування часу"
 
-#: resources.h:726
+#: resources.h:742
 msgid "Time&out in seconds:"
 msgstr "Time&out за мить:"
 
-#: resources.h:729 ../../locales/../src/interface/QueueView.cpp:1045
-#: ../../locales/../src/interface/QueueView.cpp:1089
+#: resources.h:745 ../../locales/../src/interface/QueueView.cpp:1066
+#: ../../locales/../src/interface/QueueView.cpp:1110
 msgid "Timeout"
 msgstr "Час вичерпано"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1668
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1694
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
 #, c-format
 msgid ""
@@ -7047,22 +7248,22 @@
 "Зсув часового поясу: Сервер: %d секунд.Місцевий: %d секунд. Різниця: %d "
 "секунд."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:174
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Title:"
 msgstr "Назва:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2322
+#: ../../locales/../src/interface/Mainfrm.cpp:2344
 msgid "To compare directories, both file lists have to be aligned."
 msgstr ""
 "Для того щоб порівняти директорії,обидва списки файлів необхідно вирівняти."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: ../../locales/../src/interface/Mainfrm.cpp:2345
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr ""
 "Для того щоб це зробити, необхідно щоб обидва дерева директорій були або "
 "показані,або приховані."
 
-#: resources.h:780
+#: resources.h:796
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7070,7 +7271,7 @@
 "Для підтримки автентифікації публічного ключа FileZilla мусить знати який "
 "приватний ключ використовувати."
 
-#: resources.h:990
+#: resources.h:1008
 #, fuzzy
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
@@ -7088,30 +7289,30 @@
 "Зелене: Файл новіший від непозначеного файлу з іншого боку\n"
 "Червоне: Різниця в розмірі файлів "
 
-#: resources.h:992
+#: resources.h:1010
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
 "directory on the server accordingly and vice versa."
 msgstr ""
 
-#: resources.h:980 resources.h:981
+#: resources.h:998 resources.h:999
 msgid "Toggles processing of the transfer queue"
 msgstr "Переключає обробку черги передачі"
 
-#: resources.h:972 resources.h:973
+#: resources.h:990 resources.h:991
 msgid "Toggles the display of the local directory tree"
 msgstr "Переключає відображення локального дерева директорії"
 
-#: resources.h:970 resources.h:971
+#: resources.h:988 resources.h:989
 msgid "Toggles the display of the message log"
 msgstr "Переключає відображення журналу повідомлень"
 
-#: resources.h:974 resources.h:975
+#: resources.h:992 resources.h:993
 msgid "Toggles the display of the remote directory tree"
 msgstr "Переключає відображення віддаленого дерева директорії"
 
-#: resources.h:976 resources.h:977
+#: resources.h:994 resources.h:995
 msgid "Toggles the display of the transfer queue"
 msgstr "Переключає відображення черги передачі"
 
@@ -7124,40 +7325,40 @@
 msgstr "Занадто багато перенаправлень"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:292
+#: ../../locales/../src/interface/StatusView.cpp:353
 msgid "Trace:"
 msgstr "Відстежити:"
 
-#: resources.h:913 resources.h:919
+#: resources.h:931 resources.h:937
 #, fuzzy
 msgid "Transfer"
 msgstr "&Передача"
 
-#: resources.h:360
+#: resources.h:362
 msgid "Transfer &direction"
 msgstr "Напрямок &передачі"
 
-#: resources.h:525
+#: resources.h:535
 msgid "Transfer &type"
 msgstr "Тип &передачі"
 
-#: resources.h:736
+#: resources.h:752
 msgid "Transfer Mode"
 msgstr "Спосіб Передачі"
 
-#: resources.h:869
+#: resources.h:887
 #, fuzzy
 msgid "Transfer Queue"
 msgstr "&Почерговість передачі"
 
-#: resources.h:97
+#: resources.h:98
 #, fuzzy
 msgid "Transfer Settings"
 msgstr "Налаштування передачі"
 
-#: ../../locales/../src/engine/transfersocket.cpp:493
-#: ../../locales/../src/engine/transfersocket.cpp:517
+#: ../../locales/../src/engine/transfersocket.cpp:498
+#: ../../locales/../src/engine/transfersocket.cpp:522
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Під'єднання перервано: %s"
@@ -7166,8 +7367,8 @@
 msgid "Transferred data got tainted."
 msgstr "Передані дані знечистились ."
 
-#: ../../locales/../src/interface/QueueView.cpp:1468
-#: ../../locales/../src/interface/statuslinectrl.cpp:274
+#: ../../locales/../src/interface/QueueView.cpp:1491
+#: ../../locales/../src/interface/statuslinectrl.cpp:278
 msgid "Transferring"
 msgstr "Передача"
 
@@ -7175,29 +7376,31 @@
 msgid "Transfers"
 msgstr "Передачі"
 
-#: ../../locales/../src/interface/QueueView.cpp:3022
-#: ../../locales/../src/interface/QueueView.cpp:3025
+#: ../../locales/../src/interface/QueueView.cpp:3136
+#: ../../locales/../src/interface/QueueView.cpp:3139
 #, fuzzy
 msgid "Transfers finished"
 msgstr "Налаштування передачі"
 
-#: resources.h:827
+#: resources.h:843
 msgid "Treat files &without extension as ASCII file"
 msgstr "Трактувати файли &без розширення як файли ASCII"
 
-#: resources.h:823
+#: resources.h:839
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "Траактувати &наступні типи файлів як файли ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:875
-msgid "Trust changed Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#, fuzzy
+msgid "Trust changed Hostkey:"
 msgstr "Довіряти зміненому ключу хоста: "
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
-msgid "Trust new Hostkey: "
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#, fuzzy
+msgid "Trust new Hostkey:"
 msgstr "Довіряти новому ключу хоста: "
 
-#: resources.h:193
+#: resources.h:195
 msgid "Trust the new key and carry on connecting?"
 msgstr "Довіряти новому ключеві і продовжити з'єднання?"
 
@@ -7205,40 +7408,40 @@
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Довіряти цьому сертифікату і продовжити з'єднання?"
 
-#: resources.h:180
+#: resources.h:182
 msgid "Trust this host and carry on connecting?"
 msgstr "Довіряти цьому хосту і продовжити з'єднання?"
 
-#: resources.h:395 ../../locales/../src/interface/edithandler.cpp:1222
+#: resources.h:397 ../../locales/../src/interface/edithandler.cpp:1233
 msgid "Type"
 msgstr "Тип"
 
-#: resources.h:762
+#: resources.h:778
 msgid "Type of FTP Proxy:"
 msgstr "Тип FTP Проксі:"
 
-#: resources.h:787
+#: resources.h:803
 msgid "Type of generic proxy:"
 msgstr "Тип загального проксі:"
 
-#: resources.h:330
+#: resources.h:332
 msgid "U&pload"
 msgstr "Від&вантажити"
 
-#: resources.h:483 resources.h:807
+#: resources.h:485 resources.h:823
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Обмеження Від&вантаження :"
 
-#: resources.h:931
+#: resources.h:949
 msgid "U&se filetype associations if available"
 msgstr "При наявності ви&користовувати асоціації типів файлів"
 
-#: resources.h:884
+#: resources.h:902
 msgid "U&se system defaults"
 msgstr "Ви&користовувати системні замовчування"
 
-#: resources.h:764
+#: resources.h:780
 msgid "USER@&HOST"
 msgstr "ХОСТ@&КОРИСТУВАЧА"
 
@@ -7247,16 +7450,16 @@
 msgid "Unassigned error code %d"
 msgstr "Неініціалізоаний код помилки %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:173
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Unit:"
 msgstr "Модуль"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
-#: ../../locales/../src/interface/edithandler.cpp:1282
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1293
 msgid "Unknown"
 msgstr "Невідомо"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Невідомий тип FTP проксі, неможливо згенерувати послідовність логінування."
@@ -7270,13 +7473,13 @@
 msgid "Unknown certificate"
 msgstr "Невідомий сертифікат"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:410
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
 
-#: resources.h:173
+#: resources.h:175
 msgid "Unknown host key"
 msgstr "Невідомий ключ хоста"
 
@@ -7289,7 +7492,7 @@
 "Невідома версія протоколу SOCKS переговорів про автентифікацію Користувача / "
 "Паролю: %d "
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:455
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr ""
@@ -7311,7 +7514,7 @@
 "Якщо ця проблема не буде усунута, активний режим FTP не працюватиме і "
 "необхідно використати пасивний режим."
 
-#: ../../locales/../src/engine/tlssocket.cpp:872
+#: ../../locales/../src/engine/tlssocket.cpp:888
 #, fuzzy
 msgid "Unsupported certificate type"
 msgstr "Непідтримуване перескерування"
@@ -7320,7 +7523,7 @@
 msgid "Unsupported redirect"
 msgstr "Непідтримуване перескерування"
 
-#: resources.h:331
+#: resources.h:333
 msgid "Up&load and unedit"
 msgstr "Від&вантажити і не редагувати"
 
@@ -7334,117 +7537,121 @@
 msgid "Update wizard"
 msgstr "Майстер оновлення"
 
-#: resources.h:362
+#: resources.h:364
 msgid "Upload"
 msgstr "Відвантаження"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1256
 msgid "Upload failed"
 msgstr "Невдале відвантаження"
 
-#: ../../locales/../src/interface/statusbar.cpp:603
+#: ../../locales/../src/interface/statusbar.cpp:609
 #, fuzzy, c-format
 msgid "Upload limit: %s/s"
 msgstr "Обмеження Від&вантаження :"
 
-#: ../../locales/../src/interface/statusbar.cpp:605
+#: ../../locales/../src/interface/statusbar.cpp:611
 #, fuzzy
 msgid "Upload limit: none"
 msgstr "Обмеження Від&вантаження :"
 
-#: resources.h:642
+#: resources.h:658
 msgid "Upload selected directory"
 msgstr "Відвантажити обрану директорію"
 
-#: resources.h:556
+#: resources.h:566
 msgid "Upload selected files and directories"
 msgstr "Відвантажити обрані файли і директорії"
 
-#: resources.h:315
+#: resources.h:317
 msgid "Upload this file back to the server?"
 msgstr "Відвантажити даний файл назад на сервер?"
 
-#: resources.h:314
+#: resources.h:316
 msgid "Upload this file to the server?"
 msgstr "Відвантажити даний файл на сервер?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1239
-#: ../../locales/../src/interface/edithandler.cpp:1273
-#: ../../locales/../src/interface/edithandler.cpp:1438
+#: ../../locales/../src/interface/edithandler.cpp:1250
+#: ../../locales/../src/interface/edithandler.cpp:1284
+#: ../../locales/../src/interface/edithandler.cpp:1449
 msgid "Uploading"
 msgstr "Відвантаження"
 
-#: ../../locales/../src/interface/edithandler.cpp:1242
-#: ../../locales/../src/interface/edithandler.cpp:1440
+#: ../../locales/../src/interface/edithandler.cpp:1253
+#: ../../locales/../src/interface/edithandler.cpp:1451
 msgid "Uploading and pending removal"
 msgstr "Відвантаження та очікування видалення"
 
-#: ../../locales/../src/interface/edithandler.cpp:1276
-#: ../../locales/../src/interface/edithandler.cpp:1442
+#: ../../locales/../src/interface/edithandler.cpp:1287
+#: ../../locales/../src/interface/edithandler.cpp:1453
 msgid "Uploading and unediting"
 msgstr "Відвантаження і відсутність редагування"
 
-#: resources.h:109
+#: resources.h:110
 msgid "Use &custom charset"
 msgstr "Використати &користувацький набір шрифтів"
 
-#: resources.h:928
+#: resources.h:946
 #, fuzzy
 msgid "Use &custom editor:"
 msgstr "Використати &користувацький набір шрифтів"
 
-#: resources.h:421
+#: resources.h:423
 #, fuzzy
 msgid "Use &default editor for text files"
 msgstr "Потрібно встановити редактор за замовчуванням."
 
-#: resources.h:404 resources.h:410
+#: resources.h:406 resources.h:412
 msgid "Use &synchronized browsing"
 msgstr ""
 
-#: resources.h:107
+#: resources.h:108
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Використати UTF-8 за умови його підтримки сервером, також використати "
 "локальний набір шрифтів."
 
-#: resources.h:257 resources.h:267
+#: resources.h:259 resources.h:269
 #, fuzzy
 msgid "Use default action"
 msgstr "Використати &по замовчуванню"
 
-#: resources.h:370
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+msgid "Use plain FTP"
+msgstr ""
+
+#: resources.h:372
 msgid "Use server currently connected to"
 msgstr "Використати сервер,що поточно під'єднаний до"
 
-#: resources.h:371
+#: resources.h:373
 msgid "Use server from site manager"
 msgstr "Використати сервер з Сайт Менеджера"
 
-#: resources.h:878
+#: resources.h:896
 msgid "Use system &defaults"
 msgstr "Використати системні &замовчування"
 
-#: resources.h:688
+#: resources.h:704
 msgid "Use the following IP address:"
 msgstr "Використати наступну ІР адресу:"
 
-#: resources.h:698
+#: resources.h:714
 msgid "Use the following port range:"
 msgstr "Використати наступний діапазон порту:"
 
-#: resources.h:683
+#: resources.h:699
 msgid "Use the server's external IP address instead"
 msgstr "Використати натомість зовнішню ІР адресу сервера"
 
-#: resources.h:689 resources.h:752
+#: resources.h:705 resources.h:768
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Викристати це,якщо ви знаходитеся позаду маршрутизатора і володієте "
 "статичною ІР адресою."
 
-#: resources.h:692
+#: resources.h:708
 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 "
@@ -7455,28 +7662,28 @@
 "використовуєте активний режим вперше. На сервер передається лише версія "
 "FileZilla."
 
-#: resources.h:121
+#: resources.h:122
 msgid "User:"
 msgstr "Користувач:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:493
-#: ../../locales/../src/interface/sitemanager.cpp:1127
+#: ../../locales/../src/interface/manual_transfer.cpp:509
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
 msgid "Username cannot be a series of spaces"
 msgstr "Ім'я користувача не може складатися з серії пробілів"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4368
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4424
 #, c-format
 msgid "Using proxy %s"
 msgstr "Використання проксі %s"
 
-#: resources.h:111
+#: resources.h:112
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
 "Використання неправильного набору шрифтів може спричинити неправильне "
 "відображення імен файлів."
 
-#: resources.h:230
+#: resources.h:232
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Користуючись даним майстром, ви можете перевірити наявність поновлень для "
@@ -7494,49 +7701,49 @@
 msgid "Verbose log messages from wxWidgets"
 msgstr "Багатошарові журнали повідомлень від wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1062
+#: ../../locales/../src/engine/tlssocket.cpp:1078
 msgid "Verifying certificate..."
 msgstr "Перевірка сертифікату..."
 
-#: resources.h:168
+#: resources.h:170
 #, fuzzy
 msgid "Version:"
 msgstr "&Версія %s"
 
-#: resources.h:812
+#: resources.h:828
 msgid "Very high"
 msgstr "Дуже високий"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1404
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1427
 msgid "View hidden option set, but unsupported by server"
 msgstr "Переглянути прихований набір опцій,проте не підтримуваних сервером"
 
-#: resources.h:915
+#: resources.h:933
 #, fuzzy
 msgid "View/Edit"
 msgstr "&Переглянути / Редагувати"
 
-#: resources.h:354
+#: resources.h:356
 msgid "Visible columns"
 msgstr "Видимі стовпці"
 
-#: resources.h:139
+#: resources.h:140
 msgid "W&rite"
 msgstr "Пи&сати"
 
-#: ../../locales/../src/interface/QueueView.cpp:1767
+#: ../../locales/../src/interface/QueueView.cpp:1790
 msgid "Waiting"
 msgstr "Очікування"
 
-#: ../../locales/../src/interface/QueueView.cpp:1375
+#: ../../locales/../src/interface/QueueView.cpp:1398
 msgid "Waiting for browsing connection"
 msgstr "Очікування на перегляд зв'язку"
 
-#: ../../locales/../src/interface/QueueView.cpp:1418
+#: ../../locales/../src/interface/QueueView.cpp:1441
 msgid "Waiting for password"
 msgstr "Очікування на пароль"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:268
+#: ../../locales/../src/interface/statuslinectrl.cpp:272
 msgid "Waiting for transfer to be cancelled"
 msgstr "Очікування на скасування передачі"
 
@@ -7544,7 +7751,7 @@
 msgid "Waiting to retry..."
 msgstr "Очікування на повторну спробу..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:308
+#: ../../locales/../src/interface/FileZilla.cpp:297
 msgid ""
 "Warning!\n"
 "\n"
@@ -7593,35 +7800,39 @@
 "\n"
 "Ви дійсно бажаєте перевірити нічні збірки?"
 
-#: resources.h:185
+#: resources.h:187
 msgid "Warning: Potential security breach!"
 msgstr "Попередження:Потенційна загроза безпеці!"
 
-#: resources.h:474
+#: resources.h:476
 #, fuzzy
 msgid "Welcome to FileZilla"
 msgstr "Закрити FileZilla"
 
-#: resources.h:463
+#: resources.h:465
 #, fuzzy
 msgid "What's new"
 msgstr "Що нового:"
 
-#: resources.h:240
+#: resources.h:242
 msgid "What's new:"
 msgstr "Що нового:"
 
-#: resources.h:815
+#: resources.h:831
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
 
-#: resources.h:857
+#: resources.h:873
 msgid "Widescreen"
 msgstr "Широкий екран"
 
-#: resources.h:143
+#: resources.h:491
+msgid "Would you like FileZilla to remember this password?"
+msgstr ""
+
+#: resources.h:144
 msgid "Wr&ite"
 msgstr "Пи&сати"
 
@@ -7634,11 +7845,11 @@
 msgid "Wrong line endings"
 msgstr "Неправильні закінчення лінійки"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
 msgid "Yes"
 msgstr "Так"
 
-#: resources.h:251
+#: resources.h:253
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
@@ -7646,15 +7857,15 @@
 "Ви уже користуєтесь найостаннішою версією FileZilla.Здійсніть чергову "
 "перевірку у майбутньому. ."
 
-#: resources.h:472
+#: resources.h:474
 msgid "You can always open this dialog again through the help menu."
 msgstr ""
 
-#: ../../locales/../src/engine/server.cpp:49
+#: ../../locales/../src/engine/server.cpp:63
 msgid "You can leave the port field empty to use the default port."
 msgstr ""
 
-#: resources.h:146
+#: resources.h:147
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7662,7 +7873,7 @@
 "Ви можете використати значок x у будь-якій позиції щоб зберегти дозвіл яким "
 "володіють оригінальні файли."
 
-#: ../../locales/../src/interface/import.cpp:29
+#: ../../locales/../src/interface/import.cpp:28
 msgid "You cannot import settings from FileZilla's own settings directory."
 msgstr "Ви не можете імпортувати власні налаштування директорії FileZilla."
 
@@ -7677,29 +7888,29 @@
 msgstr ""
 "Ви не ввели нове ім'я для цього файлу.Чи переписати цей файл натомість?"
 
-#: resources.h:453
+#: resources.h:455
 msgid "You have selected at least one symbolic link."
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/RemoteListView.cpp:2612
+#: ../../locales/../src/interface/LocalListView.cpp:2019
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/LocalListView.cpp:2156
+#: ../../locales/../src/interface/LocalListView.cpp:2139
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr ""
 
-#: ../../locales/../src/interface/manual_transfer.cpp:417
-#: ../../locales/../src/interface/sitemanager.cpp:1040
+#: ../../locales/../src/interface/manual_transfer.cpp:433
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Вам необхідно ввести ім'я хосту."
 
-#: ../../locales/../src/interface/search.cpp:843
+#: ../../locales/../src/interface/search.cpp:817
 #, fuzzy
 msgid "You have to enter a local directory."
 msgstr "Вам необхідно ввести дійсну ІР адресу."
@@ -7709,18 +7920,18 @@
 msgid "You have to enter a valid IP address."
 msgstr "Вам необхідно ввести дійсну ІР адресу."
 
-#: ../../locales/../src/interface/search.cpp:849
+#: ../../locales/../src/interface/search.cpp:823
 #, fuzzy
 msgid "You have to enter a writable local directory."
 msgstr "Вам необхідно ввести дійсну ІР адресу."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:504
-#: ../../locales/../src/interface/sitemanager.cpp:1137
+#: ../../locales/../src/interface/manual_transfer.cpp:520
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
 msgid "You have to enter an account name"
 msgstr "Вам необхідно ввести ім'я акаунту"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:474
-#: ../../locales/../src/interface/sitemanager.cpp:1108
+#: ../../locales/../src/interface/manual_transfer.cpp:490
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
 msgid "You have to specify a user name"
 msgstr "Вам необхідно вказати ім'я користувача"
 
@@ -7730,7 +7941,7 @@
 "transferred data."
 msgstr "Схоже ваш маршрутизатор або файєрвол помилково змінили передані дані."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:52
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #, fuzzy
 msgid "You need to enter a name for the bookmark."
 msgstr "Вам необхідно ввести хост проксі."
@@ -7740,7 +7951,7 @@
 msgid "You need to enter a name for the log file."
 msgstr "Введіть ім'я для нового фільтру."
 
-#: ../../locales/../src/interface/edithandler.cpp:1629
+#: ../../locales/../src/interface/edithandler.cpp:1640
 #, fuzzy
 msgid "You need to enter a properly quoted command."
 msgstr "Вам необхідно ввести хост проксі."
@@ -7754,39 +7965,39 @@
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "Вам потрібно ввести порт проксі в межах від 1 до 65535."
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:73
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:438
-#: ../../locales/../src/interface/sitemanager.cpp:1197
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:76
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:446
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr ""
 
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:80
-#: ../../locales/../src/interface/bookmarks_dialog.cpp:445
-#: ../../locales/../src/interface/sitemanager.cpp:1206
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:83
+#: ../../locales/../src/interface/bookmarks_dialog.cpp:453
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
 msgstr ""
 
-#: ../../locales/../src/interface/sitemanager.cpp:1162
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
 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:312
+#: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
 msgstr "Вам необхідно вказати локальний файл."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:332
+#: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
 msgstr "Вам необхідно вказати віддалений файл."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:339
+#: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
 msgstr "Вам необхідно вказати віддалений шлях."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:305
+#: ../../locales/../src/interface/manual_transfer.cpp:309
 msgid "You need to specify a server."
 msgstr "Вам необхідно вказати ісервер."
 
@@ -7798,34 +8009,49 @@
 "У вас не повинно виникнути проблем у з'єднанні з іншими серверами.Передачі "
 "файлів повинні працювати правильно."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:68
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#, fuzzy
+msgid "after"
+msgstr "&Передача"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+msgid "before"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
 msgid "begins with"
 msgstr "починається з"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:66
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
 msgid "contains"
 msgstr "вміщує"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:71
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "does not contain"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:69
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+msgid "does not equal"
+msgstr ""
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "ends with"
 msgstr "завершується з"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:74
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "equals"
 msgstr "урівнює"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:581
-#: ../../locales/../src/interface/filelistctrl.cpp:599
-#: ../../locales/../src/interface/filelistctrl.cpp:624
-#: ../../locales/../src/interface/filelistctrl.cpp:640
+#: ../../locales/../src/interface/filelistctrl.cpp:497
+#: ../../locales/../src/interface/filelistctrl.cpp:515
+#: ../../locales/../src/interface/filelistctrl.cpp:540
+#: ../../locales/../src/interface/filelistctrl.cpp:556
 msgid "file"
 msgstr "файл"
 
-#: ../../locales/../src/interface/edithandler.cpp:87
+#: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
 msgstr "fz3temp-lockfile"
 
@@ -7844,55 +8070,55 @@
 msgid "fzsftp could not be started"
 msgstr "fzsftp неможливо запустити"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:926
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr ""
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:73
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "greater than"
 msgstr "більше ніж"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "group executable"
 msgstr "групове виконання"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "group readable"
 msgstr "групове читання"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "group writeable"
 msgstr "груповий запис"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:67
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
 msgid "is equal to"
 msgstr "є рівним"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:77
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
 msgid "is set"
 msgstr "встановлено"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:78
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "is unset"
 msgstr "не встановлено"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:75
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "less than"
 msgstr "менше ніж"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:70
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "matches regex"
 msgstr "співпадає з regex"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
 msgid "owner executable"
 msgstr "виконуване власником"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "owner readable"
 msgstr "читабельне власником"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "owner writeable"
 msgstr "записуване власником"
 
@@ -7900,18 +8126,21 @@
 msgid "unknown"
 msgstr "невідомо"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "world executable"
 msgstr "глобальне виконання"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "world readable"
 msgstr "глобальне читання"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "world writeable"
 msgstr "глобальний запис"
 
-#: resources.h:164
+#: resources.h:165
 msgid "wxWidgets:"
 msgstr ""
+
+#~ msgid "Duplicate filter name"
+#~ msgstr "Дублювання імені фільтру"
diff -Nru filezilla-3.5.3/locales/vi_VN.po filezilla-3.7.3~precise/locales/vi_VN.po
--- filezilla-3.5.3/locales/vi_VN.po	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/vi_VN.po	2013-06-18 20:02:24.000000000 +0000
@@ -1,41 +1,42 @@
 # FileZilla translation for Vietnamese.
-# Copyright (C) 2004-2011 Tim Kosse <tim.kosse@filezilla-project.org>.
+# Copyright (C) 2004-2013 Tim Kosse <tim.kosse@filezilla-project.org>.
 # This file is distributed under the same license as the FileZilla package.
-# First translator: Trần Ngọc Quân <vnwildman@gmail.com>, 2008-2011.
+# First translator: Trần Ngọc Quân <vnwildman@gmail.com>, 2008-2013.
 #
 msgid ""
 msgstr ""
-"Project-Id-Version: filezilla-3.5.2\n"
+"Project-Id-Version: filezilla-3.7.1-rc1\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-08 11:58+0100\n"
-"PO-Revision-Date: 2011-11-12 07:11+0700\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-17 08:12+0700\n"
 "Last-Translator: Trần Ngọc Quân <vnwildman@gmail.com>\n"
-"Language-Team: Trần Ngọc Quân <vnwildman@gmail.com>\n"
+"Language-Team: Vietnamese <translation-team-vi@lists.sourceforge.net>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
 "Content-Transfer-Encoding: 8bit\n"
+"Language: vi_VN\n"
 "Plural-Forms: nplurals=2; plural=1;\n"
-"X-Poedit-Language: Vietnamese\n"
-"X-Poedit-Country: VIET NAM\n"
-"X-Poedit-SourceCharset: utf-8\n"
+"Team-Website: <http://translationproject.org/team/vi.html>\n"
+"X-Poedit-SourceCharset: UTF-8\n"
+"X-Generator: Poedit 1.5.5\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
-msgstr "đã được %H:%M:%S"
+msgstr "Đã được %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
-msgstr "còn %H:%M:%S"
+msgstr "Còn %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
 msgstr ""
-"%a -Tài khoản (Các dòng chứa nó sẽ bị bỏ qua nếu không sử dụng kiểu đăng "
+"%a - Tài khoản (Các dòng chứa nó sẽ bị bỏ qua nếu không sử dụng kiểu đăng "
 "nhập bằng Tài khoản)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
@@ -47,9 +48,9 @@
 msgstr[0] "%d thư mục"
 msgstr[1] "%d thư mục"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -58,33 +59,33 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
-msgstr[0] "%d tệp tin"
-msgstr[1] "%d tệp tin"
+msgstr[0] "%d tập tin"
+msgstr[1] "%d tập tin"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:81
 #, c-format
 msgid "%d file. Total size: %s"
 msgid_plural "%d files. Total size: %s"
-msgstr[0] "%d tệp tin. Kích thước tổng cộng: %s"
-msgstr[1] "%d tệp tin. Kích thước tổng cộng: %s"
+msgstr[0] "%d tập tin. Kích thước tổng cộng: %s"
+msgstr[1] "%d tập tin. Kích thước tổng cộng: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:79
 #, c-format
 msgid "%d file. Total size: At least %s"
 msgid_plural "%d files. Total size: At least %s"
-msgstr[0] "%d tệp tin. Kích thước tổng cộng: Ít nhất %s"
-msgstr[1] "%d tệp tin. Kích thước tổng cộng: Ít nhất %s"
+msgstr[0] "%d tập tin. Kích thước tổng cộng: Ít nhất %s"
+msgstr[1] "%d tập tin. Kích thước tổng cộng: Ít nhất %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
-msgstr "%d tệp tin được thêm vào hàng đợi"
+msgstr "%d tập tin được thêm vào hàng đợi"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:104
 #, c-format
@@ -93,31 +94,21 @@
 msgstr[0] "%d giây"
 msgstr[1] "%d giây"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - Máy chủ"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - Mật khẩu"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -125,17 +116,17 @@
 #: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
 msgid "%s - Certificate expired!"
-msgstr "%s - Hết hạn chứng nhận!"
+msgstr "%s - Chứng nhận đã hết hạn!"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:23
 #, c-format
 msgid "%s - Not yet valid!"
 msgstr "%s - Vẫn chưa hợp lệ!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
-msgstr "%s - Người dùng máy chủ ủy thác"
+msgstr "%s - Tài khoản máy chủ ủy thác"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:91
 #, c-format
@@ -154,27 +145,17 @@
 msgstr[0] "%s bytes"
 msgstr[1] "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
-#, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s byte (%s/s)"
 
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -189,7 +170,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:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -212,152 +193,148 @@
 msgid "%s with %d bits"
 msgstr "%s với %d bit"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
-msgstr "%u - Người dùng"
+msgstr "%u - Tài khoản"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Mật khẩu máy chủ ủy thác"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
-msgstr "Thông tin thê&m..."
+msgstr "&Giới thiệu..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "Tà&i khoản:"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "Tích &cực"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "&Thêm dấu trang..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
-msgstr "&Thêm tệp tin vào hàng đợi"
+msgstr "&Thêm tập tin vào hàng đợi"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
-msgstr "&Thêm khóa file..."
+msgstr "&Thêm keyfile..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "&Thêm vào hàng đợi"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "Chỉnh sửa độ &lệch với múi giờ máy chủ:"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "&Luôn tin giấy phép trong những lần làm việc sau."
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "&Luôn tin máy chủ này, thêm từ khóa này vào bộ nhớ"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "&Luôn sử dụng trình soạn thảo mặc định"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "&Luôn sử dụng chương trình đã chọn cho các tệp chưa liên kết"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
-msgstr "&Luôn sử dụng hành động này"
+msgstr "&Luôn dùng hành động này"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "&Hỏi địa chỉ IP từ hệ điều hành của bạn"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "&Tự động"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "&Tự dò tìm"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "Nhị &phân"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "Tiền tố &nhị phân sử dùng ký hiệu SI. (ví dụ 1 KB = 1024 bytes)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "&Dấu trang"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
-msgstr "Tìm &duyệt..."
+msgstr "&Duyệt..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "&Khoảng chấp nhận:"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "&Hủy bỏ"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "&Kiểm tra phiên bản thử nghiệm của FileZilla"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "&Xóa các thông tin riêng..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "Đón&g FileZilla"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "Đặt giới hạn tố&c độ..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "&Cấu hình..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "&Kết nối"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "Sao &chép"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
-msgstr "&Chép kết nối hiện tại vào trong Danh bạ..."
+msgstr "&Chép kết nối hiện tại vào Quản lý địa chỉ..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "&Chép vào clipboard"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "Hỏn&g"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "Tạo thư mụ&c"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "&Tạo tab mới"
 
@@ -365,649 +342,657 @@
 msgid "&Debug"
 msgstr "&Gỡ lỗi"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "&Gỡ lỗi bằng sổ nhật ký:"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "Trình soạn thảo &mặc định:"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
-msgstr "Hành động &mặc định khi tệp tin đã có sẵn..."
+msgstr "Hành động &mặc định khi tập tin đã có sẵn..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
-msgstr "&Tạm nghỉ giữa các lần đăng nhập sai:"
+msgstr "Thời gian &nghỉ giữa các lần đăng nhập sai:"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "&Xóa bỏ"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
-msgstr "&Xóa liên kết đồng bộ"
+msgstr "&Xóa liên kết biểu trưng"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "So sánh &thư mục"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr ""
-"&Loại bỏ tệp tin trên máy nội bộ sau đó tải và biên tập một tệp tin một lần "
+"&Loại bỏ tập tin trên máy nội bộ sau đó tải và biên tập một tập tin một lần "
 "nữa"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "&Ngắt kết nối"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "Máy chủ &ngắt kết nối"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "&Hiển thị tốc độ truyền hiện tại thay vì tốc độ trung bình"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "&Hiển thị kích thước tính theo byte"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "&Không lưu mật khẩu"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "&Không hiển thị hộp thoại này lần sau nữa."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "&Không sử dụng địa chỉ IP mạng cho kết nối nội bộ."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
-msgstr "Hành động khi bấm đú&p chuột vào tệp tin:"
+msgstr "Hành động khi bấm đú&p chuột vào tập tin:"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "Tải &xuống"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "Tải &xuống tại:"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "Tải &xuống..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "Tải &xuống:"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "&Biên tập"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "Chỉnh &sửa qui tắc lọc..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "&Bật"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "&Bật tự động kiểm tra phiên bản mới"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "&Bật giới hạn tốc độ"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "&Bộ mã:"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "&Mã hóa:"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "&Nhập vào dòng lệnh của bạn..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "&Thi hành"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
-msgstr "&Xuất ra các đề mục của Danh bạ"
+msgstr "&Xuất ra các đề mục từ Quản lý địa chỉ"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "&Xuất ra..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "&Quay lại chế độ tích cực"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "&Chính"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
-msgstr "&Thuộc tính tệp tin..."
+msgstr "&Thuộc tính tập tin..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
-msgstr "&Quyền truy cập tệp tin..."
+msgstr "&Quyền truy cập tập tin..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
-msgstr "&Tệp tin:"
+msgstr "&Tập tin:"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "Điều kiện &lọc:"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "Đặt bộ &lọc:"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "Bộ &lọc:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "&Hoàn thành"
 
-#: resources.h:317
+#: resources.h:327
 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ộ"
+msgstr "&Hoàn tất biên tập và xóa tập tin trên máy nội bộ"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr ""
-"&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ư "
+"&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"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "&Có liên kết đồng bộ theo sau, xóa nội dung thư mục đích"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "&Lấy địa chỉ IP từ URL sau đây:"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "&Tìm trợ giúp..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "&Dấu sách toàn cục"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 sử dụng phương thức CONNECT"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "&Trợ giúp"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
-msgstr "Ẩ&n các tệp tin chính"
+msgstr "Ẩ&n các tập tin đồng nhất"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "Cao n&hất"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "Cổng cao n&hất có thể:"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "Máy c&hủ:"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "Tiền tố nhị phân theo chuẩn &IEC (ví dụ 1 KiB = 1024 bytes)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "Tiêu chuẩn &ISO 8601 (ví dụ: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "&Nhập vào..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "Kế thừa các kiểu tập t&in của hệ thống"
 
-#: resources.h:446
+#: resources.h:456
 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"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
-msgstr "&Cách bố trí bảng chứa tệp tin và thư mục:"
+msgstr "&Cách bố trí bảng chứa tập tin và thư mục:"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "Giới hạn cổng trên máy nội bộ sử dụng bởi FileZi&lla"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "&Giới hạn kết nối đồng thời"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "&Cây thư mục trên máy nội bộ"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "&Thư mục máy nội bộ:"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
-msgstr "Ghi nhật &ký vào tệp tin"
+msgstr "Ghi nhật &ký vào tập tin"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "Kiểu đăng &nhập:"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "Kiểu đăng &nhập:"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "Mức thấ&p"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "&Quản lý dấu sách..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "Truyền thủ &công..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "Số kết nối &tối đa:"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "Số lần thử lại &tối đa:"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "&Nhật ký"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "Thu n&hỏ đặt ở trên khay đồng hồ"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "Tê&n:"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "Giúp đỡ kết &nối trực quan..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "Tạo &mới"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "Địa chỉ &mới"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "Đã có bả&n mới!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "&Tiếp theo >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "Khô&ng"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "Khô&ng"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "Bì&nh thường"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "Số &ngày giữa các lần cập nhật:"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "Giá trị bằ&ng số:"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "Đồn&g ý"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "&MỞ"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "&Mở"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
-msgstr "&Ghi đè lên"
+msgstr "&Ghi đè"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "&Thụ động"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "Mật khẩ&u:"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "&Mở một đoạn âm thanh"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "Cổn&g:"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "&Vị trí của nhật ký:"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
-msgstr "Lưu &giữ dấu thời gian của tệp tin đã truyền"
+msgstr "Lưu &giữ dấu thời gian của tập tin đã truyền"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "&Hàng đợi"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "&Kết nối nhanh"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "&Thanh kết nối nhanh"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "Đọ&c"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "Kết nối &lại"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "&Làm tươi lại"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "Nhớ mật khẩu t&rong lần làm việc này"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "Nhớ mật khẩ&u?"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "&Thư mục máy mạng:"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "Đường &dẫn máy mạng:"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "&Xóa bỏ"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "&Xóa bỏ khóa"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "&Xóa mục đã chọn"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "Đổi tê&n"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "Đổi tê&n..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
-msgstr "Mở &lại tệp tin trên máy nội bộ"
+msgstr "Mở &lại tập tin trên máy nội bộ"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "&Thay thế ký tự không hợp lệ bằng:"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "&Báo cáo lỗi..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "Đặt &và xếp lại toàn bộ hàng đợi"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "&Khởi động lại thuật sĩ"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "&Phục hồi lại"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "&Thực hiện lệnh..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "&Chạy cấu hình thuật sĩ bây giờ..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "&Chạy chương trình cập nhật bây giờ..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "&ĐỊA CHỈ"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "&Ghi lại bằng tên mới..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "&Tìm kiếm"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
-msgstr "&Tìm kiếm tệp tin từ máy mạng..."
+msgstr "&Tìm kiếm tập tin từ máy mạng..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "&Chọn Mục:"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "&Chọn ngôn ngữ:"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "&Chọn các cột sẽ hiển thị:"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "&Máy chủ"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "&Cài đặt"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "&Cài đặt..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "&Hiển thị menu gỡ rối"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "&Hiển thị thông điệp"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "&Hiển thị dấu thời gian trong nhật ký thông tin"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
-msgstr "Quản lý &Danh bạ..."
+msgstr "&Quản lý Địa chỉ..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "&Gắn với trang mạng"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "Bỏ &qua"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "&Giới hạn tốc độ"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "Bắt đầu truyền ngay &lập tức"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "&Hoán đổi cửa sổ điều khiển máy trên máy nội bộ và máy mạng"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "Kiểu mã hóa &TLS"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "Kiểm &tra"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "Định &dạng cửa sổ:"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "Sự &truyền"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "Chế độ &truyền:"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "Hàng đợi &truyền"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr ""
-"Xử lý dotfiles (&tên tệp tin bắt đầu với dấu chấm) như là tệp tin ASCII"
+"Xử lý dotfiles (&tên tập tin bắt đầu với dấu chấm) như là tập tin ASCII"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "&Không biên tập"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "Lư&u giữ lại từ khóa cho máy chủ này"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "Tải &lên"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "Tải &lên:"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "&Dùng chương trình riêng"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "Sử dụng d&uyệt đồng bộ"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "&Sử dụng trình soạn thảo tệp văn bản mặc định của hệ thống."
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
-msgstr "Sử dụng theo địa chỉ IP sa&u đây:"
+msgstr "Sử dụng địa chỉ IP sa&u đây:"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "&Dùng địa chỉ IP máy chủ để thay thế"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "Sử dụng nhiều dấ&u ngăn cách"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
-msgstr "&Người dùng:"
+msgstr "&Tài khoản:"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "Tên tài kh&oản:"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "&Phiên bản %s"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "&Trình bày"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "&Trình bày/Biên tập"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr "&Theo dõi các tệp tin đã được biên tập và nhắc tải lên khi bị sửa"
+msgstr "&Theo dõi các tập tin đã được biên tập và nhắc tải lên khi bị sửa"
+
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "&Khi kiểm tra cập nhật phiên bản mới, kiểm tra mỗi:"
 
-#: resources.h:136
+#: resources.h:145
 msgid "&Write"
 msgstr "&Ghi"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "Đồn&g ý"
 
@@ -1029,7 +1014,23 @@
 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/Mainfrm.cpp:594
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr ""
+"Kiểu đăng nhập 'Thông thường' và ' Tài khoản' không sẵn sàng, đang dùng 'Hỏi "
+"mật khẩu' để thay thế."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr ""
+"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:596
 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 "
@@ -1044,123 +1045,119 @@
 #, c-format
 msgid "(%d object filtered)"
 msgid_plural "(%d objects filtered)"
-msgstr[0] "(đối tượng %d đã được lọc)"
+msgstr[0] "(lọc ra %d đối tượng)"
 msgstr[1] "(các đối tượng %d đã được lọc)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 nghĩa là không giới hạn)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 giây)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
-msgstr "(5-9999, 0 để tắt)"
-
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(Ít nhất là 7 ngày)"
+msgstr "(5-9999, 0 là tắt)"
 
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(ví dụ: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(ví dụ: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(trong %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
-msgstr ", dưới %H:%M:%S"
+msgstr ", còn %H:%M:%S"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
-msgstr ", dưới --:--:--"
+msgstr ", còn --:--:--"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "-Bộ định tuyến và/hoặc tường lửa hỏng"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
-msgstr "-Tệp tin bị ngắt trên máy ảnh"
+msgstr "-Tập tin bị ngắt trên máy ảnh"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "-Có Malware trong máy của bạn"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "dưới --:--:--"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c không thể sử dụng cùng nhau với một địa chỉ FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l không thể sử dụng cùng với một địa chỉ FTP."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s và -c không thể có mặt đồng thời."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s không thể sử dụng cùng nhau với một địa chỉ FTP."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - Không"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1- Cảnh báo"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - Thông tin"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
-msgstr "3 -Quá dài"
+msgstr "3 - Chi tiết"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
-msgstr "Hệ điều hành 32 bit"
+msgstr "Hệ thống 32 bit"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
-msgstr "4 –Gỡ lỗi"
+msgstr "4 – Gỡ lỗi"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
-msgstr "Hệ điều hành 64 bit"
+msgstr "Hệ thống 64 bit"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< &Lùi lại"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1168,18 +1165,19 @@
 msgid ""
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr ""
-"Dấu sách nhập vào đã tồn tại trước rồi . Xin hãy nhập một cái tên chưa có."
+"Dấu sách nhập vào đã có từ trước rồi. Xin hãy nhập một cái tên chưa dùng."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "Một trình soạn thảo mặc định phải được đặt."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 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ó."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1189,27 +1187,27 @@
 "bạn có thể phải sử dụng chế độ tích cực. Trong chế độ tích cực, FileZilla mở "
 "một cổng và yêu cầu máy chủ kết nối với nó."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
-msgstr "Tệp tin mở trước đó đã bị thay đổi."
+msgstr "Tập tin mở trước đó đã bị thay đổi."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "Tệp tin với tên đó đang được soạn thảo. Bạn có muốn mở lại '%s' không?"
+msgstr "Tập tin với tên đó đang được soạn thảo. Bạn có muốn mở lại '%s' không?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
-msgstr "Tệp tin với tên đó đang truyền đi."
+msgstr "Tập tin với tên đó đang truyền đi."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
-msgstr "Tệp tin đó vẫn đang bị biên tập. Làm ơn đóng nó lại và thử lại."
+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:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1217,27 +1215,27 @@
 "Unless you fix this problem, files might be missing in the file listings.\n"
 "No further warning will be displayed this session."
 msgstr ""
-"Tệp tin máy nội bộ không thể giải mã.\n"
+"Tập tin máy nội bộ không thể giải mã.\n"
 "Xin chắc chắn là biến môi trường LC_CTYPE (hoặc LC_ALL) được đặt một cách "
 "chính xác.\n"
-"Trừ khi bạn sửa được vấn đề này, nếu không các tệp tin sẽ bị mất trong danh "
+"Trừ khi bạn sửa được vấn đề này, nếu không các tập tin sẽ bị mất trong danh "
 "sách.\n"
 "Không có thêm thông tin nóng sẽ hiển thị trong lần làm việc này."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "Đã có phiên bản mới hơn:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
 msgstr ""
-"Một máy chủ đúng qui cách luôn hiển thị tất cả các tệp tin, nhưng một vài "
+"Một máy chủ đúng qui cách luôn hiển thị tất cả các tập tin, nhưng một vài "
 "máy chủ giấu thông tin từ người dùng. Dùng tùy chọn này để hiển thị tất cả "
-"các tệp tin."
+"các tập tin."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1253,17 +1251,17 @@
 "Một thao tác đang thực hiện và chức năng duyệt đồng bộ đang được bật.\n"
 "Bạn có muốn tắt chức năng duyệt đồng bộ và tiếp tục đổi thư mục?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "&Thêm"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
-msgstr "&Cho phép phục hồi tệp tin ASCII"
+msgstr "&Cho phép phục hồi tập tin ASCII"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
@@ -1273,57 +1271,57 @@
 msgid "A&pply only to uploads"
 msgstr "Chỉ chấ&p nhận tải lên"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
-msgstr "Chấ&p nhận tất cả các tệp tin và thư mục"
+msgstr "Chấ&p nhận tất cả các tập tin và thư mục"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "Tự độn&g xóa các chuyển tác thành công"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 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."
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
-msgstr "Thông tin thêm về FileZilla"
+msgstr "Giới thiệu về FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "Trên danh sách tệp"
 
-#: ../../locales/../src/engine/server.cpp:858
-#: ../../locales/../src/engine/server.cpp:877
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "Tài khoản"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "Tá&c dụng sau khi hàng đợi hoàn thành"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
-msgstr "Tác dụng trên tệp tin đã chọn:"
+msgstr "Tác dụng trên tập tin đã chọn:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "Hành động thực thi:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
-msgstr "Tác động:"
+msgstr "Thao tác:"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:118
 msgid "Active mode"
@@ -1334,15 +1332,15 @@
 "Active mode FTP test failed. FileZilla does not know the correct external IP "
 "address."
 msgstr ""
-"Kiểm tra chế độ FTP tích cực không thành công. FileZilla không biết địa chỉ "
-"IP chính xác."
+"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:592
 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 ""
-"Kiểm tra chế độ FTP tích cực bị lỗi. FileZilla không biết địa chỉ IP chính "
+"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. Thêm vào đó, bộ định tuyến router của bạn đã chỉnh sửa địa chỉ truyền "
 "đi."
 
@@ -1352,27 +1350,27 @@
 "address, but your router or firewall has misleadingly modified the sent "
 "address."
 msgstr ""
-"Kiểm tra chế độ FTP tích cực bị lỗi. FileZilla biết địa chỉ IP chính xác, "
+"Kiểm tra chế độ FTP tích cực gặp lỗi. FileZilla biết địa chỉ IP chính xác, "
 "nhưng bộ định tuyến router hay tường lửa firewall đã chỉnh sửa sai địa chỉ "
 "truyền đi."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "Kích hoạt ở chế độ IP"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
-msgstr "Chỉ thêm tệp tin vào &hàng đợi"
+msgstr "Chỉ thêm tập tin vào &hàng đợi"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "Đặt thư mục đã chọn vào hàng đợi truyền"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
-msgstr "Đặt tệp tin và thư mục đã chọn vào hàng đợi truyền"
+msgstr "Đặt tập tin và thư mục đã chọn vào hàng đợi truyền"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "Thêm vào hàng đợi"
 
@@ -1380,48 +1378,63 @@
 msgid "Address type not supported"
 msgstr "Kiểu địa chỉ không được hỗ trợ"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "Cao cấp"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "Tùy chọn cao cấp:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"Lời khuyên: Trừ trường hợp bạn muốn thử các tính năng mới, bạn chỉ nên sử "
+"dụng bản ổn định. Bản thử nghiệm và bản được biên dịch hàng ngày là phiên "
+"bản để phát triển dành cho mục đích thử. Bản được dịch hàng ngày của "
+"FileZilla có 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 sử dụng bản thử nghiệm và bản biên "
+"dịch hàng ngày."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "Thuật toán:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
-msgstr "Tất cả các tệp tin được truyền đi thành công"
+msgstr "Tất cả các tập tin được truyền đi thành công"
 
-#: resources.h:706
+#: resources.h:727
 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:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] ""
-"Tất cả các việc truyền đã hoàn thành. %d tệp tin không thể truyền được"
+"Tất cả các việc truyền đã hoàn thành. %d tập tin không thể truyền được"
 msgstr[1] ""
-"Tất cả các việc truyền đã hoàn thành. %d tệp tin không thể truyền được"
+"Tất cả các việc truyền đã hoàn thành. %d tập tin không thể truyền được"
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "Cho phép &quay lại chế độ cũ khi truyền thất bại"
 
-#: resources.h:681
+#: resources.h:702
 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"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "Đã có kết nối sẵn dùng"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1429,7 +1442,7 @@
 "Bạn có thể lựa chọn công cụ Pageant từ PuTTY để quản lý các khóa, FileZilla "
 "có thể sử dụng Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1437,14 +1450,15 @@
 "Bạn có thể lựa chọn là sử dụng SSH của hệ thống. Để làm được như vậy, xin "
 "chắc chắn rằng biến môi trường SSH_AUTH_SOCK phải được đặt."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr ""
-"Bạn có thể có lựa chọn là tải về bản mới từ http://filezilla-project.org."
+"Bạn có thể có lựa chọn khác là tải về bản mới từ http://filezilla-project."
+"org."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1453,7 +1467,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:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1462,23 +1476,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:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 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ả đã tồn tại trong vị trí đích."
+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:879
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "Nặc danh"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 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."
@@ -1494,60 +1508,60 @@
 "file."
 msgstr ""
 "Tất cả các thay đổi tạo trong Quản Lý Địa Chỉ sẽ không được ghi lại trừ khi "
-"bạn sửa chữ tệp tin."
+"bạn sửa chữ tập tin."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 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:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 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."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "Chỉ á&p dụng cho các thư mục"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
-msgstr "Chấp nhận"
+msgstr "Áp dụng"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "&Chỉ áp dụng cho hàng đợi hiện hành"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "Chỉ áp dụng cho các tệp &tin"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "Lưu trữ"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "Như một tab trong bảng điều khiển của hàng đợi truyền"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
-msgstr "Hỏi hành động"
+msgstr "Hỏi thao tác"
 
-#: ../../locales/../src/engine/server.cpp:854
-#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "Hỏi mật khẩu"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "Lấy cổng từ hệ điều hành."
 
-#: resources.h:692
+#: resources.h:713
 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"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "Hỏi tại FileZilla forums"
 
@@ -1555,39 +1569,35 @@
 msgid "Associated program not found:"
 msgstr "Chương trình thành phần không tìm thấy:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "Có ít nhất một bộ lọc không đầy đủ"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "Tại điểm này, tất cả các thông tin yêu cầu đã được thu thập."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "Thuộc tính"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "Không đúng thẩm quyền."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "Tác giả:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "Tự động"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
-msgstr "Tự động phân loại kiểu tệp tin"
+msgstr "Tự động phân loại kiểu tập tin"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "Tự động kiểm tra cập nhật phiên bản mới"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "Kích thước cho phép"
 
@@ -1596,36 +1606,36 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Ký hiệu đơn vị cho bytes. Chỉ dịch chữ đầu>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "Bằng cách dùng chủ ủ&y thác"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "Cách dùng cơ bản"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "Cách xử lý"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "Đang được biên tập"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "Đánh giá chương trình xử lý xâu chữ coalescer"
 
-#: ../../locales/../src/engine/tlssocket.cpp:881
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "Cẩn thận! Giấy chứng nhận đã bị hủy bỏ"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "Nhị phân"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "Bảng đen"
 
@@ -1635,27 +1645,27 @@
 msgid "Bookmark"
 msgstr "Dấu trang"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "Dấu trang:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "Dấu trang"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
-msgstr "Ngày tạo:"
+msgstr "Ngày biên dịch:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
-msgstr "Thông tin xây dựng"
+msgstr "Thông tin biên dịch"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "Phạm trù được làm:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1665,63 +1675,63 @@
 "tích cực. Nếu bạn muốn giới hạn FileZilla chỉ sử dụng một vùng cổng nhỏ, xin "
 "hãy nhập vào vùng cổng bên dưới."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "&Hủy công việc hiện hành"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "&Kiểm tra phiên bản hàng ngày của FileZilla"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "&Xóa tất cả"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "Sa&o chép URL vào clipboard"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "&Người dùng"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
-msgstr "Thành phần kiểu tệp tin người &dùng:"
+msgstr "Thành phần kiểu tập tin người &dùng:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 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:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
-msgstr "Không thể đọc từ tệp tin"
+msgstr "Không thể đọc từ tập tin"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
-msgstr "Không thể ghi dữ liệu vào tệp tin."
+msgstr "Không thể ghi dữ liệu vào tập tin."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
-msgstr "Không thể ghi dữ liệu vào tệp tin: %s"
+msgstr "Không thể ghi dữ liệu vào tập tin: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "Hủy"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "Hủy công việc hiện hành"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "Hủy công việc hiện hành"
 
@@ -1730,11 +1740,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:564
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "Không thể thêm địa chỉ máy chủ vào Danh bạ"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1750,30 +1760,30 @@
 "Không thể so sánh thư mục, những bộ lọc khác nhau cho thư mục máy nội bộ và "
 "máy chủ đang được bật"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "Không thể so sánh thư mục, không có kết nối tới máy chủ."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "Không thể tạo bộ lọc mới"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
-msgstr "Không thể biên tập tệp tin"
+msgstr "Không thể sửa tập tin"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
-msgstr "Không thể sửa tệp, không có kết nối tới máy chủ."
+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:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
-msgstr "Không sửa tệp được vì không tìm thấy địa chỉ máy chủ."
+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:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
@@ -1781,57 +1791,61 @@
 "Không thể thiết lập kết nối FTP tới máy chủ SFTP. Làm ơn chọn giao thức một "
 "cách đúng đắn."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
-msgstr "Không thể tải thanh công cụ Kết Nối Nhanh từ tệp tin nguồn"
+msgstr "Không thể tải thanh công cụ Kết Nối Nhanh từ tập tin nguồn"
 
 #: ../../locales/../src/interface/import.cpp:38
 msgid "Cannot load file, not a valid XML file."
-msgstr "Không thể tải tệp tin, tệp tin XML không hợp lệ."
+msgstr "Không thể tải tập tin, tập tin XML không hợp lệ."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Cannot load keyfile"
 msgstr "Không thể tải keyfile"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1066
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
-msgstr "Không thể tải thanh công cụ từ tệp tin nguồn"
+msgstr "Không thể tải thanh công cụ từ tập tin nguồn"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "Không thể lưu mật khẩu"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "Không thể đổi tên đề mục"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
-msgstr "Không thể đổi tên tệp tin"
+msgstr "Không thể đổi tên tập tin"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "Không thể ghi lại bộ lọc"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "Không thể chọn bộ lọc"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
-msgstr "Không thể thiết lập liên kết tệp"
+msgstr "Không thể đặt ứng dụng liên kết với tập tin"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "Không thể hiển thị hộp thoại"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
-msgstr "Không thể hiển thị/biên tập tệp tin đã chọn"
+msgstr "Không thể hiển thị/biên tập tập tin đã chọn"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "Thể loại"
 
@@ -1839,81 +1853,81 @@
 msgid "Certificate and session data are not available yet."
 msgstr "Dữ liệu chứng nhận và phiên làm việc vẫn chưa có giá trị."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "Chi tiết chứng thực"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
-msgstr "&Chứng nhận dạng chuỗi:"
+msgstr "&Chứng nhận dạng móc nối:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
-msgstr "Xuất bản chứng thực"
+msgstr "Người chứng thực"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "Việc khó khăn:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
-msgstr "Thay đổi thuộc tính tệp tin"
+msgstr "Thay đổi thuộc tính tập tin"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
-msgstr "Thay đổi quyền truy cập tệp tin."
+msgstr "Thay đổi quyền truy cập tập tin."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "Sửa tệp nhật trình cần phải khởi động lại FileZilla"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "Dạng ký tự mã hóa"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
-msgstr "Tên bộ ký tự"
-
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "Kiểm tra phiên &bản tiền phát hành của FileZilla"
+msgstr "Tên bảng mã"
 
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "Kiểm tra phiên bản &mới..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "Kiểm tra &cập nhật FileZilla tự động:"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "Kiểm tra phiên bản mới hơn của FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "Kiểm tra phiên bản mới"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
-msgstr "Kiểm tra phiên bản mới bị lỗi"
+msgstr "Kiểm tra phiên bản mới gặp lỗi"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:765
 msgid "Checking for correct external IP address"
 msgstr "Kiểm tra địa chỉ IP"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "Đang kiểm tra phiên bản mới"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
-msgstr "Tệp tin tải xuống có mã tổng kiểm tra không đúng."
+msgstr "Tập tin tải xuống có mã tổng kiểm tra không đúng."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "Chọn thư mục nội bộ mặc định"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "Chọn thư mục nội bộ"
 
@@ -1921,43 +1935,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "Tổng kiểm tra dữ liệu tận cùng không đúng"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
-msgstr "Cái khác:"
+msgstr "Kiểu mã hóa:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "Đón&g tab lại"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "Cổ điển"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "&Xóa các đề mục Danh bạ"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "Xóa bộ đệm &giao diện"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "Xóa lịch sử &kết nối nhanh"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "&Xóa thông tin kết nối lại"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "Xóa hàng đợi &truyền"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:146
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "Xóa lịch sử lệnh"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1965,11 +1979,11 @@
 msgid "Clear private data"
 msgstr "Xóa dữ liệu lưu trong máy"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:145
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "Xóa thanh công cụ kết nối nhanh"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "Xóa bộ xử lý chuỗi coalescer"
 
@@ -1977,36 +1991,36 @@
 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."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "Bấm vào Tiếp tục để tải về phiên bản mới."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "Máy khách kết nối tới máy chủ MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
-msgstr "Máy khách tới máy chủ mật mã:"
+msgstr "Kiểu mã hóa từ máy khách tới máy chủ:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "Đóng tất cả các t&ab khác"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1138
-#: ../../locales/../src/interface/Mainfrm.cpp:1161
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "Đóng FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "Đóng tất cả các ứng dụng FileZilla đang chạy"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "Đóng tab hiện hành lại"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "Chú thíc&h:"
 
@@ -2014,19 +2028,19 @@
 msgid "Column properties"
 msgstr "Các tính chất của cột"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "Cài đặt cột"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
-msgstr "Lệnh và tham số phải được đóng mở ngoặc đúng."
+msgstr "Lệnh và tham số phải được trích dẫn đúng."
 
 #: ../../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
 msgid "Command failed"
-msgstr "Lệnh sai"
+msgstr "Lệnh gặp lỗi"
 
 #: ../../locales/../src/engine/proxy.cpp:448
 msgid "Command not supported"
@@ -2037,9 +2051,9 @@
 msgstr "Lệnh không được hỗ trợ bởi giao thức này"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "Lệnh:"
 
@@ -2047,7 +2061,7 @@
 msgid "Comment"
 msgstr "Chú thích"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "Tên thông thường:"
 
@@ -2056,15 +2070,15 @@
 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"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "So sánh thời gia&n chỉnh sửa"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
-msgstr "&So sánh kích thước tệp tin"
+msgstr "&So sánh kích thước tập tin"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "Ngưỡng so sánh (&tính bằng phút):"
 
@@ -2072,60 +2086,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "Ngưỡng so sánh phải ở giữa 0 và 1440 phút."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
-msgstr "Dịch cho:"
+msgstr "Biên dịch cho:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
-msgstr "Dịch trên:"
+msgstr "Biên dịch trên:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
-msgstr "Dịch với:"
+msgstr "Biên dịch với:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
-msgstr "Dịch với các cờ:"
+msgstr "Biên dịch với các cờ:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "Đã nén"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "Sự truyền hiện tại"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "Điều kiện dễ tr&ong tình trạng hỏng"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "Kiểm tra cấu hình"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "Cấu hình chế độ thụ động"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "Cấu hình vùng cổng"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "Cấu hình FileZilla và mạng của bạn"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "Xác nhận việc xóa"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "Xác nhận cần thiết"
 
@@ -2133,7 +2147,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "Xin chúc mừng, việc cấu hình của bạn có vẻ hoạt động tốt."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:144
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "Kết nối thông qua cài đặt chủ ủy thác"
 
@@ -2141,34 +2155,34 @@
 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:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "Đã kết nối"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "Đang kết nối"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "Đang kết nối tới %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "Đang kết nối tới %s thông qua máy chủ proxy"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "Đang kết nối tới %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "Đang kết nối tới máy chủ dịch vụ"
 
@@ -2176,17 +2190,17 @@
 msgid "Connection"
 msgstr "Sự kết nối"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "Cố gắng kết nối gặp lỗi"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, 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:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "Cố gắng kết nối với \"%s\" gặp lỗi."
@@ -2200,12 +2214,12 @@
 msgid "Connection closed"
 msgstr "Kết nối đã đóng"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "Kết nối đã đóng bởi máy chủ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "Kết nối đã thiết lập, đang khởi tạo TLS..."
@@ -2214,7 +2228,7 @@
 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:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 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ủ..."
 
@@ -2230,15 +2244,15 @@
 msgid "Connection refused"
 msgstr "Kết nối đã bị từ chối"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "Kết nối bị lỗi quá thời gian"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "Kết nối bị lỗi quá thời gian."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "mất kết nối tới máy chủ dịch vụ."
 
@@ -2257,29 +2271,25 @@
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:273
 msgid "Convert keyfile"
-msgstr "Đổi khóa tệp tin"
-
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "&Sao chép"
+msgstr "Đổi khóa tập tin"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "Sao chép (%d) của %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "Sao chép của %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 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:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "Không thể chấp nhận kết nối: %s"
@@ -2289,16 +2299,20 @@
 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:842
+msgid "Could not complete operation"
+msgstr "Không thể hoàn tất thao tác"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "Không thể kết nối tới máy chủ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, 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:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 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"
 
@@ -2307,17 +2321,17 @@
 msgid "Could not convert private key"
 msgstr "Không thể chuyển đổi từ khóa riêng"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "Không thể sao chép URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "Không thể sao chép dữ liệu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2325,44 +2339,44 @@
 msgstr ""
 "Không thể xác định rõ đích khi thi hành lệnh &kéo thả.\n"
 "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."
+"tập tin vào trong cửa sổ chương trình Explorer."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 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:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"không tìm thấy tệp tin tài nguyên cho FileZilla, đang đóng FileZilla.\n"
+"không tìm thấy tập tin tài nguyên cho FileZilla, đang đóng FileZilla.\n"
 "Bạn có thể đặt thư mục chứa dữ liệu cho FileZilla sử dụng dòng lệnh tùy chọn "
 "'--datadir <custompath>' hay bằng cách đặt biến môi trường FZ_DATADIR."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 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:1011
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 msgid ""
 "Could not get distinguished name of certificate issuer, "
 "gnutls_x509_get_issuer_dn failed"
 msgstr ""
 "Không thể lấy tên được ghi trong giấy phép đã xuất ra, "
-"gnutls_x509_get_issuer_dn failed"
+"gnutls_x509_get_issuer_dn gặp lỗi"
 
-#: ../../locales/../src/engine/tlssocket.cpp:986
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr ""
-"Không thể lấy tên được ghi trong nội dung giấy phép, gnutls_x509_get_dn "
-"failed"
+"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:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "Không thể lấy đường dẫn đầy đủ."
 
@@ -2371,16 +2385,16 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "Không thể nhận trả lời từ fzputtygen."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 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."
+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:939
+#: ../../locales/../src/engine/tlssocket.cpp:947
 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:932
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2396,18 +2410,18 @@
 "accessed.\n"
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
-"Không thể tải \"%s\", xin chắc chắn rằng tệp tin hợp lệ và có thể truy cập.\n"
+"Không thể tải \"%s\", xin chắc chắn rằng tập tin hợp lệ và có thể truy cập.\n"
 "Bất kỳ thay đổi nào trong Danh bạ sẽ không được lưu lại."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
-msgstr "Không thể tải khóa tệp tin"
+msgstr "Không thể tải khóa tập tin"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:300
 msgid "Could not load private key"
-msgstr "Không thể tải khóa riêng tệp tin"
+msgstr "Không thể tải khóa riêng tập tin"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2417,7 +2431,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:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2425,7 +2439,7 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 "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."
+"Chức năng duyệt đồng bộ đã bị tắt."
 
 #: ../../locales/../src/interface/state.cpp:295
 #, c-format
@@ -2435,11 +2449,11 @@
 "Synchronized browsing has been disabled."
 msgstr ""
 "Không có thư mục máy chủ tương đương với thư mục nội bộ '%s'.\n"
-"Bạn có muốn ắt chúc năng duyệt đồng bộ và tiếp tục chuyển sang thư mục khác?"
+"Chức năng duyệt đồng bộ đã bị tắt."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "Không mở được clipboard"
 
@@ -2454,11 +2468,11 @@
 msgid "Could not parse remote path."
 msgstr "Không thể phân tích cú pháp đường dẫn máy chủ."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "Không rõ cú pháp địa chỉ máy chủ:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "Không thể đọc gói mạng: %s"
@@ -2467,30 +2481,30 @@
 msgid "Could not read server item."
 msgstr "Không đọc mục tin máy chủ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, 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"
+msgstr "Không thể tìm được vị trí %s trong tập tin"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
-msgstr "Không thể chuyển đến cuối tệp tin"
+msgstr "Không thể chuyển đến cuối tập tin"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:139
 msgid "Could not send command to fzputtygen."
 msgstr "Không thể gửi lệnh tới fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "Không thể tạo dòng vào ra (IO)"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, 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ủ proxy: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "Không thể bắt đầu truyền"
 
@@ -2513,7 +2527,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:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2522,14 +2536,14 @@
 "Không thể ghi vào \"%s\", hàng đợi không thể ghi lại.\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "Không thể ghi \"%s\", các địa chỉ đã chọn không thể xuất ra: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "Không thể ghi \"%s\": %s"
@@ -2537,11 +2551,11 @@
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:325
 #, c-format
 msgid "Could not write keyfile: %s"
-msgstr "Không thể ghi khóa tệp tin: %s"
+msgstr "Không thể ghi khóa tập tin: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
-msgstr "Không thể ghi vào tệp tin nội bộ"
+msgstr "Không thể ghi vào tập tin nội bộ"
 
 #: ../../locales/../src/engine/logging.cpp:315
 #: ../../locales/../src/engine/logging.cpp:386
@@ -2549,39 +2563,51 @@
 msgid "Could not write to log file: %s"
 msgstr "Không thể ghi vào tệp nhật trình: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, 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:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "Quốc gia:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr ""
 "FileZilla bị ngừng ngay. Chỉ có thể sử dụng trình gỡ lỗi để làm sáng tỏ "
 "nguyên nhân"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "&Tạo tập tin mới"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "Tạo thư mục mới cho thư mục hiện hành"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "Tạo tập tin mới, trống rỗng trong thư mục hiện hành"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "Tạo thư mục mới"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "Tạo tập tin trống rỗng"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "Đang tạo thư mục mới"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "Đang tạo thư mục '%s'..."
@@ -2592,14 +2618,14 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:137
 msgid "Critical file transfer error"
-msgstr "Lỗi đạt tới tới hạn tệp tin"
+msgstr "Lỗi đạt tới tới hạn tập tin"
 
 #: ../../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"
+msgstr "Lỗi tới hạn tập tin sau khi truyền đi %s trong %s"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2620,69 +2646,73 @@
 msgid "Current transfer type is set to binary."
 msgstr "Kiểu truyền hiện tại được đặt là nhị phân."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "T&ùy chọn của bạn"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "Đặt bộ lọc của bạn"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "Máy chủ tùy chỉnh"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "Kiể&u dữ liệu"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "Tiền tố thập phân sử dụng ký hiệu SI (ví dụ 1 KB = 1000 byt&es)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "Mặ&c định"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "&Xóa"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "Tắt tất &cả"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "&Không lưu mật khẩu"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "Hành động khi kích đúp chuột trên thư &mục:"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "&Nhân bản"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "Tương tự DOS với kiểu đường dẫn ảo"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
-msgstr "Kiểu tệp tin nguy hiểm"
+msgstr "Kiểu tập tin nguy hiểm"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
 msgid "Data"
 msgstr "Dữ liệu"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Gói tin truyền đi bị đóng quá sớm."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "Ngày tháng"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "Định dạng ngày tháng"
 
@@ -2701,11 +2731,11 @@
 msgid "Debug"
 msgstr "Gỡ lỗi"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "Cài đặt gỡ lỗi"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "Thư mục mặc định trên máy nội &bộ:"
 
@@ -2713,19 +2743,19 @@
 msgid "Default (Autodetect)"
 msgstr "Mặc định (Tự dò tìm)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "Trình biên dịch mặc định không trích dẫn đúng đắn."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
-msgstr "Hành động mặc định với tệp tin đã tồn tại"
+msgstr "Hành động mặc định với tập tin đã có sẵn"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "Thư mục mặc định trên máy &mạng:"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2737,15 +2767,15 @@
 msgid "Default system language"
 msgstr "Ngôn ngữ hệ thống mặc định"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "Chế độ truyền mặc định:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "Kiểu truyền mặc định:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "Mặc định: http://ip.filezilla-project.org/ip.php"
 
@@ -2767,79 +2797,80 @@
 msgstr[1] ""
 "Làm trễ kết nối %d giây bởi vì cố gắng kết nối lần trước thất bại..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "&Xóa đề mục trong Danh bạ"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "Xóa thư mục đã chọn"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
-msgstr "Xóa thư mục và tệp tin đã chọn"
+msgstr "Xóa thư mục và tập tin đã chọn"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "Đang xóa các thư mục"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 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ợ"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "Xóa liên kết tượng trưng"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "Thư mục Desktop"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "Chi tiết"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "Chi tiết khóa mới:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "Các &thư mục"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
-msgstr "Hướng truyền"
+msgstr "Hướng"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "Thư mục"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2338
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
-msgstr "Sự so sánh thư mục"
+msgstr "So sánh thư mục"
 
 #: ../../locales/../src/interface/listingcomparison.cpp:74
 #: ../../locales/../src/interface/listingcomparison.cpp:82
 #: ../../locales/../src/interface/listingcomparison.cpp:88
 msgid "Directory comparison failed"
-msgstr "Sự so sánh thư mục bị lỗi"
+msgstr "Việc so sánh thư mục gặp lỗi"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:71
 msgid "Directory containing the logfile does not exist or filename is invalid."
-msgstr "Thư mục chưa tệp nhật trình không tồn tại hoặc tên tệp không hợp lệ."
+msgstr ""
+"Thư mục chưa tệp nhật trình không sẵn có hoặc tên tập tin không hợp lệ."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:192
 msgid "Directory listing aborted by user"
-msgstr "Danh sách thư mục được bãi bỏ bởi người dùng"
+msgstr "Liệt kê thư mục được bãi bỏ bởi người dùng"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
-msgstr "Danh sách thư mục sai"
+msgstr "Liệt kê thư mục gặp lỗi"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "Bộ lọc danh sách thư mục"
 
@@ -2847,66 +2878,65 @@
 msgid "Directory listing successful"
 msgstr "Lấy danh sách thư mục thành công"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "&Tắt tất cả"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 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:671
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr ""
 "Tắt tùy chọn này nếu bạn không thể nhìn thấy nội dung thư mục chính xác."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "Ngắt kết nối khỏi máy chủ"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "Đã ngắt kết nối khỏi máy chủ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "Ngắt kết nối từ máy chủ: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "Đã ngắt kết nối từ máy chủ dịch vụ trước đó"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "Đã ngắt kết nối từ máy chủ dịch vụ hiện hành"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
-msgstr "Hiển thị hộp thoại thông tin thêm"
+msgstr "Hiển thị hộp thoại giới thiệu về ứng dụng"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "&Không sử dụng trình soạn thảo mặc định"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "Khô&ng làm gì cả"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2915,8 +2945,8 @@
 "Trừ khi bạn muốn kiểm tra các đặc tính mới nếu không hãy sử dụng phiên bản "
 "ổn định."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
-#: ../../locales/../src/interface/Mainfrm.cpp:1165
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "Bạn có thật sự muốn thoát khỏi FileZilla không?"
 
@@ -2931,7 +2961,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "Bạn có thật sự muốn xóa tất cả các đề mục của Danh bạ không?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "Bạn có thật sự muốn xóa tất cả các đề mục đã chọn không?"
 
@@ -2939,32 +2969,32 @@
 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:595
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, 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' tới máy chủ không?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "Tài liệu"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "Không sử dụng địa chỉ IP mạng cho kết nối nội &bộ."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
-msgstr "Dotfiles là tên tệp tin bắt đầu bằng dấu chấm, ví dụ .htaccess"
+msgstr "Dotfiles là tên tập tin bắt đầu bằng dấu chấm, ví dụ .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "Hành động khi kích đúp chuột"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "Tải về"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "&Giới hạn tải xuống:"
 
@@ -2977,41 +3007,50 @@
 msgid "Download limit: none"
 msgstr "Giới hạn tải xuống: không"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "Tải về kết quả tìm kiếm"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "Tải về thư mục đã chọn"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
-msgstr "Tải về các tệp tin và thư mục đã chọn"
+msgstr "Tải về các tập tin và thư mục đã chọn"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"Tốc độ tải xuống: %s/s\n"
+"Tốc độ tải lên: %s/s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "Đang tải về"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "Đang tải về %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 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:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "Đang tải về kết quả tìm kiếm"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
@@ -3019,58 +3058,62 @@
 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/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr ""
 "&Kéo thả giữa các cửa sổ máy chủ hiện tại chưa thể thực hiện được được."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "Nhân &bản"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "&Bật tất cả"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "Mở thư &mục"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "Th&i hành"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "Thoát r&a"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "Thư điện tử:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "Mỗi bộ lọc cần ít nhất một điều kiện."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "Biên tệp bộ lọc"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
-msgstr "Biên tập tệp tin với bộ biên tập cấu hình và tải thay đổi lên máy chủ."
+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/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
-msgstr "Việc biên tập gặp lỗi"
+msgstr "Việc sửa gặp lỗi"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "Thư điện tử:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "Lệnh rỗng"
 
@@ -3078,7 +3121,7 @@
 msgid "Empty command."
 msgstr "Lệnh rỗng."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "Danh sách thư mục rỗng"
 
@@ -3088,103 +3131,115 @@
 
 #: ../../locales/../src/interface/settings/optionspage_edit_associations.cpp:53
 msgid "Empty file extension."
-msgstr "Tệp tin không có đuôi mở rộng."
+msgstr "Tập tin không có đuôi mở rộng."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "Tên bộ lọc rỗng là không được phép."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "Chưa có tên"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "Mẩu tin trích dẫn rỗng."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "&Bật tất cả"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "Cho phép &lọc ký tự không hợp lệ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "Đã mã hóa"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "Sự mã hóa"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "Thông tin chi tiết mã hóa"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "Kết thúc so sánh và thay đổi thứ tự sắp xếp?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "Nhập vào &lệnh của bạn..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "Nhập 0 để không giới hạn tốc độ"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "Nhập lệnh vào"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "Nhập vào lệnh của bạn"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "Mở thư mục"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "Nhập tên bộ lọc"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "Nhập tên bộ lọc muốn đặt"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "Nhập tên mới bộ lọc muốn đặt"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "Nhập mật khẩu"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "Vào thư mục đã chọn"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "Nhập địa chỉ của máy chủ.\n"
 "Ghi rõ giao thức máy chủ, phần đầu tên máy chủ định nghĩa giao thức. Nếu "
 "không ghi rõ, giao thức mặc định(ftp://) sẽ được sử dụng.\n"
 "Bạn cũng có thể nhập định dạng đầy đủ URLs theo dạng: //user:pass@host:port "
-"tại đây giá trị trong các trường khác sẽ bị viết đè lên sau đó."
+"tại đây giá trị trong các trường khác sẽ bị viết đè lên sau đó.\n"
+"\n"
+"Các giao thức được hỗ trợ là:\n"
+"- ftp:// cho giao thức FTP thông thường,\n"
+"- sftp:// cho giao thức truyền tập tin thông qua SSH,\n"
+"- ftps:// cho giao thức FTP thông qua SSL (ẩn) và\n"
+"- ftpes://cho giao thức FTP thông qua SSL (rõ ràng)."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3192,10 +3247,10 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
-"Nhập vào mật khẩu cho tệp tin '%s'.\n"
-"Xin chú ý là tệp tin chuyển đổi sẽ không được bảo vệ bằng mật khẩu."
+"Nhập vào mật khẩu cho tập tin '%s'.\n"
+"Xin chú ý là tập tin chuyển đổi sẽ không được bảo vệ bằng mật khẩu."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3217,7 +3272,7 @@
 msgid "Error importing"
 msgstr "Lỗi nhập vào"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "Lỗi khi tải hàng đợi"
 
@@ -3226,27 +3281,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:731
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:786
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
-msgstr "Lỗi tải tệp tin xml"
+msgstr "Lỗi tải tập tin xml"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "Lỗi ghi lại hàng đợi"
 
@@ -3257,74 +3312,82 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
-msgstr "Lỗi ghi tệp tin xml"
+msgstr "Lỗi ghi tập tin xml"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
-msgstr "Lỗi, tệp tin không thể phân tích."
+msgstr "Lỗi, tập tin không thể phân tích."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
-msgstr "Lỗi, tệp tin trên máy có tồn tại nhưng không thể xóa."
+msgstr "Lỗi, tập tin trên máy có sẵn nhưng không thể xóa"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "Lỗi:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "Thiết lập kết nối trong một tab mới"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "Mỗi tháng một lần"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "Hai tuần một lần"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "Ví dụ: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "Ví dụ"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "Thực th&i"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "Có thể thực thi"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr ""
 "Chương trình thực thi không chứa thông tin về phiên bản, không thể kiểm tra "
 "để cập nhật."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
-msgstr "Chương trình duyệt tệp tin Explorer"
+msgstr "Chương trình duyệt tập tin Explorer"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "Xuất ra &hàng đợi"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "Xuất thôn&g tin cài đặt"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "Xuất cài đặt ra"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "Tên bộ &lọc:"
 
@@ -3334,35 +3397,35 @@
 
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
-msgstr "FTP - Giao Thức Truyền Tệp Tin"
+msgstr "FTP - Giao Thức Truyền Tập tin"
 
 #: ../../locales/../src/engine/server.cpp:15
 msgid "FTP - File Transfer Protocol with optional encryption"
-msgstr "FTP - Giao Thức Truyền Tệp Tin có mã hóa"
+msgstr "FTP - Giao Thức Truyền Tập tin có mã hóa"
 
 #: ../../locales/../src/engine/server.cpp:21
 msgid "FTP - Insecure File Transfer Protocol"
-msgstr "FTP - Giao Thức Truyền Tệp Tin Không An Toàn"
+msgstr "FTP - Giao Thức Truyền Tập tin Không An Toàn"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "Bộ máy FTP không thể khởi tạo, không thể kết nối"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "Duy trì FTP"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "Máy chủ FTP ủy thác"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "Địa chỉ URL của FTP"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3378,100 +3441,100 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "Giao thức FTPES - FTP ngầm thông qua TLS/SSL"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "Đổi thư mục gặp lỗi"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "Đổi ngôn ngữ gặp lỗi"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "Kiểm tra phiên bản mới của FileZilla gặp lỗi."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "Sao chép hay di chuyển địa chỉ gặp lỗi"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:524
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 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"
+msgstr "Tạo bản sao lưu dự phòng tập tin xml gặp lỗi"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
-msgstr "Tạo gói mạng lắng nghe gặp lỗi, đang bỏ qua"
+msgstr "Gặp lỗi khi tạo socket để lắng nghe, đang bỏ qua"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "Tạo gói mạng để nghe cho chế độ truyền tích cực gặp lỗi"
+msgstr "Tạo socket để nghe cho chế độ truyền tích cực gặp lỗi"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "Tải bản mới của FileZilla gặp lỗi."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 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:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "Lỗi lấy đường dẫn desktop"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 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:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "Lỗi lấy địa chỉ của kết nối dữ liệu, kết nối đã đóng lại."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "Khởi tạo bộ máy FTP gặp lỗi."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "Khởi tạo TLS gặp lỗi."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 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ệ?"
+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/settings/optionspage_connection_sftp.cpp:299
 #, c-format
 msgid "Failed to load private key: %s"
 msgstr "Lỗi tải khóa riêng: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, 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:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
-msgstr "Mở \"%s\" để đọc tệp tin gặp lỗi"
+msgstr "Mở \"%s\" để đọc tập tin gặp lỗi"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
-msgstr "Mở \"%s\" để ghi tệp tin gặp lỗi"
+msgstr "Mở \"%s\" để ghi tập tin gặp lỗi"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "Phân tích đường dẫn trả về gặp lỗi."
 
@@ -3479,7 +3542,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "Phân tích xác thực giấy phép gốc gặp lỗi."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "Nhận dữ liệu dữ liệu gặp lỗi"
 
@@ -3491,11 +3554,11 @@
 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:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "Phục hồi địa chỉ IP gặp lỗi, sử dụng địa chỉ nội bộ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "Phục hồi địa chỉ IP nội bộ gặp lỗi."
 
@@ -3511,34 +3574,34 @@
 msgid "Failed to send command."
 msgstr "Gửi lệnh đi gặp lỗi."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "Lỗi lấy ngôn ngữ %s(%s), sử dụng ngôn ngữ hệ thống mặc định"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, c-format
 msgid ""
 "Failed to set language to %s (%s), using default system language (%s, %s)."
 msgstr "Lỗi lấy ngôn ngữ %s(%s), sử dụng ngôn ngữ hệ thống (%s, %s) mặc định."
 
-#: ../../locales/../src/interface/FileZilla.cpp:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "Lỗi lấy ngôn ngữ %s(%s), sử dụng ngôn ngữ hệ thống mặc định."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "Lỗi lấy ngôn ngữ %s, sử dụng ngôn ngữ hệ thống mặc định"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr "Lỗi lấy ngôn ngữ %s, sử dụng ngôn ngữ hệ thống (%s, %s) mặc định."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "Lỗi lấy ngôn ngữ %s, sử dụng ngôn ngữ hệ thống mặc định."
@@ -3547,79 +3610,77 @@
 msgid "Failed to validate settings"
 msgstr "Cài đặt xác nhận tính hợp lệ bị lỗi"
 
-#: ../../locales/../src/engine/tlssocket.cpp:874
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "Xác nhận dữ liệu giấy phép gặp lỗi"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:566
 #, c-format
 msgid "Failed to write to file %s"
-msgstr "Ghi tệp tin %s gặp lỗi"
+msgstr "Ghi tập tin %s gặp lỗi"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:542
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
-msgstr "Ghi tệp tin xml gặp lỗi"
+msgstr "Ghi tập tin xml gặp lỗi"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
 msgstr "Các lần truyền gặp lỗi"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "Lỗi trở về chế độ tích cực"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
-msgstr "&Tệp tin:"
+msgstr "&Tập tin:"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
-msgstr "&Tệp tin"
+msgstr "&Tập tin"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
-msgstr "Tệp tin"
+msgstr "Tập tin"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:124
 msgid "File Types"
-msgstr "Kiểu tệp tin"
+msgstr "Kiểu tập tin"
 
 #: ../../locales/../src/interface/import.cpp:108
 msgid "File does not contain any importable data."
-msgstr "Tệp tin không chứa bất kỳ một dữ liệu có thể nhập vào."
+msgstr "Tập tin không chứa bất kỳ một dữ liệu có thể nhập vào."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
-msgstr "Tệp tin đang biên tập"
+msgstr "Tập tin đang biên tập"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
-msgstr "Tệp tin đã tồn tại"
+msgstr "Tập tin đã có sẵn"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:125
 msgid "File exists action"
-msgstr "Hành động với tệp tin đã tồn tại"
+msgstr "Hành động với tập tin đã có sẵn"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
-msgstr "Tệp tin đã thay đổi"
+msgstr "Tập tin đã thay đổi"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:130
 msgid "File lists"
-msgstr "Danh sách các tệp tin"
+msgstr "Danh sách các tập tin"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
-msgstr "Tệp tin không tìm thấy"
+msgstr "Tập tin không tìm thấy"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
-msgstr "Tìm kiếm tệp tin"
+msgstr "Tìm kiếm tập tin"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:128
 msgid "File transfer aborted by user"
@@ -3629,16 +3690,16 @@
 #, 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 sử dụng sau khi truyền %s trong %s"
+"Tập tin truyền đi bị bãi bỏ bởi người sử dụng sau khi truyền %s trong %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
-msgstr "Tệp tin được truyền đi không thành công"
+msgstr "Tập tin được truyền đi không thành công"
 
 #: ../../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"
+msgstr "Tập tin truyền đi gặp lỗi sau khi truyền %s trong %s"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:134
 msgid "File transfer skipped"
@@ -3646,178 +3707,177 @@
 
 #: ../../locales/../src/engine/ControlSocket.cpp:132
 msgid "File transfer successful"
-msgstr "Tệp tin được truyền đi thành công"
+msgstr "Tập tin được truyền đi thành công"
 
 #: ../../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"
+msgstr "Tập tin được truyền đi thành công, đã truyền %s trong %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
-msgstr "Tệp tin truyền đi vẫn đang trong tiến trình."
+msgstr "Tập tin truyền đi vẫn đang trong tiến trình."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
-msgstr "Tệp tin được truyền với dạng dữ liệu kiểu ASCII."
+msgstr "Tập tin được truyền với dạng dữ liệu kiểu ASCII."
 
-#: resources.h:388
+#: resources.h:398
 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."
+msgstr "Tập tin được truyền với dạng dữ liệu kiểu nhị phân."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "Lỗi của FileZilla"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 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."
 
-#: resources.h:477
+#: resources.h:487
 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/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla được chạy trong kiểu ki ốt.\n"
-"Kiểu đăng nhập 'Thông thường' và ' Tài khoản' không dùng được trong chế độ "
-"này."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 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."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "Cập nhật FileZilla"
+
+#: resources.h:534
 msgid "Filelist status &bars"
-msgstr "Danh sách tệp tin trên t&hanh trạng thái"
+msgstr "Danh sách tập tin trên t&hanh trạng thái"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
-msgstr "Tên tệp tin"
+msgstr "Tên tập tin"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "Tên tệ&p tin của bộ lọc..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, 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"
+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:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
-msgstr "Tên tệp tin không hợp lệ"
+msgstr "Tên tập tin không hợp lệ"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "Tên tập tin không thể chứa các ký tự sau đây: / \\ : * ? \" < > |"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
-msgstr "Tên tệp tin không thể thay đổi"
+msgstr "Tên tập tin không thể thay đổi"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
-msgstr "Tên tệp tin:"
+msgstr "Tên tập tin:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
-msgstr "Tên tệp tin không thể chứa các ký tự sau đây: / * ? < > |"
+msgstr "Tên tập tin không thể chứa các ký tự sau đây: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
-msgstr "Tên tệp tin không thể chứa các ký tự sau đây: / \\ : * ? \" < > |"
+msgstr "Tên tập tin không thể chứa các ký tự sau đây: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
-msgstr "Tệp tin hiện hành đang bị biên tập"
+msgstr "Tập tin hiện hành đang bị biên tập"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
-msgstr "Kích thước tệp tin"
+msgstr "Kích thước tập tin"
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:129
 msgid "Filesize format"
-msgstr "Định dạng kích thước tệp tin"
+msgstr "Định dạng kích thước tập tin"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
-msgstr "Kiểu tệp tin"
+msgstr "Kiểu tập tin"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr "Thành phần của tệp tin"
+msgstr "Thành phần của tập tin"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "Ứng dụng bộ lọc này cho:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
-msgstr "Ký tự lọc không hợp lệ trong tệp tin."
+msgstr "Ký tự lọc không hợp lệ trong tập tin."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
-msgstr "Tên bộ lọc đã tồn tại rồi"
+msgstr "Tên bộ lọc đã có rồi"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "Cái lọc ra tương ứng với tất cả những cái như sau đây"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "Cái lọc ra tương ứng với những cái như sau đây"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "Cái thứ lọc ra không tương ứng với những cái như sau đây"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "Bộ lọc này đã được đặt rồi"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
-msgstr "Bộ lọc các danh sách tệp tin"
+msgstr "Bộ lọc các danh sách tập tin"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "Bộ lọc không hợp lệ"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "Dấu tay (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "Dấu tay (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "Dấu tay:"
 
@@ -3825,7 +3885,7 @@
 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"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
@@ -3833,11 +3893,11 @@
 "Xem thông tin chi tiết về tác động của các tùy chọn, xin hãy sử dụng chương "
 "trình cấu hình mạng trực quan."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "Để chắc chắn hơn bạn có thể ghi rõ một vùng ít nhất là 10 cổng."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
@@ -3845,33 +3905,33 @@
 "Với phiên làm việc này các cài đặt mặc định sẽ được sử dụng. Bất kỳ thay đổi "
 "nào tới các cài đặt sẽ không được ghi lại."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "Phải dùng bộ mã &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
-msgstr "&Phải hiển thị tệp tin ẩn"
+msgstr "&Phải hiển thị tập tin ẩn"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
-msgstr "Phải hiển thị các tệp tin ẩn"
+msgstr "Phải hiển thị các tập tin ẩn"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
 msgstr "Định dạng đặc biệt:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr ""
 "Định dạng: Phần mở rộng đi theo bởi lệnh và các đối số trong dấu ngoặc kép "
 "một cách đúng đắn."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "Tài liệu hơn nữa"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "Tổng quát"
 
@@ -3879,21 +3939,21 @@
 msgid "General SOCKS server failure"
 msgstr "GÓI MẠNG máy chủ chung gặp lỗi"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "Máy chủ ủy thác proxy chung"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "Lấy địa chỉ IP từ URL sau đây:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "Tìm trợ giúp"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 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 "
@@ -3903,15 +3963,15 @@
 msgid "Global bookmarks"
 msgstr "Toàn cục"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GNUTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "Quyền của nhóm"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "C&ao"
 
@@ -3919,21 +3979,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - HTTP thông qua TLS"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Dữ liệu hỏng:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "Ẩn"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "Cao"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "Cao nhất"
 
@@ -3941,25 +4001,25 @@
 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."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr ""
 "Giữ phím shift để giữ trạng thái bộ lọc trên đồng thời cả hai khía cạnh."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "Trang chủ:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "Dấu Khóa nóng:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "Khóa nóng không khớp"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 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."
 
@@ -3967,20 +4027,20 @@
 msgid "Host unreachable"
 msgstr "Máy chủ không thể tới được"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "Máy chủ:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "Giờ,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (ví dụ: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -3990,13 +4050,13 @@
 "thời gian được định sẵn, kết nối sẽ bị đóng lại và FileZilla sẽ thử kết nối "
 "lại."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr ""
 "Nếu báo cáo các lỗi, xin hãy cung cấp nhật ký thông tin ở mức đầy đủ "
 "\"Verbose\"."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -4004,11 +4064,11 @@
 "basis in the Site Manager."
 msgstr ""
 "Nếu việc kiểm tra tự động tại cuối chương trình thuật sĩ thành công, nhưng "
-"bạn không thể truyền tệp tin tới máy chủ cụ thể, thì máy chủ có thể đã bị "
+"bạn không thể truyền tập tin tới máy chủ cụ thể, thì máy chủ có thể đã bị "
 "cấu hình sai hoặc bạn có thể thử ở chế độ tích cực. Bạn có thể đặt chế độ "
 "truyền trên nền tảng bằng-máy-chủ trong Danh bạ."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
@@ -4016,7 +4076,7 @@
 "Nếu tùy chọn dự trữ được đặt, bạn sẽ có thể kết nối đến máy chủ cấu hình "
 "sai, cái mà đã từ chối chế độ truyền đã chọn."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -4040,7 +4100,7 @@
 "Nếu vẫn đề này vẫn tiếp tục, một vài bộ định tuyến router (và)hay tường lửa "
 "firewall ngắt kết nối."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -4049,7 +4109,7 @@
 "Nếu tệp nhật trình đạt giới hạn kích thước, \".1\" sẽ được thêm vào cuối tên "
 "têp (có thể ghi đè lên những nhật trình cũ hơn) và một tệp mới được tạo."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -4068,10 +4128,10 @@
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr ""
-"Nếu vấn đề này vẫn tồn tại, xin hãy hỏi nhà sản xuất bộ định tuyến router "
-"của bạn."
+"Nếu vấn đề này vẫn tiếp tục xảy ra, xin hãy hỏi nhà sản xuất bộ định tuyến "
+"router của bạn."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -4081,19 +4141,19 @@
 "đượ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ạ."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
-"Nếu bạn sử dụng dấu thời gian cho sự so sánh cơ bản, việc tính toán hai tệp "
+"Nếu bạn sử dụng dấu thời gian cho sự so sánh cơ bản, việc tính toán hai tập "
 "tin bằng nhau nếu dấu thời gian sai lệch của chúng không vượt quá ngưỡng này."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "Nếu bạn thay đổi ngôn ngữ, bạn phải khởi động lại FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -4101,28 +4161,28 @@
 "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:1164
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 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."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr ""
-"Nếu bạn nhập vào kiểu tệp tin sai, những tệp tin đó có thể bị hỏng khi "
+"Nếu bạn nhập vào kiểu tập tin sai, những tập tin đó có thể bị hỏng khi "
 "truyền đi."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
-msgstr "Nếu bạn gặp bất kỳ lỗi nào,tệp tin cấu hình của bạn đã không đúng."
+msgstr "Nếu bạn gặp bất kỳ lỗi nào,tập tin cấu hình của bạn đã không đúng."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
 msgstr ""
-"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ử "
+"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:569
@@ -4131,12 +4191,12 @@
 "remote router or firewall might be misconfigured. In this case try to toggle "
 "passive mode and contact the server administrator for help."
 msgstr ""
-"Nếu vấn đề vẫn tồn tại với một máy chủ riêng biệt, chính máy chủ đó hoặc bộ "
+"Nếu vấn đề vẫn xảy ra với một máy chủ đặc biệt, chính máy chủ đó hoặc bộ "
 "định tuyến router hay tường lửa firewall có lẽ bị cấu hình sai. Trong trường "
 "hợp này hãy thử thay đổi chế độ thụ động và liên hệ với người quản trị máy "
 "chủ để được giúp đỡ."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
@@ -4145,7 +4205,7 @@
 "cũng thành công, tất cả tường lửa firewall hay bộ định tuyến router bạn có "
 "có thể đã được cấu hình đúng đắn."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
@@ -4153,7 +4213,7 @@
 "Nếu bạn sử dụng tường lửa firewall, hãy chắc chắn rằng FileZilla được phép "
 "kết nối trên tất cả các cổng đã được nhận."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4172,7 +4232,7 @@
 msgid "Import data from older version"
 msgstr "Nhập dữ liệu từ phiên bản cũ"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "Nhập các cài đặt"
 
@@ -4186,7 +4246,7 @@
 msgid "Improperly quoted association."
 msgstr "Sự kết hợp dấu nháy kép không chính xác."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4194,7 +4254,7 @@
 "Trong chế độ tích cực, FileZilla nghe từ một cổng cho dữ liệu truyền đi. Bạn "
 "phải chỉ định rõ cổng nào FileZilla sẽ sử dụng."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4203,7 +4263,7 @@
 "có hiệu lực, có vẻ như FileZilla không có tác dụng với các cổng mà hệ thống "
 "của bạn đã chọn."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
@@ -4211,7 +4271,7 @@
 "Trong trường hợp bạn thích tự động cập nhật phiên bản mới, bạn hãy bật tự "
 "động kiểm tra phiên bản mới trong hộp thoại cài đặt."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
@@ -4219,7 +4279,7 @@
 "Trong thứ tự sử dụng chế độ tích cực, FileZilla cần phải biết địa chỉ IP "
 "trên Internet của bạn."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4229,7 +4289,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:888
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4237,20 +4297,20 @@
 "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/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "Mật khẩu sai"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "Đang khởi tạo TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 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:856
-#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "Tính tương tác"
@@ -4260,8 +4320,8 @@
 msgstr "Giao diện"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "Bị ngắt bởi người sử dụng"
 
@@ -4273,8 +4333,8 @@
 msgid "Invalid HTTP Response"
 msgstr "HTTP trả lời không hợp lệ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4297,12 +4357,13 @@
 msgid "Invalid date"
 msgstr "Ngày tháng không hợp lệ"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "Tên không hợp lệ"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr ""
 "Máy chủ không hợp lệ, sau khi đóng dấu ngoặc đơn chỉ có một dấu hai chấm và "
@@ -4312,28 +4373,35 @@
 msgid "Invalid input"
 msgstr "Nguồn vào không hợp lệ"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "Giá trị cổng sai. Cổng phải có giá trị từ 1 đến 65535."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:124
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
-"Đặt giao thức sai. Giao thức đúng là:\n"
+"Giao thức đã cho không hợp lệ. Giao thức đúng là:\n"
 "ftp:// cho giao thức FTP thông thường,\n"
-"sftp:// cho kiểu giao thức truyền tệp tin SSH,\n"
+"sftp:// cho giao thức truyền tập tin thông qua SSH,\n"
 "ftps:// cho giao thức FTP thông qua SSL (ẩn) và\n"
 "ftpes://cho giao thức FTP thông qua SSL (rõ ràng)."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+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:699
 msgid "Invalid regular expression in search conditions."
 msgstr "Điều kiện không hợp lệ."
 
@@ -4341,7 +4409,7 @@
 msgid "Invalid response code"
 msgstr "Mã đáp ứng sai"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "Điều kiện tìm kiếm không hợp lệ: %s"
@@ -4353,38 +4421,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "Đường dẫn địa chỉ không hợp lệ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "Kích thước không hợp lệ trong điều kiện"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "Tên người dùng đã cho không hợp lệ."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "Khu vực của quốc gia:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "Khu vực của vùng:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "Khu vực của bang hay tỉnh:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "Giữ thư mục ở trên cao nhất"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:670
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4395,50 +4463,54 @@
 "hiện một số lần thử để kiểm tra xem máy chủ hỗ trợ đặc tính này hay không, "
 "sự thử có thể thất bại."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "Chuyển đổi khóa"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "Chuyển đổi khóa:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "Thấp &nhất"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "Ngôn ngữ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "Ngôn ngữ đã thay đổi"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "Ngày sửa gần nhất"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "Bố trí"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "Giới hạn tải xuốn&g hiện hành:"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "Giới hạn tải &lên hiện hành:"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "Giới hạn các cổng nội bộ"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
-msgstr "Giới hạn kích thước của tệp nhật trình"
+msgstr "Giới hạn kích thước của tệp nhật ký"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "Giới hạn:"
 
@@ -4446,7 +4518,7 @@
 msgid "Line length exceeded"
 msgstr "Vượt quá độ dài dòng"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "Liên kết ngược"
 
@@ -4455,37 +4527,37 @@
 msgstr "Gói mạng để nghe bị đóng lại"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "Danh sách:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "Cổn&g thấp nhất có thể:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "Máy nội bộ"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
-msgstr "Tệp tin nội bộ"
+msgstr "Tập tin nội bộ"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:328
 msgid "Local file does not exist."
-msgstr "Tệp tin nội bộ không tồn tại."
+msgstr "Tập tin nội bộ không tồn tại."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:323
 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."
+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:369
 msgid "Local file is not a valid filename."
-msgstr "Tệp tin không hợp lệ."
+msgstr "Tập tin không hợp lệ."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "Bộ lọc nội bộ:"
 
@@ -4493,24 +4565,24 @@
 msgid "Local site:"
 msgstr "Địa chỉ máy nội bộ:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "Vị trí:"
 
 #: ../../locales/../src/interface/settings/optionspage_logging.cpp:97
 msgid "Log file"
-msgstr "Tệp tin nhật ký"
+msgstr "Tập tin nhật ký"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "Nhật ký kiểm tra cập nhật phiên bản mới:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "Đăng nhập"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4519,7 +4591,7 @@
 "thể không nhận dạng được bộ mã UTF-8. Không thể quay lại sử dụng bộ ký tự "
 "nội bộ từ khi sử dụng máy chủ ủy thác proxy."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Trying local charset."
@@ -4527,18 +4599,18 @@
 "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ử sử dụng bộ ký tự nội bộ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 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ỏ."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr ""
 "Kiểu đăng nhập không phải là 'hỏi' thì phải là 'tương tác' (không có dấu "
 "nháy)."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
@@ -4547,13 +4619,13 @@
 "Kiểu đăng nhập, có thể chỉ sử dụng cùng với địa chỉ FTP. Tham số phải là '%"
 "s' hay '%s'"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "Thấp"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "Thấp nhất"
 
@@ -4561,14 +4633,14 @@
 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."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "Máy MAC:"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr ""
-"Hãy chắc chắn rằng tệp tin có thể được phép truy cập và hợp chuẩn tài liệu "
+"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:827
@@ -4588,7 +4660,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "Phần trả lời sai lệch, máy chủ không gửi ký tự xuống dòng thích hợp"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4599,52 +4671,52 @@
 msgid "Manual transfer"
 msgstr "Truyền thủ công"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "Tương ứng với tất cả cái như sau"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "Tương ứng với tất cả cái như sau"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "Không tương ứng với tất cả cái như sau"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "Tối đa số truyền đi đồng &thời:"
 
 #: ../../locales/../src/interface/Mainfrm.cpp:378
-#: ../../locales/../src/interface/Mainfrm.cpp:1855
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "Nhật ký thông tin"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "Vị trí của nhật trình thông báo"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "Phút"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "Di chuyển x&uống"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "Di chuyển &lên"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "Thư mục My Computer"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "Thư mục My Documents"
 
@@ -4659,33 +4731,33 @@
 msgid "N/a"
 msgstr "Không định nghĩa"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "Tên"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
-msgstr "Tên đã tồn tại rồi"
+msgstr "Tên đã có rồi"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
-msgstr "Tên dấu trang đã tồn tại."
+msgstr "Tên dấu trang đã sẵn có."
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "Tên:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "Phải nhập tên bộ lọc"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "Phải nhập đường dẫn máy mạng hợp lệ"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "Cần chỉ rõ bộ mã ký tự"
 
@@ -4693,19 +4765,23 @@
 msgid "Network unreachable"
 msgstr "Mạng máy tính không tới được"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "Không bao giờ"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "Thư &mục mới"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "&Tab mới"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "Tạo &mới"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4718,23 +4794,23 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "Tạo dấu trang mới"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "Thư &mục mới"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "Các đặc tính mới và sự cải tiến trong %s"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "Bộ lọc mới"
 
@@ -4744,15 +4820,15 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "Tạo địa chỉ mới"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "Hàng đợi truyền tiếp theo"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "Không"
 
@@ -4760,25 +4836,25 @@
 msgid "No category to export selected"
 msgstr "Không có category để xuất ra được chọn"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "Không có lệnh được chỉ rõ,bãi bỏ."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "Không có địa chỉ IP trên Internet được đặt, đang thử mặc định."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
-msgstr "Không có tệp tin nào hiện thời đang được biên tập."
+msgstr "Không có tập tin nào hiện thời đang được biên tập."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "Tên bộ lọc không được chỉ rõ"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "Không có máy chủ được chỉ rõ, hãy nhập tên máy chủ."
 
@@ -4786,27 +4862,27 @@
 msgid "No images available"
 msgstr "Không có ảnh nào có thể dùng được"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
-msgstr "Không thể thêm tệp tin vào hàng đợi nữa!"
+msgstr "Không thể thêm tập tin vào hàng đợi nữa!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "Không có tên cho bộ lọc nhận được."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "Chưa có chương trình nào liên kết với kiểu tệp này"
 
-#: resources.h:420
+#: resources.h:430
 #, 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 liên kết để chỉnh sửa tệp với phần mở rộng '%"
 "s'."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "Không tìm thấy"
 
@@ -4824,23 +4900,23 @@
 msgid "No username given."
 msgstr "Không có tên người dùng này."
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "Không"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "Chưa có gì được chọn"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "Bình thường"
 
@@ -4850,15 +4926,15 @@
 msgstr "Không phải tất cả các mục tin đều có thể yêu cầu xem/biên tập."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "Chưa được kết nối"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 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:564
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "Không có bất kỳ kết nối tới máy chủ."
 
@@ -4866,21 +4942,21 @@
 msgid "Not connected."
 msgstr "Chưa được kết nối."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "Chú ý rằng đặc tính này chỉ hỗ trợ sử dụng giao thức FTP."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "Chú ý: Nó chỉ hoạt động với kết nối FTP thông thường, không bị mã hóa."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr ""
 "Chú ý: Sử dụng máy chủ ủy thác proxy chung áp đặt kết nối FTP trong chế độ "
 "thụ động."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "Số chữ số thập phân:"
 
@@ -4888,21 +4964,21 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "Số lần thử lại phải nằm giữa 0 và 99."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
-msgstr "&Mở tệp tin"
+msgstr "&Mở tập tin"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "Đồng ý"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
@@ -4910,119 +4986,123 @@
 "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:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "Một lần"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr ""
-"Chỉ phiên bản của FileZilla và hệ điều hành bạn đang sử dụng sẽ chuyển tới "
-"cho máy chủ."
+#: resources.h:970
+msgid "Once a week"
+msgstr "Tuần một lần"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
-msgstr "Mở thư mục trong bộ quản lý tệp tin hệ thống"
+msgstr "Mở thư mục trong bộ quản lý tập tin hệ thống"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "Mở Danh bạ"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "Mở Quản lý địa chỉ."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "Mở Quản lý địa chỉ. Bấm chuột phải để liệt kê các địa chỉ."
+
+#: resources.h:581
 msgid "Open the file."
-msgstr "Mở tệp tin."
+msgstr "Mở tập tin."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "Mở hộp thoại cài đặt của FileZilla"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "Mở như là:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "Mở bị lỗi"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "Mở một tab mới"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "Mở Danh bạ"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr ""
 "Mở hộp thoại danh sách bộ lọc thư mục. Bấm chuột phải để bật hoặc tắt các bộ "
 "lọc."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "Hệ điều hành"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "Trục trặc của hệ điều hành đã tìm ra"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "Tổ chức:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "Cái khác:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "Tổng quan"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "Ghi đè nếu có nguồn mớ&i hơn"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "Ghi đè"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "Ghi đè nếu kích thước khác biệt"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "Ghi đè nếu mới hơn hay kích thước khác biệt"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "Ghi đè nếu có nguồn mới hơn"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "Ghi đè nếu kích thước &khác biệt"
 
-#: resources.h:61
+#: resources.h:70
 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"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "Quyền sở hữu"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "Người sở hữu/Nhóm"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
@@ -5030,7 +5110,7 @@
 "Hệ thống trở ngại từ việc đi vào t&rạng thái nghỉ trong suốt quá trình "
 "truyền và các tác vụ khác"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Máy chủ ủy thá&c proxy:"
@@ -5039,27 +5119,27 @@
 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."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "Thụ độn&g (nên dùng)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "Đóng gói"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2489
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "Tham số không hợp chuẩn URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "Mật &khẩu:"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "Thụ động (nên dùng)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "Chế độ thụ động"
@@ -5074,42 +5154,46 @@
 msgid "Password required"
 msgstr "Yêu cầu mật khẩu"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "Đường dẫn"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, 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"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "Không tìm thấy đường dẫn:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "Đường dẫn"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "Loại bỏ lệnh còn chờ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "Quyền"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "Các quyền"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "Nền tảng:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -5124,7 +5208,7 @@
 "Xin kiểm tra tại http://filezilla-project.org/probe.php máy chủ này phải "
 "chạy được và cẩn thận kiểm tra lại cài đặt của bạn."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -5133,7 +5217,7 @@
 "gói cập nhật hay truy cập http://filezilla-project.org để tải về mã nguồn "
 "của FileZilla."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5163,7 +5247,7 @@
 msgid "Please enter a custom time format."
 msgstr "Đề nghị nhập định dạng thời gian."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "Xin nhập ngày tháng theo định dạng YYYY-MM-DD ví dụ như 2010-07-18."
@@ -5174,20 +5258,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "Hãy nhập giá trị giới hạn tải về lớn hơn hoặc bằng 0 %s/s."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "Đề nghị nhập tên cho bộ lọc mới."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 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:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "Đề nghị nhập tên mới cho bộ lọc \"%s\"."
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "Đề nghị nhập tên mới cho bộ lọc."
 
@@ -5208,11 +5292,11 @@
 "transfers."
 msgstr "Hãy nhập một số từ 0 đến 10 cho số kết nối truyền hiện hành."
 
-#: resources.h:117
+#: resources.h:126
 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:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5230,11 +5314,11 @@
 "Hãy nhập thời gian quá giờ từ 5 đến 9999 giây hoặc giá trị 0 để bỏ chức năng "
 "này."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 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"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "Xin nhập tên người dùng cho máy chủ này:"
 
@@ -5247,17 +5331,13 @@
 msgstr ""
 "Xin hãy nhập địa chỉ URL nơi mà nhận được địa chỉ Internet của bạn từ đó"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "Hãy nhập khoảng thời gian giữa các lần cập nhật ít nhất là 7 ngày"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "Hãy nhập giới hạn tốc độ tải lên có giá trị lớn hơn hoặc bằng 0 %s/s."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5265,14 +5345,18 @@
 "Xin nhập dòng lệnh thô của giao thức FTP.\n"
 "Sử dụng dòng lệnh thô sẽ xóa bộ đệm dữ liệu thư mục."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 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:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+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:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "Nhập tên mật khẩu cho máy chủ này:"
 
@@ -5291,7 +5375,7 @@
 "trình thuật sĩ này. Trong trường hợp bạn có một địa chỉ động hay bạn không "
 "biết địa chỉ, sử dụng tùy chọn thiết bị phân tích từ bên ngoài."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5307,7 +5391,7 @@
 "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:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr ""
 "Xin chắc chắn là nơi xảy ra yêu cầu đã được cài đặt trong hệ thống của bạn."
@@ -5324,7 +5408,7 @@
 "đắn. Bạn sẽ phải cấu hình cổng thủ công. Đừng sử dụng bộ định tuyến trong "
 "chế độ 'DMZ' hay 'Game'."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5336,7 +5420,7 @@
 "cho rằng nó chỉ sử 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:718
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5344,7 +5428,7 @@
 "Xin chú ý là lưu trữ dấu thời gian trong việc tải lên máy chủ FTP, FTPS và "
 "FTPES chỉ hoạt động nếu chúng hỗ trợ lệnh MFMT."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
@@ -5352,7 +5436,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."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5361,7 +5445,7 @@
 "Xin hãy đọc http://wiki.filezilla-project.org/Date_and_Time_formatting để "
 "biết thêm chi tiết"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5379,40 +5463,40 @@
 "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."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "Hãy chọn tác động:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "Chọn những thể loại bạn muốn nhập vào."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "Đề nghị chọn chế độ truyền mặc định bạn muốn sử dụng."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "Đề nghị chọn thuộc tính mới cho thư mục \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr "Đề nghị chọn thuộc tính mới cho tệp tin \"%s\"."
+msgstr "Đề nghị chọn thuộc tính mới cho tập tin \"%s\"."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "Đề nghị chọn thuộc tính mới cho thư mục đã chọn."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
-msgstr "Đề nghị chọn thuộc tính mới cho thư mục và tệp tin đã chọn."
+msgstr "Đề nghị chọn thuộc tính mới cho thư mục và tập tin đã chọn."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 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."
+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:581
 msgid ""
@@ -5428,7 +5512,7 @@
 "chế độ 'DMZ' hay 'game'. Những điều giống như kiểm duyệt nghi thức hay "
 "'fixups' phải bị tắt đi"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
@@ -5436,8 +5520,8 @@
 "Mời bạn truy cập http://filezilla-project.org để tìm thêm thông tin về "
 "FileZilla."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
@@ -5445,65 +5529,78 @@
 "Mời bạn truy cập http://filezilla-project.org để tải phiên bản mới nhất của "
 "FileZilla."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "Mã bưu điện:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "Giới hạn trước các địa chỉ"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:717
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
-msgstr "Lưu giữ dấu thời gian của tệp tin"
+msgstr "Lưu giữ dấu thời gian của tập tin"
 
 #: ../../locales/../src/interface/settings/optionspage_themes.cpp:223
 msgid "Preview:"
 msgstr "Xem trước:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:914
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 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."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr ""
+"Hiển thị thông tin điều tra liên quan đến quá trình khởi động FileZilla"
+
+#: ../../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"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "Thư mục ưu tiên (mặc định)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "Quyền ưu tiên"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "Chính sách riêng tư:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"Chính sách riêng tư: Chỉ phiên bản của FileZilla, hệ điều hành bạn đang sử "
+"dụng và cả kiến trúc CPU sẽ chuyển tới cho máy chủ."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "Khóa &riêng:"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "Giao &thức:"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Mật &khẩu máy chủ ủy thác proxy:"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "Xử lý &hàng đợi"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "Giao thức:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Cổng máy chủ ủy thác &Proxy:"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Người dù&ng chủ ủy thác:"
 
@@ -5511,12 +5608,16 @@
 msgid "Proxy authentication failed"
 msgstr "Sự xác thực máy chủ ủy thác proxy bị lỗi."
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Kết nối bắt tay với máy chủ ủy thác proxy bị lỗi: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+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:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5531,23 +5632,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Yêu cầu máy chủ proxy lỗi: Không rõ kiểu địa chỉ trong trả lời CONNECT"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "Truy cập ủy thác được đặt nhưng máy chủ hay cổng hợp lệ"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "Xác thực Khóa Công"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "Thuật toán Khóa Công:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "Cho phép tất cả mọi người"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "Hàng đợi đã đầy"
 
@@ -5566,39 +5667,39 @@
 msgid "Queue: empty"
 msgstr "Hàng đợi: rỗng"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
-msgstr "Hàng đợi các tệp tin"
+msgstr "Hàng đợi các tập tin"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "Đang đợi:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "&Khởi động lại hệ thống"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "Cây thư mụ&c máy mạng"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 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"
+msgstr "Đặt và xếp &lại hàng đợi với các tập tin đã chọn"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "Lệnh FTP thô"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "Đọ&c"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "Làm &tươi"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "Đổi tê&n"
 
@@ -5610,65 +5711,79 @@
 "Chạy lại phần cấu hình trực quan và cẩn thận kiểm tra các cài đặt và cấu "
 "hình tất cả các bộ định tuyến và tường lửa cho phù hợp."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "Đọ&c"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "Chỉ đọc"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1095
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 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:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
+#, 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] ""
+"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?"
+msgstr[1] ""
+"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:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "Bạn có thực sự muốn xóa %d thư mục và nội dung của nó không?"
-msgstr[1] "Bạn có thực sự muốn xóa %d thư mục và nội dung của nó không?"
-
-#: ../../locales/../src/interface/RemoteListView.cpp:1690
-#: ../../locales/../src/interface/search.cpp:1023
-#, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "Bạn có thực sự muốn xóa %d tệp tin không?"
-msgstr[1] "Bạn có thực sự muốn xóa %d tệp tin không?"
+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?"
+msgstr[1] "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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "Bạn có thực sự muốn xóa %s và %s không?"
+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:1125
+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:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "Bạn có thực sự muốn xóa tất cả tệp tin và thư mục đã chọn không?"
+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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "Lý do"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "Khởi động lại ngay"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "Rec&urse vào thư mục con"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+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:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "Nhận hơn 10000 ký tự trong một dòng, đang bãi bỏ."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "Xác nhận dữ liệu bị hỏng"
 
@@ -5680,11 +5795,11 @@
 "Thông tin về kết nối lại không thể đầy đủ khi kết nối tới máy chủ.\n"
 "Nếu bạn tiếp tục, kết nối của bạn sẽ bị đóng lại."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "Các cài đặt về kết nối lại"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "Kết nối lại với máy chủ kết nối cuối cùng"
 
@@ -5692,34 +5807,38 @@
 msgid "Redirection to invalid address"
 msgstr "Đổi hướng tới địa chỉ không hợp lệ"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
-msgstr "Làm mới lại danh sách tệp tin và thư mục"
+msgstr "Làm mới lại danh sách tập tin và thư mục"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "Nhớ mật khẩu?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "Máy trên mạng"
 
-#: ../../locales/../src/engine/tlssocket.cpp:837
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "Thông tin xác nhận máy mạng không tin cậy."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
-msgstr "Tệp tin máy mạng"
+msgstr "Tập tin máy mạng"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
-msgstr "Tìm kiếm tệp tin máy mạng"
+msgstr "Tìm kiếm tập tin máy mạng"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "Bộ lọc máy mạng:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "Đường dẫn máy mạng"
 
@@ -5732,7 +5851,7 @@
 "Không thể phân tích đường dẫn máy mạng. Hãy chắc chắn là nó hợp lệ và được "
 "hỗ trợ bởi kiểu máy chủ (%s)."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5743,7 +5862,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 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ệ."
 
@@ -5751,11 +5870,11 @@
 msgid "Remote path could not be parsed."
 msgstr "Đường dẫn máy mạng không thể phân tách được."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "Đường dẫn máy mạng đang xử lý:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "Đường dẫn máy mạng:"
 
@@ -5763,34 +5882,34 @@
 msgid "Remote site:"
 msgstr "Địa chỉ máy mạng:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "L&oại bỏ tất cả"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "Loại bỏ phần đã &chọn"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
-msgstr "Đổi tên tệp tin"
+msgstr "Đổi tên tập tin"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "Đổi tên thư mục đã chọn"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
-msgstr "Đổi tên tệp tin và thư mục đã chọn"
+msgstr "Đổi tên tập tin và thư mục đã chọn"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "Đổi tên mới từ '%s' thành '%s'"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "Đang báo cáo lỗi và các đặc tính yêu cầu"
 
@@ -5802,76 +5921,76 @@
 msgid "Require implicit FTP over TLS"
 msgstr "Yêu cầu FTP thông qua TLS ngầm định"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "Đặt và xếp lại toàn &bộ hàng đợi"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "Phân giải địa chỉ IP của %s"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "Phân giải tên máy chủ"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "Trả về:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "Kết quả:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "Phục hồi lại việc truyền"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr ""
-"Phục hồi tệp tin ASCII có thể là nguyên nhân của sự cố nếu máy chủ sử dụng "
+"Phục hồi tập tin ASCII có thể là nguyên nhân của sự cố nếu máy chủ sử dụng "
 "kiểu xuống dòng khác với máy khách."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "Đang nhận danh sách thư mục..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "Nhận địa chỉ IP từ %s"
 
-#: ../../locales/../src/engine/tlssocket.cpp:895
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "Thông tin xác nhận không được xác nhận."
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
-msgstr "&Hiển thị tệp tin đang sửa..."
+msgstr "&Hiển thị tập tin đang sửa..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "Mở cửa sổ quản lý dan&h bạ khi khởi động"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "Tắt &hệ thống"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "&Dừng lại"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "&Duyệt đồng bộ"
 
@@ -5879,33 +5998,47 @@
 msgid "SFTP"
 msgstr "Giao thức SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "Lưu lại các cài đặt không?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+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:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "Việc lưu mật khẩu đã được tắt bởi chính bạn."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
-msgstr "Quét toàn bộ các tệp tin để thêm vào hàng đợi"
+msgstr "Quét toàn bộ các tập tin để thêm vào hàng đợi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
-msgstr "Quét toàn bộ các tệp tin để tải lên"
+msgstr "Quét toàn bộ các tập tin để tải lên"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "Điều &kiện tìm kiếm:"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "&Thư mục tìm kiếm:"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
-msgstr "Tìm kiếm đệ qui tệp tin."
+msgstr "Tìm kiếm đệ qui tập tin."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
-msgstr "Tìm kiếm tệp tin trên máy chủ"
+msgstr "Tìm kiếm tập tin trên máy chủ"
 
 #: ../../locales/../src/interface/statusbar.cpp:531
 msgid "Security information"
@@ -5916,27 +6049,27 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "Xem thêm tại: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "&Chọn máy chủ"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "Chọn tr&ang:"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "Chọn Theme"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr ""
-"Chọn hành động thực thi mặc định nếu tệp tin đích của việc truyền tệp tin đã "
-"tồn tại từ trước."
+"Chọn hành động thực thi mặc định nếu tập tin đích của việc truyền tập tin đã "
+"sẵn có từ trước."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "Chọn trình soạn thảo mặc định"
 
@@ -5945,7 +6078,7 @@
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
 msgstr ""
-"Chọn hành động mặc định với tệp tin đích đã tồn tại nếu tệp tin đích đã tồn "
+"Chọn hành động mặc định với tập tin đích đã sẵn có nếu tập tin đích đã tồn "
 "tại. Lựa chọn này hợp lệ chỉ cho phiên làm việc hiện hành."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
@@ -5953,68 +6086,68 @@
 "Select default file exists action only for the currently selected files in "
 "the queue."
 msgstr ""
-"Chọn hành động mặc định với tệp tin đích đã tồn tại chỉ dành cho các tệp tin "
+"Chọn hành động mặc định với tập tin đích đã sẵn có chỉ dành cho các tập tin "
 "hiện hành đã chọn trong hàng đợi."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "Chọn vị trí tải về cho gói tin"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:360
 msgid "Select file containing private key"
-msgstr "Chọn tệp tin có chứa khóa riêng"
+msgstr "Chọn tập tin có chứa khóa riêng"
 
 #: ../../locales/../src/interface/export.cpp:38
 msgid "Select file for exported data"
-msgstr "Chọn tệp tin cho dữ liệu xuất ra"
+msgstr "Chọn tập tin cho dữ liệu xuất ra"
 
 #: ../../locales/../src/interface/export.cpp:34
 msgid "Select file for exported queue"
-msgstr "Chọn tệp tin cho hàng đợi xuất ra"
+msgstr "Chọn tập tin cho hàng đợi xuất ra"
 
 #: ../../locales/../src/interface/export.cpp:36
 msgid "Select file for exported settings"
-msgstr "Chọn tệp tin để xuất ra thông tin cài đặt"
+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:2169
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
-msgstr "Chọn tệp tin cho địa chỉ xuất ra"
+msgstr "Chọn tập tin cho địa chỉ xuất ra"
 
 #: ../../locales/../src/interface/import.cpp:15
 msgid "Select file to import settings from"
-msgstr "Chọn tệp tin để nhập thông tin cài đặt"
+msgstr "Chọn tập tin để nhập thông tin cài đặt"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:250
 msgid "Select file to upload"
-msgstr "Chọn tệp tin để tải lên"
+msgstr "Chọn tập tin để tải lên"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:304
 msgid "Select filename for converted keyfile"
-msgstr "Chọn tệp tin để chuyển đổi khóa tệp tin"
+msgstr "Chọn tập tin để chuyển đổi khóa tập tin"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
-msgstr "Chọn cách mở tệp tin."
+msgstr "Chọn cách mở tập tin."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "Chọn thư mục đích để tải về"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
-msgstr "Chọn tên tệp tin đích"
+msgstr "Chọn tên tập tin đích"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "Chọn những thể loại cần xuất thông tin:"
 
-#: resources.h:282
+#: resources.h:292
 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:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -6028,28 +6161,28 @@
 msgstr[0] "Đã chọn %d. thư mục"
 msgstr[1] "Đã chọn %d thư mục."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
-msgstr[0] "Đã chọn %d tệp tin để truyền."
-msgstr[1] "Đã chọn %d tệp tin để truyền."
+msgstr[0] "Đã chọn %d tập tin để truyền."
+msgstr[1] "Đã chọn %d tập tin để truyền."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:58
 #, c-format
 msgid "Selected %d file. Total size: %s"
 msgid_plural "Selected %d files. Total size: %s"
-msgstr[0] "Đã chọn %d tệp tin. Kích thước tổng cộng là: %s"
-msgstr[1] "Đã chọn %d tệp tin. Kích thước tổng cộng là: %s"
+msgstr[0] "Đã chọn %d tập tin. Kích thước tổng cộng là: %s"
+msgstr[1] "Đã chọn %d tập tin. Kích thước tổng cộng là: %s"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:56
 #, c-format
 msgid "Selected %d file. Total size: At least %s"
 msgid_plural "Selected %d files. Total size: At least %s"
-msgstr[0] "Đã chọn %d tệp tin. Kích thước tổng cộng ít nhất là: %s"
-msgstr[1] "Đã chọn %d tệp tin. Kích thước tổng cộng ít nhất là: %s"
+msgstr[0] "Đã chọn %d tập tin. Kích thước tổng cộng ít nhất là: %s"
+msgstr[1] "Đã chọn %d tập tin. Kích thước tổng cộng ít nhất là: %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "Đã chọn %s và %s để truyền."
@@ -6064,31 +6197,31 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "Đã chọn %s và %s. Kích thước tổng cộng ít nhất là: %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
-msgstr "Trình soạn thảo bạn chọn không tồn tại"
+msgstr "Trình soạn thảo bạn chọn không sẵn có."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
-msgstr "Tệp tin bạn chọn đang bị biên tập"
+msgstr "Tập tin bạn chọn đang bị biên tập"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:389
 msgid "Selected file is already loaded"
-msgstr "Tệp tin đã chọn đã được tải"
+msgstr "Tập tin đã chọn đã được tải"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
-msgstr "Tệp tin đã chọn đã được mở"
+msgstr "Tập tin đã chọn đã được mở"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
-msgstr "Tệp tin đã chọn vẫn còn bị chỉnh sửa"
+msgstr "Tập tin đã chọn vẫn còn bị chỉnh sửa"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 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ộ."
+msgstr "Chọn bộ lọc chỉ làm việc cho tập tin nội bộ."
 
 #: ../../locales/../src/interface/menu_bar.cpp:313
 msgid ""
@@ -6102,63 +6235,68 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "Chọn cổng thường sử dụng bởi các giao thức khác."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "Gửi các &lệnh duy trì FTP"
 
-#: resources.h:543
+#: resources.h:560
 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:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "Đang gửi lệnh duy trì"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "Số serial:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "&Kiểu máy chủ:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:721
+#: ../../locales/../src/engine/tlssocket.cpp:794
 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:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+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:4349
 #, 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."
+msgstr "Máy chủ không hỗ trợ phục hồi tập tin >%d GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, c-format
 msgid ""
 "Server does not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"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."
+"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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 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."
+msgstr "Máy chủ không hỗ trợ phục hồi tập tin >2GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 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."
+msgstr "Máy chủ không hỗ trợ phục hồi tập tin >4GB."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, c-format
 msgid ""
 "Server may not support resume of files > %d GB. End transfer since file "
 "sizes match."
 msgstr ""
-"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."
+"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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
@@ -6166,24 +6304,24 @@
 "Máy chủ có thể yêu cầu tài khoản sử dụng. Thử ghi rõ một tài khoản sử dụng "
 "trong Danh bạ"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "Máy chủ trả về đường dẫn rỗng."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 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 sử dụng đăng nhập kiểu tương tác."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 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:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -6203,89 +6341,100 @@
 msgid "Server sent unexpected reply."
 msgstr "Máy chủ gửi trả lời không hợp lệ."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "Máy chủ tới máy khách MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
-msgstr "Máy chủ tới máy khách vô định:"
+msgstr "Kiểu mã hóa từ máy chủ tới máy khách:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "&Kiểu máy chủ:"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
-msgstr "Tệp tin Máy chủ/Máy nội bộ"
+msgstr "Tập tin Máy chủ/Máy nội bộ"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "Máy chủ:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "Thông tin chi tiết phiên làm việc"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "T&hiết lập quyền ưu tiên"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, 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:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize được gọi mà không có gói mạng nào"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "Cài đặt"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "Hiển thị danh sách thư mục &thô"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "Hiển thị hộp thoại &chào mừng..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2341
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 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?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "Hiển thị các kiểu mã hóa TLS sẵn dùng"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "Hiển thị hộp thoại trợ giúp"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "Tắt ngay bây giờ"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "Thuật toán ký:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "Các đề &mục Danh bạ"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "Danh bạ"
 
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "Quản lý địa chỉ - Không thể lưu mật khẩu"
+
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:956
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp: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
 msgid "Site Manager - Invalid data"
 msgstr "Quản lý Địa chỉ - Dữ liệu không hợp lệ"
 
@@ -6296,8 +6445,8 @@
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "Địa chỉ không tồn tại."
 
@@ -6307,8 +6456,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "Địa chỉ trang mạng không hợp lệ."
 
@@ -6326,11 +6475,11 @@
 "Dấu trang gắn với trang mạng yêu cầu máy chủ phải được lưu trong danh bạ.\n"
 "Thêm kết nối hiện tại vào danh bạ?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "Kích thước"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "Định dạng kích thước"
 
@@ -6339,31 +6488,31 @@
 msgid "Size unknown"
 msgstr "Không biết kích thước"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "Bỏ qua tập tin"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "Giữ nguyên tải xuống của %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "Giữ nguyên tải lên của %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1163
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 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."
+msgstr "Có một vài tập tin vẫn đang sửa hay cần phải tải lên."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6371,19 +6520,19 @@
 "Một vài máy chủ cấu hình sai là ở sau bộ định tuyến router, có thể trả lời "
 "với địa chỉ IP nội bộ của chúng."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "Xắp xếp thư mục trực tiếp"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 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."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "Sắp xếp"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "Chế độ &xắp xếp:"
 
@@ -6393,22 +6542,22 @@
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:315
 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"
+msgstr "Tập tin nguồn và đường dẫn của nó không thể giống nhau"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "Nguồn và đích của lệnh 'thả' là trùng nhau"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
-msgstr "Tệp tin nguồn:"
+msgstr "Tập tin nguồn:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "Các giới hạn tốc độ"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "Giới hạn tốc độ"
 
@@ -6420,7 +6569,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "Giới hạn tốc độ đã được bật, bấm vào để thay đổi."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "Cả bản thử nghiệm và ổn định"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "Chỉ bản ổn định"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "Bắt đầu truyền ngay lậ&p tức"
 
@@ -6428,43 +6585,47 @@
 msgid "Start with opened Site Manager"
 msgstr "Bắt đầu bằng việc mở Danh bạ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "Bắt đầu tải về %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "Bắt đầu tải lên %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+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:185
 msgid "State or province:"
 msgstr "Bang hoặc tỉnh:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "Tình trạng"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "Tình trạng:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "Dừng và xóa tất &cả"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "Tên đường phố:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "Chủ đề của chứng nhận"
 
@@ -6472,56 +6633,57 @@
 msgid "Successful transfers"
 msgstr "Các lần truyền thành công"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "Tổng hợp kết quả kiểm tra:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr ""
-"Liên kết đồng bộ tới các tệp tin không bị tác động bởi việc chọn này, như "
+"Liên kết đồng bộ 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 đồng bộ luôn bị xóa."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "Duyệt đồng bộ"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "Chức năng duyệt đồng bộ đã bị khoá."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "Cấu trúc sai"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2491
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "Cấu trúc dòng lệnh sai"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "Hệ thống"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "Thanh côn&g cụ"
 
@@ -6529,11 +6691,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "Kết nối TLS/SSL đã thiết lập, đang gửi yêu cầu HTTP"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "Kết nối TLS/SSL được thiết lập, xin chờ thông tin từ máy chủ..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "Kết nối TLS/SSL được thiết lập."
 
@@ -6541,23 +6703,27 @@
 msgid "TTL expired"
 msgstr "TTL đã hết hiệu lực"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
-msgstr "Tệp tin đích đã tồn tại từ trước"
+msgstr "Tập tin đích đã sẵn có từ trước"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
-msgstr "Tệp tin đích:"
+msgstr "Tập tin đích:"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "Tập tin đích đã có sẵn từ trước!"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 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?"
+msgstr "Tên tập tin đích đã tạo rồi, có tiếp tục nữa không?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "Kết quả kiểm tra"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "Kiểm tra khả năng phục hồi của máy chủ"
 
@@ -6590,11 +6756,11 @@
 msgstr "Địa chỉ bạn đã nhập vào là: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "Dấu sách không thể đặt thêm."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "Các dấu sách không thể xóa được."
 
@@ -6606,27 +6772,32 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "Chuỗi đăng nhập không thể rỗng."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, 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"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 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 văn bản."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "Trình soạn thảo mặc định cho tệp văn bản là '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr ""
-"Tên bộ lọc nhập vào đã tồn tại trước rồi, xin hãy chọn một cái tên khác"
+"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:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
-msgstr "Phần mở rộng '%s' đã được tồn tại trước trong danh sách"
+msgstr "Phần mở rộng '%s' đã được sẵn có từ trước trong danh sách"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:246
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:253
@@ -6635,12 +6806,12 @@
 "The file %s already exists.\n"
 "Please enter a new name:"
 msgstr ""
-"Tệp tin %s tồn tại trước rồi .\n"
+"Tập tin %s sẵn có trước rồi.\n"
 "Xin hãy nhập một cái tên mới:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6649,38 +6820,38 @@
 msgstr ""
 "Không mở được tệp '%s':\n"
 "Không tìm thấy chương trình liên kết (%s).\n"
-"Xin kiểm tra lại cấu hình liên kết kiểu tệp tin."
+"Xin kiểm tra lại cấu hình liên kết kiểu tập tin."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "Tệp tin '%s' không thể tải được hoặc không chứa khóa riêng."
+msgstr "Tập tin '%s' không thể tải được hoặc không chứa khóa riêng."
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
-msgstr "Tệp tin '%s' không thể tải lên được."
+msgstr "Tập tin '%s' không thể tải lên được."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
-"Tệp tin '%s' không thể mở được:\n"
-"Không có chương trình liên kết trong hệ điều hành của bạn với kiểu tệp tin "
+"Tập tin '%s' không thể mở được:\n"
+"Không có chương trình liên kết trong hệ điều hành của bạn với kiểu tập tin "
 "này."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
-"Tệp tin '%s' không thể mở được:\n"
+"Tập tin '%s' không thể mở được:\n"
 "Lệnh liên kết để mở lỗi"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
@@ -6691,8 +6862,8 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
-"Tệp tin '%s' không có trong định dạng mà FileZilla hỗ trợ.\n"
-"Tệp tin cũng được bảo vệ bằng mật khẩu. Tệp tin chứa mã bảo vệ vẫn chưa được "
+"Tập tin '%s' không có trong định dạng mà FileZilla hỗ trợ.\n"
+"Tập tin cũng được bảo vệ bằng mật khẩu. Tập tin chứa mã bảo vệ vẫn chưa được "
 "FileZilla hỗ trợ.\n"
 "Bạn có muốn chuyển đổi nó thành dạng được hỗ trợ, không được bảo vệ?"
 
@@ -6702,7 +6873,7 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
-"Tệp tin '%s' không có trong định dạng mà FileZilla hỗ trợ.\n"
+"Tập tin '%s' không có trong định dạng mà FileZilla hỗ trợ.\n"
 "Bạn có muốn chuyển đổi nó thành dạng được hỗ trợ?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
@@ -6712,13 +6883,13 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
-"Tệp tin '%s' được bảo vệ bằng mật khẩu. Tệp tin chứa mã bảo vệ vẫn chưa được "
+"Tập tin '%s' được bảo vệ bằng mật khẩu. Tập tin chứa mã bảo vệ vẫn chưa được "
 "FileZilla hỗ trợ.\n"
 "Bạn có muốn chuyển đổi nó thành dạng không được bảo vệ?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
-msgstr "Tệp tin bạn chọn làm trình soạn thảo mặc định không tồn tại."
+msgstr "Tập tin bạn chọn làm trình soạn thảo mặc định không tồn tại."
 
 #: ../../locales/../src/interface/import.cpp:95
 msgid ""
@@ -6728,7 +6899,7 @@
 "password will be imported.\n"
 "Continue with the import?"
 msgstr ""
-"Tệp tin mà bạn đã chọn chứa dữ liệu của Danh bạ từ phiên bản trước của "
+"Tập tin mà bạn đã chọn chứa dữ liệu của Danh bạ từ phiên bản trước của "
 "FileZilla.\n"
 "Bởi vì sự bất đồng trong định dạng lưu trữ, chỉ có máy chủ, cổng, tên người "
 "dùng và mật khẩu sẽ được nhập vào.\n"
@@ -6736,11 +6907,11 @@
 
 #: ../../locales/../src/interface/listctrlex.cpp:761
 msgid "The filename column can neither be hidden nor moved."
-msgstr "Cột ghi tên tệp tin có thể không bị ẩn cũng không bị di chuyển."
+msgstr "Cột ghi tên tập tin có thể không bị ẩn cũng không bị di chuyển."
 
 #: ../../locales/../src/interface/listctrlex.cpp:811
 msgid "The filename column cannot be hidden."
-msgstr "Cột ghi tên tệp tin có thể không bị ẩn."
+msgstr "Cột ghi tên tập tin có thể không bị ẩn."
 
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:68
 #, c-format
@@ -6752,11 +6923,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "Các ký tự sau đây sẽ bị thay thế: %s"
 
-#: resources.h:328
+#: resources.h:338
 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:"
+msgstr "Các tập tin sau đây hiện tại đang bị biên tập:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "Giải pháp FTP nguồn mở miễn phí"
 
@@ -6764,7 +6935,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "Dấu sách toàn cục không thể ghi lại được."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6794,7 +6965,7 @@
 msgstr ""
 "Giá trị cổng thấp nhất có thể phải nhỏ hơn hoặc bằng giá trị cổng cao nhất."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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."
@@ -6802,7 +6973,7 @@
 "Phiên bản gần đây nhất đã được tải về. Bấm vào nút Hoàn tất để đóng "
 "FileZilla và bắt đầu việc cài đặt."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../locales/../src/interface/updatewizard.cpp:620
 msgid ""
 "The most recent version has been downloaded. Please install it the same way "
 "you installed this version."
@@ -6810,11 +6981,11 @@
 "Phiên bản gần đây nhất đã được tải về. Xin hãy cài đặt nó giống như cách bạn "
 "đã cài đặt phiên bản này."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "Hàng đợi sẽ không thể được ghi lại."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6827,29 +6998,29 @@
 msgid "The selected categories have been imported."
 msgstr "Các thể loại đươc chọn đã được nhập vào."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
-msgstr "Tệp tin đã chọn chứa dữ liệu có thể nhập vào cho thể loại sau đây:"
+msgstr "Tập tin đã chọn chứa dữ liệu có thể nhập vào cho thể loại sau đây:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
-msgstr "Tệp tin đã chọn đang sửa:"
+msgstr "Tập tin đã chọn đang sửa:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr ""
-"Tệp tin đã chọn vẫn đang mở ở chương trình khác, xin hãy đóng chúng lại."
+"Tập tin đã chọn vẫn đang mở ở chương trình khác, xin hãy đóng chúng lại."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
 "Do you really want to continue?"
 msgstr ""
-"Tệp tin bạn chọn có thể thi hành trực tiếp.\n"
+"Tập tin bạn chọn có thể thi hành trực tiếp.\n"
 "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?"
 
@@ -6861,9 +7032,9 @@
 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."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
-msgstr "Máy chủ sử dụng bộ mã ký tự sau đây cho tên tệp tin:"
+msgstr "Máy chủ sử dụng bộ mã ký tự sau đây cho tên tập tin:"
 
 #: resources.h:2
 msgid ""
@@ -6873,7 +7044,7 @@
 "Giấy chứng nhận của máy chủ không được nhận ra. Xin hãy cẩn thận kiểm tra để "
 "chắc chắn là máy chủ có thể tin cậy."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6883,7 +7054,7 @@
 "nghĩa là nếu không phải là người quản trị thay đổi thì là do bạn trên thực "
 "tế đang thử kết nối tới một máy tính ngụy tạo là máy chủ."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6899,23 +7070,23 @@
 "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/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 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 Hủy bỏ."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 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 Hủy bỏ."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
 msgstr ""
-"Tệp tin đích đã tồn tại từ trước.\n"
+"Tập tin đích đã sẵn có từ trước.\n"
 "Xin hãy chọn một hành động."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 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?"
@@ -6924,11 +7095,11 @@
 msgid "Themes"
 msgstr "Kiểu Themes"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "Bộ lọc này không thể xóa."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "Không thể đổi tên bộ lọc này."
 
@@ -6939,7 +7110,7 @@
 msgstr ""
 "Điều này có nghĩa là bộ định tuyến hay(và) tường lửa vẫn chặn với FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
@@ -6947,7 +7118,7 @@
 "Nó chỉ thực sự làm việc nếu bạn không ở đằng sau bộ định tuyến router, nếu "
 "không hệ thống của bạn chỉ coi như trả về địa chỉ mạng của bạn."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
@@ -6955,25 +7126,25 @@
 "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:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "Thời gian"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "Định dạng thời gian"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "Q&uá giờ tính bằng giây:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "Quá lâu"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
@@ -6982,19 +7153,19 @@
 "Khoảng cách múi thời gian: Máy chủ: %d giây. Máy nội bộ: %d giây. Khác biệt: "
 "%d giây."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "Tựa đề:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2339
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 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."
+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:2340
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 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ả."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
@@ -7002,7 +7173,7 @@
 "Để hỗ trợ khả năng xác thực khóa công, FileZilla cần phải biết khóa riêng để "
 "dùng."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -7014,11 +7185,11 @@
 "Bật tắt việc so sánh thư mục. Bấm chuột phải để thay đổi chế độ so sánh.\n"
 "\n"
 "Các màu:\n"
-"Màu vàng: Tệp tin chỉ tồn tại ở một phía\n"
-"Màu xanh lục: Tệp tin mới hơn tệp tin đã đánh dấu ở bên kia\n"
+"Màu vàng: Tập tin chỉ có ở một phía\n"
+"Màu xanh lục: Tập tin mới hơn tập tin đã đánh dấu ở bên kia\n"
 "Màu đỏ: Kích thước khác nhau"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -7028,23 +7199,23 @@
 "Nếu được bật, thay đổi thư mục nội bộ hiện hành cũng làm thay đổi thư mục "
 "máy chủ hiện hành tương ứng và ngược lại."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "Bật tắt quá trình của hàng đợi truyền"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "Bật tắt việc hiển thị của cây thư mục máy nội bộ"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "Bật tắt việc hiển thị của nhật ký thông điệp"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "Bật tắt việc hiển thị của cây thư mục máy mạng"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 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"
 
@@ -7057,37 +7228,37 @@
 msgstr "Quá nhiều lần gửi lại"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "Dấu vết:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "&Truyền"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "Hướng tru&yền"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "Kiểu &truyền"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "Chế độ truyền"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "Hàng đợi &Truyền"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "Cài đặt chế độ truyền"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "Kết nối truyền bị ngắt: %s"
@@ -7096,8 +7267,8 @@
 msgid "Transferred data got tainted."
 msgstr "Dữ liệu truyền đi bị hư hỏng."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "Đang truyền"
 
@@ -7105,69 +7276,69 @@
 msgid "Transfers"
 msgstr "Truyền"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "Việc truyền đã hoàn thành"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
-msgstr "Coi các tệp tin không có phần mở &rộng như tệp tin ASCII"
+msgstr "Coi các tập tin không có phần mở &rộng như tập tin ASCII"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "Coi các tệp tin &sau đây như tệp tin ASCII:"
+msgstr "Coi các tập tin &sau đây như tập tin ASCII:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "Khóa đã thay đổi đáng tin cậy:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "Khóa mới đáng tin cậy:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "Tin khóa mới này và sử dụng để kết nối?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "Tin giấy phép này và dùng để kết nối?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "Tín nhiệm máy chủ này và dùng để kết nối?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "Kiểu"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "Kiểu máy chủ FTP ủy thác:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "Kiểu máy chủ ủy thác chung:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "Tải &lên"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "Giới hạn tải &lên:"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
-msgstr "&Sử dụng kiểu tệp tin liên kết nếu được"
+msgstr "&Sử dụng kiểu tập tin liên kết nếu được"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "&Sử dụng hệ thống mặc định"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "NGƯỜIDÙNG@&MÁYCHỦ"
 
@@ -7176,16 +7347,16 @@
 msgid "Unassigned error code %d"
 msgstr "Mã lỗi sai không xác định %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "Đơn vị:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "Không rõ"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr ""
 "Không rõ máy chủ ủy thác proxy cho giao thức FTP, không thể tạo đăng nhập "
@@ -7205,10 +7376,10 @@
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr ""
-"Không rõ lỗi mở tệp tin. Hãy chắc chắn là tệp tin có thể truy cập và hợp "
+"Không rõ lỗi mở tập tin. Hãy chắc chắn là tập tin có thể truy cập và hợp "
 "chuẩn tài liệu dạng XML."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "Không rõ khóa nóng"
 
@@ -7218,13 +7389,13 @@
 "Unknown protocol version of SOCKS Username/Password Authentication "
 "subnegotiation: %d"
 msgstr ""
-"Không rõ phiên bản của giao thức SOCKS Người dùng/Mật khẩu Thỏa thuận xác "
+"Không rõ phiên bản của giao thức SOCKS Tài khoản/Mật khẩu Thỏa thuận xác "
 "thực phụ: %d"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
-msgstr "Không hiểu nút gốc, tệp tin không được tạo ra bởi FileZilla."
+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:596
 #: ../../locales/../src/interface/netconfwizard.cpp:607
@@ -7243,7 +7414,7 @@
 "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 sử dụng."
 
-#: ../../locales/../src/engine/tlssocket.cpp:866
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "Kiểu giấy chứng nhận không được hỗ trợ"
 
@@ -7251,27 +7422,26 @@
 msgid "Unsupported redirect"
 msgstr "Gửi lại một lần nữa không được hỗ trợ"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "Tải &lên và không biên tập"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "Kiểm tra bản mới"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "Giúp bạn tải về bản mới nhất"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "Cập nhật"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "Tải lên"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
-msgstr "Tải lên lỗi"
+msgstr "Tải lên gặp lỗi"
 
 #: ../../locales/../src/interface/statusbar.cpp:609
 #, c-format
@@ -7282,60 +7452,60 @@
 msgid "Upload limit: none"
 msgstr "Giới hạn tải lên: không"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "Tải lên thư mục đã chọn"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
-msgstr "Tải lên các thư mục và tệp tin đã chọn"
+msgstr "Tải lên các thư mục và tập tin đã chọn"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
-msgstr "Tải lên tệp tin này lại cho máy chủ không?"
+msgstr "Tải lên tập tin này lại cho máy chủ không?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
-msgstr "Bạn muốn tải tệp tin lên máy chủ phải không?"
+msgstr "Bạn muốn tải tập tin lên máy chủ phải không?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "Đang tải lên"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "Đang tải lên và đang chờ bị bỏ đi"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "Đang tải lên và không biên tập"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "Bộ mã ký tự người &dùng"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "Dùng trình soạn thảo &riêng:"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "&Sử dụng trình soạn thảo mặc định cho tệp văn bản."
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "Sử dụng &duyệt đồng bộ"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr ""
 "Sử dụng UTF-8 nếu máy chủ có hỗ trợ, nếu không sử dụng bộ mã ký tự nội bộ."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "Dùng hành động mặc định"
 
@@ -7343,38 +7513,38 @@
 msgid "Use plain FTP"
 msgstr "Giao thức FTP thường"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "Máy chủ hiện hành đang kết nối với"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "Sử dụng máy chủ từ Danh bạ"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "Sử &dụng hệ thống mặc định"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "Sử dụng địa chỉ IP sau đây:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "Sử dụng vùng cổng sau đây:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "Sử dụng địa chỉ IP máy chủ trên mạng để thay thế"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr ""
 "Sử dụng điều này nếu bạn ở đằng sau bộ định tuyến router và có một địa chỉ "
 "IP tĩnh."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7385,86 +7555,86 @@
 "tích cực cho lần đầu tiên. Chỉ phiên bản FileZilla bạn đang sử dụng sẽ được "
 "truyền lên máy chủ."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
-msgstr "Người dùng:"
+msgstr "Tài khoản:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "Tên người dùng không thể liên kết bằng khoảng trống"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "Đang dùng máy chủ ủy thác %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr ""
-"Sử dụng bộ mã ký tự sai có thể dẫn đến kết quả tên tệp tin trả về không hiển "
+"Sử dụng bộ mã ký tự sai có thể dẫn đến kết quả tên tập tin trả về không hiển "
 "thị đúng."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr ""
 "Sử dụng chương trình thuật sĩ này bạn có thể kiểm tra cập nhật bản mới cho "
 "FileZilla."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "Hợp lệ từ:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "Hợp lệ với:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "Nhật ký thông tin đầy đủ từ wxWidgets"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1056
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "Đang xác minh giấy phép..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "Phiên bản:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "Rất cao"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 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ủ"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "Trình bày / Sửa"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "Hiển thị cột"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "&Ghi"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "Đang chờ"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "Đang chờ trình duyệt kết nối"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "Đang chờ mật khẩu"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "Việc chờ truyền bị hủy"
 
@@ -7472,7 +7642,7 @@
 msgid "Waiting to retry..."
 msgstr "Đang thử lại xin chờ..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7502,11 +7672,11 @@
 "Cổng ,\n"
 "nếu không FileZilla sẽ không thể truyền được dữ liệu lớn."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 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."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7520,35 +7690,47 @@
 "\n"
 "Bạn có thực sự muốn kiểm tra bản trong ngày không?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "Cảnh báo: Lỗ thủng an ninh tiềm tàng!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "Chào các bạn đến với FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "Các điểm mới"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "Các điểm mới:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"khi bạn cho FileZilla ghi nhớ mật khẩu, bạn có thể kết nối lại mà không cần "
+"nhập lại mật khẩu nữa sau khi bạn khởi động lại FileZilla."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr ""
-"Khi được phép, các ký tự mà không được hỗ trợ bởi hệ điều hành trong tệp tin "
-"sẽ bị thay thế nếu tải xuống như một tệp tin."
+"Khi được phép, các ký tự mà không được hỗ trợ bởi hệ điều hành trong tập tin "
+"sẽ bị thay thế nếu tải xuống như một tập tin."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "Màn hình rộng"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "Bạn có muốn FileZilla ghi nhớ mật khẩu?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "&Ghi"
 
@@ -7561,25 +7743,33 @@
 msgid "Wrong line endings"
 msgstr "Xuống dòng sai"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "Đồng ý"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr ""
+"Bạn dùng máy chủ chỉ hỗ trợ IPv6. Chương trình thuật sĩ này không hỗ trợ môi "
+"trường này."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "Bạn đã sử dụng bản mới nhất của FileZilla. Hãy kiểm tra lại sau."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "Bạn có thể thường xuyên mở hộp thoại này thông qua trình đơn trợ giúp."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "Bạn có thể để ô ghi cổng rỗng để sử dụng giá trị cổng mặc định."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7597,37 +7787,37 @@
 "Please enter a character that is allowed in filenames."
 msgstr ""
 "Bạn không thể thay thế ký tự không hợp lệ bằng một ký tự không hợp lệ khác. "
-"Xin hãy nhập vào ký tự mà nó được phép trong tệp tin."
+"Xin hãy nhập vào ký tự mà nó được phép trong tập tin."
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 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ế?"
+msgstr "Bạn đã không nhập tên mới cho tập tin. Ghi đè lên tập tin thay thế?"
 
-#: resources.h:454
+#: resources.h:464
 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 tượng trưng."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 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?"
+"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:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 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?"
+"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:433
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "Bạn phải nhập tên máy chủ."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "Bạn phải nhập thư mục máy nội bộ."
 
@@ -7636,17 +7826,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "Bạn phải nhập địa chỉ IP."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 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:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 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:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 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"
 
@@ -7666,29 +7856,29 @@
 msgid "You need to enter a name for the log file."
 msgstr "Bạn cần nhập tên tệp nhật trình."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "Bạn cần nhập lệnh được đóng mở ngoặc chính xác."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "Bạn cần nhập tên máy chủ ủy thác."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr ""
 "Bạn cần nhập giá trị cổng máy chủ ủy thác proxy trong khoảng từ 1 tới 65535."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "Bạn cần nhập ít nhất một đường dẫn, dấu trang rỗng không được hỗ trợ."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this bookmark."
@@ -7696,7 +7886,7 @@
 "Bạn cần phải nhập vào cả đường dẫn máy nội bộ và máy mạng để bật chế độ "
 "duyệt đồng bộ cho dấu sách này."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7706,11 +7896,11 @@
 
 #: ../../locales/../src/interface/manual_transfer.cpp:316
 msgid "You need to specify a local file."
-msgstr "Bạn phải định rõ tệp tin nội bộ."
+msgstr "Bạn phải định rõ tập tin nội bộ."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:336
 msgid "You need to specify a remote file."
-msgstr "Bạn phải định rõ tệp tin máy mạng."
+msgstr "Bạn phải định rõ tập tin máy mạng."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:343
 msgid "You need to specify a remote path."
@@ -7726,48 +7916,53 @@
 "should work properly."
 msgstr ""
 "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."
+"truyền tập tin có thể làm việc một cách đúng đắn."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "sau"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "trước"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "bắt đầu với"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "byte"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "có chứa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "không chứa"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "không bằng nhau"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "kết thúc với"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "bằng nhau"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
-msgstr "tệp tin"
+msgstr "tập tin"
 
 #: ../../locales/../src/interface/edithandler.cpp:88
 msgid "fz3temp-lockfile"
@@ -7781,84 +7976,129 @@
 "FileZilla executable."
 msgstr ""
 "không thể khởi động fzputtygen.\n"
-"Xin chắc chắn là tệp tin thi hành tồn tại trong cùng thư mục với tệp tin thi "
+"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:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "không thể khởi động fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:904
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers không trả về chứng nhận nào cả."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "lớn hơn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "nhóm có thể thực thi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "nhóm được phép đọc"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "nhóm được phép ghi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "bằng với"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "được đặt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "không được đặt"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "ít hơn"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "khớp với biểu thức chính quy"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "người được chạy chương trình"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "người được phép đọc"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "người được phép ghi"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "không rõ"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "ai cũng được phép thực thi"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "ai cũng được phép đọc"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "ai cũng được phép ghi"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "Sao &chép"
+
+#~ msgid "Cop&y"
+#~ msgstr "&Sao chép"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "&Bật tự động kiểm tra phiên bản mới"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "Số &ngày giữa các lần cập nhật:"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(Ít nhất là 7 ngày)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "Tự động kiểm tra cập nhật phiên bản mới"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "Kiểm tra phiên &bản tiền phát hành của FileZilla"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "Hãy nhập khoảng thời gian giữa các lần cập nhật ít nhất là 7 ngày"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "Chính sách riêng tư:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "Sai opState: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "Sao bản tên bộ lọc"
diff -Nru filezilla-3.5.3/locales/zh_CN.po filezilla-3.7.3~precise/locales/zh_CN.po
--- filezilla-3.5.3/locales/zh_CN.po	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/locales/zh_CN.po	2013-06-18 20:02:24.000000000 +0000
@@ -1,10 +1,14 @@
+# Chinese simplified translation for FileZilla Client.
+# Thanks to translation contributors.
+# Wylmer Wang <wantinghard@gmail.com>, 2011, 2012, 2013.
+#
 msgid ""
 msgstr ""
 "Project-Id-Version: FileZilla 3\n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2012-01-08 11:58+0100\n"
-"PO-Revision-Date: 2011-11-16 10:43+0800\n"
-"Last-Translator: Yinghua Wang <wantinghard@gmail.com>\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-16 16:27+0800\n"
+"Last-Translator: Wylmer Wang <wantinghard@gmail.com>\n"
 "Language-Team: Chinese (simplified) <i18n-zh@googlegroups.com>\n"
 "MIME-Version: 1.0\n"
 "Content-Type: text/plain; charset=UTF-8\n"
@@ -16,21 +20,21 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "已耗时 %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "剩余 %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
 "logontype)"
-msgstr "%a - 帐号 (如果不是使用帐号登录的方式，该行就会被忽略)"
+msgstr "%a - 帐号(如果不是使用帐号登录的方式，该行就会被忽略)"
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:63
 #: ../../locales/../src/interface/filelist_statusbar.cpp:74
@@ -40,9 +44,9 @@
 msgid_plural "%d directories"
 msgstr[0] "%d 个目录"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -50,9 +54,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -70,7 +74,7 @@
 msgid_plural "%d files. Total size: At least %s"
 msgstr[0] "%d 个文件。大小总共: 至少 %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d 个文件加入队列"
@@ -81,34 +85,24 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - 主机"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - 密码"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/秒)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
-msgstr "%s (? B/s)"
+msgstr "%s (? B/秒)"
 
 #: ../../locales/../src/interface/verifycertdialog.cpp:39
 #, c-format
@@ -120,7 +114,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - 尚未生效!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - 代理服务器用户"
@@ -141,27 +135,17 @@
 msgid_plural "%s bytes"
 msgstr[0] "%s 字节"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s 字节"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s 字节 (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s 字节 (%s/秒)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s 字节 (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s 字节 (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -174,7 +158,7 @@
 "\n"
 "请重新下载 FileZilla。如果该问题仍然存在，请提交一份问题报告。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -195,152 +179,148 @@
 msgid "%s with %d bits"
 msgstr "%s，有 %d 位"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - 用户名"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - 代理服务器密码"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "关于(&A)..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "帐号(&A):"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "主动(&A)"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "添加书签(&A)..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "添加文件到队列(&A)"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "添加密钥文件(&A)..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "添加到队列(&A)"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "调整服务器时区(&A):"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "在以后的会话中始终信任该证书(&A)。"
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "总是信任该主机，并将该密钥加入缓存(&A)"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "总是使用默认编辑器(&A)"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "对所有未关联文件总使用该选择(&A)"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "总是使用该操作(&A)"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "向您的操作系统查询外部 IP 地址(&A)"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "自动(&A)"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "自动检测(&A)"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "二进制(&B)"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "使用 SI 式二进制前缀。(如 1 KB = 1024 bytes)(&B)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "书签(&B)"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "浏览(&B)..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "允许峰值(&B):"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "检查测试版的 FileZilla(&C)"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "清除个人信息(&C)..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "关闭 FileZilla(&C)"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "配置速度限制(&C)..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "配置(&C)..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "连接(&C)"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "复制(&C)"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "添加当前连接到站点管理器(&C)..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "复制到剪贴板(&C)"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "崩溃(&C)"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "创建目录(&C)"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "创建新标签(&C)"
 
@@ -348,644 +328,652 @@
 msgid "&Debug"
 msgstr "调试(&D)"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "消息记录中的调试信息(&D):"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "默认编辑器(&D):"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "对已存在文件的默认操作(&D)..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
-msgstr "在失败的登陆请求之间延迟(&D):"
+msgstr "登陆重试延时(&D):"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "删除(&D)"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "删除符号链接(&D)"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "目录比较(&D)"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "放弃本地文件，重新下载并编辑(&D)"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "断开连接(&D)"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "从服务器断开(&D)"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "显示实时传输速度而非平均速度(&D)"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "以字节为单位显示(&D)"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "不要保存密码(&D)"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "不再显示此对话框(&D)。"
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "本地连接不使用外部 IP 地址(&D)。"
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "双击文件操作(&D):"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "下载(&D)"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
-msgstr "下载至(&D):"
+msgstr "下载到(&D):"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "下载(&D)..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "下载(&D):"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "编辑(&E)"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "编辑过滤器规则(&E)..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "启用(&E)"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "启用自动检查更新功能(&E)"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "启用速度限制(&E)"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "编码(&E):"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "加密(&E):"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "输入自定义命令(&E)..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "执行(&E)"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "导出站点管理器记录(&E)"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "导出(&E)..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "退回到主动模式(&F)"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "文件(&F)"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "文件属性(&F)..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "文件权限(&F)..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "文件(&F):"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "过滤器条件(&F):"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "过滤器集合(&F):"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "过滤器(&F):"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "完成(&F)"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "结束编辑并删除本地文件(&F)"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr "展开远程路径，将所有包含的文件下载到目标目录(&F)"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "跟踪符号链接，删除目标目录内容(&F)"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "从以下 URL 得到外部 IP 地址(&G):"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "获得帮助(&G)..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "全局书签(&G)"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "&HTTP/1.1 使用 CONNECT 方式"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "帮助(&H)"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "隐藏相同的文件(&H)"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "最高(&H)"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "最高可用端口(&H):"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "主机(&H):"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "&IEC 式二进制前缀 (如 1 KiB = 1024 bytes)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "&ISO 8601 (示例: 2007-09-15)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "导入(&I)..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
 msgstr "继承系统的文件类型关联(&I)"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "保持远程目录路径相对于搜索的根目录(&K)"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "文件和目录面板布局(&L):"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "限制 FilaZila 使用的本地端口(&L)"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "限制并发连接数(&L)"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "本地目录树(&L)"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "本地目录(&L):"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
-msgstr "记录日志到文件(&L)"
+msgstr "日志文件(&L)"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "登录类型(&L):"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "登录类型(&L):"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "低(&L)"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "管理书签(&M)..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "手动传输(&M)..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "最大连接数(&M):"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "最大重试次数(&M):"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "消息日志(&M)"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "最小化到托盘(&M)"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "名字(&N):"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "网络配置向导(&N)..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "新建(&N)"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "新站点(&N)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "有新版本了！(&N)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "下一步(&N) >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "否(&N)"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "无(&N)"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
-msgstr "普通(&N)"
-
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "检查更新的间隔天数(&N):"
+msgstr "正常(&N)"
 
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "数字值(&N):"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "确定(&O)"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "打开(&O)"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "打开(&O)"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "覆盖(&O)"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "被动(&P)"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "密码(&P):"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "播放声音(&P)"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "端口(&P):"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "消息日志的位置(&P):"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "保留传输文件的时间戳(&P)"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "队列(&Q)"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "快速连接(&Q)"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "快速连接工具栏(&Q)"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "读取(&R)"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "重新连接(&R)"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "刷新(&R)"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "为本次会话记住密码(&R)"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "记住密码(&R)"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "远程目录(&R):"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "远程路径(&R):"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "移除(&R)"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "移除密钥(&R)"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "移除选定(&R)"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "重命名(&R)"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "重命名(&R)..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "重新打开本地文件(&R)"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "将无效字符替换为(&R):"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "报告问题(&R)..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "重置并将所有文件重新加入队列(&R)"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "重新开始向导(&R)"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "续传(&R)"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "运行命令(&R)..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "现在运行配置向导(&R)..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
 msgstr "现在检查更新(&R)..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "站点(&S)"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "&SOCKS 5"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "保存为(&S)..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "搜索(&S)"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "搜索远程文件(&S)..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "选择项(&S):"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "选择语言(&S):"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "设置要显示的栏目(&S):"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "服务器(&S)"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "设置(&S)"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "设置(&S)..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "显示调试菜单(&S)"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "显示消息(&S)"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "在消息日志中显示时间戳(&S)"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "站点管理器(&S)..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "特定站点书签(&S)"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "跳过(&S)"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "速度限制(&S)"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "立即开始传输(&S)"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "交换本地和远程面板(&S)"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "&TLS 密码"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "测试(&T)"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "主题(&T):"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "传输(&T)"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "传输模式(&T):"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "传输队列(&T)"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
 msgstr "把点文件作为 ASCII 文件对待(&T)"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "放弃修改(&U)"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
 msgstr "更新该主机的缓存密钥(&U)"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "上传(&U)"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "上传(&U):"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "使用自定义程序(&U)"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "使用同步浏览(&U)"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "使用系统默认文本编辑器处理文本文件(&U)"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "使用以下 IP 地址(&U):"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "使用服务器的外部 IP 地址来代替(&U)"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "使用千位分隔符(&U)"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "用户(&U):"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "用户名(&U):"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "版本 %s (&V)"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "查看(&V)"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "查看/编辑(&V)"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
 msgstr "监视本地编辑的文件并且提示上传修改(&W)"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "在检查更新时，检查(&W)："
+
+#: resources.h:145
 msgid "&Write"
 msgstr "写入(&W)"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "是(&Y)"
 
@@ -1007,7 +995,19 @@
 msgid "'Account' logontype not supported by selected protocol"
 msgstr "选定的协议不支持“帐号”登录类型"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:594
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr "“正常”和“帐户”登录类型不可用。请使用“询问密码”。"
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr "“正常”和“帐户”登录类型不可用。您的登录入口已更改为“询问密码”。"
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 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 "
@@ -1023,120 +1023,116 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(%d 个对象被过滤)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 代表不限制)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 秒)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999，0 表示禁用)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(至少 7 天)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(示例: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(示例: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(以 %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr "，剩下 %H:%M:%S"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr "，剩下 --:--:--"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- 损坏的路由器和/或防火墙"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- 镜像上的文件损坏"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- 您系统上有恶意软件"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "剩下 --:--:--"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c 不能与 FTP URL 一起使用。"
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l 只能与 FTP URL 一起使用。"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
 msgstr "-s 和 -c 不能同时使用。"
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s 不能与 FTP URL 一起使用。"
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - 无"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - 警告"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - 信息"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - 详细"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 位系统"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - 调试"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 位系统"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< 上一步(&B)"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1145,16 +1141,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "该名称的书签已经存在。请输入一个未使用的名字。"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "需要设置默认编辑器。"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "目录无法被拖入其子目录中。"
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1163,27 +1160,27 @@
 "有一些服务器不允许被动模式或者配置错误。这样的情况下您必须使用主动模式。在主"
 "动模式下，FileZilla 打开一个端口并且请求服务器来连接。"
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "之前打开的文件被修改。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "该名称的文件正在编辑。要重新打开“%s”？"
+msgstr "该名称的文件正在编辑。要重新打开“%s”吗？"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
-msgstr "该名称的文件已经传输。"
+msgstr "该名称的文件已在进行传输。"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "该名称的文件仍在编辑，请将其关闭后再试一次。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1196,11 +1193,11 @@
 "除非解决了这个问题，不然文件在文件列表中可能会不显示。\n"
 "本次会话将不再显示该警告。"
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "新版 FileZilla 可供下载:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 msgid ""
 "A proper server always shows all files, but some broken servers hide files "
 "from the user. Use this option to force the server to show all files."
@@ -1208,7 +1205,7 @@
 "一个正常的服务器总是会显示所有文件，但有些配置不恰当的服务器会把文件隐藏起"
 "来。通过这个选项强制服务器显示所有文件。"
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1222,15 +1219,15 @@
 "一个远程操作正在进行并且同步浏览是启用的。\n"
 "关闭同步浏览并且继续修改本地目录？"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "A&SCII"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "添加(&D)"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
 msgstr "允许续传 ASCII 文件(&L)"
 
@@ -1242,55 +1239,55 @@
 msgid "A&pply only to uploads"
 msgstr "只对上传起作用(&P)"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "应用到所有文件和目录(&P)"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "自动移除成功的传输(&U)"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "ASCII"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "放弃之前的连接并在当前标签中连接"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "关于 FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "在文件列表上面"
 
-#: ../../locales/../src/engine/server.cpp:858
-#: ../../locales/../src/engine/server.cpp:877
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1289
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "帐号"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "队列完成后执行动作(&C)"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "所选文件的动作:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "执行动作:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "动作:"
 
@@ -1321,23 +1318,23 @@
 "主动模式 FTP 测试失败。FileZilla 知道正确的外部 IP 地址，但是您的路由器或防火"
 "墙错误地修改了发送地址。"
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "主动模式 IP"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "只添加文件到队列(&Q)"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "添加选中的文件夹到传输队列"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "添加选中的文件和文件夹到传输队列"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "添加到队列"
 
@@ -1345,52 +1342,64 @@
 msgid "Address type not supported"
 msgstr "不支持该地址类型"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "高级"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "高级选项:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"建议：如果不是想测试新功能，请坚持使用稳定版本。Beta 版本和每日编译版本是用于"
+"测试目的的开发版本。每日编译版本的 FileZilla 可能工作不正常，甚至破坏您的系"
+"统。使用 Beta 和每日编译版本的风险由您自己承担。"
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "算法:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "所有文件都已经成功传输"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
 msgstr "所有指定的端口范围必须在 1024 和 65535 之间。"
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "所有传输都已经结束。%d 个文件无法传输。"
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
-msgstr "失败后允许返回到其他传输模式(&F)"
+msgstr "失败后允许退回到其他传输模式(&F)"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
-msgstr "失败后允许返回到其他传输模式"
+msgstr "失败后允许退回到其他传输模式"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "已连接"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
 msgstr ""
 "另外您能使用 PuTTY 内的 Pageant 工具去管理您的密钥。FileZilla 同样也会认可。"
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1398,13 +1407,13 @@
 "另外您也可以使用系统内的 SSH 代理。如果要这样做，需要确认是否已经设置了 "
 "SSH_AUTH_SOCK 环境变量。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr "或者请访问 http://filezilla-project.org 下载最新版本。"
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1413,7 +1422,7 @@
 "在从“%s”加载传输队列时发生了一个错误。\n"
 "队列中的一些项可能没有恢复。"
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1422,23 +1431,23 @@
 "在将传输队列保存到“%s”时发生了一个错误。\n"
 "队列中的一些项可能没有恢复。"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "目标位置已存在与所拖拽项目同名的文件。"
 
-#: ../../locales/../src/engine/server.cpp:879
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1529
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "另一个远程操作已经在进行，现在不能更改目录。"
@@ -1453,58 +1462,58 @@
 "file."
 msgstr "任何对站点管理器的更改都将不被保存，除非您修复该文件。"
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "任何对过滤器的更改都无法被保存。"
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "任何对过滤器的更改都将不被保存。"
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "只应用到目录(&L)"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "应用"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "只应用到当前队列(&C)"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "只应用到文件(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "归档"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "作为传输队列面板中的标签"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "询问操作"
 
-#: ../../locales/../src/engine/server.cpp:854
-#: ../../locales/../src/engine/server.cpp:873
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "询问密码"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "向操作系统询问端口。"
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "向您的操作系统询问外部 IP 地址"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "在 FileZilla 论坛里提问"
 
@@ -1512,39 +1521,35 @@
 msgid "Associated program not found:"
 msgstr "找不到关联的程序:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "至少有一个过滤条件不完整"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "至此，所有必须的信息都已经收集成功。"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "属性"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "认证失败。"
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "作者:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "自动"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "自动对文件进行分类"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "自动检查更新"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "可用大小"
 
@@ -1553,36 +1558,36 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <字节单位符号。只传送第一个字母>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "绕过代理(&Y)"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "基本使用说明"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "行为"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "正在编辑"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "字符串聚结器基准测试"
 
-#: ../../locales/../src/engine/tlssocket.cpp:881
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "注意！证书已被撤销"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "二进制"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "黑板"
 
@@ -1592,27 +1597,27 @@
 msgid "Bookmark"
 msgstr "书签"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "书签:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "书签"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "编译日期:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "编译信息"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "业务类型:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1621,63 +1626,63 @@
 "默认情况下使用任何可用的本地端口来进行主动模式传输。如果您想限制 FileZilla 只"
 "使用一个小范围内的端口，请在下面填入端口范围。"
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "取消当前操作(&C)"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "检查每日编译版的 FileZilla(&H)"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "全部清除(&C)"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "复制 URL 到剪贴板(&O)"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "自定义(&U)"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
 msgstr "自定义文件格式关联(&U):"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "计算服务器时差..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "无法读取文件"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "无法将数据写入文件。"
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "无法将数据写入文件: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "取消"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "取消当前操作"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "取消当前操作"
 
@@ -1686,11 +1691,11 @@
 msgid "Cannot access '%s', no media inserted or drive not ready."
 msgstr "无法访问“%s”，没有媒介插入或者驱动器未准备好。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:564
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "不能将服务器添加到站点管理器"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1704,37 +1709,37 @@
 "directories are enabled"
 msgstr "无法比较目录，本地与远程目录使用了不同的过滤器"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "没有连接到任何服务器，无法比较目录。"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "无法创建新过滤器"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "无法编辑文件"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "不能编辑文件，没有连接到任何服务器。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "不能编辑文件，未知远程路径。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "无法和 SFTP 服务器建立 FTP 连接，请选择合适的协议。"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "无法从资源文件导入快速连接栏"
 
@@ -1746,44 +1751,48 @@
 msgid "Cannot load keyfile"
 msgstr "无法加载密钥文件"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1066
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "无法从资源文件导入工具栏"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "无法记住密码"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "无法重命名记录"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "无法重命名文件"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "无法保存过滤器集合"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "无法选择过滤器"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
 msgstr "无法设置文件格式关联"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "无法显示对话框"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "无法查看/编辑所选的文件"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "分类"
 
@@ -1791,59 +1800,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "证书和会话数据目前不可用。"
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "证书细节"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "证书链:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "证书颁发者"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "需要确认:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "改变文件属性"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "改变文件权限。"
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "修改日志文件设置需要重启 FileZilla。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "字符编码问题"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "字符集"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "检查测试和候选发布版的 FileZilla(&B)"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "检查更新(&U)..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "自动检查 FileZilla 更新(&U)："
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "检查新版的 FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "检查更新"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "检查更新失败"
 
@@ -1851,21 +1860,21 @@
 msgid "Checking for correct external IP address"
 msgstr "检查正确的外部 IP 地址"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "正在检查更新"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "下载的文件校验和不匹配。"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1459
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "选择默认的本地目录"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2206
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "选择本地目录"
 
@@ -1873,43 +1882,43 @@
 msgid "Chunk data improperly terminated"
 msgstr "块数据错误中止"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "密码:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "关闭标签(&O)"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "经典"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "清除站点管理器记录(&S)"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "清空布局缓存(&L)"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "清除快速连接栏历史(&Q)"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "清除重新连接信息(&R)"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "清除传输队列(&T)"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:146
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "清除历史记录"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1917,11 +1926,11 @@
 msgid "Clear private data"
 msgstr "清除个人信息"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:145
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "清除快速连接栏"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "清除字符串聚结器"
 
@@ -1929,36 +1938,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "点击完成，保存您的配置。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "点击下一步下载新版本。"
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "本地至服务器 MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "本地至服务器密码:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "关闭所有其它的标签(&A)"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1138
-#: ../../locales/../src/interface/Mainfrm.cpp:1161
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "关闭 FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "关闭所有运行的 FileZilla 实例"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "关闭当前标签"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "注释(&M):"
 
@@ -1966,11 +1975,11 @@
 msgid "Column properties"
 msgstr "栏目属性"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "栏目设置"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "命令与其参数需要正确的引号包裹。"
 
@@ -1989,9 +1998,9 @@
 msgstr "命令不被该协议支持"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "命令:"
 
@@ -1999,7 +2008,7 @@
 msgid "Comment"
 msgstr "注释"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "公用名:"
 
@@ -2008,15 +2017,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "通讯已受路由器或防火墙影响"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "比较修改时间(&M)"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "比较文件大小(&S)"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "对比差异值(分钟)(&T):"
 
@@ -2024,60 +2033,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "对比值必须在 0 和 1440 分钟之间。"
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "编译目标:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "编译平台:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "编译器:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "编译参数:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "已压缩"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "并发传输"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
 msgstr "条件是区分大小写的(&A)"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "配置测试"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "配置被动模式"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "配置端口范围"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "配置 FileZilla 和您的网络"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "确认删除"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "需要确认"
 
@@ -2085,7 +2094,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "祝贺您，您的配置看起来能正常运作。"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:144
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "绕过代理设置连接"
 
@@ -2093,34 +2102,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "连接至指定的“站点管理器”站点"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "已连接"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "正在连接"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "连接到 %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "通过代理连接到 %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正在连接 %s..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "正在连接到服务器"
 
@@ -2128,17 +2137,17 @@
 msgid "Connection"
 msgstr "连接"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "连接尝试失败"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "尝试连接“%s”失败，正在尝试下一个地址。"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "尝试连接“%s”失败。"
@@ -2152,12 +2161,12 @@
 msgid "Connection closed"
 msgstr "连接关闭"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "连接被服务器关闭"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
 msgstr "连接已建立，正在初始化 TLS..."
@@ -2166,7 +2175,7 @@
 msgid "Connection established, sending HTTP request"
 msgstr "连接已建立，正在发送 HTTP 请求"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
 msgstr "连接建立，等待欢迎消息..."
 
@@ -2182,15 +2191,15 @@
 msgid "Connection refused"
 msgstr "连接被拒绝"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "连接超时"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "连接超时。"
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "与服务器的连接丢失。"
 
@@ -2210,27 +2219,23 @@
 msgid "Convert keyfile"
 msgstr "转换密钥文件"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "复制(&Y)"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1762
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "复制 (%d) / %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1739
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "复制 %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "复制选中项的 URL 到剪贴板。"
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "无法接受连接: %s"
@@ -2240,16 +2245,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "无法添加当前连接到站点管理器"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "完成操作"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "无法连接到服务器"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "无法连接到服务器: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "无法将命令转换成服务器的编码"
 
@@ -2258,17 +2267,17 @@
 msgid "Could not convert private key"
 msgstr "无法转换私钥"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "无法复制 URL"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "无法复制数据"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2277,11 +2286,11 @@
 "无法确定拖放操作的目标。\n"
 "这是由于 shell 扩展未正确安装，或者您没有把文件拖拽到文件浏览器窗口。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "无法建立到服务器的连接"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
@@ -2292,23 +2301,23 @@
 "您可以通过从命令行用“ --datadir <路径>” 参数启动，或者设置 FZ_DATADIR 环境变"
 "量来设置 FileZilla的数据目录。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "无法生成自定义登录过程。"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1011
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 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:986
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr "无法获得明确的证书主题名称，gnutls_x509_get_dn 失败"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "无法得到完整远程路径。"
 
@@ -2317,15 +2326,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "无法得到 fzputtygen 的回应。"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "找不到放置下载文件所需的临时目录。"
 
-#: ../../locales/../src/engine/tlssocket.cpp:939
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "无法导入对等认证，gnutls_x509_crt_import 失败"
 
-#: ../../locales/../src/engine/tlssocket.cpp:932
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2350,7 +2359,7 @@
 msgid "Could not load private key"
 msgstr "无法加载私钥"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2360,7 +2369,7 @@
 "无法获得远程目录“%s”对应的本地目录。\n"
 "关闭同步浏览并且继续修改本地目录？"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
@@ -2380,9 +2389,9 @@
 "无法获得远程目录“%s”对应的本地目录。\n"
 "同步浏览已经被禁用。"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "无法打开剪贴板"
 
@@ -2397,11 +2406,11 @@
 msgid "Could not parse remote path."
 msgstr "无法解析远程路径。"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "无法解析服务器地址:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "无法读取套接字: %s"
@@ -2410,12 +2419,12 @@
 msgid "Could not read server item."
 msgstr "无法读取服务器项。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "无法找到文件中的 %s 偏移"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "无法搜索到文件尾"
 
@@ -2423,17 +2432,17 @@
 msgid "Could not send command to fzputtygen."
 msgstr "无法将命令发送到 fzputtygen。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "无法生成 IO 线程"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "无法开始代理握手: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "无法启动传输"
 
@@ -2455,7 +2464,7 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "无法写入“%s”，不能添加该全局书签: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, c-format
 msgid ""
 "Could not write \"%s\", the queue could not be saved.\n"
@@ -2464,14 +2473,14 @@
 "无法写入“%s”，不能保存队列。\n"
 "%s"
 
-#: ../../locales/../src/interface/sitemanager.cpp:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
 msgstr "无法写入“%s”，不能导出所选择的站点: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "无法写入“%s”: %s"
@@ -2481,7 +2490,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "无法写入密钥文件: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "无法写入本地文件"
 
@@ -2491,37 +2500,49 @@
 msgid "Could not write to log file: %s"
 msgstr "无法写入日志文件: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "无法写入套接字: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "国家:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "使 Filezilla 立即崩溃。只用于调试异常处理"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "创建新文件(&T)"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "在当前目录创建一个新的子目录"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "在当前目录创建一个新的空文件"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "创建目录"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "创建空文件"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "正在创建目录"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
 msgstr "正在创建目录“%s”..."
@@ -2539,7 +2560,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "传输了 %s (用时 %s)后出现严重文件传输错误"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2560,52 +2581,56 @@
 msgid "Current transfer type is set to binary."
 msgstr "当前的传送类型被设置为二进制模式。"
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "自定义(&T)"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "自定义过滤器集合"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "自定义服务器"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "数据类型(&A)"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "使用 SI 式十进制前缀 (如 1 KB = 1000 bytes)(&E)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "默认(&E)"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "删除(&E)"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "全部禁用(&I)"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "不要保存密码(&O)"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "双击目录操作(&O):"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "复制(&U)"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "带虚拟路径的 DOS 式"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
 msgstr "危险的文件格式"
 
@@ -2613,16 +2638,16 @@
 msgid "Data"
 msgstr "数据"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "数据套接字过早关闭。"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "日期"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "日期格式"
 
@@ -2641,11 +2666,11 @@
 msgid "Debug"
 msgstr "调试"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "调试设置"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "默认本地目录(&L):"
 
@@ -2653,19 +2678,19 @@
 msgid "Default (Autodetect)"
 msgstr "默认(自动检测)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "没有正确引用默认编辑器。"
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "文件存在时的默认操作"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "默认远程目录(&E):"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2676,15 +2701,15 @@
 msgid "Default system language"
 msgstr "系统默认语言"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "默认传输模式:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "默认传输类型:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "默认: http://ip.filezilla-project.org/ip.php"
 
@@ -2703,57 +2728,57 @@
 "attempt..."
 msgstr[0] "由于上一次尝试连接失败，将推迟连接 %d 秒..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1214
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
 msgstr "清除站点管理器记录"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "删除所选的目录"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "删除选定的文件和目录"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
 msgstr "正在删除目录"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "目前不支持删除多个不相关的目录。"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "正在删除符号链接"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "桌面"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "详细资料"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "新密钥的详细资料:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "目录(&C)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "方向"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "目录"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2338
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "比较目录"
 
@@ -2771,11 +2796,11 @@
 msgid "Directory listing aborted by user"
 msgstr "目录列表被用户终止"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "目录列表失败"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "目录列表过滤器"
 
@@ -2783,65 +2808,64 @@
 msgid "Directory listing successful"
 msgstr "列出目录成功"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "全部禁用(&B)"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr "关闭同步浏览并且继续修改本地目录？"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:671
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "如果您无法再看见文件时请停用此选项。"
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "从服务器断开"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "已从服务器断开"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "已从服务器断开: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
 msgstr "正在从上一个服务器断开连接"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "断开当前可见的服务器"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "显示关于对话框"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "不使用默认编辑器(&N)"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "什么都不做(&N)"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2849,8 +2873,8 @@
 "您真的想检查测试版吗？\n"
 "除非您想测试新功能，否则请使用稳定的正式版。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1141
-#: ../../locales/../src/interface/Mainfrm.cpp:1165
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "您真的要关闭 FileZilla？"
 
@@ -2863,7 +2887,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "您真的想删除所有站点管理器里的记录？"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1216
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "您真的想删除所选的记录？"
 
@@ -2871,32 +2895,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "您真的想删除传输队列？"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:595
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
 msgstr "您真的想发送“%s”给服务器吗?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "文档"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "本地连接不使用外部 IP 地址(&L)。"
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "文件名的开始是以一个点开始的，例如: .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "双击操作"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "下载"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "下载限制(&L):"
 
@@ -2909,98 +2933,111 @@
 msgid "Download limit: none"
 msgstr "下载限制: 无"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "下载搜索结果"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "下载选定的目录"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "下载选定的文件和目录"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"下载速度：%s/s\n"
+"上传速度：%s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "正在下载"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "正在下载 %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "目前不支持下载多个不相关的目录。"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
 msgstr "正在下载搜索结果"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr "在不同的 FileZilla 的实例间拖放还未被实现。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "在不同服务器之间拖放还未被实现。"
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "复制(&I)"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "全部启用(&N)"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "进入目录(&N)"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "执行(&X)"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "退出(&X)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "电子邮件:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "每个过滤器至少要有一个条件。"
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "编辑过滤器"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
 msgstr "使用设置的编辑器编辑文件并上传修改后的文件到服务器。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "编辑失败"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "电子邮件:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "空命令"
 
@@ -3008,7 +3045,7 @@
 msgid "Empty command."
 msgstr "空命令。"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "空目录列表"
 
@@ -3020,101 +3057,113 @@
 msgid "Empty file extension."
 msgstr "空文件扩展名。"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "过滤器名称不能为空。"
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "空名称"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "空的引用字串。"
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
-msgstr "全部生效(&A)"
+msgstr "全部启用(&A)"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "启用无效字符过滤(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "已加密"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "加密"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "加密细节"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "结束对比并改变排序？"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "输入自定义命令(&C)..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "输入 0 表示无速度限制。"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "输入命令"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "输入自定义命令"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "进入目录"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "输入过滤器名称"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "输入过滤器集合名称"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "输入过滤器集合新名称"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "输入密码"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "进入所选的目录"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "输入服务器地址。\n"
 "要指定服务器的协议类型，在前面加上主机协议标示符。如果没有指定协议，会使用默"
 "认协议(ftp://)\n"
 "您也可以键入完整的URL地址，使用如下格式 protocol://user:pass@host:port，这样"
-"其它的输入框的值会被覆盖。"
+"其它的输入框的值会被覆盖。\n"
+"\n"
+"支持的协议有：\n"
+"- ftp:// 正常 FTP\n"
+"- sftp:// SSH 文件传输协议\n"
+"- ftps:// FTP over TLS (隐式)\n"
+"- ftpes:// FTP over TLS (显式)"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3125,7 +3174,7 @@
 "为文件“%s”输入密码。\n"
 "请注意转换后的文件将失去密码保护。"
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3147,7 +3196,7 @@
 msgid "Error importing"
 msgstr "导入出错"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "加载队列出错"
 
@@ -3156,27 +3205,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:731
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:786
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "导入 XML 文件出错"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "保存队列出错"
 
@@ -3187,72 +3236,80 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2188
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "写入 XML 文件出错"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "错误，文件名无法解析。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "错误，本地文件存在但无法删除"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "错误:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "在新标签中建立连接"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "每月"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "每两周"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "示例: png “c:\\program files\\viewer\\viewer.exe”-open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "示例"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "执行(&C)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
 msgstr "可执行"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1778
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
 msgstr "程序未包含版本信息，无法检查更新。"
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "浏览器"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "导出队列(&Q)"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "导出设置(&S)"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
 msgstr "导出设置"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "过滤器名(&I):"
 
@@ -3272,25 +3329,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - 不安全的文件传输协议"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "FTP 引擎没有初始化，无法连接"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP Keep-alive"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP 代理服务器"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP 地址"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3304,68 +3361,68 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - 通过隐式 TLS/SSL 的 FTP"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "改变目录失败"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "切换语言失败"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "检查新版 FileZilla 失败。"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1951
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "无法复制或移动站点"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:524
+#: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
 msgstr "创建 XML 文件的备件副本失败"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "创建监听套接字失败，正在中止"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
 msgstr "为主动模式传输创建监听套接字失败"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "下载最新版 FileZilla 失败。"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
 msgstr "取得“我的文档”路径失败"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "获取桌面路径失败"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
 msgstr "获取控制连接的对等地址失败，连接已关闭。"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
 msgstr "获取数据连接的对等地址失败，连接已关闭。"
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "FTP 引擎初始化失败"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
 msgstr "TLS 初始化失败。"
@@ -3379,24 +3436,24 @@
 msgid "Failed to load private key: %s"
 msgstr "加载私钥: %s 失败"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "打开“%s”追加/写入失败"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "打开“%s”读取失败"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "打开“%s”写入失败"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "无法解析返回的路径。"
 
@@ -3404,7 +3461,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "解析认证的根证书失败。"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "接收数据失败"
 
@@ -3416,11 +3473,11 @@
 msgid "Failed to retrieve external ip address, aborting"
 msgstr "获取外部 IP 地址失败，中止"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "获取外部 IP 地址失败，使用本地地址。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "获取本地 IP 地址失败。"
 
@@ -3436,34 +3493,34 @@
 msgid "Failed to send command."
 msgstr "发送命令失败。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "无法将语言设置为 %s (%s)，将使用系统默认语言。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, 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:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "无法将语言设置为 %s(%s)，将使用系统默认语言。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "设置语言为 %s 失败，将使用默认系统语言"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr "无法将语言设置为 %s，将使用系统默认语言(%s，%s)。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "无法将语言设置为 %s，将使用系统默认语言。"
@@ -3472,7 +3529,7 @@
 msgid "Failed to validate settings"
 msgstr "校验设置失败"
 
-#: ../../locales/../src/engine/tlssocket.cpp:874
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "验证对等证书失败"
 
@@ -3481,29 +3538,27 @@
 msgid "Failed to write to file %s"
 msgstr "写入 %s 文件失败"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:542
+#: ../../locales/../src/interface/xmlfunctions.cpp:532
 msgid "Failed to write xml file"
 msgstr "写入 xml 文件错误"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:16
 msgid "Failed transfers"
-msgstr "传输失败"
+msgstr "失败的传输"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
-msgstr "回到主动模式"
+msgstr "退回主动模式"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "文件(&E):"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "文件(&E)"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "文件"
 
@@ -3517,9 +3572,9 @@
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:132
 msgid "File editing"
-msgstr "正在编辑文件"
+msgstr "文件编辑"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "文件已存在"
 
@@ -3527,7 +3582,7 @@
 msgid "File exists action"
 msgstr "对已存在文件的操作"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "文件已改变"
 
@@ -3535,14 +3590,14 @@
 msgid "File lists"
 msgstr "文件列表"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "文件未找到"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "文件搜索"
 
@@ -3553,7 +3608,7 @@
 #: ../../locales/../src/engine/ControlSocket.cpp:118
 #, c-format
 msgid "File transfer aborted by user after transferring %s in %s"
-msgstr "传输了 %s (用时%s)后用户取消文件传输"
+msgstr "传输了 %s (用时%s)后用户中止了文件传输"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:139
 msgid "File transfer failed"
@@ -3577,99 +3632,99 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "文件传输成功，传输了 %s (用时%s)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1140
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "文件传输仍在进行。"
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "文件将以 ASCII 的数据类型传送。"
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "文件将以二进制的数据类型传送。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:201
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla 错误"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
-msgstr "FileZilla 现在可以测试您的配置以确保所有的配置都是合适的。"
+msgstr "FileZilla 现在可以测试您的配置以确保所有配置正常。"
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla 已经连接了一台服务器。"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla 运行于公共模式。\n"
-"“正常”和“帐户”登陆方式在此模式下不可用。"
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "改变语言需要重启 FileZilla 才会生效。"
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "FileZilla 更新"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "文件列表状态栏(&B)"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "文件名"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "文件名过滤器(&F)..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "无法为目录 %s 和文件名 %s 构造文件名"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "文件名无效"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "文件名不能包含以下任何字符：/ \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "文件名没有改变"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "文件名:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "文件名不能包含以下任何字符: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "文件名不能包含以下任何字符: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "正在编辑的文件"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "文件大小"
@@ -3678,68 +3733,68 @@
 msgid "Filesize format"
 msgstr "文件大小格式"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
 msgstr "文件类型"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
 msgstr "文件格式关联"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
-msgstr "过滤器应用到:"
+msgstr "过滤器应用范围:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "过滤器的文件名称有无效字符"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "过滤器名已经存在"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "过滤出匹配以下所有的项目"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "过滤出匹配以下任意一个的项目"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "过滤出不匹配以下任何一个的项目"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "过滤器集合已经存在"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "过滤目录列表"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "过滤器核对失败"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "指纹(MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "指纹(SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "指纹:"
 
@@ -3747,69 +3802,69 @@
 msgid "Firewall and router configuration wizard"
 msgstr "防火墙和路由器配置向导"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr "请运行网络配置向导获取关于这些选项的更多信息。"
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
 msgstr "您至少需要指定 10 个端口才能保证可靠性。"
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr "当前会话将使用默认设置，并且任何设置的修改都不被保存。"
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "强制 &UTF-8"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "强制显示隐藏文件(&H)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "强制显示隐藏文件"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
-msgstr "格式规范:"
+msgstr "格式规定:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "格式: 扩展名后跟随正确的指令和参数。"
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "更多文档"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
-msgstr "通用"
+msgstr "常规"
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
 msgstr "常规 SOCKS 服务器故障"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "通用代理"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "从以下 URL 得到外部 IP 地址:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "获得帮助"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "给定的过滤器集合名已经存在，是否覆盖过滤器集合？"
 
@@ -3817,15 +3872,15 @@
 msgid "Global bookmarks"
 msgstr "全局书签"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "组权限"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "高(&I)"
 
@@ -3833,21 +3888,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - 通过 TLS 的 HTTP"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
-msgstr "哈希值:"
+msgstr "散列值:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "隐藏"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "高"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "最高"
 
@@ -3855,24 +3910,24 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "最高的可用端口号必须在 1024 到 65535 之间。"
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
-msgstr "按住 shift 键，同时切换两边的过滤器状态。"
+msgstr "按住 shift 键来同时切换两边的过滤器状态。"
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
-msgstr "主页:"
+msgstr "主页："
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "主机密钥指纹:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "主机密钥不匹配"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "主机名以“[”开始，但没有结束符“]”。"
 
@@ -3880,20 +3935,20 @@
 msgid "Host unreachable"
 msgstr "无法连接主机"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "主机:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "小时，"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "I&SO 8601 (示例: 15:47)"
 
-#: resources.h:734
+#: resources.h:755
 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 "
@@ -3902,11 +3957,11 @@
 "如果一次操作中，在指定的时间长度内没有发出或收到数据，连接将被关闭，"
 "FileZilla 会尝试重新连接。"
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "如果要报告问题，请提供“详细”等级的日志文件。"
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -3917,14 +3972,13 @@
 "那个服务器可能配置有问题，您要试着使用主动模式。您可以在站点管理器里设定单服"
 "务器的传输模式。"
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
-msgstr ""
-"如果回退模式被选中，您将能连接到由于错误配置，拒绝选定的传输模式的站点。"
+msgstr "如果启用了退回选项，您将能连接到因错误配置而拒绝选定传输模式的站点。"
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3942,7 +3996,7 @@
 "connection."
 msgstr "如果这个问题仍然存在，则是某些路由器和/或防火墙仍在打断该连接。"
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -3951,7 +4005,7 @@
 "如果日志文件的体积达到限制，它将以文件名末尾将加上“.1”的方式重命名(有可能覆盖"
 "旧的日志文件)，之后新的文件将会被创建。"
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3969,7 +4023,7 @@
 msgid "If this problem stays, please contact your router manufacturer."
 msgstr "如果这个问题仍然存在，请联系您的路由器制造商。"
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -3978,17 +4032,17 @@
 "要是选择“如果较新就覆盖”，您的系统时间需要与服务器同步。若时间不同(比如不同的"
 "时区)，请在站点管理器中选择一个时区。"
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr "如果使用时间戳方式比较，只要两个文件的时间差异不超过限定值便视为相同。"
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
-msgstr "如果您改变了语言，您需要重启 FileZilla。"
+msgstr "如果改变了语言，您需要重启 FileZilla。"
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -3996,21 +4050,21 @@
 "如果您点击了测试，FileZilla 会连接到 probe.filezilla-project.org 并且进行一些"
 "简单测试。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1164
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "如果关闭 FileZilla，您所做的改变将会丢失。"
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
 msgstr "如果您输入了错误的文件类型，那些文件可能会在传输完成后被损坏。"
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "如果遇到了错误，说明您的配置不正确。"
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4025,26 +4079,26 @@
 "如果在一个特定的服务器上一直有问题，那个服务器本身或者路由器可能被配置错了。"
 "这种情况下您可以试着切换被动模式，并和服务器管理员联系以获取帮助。"
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
-"如果您成功完成了向导，最后测试也成功，任何您使用的防火墙和路由器应该也已经正"
-"确配置了。"
+"如果您成功完成了向导并且最后测试成功，任何您使用的防火墙和路由器应该也已经正"
+"确配置。"
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr "如果您使用了防火墙，确保 FileZilla 被允许在所有给定的端口上进行连接。"
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
 msgstr ""
-"如果您使用了路由器，确保所有的端口都被转发到您运行 FileZilla 的机器上了。"
+"如果您使用了路由器，确保所有的端口都已被转发到您运行 FileZilla 的机器上。"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:595
 msgid ""
@@ -4056,7 +4110,7 @@
 msgid "Import data from older version"
 msgstr "从旧版中导入数据"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
 msgstr "导入设置"
 
@@ -4070,7 +4124,7 @@
 msgid "Improperly quoted association."
 msgstr "未正确引用的关联。"
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4078,7 +4132,7 @@
 "主动模式下，FileZilla 必须监听一个端口以便进行数据传输。您必须指定 FileZilla "
 "使用哪个端口。"
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4086,47 +4140,47 @@
 "如果您有路由器，您必须转发所有可用的端口，因为 FileZilla 无法影响您的系统选择"
 "哪个端口。"
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
-msgstr "如果您喜欢使用自动升级，您可以在设置对话框中启用自动升级检查功能。"
+msgstr "如果您喜欢使用自动更新，您可以在设置对话框中启用自动检查更新功能。"
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "为了使用主动模式，FileZilla 需要知道您的外部 IP 地址。"
 
-#: resources.h:676
+#: resources.h:697
 msgid ""
 "In passive mode, which is recommended for most users, FileZilla asks the "
 "server for a port and connects to the given port. Not much configuration has "
 "to be done for this."
 msgstr ""
-"在被动模式下(推荐大多数用户使用的模式)，FileZilla 请求服务器给出一个端口，然"
-"后连接到那个端口去。不需要太多的配置。"
+"在被动模式下(推荐大多数用户使用)，FileZilla 请求服务器给出一个端口，然后连接"
+"到那个端口去。不需要太多的配置。"
 
-#: ../../locales/../src/engine/tlssocket.cpp:888
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
 msgstr "不完整的认证链，顶级证书不是自签发证书授权证书"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
 msgstr "密码错误"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
 msgstr "初始化 TLS 中..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "不安全的服务器，不支持 FTP over TLS。"
 
-#: ../../locales/../src/engine/server.cpp:856
-#: ../../locales/../src/engine/server.cpp:875
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "交互式"
@@ -4136,8 +4190,8 @@
 msgstr "界面"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "用户终止"
 
@@ -4149,8 +4203,8 @@
 msgid "Invalid HTTP Response"
 msgstr "无效的 HTTP 响应"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
@@ -4171,12 +4225,13 @@
 msgid "Invalid date"
 msgstr "无效数据"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "无效文件名"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "无效主机名，在闭合括号之后只能是冒号加端口号。"
 
@@ -4184,28 +4239,33 @@
 msgid "Invalid input"
 msgstr "无效输入"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "给定的端口无效，端口号必须是一个 1 到 65535 间的值。"
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:124
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "指定的协议无效。有效的协议有:\n"
-"ftp:// 表示普通FTP，\n"
-"sftp:// 表示SSH文件传输协议，\n"
-"ftps:// 表示通过 SSL 传输的 FTP(隐式)以及\n"
-"ftpes:// 表示通过 SSL 传输的 FTP(显式)。"
+"ftp:// 普通 FTP，\n"
+"sftp:// SSH 文件传输协议，\n"
+"ftps:// 通过 TLS 传输的 FTP(隐式)以及\n"
+"ftpes:// 通过 TLS 传输的 FTP(显式)。"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr "无效代理主机名，在闭合括号之后只允许是跟冒号加端口号。"
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
 msgstr "无效的搜索条件正则表达式。"
 
@@ -4213,7 +4273,7 @@
 msgid "Invalid response code"
 msgstr "无效的响应码"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "无效的搜索条件: %s"
@@ -4225,38 +4285,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "无效的站点路径"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "条件中的大小无效"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "给定的用户名无效。"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "司法管辖国家:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "司法管辖地区:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "司法管辖州或省:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "保持目录在上方"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:670
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4266,50 +4326,54 @@
 "的列表。虽然 FileZilla 会先执行一些测试看看服务器是否支持这个功能，但这些测试"
 "也可能会失败。"
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "密钥交换"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "密钥交换："
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "最低(&O)"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "语言"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1527
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "语言已经更改"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "最近修改"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "布局"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "同时下载限制(&D):"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "同时上传限制(&U):"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "限制本地端口"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "限制日志文件大小"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "限制:"
 
@@ -4317,7 +4381,7 @@
 msgid "Line length exceeded"
 msgstr "行长度已超出"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "已连接的对象"
 
@@ -4326,21 +4390,21 @@
 msgstr "监听套接字已关闭"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "列表:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "最低可用端口(&W):"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "本地"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "本地文件"
 
@@ -4356,7 +4420,7 @@
 msgid "Local file is not a valid filename."
 msgstr "本地文件不是一个有效的文件名。"
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "本地过滤器:"
 
@@ -4364,7 +4428,7 @@
 msgid "Local site:"
 msgstr "本地站点:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "地点:"
 
@@ -4372,52 +4436,52 @@
 msgid "Log file"
 msgstr "日志文件"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
-msgstr "升级检查日志:"
+msgstr "更新检查日志:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "日志"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
 msgstr ""
-"登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。所以无法恢复使用本地编"
+"登录数据包含非 ASCII 字符而且服务器可能无法识别 UTF-8。所以无法退回使用本地编"
 "码。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "登录过程已完全执行，但依然无法登录。正在终止。"
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "登录类型必须是“ask”或“interactive”(没有引号)。"
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
 msgstr "登录类型只能和 FTP URL 一起使用。参数必须是“%s”或“%s”"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "低"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "最低"
 
@@ -4425,7 +4489,7 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "最低的可用端口号必须在 1024 到 65535 之间。"
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
@@ -4450,7 +4514,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "错误的回应，服务器没有发送正确的行结尾"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4461,52 +4525,52 @@
 msgid "Manual transfer"
 msgstr "手动传输"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "匹配以下所有"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "匹配以下任意一个"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "不匹配以下内容"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "最大并发传输(&T):"
 
 #: ../../locales/../src/interface/Mainfrm.cpp:378
-#: ../../locales/../src/interface/Mainfrm.cpp:1855
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "消息日志"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "消息日志位置"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "分钟"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "下移(&D)"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "上移(&U)"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "我的电脑"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "我的文档"
 
@@ -4521,33 +4585,33 @@
 msgid "N/a"
 msgstr "不可用"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "名字"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1181
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "名称已经存在"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "该名称的书签已经存在。"
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "名字:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "需要输入过滤器名"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "需要输入正确的远程路径"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "需要指定字符编码"
 
@@ -4555,19 +4619,23 @@
 msgid "Network unreachable"
 msgstr "无法连接网络"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "从不"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "新文件夹(&F)"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "新标签(&T)"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "新建书签(&M)"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4580,23 +4648,23 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2116
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "新建书签"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "创建目录"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "%s 中的新功能和改进"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "新过滤器"
 
@@ -4606,15 +4674,15 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2092
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "新站点"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "在传输队列旁边"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "否"
 
@@ -4622,25 +4690,25 @@
 msgid "No category to export selected"
 msgstr "没有选定要导出的分类目录"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "没有给出命令，中止。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
 msgstr "没有设定外部 IP 地址，尝试使用默认值。"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "没有正在编辑的文件。"
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "没有给过滤器指定名称"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "没有给出主机，请输入一个主机。"
 
@@ -4648,25 +4716,25 @@
 msgid "No images available"
 msgstr "没有图像可用"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
 msgstr "队列里已没有文件！"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "没有给过滤器集合指定名称。"
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
 msgstr "文件格式没有关联程序"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
 msgstr "扩展名为“%s”的文件没有关联程序。"
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "没有搜索结果"
 
@@ -4684,25 +4752,25 @@
 msgid "No username given."
 msgstr "未指定用户名。"
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "无"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "没有选定项"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:852
-#: ../../locales/../src/engine/server.cpp:871
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
-msgstr "一般"
+msgstr "正常"
 
 #: ../../locales/../src/interface/queueview_failed.cpp:326
 #: ../../locales/../src/interface/queueview_failed.cpp:351
@@ -4710,15 +4778,15 @@
 msgstr "并非所有项目都可被重新列队以查看/编辑。"
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "未连接"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "没有连接到任何服务器"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:564
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "没有连接到任何服务器。"
 
@@ -4726,19 +4794,19 @@
 msgid "Not connected."
 msgstr "未连接。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "注意这个功能只在使用 FTP 协议时才支持。"
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "注意: 这只能工作于一般未加密的 FTP 连接。"
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "注意: 使用代理将强制使用被动模式进行 FTP 连接。"
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "小数位数:"
 
@@ -4746,141 +4814,147 @@
 msgid "Number of retries has to be between 0 and 99."
 msgstr "重试的次数必须在 0 和 99 之间。"
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "打开文件(&P)"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "确定"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
-msgstr "在接下来的几个页面里将要设置选择的传输模式以及回退模式(如果启用了)。"
+msgstr "在接下来的几个页面里将要设置选择的传输模式以及退回模式(如果启用)。"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "一次"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr "只有 FileZilla 以及操作系统的版本将被发送到服务器"
+#: resources.h:970
+msgid "Once a week"
+msgstr "每周一次"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "在系统的文件管理器中打开目录"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "打开站点管理器"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "打开站点管理器。"
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "打开站点管理器。右击查看站点列表。"
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "打开文件。"
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "打开 FileZilla 的设置对话框"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "打开为:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "打开失败"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "打开一个新的标签"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "打开站点管理器"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "打开目录列表过滤器对话框。右击切换过滤器。"
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "操作系统"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "检测到操作系统问题"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "组织:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "其他:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "概述"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "如果较新则覆盖(&I)"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "覆盖文件"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "如果大小不同则覆盖文件"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "如果大小不同或源文件较新则覆盖文件"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "如果源文件较新则覆盖文件"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "如果大小不同则覆盖(&D)"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "如果大小不同或源文件较新则覆盖(&Z)"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "所有者权限"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "所有者/组"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "当传输或其它操作时，阻止系统进入空闲睡眠(&R)"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "代理主机(&R):"
@@ -4889,27 +4963,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT 命令已受路由器或防火墙影响。"
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "被动(推荐)(&S)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "数据包"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2489
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "参数不是有效的 URL"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "密码(&W):"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "被动(推荐)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "被动模式"
@@ -4924,42 +4998,46 @@
 msgid "Password required"
 msgstr "要求提供密码"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "路径"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "无法为目录 %s 和子目录 %s 构造路径"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "路径未找到："
+
+#: resources.h:411
 msgid "Paths"
 msgstr "路径"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "等待移除"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "权限"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "权限"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "平台:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -4973,7 +5051,7 @@
 "请检查 http://filezilla-project.org/probe.php 服务器是否在运行，并再一次仔细"
 "检查您的设置。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -4981,7 +5059,7 @@
 "请检查您系统的包管理器以获取升级包或访问 http://filezilla-project.org 下载最"
 "新的 FileZilla 源文件。"
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5006,7 +5084,7 @@
 msgid "Please enter a custom time format."
 msgstr "请输入自定义时间格式。"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "请以格式 YYYY-MM-DD 输入一个日期，例如 2010-07-18。"
@@ -5017,20 +5095,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "请输入大于等于 0 %s/s 的下载速度限制。"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "请为新过滤器命名。"
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "请为过滤器复件输入新名称。"
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "请为过滤器“%s”输入新名称。"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "请为过滤器输入新名称。"
 
@@ -5051,11 +5129,11 @@
 "transfers."
 msgstr "请输入 1 到 10 之间的数字来设置并发传输任务数。"
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "请为这个服务器输入一个密码:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5070,11 +5148,11 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "请输入介于 5 和 9999 之间的超时秒数，或输入 0 禁用超时。"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "请为这个过滤器集合输入一个唯一的名称"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "请为这个服务器输入用户名:"
 
@@ -5086,17 +5164,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "请输入您用以获取外部地址的 URL"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "请输入升级时间间隔(至少 7 天)"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "请输入大于等于 0 %s/s 的上传速度限制。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:576
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5104,14 +5178,18 @@
 "请输入原始 FTP 命令。\n"
 "使用原始的 ftp 命令将会清空目录缓存。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
-msgstr "请输入将要创建的目录的名字:"
+msgstr "请输入将要创建的目录名:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "请输入将要创建的文件名:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "请为这个服务器输入用户名和密码:"
 
@@ -5129,7 +5207,7 @@
 "请在本向导的主动模式页输入您的外部 IP 地址。如果是动态地址或不知道外部地址，"
 "请使用外部解析器选项。"
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5142,7 +5220,7 @@
 msgstr ""
 "请确保 FileZilla 被允许建立向外的连接并且确保您输入了被正确解析的地址。"
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "请确认要求的区域配置已安装在系统里。"
 
@@ -5156,7 +5234,7 @@
 "请确保您的路由器使用可用的最新固件。还有您的路由器是否已被正确配置。必须要用"
 "手动端口转发，不要让您的路由器运行在所谓的“DMZ 模式”或才“Game 模式”下。"
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5167,7 +5245,7 @@
 "墙认为只有木马或其它有害软件才会用到的端口。这可能会引发一个错误的警告，您可"
 "以安全地忽略掉。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:718
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5175,13 +5253,13 @@
 "请注意保留时间戳只针对支持 MFMT 命令的 FTP，FTPS 和 FTPES 服务器上(不包含 "
 "SFTP)。"
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr "请注意，如果您过于频繁的尝试连接，或者间隔过短，某些服务器会阻止您。"
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5190,7 +5268,7 @@
 "请访问 http://filezilla-project.org/wiki/index.php/Date_and_Time_formatting "
 "以获取更多信息。"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
@@ -5205,38 +5283,38 @@
 "请再运行一遍本向导，可以解决网络环境的改变，或者突然碰到之前能用的服务器不能"
 "使用的问题。"
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "请选择一个动作:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "请选择您想要导入的分类。"
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "请选择您要使用的默认传输模式。"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
 msgstr "请为文件夹“%s”选择新的属性。"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
 msgstr "请为文件“%s”选择新的属性。"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
 msgstr "请为选定的目录选择新的属性。"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
 msgstr "请为选定的文件和目录选择新的属性。"
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
 msgstr "请为选定的文件选择新的属性。"
 
@@ -5248,34 +5326,34 @@
 "called 'DMZ mode' or 'game mode'. Things like protocol inspection or "
 "protocol specific 'fixups' have to be disabled"
 msgstr ""
-"请升级您的防火墙并确保您的路由器使用可用的最新固件。还有您的路由器是否已被正"
+"请更新您的防火墙并确保您的路由器使用可用的最新固件。还有您的路由器是否已被正"
 "确配置。您必须要用手动设定端口转发。不要让您的路由器运行在所谓的“DMZ 模"
 "式”或“Game 模式”下。还要停用类似协议检查或协议修正之类的选项"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr "请访问 http://filezilla-project.org 获取更多关于 FileZilla 的信息。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "请访问 http://filezilla-project.org 下载最新的版本。"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "邮编:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1817
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "预定义的站点"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:717
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "保留文件时间戳"
 
@@ -5283,47 +5361,58 @@
 msgid "Preview:"
 msgstr "预览:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:914
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
 msgstr "主连接和数据连接的证书不匹配。"
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "打印输出与 FileZilla 启动相关的诊断信息"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "打印版本信息至标准输出(stdout)并退出"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "目录优先(默认)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "优先级"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "隐私政策:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"隐私政策：只有您所使用的 FileZilla、操作系统版本及 CPU 架构会被发送到服务器。"
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "私钥(&K):"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "协议(&T):"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "代理密码(&X):"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "处理队列(&Q)"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "协议："
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "代理端口(&P):"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "代理用户(&U):"
 
@@ -5331,12 +5420,16 @@
 msgid "Proxy authentication failed"
 msgstr "代理认证失败"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "代理握手失败: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "代理主机以“[”开始，但没有闭合括号。"
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5351,23 +5444,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "代理请求失败: CONNECT 回复了未知的地址类型"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "已设定代理服务器，但代理地址或端口设置无效"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "公钥认证"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "公钥算法:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "公共权限"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "队列已全部处理"
 
@@ -5386,39 +5479,39 @@
 msgid "Queue: empty"
 msgstr "队列: 空"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "列队的文件"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "列队中:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "重启系统(&E)"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "远程目录(&E)"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "重置并重新请求所选的文件(&E)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "原始 FTP 命令"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "读取(&A)"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "刷新(&F)"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "重命名(&N)"
 
@@ -5428,63 +5521,71 @@
 "routers and firewalls accordingly."
 msgstr "重新执行向导，仔细检查您的设置并正确配置所有路由器和防火墙。"
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "读取(&D)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "只读"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1095
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "真的要取消当前操作吗？"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "确实要删除 %d 个目录及其内容？"
+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:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "确实要删除 %d 个文件？"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "确实要删除 %s 和 %s？"
+msgid "Really delete %s and %s from the server?"
+msgstr "确实要从服务器上删除 %s 和 %s 吗？"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "真的要从服务器上删除所有选定的文件和/或目录吗？"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "真的要删除所有选定的文件和/或目录吗？"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "真的要从您的计算机上删除所有选定的文件和/或目录吗？"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "原因"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "马上重启"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "递归处理子目录(&U)"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "收到了一个疑似使用 EBCDIC 编码的目录列表。"
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "接收到超过 1000 个字符的行，中止。"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "已收到的数据被损坏"
 
@@ -5496,11 +5597,11 @@
 "连接到服务器时无法清除重新连接信息。\n"
 "如果您要继续，您的连接将会断开。"
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "重连设置"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "重新连接上一次使用过的服务器"
 
@@ -5508,34 +5609,38 @@
 msgid "Redirection to invalid address"
 msgstr "重定向到无效的地址"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "刷新文件和文件夹列表"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "记住密码？"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "远程"
 
-#: ../../locales/../src/engine/tlssocket.cpp:837
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
 msgstr "远程证书不被信任。"
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "远程文件"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "远程文件搜索"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "远程过滤器:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "远程路径"
 
@@ -5548,7 +5653,7 @@
 "默认远程路经无法解析。请确认是否是有效的绝对路径并且被当前站点的服务器模式(%"
 "s)支持。"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1085
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5559,7 +5664,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr "远程路经无法解析。请确认是否是有效的绝对路径。"
 
@@ -5567,11 +5672,11 @@
 msgid "Remote path could not be parsed."
 msgstr "无法解析远程路经。"
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "远程路径处理:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "远程路径:"
 
@@ -5579,34 +5684,34 @@
 msgid "Remote site:"
 msgstr "远程站点:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "删除所有(&A)"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "删除选定(&S)"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "重命名文件"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "重命令选定的文件夹"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
 msgstr "重命令选定的文件和文件夹"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
 msgstr "“%s”改名为“%s”"
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "报告错误以及请求功能"
 
@@ -5618,74 +5723,74 @@
 msgid "Require implicit FTP over TLS"
 msgstr "要求隐式的 FTP over TLS"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "重置并重新请求所有(&A)"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "正在解析 %s 的地址"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "正在解析主机名称"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "响应:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "结果:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "继续文件传输"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr "如果服务器使用不同格式的行结尾，继续传输 ASCII 格式文件可能导致问题。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "读取目录列表..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "从 %s 得到外部 IP 地址"
 
-#: ../../locales/../src/engine/tlssocket.cpp:895
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "根证书不被信任"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "显示正在被编辑的文件(&H)..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "启动时显示站点管理器(&H)"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "关闭系统(&H)"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "停止(&T)"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "同步浏览(&Y)"
 
@@ -5693,31 +5798,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite："
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "保存设置吗？"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "您的系统管理员禁止了保存密码。"
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "您禁止了保存密码。"
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "正在检查加入到队列中的文件"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "正在检查要上传的文件"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "搜索条件(&C):"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "搜索目录(&D):"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "递归搜索文件。"
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "在服务器上搜索文件"
 
@@ -5730,25 +5849,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "参见: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "选择服务器(&C)"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "选择页面(&P):"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "选择主题"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "请选择目标文件存在时的默认操作。"
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "选择默认编辑器"
 
@@ -5764,7 +5883,7 @@
 "the queue."
 msgstr "请选择仅针对队列中已选择文件的默认文件存在操作。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "选择包的下载地址"
 
@@ -5785,7 +5904,7 @@
 msgstr "选择需要导出设定的文件"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2169
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "选择用于导出站点的文件"
 
@@ -5801,12 +5920,12 @@
 msgid "Select filename for converted keyfile"
 msgstr "为转换的密钥文件输入文件名"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "选择这些文件将被如何打开。"
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
 msgstr "选择下载目标文件夹。"
 
@@ -5814,15 +5933,15 @@
 msgid "Select target filename"
 msgstr "选择目标文件名"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "选择要导出的分类:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "请选择您要删除的个人信息。"
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5834,7 +5953,7 @@
 msgid_plural "Selected %d directories."
 msgstr[0] "选择了 %d 个文件夹。"
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5852,7 +5971,7 @@
 msgid_plural "Selected %d files. Total size: At least %s"
 msgstr[0] "选择了 %d 个文件。大小总共: 至少 %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "选择了 %s 和 %s 进行传输。"
@@ -5867,13 +5986,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "选择了 %s 和 %s。大小总共: 至少 %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "所选的编辑器不存在。"
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "已在编辑所选的文件。"
 
@@ -5881,15 +6000,15 @@
 msgid "Selected file is already loaded"
 msgstr "所选的文件已经加载。"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "所选的文件已打开"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "所选文件已在编辑"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "选择的过滤器只针对本地文件。"
 
@@ -5905,79 +6024,84 @@
 msgid "Selected port usually in use by a different protocol."
 msgstr "选择的端口通常是被其他协议使用。"
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "发出 FTP 保持连接指令(&K)"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "发送自定义命令到服务器，如果可用的话"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "发出保持连接指令"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "序列号:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "服务器类型(&T):"
 
-#: ../../locales/../src/engine/tlssocket.cpp:721
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "服务器没有正常的关闭 TLS 连接"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "服务器不支持非 ASCII 字符。"
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "服务器不支持续传大于 %d GB 的文件。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, 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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "服务器不支持续传大于 2 GB 的文件。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "服务器不支持续传大于 4 GB 的文件。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, 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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr "服务器可能需要帐号。请尝试在站点管理器里指定一个帐号"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "服务器发送了空路径。"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr "服务器传送了一个附加的登录提示。您需要使用交互式的登录方式。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr "服务器发回了不可路由的地址。被动模式失败。"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -5995,89 +6119,100 @@
 msgid "Server sent unexpected reply."
 msgstr "服务器发送了意外的回应。"
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "服务器至本地 MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "服务器至本地密码:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "服务器类型(&T):"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "服务器/本地文件"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "服务器:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "会话细节"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "设定优先级(&P)"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
 msgstr "修改“%s”的权限为“%s”"
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "SetSocketBufferSize 未带套接字调用"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "设置"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "显示目录列表(&R)"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "显示欢迎对话框(&W)..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2341
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "要显示两边的目录树并进行比较吗？"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "显示可用的 TLS 密码"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "显示这个帮助对话框"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "马上关闭系统"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "签名算法："
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "站点管理器(&M)"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "站点管理器"
 
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "站点管理器 - 无法记住密码"
+
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 #: ../../locales/../src/interface/sitemanager_dialog.cpp:956
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:965
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:982
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:996
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1052
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1063
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1088
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp: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
 msgid "Site Manager - Invalid data"
 msgstr "站点管理器 - 无效数据"
 
@@ -6088,8 +6223,8 @@
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "站点不存在。"
 
@@ -6099,8 +6234,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "站点路径是损坏的。"
 
@@ -6118,11 +6253,11 @@
 "站点特定书签需要将服务器保存在站点管理器中。\n"
 "将当前连接加入站点管理器码？"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "大小"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "文件大小格式"
 
@@ -6131,49 +6266,49 @@
 msgid "Size unknown"
 msgstr "大小未知"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "跳过文件"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "跳过下载 %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "跳过上传 %s"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1163
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "部分文件正被编辑或是需要上传。"
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
 msgstr "一些配置错误的远程服务器放在了路由器后面，可能会返回它们的本地地址。"
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "在原位置排序目录列表"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "对比目录时不能改变目录排序。"
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "正在排序"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "排序模式(&M):"
 
@@ -6185,20 +6320,20 @@
 msgid "Source and target file may not be the same"
 msgstr "来源和目标文件不能相同"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "拖放操作的来源和目标相同"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "源文件:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "速度限制"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "速度限制"
 
@@ -6210,7 +6345,15 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "速度限制已启用，点击修改。"
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "稳定和 Beta 版本"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "仅稳定版本"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
 msgstr "立即开始传输(&I)"
 
@@ -6218,43 +6361,47 @@
 msgid "Start with opened Site Manager"
 msgstr "启动时打开站点管理器"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "开始下载 %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "开始上传 %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "启动给定路径下的本地站点"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "州或省:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "状态"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "状态:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "停止并删除所有(&A)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "街道:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "证书主题"
 
@@ -6262,54 +6409,55 @@
 msgid "Successful transfers"
 msgstr "成功的传输"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "测试结果总结:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
 msgstr "指向文件的符号链接不受该选择的影响，这种符号链接总是被删除。"
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "同步浏览"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "同步浏览已经被关闭。"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:125
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "语法错误"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2491
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "命令行语法错误"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "系统"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "工具栏(&O)"
 
@@ -6317,11 +6465,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL 连接已建立，正在发送 HTTP 请求"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
 msgstr "TLS/SSL 连接建立，等待欢迎消息..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL 连接已建立。"
 
@@ -6329,23 +6477,27 @@
 msgid "TTL expired"
 msgstr "TTL 超时"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "目标文件已经存在"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "目标文件:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "目标文件名已经存在！"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "目标文件名已经存在，是否继续？"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "测试结果"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "正在检测服务器能否续传"
 
@@ -6377,11 +6529,11 @@
 msgstr "您输入的地址是: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "无法添加该书签。"
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "无法清除该书签。"
 
@@ -6393,19 +6545,24 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "自定义登录过程不能为空。"
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "无法建立数据连接：%s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "默认的文本文件编辑器不存在。"
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "默认的文本文件编辑器是“%s”。"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "您输入的过滤器名称已经存在，请另选一个名称。"
 
@@ -6424,9 +6581,9 @@
 "文件 %s 已经存在。\n"
 "请输入一个新的名字:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
@@ -6447,9 +6604,9 @@
 msgid "The file '%s' could not be loaded."
 msgstr "文件“%s”无法加载。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6458,8 +6615,8 @@
 "无法打开文件“%s”:\n"
 "系统中没有设置此类型文件关联的程序。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
@@ -6499,7 +6656,7 @@
 "文件“%s”有被加密。加密的密钥文件不被 FileZilla 支持。\n"
 "您想转换此文件到软件支持的不加密的格式吗？"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "所选的用作默认编辑器的文件不存在。"
 
@@ -6533,11 +6690,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "以下字符将被替换: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "正在编辑以下文件:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "免费且开源的 FTP 解决方案"
 
@@ -6545,7 +6702,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "无法保存该全局书签。"
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6572,23 +6729,23 @@
 "port."
 msgstr "最低的可用端口必须小于或等于最高的。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 "最新版已下载，点击完成按钮关闭 FileZilla 并开始安装最新版。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 "最新版已下载，请您依照安装当前版本的方法进行安装。"
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "队列将不会被保存。"
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, c-format
 msgid ""
 "The remote directory '%s' is not below the synchronization root (%s).\n"
@@ -6601,22 +6758,22 @@
 msgid "The selected categories have been imported."
 msgstr "已导入所选的分类。"
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "所选的文件可导入以下分类:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "所选的文件正在被编辑:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "所选文件仍被其它程序打开，请关闭它。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6634,7 +6791,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "服务器发送了意外的或不可识别的回应。"
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "服务器使用以下的字符集编码来处理文件名:"
 
@@ -6644,7 +6801,7 @@
 "certificate to make sure the server can be trusted."
 msgstr "服务器的证书未知。请小心验证证书以确信该服务器可信任。"
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6653,7 +6810,7 @@
 "该服务器的主机密匙与缓存的密钥不符。这意味着管理员更改了主机密钥或者您正在尝"
 "试连接到伪装成该服务器的另一台计算机。"
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6665,15 +6822,15 @@
 "settings to have effect."
 msgstr "已导入设置，您需要重新启动 FileZilla 使所有设置生效。"
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "除非您按下取消，否则系统将会马上重启。"
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "除非您按下取消，否则系统将会马上关闭。"
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6681,7 +6838,7 @@
 "目标文件已经存在。\n"
 "请选择处理方法。"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "测试不成功。您真的要保存配置吗？"
 
@@ -6689,11 +6846,11 @@
 msgid "Themes"
 msgstr "主题"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "这个过滤器集合不能被删除。"
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "这个过滤器集合不能重命名。"
 
@@ -6703,62 +6860,62 @@
 "FileZilla."
 msgstr "这说明某些路由器或防火墙仍在干扰 FileZilla。"
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr "只有您不在路由器后面的时候才会可用，否则您的系统会只返回您的内部地址。"
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr "本向导会帮助您正确地配置任何您使用的路由器和防火墙，并且测试您的配置。"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "时间"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "时间格式"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "超时秒数(&O):"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "超时"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr "时差: 服务器为 %d 秒。 本地: %d 秒。 相差: %d 秒。"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "标题:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2339
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "两边的文件列表必须排列整齐才能比较目录。"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2340
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr "两边的目录树必须同时显示或隐藏才能执行此动作。"
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr "为了支持进行公钥认证，FileZilla 需要知道使用的私钥。"
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6774,7 +6931,7 @@
 "绿: 与另一边的未标记文件比较，文件较新\n"
 "红: 文件大小不同"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6783,23 +6940,23 @@
 "打开或关闭同步浏览。\n"
 "如果启用，导航本地目录时将相应的修改服务器目录，反之亦然。"
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "切换处理传输队列"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "切换本地目录树显示"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "切换消息记录显示"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "切换远程目录树显示"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "切换传输队列显示"
 
@@ -6812,37 +6969,37 @@
 msgstr "太多重定向"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "追踪:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "传输"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "传输目录(&D)"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "传输类型(&T)"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "传输模式"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "传输队列"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "传输设置"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "传输连接被打断: %s"
@@ -6851,8 +7008,8 @@
 msgid "Transferred data got tainted."
 msgstr "已传输的数据被损坏。"
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "正在传输"
 
@@ -6860,69 +7017,69 @@
 msgid "Transfers"
 msgstr "传输"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "传输完成"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
 msgstr "把没有扩展名的文件作为 ASCII 格式文件对待(&W)"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
 msgstr "把以下的文件类型作为 ASCII 格式文件对待(&F):"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "信任改变后的主机密钥:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "信任新的主机密钥:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "信任该新密钥并继续连接？"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "信任该证书并继续连接?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "信任该主机并继续连接？"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "类型"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "FTP 代理服务器类型:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "代理服务器类型:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "上传(&P)"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "上传限制(&P):"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
 msgstr "可以的话使用文件格式关联(&S)"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "使用系统默认值(&S)"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@&HOST"
 
@@ -6931,16 +7088,16 @@
 msgid "Unassigned error code %d"
 msgstr "未知错误代码 %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "单位:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "未知"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
 msgstr "未知 FTP 代理服务器类型，无法生成登录过程。"
 
@@ -6960,7 +7117,7 @@
 msgstr ""
 "打开文件时出现未知错误。确认该文件可以被存取而且是一个格式正确的 XML 文档。"
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "未定义的快捷键"
 
@@ -6989,7 +7146,7 @@
 "mode has to be used."
 msgstr "除非问题被修复，主动模式 FTP 不会工作，只能使用被动模式。"
 
-#: ../../locales/../src/engine/tlssocket.cpp:866
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
 msgstr "不支持的证书类型"
 
@@ -6997,25 +7154,24 @@
 msgid "Unsupported redirect"
 msgstr "不支持的重定向"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "上传并放弃修改(&L)"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "更新检查"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "更新向导"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "更新"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "上传"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "上传失败"
 
@@ -7028,59 +7184,59 @@
 msgid "Upload limit: none"
 msgstr "上传限制: 无"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
 msgstr "上传选定的目录"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "上传选定的文件和目录"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
 msgstr "上传该文件回服务器？"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "上传该文件到服务器？"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "正在上传"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "正在上传和等待移除"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "正上传并放弃修改"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "使用自定义的字符集(&C)"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "使用自定义编辑器(&C):"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "使用默认的文本编辑器(&D)"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "使用同步浏览(&S)"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr "如果服务器支持就使用 UTF-8，否则使用本地编码。"
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "使用默认动作"
 
@@ -7088,36 +7244,36 @@
 msgid "Use plain FTP"
 msgstr "使用普通 FTP"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "使用当前连接到的服务器"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "使用从站点管理器选择的服务器"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "使用系统默认值(&D)"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "使用以下 IP 地址:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "使用以下端口范围:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "使用服务器的外部地址来代替"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
 msgstr "使用这个选项，如果您在路由器后面，并且有一个静态外部 IP 地址。"
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7126,82 +7282,82 @@
 "使用这个选项，如果您有一个动态 IP 地址。只要使用主动模式，FileZilla 就会在每"
 "次会话时联系以上服务器。只有您使用的 FileZilla 的版本号会被提交到服务器。"
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "用户:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1028
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "用户名不能是一系列的空格"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "正在使用代理 %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "使用错误的字符集可能导致文件名显示不正确。"
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "使用该向导，您可以检查 FileZilla 可用的更新。"
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "有效期开始:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "有效期截止:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "来自 wxWidgets 的详细日志消息"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1056
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
 msgstr "正在验证证书..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "版本:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "非常高"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "已经设置了显示隐藏的选项，但是服务器端并未支持"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "查看/编辑"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "可见栏目"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "写入(&R)"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
 msgstr "等待"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
 msgstr "等待浏览连接"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
 msgstr "等待密码"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
 msgstr "等待传输取消"
 
@@ -7209,7 +7365,7 @@
 msgid "Waiting to retry..."
 msgstr "正在等待重试..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7238,11 +7394,11 @@
 "除非您停用 Windows 防火墙或是应用层网关服务，\n"
 "否则 FileZilla 在大型传输时将会超时。"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "警告，忽略从错误 IP 接入的数据。"
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7256,33 +7412,44 @@
 "\n"
 "您真的要检查每日编译版吗？"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "警告: 潜在的安全隐患！"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "欢迎使用 FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
 msgstr "更新"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "更新:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"若让 FileZilla 记住密码，在重启 FileZilla 进行连接时就无须重新输入您的密码。"
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr "启用后，下载这种文件时，文件名中本地操作系统不支持的字符将被替换。"
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "宽屏"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "您想让 FileZilla 记住密码吗？"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "写入(&I)"
 
@@ -7295,25 +7462,31 @@
 msgid "Wrong line endings"
 msgstr "错误的行结尾"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "是"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "您似乎正在使用纯 IPv6 主机。此向导不支持这种环境。"
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "您正在使用最新的 FileZilla。请过段时间再来检查。"
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "您总是可以在帮助菜单中再次打开这个对话框。"
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "你可以不填写端口而使用默认端口。"
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7334,18 +7507,18 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "您没有输入该文件的新的名字。要覆盖这个文件吗？"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "您选择了至少一个符号链接。"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "您选择编辑超过 10 个文件，真的要继续吗？"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
@@ -7356,7 +7529,7 @@
 msgid "You have to enter a hostname."
 msgstr "请输入一个主机名称。"
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "您必须输入一个本地目录。"
 
@@ -7365,17 +7538,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "请输入正确的 IP 地址。"
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "您必须输入一个可写入的本地目录。"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1038
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "您需要输入账户名称"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1009
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "请输入一个用户名称。"
 
@@ -7393,34 +7566,34 @@
 msgid "You need to enter a name for the log file."
 msgstr "请为日志文件输入一个名字。"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "您必须输入一个合适的引用命令。"
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "您必须输入一个代理主机。"
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "您必须输入一个代理服务器端口(从 1 到 65535)"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1098
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
 msgstr "您至少要输入一个路径，不支持空书签。"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 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:1063
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7448,44 +7621,49 @@
 "should work properly."
 msgstr "连接到其它服务应该没有问题，文件传输也能正常工作了。"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "之后"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "之前"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "开始于"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "字节"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "包含"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "不包含"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "不相等"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "结束于"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "相等"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "文件"
 
@@ -7503,82 +7681,130 @@
 "fzputtygen 无法启动。\n"
 "请确认其执行程序和 FileZilla 执行程序在相同的目录内。"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "fzsftp 无法启动"
 
-#: ../../locales/../src/engine/tlssocket.cpp:904
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers 没有返回证书"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "大于"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "组可执行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "组可读"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "组可写"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "等于"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "已设置"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "未设置"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "小于"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "匹配正则表达式 (regex)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "所有者可执行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "所有者可读"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "所有者可写"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "未知"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "全体可执行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "全体可读"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "全体可写"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "&Copy"
+#~ msgstr "复制(&C)"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "启用自动检查更新功能(&E)"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "检查更新的间隔天数(&N):"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(至少 7 天)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "自动检查更新"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "检查测试和候选发布版的 FileZilla(&B)"
+
+#~ msgid "Cop&y"
+#~ msgstr "复制(&Y)"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "请输入升级时间间隔(至少 7 天)"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "隐私政策:"
+
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s 字节 (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s 字节 (%d.%d MB/s)"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "记住这次和以后的所有密码(&R)"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "错误的 opState：%d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "重复的过滤器名称"
 
diff -Nru filezilla-3.5.3/locales/zh_TW.po filezilla-3.7.3~precise/locales/zh_TW.po
--- filezilla-3.5.3/locales/zh_TW.po	2011-11-08 20:33:05.000000000 +0000
+++ filezilla-3.7.3~precise/locales/zh_TW.po	2013-06-18 20:02:24.000000000 +0000
@@ -2,8 +2,8 @@
 msgstr ""
 "Project-Id-Version: \n"
 "Report-Msgid-Bugs-To: \n"
-"POT-Creation-Date: 2011-11-08 19:39+0100\n"
-"PO-Revision-Date: 2011-11-03 01:31+0800\n"
+"POT-Creation-Date: 2013-06-10 20:28+0200\n"
+"PO-Revision-Date: 2013-06-15 19:18+0800\n"
 "Last-Translator: Kene Lin <kenelin@gmail.com>\n"
 "Language-Team: milo <milo.tw@gmail.com>\n"
 "MIME-Version: 1.0\n"
@@ -15,16 +15,16 @@
 "Plural-Forms: nplurals=1; plural=0;\n"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:65
-#: ../../locales/../src/interface/statuslinectrl.cpp:225
+#: ../../locales/../src/interface/statuslinectrl.cpp:230
 msgid "%H:%M:%S elapsed"
 msgstr "經過時間 %H:%M:%S"
 
 #: ../../locales/../src/interface/statuslinectrl.cpp:69
-#: ../../locales/../src/interface/statuslinectrl.cpp:233
+#: ../../locales/../src/interface/statuslinectrl.cpp:238
 msgid "%H:%M:%S left"
 msgstr "剩餘時間 %H:%M:%S"
 
-#: resources.h:778
+#: resources.h:799
 #, no-c-format
 msgid ""
 "%a - Account (Lines containing this will be omitted if not using Account "
@@ -39,9 +39,9 @@
 msgid_plural "%d directories"
 msgstr[0] "%d 個目錄"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1696
-#: ../../locales/../src/interface/search.cpp:776
-#: ../../locales/../src/interface/search.cpp:1029
+#: ../../locales/../src/interface/RemoteListView.cpp:1721
+#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:1030
 #, c-format
 msgid "%d directory with its contents"
 msgid_plural "%d directories with their contents"
@@ -49,9 +49,9 @@
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:62
 #: ../../locales/../src/interface/filelist_statusbar.cpp:85
-#: ../../locales/../src/interface/RemoteListView.cpp:1695
-#: ../../locales/../src/interface/search.cpp:775
-#: ../../locales/../src/interface/search.cpp:1028
+#: ../../locales/../src/interface/RemoteListView.cpp:1720
+#: ../../locales/../src/interface/search.cpp:776
+#: ../../locales/../src/interface/search.cpp:1029
 #, c-format
 msgid "%d file"
 msgid_plural "%d files"
@@ -69,7 +69,7 @@
 msgid_plural "%d files. Total size: At least %s"
 msgstr[0] "%d 個檔案. 總共大小: 至少 %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:2937
+#: ../../locales/../src/interface/QueueView.cpp:2934
 #, c-format
 msgid "%d files added to queue"
 msgstr "%d 個檔案加入佇列"
@@ -80,31 +80,21 @@
 msgid_plural "%d seconds"
 msgstr[0] "%d 秒"
 
-#: resources.h:775
+#: resources.h:796
 msgid "%h - Host"
 msgstr "%h - 主機"
 
-#: resources.h:777
+#: resources.h:798
 #, no-c-format
 msgid "%p - Password"
 msgstr "%p - 密碼"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:181
-#, c-format
-msgid "%s (%d B/s)"
-msgstr "%s (%d B/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:179
-#, c-format
-msgid "%s (%d.%d KB/s)"
-msgstr "%s (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/statuslinectrl.cpp:177
+#: ../../locales/../src/interface/statuslinectrl.cpp:186
 #, c-format
-msgid "%s (%d.%d MB/s)"
-msgstr "%s (%d.%d MB/s)"
+msgid "%s (%s/s)"
+msgstr "%s (%s/s)"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:184
+#: ../../locales/../src/interface/statuslinectrl.cpp:189
 #, c-format
 msgid "%s (? B/s)"
 msgstr "%s (? B/s)"
@@ -119,7 +109,7 @@
 msgid "%s - Not yet valid!"
 msgstr "%s - 尚未生效!"
 
-#: resources.h:779
+#: resources.h:800
 #, no-c-format
 msgid "%s - Proxy user"
 msgstr "%s - Proxy 使用者"
@@ -140,27 +130,17 @@
 msgid_plural "%s bytes"
 msgstr[0] "%s Byte"
 
-#: ../../locales/../src/interface/updatewizard.cpp:904
+#: ../../locales/../src/interface/updatewizard.cpp:918
 #, c-format
 msgid "%s bytes"
 msgstr "%s bytes"
 
-#: ../../locales/../src/interface/updatewizard.cpp:888
+#: ../../locales/../src/interface/updatewizard.cpp:902
 #, c-format
-msgid "%s bytes (%d B/s)"
-msgstr "%s bytes (%d B/s)"
+msgid "%s bytes (%s/s)"
+msgstr "%s bytes (%s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:886
-#, c-format
-msgid "%s bytes (%d.%d KB/s)"
-msgstr "%s bytes (%d.%d KB/s)"
-
-#: ../../locales/../src/interface/updatewizard.cpp:884
-#, c-format
-msgid "%s bytes (%d.%d MB/s)"
-msgstr "%s bytes (%d.%d MB/s)"
-
-#: ../../locales/../src/interface/FileZilla.cpp:701
+#: ../../locales/../src/interface/FileZilla.cpp:711
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -173,7 +153,7 @@
 "\n"
 "請再次下載 FileZilla. 如果這個問題依舊持續, 請回報此錯誤."
 
-#: ../../locales/../src/interface/FileZilla.cpp:795
+#: ../../locales/../src/interface/FileZilla.cpp:805
 #, c-format
 msgid ""
 "%s could not be found. Without this component of FileZilla, SFTP will not "
@@ -194,152 +174,148 @@
 msgid "%s with %d bits"
 msgstr "%s with %d bits"
 
-#: resources.h:776
+#: resources.h:797
 #, no-c-format
 msgid "%u - Username"
 msgstr "%u - 使用者名稱"
 
-#: resources.h:780
+#: resources.h:801
 #, no-c-format
 msgid "%w - Proxy password"
 msgstr "%w - Proxy 密碼"
 
-#: resources.h:555
+#: resources.h:572
 msgid "&About..."
 msgstr "關於(&A)..."
 
-#: resources.h:86 resources.h:384
+#: resources.h:95 resources.h:394
 msgid "&Account:"
 msgstr "帳號(&A):"
 
-#: resources.h:101 resources.h:680 resources.h:744
+#: resources.h:110 resources.h:701 resources.h:765
 msgid "&Active"
 msgstr "主動模式(&A)"
 
-#: resources.h:546
+#: resources.h:563
 msgid "&Add bookmark..."
 msgstr "新增書籤(&A)..."
 
-#: resources.h:559 resources.h:576
+#: resources.h:576 resources.h:593
 msgid "&Add files to queue"
 msgstr "加入檔案到佇列(&A)"
 
-#: resources.h:788
+#: resources.h:809
 msgid "&Add keyfile..."
 msgstr "加入金鑰檔案(&A)..."
 
-#: resources.h:630 resources.h:649
+#: resources.h:651 resources.h:670
 msgid "&Add to queue"
 msgstr "加入到佇列(&A)"
 
-#: resources.h:95
+#: resources.h:104
 msgid "&Adjust server timezone offset:"
 msgstr "調整伺服器時區偏移量(&A):"
 
-#: resources.h:23
+#: resources.h:28
 msgid "&Always trust certificate in future sessions."
 msgstr "總是信任未來連線的憑證(&A)"
 
-#: resources.h:182
+#: resources.h:192
 msgid "&Always trust this host, add this key to the cache"
 msgstr "總是信任這台主機, 並且加入其主機金鑰到快取裡(&A)"
 
-#: resources.h:940
+#: resources.h:961
 msgid "&Always use default editor"
 msgstr "總是使用預設編輯器(&A)"
 
-#: resources.h:427
+#: resources.h:437
 msgid "&Always use selection for unassociated files"
 msgstr "總是對所有無檔案關聯的檔案使用這個選項(&A)"
 
-#: resources.h:65
+#: resources.h:74
 msgid "&Always use this action"
 msgstr "總是使用這個動作(&A)"
 
-#: resources.h:756
+#: resources.h:777
 msgid "&Ask your operating system for the external IP address"
 msgstr "對您的作業系統詢問外部 IP Address (&A)"
 
-#: resources.h:528 resources.h:660 resources.h:825
+#: resources.h:545 resources.h:681 resources.h:846
 msgid "&Auto"
 msgstr "自動(&A)"
 
-#: resources.h:107
+#: resources.h:116
 msgid "&Autodetect"
 msgstr "自動偵測(&A)"
 
-#: resources.h:530 resources.h:662 resources.h:827
+#: resources.h:547 resources.h:683 resources.h:848
 msgid "&Binary"
 msgstr "二進位檔案(&B)"
 
-#: resources.h:900
+#: resources.h:921
 msgid "&Binary prefixes using SI symbols. (e.g. 1 KB = 1024 bytes)"
 msgstr "使用 SI 式符號的二進制字首. (即 1 KB = 1024 bytes) (&B)"
 
-#: resources.h:545
+#: resources.h:562
 msgid "&Bookmarks"
 msgstr "書籤(&B)"
 
-#: resources.h:92 resources.h:366 resources.h:403 resources.h:409
-#: resources.h:426 resources.h:444 resources.h:937 resources.h:959
+#: resources.h:101 resources.h:376 resources.h:413 resources.h:419
+#: resources.h:436 resources.h:454 resources.h:958 resources.h:984
 msgid "&Browse..."
 msgstr "瀏覽(&B)..."
 
-#: resources.h:815
+#: resources.h:836
 #, no-c-format
 msgid "&Burst tolerance:"
 msgstr "暴衝容忍度(&B):"
 
-#: resources.h:128 resources.h:131 resources.h:197 resources.h:488
-#: resources.h:728
+#: resources.h:137 resources.h:140 resources.h:207 resources.h:498
+#: resources.h:505 resources.h:749
 msgid "&Cancel"
 msgstr "取消(&C)"
 
-#: resources.h:235
+#: resources.h:245
 msgid "&Check for beta versions of FileZilla"
 msgstr "檢查 Beta 測試版本的 FileZilla(&C)"
 
-#: resources.h:505
+#: resources.h:522
 msgid "&Clear private data..."
 msgstr "清除私人資料(&C)..."
 
-#: resources.h:603
+#: resources.h:622
 msgid "&Close FileZilla"
 msgstr "關閉 FileZilla (&C)"
 
-#: resources.h:670
+#: resources.h:691
 msgid "&Configure speed limits..."
 msgstr "組態速度限制(&C)..."
 
-#: resources.h:533
+#: resources.h:550
 msgid "&Configure..."
 msgstr "組態(&C)..."
 
-#: resources.h:113
+#: resources.h:122
 msgid "&Connect"
 msgstr "連線(&C)"
 
-#: resources.h:218
-msgid "&Copy"
-msgstr "複製(&C)"
-
-#: resources.h:493
+#: resources.h:510
 msgid "&Copy current connection to Site Manager..."
 msgstr "複製目前的連線到站台管理員(&C)..."
 
-#: resources.h:172 resources.h:612
+#: resources.h:182 resources.h:631
 msgid "&Copy to clipboard"
 msgstr "複製到剪貼簿(&C)"
 
-#: resources.h:617
+#: resources.h:636
 msgid "&Crash"
 msgstr "毀壞(&C)"
 
-#: resources.h:567 resources.h:581 resources.h:632 resources.h:653
+#: resources.h:584 resources.h:598 resources.h:653 resources.h:674
 msgid "&Create directory"
 msgstr "新增目錄(&C)"
 
-#: resources.h:665
+#: resources.h:686
 msgid "&Create new tab"
 msgstr "新增頁籤(&C)"
 
@@ -347,644 +323,652 @@
 msgid "&Debug"
 msgstr "偵錯(&D)"
 
-#: resources.h:967
+#: resources.h:992
 msgid "&Debug information in message log:"
 msgstr "訊息記錄中的偵錯資訊(&D):"
 
-#: resources.h:933
+#: resources.h:954
 msgid "&Default editor:"
 msgstr "預設編輯器(&D):"
 
-#: resources.h:526 resources.h:595
+#: resources.h:543 resources.h:614
 msgid "&Default file exists action..."
 msgstr "預設檔案存在動作(&D)..."
 
-#: resources.h:738
+#: resources.h:759
 msgid "&Delay between failed login attempts:"
 msgstr "登入嘗試失敗之間的延遲(&D):"
 
-#: resources.h:76 resources.h:202 resources.h:216 resources.h:416
-#: resources.h:570 resources.h:655
+#: resources.h:85 resources.h:212 resources.h:226 resources.h:426
+#: resources.h:587 resources.h:676
 msgid "&Delete"
 msgstr "刪除(&D)"
 
-#: resources.h:457
+#: resources.h:467
 msgid "&Delete symlink"
 msgstr "刪除軟連結(&D)"
 
-#: resources.h:511
+#: resources.h:528
 msgid "&Directory comparison"
 msgstr "目錄比對(&D)"
 
-#: resources.h:325
+#: resources.h:335
 msgid "&Discard local file then download and edit file anew"
 msgstr "略過本地而另行下載編輯檔案(&D)"
 
-#: resources.h:539
+#: resources.h:556
 msgid "&Disconnect"
 msgstr "中斷連線(&D)"
 
-#: resources.h:604
+#: resources.h:623
 msgid "&Disconnect from server"
 msgstr "從伺服器離線(&D)"
 
-#: resources.h:876
+#: resources.h:897
 msgid "&Display momentary transfer speed instead of average speed"
 msgstr "顯示瞬間傳輸速率而非平均速率(&D)"
 
-#: resources.h:898
+#: resources.h:919
 msgid "&Display size in bytes"
 msgstr "以 byte 單位顯示大小(&D)"
 
+#: resources.h:503
+msgid "&Do not remember passwords"
+msgstr "不記憶密碼(&O)"
+
 #: ../../locales/../src/interface/conditionaldialog.cpp:25
 msgid "&Don't show this dialog again."
 msgstr "不再顯示此對話框(&D)."
 
-#: resources.h:761
+#: resources.h:782
 msgid "&Don't use external IP address on local connections."
 msgstr "不在本地端連線使用外部 IP Address (&D)."
 
-#: resources.h:920
+#: resources.h:941
 msgid "&Double-click action on files:"
 msgstr "對檔案的雙擊動作(&D):"
 
-#: resources.h:574 resources.h:628
+#: resources.h:591 resources.h:649
 msgid "&Download"
 msgstr "下載(&D)"
 
-#: resources.h:443
+#: resources.h:453
 msgid "&Download to:"
 msgstr "下載到(&D)"
 
-#: resources.h:663
+#: resources.h:684
 msgid "&Download..."
 msgstr "下載(&D)..."
 
-#: resources.h:257 resources.h:837
+#: resources.h:267 resources.h:858
 msgid "&Downloads:"
 msgstr "下載(&D):"
 
-#: resources.h:503 resources.h:565
+#: resources.h:520 resources.h:582
 msgid "&Edit"
 msgstr "編輯(&E)"
 
-#: resources.h:210
+#: resources.h:220
 msgid "&Edit filter rules..."
 msgstr "編輯篩選規則(&E)..."
 
-#: resources.h:512 resources.h:532 resources.h:643 resources.h:669
+#: resources.h:529 resources.h:549 resources.h:664 resources.h:690
 msgid "&Enable"
 msgstr "啟用(&E)"
 
-#: resources.h:948
-msgid "&Enable automatic update check"
-msgstr "啟用自動更新檢查(&E)"
-
-#: resources.h:481 resources.h:810
+#: resources.h:491 resources.h:831
 msgid "&Enable speed limits"
 msgstr "啟用速度限制(&E)"
 
-#: resources.h:111
+#: resources.h:120
 msgid "&Encoding:"
 msgstr "編碼(&E):"
 
-#: resources.h:82
+#: resources.h:91
 msgid "&Encryption:"
 msgstr "加密(&E):"
 
-#: resources.h:611
+#: resources.h:630
 msgid "&Enter custom command..."
 msgstr "輸入自訂指令(&E)..."
 
-#: resources.h:137
+#: resources.h:146
 msgid "&Execute"
 msgstr "執行(&E)"
 
-#: resources.h:292
+#: resources.h:302
 msgid "&Export Site Manager entries"
 msgstr "匯出站台管理員欄位(&E)"
 
-#: resources.h:498 resources.h:659
+#: resources.h:515 resources.h:680
 msgid "&Export..."
 msgstr "匯出(&E)..."
 
-#: resources.h:766
+#: resources.h:787
 msgid "&Fall back to active mode"
 msgstr "回復為主動模式(&F)"
 
-#: resources.h:490
+#: resources.h:507
 msgid "&File"
 msgstr "檔案(&F)"
 
-#: resources.h:640
+#: resources.h:661
 msgid "&File Attributes..."
 msgstr "檔案屬性(&F)..."
 
-#: resources.h:590
+#: resources.h:609
 msgid "&File permissions..."
 msgstr "檔案權限(&F)..."
 
-#: resources.h:365
+#: resources.h:375
 msgid "&File:"
 msgstr "檔案(&F):"
 
-#: resources.h:220
+#: resources.h:230
 msgid "&Filter conditions:"
 msgstr "篩選條件(&F):"
 
-#: resources.h:199
+#: resources.h:209
 msgid "&Filter sets:"
 msgstr "篩選集(&F):"
 
-#: resources.h:214
+#: resources.h:224
 msgid "&Filters:"
 msgstr "篩選器(&F):"
 
-#: ../../locales/../src/interface/updatewizard.cpp:29
+#: ../../locales/../src/interface/updatewizard.cpp:30
 msgid "&Finish"
 msgstr "結束(&F)"
 
-#: resources.h:317
+#: resources.h:327
 msgid "&Finish editing and delete local file"
 msgstr "結束編輯並且刪除本地檔案(&F)"
 
-#: resources.h:447
+#: resources.h:457
 msgid ""
 "&Flatten remote paths, download all contained files directly into target "
 "directory"
 msgstr "扁平化遠端路徑, 直接下載所有包含的檔案到目的目錄(&F)"
 
-#: resources.h:458
+#: resources.h:468
 msgid "&Follow symlink, delete target directory contents"
 msgstr "依循軟連結, 刪除目的目錄內容(&F)"
 
-#: resources.h:759
+#: resources.h:780
 msgid "&Get external IP address from the following URL:"
 msgstr "從下列網址取得外部 IP Address (&G):"
 
-#: resources.h:553
+#: resources.h:570
 msgid "&Getting help..."
 msgstr "取得協助(&G)..."
 
-#: resources.h:397
+#: resources.h:407
 msgid "&Global bookmark"
 msgstr "全域書籤(&G)"
 
-#: resources.h:795
+#: resources.h:816
 msgid "&HTTP/1.1 using CONNECT method"
 msgstr "HTTP/1.1 使用 CONNECT 方法 (&H)"
 
-#: resources.h:549
+#: resources.h:566
 msgid "&Help"
 msgstr "說明(&H)"
 
-#: resources.h:515 resources.h:646
+#: resources.h:532 resources.h:667
 msgid "&Hide identical files"
 msgstr "隱藏相同的檔案(&H)"
 
-#: resources.h:597
+#: resources.h:616
 msgid "&Highest"
 msgstr "最高(&H)"
 
-#: resources.h:754
+#: resources.h:775
 msgid "&Highest available port:"
 msgstr "最高可用連接埠(&H):"
 
-#: resources.h:79 resources.h:378 resources.h:718
+#: resources.h:88 resources.h:388 resources.h:739
 msgid "&Host:"
 msgstr "主機(&H):"
 
-#: resources.h:899
+#: resources.h:920
 msgid "&IEC binary prefixes (e.g. 1 KiB = 1024 bytes)"
 msgstr "IEC 式二進制字首 (即 1 KiB = 1024 bytes) (&I)"
 
-#: resources.h:887
+#: resources.h:908
 msgid "&ISO 8601 (example: 2007-09-15)"
 msgstr "ISO 8601 (例: 2007-09-15) (&I)"
 
-#: resources.h:499
+#: resources.h:516
 msgid "&Import..."
 msgstr "匯入(&I)..."
 
-#: resources.h:942
+#: resources.h:963
 msgid "&Inherit system's filetype associations"
-msgstr "繼承系統的檔案型態關聯(&I)"
+msgstr "繼承系統的檔案類型關聯(&I)"
 
-#: resources.h:446
+#: resources.h:456
 msgid "&Keep remote path structure relative to search root"
 msgstr "保持相對於搜尋根目錄的遠端路徑架構(&K)"
 
-#: resources.h:860
+#: resources.h:881
 msgid "&Layout of file and directory panes:"
 msgstr "檔案與目錄窗格的佈局(&L):"
 
-#: resources.h:751
+#: resources.h:772
 msgid "&Limit local ports used by FileZilla"
 msgstr "限制 FileZilla 使用的本地連接埠(&L)"
 
-#: resources.h:103
+#: resources.h:112
 msgid "&Limit number of simultaneous connections"
 msgstr "限制同時連線數(&L)"
 
-#: resources.h:521
+#: resources.h:538
 msgid "&Local directory tree"
 msgstr "本地樹狀目錄(&L)"
 
-#: resources.h:402 resources.h:408
+#: resources.h:412 resources.h:418
 msgid "&Local directory:"
 msgstr "本地目錄(&L):"
 
-#: resources.h:957
+#: resources.h:982
 msgid "&Log to file"
 msgstr "記錄到檔案(&L)"
 
-#: resources.h:83
+#: resources.h:92
 msgid "&Logon Type:"
 msgstr "登入型式(&L):"
 
-#: resources.h:381
+#: resources.h:391
 msgid "&Logontype:"
 msgstr "登入型式(&L):"
 
-#: resources.h:600
+#: resources.h:619
 msgid "&Low"
 msgstr "低(&L)"
 
-#: resources.h:547
+#: resources.h:564
 msgid "&Manage bookmarks..."
 msgstr "管理書籤(&M)..."
 
-#: resources.h:535
+#: resources.h:552
 msgid "&Manual transfer..."
 msgstr "手動傳輸(&M)..."
 
-#: resources.h:104
+#: resources.h:113
 msgid "&Maximum number of connections:"
 msgstr "最大連線數(&M):"
 
-#: resources.h:736
+#: resources.h:757
 msgid "&Maximum number of retries:"
 msgstr "最大重試次數(&M):"
 
-#: resources.h:520
+#: resources.h:537
 msgid "&Message log"
 msgstr "訊息記錄(&M)"
 
-#: resources.h:873
+#: resources.h:894
 msgid "&Minimize to tray"
 msgstr "最小化到系統列(&M)"
 
-#: resources.h:400
+#: resources.h:410
 msgid "&Name:"
 msgstr "名稱(&N):"
 
-#: resources.h:504
+#: resources.h:521
 msgid "&Network configuration wizard..."
 msgstr "網路組態精靈(&N)..."
 
-#: resources.h:215
+#: resources.h:225
 msgid "&New"
 msgstr "新增(&N)"
 
-#: resources.h:72
+#: resources.h:81
 msgid "&New Site"
 msgstr "新增站台(&N)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1043
+#: ../../locales/../src/interface/updatewizard.cpp:1058
 msgid "&New version available!"
 msgstr "有新版本(&N)!"
 
-#: ../../locales/../src/interface/updatewizard.cpp:27
+#: ../../locales/../src/interface/updatewizard.cpp:28
 msgid "&Next >"
 msgstr "下一步(&N) >"
 
-#: resources.h:319
+#: resources.h:329
 msgid "&No"
 msgstr "否(&N)"
 
-#: resources.h:769 resources.h:794
+#: resources.h:790 resources.h:815
 msgid "&None"
 msgstr "無(&N)"
 
-#: resources.h:599
+#: resources.h:618
 msgid "&Normal"
 msgstr "一般(&N)"
 
-#: resources.h:949
-msgid "&Number of days between update checks:"
-msgstr "更新檢查間隔日數(&N):"
-
-#: resources.h:146
+#: resources.h:155
 msgid "&Numeric value:"
 msgstr "數值(&N):"
 
-#: resources.h:114 resources.h:127 resources.h:418
+#: resources.h:123 resources.h:136 resources.h:428
 msgid "&OK"
 msgstr "確認(&O)"
 
-#: resources.h:772
+#: resources.h:793
 msgid "&OPEN"
 msgstr "OPEN (&O)"
 
-#: resources.h:563 resources.h:651
+#: resources.h:580 resources.h:672
 msgid "&Open"
 msgstr "開啟(&O)"
 
-#: resources.h:58
+#: resources.h:67
 msgid "&Overwrite"
 msgstr "覆寫(&O)"
 
-#: resources.h:102
+#: resources.h:111
 msgid "&Passive"
 msgstr "被動模式(&P)"
 
-#: resources.h:125
+#: resources.h:134
 msgid "&Password:"
 msgstr "密碼(&P):"
 
-#: resources.h:607
+#: resources.h:626
 msgid "&Play sound"
 msgstr "播放音效(&P)"
 
-#: resources.h:80 resources.h:379 resources.h:722
+#: resources.h:89 resources.h:389 resources.h:743
 msgid "&Port:"
 msgstr "連接埠(&P):"
 
-#: resources.h:866
+#: resources.h:887
 msgid "&Position of the message log:"
 msgstr "訊息記錄的顯示位置(&P)"
 
-#: resources.h:531
+#: resources.h:548
 msgid "&Preserve timestamps of transferred files"
 msgstr "保留傳輸檔案的時間戳記(&P)"
 
-#: resources.h:301
+#: resources.h:311
 msgid "&Queue"
 msgstr "佇列(&Q)"
 
-#: resources.h:724
+#: resources.h:745
 msgid "&Quickconnect"
 msgstr "快速連線(&Q)"
 
-#: resources.h:519
+#: resources.h:536
 msgid "&Quickconnect bar"
 msgstr "快速連線列(&Q)"
 
-#: resources.h:135
+#: resources.h:144
 msgid "&Read"
 msgstr "讀取(&R)"
 
-#: resources.h:538
+#: resources.h:555
 msgid "&Reconnect"
 msgstr "重新連線(&R)"
 
-#: resources.h:509 resources.h:668
+#: resources.h:526 resources.h:689
 msgid "&Refresh"
 msgstr "重新整理(&R)"
 
-#: resources.h:126
+#: resources.h:135
 msgid "&Remember password for this session"
 msgstr "記住這次連線的密碼(&R)"
 
-#: resources.h:404 resources.h:410
+#: resources.h:502
+msgid "&Remember passwords"
+msgstr "記憶密碼(&R)"
+
+#: resources.h:414 resources.h:420
 msgid "&Remote directory:"
 msgstr "遠端目錄(&R):"
 
-#: resources.h:368
+#: resources.h:378
 msgid "&Remote path:"
 msgstr "遠端路徑(&R):"
 
-#: resources.h:831
+#: resources.h:852
 msgid "&Remove"
 msgstr "移除(&R)"
 
-#: resources.h:789
+#: resources.h:810
 msgid "&Remove key"
 msgstr "移除金鑰(&R)"
 
-#: resources.h:594
+#: resources.h:613
 msgid "&Remove selected"
 msgstr "移除所選項目(&R)"
 
-#: resources.h:75 resources.h:217 resources.h:415 resources.h:572
-#: resources.h:586 resources.h:636 resources.h:657
+#: resources.h:84 resources.h:227 resources.h:425 resources.h:589
+#: resources.h:605 resources.h:657 resources.h:678
 msgid "&Rename"
 msgstr "更名(&R)"
 
-#: resources.h:201
+#: resources.h:211
 msgid "&Rename..."
 msgstr "更名(&R)..."
 
-#: resources.h:324
+#: resources.h:334
 msgid "&Reopen local file"
 msgstr "重新開啟本地檔案(&R)"
 
-#: resources.h:822
+#: resources.h:843
 msgid "&Replace invalid characters with:"
 msgstr "以特定字元取代無效字元, 特定字元為(&R):"
 
-#: resources.h:554
+#: resources.h:571
 msgid "&Report a bug..."
 msgstr "回報錯誤(&R)..."
 
-#: resources.h:620
+#: resources.h:641
 msgid "&Reset and requeue all"
 msgstr "重設與重排所有檔案(&R)"
 
-#: resources.h:717
+#: resources.h:738
 msgid "&Restart Wizard"
 msgstr "再次執行組態精靈(&R)"
 
-#: resources.h:62
+#: resources.h:71
 msgid "&Resume"
 msgstr "續傳(&R)"
 
-#: resources.h:605
+#: resources.h:624
 msgid "&Run command..."
 msgstr "執行指令(&E)..."
 
-#: resources.h:731
+#: resources.h:752
 msgid "&Run configuration wizard now..."
 msgstr "立即執行組態精靈(&R)..."
 
-#: resources.h:951
+#: resources.h:977
 msgid "&Run update check now..."
-msgstr "立刻執行更新檢查(&R)..."
+msgstr "立即執行更新檢查(&R)..."
 
-#: resources.h:771
+#: resources.h:792
 msgid "&SITE"
 msgstr "SITE (&S)"
 
-#: resources.h:796
+#: resources.h:817
 msgid "&SOCKS 5"
 msgstr "SOCKS 5 (&S)"
 
-#: resources.h:200
+#: resources.h:210
 msgid "&Save as..."
 msgstr "儲存為(&S)..."
 
-#: resources.h:432
+#: resources.h:442
 msgid "&Search"
 msgstr "搜尋(&S)"
 
-#: resources.h:540
+#: resources.h:557
 msgid "&Search remote files..."
 msgstr "搜尋遠端檔案(&S)..."
 
-#: resources.h:71
+#: resources.h:80
 msgid "&Select Entry:"
 msgstr "選擇欄位(&S):"
 
-#: resources.h:931
+#: resources.h:952
 msgid "&Select language:"
 msgstr "選擇語系(&S):"
 
-#: resources.h:356
+#: resources.h:366
 msgid "&Select the columns that should be displayed:"
 msgstr "選擇要顯示的欄位(&S):"
 
-#: resources.h:370 resources.h:536
+#: resources.h:380 resources.h:553
 msgid "&Server"
 msgstr "伺服器(&S)"
 
-#: resources.h:300
+#: resources.h:310
 msgid "&Settings"
 msgstr "設定(&S)"
 
-#: resources.h:506
+#: resources.h:523
 msgid "&Settings..."
 msgstr "設定(&S)..."
 
-#: resources.h:966
+#: resources.h:991
 msgid "&Show debug menu"
 msgstr "顯示偵錯選單(&S)"
 
-#: resources.h:606
+#: resources.h:625
 msgid "&Show message"
 msgstr "顯示訊息(&S)"
 
-#: resources.h:956
+#: resources.h:981
 msgid "&Show timestamps in message log"
 msgstr "顯示訊息記錄中的時間戳記(&S)"
 
-#: resources.h:491
+#: resources.h:508
 msgid "&Site Manager..."
 msgstr "站台管理員(&S)..."
 
-#: resources.h:398
+#: resources.h:408
 msgid "&Site-specific bookmark"
 msgstr "站台書籤(&S)"
 
-#: resources.h:64
+#: resources.h:73
 msgid "&Skip"
 msgstr "略過(&S)"
 
-#: resources.h:534
+#: resources.h:551
 msgid "&Speed limits"
 msgstr "速度限制(&S)"
 
-#: resources.h:449
+#: resources.h:459
 msgid "&Start transfer immediately"
 msgstr "立即啟動傳輸(&S)"
 
-#: resources.h:865
+#: resources.h:886
 msgid "&Swap local and remote panes"
 msgstr "交換本地與遠端窗格(&S)"
 
+#: resources.h:638
+msgid "&TLS Ciphers"
+msgstr "TLS Cipher (&T)"
+
 #: ../../locales/../src/interface/netconfwizard.cpp:228
 msgid "&Test"
 msgstr "測試(&T)"
 
-#: resources.h:879
+#: resources.h:900
 msgid "&Theme:"
 msgstr "佈景主題(&T):"
 
-#: resources.h:524
+#: resources.h:541
 msgid "&Transfer"
 msgstr "傳輸(&T)"
 
-#: resources.h:99
+#: resources.h:108
 msgid "&Transfer mode:"
 msgstr "傳輸模式(&U):"
 
-#: resources.h:523
+#: resources.h:540
 msgid "&Transfer queue"
 msgstr "傳輸佇列(&T)"
 
-#: resources.h:834
+#: resources.h:855
 msgid "&Treat dotfiles as ASCII files"
-msgstr "將點檔案 (dotfile) 視作文字檔案(&T)"
+msgstr "將點檔案 (dotfile) 視作文字類檔案(&T)"
 
-#: resources.h:330
+#: resources.h:340
 msgid "&Unedit"
 msgstr "反編輯(&U)"
 
-#: resources.h:195
+#: resources.h:205
 msgid "&Update cached key for this host"
-msgstr "更新快取的主機金鑰(&U)"
+msgstr "更新快取中的主機金鑰(&U)"
 
-#: resources.h:557 resources.h:647
+#: resources.h:574 resources.h:668
 msgid "&Upload"
 msgstr "上傳(&U)"
 
-#: resources.h:267 resources.h:846
+#: resources.h:277 resources.h:867
 msgid "&Uploads:"
 msgstr "上傳(&U):"
 
-#: resources.h:425
+#: resources.h:435
 msgid "&Use custom program"
 msgstr "使用自訂程式(&U)"
 
-#: resources.h:94
+#: resources.h:103
 msgid "&Use synchronized browsing"
 msgstr "使用同步瀏覽(&S)"
 
-#: resources.h:935
+#: resources.h:956
 msgid "&Use system's default editor for text files"
 msgstr "使用系統預設的文字檔案編輯器(&U)"
 
-#: resources.h:757
+#: resources.h:778
 msgid "&Use the following IP address:"
 msgstr "使用以下的 IP Address (&U):"
 
-#: resources.h:765
+#: resources.h:786
 msgid "&Use the server's external IP address instead"
 msgstr "改為使用伺服器的外部 IP Address (&U)"
 
-#: resources.h:902
+#: resources.h:923
 msgid "&Use thousands separator"
 msgstr "使用千分位分隔符號(&U)"
 
-#: resources.h:84 resources.h:124 resources.h:382
+#: resources.h:93 resources.h:133 resources.h:392
 msgid "&User:"
 msgstr "使用者(&U):"
 
-#: resources.h:720
+#: resources.h:741
 msgid "&Username:"
 msgstr "使用者名稱(&U):"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1039
+#: ../../locales/../src/interface/updatewizard.cpp:1054
 #, c-format
 msgid "&Version %s"
 msgstr "版本 %s (&V)"
 
-#: resources.h:508
+#: resources.h:525
 msgid "&View"
 msgstr "檢視(&V)"
 
-#: resources.h:580
+#: resources.h:597
 msgid "&View/Edit"
 msgstr "檢視/編輯(&V)"
 
-#: resources.h:941
+#: resources.h:962
 msgid "&Watch locally edited files and prompt to upload modifications"
-msgstr "觀察在本地編輯的檔案並提示上傳修正(&W)"
+msgstr "觀察在本地編輯的檔案並提示上傳修改(&W)"
 
-#: resources.h:136
+#: resources.h:973
+msgid "&When checking for updates, check for:"
+msgstr "當檢查更新時, 檢查(&W):"
+
+#: resources.h:145
 msgid "&Write"
 msgstr "寫入(&W)"
 
-#: resources.h:318
+#: resources.h:328
 msgid "&Yes"
 msgstr "是(&Y)"
 
@@ -992,28 +976,40 @@
 #: ../../locales/../src/engine/local_path.cpp:511
 #, c-format
 msgid "'%s' does not exist or cannot be accessed."
-msgstr "'%s' 不存在或是無法存取."
+msgstr "\"%s\" 不存在或是無法存取."
 
 #: ../../locales/../src/engine/local_path.cpp:477
 #: ../../locales/../src/engine/local_path.cpp:498
 #: ../../locales/../src/engine/local_path.cpp:505
 #, c-format
 msgid "'%s' is not a directory."
-msgstr "'%s' 並不是目錄."
+msgstr "\"%s\" 並不是目錄."
 
 #: ../../locales/../src/interface/manual_transfer.cpp:445
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:956
 msgid "'Account' logontype not supported by selected protocol"
-msgstr "所選的協定不支援帳號 (Account) 登入型式"
+msgstr "所選的協定不支援 \"帳號 (Account)\" 登入型式"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:592
+#: ../../locales/../src/interface/manual_transfer.cpp:459
+msgid ""
+"'Normal' and 'Account' logontypes are not available, using 'Ask for "
+"password' instead."
+msgstr "\"一般\" 與 \"帳號\" 的登入型式不能用. 改使用 \"詢問密碼\"."
+
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:971
+msgid ""
+"'Normal' and 'Account' logontypes are not available. Your entry has been "
+"changed to 'Ask for password'."
+msgstr "\"一般\" 與 \"帳號\" 的登入型式不能用. 您的欄位已更改為 \"詢問密碼\"."
+
+#: ../../locales/../src/interface/Mainfrm.cpp:596
 msgid ""
 "'quote' is usually a local command used by commandline clients to send the "
 "arguments following 'quote' to the server. You might want to enter the raw "
 "command without the leading 'quote'."
 msgstr ""
-"'quote' 通常是用於命令列客戶端本地指令, 用於傳送置於 'quote' 之後的參數給伺服"
-"器. 您也許想略過前頭的 'quote' 而直接輸入指令."
+"\"quote\" 通常是用於命令列客戶端本地指令, 用於傳送置於 \"quote\" 之後的參數給"
+"伺服器. 您也許想略過前頭的 \"quote\" 而直接輸入指令."
 
 #: ../../locales/../src/interface/filelist_statusbar.cpp:96
 #: ../../locales/../src/interface/filelist_statusbar.cpp:105
@@ -1022,120 +1018,116 @@
 msgid_plural "(%d objects filtered)"
 msgstr[0] "(篩選掉 %d 個物件)"
 
-#: resources.h:806 resources.h:808
+#: resources.h:827 resources.h:829
 msgid "(0 for no limit)"
 msgstr "(0 即不設限)"
 
-#: resources.h:737
+#: resources.h:758
 msgid "(0-99)"
 msgstr "(0-99)"
 
-#: resources.h:739
+#: resources.h:760
 msgid "(0-999 seconds)"
 msgstr "(0-999 秒)"
 
-#: resources.h:804
+#: resources.h:825
 msgid "(1-10)"
 msgstr "(1-10)"
 
-#: resources.h:733
+#: resources.h:754
 msgid "(5-9999, 0 to disable)"
 msgstr "(5-9999, 0 則停用)"
 
-#: resources.h:950
-msgid "(At least 7 days)"
-msgstr "(最少 7 日)"
-
-#: resources.h:895
+#: resources.h:916
 msgid "(example: %H:%M)"
 msgstr "(例: %H:%M)"
 
-#: resources.h:889
+#: resources.h:910
 msgid "(example: %Y-%m-%d)"
 msgstr "(例: %Y-%m-%d)"
 
-#: resources.h:483 resources.h:485 resources.h:812 resources.h:814
+#: resources.h:493 resources.h:495 resources.h:833 resources.h:835
 #, c-format
 msgid "(in %s/s)"
 msgstr "(單位 %s/s)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:896
+#: ../../locales/../src/interface/updatewizard.cpp:910
 msgid ", %H:%M:%S left"
 msgstr ", 剩餘時間 %H:%M:%S"
 
-#: ../../locales/../src/interface/updatewizard.cpp:900
+#: ../../locales/../src/interface/updatewizard.cpp:914
 msgid ", --:--:-- left"
 msgstr ", 剩餘時間 --:--:--"
 
-#: resources.h:705
+#: resources.h:726
 msgid "-"
 msgstr "-"
 
-#: resources.h:248
+#: resources.h:258
 msgid "- Broken router and/or firewall"
 msgstr "- 有問題的路由器或是防火牆"
 
-#: resources.h:249
+#: resources.h:259
 msgid "- File corrupted on mirror"
 msgstr "- 映射站台的檔案損毀"
 
-#: resources.h:247
+#: resources.h:257
 msgid "- Malware on your system"
 msgstr "- 您的系統上有惡意軟體"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:236
+#: ../../locales/../src/interface/statuslinectrl.cpp:241
 msgid "--:--:-- left"
 msgstr "剩餘時間 --:--:--"
 
-#: ../../locales/../src/interface/cmdline.cpp:80
+#: ../../locales/../src/interface/cmdline.cpp:88
 msgid "-c cannot be used together with an FTP URL."
 msgstr "-c 不能和 FTP 網址一起使用."
 
-#: ../../locales/../src/interface/cmdline.cpp:89
+#: ../../locales/../src/interface/cmdline.cpp:97
 msgid "-l can only be used together with an FTP URL."
 msgstr "-l 僅能和 FTP 網址一起使用."
 
-#: ../../locales/../src/interface/cmdline.cpp:68
+#: ../../locales/../src/interface/cmdline.cpp:76
 msgid "-s and -c cannot be present at the same time."
-msgstr "-s 和 -c 無法同時呈現."
+msgstr "-s 和 -c 無法同時使用."
 
-#: ../../locales/../src/interface/cmdline.cpp:74
+#: ../../locales/../src/interface/cmdline.cpp:82
 msgid "-s cannot be used together with an FTP URL."
 msgstr "-s 不能和 FTP 網址一起使用."
 
-#: resources.h:968
+#: resources.h:993
 msgid "0 - None"
 msgstr "0 - 無"
 
-#: resources.h:969
+#: resources.h:994
 msgid "1 - Warning"
 msgstr "1 - 警告"
 
-#: resources.h:970
+#: resources.h:995
 msgid "2 - Info"
 msgstr "2 - 資訊"
 
-#: resources.h:971
+#: resources.h:996
 msgid "3 - Verbose"
 msgstr "3 - 詳述"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:148
+#: ../../locales/../src/interface/aboutdialog.cpp:152
 msgid "32 bit system"
 msgstr "32 位元系統"
 
-#: resources.h:972
+#: resources.h:997
 msgid "4 - Debug"
 msgstr "4 - 偵錯"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:146
+#: ../../locales/../src/interface/aboutdialog.cpp:150
 msgid "64 bit system"
 msgstr "64 位元系統"
 
-#: ../../locales/../src/interface/updatewizard.cpp:28
+#: ../../locales/../src/interface/updatewizard.cpp:29
 msgid "< &Back"
 msgstr "< 上一步(&B)"
 
-#: resources.h:548
+#: resources.h:565
 msgid "?"
 msgstr "?"
 
@@ -1144,16 +1136,17 @@
 "A bookmark with the entered name already exists. Please enter an unused name."
 msgstr "輸入的書籤名稱已存在. 請輸入未使用的名稱."
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:153
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:159
 msgid "A default editor needs to be set."
 msgstr "需要設定預設的編輯器."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:154
-#: ../../locales/../src/interface/RemoteTreeView.cpp:115
+#: ../../locales/../src/interface/RemoteListView.cpp:157
+#: ../../locales/../src/interface/RemoteTreeView.cpp:117
+#: ../../locales/../src/interface/state.cpp:827
 msgid "A directory cannot be dragged into one of its subdirectories."
 msgstr "目錄不能拖曳到其子目錄下."
 
-#: resources.h:677
+#: resources.h:698
 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 "
@@ -1162,27 +1155,27 @@
 "一些伺服器不允許被動模式或是設定有誤. 這些情況下您可能得使用主動模式. 在主動"
 "模式下, FileZilla 會開啟一個連接埠要求伺服器連線."
 
-#: resources.h:306
+#: resources.h:316
 msgid "A file previously opened has been changed."
 msgstr "先前開啟的檔案已被更動."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2058
+#: ../../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 "該名稱之檔案已被編輯. 您要重新開啟 '%s' 嗎?"
+msgstr "該名稱之檔案已被編輯. 您要重新開啟 \"%s\" 嗎?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "A file with that name is already being transferred."
 msgstr "該名稱之檔案已傳送."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid ""
 "A file with that name is still being edited. Please close it and try again."
 msgstr "該名稱之檔案依舊在編輯. 請關閉再試試看."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid ""
 "A local filename could not be decoded.\n"
 "Please make sure the LC_CTYPE (or LC_ALL) environment variable is set "
@@ -1195,11 +1188,11 @@
 "除非您解決這個問題, 否則檔案可能不會顯示於檔案列表內.\n"
 "此次連線不再顯示更多的警告."
 
-#: resources.h:237
+#: resources.h:247
 msgid "A newer version of FileZilla is available:"
 msgstr "有新版的 FileZilla:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:667
+#: ../../locales/../src/interface/Mainfrm.cpp:679
 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."
@@ -1207,7 +1200,7 @@
 "正常的伺服器總是會顯示所有檔案, 但某些有問題的伺服器會對使用者隱藏檔案. 使用"
 "此選項會強制伺服器顯示所有檔案."
 
-#: resources.h:749
+#: resources.h:770
 msgid ""
 "A proper server does not require this. Contact the server administrator if "
 "you need this."
@@ -1221,17 +1214,17 @@
 "遠端操作已在處理中, 且同步瀏覽已啟用.\n"
 "要停用同步瀏覽並繼續變更本地目錄?"
 
-#: resources.h:529 resources.h:661 resources.h:826
+#: resources.h:546 resources.h:682 resources.h:847
 msgid "A&SCII"
 msgstr "文字類檔案(&S)"
 
-#: resources.h:830
+#: resources.h:851
 msgid "A&dd"
 msgstr "新增(&D)"
 
-#: resources.h:857
+#: resources.h:878
 msgid "A&llow resume of ASCII files"
-msgstr "允許文字檔案的續傳(&L)"
+msgstr "允許文字類檔案的續傳(&L)"
 
 #: ../../locales/../src/interface/fileexistsdlg.cpp:114
 msgid "A&pply only to downloads"
@@ -1241,55 +1234,55 @@
 msgid "A&pply only to uploads"
 msgstr "只套用到上傳(&P)"
 
-#: resources.h:149
+#: resources.h:158
 msgid "A&pply to all files and directories"
 msgstr "套用到所有的檔案與目錄(&P)"
 
-#: resources.h:627
+#: resources.h:648
 msgid "A&utomatically remove successful transfers"
 msgstr "自動移除成功的傳輸(&U)"
 
-#: resources.h:389
+#: resources.h:399
 msgid "ASCII"
 msgstr "文字類檔案"
 
-#: resources.h:479
+#: resources.h:489
 msgid "Abort previous connection and connect in current tab"
 msgstr "中止先前的連線, 並在目前的頁籤連線"
 
-#: resources.h:154
+#: resources.h:163
 msgid "About FileZilla"
 msgstr "關於 FileZilla"
 
-#: resources.h:867
+#: resources.h:888
 msgid "Above the file lists"
 msgstr "在檔案列表的上方"
 
-#: ../../locales/../src/engine/server.cpp:853
-#: ../../locales/../src/engine/server.cpp:872
+#: ../../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:560
-#: ../../locales/../src/interface/manual_transfer.cpp:561
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1288
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/manual_transfer.cpp:570
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1298
 msgid "Account"
 msgstr "帳號"
 
-#: resources.h:602
+#: resources.h:621
 msgid "Action after queue &completion"
 msgstr "佇列完成後執行動作(&C)"
 
-#: resources.h:329
+#: resources.h:339
 msgid "Action on selected file:"
 msgstr "所選檔案的動作:"
 
-#: resources.h:323
+#: resources.h:333
 msgid "Action to perform:"
 msgstr "要執行的動作:"
 
-#: resources.h:57
+#: resources.h:66
 msgid "Action:"
 msgstr "動作:"
 
@@ -1320,23 +1313,23 @@
 "FTP 主動模式測試失敗. FileZilla 知道正確的外部 IP Address, 但您的路由器或防火"
 "牆改錯了傳送位址."
 
-#: resources.h:762
+#: resources.h:783
 msgid "Active mode IP"
 msgstr "主動模式 IP Address"
 
-#: resources.h:450
+#: resources.h:460
 msgid "Add files to &queue only"
 msgstr "只加入檔案到佇列(&Q)"
 
-#: resources.h:631 resources.h:650
+#: resources.h:652 resources.h:671
 msgid "Add selected directory to the transfer queue"
 msgstr "加入所選的目錄到傳輸佇列"
 
-#: resources.h:560 resources.h:577
+#: resources.h:577 resources.h:594
 msgid "Add selected files and folders to the transfer queue"
 msgstr "加入所選的檔案與資料夾到傳輸佇列"
 
-#: resources.h:922 resources.h:928
+#: resources.h:943 resources.h:949
 msgid "Add to queue"
 msgstr "加入到佇列"
 
@@ -1344,45 +1337,57 @@
 msgid "Address type not supported"
 msgstr "位址型態未支援"
 
-#: resources.h:88
+#: resources.h:97
 msgid "Advanced"
 msgstr "進階設定"
 
-#: resources.h:234
+#: resources.h:244
 msgid "Advanced options:"
 msgstr "進階選項:"
 
-#: resources.h:338
+#: resources.h:976
+msgid ""
+"Advice: Unless you want to test new features, please keep using stable "
+"versions only. Beta versions and nightly builds are development versions "
+"meant for testing purposes. Nightly builds of FileZilla may not work as "
+"expected and might even damage your system. Use beta versions and nightly "
+"builds at your own risk."
+msgstr ""
+"忠告: 除非您想測試新功能, 否則請維持 \"僅使用穩定版本\". Beta 測試版和每日組"
+"建版都是用以測試的版本. 每日組建版的 FileZilla 可能不會如預期運作, 甚至也可能"
+"會損害您的系統. 使用 Beta 測試版與每日組建版請您自行承擔風險."
+
+#: resources.h:348
 msgid "Algorithm:"
 msgstr "演算法:"
 
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "All files have been successfully transferred"
 msgstr "所有檔案都已成功傳輸"
 
-#: resources.h:706
+#: resources.h:727
 msgid "All ports in the given range have to be between 1024 and 65535."
-msgstr "所有範圍內的連接埠號碼必須在 1024 到 65535 之間."
+msgstr "所有範圍內的連接埠號碼都必須在 1024 到 65535 之間."
 
-#: ../../locales/../src/interface/QueueView.cpp:3135
+#: ../../locales/../src/interface/QueueView.cpp:3119
 #, c-format
 msgid "All transfers have finished. %d file could not be transferred."
 msgid_plural "All transfers have finished. %d files could not be transferred."
 msgstr[0] "所有傳輸都已完成. %d 檔案無法傳輸."
 
-#: resources.h:745
+#: resources.h:766
 msgid "Allow &fall back to other transfer mode on failure"
 msgstr "失敗時允許回復到其他傳輸模式(&F)"
 
-#: resources.h:681
+#: resources.h:702
 msgid "Allow fallback to other transfer mode on failure"
 msgstr "失敗時允許回復到其他傳輸模式"
 
-#: resources.h:476
+#: resources.h:486
 msgid "Already connected"
 msgstr "已連線"
 
-#: resources.h:790
+#: resources.h:811
 msgid ""
 "Alternatively you can use the Pageant tool from PuTTY to manage your keys, "
 "FileZilla does recognize Pageant."
@@ -1390,7 +1395,7 @@
 "您也可以選擇 PuTTY 裡的 Pageant 做為替代來管理金鑰. FileZilla 可以辨識 "
 "Pageant."
 
-#: resources.h:791
+#: resources.h:812
 msgid ""
 "Alternatively you can use your system's SSH agent. To do so, make sure the "
 "SSH_AUTH_SOCK environment variable is set."
@@ -1398,13 +1403,13 @@
 "您也可以選擇系統上的 SSH 代理程式做為替代. 要這麼做, 請確認有設定 "
 "SSH_AUTH_SOCK 環境變數."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1097
+#: ../../locales/../src/interface/updatewizard.cpp:1118
 msgid ""
 "Alternatively, visit http://filezilla-project.org to download the most "
 "recent version."
 msgstr "也可以拜訪 http://filezilla-project.org 下載最近的版本."
 
-#: ../../locales/../src/interface/QueueView.cpp:2051
+#: ../../locales/../src/interface/QueueView.cpp:2042
 #, c-format
 msgid ""
 "An error occurred loading the transfer queue from \"%s\".\n"
@@ -1413,7 +1418,7 @@
 "從 \"%s\" 載入傳輸佇列時發生錯誤.\n"
 "部分佇列項目可能無法還原."
 
-#: ../../locales/../src/interface/QueueView.cpp:1950
+#: ../../locales/../src/interface/QueueView.cpp:1941
 #, c-format
 msgid ""
 "An error occurred saving the transfer queue to \"%s\".\n"
@@ -1422,89 +1427,89 @@
 "儲存傳輸佇列到 \"%s\" 時發生錯誤.\n"
 "部分佇列項目可能無法儲存."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid ""
 "An item with the same name as the dragged item already exists at the target "
 "location."
 msgstr "目標位置已存在與拖曳來源相同名稱的項目."
 
-#: ../../locales/../src/engine/server.cpp:874
+#: ../../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:559
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1286
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1528
+#: ../../locales/../src/interface/manual_transfer.cpp:568
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1296
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1538
 msgid "Anonymous"
 msgstr "匿名"
 
-#: ../../locales/../src/interface/state.cpp:1031
+#: ../../locales/../src/interface/state.cpp:1095
 msgid ""
 "Another remote operation is already in progress, cannot change directory now."
 msgstr "另一個遠端操作已在處理中, 現在無法變更目錄."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:784
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
 msgid "Any changes made in the Site Manager could not be saved."
 msgstr "站台管理員裡的任何變更都無法儲存."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:729
+#: ../../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 "除非您修復檔案, 否則站台管理員裡的任何變更都不會儲存."
 
-#: ../../locales/../src/interface/filter.cpp:210
+#: ../../locales/../src/interface/filter.cpp:209
 msgid "Any changes made to the filters could not be saved."
 msgstr "篩選器裡的任何變更都無法儲存."
 
-#: ../../locales/../src/interface/filter.cpp:1045
+#: ../../locales/../src/interface/filter.cpp:1033
 msgid "Any changes made to the filters will not be saved."
 msgstr "篩選器裡的任何變更都不會儲存."
 
-#: resources.h:151
+#: resources.h:160
 msgid "App&ly to directories only"
 msgstr "只套用到目錄(&L)"
 
-#: resources.h:213
+#: resources.h:223
 msgid "Apply"
 msgstr "套用"
 
-#: resources.h:66
+#: resources.h:75
 msgid "Apply to &current queue only"
 msgstr "只套用到目前的佇列(&C)"
 
-#: resources.h:150
+#: resources.h:159
 msgid "Apply to &files only"
 msgstr "只套用到檔案(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
-#: ../../locales/../src/interface/updatewizard.cpp:322
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/updatewizard.cpp:330
 msgid "Archive"
 msgstr "封存"
 
-#: resources.h:869
+#: resources.h:890
 msgid "As tab in the transfer queue pane"
 msgstr "傳輸佇列的一個頁籤"
 
-#: resources.h:259 resources.h:269 resources.h:838 resources.h:847
+#: resources.h:269 resources.h:279 resources.h:859 resources.h:868
 msgid "Ask for action"
 msgstr "詢問動作"
 
-#: ../../locales/../src/engine/server.cpp:849
-#: ../../locales/../src/engine/server.cpp:868
+#: ../../locales/../src/engine/server.cpp:856
+#: ../../locales/../src/engine/server.cpp:875
 #: ../../locales/../src/interface/manual_transfer.cpp:188
 msgid "Ask for password"
 msgstr "詢問密碼"
 
-#: resources.h:702
+#: resources.h:723
 msgid "Ask operating system for a port."
 msgstr "對作業系統要求連接埠."
 
-#: resources.h:692
+#: resources.h:713
 msgid "Ask your operating system for the external IP address"
 msgstr "對您的作業系統詢問外部 IP Address"
 
-#: resources.h:471
+#: resources.h:481
 msgid "Asking questions in the FileZilla forums"
 msgstr "於 FileZilla 論壇上詢問"
 
@@ -1512,39 +1517,35 @@
 msgid "Associated program not found:"
 msgstr "找不到關聯的程式:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:664
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:705
 msgid "At least one filter condition is incomplete"
 msgstr "最少有一個篩選條件沒有完整"
 
-#: resources.h:711
+#: resources.h:732
 msgid "At this point, all required information has been gathered."
 msgstr "此時所有必備的資訊皆已收集完成."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:137
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:140
 msgid "Attribute"
 msgstr "檔案屬性"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:673
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:674
 msgid "Authentication failed."
 msgstr "認證失敗."
 
-#: resources.h:880
+#: resources.h:901
 msgid "Author:"
 msgstr "作者:"
 
-#: resources.h:386
+#: resources.h:396
 msgid "Auto"
 msgstr "自動"
 
-#: resources.h:828
+#: resources.h:849
 msgid "Automatic file type classification"
 msgstr "自動檔案分類"
 
-#: resources.h:947
-msgid "Automatic update check"
-msgstr "自動更新檢查"
-
-#: resources.h:884
+#: resources.h:905
 msgid "Available sizes"
 msgstr "可用大小"
 
@@ -1553,66 +1554,66 @@
 msgid "B <Unit symbol for bytes. Only translate first letter>"
 msgstr "B <Bytes 的單位符號. 只翻譯第一個字母>"
 
-#: resources.h:90
+#: resources.h:99
 msgid "B&ypass proxy"
 msgstr "略過 Proxy (&Y)"
 
-#: resources.h:467
+#: resources.h:477
 msgid "Basic usage instructions"
 msgstr "基本使用指引"
 
-#: resources.h:871
+#: resources.h:892
 msgid "Behaviour"
 msgstr "行為"
 
-#: ../../locales/../src/interface/edithandler.cpp:1260
-#: ../../locales/../src/interface/edithandler.cpp:1288
+#: ../../locales/../src/interface/edithandler.cpp:1268
+#: ../../locales/../src/interface/edithandler.cpp:1296
 msgid "Being edited"
 msgstr "正在編輯"
 
-#: resources.h:616
+#: resources.h:635
 msgid "Benchmark string coalescer"
 msgstr "量測 String Coalescer 效能"
 
-#: ../../locales/../src/engine/tlssocket.cpp:877
+#: ../../locales/../src/engine/tlssocket.cpp:1094
 msgid "Beware! Certificate has been revoked"
 msgstr "請小心! 憑證可能已註銷"
 
-#: resources.h:390
+#: resources.h:400
 msgid "Binary"
 msgstr "二進位檔案"
 
-#: resources.h:864
+#: resources.h:885
 msgid "Blackboard"
 msgstr "黑板"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:272
 #: ../../locales/../src/interface/menu_bar.cpp:313
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:394
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:395
 msgid "Bookmark"
 msgstr "書籤"
 
-#: resources.h:413
+#: resources.h:423
 msgid "Bookmark:"
 msgstr "書籤:"
 
-#: resources.h:412
+#: resources.h:422
 msgid "Bookmarks"
 msgstr "書籤"
 
-#: resources.h:162
+#: resources.h:171
 msgid "Build date:"
 msgstr "組建日期:"
 
-#: resources.h:159
+#: resources.h:168
 msgid "Build information"
 msgstr "組建資訊"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:178
+#: ../../locales/../src/interface/verifycertdialog.cpp:181
 msgid "Business category:"
 msgstr "業務範疇:"
 
-#: resources.h:752
+#: resources.h:773
 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, "
@@ -1621,76 +1622,76 @@
 "預設情形下主動模式使用任何可用的本地連接埠. 如果您想限制 FileZilla 只使用小範"
 "圍的連接埠, 請在下方輸入連接埠範圍."
 
-#: resources.h:537
+#: resources.h:554
 msgid "C&ancel current operation"
 msgstr "取消目前的操作(&A)"
 
-#: resources.h:236
+#: resources.h:246
 msgid "C&heck for nightly builds of FileZilla"
 msgstr "檢查每日組建版的 FileZilla (&H)"
 
-#: resources.h:613
+#: resources.h:632
 msgid "C&lear all"
 msgstr "全部清除(&L)"
 
-#: resources.h:588 resources.h:638
+#: resources.h:607 resources.h:659
 msgid "C&opy URL(s) to clipboard"
 msgstr "複製網址到剪貼簿(&O)"
 
-#: resources.h:888
+#: resources.h:909
 msgid "C&ustom"
 msgstr "自訂(&U)"
 
-#: resources.h:943
+#: resources.h:964
 msgid "C&ustom filetype associations:"
-msgstr "自訂檔案型態關聯(&U):"
+msgstr "自訂檔案類型關聯(&U):"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1623
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1270
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1654
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1271
 msgid "Calculating timezone offset of server..."
 msgstr "計算伺服器的時區偏移量..."
 
-#: ../../locales/../src/engine/transfersocket.cpp:733
+#: ../../locales/../src/engine/transfersocket.cpp:743
 msgid "Can't read from file"
 msgstr "無法讀取檔案"
 
-#: ../../locales/../src/engine/transfersocket.cpp:712
-#: ../../locales/../src/engine/transfersocket.cpp:786
+#: ../../locales/../src/engine/transfersocket.cpp:722
+#: ../../locales/../src/engine/transfersocket.cpp:796
 msgid "Can't write data to file."
 msgstr "無法寫入檔案."
 
-#: ../../locales/../src/engine/transfersocket.cpp:710
-#: ../../locales/../src/engine/transfersocket.cpp:784
+#: ../../locales/../src/engine/transfersocket.cpp:720
+#: ../../locales/../src/engine/transfersocket.cpp:794
 #, c-format
 msgid "Can't write data to file: %s"
 msgstr "無法寫入檔案: %s"
 
-#: resources.h:25 resources.h:69 resources.h:115 resources.h:153
-#: resources.h:184 resources.h:212 resources.h:229 resources.h:280
-#: resources.h:289 resources.h:296 resources.h:304 resources.h:327
-#: resources.h:360 resources.h:393 resources.h:407 resources.h:419
-#: resources.h:429 resources.h:452 resources.h:461 resources.h:480
+#: resources.h:30 resources.h:78 resources.h:124 resources.h:162
+#: resources.h:194 resources.h:222 resources.h:239 resources.h:290
+#: resources.h:299 resources.h:306 resources.h:314 resources.h:337
+#: resources.h:370 resources.h:403 resources.h:417 resources.h:429
+#: resources.h:439 resources.h:462 resources.h:471 resources.h:490
 msgid "Cancel"
 msgstr "取消"
 
-#: resources.h:990
+#: resources.h:1016
 msgid "Cancel current operation"
 msgstr "取消目前的操作"
 
-#: resources.h:991
+#: resources.h:1017
 msgid "Cancels the current operation"
 msgstr "取消目前的操作"
 
 #: ../../locales/../src/engine/local_path.cpp:471
 #, c-format
 msgid "Cannot access '%s', no media inserted or drive not ready."
-msgstr "無法存取 '%s', 裝置未插入或是磁碟機尚未備妥."
+msgstr "無法存取 \"%s\", 裝置未插入或是磁碟機尚未備妥."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Cannot add server to Site Manager"
 msgstr "無法新增伺服器到站台管理員"
 
-#: ../../locales/../src/interface/context_control.cpp:345
+#: ../../locales/../src/interface/context_control.cpp:348
 msgid ""
 "Cannot close tab while busy.\n"
 "Cancel current operation and close tab?"
@@ -1702,39 +1703,39 @@
 msgid ""
 "Cannot compare directories, different filters for local and remote "
 "directories are enabled"
-msgstr "無法比對目錄, 本地與遠端目錄啟用不同的篩選器"
+msgstr "無法比對目錄, 本地與遠端目錄啟用了不同的篩選器"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2778
+#: ../../locales/../src/interface/RemoteListView.cpp:2809
 msgid "Cannot compare directories, not connected to a server."
 msgstr "無法比對目錄, 未連線到伺服器."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "Cannot create new filter"
 msgstr "無法建立新的篩選器"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2036
-#: ../../locales/../src/interface/LocalListView.cpp:2167
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
-#: ../../locales/../src/interface/RemoteListView.cpp:2654
+#: ../../locales/../src/interface/LocalListView.cpp:2044
+#: ../../locales/../src/interface/LocalListView.cpp:2175
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
+#: ../../locales/../src/interface/RemoteListView.cpp:2685
 msgid "Cannot edit file"
 msgstr "無法編輯檔案"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
+#: ../../locales/../src/interface/LocalListView.cpp:1960
 msgid "Cannot edit file, not connected to any server."
 msgstr "無法編輯檔案, 未連線到任何伺服器."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Cannot edit file, remote path unknown."
 msgstr "無法編輯檔案, 未知的遠端路徑."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:335
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:342
 msgid ""
 "Cannot establish FTP connection to an SFTP server. Please select proper "
 "protocol."
 msgstr "無法建立 FTP 連線到 SFTP 伺服器. 請選擇正確的協定."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:36
-#: ../../locales/../src/interface/quickconnectbar.cpp:54
+#: ../../locales/../src/interface/quickconnectbar.cpp:37
+#: ../../locales/../src/interface/quickconnectbar.cpp:55
 msgid "Cannot load Quickconnect bar from resource file"
 msgstr "無法從資源檔裡載入快速連線列"
 
@@ -1746,44 +1747,48 @@
 msgid "Cannot load keyfile"
 msgstr "無法載入金鑰檔案"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1051
+#: ../../locales/../src/interface/Mainfrm.cpp:1100
 msgid "Cannot load toolbar from resource file"
 msgstr "無法從資源檔裡載入工具列"
 
+#: ../../locales/../src/interface/manual_transfer.cpp:463
+msgid "Cannot remember password"
+msgstr "無法記憶密碼"
+
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Cannot rename entry"
 msgstr "無法更名欄位"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Cannot rename file"
 msgstr "無法更名檔案"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "Cannot save filterset"
 msgstr "無法儲存篩選集"
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Cannot select filter"
 msgstr "無法選取篩選器"
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/interface/edithandler.cpp:1646
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1690
 msgid "Cannot set file association"
-msgstr "無法設定檔案型態關聯"
+msgstr "無法設定檔案類型關聯"
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "Cannot show dialog"
 msgstr "無法顯示對話框"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2054
-#: ../../locales/../src/interface/RemoteListView.cpp:2674
+#: ../../locales/../src/interface/LocalListView.cpp:2062
+#: ../../locales/../src/interface/RemoteListView.cpp:2705
 msgid "Cannot view/edit selected file"
 msgstr "無法檢視/編輯所選的檔案"
 
-#: resources.h:283
+#: resources.h:293
 msgid "Categories"
 msgstr "分類目錄"
 
@@ -1791,59 +1796,59 @@
 msgid "Certificate and session data are not available yet."
 msgstr "憑證與連線資料仍不能用."
 
-#: resources.h:26
+#: resources.h:31
 msgid "Certificate details"
 msgstr "憑證細節"
 
-#: resources.h:3 resources.h:27
+#: resources.h:3 resources.h:32
 msgid "Certificate in chain:"
 msgstr "鍊內憑證:"
 
-#: resources.h:13 resources.h:37
+#: resources.h:14 resources.h:42
 msgid "Certificate issuer"
 msgstr "憑證發行者"
 
-#: resources.h:123
+#: resources.h:132
 msgid "Challenge:"
 msgstr "需要確認:"
 
-#: resources.h:132
+#: resources.h:141
 msgid "Change file attributes"
 msgstr "變更檔案屬性"
 
-#: resources.h:591 resources.h:641
+#: resources.h:610 resources.h:662
 msgid "Change the file permissions."
 msgstr "變更檔案權限."
 
-#: resources.h:964
+#: resources.h:989
 msgid "Changing logfile settings requires restart of FileZilla."
 msgstr "變更記錄檔案的設定必須重新啟動 FileZilla."
 
-#: ../../locales/../src/interface/FileZilla.cpp:681
+#: ../../locales/../src/interface/FileZilla.cpp:690
 msgid "Character encoding issue"
 msgstr "字元編碼議題"
 
-#: resources.h:105
+#: resources.h:114
 msgid "Charset"
 msgstr "字碼集"
 
-#: resources.h:952
-msgid "Check for &beta versions and release candidates"
-msgstr "檢查 Beta 測試版本與正式候選版本的 FileZilla(&B)"
-
-#: resources.h:550
+#: resources.h:567
 msgid "Check for &updates..."
 msgstr "檢查更新(&U)..."
 
-#: resources.h:551
+#: resources.h:968
+msgid "Check for FileZilla &updates automatically:"
+msgstr "自動檢查 FileZilla 更新(&U):"
+
+#: resources.h:568
 msgid "Check for newer versions of FileZilla"
 msgstr "檢查新版的 FileZilla"
 
-#: ../../locales/../src/interface/updatewizard.cpp:163
+#: ../../locales/../src/interface/updatewizard.cpp:171
 msgid "Check for updates"
 msgstr "檢查更新"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Check for updates failed"
 msgstr "檢查更新失敗"
 
@@ -1851,65 +1856,65 @@
 msgid "Checking for correct external IP address"
 msgstr "正在檢查正確的外部 IP Address"
 
-#: resources.h:232
+#: resources.h:242
 msgid "Checking for updates"
 msgstr "正在檢查更新"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1241
+#: ../../locales/../src/interface/updatewizard.cpp:1261
 msgid "Checksum mismatch of downloaded file."
 msgstr "加總校驗值與下載的檔案不符."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1458
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1468
 msgid "Choose the default local directory"
 msgstr "選擇預設的本地目錄"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:130
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:378
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2205
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2215
 msgid "Choose the local directory"
 msgstr "選擇本地目錄"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:854
 msgid "Chunk data improperly terminated"
-msgstr "區塊資料不正確結束"
+msgstr "區塊資料不正確終止"
 
-#: resources.h:18 resources.h:42
+#: resources.h:23 resources.h:51
 msgid "Cipher:"
 msgstr "Cipher:"
 
-#: resources.h:496 resources.h:666
+#: resources.h:513 resources.h:687
 msgid "Cl&ose tab"
 msgstr "關閉頁籤(&O)"
 
-#: resources.h:861
+#: resources.h:882
 msgid "Classic"
 msgstr "傳統模式"
 
-#: resources.h:286
+#: resources.h:296
 msgid "Clear &Site Manager entries"
 msgstr "清除站台管理員裡的欄位(&S)"
 
-#: resources.h:614
+#: resources.h:633
 msgid "Clear &layout cache"
 msgstr "清除版面快取(&L)"
 
-#: resources.h:284
+#: resources.h:294
 msgid "Clear &quickconnect history"
 msgstr "清除快速連線列裡的歷程(&Q)"
 
-#: resources.h:285
+#: resources.h:295
 msgid "Clear &reconnect information"
 msgstr "清除重新連線資訊(&R)"
 
-#: resources.h:287
+#: resources.h:297
 msgid "Clear &transfer queue"
 msgstr "清除傳輸佇列(&T)"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:143
+#: ../../locales/../src/interface/quickconnectbar.cpp:150
 msgid "Clear history"
 msgstr "清除歷程"
 
-#: resources.h:281 ../../locales/../src/interface/clearprivatedata.cpp:34
+#: resources.h:291 ../../locales/../src/interface/clearprivatedata.cpp:34
 #: ../../locales/../src/interface/clearprivatedata.cpp:40
 #: ../../locales/../src/interface/clearprivatedata.cpp:46
 #: ../../locales/../src/interface/clearprivatedata.cpp:77
@@ -1917,11 +1922,11 @@
 msgid "Clear private data"
 msgstr "清除私人資料"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:142
+#: ../../locales/../src/interface/quickconnectbar.cpp:149
 msgid "Clear quickconnect bar"
 msgstr "清除快速連線列"
 
-#: resources.h:615
+#: resources.h:634
 msgid "Clear string coalescer"
 msgstr "清除 String Coalescer"
 
@@ -1929,36 +1934,36 @@
 msgid "Click on Finish to save your configuration."
 msgstr "按 Finish 來儲存您的組態."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1096
+#: ../../locales/../src/interface/updatewizard.cpp:1117
 msgid "Click on next to download the new version."
 msgstr "按 Next 下載新版本."
 
-#: resources.h:347
+#: resources.h:357
 msgid "Client to server MAC:"
 msgstr "客戶對伺服器 MAC:"
 
-#: resources.h:345
+#: resources.h:355
 msgid "Client to server cipher:"
 msgstr "客戶對伺服器 Cipher:"
 
-#: resources.h:667
+#: resources.h:688
 msgid "Close &all other tabs"
 msgstr "關閉其它所有頁籤(&A)"
 
-#: resources.h:502 ../../locales/../src/interface/Mainfrm.cpp:1123
-#: ../../locales/../src/interface/Mainfrm.cpp:1146
+#: resources.h:519 ../../locales/../src/interface/Mainfrm.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1268
 msgid "Close FileZilla"
 msgstr "關閉 FileZilla"
 
-#: ../../locales/../src/interface/cmdline.cpp:14
+#: ../../locales/../src/interface/cmdline.cpp:15
 msgid "Close all running instances of FileZilla"
 msgstr "關閉所有正在執行的 FileZilla 實體"
 
-#: resources.h:497
+#: resources.h:514
 msgid "Closes current tab"
 msgstr "關閉目前的頁籤"
 
-#: resources.h:87
+#: resources.h:96
 msgid "Co&mments:"
 msgstr "註解(&M):"
 
@@ -1966,11 +1971,11 @@
 msgid "Column properties"
 msgstr "欄位屬性"
 
-#: resources.h:354
+#: resources.h:364
 msgid "Column setup"
 msgstr "欄位設定"
 
-#: resources.h:938
+#: resources.h:959
 msgid "Command and its arguments should be properly quoted."
 msgstr "指令與其引數需要正確引用."
 
@@ -1989,9 +1994,9 @@
 msgstr "通訊協定不支援此指令"
 
 #: ../../locales/../src/engine/logging.cpp:214
-#: ../../locales/../src/interface/StatusView.cpp:287
-#: ../../locales/../src/interface/StatusView.cpp:337
-#: ../../locales/../src/interface/updatewizard.cpp:541
+#: ../../locales/../src/interface/StatusView.cpp:285
+#: ../../locales/../src/interface/StatusView.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:552
 msgid "Command:"
 msgstr "指令:"
 
@@ -1999,7 +2004,7 @@
 msgid "Comment"
 msgstr "註解"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:176
+#: ../../locales/../src/interface/verifycertdialog.cpp:179
 msgid "Common name:"
 msgstr "憑證名稱:"
 
@@ -2008,15 +2013,15 @@
 msgid "Communication tainted by router or firewall"
 msgstr "通訊已被路由器或防火牆影響"
 
-#: resources.h:514 resources.h:645
+#: resources.h:531 resources.h:666
 msgid "Compare &modification time"
 msgstr "比對修改時間(&M)"
 
-#: resources.h:513 resources.h:644
+#: resources.h:530 resources.h:665
 msgid "Compare file&size"
 msgstr "比對檔案大小(&S)"
 
-#: resources.h:918
+#: resources.h:939
 msgid "Comparison &threshold (in minutes):"
 msgstr "比對門檻(分鐘)(&T):"
 
@@ -2024,60 +2029,60 @@
 msgid "Comparison threshold needs to be between 0 and 1440 minutes."
 msgstr "比對門檻必須在 0 到 1440 分鐘之間."
 
-#: resources.h:160
+#: resources.h:169
 msgid "Compiled for:"
 msgstr "編譯給:"
 
-#: resources.h:161
+#: resources.h:170
 msgid "Compiled on:"
 msgstr "編譯在:"
 
-#: resources.h:163
+#: resources.h:172
 msgid "Compiled with:"
 msgstr "編譯以:"
 
-#: resources.h:164
+#: resources.h:173
 msgid "Compiler flags:"
 msgstr "編譯器旗標:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
 msgid "Compressed"
 msgstr "壓縮"
 
-#: resources.h:802
+#: resources.h:823
 msgid "Concurrent transfers"
 msgstr "並行傳輸"
 
-#: resources.h:224 resources.h:438
+#: resources.h:234 resources.h:448
 msgid "Conditions are c&ase sensitive"
-msgstr "篩選條件是分大小寫的(&A)"
+msgstr "篩選條件是有分大小寫的(&A)"
 
-#: resources.h:710
+#: resources.h:731
 msgid "Configuration test"
 msgstr "組態測試"
 
-#: resources.h:684
+#: resources.h:705
 msgid "Configure passive mode"
 msgstr "配置被動模式"
 
-#: resources.h:700
+#: resources.h:721
 msgid "Configure port range"
 msgstr "配置連接埠範圍"
 
-#: resources.h:468
+#: resources.h:478
 msgid "Configuring FileZilla and your network"
 msgstr "配置 FileZilla 與您的網路"
 
-#: ../../locales/../src/interface/search.cpp:1033
+#: ../../locales/../src/interface/search.cpp:1034
 msgid "Confirm deletion"
 msgstr "確認刪除"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/LocalListView.cpp:2007
-#: ../../locales/../src/interface/LocalListView.cpp:2127
-#: ../../locales/../src/interface/RemoteListView.cpp:1700
-#: ../../locales/../src/interface/RemoteListView.cpp:2625
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
+#: ../../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
 msgid "Confirmation needed"
 msgstr "需要確認"
 
@@ -2085,7 +2090,7 @@
 msgid "Congratulations, your configuration seems to be working."
 msgstr "恭喜, 您的組態似乎已可正常運作."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:141
+#: ../../locales/../src/interface/quickconnectbar.cpp:148
 msgid "Connect bypassing proxy settings"
 msgstr "連線略過 Proxy 設定"
 
@@ -2093,34 +2098,34 @@
 msgid "Connect to specified Site Manager site"
 msgstr "連線到指定的站台管理員站台"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:933
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:943
 msgid "Connected"
 msgstr "已連線"
 
-#: ../../locales/../src/interface/QueueView.cpp:1454
+#: ../../locales/../src/interface/QueueView.cpp:1437
 msgid "Connecting"
 msgstr "連線中"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:207
-#: ../../locales/../src/interface/statuslinectrl.cpp:275
+#: ../../locales/../src/interface/statuslinectrl.cpp:280
 #, c-format
 msgid "Connecting to %s"
 msgstr "正在連線到 %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1163
+#: ../../locales/../src/engine/ControlSocket.cpp:1169
 #, c-format
 msgid "Connecting to %s through proxy"
 msgstr "正經由 Proxy 連線到 %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1034
+#: ../../locales/../src/engine/ControlSocket.cpp:1037
 #: ../../locales/../src/engine/proxy.cpp:172
 #: ../../locales/../src/engine/sftpcontrolsocket.cpp:394
 #, c-format
 msgid "Connecting to %s..."
 msgstr "正在連線到 %s ..."
 
-#: ../../locales/../src/interface/updatewizard.cpp:424
-#: ../../locales/../src/interface/updatewizard.cpp:998
+#: ../../locales/../src/interface/updatewizard.cpp:435
+#: ../../locales/../src/interface/updatewizard.cpp:1013
 msgid "Connecting to server"
 msgstr "正在連線到伺服器"
 
@@ -2128,17 +2133,17 @@
 msgid "Connection"
 msgstr "連線"
 
-#: ../../locales/../src/interface/QueueView.cpp:1070
+#: ../../locales/../src/interface/QueueView.cpp:1053
 msgid "Connection attempt failed"
 msgstr "嘗試連線失敗"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1039
+#: ../../locales/../src/engine/ControlSocket.cpp:1042
 #: ../../locales/../src/engine/proxy.cpp:176
 #, c-format
 msgid "Connection attempt failed with \"%s\", trying next address."
 msgstr "以 \"%s\" 嘗試連線失敗, 試下一個 IP Address."
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1044
+#: ../../locales/../src/engine/ControlSocket.cpp:1047
 #, c-format
 msgid "Connection attempt failed with \"%s\"."
 msgstr "以 \"%s\" 嘗試連線失敗."
@@ -2152,23 +2157,23 @@
 msgid "Connection closed"
 msgstr "關閉連線"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1132
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:235
+#: ../../locales/../src/engine/ControlSocket.cpp:1135
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:241
 msgid "Connection closed by server"
 msgstr "由伺服器關閉連線"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:386
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:393
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:305
 msgid "Connection established, initializing TLS..."
-msgstr "連線已建立, 初始 TLS 加密..."
+msgstr "連線已建立, 正在初始 TLS..."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:340
 msgid "Connection established, sending HTTP request"
 msgstr "連線已建立, 正在傳送 HTTP 請求"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:415
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:422
 msgid "Connection established, waiting for welcome message..."
-msgstr "連線已建立, 正等候歡迎訊息..."
+msgstr "連線已建立, 正在等候歡迎訊息..."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:338
 msgid "Connection lost"
@@ -2182,15 +2187,15 @@
 msgid "Connection refused"
 msgstr "連線被拒"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:681
+#: ../../locales/../src/engine/ControlSocket.cpp:684
 msgid "Connection timed out"
 msgstr "連線逾時"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1070
+#: ../../locales/../src/interface/netconfwizard.cpp:1076
 msgid "Connection timed out."
 msgstr "連線逾時."
 
-#: ../../locales/../src/interface/search.cpp:676
+#: ../../locales/../src/interface/search.cpp:677
 msgid "Connection to server lost."
 msgstr "失去與伺服器的連線."
 
@@ -2210,27 +2215,23 @@
 msgid "Convert keyfile"
 msgstr "轉換金鑰檔案"
 
-#: resources.h:77 resources.h:417
-msgid "Cop&y"
-msgstr "複製(&Y)"
-
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:651
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1761
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1771
 #, c-format
 msgid "Copy (%d) of %s"
 msgstr "複製 (%d) - %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:628
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1738
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1748
 #, c-format
 msgid "Copy of %s"
 msgstr "複製 - %s"
 
-#: resources.h:589 resources.h:639
+#: resources.h:608 resources.h:660
 msgid "Copy the URLs of the selected items to clipboard."
 msgstr "複製所選項目的網址到剪貼簿"
 
-#: ../../locales/../src/engine/transfersocket.cpp:207
+#: ../../locales/../src/engine/transfersocket.cpp:215
 #, c-format
 msgid "Could not accept connection: %s"
 msgstr "無法允許連線: %s"
@@ -2240,16 +2241,20 @@
 msgid "Could not add connection to Site Manager"
 msgstr "無法新增連線到站台管理員"
 
+#: ../../locales/../src/interface/state.cpp:842
+msgid "Could not complete operation"
+msgstr "無法完成操作"
+
 #: ../../locales/../src/engine/ControlSocket.cpp:188
 msgid "Could not connect to server"
 msgstr "無法連線到伺服器"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1205
+#: ../../locales/../src/engine/ControlSocket.cpp:1211
 #, c-format
 msgid "Could not connect to server: %s"
 msgstr "無法連線到伺服器: %s"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:823
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:824
 msgid "Could not convert command to server encoding"
 msgstr "無法轉換指令成伺服器編碼"
 
@@ -2258,17 +2263,17 @@
 msgid "Could not convert private key"
 msgstr "無法轉換私鑰"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not copy URLs"
 msgstr "無法複製網址"
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
+#: ../../locales/../src/interface/aboutdialog.cpp:227
 msgid "Could not copy data"
 msgstr "無法複製資料"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2547
-#: ../../locales/../src/interface/RemoteTreeView.cpp:897
+#: ../../locales/../src/interface/RemoteListView.cpp:2578
+#: ../../locales/../src/interface/RemoteTreeView.cpp:899
 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 "
@@ -2277,38 +2282,38 @@
 "無法確認拖曳動作的目標.\n"
 "不是 Shell Extension 沒有正確安裝好就是您沒有拖曳檔案到 Explorer 視窗."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4257
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4291
 msgid "Could not establish connection to server"
 msgstr "無法建立與伺服器的連線"
 
-#: ../../locales/../src/interface/FileZilla.cpp:486
+#: ../../locales/../src/interface/FileZilla.cpp:493
 msgid ""
 "Could not find the resource files for FileZilla, closing FileZilla.\n"
 "You can set the data directory of FileZilla using the '--datadir "
 "<custompath>' commandline option or by setting the FZ_DATADIR environment "
 "variable."
 msgstr ""
-"無法找到 FileZilla 的資源檔, 關閉 FileZilla.\n"
-"您可以使用指令選項 '--datadir <custompath>' 或是設定 FZ_DATADIR 環境變數來指"
-"定 FileZilla 的資料目錄."
+"無法找到 FileZilla 的資源檔, 正在關閉 FileZilla.\n"
+"您可以使用指令選項 \"--datadir <custompath>\" 或是設定 FZ_DATADIR 環境變數來"
+"指定 FileZilla 的資料目錄."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:696
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:703
 msgid "Could not generate custom login sequence."
 msgstr "無法產生自訂的登入程序."
 
-#: ../../locales/../src/engine/tlssocket.cpp:1007
+#: ../../locales/../src/engine/tlssocket.cpp:1029
 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:982
+#: ../../locales/../src/engine/tlssocket.cpp:1005
 msgid ""
 "Could not get distinguished name of certificate subject, gnutls_x509_get_dn "
 "failed"
 msgstr "無法取得憑證物件的辨別名稱, gnutls_x509_get_dn 失敗"
 
-#: ../../locales/../src/interface/state.cpp:1015
+#: ../../locales/../src/interface/state.cpp:1079
 msgid "Could not get full remote path."
 msgstr "無法取得完整的遠端路徑."
 
@@ -2317,15 +2322,15 @@
 msgid "Could not get reply from fzputtygen."
 msgstr "無法從 fzputtygen 取得回應."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2608
+#: ../../locales/../src/interface/RemoteListView.cpp:2639
 msgid "Could not get temporary directory to download file into."
 msgstr "無法取得放置下載檔案用的暫存目錄."
 
-#: ../../locales/../src/engine/tlssocket.cpp:935
+#: ../../locales/../src/engine/tlssocket.cpp:947
 msgid "Could not import peer certificates, gnutls_x509_crt_import failed"
 msgstr "無法匯入同儕憑證, gnutls_x509_crt_import 失敗"
 
-#: ../../locales/../src/engine/tlssocket.cpp:928
+#: ../../locales/../src/engine/tlssocket.cpp:941
 msgid ""
 "Could not initialize structure for peer certificates, gnutls_x509_crt_init "
 "failed"
@@ -2340,7 +2345,7 @@
 "Any changes made in the Site Manager will not be saved."
 msgstr ""
 "無法載入 \"%s\", 請確定檔案是否有效並且可存取.\n"
-"對帳台管理員的任何變更都不永久保留."
+"對帳台管理員的任何變更都不會儲存."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:223
 msgid "Could not load keyfile"
@@ -2350,24 +2355,24 @@
 msgid "Could not load private key"
 msgstr "無法載入私鑰"
 
-#: ../../locales/../src/interface/state.cpp:1041
+#: ../../locales/../src/interface/state.cpp:1105
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr ""
-"無法取得對應遠端目錄 '%s' 的本地目錄.\n"
+"無法取得對應遠端目錄 \"%s\" 的本地目錄.\n"
 "要停用同步瀏覽並繼續變更遠端目錄?"
 
-#: ../../locales/../src/interface/state.cpp:381
+#: ../../locales/../src/interface/state.cpp:404
 #, c-format
 msgid ""
 "Could not obtain corresponding local directory for the remote directory '%"
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"無法取得對應遠端目錄 '%s' 的本地目錄.\n"
+"無法取得對應遠端目錄 \"%s\" 的本地目錄.\n"
 "同步瀏覽已停用."
 
 #: ../../locales/../src/interface/state.cpp:295
@@ -2377,12 +2382,12 @@
 "s'.\n"
 "Synchronized browsing has been disabled."
 msgstr ""
-"無法取得對應本地目錄 '%s' 的遠端目錄.\n"
+"無法取得對應本地目錄 \"%s\" 的遠端目錄.\n"
 "同步瀏覽已停用."
 
-#: ../../locales/../src/interface/aboutdialog.cpp:219
-#: ../../locales/../src/interface/RemoteListView.cpp:3059
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1452
+#: ../../locales/../src/interface/aboutdialog.cpp:227
+#: ../../locales/../src/interface/RemoteListView.cpp:3090
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1454
 msgid "Could not open clipboard"
 msgstr "無法開啟剪貼簿"
 
@@ -2397,11 +2402,11 @@
 msgid "Could not parse remote path."
 msgstr "無法解析遠端路徑."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:84
+#: ../../locales/../src/interface/quickconnectbar.cpp:85
 msgid "Could not parse server address:"
 msgstr "無法解析伺服器位址:"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:225
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:231
 #, c-format
 msgid "Could not read from socket: %s"
 msgstr "無法從 Socket 讀取: %s"
@@ -2410,12 +2415,12 @@
 msgid "Could not read server item."
 msgstr "無法讀取伺服器項目."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2695
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
 #, c-format
 msgid "Could not seek to offset %s within file"
 msgstr "無法在檔案中尋找到偏移量 %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2628
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2659
 msgid "Could not seek to the end of the file"
 msgstr "無法找尋到檔案結尾"
 
@@ -2423,22 +2428,22 @@
 msgid "Could not send command to fzputtygen."
 msgstr "無法傳送指令給 fzputtygen."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2726
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2757
 msgid "Could not spawn IO thread"
 msgstr "無法產生 I/O 執行緒"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1178
+#: ../../locales/../src/engine/ControlSocket.cpp:1184
 #, c-format
 msgid "Could not start proxy handshake: %s"
 msgstr "無法啟動 Proxy 交握: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1121
-#: ../../locales/../src/interface/QueueView.cpp:1126
+#: ../../locales/../src/interface/QueueView.cpp:1104
+#: ../../locales/../src/interface/QueueView.cpp:1109
 msgid "Could not start transfer"
 msgstr "無法啟動傳輸"
 
 #: ../../locales/../src/interface/sitemanager.cpp:657
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:808
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
 #, c-format
 msgid ""
 "Could not write \"%s\", any changes to the Site Manager could not be saved: %"
@@ -2455,23 +2460,23 @@
 msgid "Could not write \"%s\", the global bookmarks could no be saved: %s"
 msgstr "無法寫入 \"%s\", 無法儲存全域書籤: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1985
+#: ../../locales/../src/interface/QueueView.cpp:1976
 #, 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:784
-#: ../../locales/../src/interface/sitemanager.cpp:846
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2186
+#: ../../locales/../src/interface/sitemanager.cpp:782
+#: ../../locales/../src/interface/sitemanager.cpp:842
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2196
 #, c-format
 msgid "Could not write \"%s\", the selected sites could not be exported: %s"
-msgstr "無法寫入 \"%s\", 所選的站台無法匯出: %s"
+msgstr "無法寫入 \"%s\", 無法匯出所選的站台: %s"
 
-#: ../../locales/../src/interface/wrapengine.cpp:1134
+#: ../../locales/../src/interface/wrapengine.cpp:1151
 #, c-format
 msgid "Could not write \"%s\": %s"
 msgstr "無法寫入 \"%s\": %s"
@@ -2481,7 +2486,7 @@
 msgid "Could not write keyfile: %s"
 msgstr "無法寫入金鑰檔案: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1115
+#: ../../locales/../src/interface/QueueView.cpp:1098
 msgid "Could not write to local file"
 msgstr "無法寫入本地檔案"
 
@@ -2491,40 +2496,52 @@
 msgid "Could not write to log file: %s"
 msgstr "無法寫入記錄檔案: %s"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:999
-#: ../../locales/../src/engine/ControlSocket.cpp:1097
+#: ../../locales/../src/engine/ControlSocket.cpp:1002
+#: ../../locales/../src/engine/ControlSocket.cpp:1100
 #, c-format
 msgid "Could not write to socket: %s"
 msgstr "無法寫入 Socket: %s"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:181
+#: ../../locales/../src/interface/verifycertdialog.cpp:184
 msgid "Country:"
 msgstr "國家:"
 
-#: resources.h:618
+#: resources.h:637
 msgid "Crashes FileZilla instantly. Only used to debug the exception handler"
 msgstr "立即弄當 FileZilla. 只用於檢測例外處理機制"
 
-#: resources.h:568 resources.h:582 resources.h:633 resources.h:654
+#: resources.h:600
+msgid "Crea&te new file"
+msgstr "建立新檔案(&T)"
+
+#: resources.h:585 resources.h:599 resources.h:654 resources.h:675
 msgid "Create a new subdirectory in the current directory"
 msgstr "在現行目錄下建立子新的目錄"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: resources.h:601
+msgid "Create a new, empty file in the current directory"
+msgstr "在現行目錄下建立新的空檔案"
+
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Create directory"
 msgstr "新增目錄"
 
-#: ../../locales/../src/interface/QueueView.cpp:1527
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Create empty file"
+msgstr "建立空檔案"
+
+#: ../../locales/../src/interface/QueueView.cpp:1510
 msgid "Creating directory"
 msgstr "新增目錄中"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3300
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2047
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3331
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2048
 #, c-format
 msgid "Creating directory '%s'..."
-msgstr "新增目錄 '%s'..."
+msgstr "新增目錄 \"%s\"..."
 
 #: ../../locales/../src/engine/ControlSocket.cpp:174
 msgid "Critical error"
@@ -2539,7 +2556,7 @@
 msgid "Critical file transfer error after transferring %s in %s"
 msgstr "於 %s (全部 %s) 之後發生嚴重檔案傳輸錯誤"
 
-#: ../../locales/../src/interface/state.cpp:370
+#: ../../locales/../src/interface/state.cpp:393
 #, c-format
 msgid ""
 "Current remote directory (%s) is not below the synchronization root (%s).\n"
@@ -2550,7 +2567,7 @@
 
 #: ../../locales/../src/interface/statusbar.cpp:423
 msgid "Current transfer type is set to ASCII."
-msgstr "目前的傳輸型態已設定為文字型態."
+msgstr "目前的傳輸型態已設定為文字類型態."
 
 #: ../../locales/../src/interface/statusbar.cpp:433
 msgid "Current transfer type is set to automatic detection."
@@ -2560,69 +2577,73 @@
 msgid "Current transfer type is set to binary."
 msgstr "目前的傳輸型態已設定為二進位型態."
 
-#: resources.h:773 resources.h:894
+#: resources.h:794 resources.h:915
 msgid "Cus&tom"
 msgstr "自訂(&T)"
 
-#: ../../locales/../src/interface/filter.cpp:99
+#: ../../locales/../src/interface/filter.cpp:98
 msgid "Custom filter set"
 msgstr "自訂篩選集"
 
-#: resources.h:376 resources.h:377
+#: resources.h:386 resources.h:387
 msgid "Custom server"
 msgstr "自訂伺服器"
 
-#: resources.h:385
+#: resources.h:395
 msgid "D&ata type"
 msgstr "資料型態(&A)"
 
-#: resources.h:901
+#: resources.h:922
 msgid "D&ecimal prefixes using SI symbols (e.g. 1 KB = 1000 bytes)"
 msgstr "使用 SI 式符號的十進制字首 (即 1 KB = 1000 bytes) (&E)"
 
-#: resources.h:100
+#: resources.h:109
 msgid "D&efault"
 msgstr "預設(&E)"
 
-#: resources.h:584 resources.h:634 resources.h:664
+#: resources.h:603 resources.h:655 resources.h:685
 msgid "D&elete"
 msgstr "刪除(&E)"
 
-#: resources.h:205
+#: resources.h:215
 msgid "D&isable all"
 msgstr "全部關閉(&I)"
 
-#: resources.h:872
+#: resources.h:893
 msgid "D&o not save passwords"
 msgstr "不儲存密碼(&O)"
 
-#: resources.h:925
+#: resources.h:946
 msgid "D&ouble-click action on directories:"
 msgstr "對目錄的雙擊動作(&O):"
 
+#: resources.h:228 resources.h:427
+msgid "D&uplicate"
+msgstr "複製(&U)"
+
 #: ../../locales/../src/engine/server.cpp:34
 msgid "DOS-like with virtual paths"
 msgstr "DOS 類型包含虛擬路徑"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid "Dangerous filetype"
-msgstr "可能會造成危險的檔案型態"
+msgstr "可能會造成危險的檔案類型"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:41
 msgid "Data"
 msgstr "資料"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:985
-#: ../../locales/../src/interface/netconfwizard.cpp:1051
+#: ../../locales/../src/interface/netconfwizard.cpp:991
+#: ../../locales/../src/interface/netconfwizard.cpp:1057
 msgid "Data socket closed too early."
 msgstr "Data Socket 過早關閉."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:152
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:155
 msgid "Date"
 msgstr "日期"
 
-#: resources.h:885
+#: resources.h:906
 msgid "Date formatting"
 msgstr "日期格式"
 
@@ -2641,11 +2662,11 @@
 msgid "Debug"
 msgstr "偵錯"
 
-#: resources.h:965
+#: resources.h:990
 msgid "Debugging settings"
 msgstr "偵錯設定"
 
-#: resources.h:91
+#: resources.h:100
 msgid "Default &local directory:"
 msgstr "預設本地目錄(&L):"
 
@@ -2653,19 +2674,19 @@
 msgid "Default (Autodetect)"
 msgstr "預設(自動偵測)"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:138
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
 msgid "Default editor not properly quoted."
 msgstr "未正確引用預設的編輯器."
 
-#: resources.h:255 resources.h:277 resources.h:855
+#: resources.h:265 resources.h:287 resources.h:876
 msgid "Default file exists action"
 msgstr "預設檔案存在動作"
 
-#: resources.h:93
+#: resources.h:102
 msgid "Default r&emote directory:"
 msgstr "預設遠端目錄(&E):"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1051
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1061
 msgid ""
 "Default remote path cannot be parsed. Make sure it is a valid absolute path "
 "for the selected server type."
@@ -2675,15 +2696,15 @@
 msgid "Default system language"
 msgstr "系統預設語系"
 
-#: resources.h:678
+#: resources.h:699
 msgid "Default transfer mode:"
 msgstr "預設傳輸模式:"
 
-#: resources.h:824
+#: resources.h:845
 msgid "Default transfer type:"
 msgstr "預設傳輸形式:"
 
-#: resources.h:697 resources.h:760
+#: resources.h:718 resources.h:781
 msgid "Default: http://ip.filezilla-project.org/ip.php"
 msgstr "預設: http://ip.filezilla-project.org/ip.php"
 
@@ -2702,57 +2723,57 @@
 "attempt..."
 msgstr[0] "因先前連線嘗試失敗而延遲 %d 秒連線..."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1213
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1223
 msgid "Delete Site Manager entry"
-msgstr "清除站台管理員欄位"
+msgstr "刪除站台管理員欄位"
 
-#: resources.h:635 resources.h:656
+#: resources.h:656 resources.h:677
 msgid "Delete selected directory"
 msgstr "刪除所選的目錄"
 
-#: resources.h:571 resources.h:585
+#: resources.h:588 resources.h:604
 msgid "Delete selected files and directories"
 msgstr "刪除所選的檔案與目錄"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting directories"
-msgstr "刪除目錄中"
+msgstr "正在刪除目錄"
 
-#: ../../locales/../src/interface/search.cpp:1017
+#: ../../locales/../src/interface/search.cpp:1018
 msgid "Deleting multiple unrelated directories is not yet supported"
 msgstr "尚未支援刪除多個不相關的目錄"
 
-#: resources.h:453
+#: resources.h:463
 msgid "Deleting symbolic link"
 msgstr "正在刪除軟連結"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1048
+#: ../../locales/../src/interface/LocalTreeView.cpp:1042
 msgid "Desktop"
 msgstr "桌面"
 
-#: resources.h:4 resources.h:28 resources.h:176
+#: resources.h:4 resources.h:33 resources.h:186
 msgid "Details"
 msgstr "詳細內容"
 
-#: resources.h:189
+#: resources.h:199
 msgid "Details for new key:"
 msgstr "新金鑰的詳細內容:"
 
-#: resources.h:227
+#: resources.h:237
 msgid "Dire&ctories"
 msgstr "目錄(&C)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Direction"
 msgstr "方向"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:523
+#: ../../locales/../src/interface/filelistctrl.cpp:283
 msgid "Directory"
 msgstr "目錄"
 
-#: resources.h:642 resources.h:916 resources.h:999
-#: ../../locales/../src/interface/filelistctrl.cpp:445
-#: ../../locales/../src/interface/Mainfrm.cpp:2323
+#: resources.h:663 resources.h:937 resources.h:1025
+#: ../../locales/../src/interface/filelistctrl.cpp:449
+#: ../../locales/../src/interface/Mainfrm.cpp:2396
 msgid "Directory comparison"
 msgstr "目錄比對"
 
@@ -2770,11 +2791,11 @@
 msgid "Directory listing aborted by user"
 msgstr "使用者中止目錄列表"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2349
+#: ../../locales/../src/interface/RemoteListView.cpp:2380
 msgid "Directory listing failed"
 msgstr "目錄列表失敗"
 
-#: resources.h:198
+#: resources.h:208
 msgid "Directory listing filters"
 msgstr "目錄列表篩選器"
 
@@ -2782,65 +2803,64 @@
 msgid "Directory listing successful"
 msgstr "成功取得目錄列表"
 
-#: resources.h:208
+#: resources.h:218
 msgid "Disa&ble all"
 msgstr "全部停用(&B)"
 
-#: ../../locales/../src/interface/state.cpp:1049
+#: ../../locales/../src/interface/state.cpp:1113
 msgid ""
 "Disable synchronized browsing and continue changing the remote directory?"
 msgstr "要停用同步瀏覽並繼續變更遠端目錄?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:669
+#: ../../locales/../src/interface/Mainfrm.cpp:681
 msgid ""
 "Disable this option again if you will not be able to see the correct "
 "directory contents anymore."
 msgstr "如果您不再看見正確的目錄列表, 請再次停用此選項."
 
-#: resources.h:992
+#: resources.h:1018
 msgid "Disconnect from server"
 msgstr "從伺服器離線"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:82
-#: ../../locales/../src/engine/ControlSocket.cpp:1000
-#: ../../locales/../src/engine/ControlSocket.cpp:1099
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:227
+#: ../../locales/../src/engine/ControlSocket.cpp:1003
+#: ../../locales/../src/engine/ControlSocket.cpp:1102
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:233
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:936
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:938
-#: ../../locales/../src/interface/QueueView.cpp:1068
-#: ../../locales/../src/interface/QueueView.cpp:1112
+#: ../../locales/../src/interface/QueueView.cpp:1051
+#: ../../locales/../src/interface/QueueView.cpp:1095
 msgid "Disconnected from server"
 msgstr "已從伺服器離線"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1134
+#: ../../locales/../src/engine/ControlSocket.cpp:1137
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:953
 #, c-format
 msgid "Disconnected from server: %s"
 msgstr "已從伺服器離線: %s"
 
-#: ../../locales/../src/interface/QueueView.cpp:1429
-#: ../../locales/../src/interface/statuslinectrl.cpp:269
+#: ../../locales/../src/interface/QueueView.cpp:1412
+#: ../../locales/../src/interface/statuslinectrl.cpp:274
 msgid "Disconnecting from previous server"
-msgstr "從先前伺服器離線中"
+msgstr "正在從先前伺服器離線"
 
-#: resources.h:993
+#: resources.h:1019
 msgid "Disconnects from the currently visible server"
 msgstr "從當前伺服器離線"
 
-#: resources.h:556
+#: resources.h:573
 msgid "Display about dialog"
 msgstr "顯示 FileZilla 相關資訊"
 
-#: resources.h:934
+#: resources.h:955
 msgid "Do &not use default editor"
 msgstr "不使用預設編輯器(&N)"
 
-#: resources.h:610
+#: resources.h:629
 msgid "Do &nothing"
 msgstr "什麼都不做(&N)"
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
+#: ../../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."
@@ -2848,8 +2868,8 @@
 "您想檢查測試版嗎? 除非您想測試新功能,\n"
 "否則還是繼續使用穩定版本會比較好."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1126
-#: ../../locales/../src/interface/Mainfrm.cpp:1150
+#: ../../locales/../src/interface/Mainfrm.cpp:1248
+#: ../../locales/../src/interface/Mainfrm.cpp:1272
 msgid "Do you really want to close FileZilla?"
 msgstr "您真的要關閉 FileZilla?"
 
@@ -2862,7 +2882,7 @@
 msgid "Do you really want to delete all Site Manager entries?"
 msgstr "您真的要刪除所有站台管理員裡的欄位?"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1215
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1225
 msgid "Do you really want to delete selected entry?"
 msgstr "您真的要刪除所選的欄位?"
 
@@ -2870,32 +2890,32 @@
 msgid "Do you really want to delete the transfer queue?"
 msgstr "您真的要刪除傳輸佇列?"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:593
+#: ../../locales/../src/interface/Mainfrm.cpp:597
 #, c-format
 msgid "Do you really want to send '%s' to the server?"
-msgstr "您真的要傳送 '%s' 到伺服器?"
+msgstr "您真的要傳送 \"%s\" 到伺服器?"
 
-#: resources.h:466
+#: resources.h:476
 msgid "Documentation"
 msgstr "文件"
 
-#: resources.h:699
+#: resources.h:720
 msgid "Don't use external IP address on &local connections."
 msgstr "不在本地端連線使用外部 IP Address (&L)."
 
-#: resources.h:835
+#: resources.h:856
 msgid "Dotfiles are filenames starting with a dot, e.g. .htaccess"
 msgstr "點檔案即是以 \".\" 開頭的檔案, 如 .htaccess"
 
-#: resources.h:919
+#: resources.h:940
 msgid "Double-click action"
 msgstr "雙擊動作"
 
-#: resources.h:362
+#: resources.h:372
 msgid "Download"
 msgstr "下載"
 
-#: resources.h:482 resources.h:811
+#: resources.h:492 resources.h:832
 msgid "Download &limit:"
 msgstr "下載限制(&L):"
 
@@ -2908,98 +2928,111 @@
 msgid "Download limit: none"
 msgstr "下載限制: 無"
 
-#: resources.h:441 ../../locales/../src/interface/search.cpp:817
-#: ../../locales/../src/interface/search.cpp:823
+#: resources.h:451 ../../locales/../src/interface/search.cpp:818
+#: ../../locales/../src/interface/search.cpp:824
 msgid "Download search results"
 msgstr "下載搜尋結果"
 
-#: resources.h:629
+#: resources.h:650
 msgid "Download selected directory"
 msgstr "下載所選的目錄"
 
-#: resources.h:575
+#: resources.h:592
 msgid "Download selected files and directories"
 msgstr "下載所選的檔案與目錄"
 
-#: ../../locales/../src/interface/edithandler.cpp:1245
+#: ../../locales/../src/interface/Mainfrm.cpp:1072
+#, c-format
+msgid ""
+"Download speed: %s/s\n"
+"Upload speed: %s/s"
+msgstr ""
+"下載速率: %s/s\n"
+"上傳速率: %s/s"
+
+#: ../../locales/../src/interface/edithandler.cpp:1253
 msgid "Downloading"
 msgstr "正在下載"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:358
-#: ../../locales/../src/interface/updatewizard.cpp:415
+#: ../../locales/../src/interface/updatewizard.cpp:423
 #, c-format
 msgid "Downloading %s"
 msgstr "正在下載 %s"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading multiple unrelated directories is not yet supported"
 msgstr "尚未支援下載多個不相關的目錄"
 
-#: ../../locales/../src/interface/search.cpp:926
+#: ../../locales/../src/interface/search.cpp:927
 msgid "Downloading search results"
-msgstr "下載搜尋結果"
+msgstr "正在下載搜尋結果"
 
-#: ../../locales/../src/interface/LocalListView.cpp:103
+#: ../../locales/../src/interface/LocalListView.cpp:104
 #: ../../locales/../src/interface/LocalTreeView.cpp:104
 #: ../../locales/../src/interface/QueueView.cpp:83
-#: ../../locales/../src/interface/RemoteListView.cpp:101
+#: ../../locales/../src/interface/RemoteListView.cpp:102
 #: ../../locales/../src/interface/RemoteTreeView.cpp:88
 msgid ""
 "Drag&drop between different instances of FileZilla has not been implemented "
 "yet."
 msgstr "尚未實作在不同 FileZilla 程式實體間的拖曳功能."
 
-#: ../../locales/../src/interface/LocalListView.cpp:109
+#: ../../locales/../src/interface/LocalListView.cpp:110
 #: ../../locales/../src/interface/LocalTreeView.cpp:110
 #: ../../locales/../src/interface/QueueView.cpp:96
-#: ../../locales/../src/interface/RemoteListView.cpp:107
+#: ../../locales/../src/interface/RemoteListView.cpp:108
 #: ../../locales/../src/interface/RemoteTreeView.cpp:94
 msgid "Drag&drop between different servers has not been implemented yet."
 msgstr "尚未實作在不同伺服器間的拖曳功能."
 
-#: resources.h:204
+#: resources.h:86
+msgid "Dupl&icate"
+msgstr "複製(&I)"
+
+#: resources.h:214
 msgid "E&nable all"
 msgstr "全部啟用(&N)"
 
-#: resources.h:561 resources.h:578
+#: resources.h:578 resources.h:595
 msgid "E&nter directory"
 msgstr "進入目錄(&N)"
 
-#: resources.h:141
+#: resources.h:150
 msgid "E&xecute"
 msgstr "執行(&X)"
 
-#: resources.h:501
+#: resources.h:518
 msgid "E&xit"
 msgstr "離開(&X)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:190
 msgid "E-Mail:"
 msgstr "電子郵件:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:646
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:687
 msgid "Each filter needs at least one condition."
 msgstr "每一個篩選器需要最少一個條件."
 
-#: resources.h:230
+#: resources.h:240
 msgid "Edit filters"
 msgstr "編輯篩選器"
 
-#: resources.h:566
+#: resources.h:583
 msgid ""
 "Edit the file with the configured editor and upload changes to the server."
-msgstr "使用配置好的編輯器編輯檔案並上傳變更回伺服器."
+msgstr "使用組態好的編輯器編輯檔案並上傳變更回伺服器."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1952
-#: ../../locales/../src/interface/LocalListView.cpp:1963
+#: ../../locales/../src/interface/LocalListView.cpp:1960
+#: ../../locales/../src/interface/LocalListView.cpp:1971
 msgid "Editing failed"
 msgstr "編輯失敗"
 
-#: resources.h:882
+#: resources.h:903
 msgid "Email:"
 msgstr "電子郵件:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "Empty command"
 msgstr "空的指令"
 
@@ -3007,7 +3040,7 @@
 msgid "Empty command."
 msgstr "空的指令."
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2351
+#: ../../locales/../src/interface/RemoteListView.cpp:2382
 msgid "Empty directory listing"
 msgstr "空目錄列表"
 
@@ -3019,101 +3052,113 @@
 msgid "Empty file extension."
 msgstr "空的副檔名."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty filter names are not allowed."
 msgstr "不允許空的篩選器名稱."
 
-#: ../../locales/../src/interface/filteredit.cpp:206
-#: ../../locales/../src/interface/filteredit.cpp:248
+#: ../../locales/../src/interface/filteredit.cpp:208
+#: ../../locales/../src/interface/filteredit.cpp:250
 msgid "Empty name"
 msgstr "空的名稱"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:141
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:147
 msgid "Empty quoted string."
 msgstr "空的引用字串."
 
-#: resources.h:207
+#: resources.h:217
 msgid "En&able all"
 msgstr "全部啟用(&A)"
 
-#: resources.h:820
+#: resources.h:841
 msgid "Enable invalid character &filtering"
 msgstr "啟用無效字元篩選(&F)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:104
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
 msgid "Encrypted"
 msgstr "加密"
 
-#: resources.h:344
+#: resources.h:354
 msgid "Encryption"
 msgstr "加密"
 
-#: resources.h:336
+#: resources.h:346
 msgid "Encryption details"
 msgstr "加密細節"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:447
+#: ../../locales/../src/interface/filelistctrl.cpp:451
 msgid "End comparison and change sorting order?"
 msgstr "結束比對並變更排序?"
 
-#: resources.h:542
+#: resources.h:559
 msgid "Enter &custom command..."
 msgstr "輸入自訂指令(&C)..."
 
-#: resources.h:486
+#: resources.h:496
 #, no-c-format
 msgid "Enter 0 for unlimited speed."
 msgstr "輸入 0 則不設速限."
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 msgid "Enter command"
 msgstr "輸入指令"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid "Enter custom command"
 msgstr "輸入自訂指令"
 
-#: resources.h:926
+#: resources.h:947
 msgid "Enter directory"
 msgstr "進入目錄"
 
-#: ../../locales/../src/interface/filteredit.cpp:134
-#: ../../locales/../src/interface/filteredit.cpp:194
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:136
+#: ../../locales/../src/interface/filteredit.cpp:196
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Enter filter name"
 msgstr "輸入篩選器名稱"
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Enter name for filterset"
 msgstr "輸入篩選集的名稱"
 
-#: ../../locales/../src/interface/filter.cpp:406
+#: ../../locales/../src/interface/filter.cpp:405
 msgid "Enter new name for filterset"
 msgstr "輸入篩選集的新名稱"
 
-#: resources.h:116
+#: resources.h:125
 msgid "Enter password"
 msgstr "輸入密碼"
 
-#: resources.h:562 resources.h:579
+#: resources.h:579 resources.h:596
 msgid "Enter selected directory"
 msgstr "進入所選的目錄"
 
-#: resources.h:719
+#: resources.h:740
 msgid ""
 "Enter the address of the server.\n"
 "To specify the server protocol, prepend the host with the protocol "
 "identifier. If no protocol is specified, the default protocol (ftp://) will "
 "be used.\n"
 "You can also enter complete URLs in the form protocol://user:pass@host:port "
-"here, the values in the other fields will be overwritten then."
+"here, the values in the other fields will be overwritten then.\n"
+"\n"
+"Supported protocols are:\n"
+"- ftp:// for normal FTP\n"
+"- sftp:// for SSH file transfer protocol\n"
+"- ftps:// for FTP over TLS (implicit)\n"
+"- ftpes:// for FTP over TLS (explicit)"
 msgstr ""
 "輸入伺服器的位址.\n"
 "要指定通訊協定, 請在主機名稱前方加入協定識別字串. 如果沒有指定任何通訊協定, "
 "則會使用預設的通訊協定 (ftp://).\n"
 "您可以輸入完整的 URL 格式, 如 protocol://user:pass@host:port 這樣, 如此一來其"
-"它欄位的資料則會被此格式覆寫."
+"它欄位的資料則會被此格式覆寫.\n"
+"\n"
+"支援的協定有:\n"
+"- ftp:// 給一般的 FTP 用\n"
+"- sftp:// 給 SSH 檔案傳輸協定用\n"
+"- ftps:// 給透過 (隱含式) TLS 的 FTP 用\n"
+"- ftpes:// 給透過 (外顯式) TLS 的 FTP 用"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:279
 #, c-format
@@ -3121,10 +3166,10 @@
 "Enter the password for the file '%s'.\n"
 "Please note that the converted file will not be password protected."
 msgstr ""
-"輸入檔案 '%s' 的密碼.\n"
+"輸入檔案 \"%s\" 的密碼.\n"
 "請記得轉換後的檔案將沒有密碼保護."
 
-#: resources.h:723
+#: resources.h:744
 msgid ""
 "Enter the port on which the server listens.\n"
 "The default for FTP is 21, the default for SFTP is 22."
@@ -3146,7 +3191,7 @@
 msgid "Error importing"
 msgstr "匯入錯誤"
 
-#: ../../locales/../src/interface/QueueView.cpp:2052
+#: ../../locales/../src/interface/QueueView.cpp:2043
 msgid "Error loading queue"
 msgstr "載入佇列錯誤"
 
@@ -3155,27 +3200,27 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:731
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:772
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:821
-#: ../../locales/../src/interface/filter.cpp:211
-#: ../../locales/../src/interface/filter.cpp:1046
+#: ../../locales/../src/interface/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:215
-#: ../../locales/../src/interface/QueueView.cpp:1965
-#: ../../locales/../src/interface/search.cpp:1094
-#: ../../locales/../src/interface/search.cpp:1115
+#: ../../locales/../src/interface/Options.cpp:216
+#: ../../locales/../src/interface/QueueView.cpp:1956
+#: ../../locales/../src/interface/search.cpp:1095
+#: ../../locales/../src/interface/search.cpp:1116
 #: ../../locales/../src/interface/sitemanager.cpp:250
 #: ../../locales/../src/interface/sitemanager.cpp:448
 #: ../../locales/../src/interface/sitemanager.cpp:544
 #: ../../locales/../src/interface/sitemanager.cpp:603
-#: ../../locales/../src/interface/sitemanager.cpp:723
-#: ../../locales/../src/interface/sitemanager.cpp:810
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:730
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:785
-#: ../../locales/../src/interface/wrapengine.cpp:976
+#: ../../locales/../src/interface/sitemanager.cpp:721
+#: ../../locales/../src/interface/sitemanager.cpp:806
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:731
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:786
+#: ../../locales/../src/interface/wrapengine.cpp:993
 msgid "Error loading xml file"
 msgstr "載入 XML 檔案錯誤"
 
-#: ../../locales/../src/interface/QueueView.cpp:1951
+#: ../../locales/../src/interface/QueueView.cpp:1942
 msgid "Error saving queue"
 msgstr "儲存佇列錯誤"
 
@@ -3186,72 +3231,80 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:331
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:859
-#: ../../locales/../src/interface/QueueView.cpp:1986
+#: ../../locales/../src/interface/QueueView.cpp:1977
 #: ../../locales/../src/interface/sitemanager.cpp:658
-#: ../../locales/../src/interface/sitemanager.cpp:785
-#: ../../locales/../src/interface/sitemanager.cpp:847
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:809
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2187
-#: ../../locales/../src/interface/wrapengine.cpp:1135
+#: ../../locales/../src/interface/sitemanager.cpp:783
+#: ../../locales/../src/interface/sitemanager.cpp:843
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:810
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2197
+#: ../../locales/../src/interface/wrapengine.cpp:1152
 msgid "Error writing xml file"
 msgstr "寫入 XML 檔案錯誤"
 
-#: ../../locales/../src/interface/updatewizard.cpp:335
+#: ../../locales/../src/interface/updatewizard.cpp:343
 msgid "Error, file name cannot be parsed."
 msgstr "錯誤, 無法解析檔案名稱."
 
-#: ../../locales/../src/interface/updatewizard.cpp:351
+#: ../../locales/../src/interface/updatewizard.cpp:359
 msgid "Error, local file exists but cannot be removed"
 msgstr "錯誤, 本地檔案存在但無法移除"
 
 #: ../../locales/../src/engine/logging.cpp:213
-#: ../../locales/../src/interface/StatusView.cpp:285
-#: ../../locales/../src/interface/StatusView.cpp:333
-#: ../../locales/../src/interface/updatewizard.cpp:535
+#: ../../locales/../src/interface/StatusView.cpp:283
+#: ../../locales/../src/interface/StatusView.cpp:331
+#: ../../locales/../src/interface/updatewizard.cpp:546
 msgid "Error:"
 msgstr "錯誤:"
 
-#: resources.h:478
+#: resources.h:488
 msgid "Establish connection in a new tab"
 msgstr "於新頁籤建立連線"
 
-#: resources.h:945
+#: resources.h:972
+msgid "Every month"
+msgstr "一個月一次"
+
+#: resources.h:971
+msgid "Every two weeks"
+msgstr "兩週一次"
+
+#: resources.h:966
 msgid "Example: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 msgstr "範例: png \"c:\\program files\\viewer\\viewer.exe\" -open"
 
-#: resources.h:904
+#: resources.h:925
 msgid "Examples"
 msgstr "範例"
 
-#: resources.h:145
+#: resources.h:154
 msgid "Exe&cute"
 msgstr "執行(&C)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:320
+#: ../../locales/../src/interface/updatewizard.cpp:328
 msgid "Executable"
-msgstr "執行檔"
+msgstr "可執行檔"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1763
+#: ../../locales/../src/interface/Mainfrm.cpp:1833
 msgid "Executable contains no version info, cannot check for updates."
-msgstr "執行檔未包含版本資訊, 無法檢查更新."
+msgstr "可執行檔未包含版本資訊, 無法檢查更新."
 
-#: resources.h:862
+#: resources.h:883
 msgid "Explorer"
 msgstr "檔案總管"
 
-#: resources.h:294
+#: resources.h:304
 msgid "Export &Queue"
 msgstr "匯出佇列(&Q)"
 
-#: resources.h:293
+#: resources.h:303
 msgid "Export &Settings"
 msgstr "匯出設定(&S)"
 
-#: resources.h:290
+#: resources.h:300
 msgid "Export settings"
-msgstr "設定匯出"
+msgstr "匯出設定"
 
-#: resources.h:219
+#: resources.h:229
 msgid "F&ilter name:"
 msgstr "篩選器名稱(&I):"
 
@@ -3259,7 +3312,7 @@
 msgid "FTP"
 msgstr "FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:496
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:497
 msgid "FTP - File Transfer Protocol"
 msgstr "FTP - 檔案傳輸協定"
 
@@ -3271,25 +3324,25 @@
 msgid "FTP - Insecure File Transfer Protocol"
 msgstr "FTP - 不安全的檔案傳輸協定"
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FTP Engine not initialized, can't connect"
 msgstr "未初始 FTP 引擎, 無法連線"
 
-#: resources.h:747
+#: resources.h:768
 msgid "FTP Keep-alive"
 msgstr "FTP 維持連線"
 
-#: resources.h:767
+#: resources.h:788
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:120
 msgid "FTP Proxy"
 msgstr "FTP Proxy"
 
-#: ../../locales/../src/interface/cmdline.cpp:19
+#: ../../locales/../src/interface/cmdline.cpp:21
 msgid "FTP URL"
 msgstr "FTP 網址"
 
-#: resources.h:675
+#: resources.h:696
 msgid ""
 "FTP uses secondary connections for data transfers. These additional "
 "connections can be established in two ways."
@@ -3303,71 +3356,71 @@
 msgid "FTPS - FTP over implicit TLS/SSL"
 msgstr "FTPS - 透過隱含式 TLS/SSL 的 FTP"
 
-#: ../../locales/../src/interface/LocalListView.cpp:534
-#: ../../locales/../src/interface/LocalListView.cpp:614
-#: ../../locales/../src/interface/LocalListView.cpp:2248
-#: ../../locales/../src/interface/LocalTreeView.cpp:906
+#: ../../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
 msgid "Failed to change directory"
 msgstr "無法變更目錄"
 
-#: ../../locales/../src/interface/FileZilla.cpp:259
-#: ../../locales/../src/interface/FileZilla.cpp:267
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../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
 msgid "Failed to change language"
 msgstr "無法變更語系"
 
-#: ../../locales/../src/interface/updatewizard.cpp:453
+#: ../../locales/../src/interface/updatewizard.cpp:464
 msgid "Failed to check for newer version of FileZilla."
 msgstr "無法檢查新版的 FileZilla."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1950
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1960
 msgid "Failed to copy or move sites"
 msgstr "無法複製或移動站台"
 
 #: ../../locales/../src/interface/xmlfunctions.cpp:514
 msgid "Failed to create backup copy of xml file"
-msgstr "無法建立 XML 檔案副本"
+msgstr "無法建立 XML 檔案備份"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:791
+#: ../../locales/../src/interface/netconfwizard.cpp:797
 msgid "Failed to create listen socket, aborting"
 msgstr "無法建立 Listen Socket, 正在中止."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4233
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4237
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4266
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4270
 msgid "Failed to create listening socket for active mode transfer"
-msgstr "無法以主動傳輸模式建立 socket"
+msgstr "無法以主動傳輸模式建立 Socket"
 
-#: ../../locales/../src/interface/updatewizard.cpp:455
+#: ../../locales/../src/interface/updatewizard.cpp:466
 msgid "Failed to download the latest version of FileZilla."
 msgstr "無法下載最新版的 FileZilla."
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:660
+#: ../../locales/../src/interface/LocalTreeView.cpp:665
 msgid "Failed to get 'My Documents' path"
-msgstr "無法取得 '我的文件' 路徑"
+msgstr "無法取得 \"我的文件\" 路徑"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:646
+#: ../../locales/../src/interface/LocalTreeView.cpp:651
 msgid "Failed to get desktop path"
 msgstr "無法取得桌面路徑"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:950
+#: ../../locales/../src/interface/netconfwizard.cpp:956
 msgid "Failed to get peer address of control connection, connection closed."
-msgstr "無法取得 peer address 的控制連線, 連線關閉."
+msgstr "無法取得 Peer Address 的控制連線, 連線關閉."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:958
+#: ../../locales/../src/interface/netconfwizard.cpp:964
 msgid "Failed to get peer address of data connection, connection closed."
-msgstr "無法取得 peer address 的資料連線, 連線關閉."
+msgstr "無法取得 Peer Address 的資料連線, 連線關閉."
 
-#: ../../locales/../src/interface/context_control.cpp:77
+#: ../../locales/../src/interface/context_control.cpp:79
 msgid "Failed to initialize FTP engine"
 msgstr "無法初始 FTP 引擎"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:395
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:775
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:402
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:782
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:313
 msgid "Failed to initialize TLS."
-msgstr "無法初始 TLS 加密."
+msgstr "無法初始 TLS."
 
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:173
 msgid "Failed to load panels, invalid resource files?"
@@ -3378,24 +3431,24 @@
 msgid "Failed to load private key: %s"
 msgstr "無法載入私鑰: %s"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2617
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2648
 #, c-format
 msgid "Failed to open \"%s\" for appending/writing"
 msgstr "無法接續/寫入 \"%s\""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2679
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2710
 #, c-format
 msgid "Failed to open \"%s\" for reading"
 msgstr "無法讀取 \"%s\""
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2658
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2689
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:391
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:448
 #, c-format
 msgid "Failed to open \"%s\" for writing"
 msgstr "無法寫入 \"%s\""
 
-#: ../../locales/../src/engine/ControlSocket.cpp:415
+#: ../../locales/../src/engine/ControlSocket.cpp:418
 msgid "Failed to parse returned path."
 msgstr "無法解析回傳路徑."
 
@@ -3403,7 +3456,7 @@
 msgid "Failed to parse trusted root cert."
 msgstr "無法解析信任的根憑證."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:1014
+#: ../../locales/../src/interface/netconfwizard.cpp:1020
 msgid "Failed to receive data"
 msgstr "無法收到資料"
 
@@ -3413,19 +3466,19 @@
 
 #: ../../locales/../src/interface/netconfwizard.cpp:719
 msgid "Failed to retrieve external ip address, aborting"
-msgstr "無法取得外部 IP Address. 正在中止."
+msgstr "無法取得外部 IP Address. 正在中止"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3931
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3962
 msgid "Failed to retrieve external ip address, using local address"
 msgstr "無法取得外部 IP Address, 使用本地 IP Address"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3953
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3984
 msgid "Failed to retrieve local ip address."
 msgstr "無法取得本地 IP Address."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:688
 msgid "Failed to retrieve local ip address. Aborting"
-msgstr "無法取得本地 IP Address. 正在中止."
+msgstr "無法取得本地 IP Address. 正在中止"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:616
 msgid "Failed to retrieve the external IP address."
@@ -3435,34 +3488,34 @@
 msgid "Failed to send command."
 msgstr "無法傳送指令."
 
-#: ../../locales/../src/interface/FileZilla.cpp:267
+#: ../../locales/../src/interface/FileZilla.cpp:271
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language"
 msgstr "無法設定語系為 %s (%s), 使用預設的系統語系."
 
-#: ../../locales/../src/interface/FileZilla.cpp:252
+#: ../../locales/../src/interface/FileZilla.cpp:256
 #, 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:240
+#: ../../locales/../src/interface/FileZilla.cpp:244
 #, c-format
 msgid "Failed to set language to %s (%s), using default system language."
 msgstr "無法設定語系為 %s (%s), 使用預設的系統語系."
 
-#: ../../locales/../src/interface/FileZilla.cpp:269
+#: ../../locales/../src/interface/FileZilla.cpp:273
 #: ../../locales/../src/interface/settings/optionspage_language.cpp:53
 #, c-format
 msgid "Failed to set language to %s, using default system language"
 msgstr "無法設定語系為 %s, 使用預設的系統語系"
 
-#: ../../locales/../src/interface/FileZilla.cpp:248
+#: ../../locales/../src/interface/FileZilla.cpp:252
 #, c-format
 msgid "Failed to set language to %s, using default system language (%s, %s)."
 msgstr "無法設定語系為 %s, 使用預設的系統語系 (%s, %s)."
 
-#: ../../locales/../src/interface/FileZilla.cpp:237
+#: ../../locales/../src/interface/FileZilla.cpp:241
 #, c-format
 msgid "Failed to set language to %s, using default system language."
 msgstr "無法設定語系為 %s, 使用預設的系統語系."
@@ -3471,7 +3524,7 @@
 msgid "Failed to validate settings"
 msgstr "無法確認設定有效"
 
-#: ../../locales/../src/engine/tlssocket.cpp:870
+#: ../../locales/../src/engine/tlssocket.cpp:1087
 msgid "Failed to verify peer certificate"
 msgstr "無法驗證同儕憑證"
 
@@ -3488,21 +3541,19 @@
 msgid "Failed transfers"
 msgstr "傳輸失敗"
 
-#: resources.h:690
+#: resources.h:711
 msgid "Fall back to active mode"
 msgstr "回復成主動模式"
 
-#: resources.h:369
+#: resources.h:379
 msgid "Fil&e:"
 msgstr "檔案(&E):"
 
-#: resources.h:226
+#: resources.h:236
 msgid "Fil&es"
 msgstr "檔案(&E)"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:500
-#: ../../locales/../src/interface/filelistctrl.cpp:518
-#: ../../locales/../src/interface/filelistctrl.cpp:527
+#: ../../locales/../src/interface/filelistctrl.cpp:282
 msgid "File"
 msgstr "檔案"
 
@@ -3518,7 +3569,7 @@
 msgid "File editing"
 msgstr "檔案編輯"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "File exists"
 msgstr "檔案存在"
 
@@ -3526,7 +3577,7 @@
 msgid "File exists action"
 msgstr "檔案存在動作"
 
-#: resources.h:305
+#: resources.h:315
 msgid "File has changed"
 msgstr "檔案已改變"
 
@@ -3534,14 +3585,14 @@
 msgid "File lists"
 msgstr "檔案列表"
 
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/FileZilla.cpp:702
-#: ../../locales/../src/interface/FileZilla.cpp:796
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/FileZilla.cpp:712
+#: ../../locales/../src/interface/FileZilla.cpp:806
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "File not found"
 msgstr "找不到檔案"
 
-#: resources.h:1003
+#: resources.h:1029
 msgid "File search"
 msgstr "檔案搜尋"
 
@@ -3576,99 +3627,99 @@
 msgid "File transfer successful, transferred %s in %s"
 msgstr "檔案傳輸成功, 已傳輸 %s (全部 %s)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1125
+#: ../../locales/../src/interface/Mainfrm.cpp:1247
 msgid "File transfers still in progress."
 msgstr "仍在處理檔案傳輸."
 
-#: resources.h:387
+#: resources.h:397
 msgid "File would transfer with ASCII data type."
 msgstr "檔案會以文字類資料型態傳輸."
 
-#: resources.h:388
+#: resources.h:398
 msgid "File would transfer with binary data type."
 msgstr "檔案會以二進位資料型態傳輸."
 
-#: ../../locales/../src/interface/FileZilla.cpp:487
-#: ../../locales/../src/interface/quickconnectbar.cpp:68
-#: ../../locales/../src/interface/quickconnectbar.cpp:198
+#: ../../locales/../src/interface/FileZilla.cpp:494
+#: ../../locales/../src/interface/quickconnectbar.cpp:69
+#: ../../locales/../src/interface/quickconnectbar.cpp:205
 msgid "FileZilla Error"
 msgstr "FileZilla 錯誤"
 
-#: resources.h:712
+#: resources.h:733
 msgid ""
 "FileZilla can now test your configuration to ensure everything is configured "
 "properly."
 msgstr "FileZilla 現在可以測試您的組態以確認是否都已配置正確."
 
-#: resources.h:477
+#: resources.h:487
 msgid "FileZilla is already connected to a server."
 msgstr "FileZilla 已連線到伺服器."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-msgid ""
-"FileZilla is running in kiosk mode.\n"
-"'Normal' and 'Account' logontypes are not available in this mode."
-msgstr ""
-"FileZilla 正以服務台模式執行.\n"
-"在此模式下 '一般' 與 '帳號' 的登入型式都不能用."
-
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "FileZilla needs to be restarted for the language change to take effect."
 msgstr "變更語系需要重新啟動 FileZilla."
 
-#: resources.h:517
+#: resources.h:979
+msgid "FileZilla updates"
+msgstr "FileZilla 更新"
+
+#: resources.h:534
 msgid "Filelist status &bars"
 msgstr "檔案列表狀態列(&B)"
 
-#: ../../locales/../src/interface/edithandler.cpp:1230
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:127
-#: ../../locales/../src/interface/LocalListView.cpp:265
-#: ../../locales/../src/interface/RemoteListView.cpp:358
+#: ../../locales/../src/interface/edithandler.cpp:1238
+#: ../../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
 msgid "Filename"
 msgstr "檔案名稱"
 
-#: resources.h:510
+#: resources.h:527
 msgid "Filename &filters..."
 msgstr "檔名篩選器(&F)..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3097
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2310
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3128
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2311
 #, c-format
 msgid "Filename cannot be constructed for directory %s and filename %s"
 msgstr "目錄 %s 下無法建構檔名 %s"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1894
+#: ../../locales/../src/interface/RemoteListView.cpp:1921
 msgid "Filename invalid"
 msgstr "檔名無效"
 
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
+msgid ""
+"Filename may not contain any of the following characters: / \\ : * ? \" < > |"
+msgstr "檔名不能包含以下任何字元: / \\ : * ? \" < > |"
+
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:268
 msgid "Filename unchanged"
 msgstr "檔名未改變"
 
-#: resources.h:307 resources.h:958
+#: resources.h:317 resources.h:983
 msgid "Filename:"
 msgstr "檔案名稱:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1366
 msgid "Filenames may not contain any of the following characters: / * ? < > |"
 msgstr "檔名不能包含以下任何字元: / * ? < > |"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
+#: ../../locales/../src/interface/LocalListView.cpp:1341
 msgid ""
 "Filenames may not contain any of the following characters: / \\ : * ? \" < > "
 "|"
 msgstr "檔名不能包含以下任何字元: / \\ : * ? \" < > |"
 
-#: resources.h:335
+#: resources.h:345
 msgid "Files currently being edited"
 msgstr "檔案正在編輯"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:132
-#: ../../locales/../src/interface/LocalListView.cpp:266
-#: ../../locales/../src/interface/RemoteListView.cpp:359
+#: ../../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
 msgid "Filesize"
 msgstr "檔案大小"
@@ -3677,68 +3728,68 @@
 msgid "Filesize format"
 msgstr "檔案大小格式"
 
-#: ../../locales/../src/interface/LocalListView.cpp:267
-#: ../../locales/../src/interface/RemoteListView.cpp:360
+#: ../../locales/../src/interface/LocalListView.cpp:279
+#: ../../locales/../src/interface/RemoteListView.cpp:374
 #: ../../locales/../src/interface/search.cpp:382
 msgid "Filetype"
-msgstr "檔案類別"
+msgstr "檔案類型"
 
-#: resources.h:946
+#: resources.h:967
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:133
 msgid "Filetype associations"
-msgstr "檔案型態關聯"
+msgstr "檔案類型關聯"
 
-#: resources.h:225
+#: resources.h:235
 msgid "Filter applies to:"
 msgstr "篩選器套用到:"
 
-#: resources.h:819
+#: resources.h:840
 msgid "Filter invalid characters in filenames"
 msgstr "篩選檔名裡的無效字元"
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter name already exists"
 msgstr "篩選器名稱已經存在"
 
-#: resources.h:221
+#: resources.h:231
 msgid "Filter out items matching all of the following"
 msgstr "篩選掉符合以下所有的項目"
 
-#: resources.h:222
+#: resources.h:232
 msgid "Filter out items matching any of the following"
 msgstr "篩選掉符合以下任何的項目"
 
-#: resources.h:223
+#: resources.h:233
 msgid "Filter out items matching none of the following"
 msgstr "篩選掉不符合以下任何的項目"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Filter set already exists"
 msgstr "篩選集名稱已經存在"
 
-#: resources.h:996
+#: resources.h:1022
 msgid "Filter the directory listings"
 msgstr "篩選目錄列表"
 
-#: ../../locales/../src/interface/filteredit.cpp:338
-#: ../../locales/../src/interface/filteredit.cpp:347
-#: ../../locales/../src/interface/filteredit.cpp:356
+#: ../../locales/../src/interface/filteredit.cpp:340
+#: ../../locales/../src/interface/filteredit.cpp:349
+#: ../../locales/../src/interface/filteredit.cpp:358
 msgid "Filter validation failed"
 msgstr "篩選器確認失敗"
 
-#: resources.h:9 resources.h:33
+#: resources.h:10 resources.h:38
 msgid "Fingerprint (MD5):"
 msgstr "數位指紋 (MD5):"
 
-#: resources.h:10 resources.h:34
+#: resources.h:11 resources.h:39
 msgid "Fingerprint (SHA-1):"
 msgstr "數位指紋 (SHA-1):"
 
-#: resources.h:179 resources.h:192
+#: resources.h:189 resources.h:202
 msgid "Fingerprint:"
 msgstr "數位指紋:"
 
@@ -3746,69 +3797,69 @@
 msgid "Firewall and router configuration wizard"
 msgstr "防火牆與路由器組態精靈"
 
-#: resources.h:730
+#: resources.h:751
 msgid ""
 "For more detailed information about what these options do, please run the "
 "network configuration wizard."
 msgstr "想知道更多關於這些選項的詳細資訊, 請執行網路組態精靈."
 
-#: resources.h:707
+#: resources.h:728
 msgid "For reliability you should specify a range of at least 10 ports."
-msgstr "為了穩定性您必須指定最少十個的連接埠範圍."
+msgstr "為了可靠性您必須指定最少十個的連接埠範圍."
 
-#: ../../locales/../src/interface/Options.cpp:214
+#: ../../locales/../src/interface/Options.cpp:215
 msgid ""
 "For this session the default settings will be used. Any changes to the "
 "settings will not be saved."
 msgstr "這次連線期間將會使用預設值. 任何設定值的變更都不會儲存."
 
-#: resources.h:109
+#: resources.h:118
 msgid "Force &UTF-8"
 msgstr "強制使用 UTF-8 (&U)"
 
-#: resources.h:544
+#: resources.h:561
 msgid "Force showing &hidden files"
 msgstr "強制顯示隱藏檔案(&H)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:664
+#: ../../locales/../src/interface/Mainfrm.cpp:676
 msgid "Force showing hidden files"
 msgstr "強制顯示隱藏檔案"
 
-#: resources.h:774
+#: resources.h:795
 msgid "Format specifications:"
-msgstr "格式指定:"
+msgstr "格式規範:"
 
-#: resources.h:944
+#: resources.h:965
 msgid "Format: Extension followed by properly quoted command and arguments."
 msgstr "格式: 副檔名後接正確引用的指令和引數."
 
-#: resources.h:469
+#: resources.h:479
 msgid "Further documentation"
 msgstr "進一步的文件"
 
-#: resources.h:78
+#: resources.h:87
 msgid "General"
 msgstr "一般設定"
 
 #: ../../locales/../src/engine/proxy.cpp:430
 msgid "General SOCKS server failure"
-msgstr "通用 SOCKS 伺服器失敗"
+msgstr "一般 SOCKS 伺服器失敗"
 
-#: resources.h:792
+#: resources.h:813
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:122
 msgid "Generic proxy"
 msgstr "通用 Proxy"
 
-#: resources.h:696
+#: resources.h:717
 msgid "Get external IP address from the following URL:"
 msgstr "從下列網址取得外部 IP Address:"
 
-#: resources.h:470
+#: resources.h:480
 msgid "Getting help"
 msgstr "取得協助"
 
-#: ../../locales/../src/interface/filter.cpp:366
-#: ../../locales/../src/interface/filter.cpp:427
+#: ../../locales/../src/interface/filter.cpp:365
+#: ../../locales/../src/interface/filter.cpp:426
 msgid "Given filterset name already exists, overwrite filter set?"
 msgstr "指定的篩選集名稱已經存在, 要複寫嗎?"
 
@@ -3816,15 +3867,15 @@
 msgid "Global bookmarks"
 msgstr "全域書籤"
 
-#: resources.h:166
+#: resources.h:175
 msgid "GnuTLS:"
 msgstr "GnuTLS:"
 
-#: resources.h:138
+#: resources.h:147
 msgid "Group permissions"
 msgstr "群組權限"
 
-#: resources.h:598
+#: resources.h:617
 msgid "H&igh"
 msgstr "高(&I)"
 
@@ -3832,21 +3883,21 @@
 msgid "HTTPS - HTTP over TLS"
 msgstr "HTTPS - 透過 TLS 的 HTTP"
 
-#: resources.h:340
+#: resources.h:350
 msgid "Hash:"
 msgstr "Hash:"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:105
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:108
 msgid "Hidden"
 msgstr "隱藏"
 
-#: resources.h:817 ../../locales/../src/interface/queue.cpp:922
-#: ../../locales/../src/interface/queue.cpp:1009
+#: resources.h:838 ../../locales/../src/interface/queue.cpp:924
+#: ../../locales/../src/interface/queue.cpp:1011
 msgid "High"
 msgstr "高"
 
-#: ../../locales/../src/interface/queue.cpp:924
-#: ../../locales/../src/interface/queue.cpp:1011
+#: ../../locales/../src/interface/queue.cpp:926
+#: ../../locales/../src/interface/queue.cpp:1013
 msgid "Highest"
 msgstr "最高"
 
@@ -3854,24 +3905,24 @@
 msgid "Highest available port has to be a number between 1024 and 65535."
 msgstr "最高可用連接埠必須在 1024 到 65535 之間."
 
-#: resources.h:209
+#: resources.h:219
 msgid ""
 "Hold the shift key to toggle the filter state on both sides simultaneously."
 msgstr "按住 Shift 鍵來同時切換兩邊的篩選器狀態."
 
-#: resources.h:157
+#: resources.h:166
 msgid "Homepage:"
 msgstr "首頁:"
 
-#: resources.h:342
+#: resources.h:352
 msgid "Host key fingerprint:"
 msgstr "主機金鑰指紋:"
 
-#: resources.h:185
+#: resources.h:195
 msgid "Host key mismatch"
 msgstr "主機金鑰不吻合"
 
-#: ../../locales/../src/engine/server.cpp:166
+#: ../../locales/../src/engine/server.cpp:168
 msgid "Host starts with '[' but no closing bracket found."
 msgstr "主機以 '[' 起始, 卻沒有找到對應的結束括弧."
 
@@ -3879,33 +3930,32 @@
 msgid "Host unreachable"
 msgstr "連不上主機"
 
-#: resources.h:16 resources.h:40 resources.h:121 resources.h:177
-#: resources.h:190
+#: resources.h:17 resources.h:45 resources.h:130 resources.h:187
+#: resources.h:200
 msgid "Host:"
 msgstr "主機:"
 
-#: resources.h:96
+#: resources.h:105
 msgid "Hours,"
 msgstr "小時,"
 
-#: resources.h:893
+#: resources.h:914
 msgid "I&SO 8601 (example: 15:47)"
 msgstr "ISO 8601 (例: 15:47) (&S)"
 
-#: resources.h:734
+#: resources.h:755
 msgid ""
 "If no data is sent or received during an operation for longer than the "
 "specified time, the connection will be closed and FileZilla will try to "
 "reconnect."
 msgstr ""
-"如果沒有傳送或是接收資料的時間較指定時間長, 連線就會關閉且 FileZilla 會嘗試重"
-"新連線."
+"如果沒有傳送資料的時間較指定時間長, 連線就會關閉且 FileZilla 會嘗試重新連線."
 
-#: resources.h:974
+#: resources.h:999
 msgid "If reporting bugs, please provide logs with \"Verbose\" logging level."
 msgstr "如果要回報錯誤, 請提供\"詳述\"等級的記錄."
 
-#: resources.h:687
+#: resources.h:708
 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 "
@@ -3915,13 +3965,13 @@
 "如果精靈最後的自動測試成功, 您卻無法到特定的伺服器, 該伺服器可能設置錯誤, 而"
 "您應嘗試使用主動模式. 您可以在站台管理員裡面設定各伺服器的傳輸模式."
 
-#: resources.h:682
+#: resources.h:703
 msgid ""
 "If the fallback option is enabled, you will be able to connect to "
 "misconfigured servers which reject the selected transfer mode."
-msgstr "如果回復模式已啟用, 您可以連線到設定有誤, 拒絕選定傳輸模式的伺服器."
+msgstr "如果回復選項已啟用, 您可以連線到設定有誤, 拒絕選定傳輸模式的伺服器."
 
-#: resources.h:188
+#: resources.h:198
 msgid ""
 "If the host key change was not expected, please contact the server "
 "administrator."
@@ -3931,15 +3981,15 @@
 msgid ""
 "If the problem persists, some router and/or firewall keeps blocking "
 "FileZilla."
-msgstr "若問題依舊持續, 則某些路由器或防火牆持續阻擋 FileZilla."
+msgstr "如果問題依舊持續, 則某些路由器或防火牆持續阻擋 FileZilla."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:563
 msgid ""
 "If the problem persists, some router and/or firewall keeps interrupting the "
 "connection."
-msgstr "若問題依舊持續, 則某些路由器或防火牆持續阻斷連線."
+msgstr "如果問題依舊持續, 則某些路由器或防火牆持續阻斷連線."
 
-#: resources.h:963
+#: resources.h:988
 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 "
@@ -3948,7 +3998,7 @@
 "如果記錄檔案的大小已達上限, 就會在檔名的最後加上 \".1\" (這可能會覆寫舊的記錄"
 "檔) 並建立新的記錄檔案."
 
-#: resources.h:455
+#: resources.h:465
 msgid ""
 "If the symlink points to a directory, FileZilla can either delete the "
 "symbolic link or remove the contents of the linked directory."
@@ -3959,13 +4009,13 @@
 msgid ""
 "If this problem persists, please contact your router or firewall "
 "manufacturer for a solution."
-msgstr "若問題依舊持續, 請聯絡您的路由器或防火牆製造商以解決問題."
+msgstr "如果問題依舊持續, 請聯絡您的路由器或防火牆製造商以解決問題."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:582
 msgid "If this problem stays, please contact your router manufacturer."
-msgstr "若問題依舊持續, 請聯絡您的路由器製造商."
+msgstr "如果問題依舊持續, 請聯絡您的路由器製造商."
 
-#: resources.h:278 resources.h:856
+#: resources.h:288 resources.h:877
 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 "
@@ -3974,18 +4024,18 @@
 "如果使用\"如果較新就覆寫\"選項, 您的系統時間就得與伺服器同步. 如果時間有異 "
 "(如在不同的時區) 那請在站台管理員中指定時區偏移量."
 
-#: resources.h:917
+#: resources.h:938
 msgid ""
 "If using timestamp based comparison, consider two files equal if their "
 "timestamp difference does not exceed this threshold."
 msgstr ""
 "如果使用時間戳記式的比對, 那只要兩個檔案的時間戳記差異不超過門檻就視為相同."
 
-#: resources.h:932
+#: resources.h:953
 msgid "If you change the language, you should restart FileZilla."
 msgstr "如果您變更了語系, 您應重新啟動 FileZilla."
 
-#: resources.h:713
+#: resources.h:734
 msgid ""
 "If you click on test, FileZilla will connect to probe.filezilla-project.org "
 "and will perform some simple tests."
@@ -3993,21 +4043,21 @@
 "如果您按了測試, FileZilla 將會連線到 probe.filezilla-project.org 做些簡單的測"
 "試."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1149
+#: ../../locales/../src/interface/Mainfrm.cpp:1271
 msgid "If you close FileZilla, your changes will be lost."
 msgstr "如果關閉 FileZilla, 您所做的變更將會遺失."
 
-#: resources.h:832
+#: resources.h:853
 msgid ""
 "If you enter the wrong filetypes, those files may get corrupted when "
 "transferred."
-msgstr "如果您輸入錯誤的檔案類別, 那該類檔案在傳輸的過程中就可能會發生毀損."
+msgstr "如果您輸入錯誤的檔案類型, 那該類檔案在傳輸的過程中就可能會發生毀損."
 
-#: resources.h:714
+#: resources.h:735
 msgid "If you get any errors, your configuration is not correct."
 msgstr "如果遇到了任何錯誤, 那您的設定即不正確."
 
-#: resources.h:746
+#: resources.h:767
 msgid ""
 "If you have problems to retrieve directory listings or to transfer files, "
 "try to change the default transfer mode."
@@ -4022,20 +4072,20 @@
 "若您在某台伺服器上一直遇到錯誤, 此伺服器本身或某台遠端路由器或是防火牆可能配"
 "置有誤. 在這情況下請切換為被動模式並請連絡伺服器管理者協助."
 
-#: resources.h:673
+#: resources.h:694
 msgid ""
 "If you successfully complete the wizard and the final test succeeds, any "
 "firewalls and routers you have should be configured properly."
 msgstr ""
 "如果您成功地執行完精靈且最後的測試有成功, 您應已正確設定您的防火牆或路由器."
 
-#: resources.h:709
+#: resources.h:730
 msgid ""
 "If you use a firewall, make sure FileZilla is allowed to accept connection "
 "on all given ports."
 msgstr "如果您有用防火牆, 請確定有允許 FileZilla 在指定的連接埠上連線."
 
-#: resources.h:708
+#: resources.h:729
 msgid ""
 "If you use a router, make sure all these ports are forwarded to the machine "
 "you're running FileZilla on."
@@ -4051,9 +4101,9 @@
 msgid "Import data from older version"
 msgstr "從舊版匯入資料"
 
-#: resources.h:297
+#: resources.h:307
 msgid "Import settings"
-msgstr "設定匯入"
+msgstr "匯入設定"
 
 #: ../../locales/../src/interface/import.cpp:81
 #: ../../locales/../src/interface/import.cpp:84
@@ -4065,7 +4115,7 @@
 msgid "Improperly quoted association."
 msgstr "不正確引用的關聯."
 
-#: resources.h:701
+#: resources.h:722
 msgid ""
 "In active mode, FileZilla has to listen on a port for data transfers. You "
 "have to specify which ports FileZilla will use."
@@ -4073,7 +4123,7 @@
 "在主動模式下, FileZilla 必須聆聽一個連接埠以供資料傳輸. 您必須指定一個給 "
 "FileZilla 用的連接埠."
 
-#: resources.h:703
+#: resources.h:724
 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."
@@ -4081,19 +4131,19 @@
 "假如您有路由器, 您要轉送所有可用的連接埠使得 FileZilla 不受您系統所選的連接埠"
 "影響."
 
-#: resources.h:254
+#: resources.h:264
 msgid ""
 "In case you prefer automatic updates, you can enable automatic update checks "
 "in the settings dialog."
 msgstr "如果您較喜歡自動更新, 您可以在設定對話框內啟用自動更新檢查."
 
-#: resources.h:691 resources.h:755
+#: resources.h:712 resources.h:776
 msgid ""
 "In order to use active mode, FileZilla needs to know your external IP "
 "address."
 msgstr "為了要使用主動模式, FileZilla 需要知道您的外部 IP Address."
 
-#: resources.h:676
+#: resources.h:697
 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 "
@@ -4102,7 +4152,7 @@
 "在被動模式 (建議大部分使用者使用) 下, FileZilla 會對伺服器要求一個連接埠以供"
 "連線. 無須額外的設定."
 
-#: ../../locales/../src/engine/tlssocket.cpp:884
+#: ../../locales/../src/engine/tlssocket.cpp:1101
 msgid ""
 "Incomplete chain, top certificate is not self-signed certificate authority "
 "certificate"
@@ -4110,20 +4160,20 @@
 "不完整的憑證鍊, 最上層的憑證並非是自我簽署的憑證中心 (Certificate Authority) "
 "憑證"
 
-#: ../../locales/../src/interface/QueueView.cpp:1064
+#: ../../locales/../src/interface/QueueView.cpp:1047
 msgid "Incorrect password"
-msgstr "密碼不正確"
+msgstr "不正確的密碼"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:765
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:772
 msgid "Initializing TLS..."
-msgstr "初始 TLS 加密中..."
+msgstr "正在初始 TLS..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:751
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:758
 msgid "Insecure server, it does not support FTP over TLS."
 msgstr "不安全的伺服器, 它不支援透過 TLS 的 FTP."
 
-#: ../../locales/../src/engine/server.cpp:851
-#: ../../locales/../src/engine/server.cpp:870
+#: ../../locales/../src/engine/server.cpp:858
+#: ../../locales/../src/engine/server.cpp:877
 #: ../../locales/../src/interface/manual_transfer.cpp:191
 msgid "Interactive"
 msgstr "交談式"
@@ -4133,8 +4183,8 @@
 msgstr "介面"
 
 #: ../../locales/../src/engine/ControlSocket.cpp:219
-#: ../../locales/../src/interface/QueueView.cpp:1021
-#: ../../locales/../src/interface/QueueView.cpp:1597
+#: ../../locales/../src/interface/QueueView.cpp:1004
+#: ../../locales/../src/interface/QueueView.cpp:1579
 msgid "Interrupted by user"
 msgstr "被使用者中斷"
 
@@ -4146,14 +4196,14 @@
 msgid "Invalid HTTP Response"
 msgstr "無效的 HTTP 回應"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:544
-#: ../../locales/../src/engine/ControlSocket.cpp:604
+#: ../../locales/../src/engine/ControlSocket.cpp:547
+#: ../../locales/../src/engine/ControlSocket.cpp:607
 msgid ""
 "Invalid character sequence received, disabling UTF-8. Select UTF-8 option in "
 "site manager to force UTF-8."
 msgstr ""
-"收到無效的字元序, 停用 UTF-8. 欲強制使用 UTF-8 請在站台管理員內選擇 UTF-8 選"
-"項."
+"收到無效的字元序, 正在停用 UTF-8. 欲強制使用 UTF-8 請在站台管理員內選擇 UTF-"
+"8 選項."
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:896
 msgid "Invalid chunk size"
@@ -4170,12 +4220,13 @@
 msgid "Invalid date"
 msgstr "無效的日期"
 
-#: ../../locales/../src/interface/LocalListView.cpp:1337
-#: ../../locales/../src/interface/LocalListView.cpp:1362
+#: ../../locales/../src/interface/LocalListView.cpp:1341
+#: ../../locales/../src/interface/LocalListView.cpp:1366
+#: ../../locales/../src/interface/RemoteListView.cpp:3206
 msgid "Invalid filename"
 msgstr "無效的檔名"
 
-#: ../../locales/../src/engine/server.cpp:173
+#: ../../locales/../src/engine/server.cpp:175
 msgid "Invalid host, after closing bracket only colon and port may follow."
 msgstr "無效的主機, 在結尾括弧後只能接冒號和連接埠號碼."
 
@@ -4183,36 +4234,41 @@
 msgid "Invalid input"
 msgstr "無效的輸入"
 
-#: ../../locales/../src/engine/server.cpp:61
-#: ../../locales/../src/engine/server.cpp:194
-#: ../../locales/../src/engine/server.cpp:206
+#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:196
+#: ../../locales/../src/engine/server.cpp:208
 msgid "Invalid port given. The port has to be a value from 1 to 65535."
 msgstr "無效的連接埠. 連接埠應介於 1 到 65535 之間."
 
-#: ../../locales/../src/engine/server.cpp:91
-#: ../../locales/../src/interface/quickconnectbar.cpp:121
+#: ../../locales/../src/engine/server.cpp:93
+#: ../../locales/../src/interface/quickconnectbar.cpp:125
 msgid ""
 "Invalid protocol specified. Valid protocols are:\n"
 "ftp:// for normal FTP,\n"
 "sftp:// for SSH file transfer protocol,\n"
-"ftps:// for FTP over SSL (implicit) and\n"
-"ftpes:// for FTP over SSL (explicit)."
+"ftps:// for FTP over TLS (implicit) and\n"
+"ftpes:// for FTP over TLS (explicit)."
 msgstr ""
 "指定了無效的協定. 有效的協定有:\n"
 "ftp:// 給一般的 FTP 用,\n"
 "sftp:// 給 SSH 檔案傳輸協定用,\n"
-"ftps:// 給透過 SSL (隱含式) 的 FTP 用, 以及\n"
-"ftpes:// 給透過 SSL (外顯式) 的 FTP 用."
+"ftps:// 給透過 (隱含式) TLS 的 FTP 用, 以及\n"
+"ftpes:// 給透過 (外顯式) TLS 的 FTP 用."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4418
+msgid ""
+"Invalid proxy host, after closing bracket only colon and port may follow."
+msgstr "無效的 Proxy 主機, 在結尾括弧後只能接冒號和連接埠號碼."
 
-#: ../../locales/../src/interface/search.cpp:698
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Invalid regular expression in search conditions."
-msgstr "搜尋條件裡無效的正規表示法"
+msgstr "搜尋條件裡的無效正規表示法"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:633
 msgid "Invalid response code"
 msgstr "無效的回應碼"
 
-#: ../../locales/../src/interface/search.cpp:692
+#: ../../locales/../src/interface/search.cpp:693
 #, c-format
 msgid "Invalid search conditions: %s"
 msgstr "無效的搜尋條件: %s"
@@ -4224,38 +4280,38 @@
 #: ../../locales/../src/interface/sitemanager.cpp:470
 #: ../../locales/../src/interface/sitemanager.cpp:487
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:822
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:818
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Invalid site path"
 msgstr "無效的站台路徑"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:679
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:720
 msgid "Invalid size in condition"
 msgstr "無效的檔案篩選大小"
 
-#: ../../locales/../src/engine/server.cpp:136
+#: ../../locales/../src/engine/server.cpp:138
 msgid "Invalid username given."
 msgstr "無效的使用者名稱."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:189
+#: ../../locales/../src/interface/verifycertdialog.cpp:192
 msgid "Jurisdiction country:"
 msgstr "管轄國家:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:191
+#: ../../locales/../src/interface/verifycertdialog.cpp:194
 msgid "Jurisdiction locality:"
 msgstr "管轄地區:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:190
+#: ../../locales/../src/interface/verifycertdialog.cpp:193
 msgid "Jurisdiction state or province:"
 msgstr "管轄州郡省份:"
 
-#: resources.h:914
+#: resources.h:935
 msgid "Keep directories on top"
 msgstr "保持目錄在最上方"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:668
+#: ../../locales/../src/interface/Mainfrm.cpp:680
 msgid ""
 "Keep in mind that not all servers support this feature and may return "
 "incorrect listings if this option is enabled. Although FileZilla performs "
@@ -4265,50 +4321,54 @@
 "傳不正確的列表. 雖然 FileZilla 會先執行一些測試看看是否伺服器支援這個功能, 但"
 "這些測試也可能會失敗."
 
-#: resources.h:337
+#: resources.h:347
 msgid "Key exchange"
 msgstr "金鑰交換"
 
-#: resources.h:601
+#: resources.h:21 resources.h:49
+msgid "Key exchange:"
+msgstr "金鑰交換:"
+
+#: resources.h:620
 msgid "L&owest"
 msgstr "最低(&O)"
 
-#: resources.h:930
+#: resources.h:951
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:131
 msgid "Language"
 msgstr "語系"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1512
+#: ../../locales/../src/interface/Mainfrm.cpp:1582
 msgid "Language changed"
 msgstr "語系已變更"
 
-#: ../../locales/../src/interface/LocalListView.cpp:268
-#: ../../locales/../src/interface/RemoteListView.cpp:361
+#: ../../locales/../src/interface/LocalListView.cpp:280
+#: ../../locales/../src/interface/RemoteListView.cpp:375
 #: ../../locales/../src/interface/search.cpp:383
 msgid "Last modified"
 msgstr "最後修改時間"
 
-#: resources.h:859
+#: resources.h:880
 msgid "Layout"
 msgstr "佈局"
 
-#: resources.h:805
+#: resources.h:826
 msgid "Limit for concurrent &downloads:"
 msgstr "並行下載限制(&D):"
 
-#: resources.h:807
+#: resources.h:828
 msgid "Limit for concurrent &uploads:"
 msgstr "並行上傳限制(&U):"
 
-#: resources.h:750
+#: resources.h:771
 msgid "Limit local ports"
 msgstr "限制本地連接埠"
 
-#: resources.h:960
+#: resources.h:985
 msgid "Limit size of logfile"
 msgstr "限制記錄檔案的大小"
 
-#: resources.h:961
+#: resources.h:986
 msgid "Limit:"
 msgstr "限制:"
 
@@ -4316,7 +4376,7 @@
 msgid "Line length exceeded"
 msgstr "超過單行長度"
 
-#: resources.h:167
+#: resources.h:177
 msgid "Linked against"
 msgstr "連結的函式庫"
 
@@ -4325,21 +4385,21 @@
 msgstr "Listen Socket 關閉"
 
 #: ../../locales/../src/engine/logging.cpp:220
-#: ../../locales/../src/interface/StatusView.cpp:296
-#: ../../locales/../src/interface/StatusView.cpp:361
+#: ../../locales/../src/interface/StatusView.cpp:294
+#: ../../locales/../src/interface/StatusView.cpp:359
 msgid "Listing:"
 msgstr "列表:"
 
-#: resources.h:753
+#: resources.h:774
 msgid "Lo&west available port:"
 msgstr "最低可用連接埠(&W):"
 
-#: ../../locales/../src/interface/edithandler.cpp:1278
-#: ../../locales/../src/interface/edithandler.cpp:1532
+#: ../../locales/../src/interface/edithandler.cpp:1286
+#: ../../locales/../src/interface/edithandler.cpp:1540
 msgid "Local"
 msgstr "本地端"
 
-#: resources.h:364
+#: resources.h:374
 msgid "Local file"
 msgstr "本地檔案"
 
@@ -4355,7 +4415,7 @@
 msgid "Local file is not a valid filename."
 msgstr "本地檔案並未使用有效的檔名."
 
-#: resources.h:203
+#: resources.h:213
 msgid "Local filters:"
 msgstr "本地篩選器:"
 
@@ -4363,7 +4423,7 @@
 msgid "Local site:"
 msgstr "本地站台:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:183
+#: ../../locales/../src/interface/verifycertdialog.cpp:186
 msgid "Locality:"
 msgstr "城市名:"
 
@@ -4371,16 +4431,16 @@
 msgid "Log file"
 msgstr "記錄檔案"
 
-#: resources.h:251
+#: resources.h:261
 msgid "Log of update check:"
 msgstr "更新檢查日誌:"
 
-#: resources.h:955
+#: resources.h:980
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:140
 msgid "Logging"
 msgstr "記錄"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:818
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
 msgid ""
 "Login data contains non-ASCII characters and server might not be UTF-8 "
 "aware. Cannot fall back to local charset since using proxy."
@@ -4388,34 +4448,35 @@
 "登入資料包含非 ASCII 字元且伺服器可能不認得 UTF-8. 因為使用 Proxy, 所以無法回"
 "復成本地字集."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:825
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:832
 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:854
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:861
 msgid "Login sequence fully executed yet not logged in. Aborting."
 msgstr "登入程序已完全執行, 但仍未登入. 正在中止."
 
-#: ../../locales/../src/interface/cmdline.cpp:95
+#: ../../locales/../src/interface/cmdline.cpp:103
 msgid "Logontype has to be either 'ask' or 'interactive' (without the quotes)."
 msgstr "登入型式必須是 ask 或是 interactive 兩者之一."
 
-#: ../../locales/../src/interface/cmdline.cpp:10
+#: ../../locales/../src/interface/cmdline.cpp:11
 #, c-format
 msgid ""
 "Logontype, can only be used together with FTP URL. Argument has to be either "
 "'%s' or '%s'"
-msgstr "登入型式僅能與 FTP 網址一起使用. 引數必須是 '%s' 或是 '%s' 兩者之一"
+msgstr ""
+"登入型式僅能與 FTP 網址一起使用. 引數必須是 \"%s\" 或是 \"%s\" 兩者之一"
 
-#: ../../locales/../src/interface/queue.cpp:917
-#: ../../locales/../src/interface/queue.cpp:1004
+#: ../../locales/../src/interface/queue.cpp:919
+#: ../../locales/../src/interface/queue.cpp:1006
 msgid "Low"
 msgstr "低"
 
-#: ../../locales/../src/interface/queue.cpp:915
-#: ../../locales/../src/interface/queue.cpp:1002
+#: ../../locales/../src/interface/queue.cpp:917
+#: ../../locales/../src/interface/queue.cpp:1004
 msgid "Lowest"
 msgstr "最低"
 
@@ -4423,11 +4484,11 @@
 msgid "Lowest available port has to be a number between 1024 and 65535."
 msgstr "最低的可用連接埠介於 1024 到 65535 之間."
 
-#: resources.h:20 resources.h:44
+#: resources.h:25 resources.h:53
 msgid "MAC:"
 msgstr "MAC:"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:65
+#: ../../locales/../src/interface/xmlfunctions.cpp:67
 msgid "Make sure the file can be accessed and is a well-formed XML document."
 msgstr "請確認可以找到檔案並且內容為滿足格式的 XML 文件."
 
@@ -4448,7 +4509,7 @@
 msgid "Malformed reply, server not sending proper line endings"
 msgstr "格式有誤的回應, 伺服器未傳送正確的換行格式"
 
-#: resources.h:394 ../../locales/../src/interface/manual_transfer.cpp:309
+#: resources.h:404 ../../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
@@ -4459,58 +4520,58 @@
 msgid "Manual transfer"
 msgstr "手動傳輸"
 
-#: resources.h:434
+#: resources.h:444
 msgid "Match all of the following"
 msgstr "比對以下所有項目"
 
-#: resources.h:435
+#: resources.h:445
 msgid "Match any of the following"
 msgstr "符合以下任何項目"
 
-#: resources.h:436
+#: resources.h:446
 msgid "Match none of the following"
 msgstr "不符合以下任何項目"
 
-#: resources.h:803
+#: resources.h:824
 msgid "Maximum simultaneous &transfers:"
 msgstr "最大同時傳輸數目(&T):"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:377
-#: ../../locales/../src/interface/Mainfrm.cpp:1840
+#: ../../locales/../src/interface/Mainfrm.cpp:378
+#: ../../locales/../src/interface/Mainfrm.cpp:1910
 msgid "Message log"
 msgstr "訊息記錄"
 
-#: resources.h:870
+#: resources.h:891
 msgid "Message log position"
 msgstr "訊息記錄位置"
 
-#: resources.h:962
+#: resources.h:987
 msgid "MiB"
 msgstr "MiB"
 
-#: resources.h:97
+#: resources.h:106
 msgid "Minutes"
 msgstr "分鐘"
 
-#: resources.h:358
+#: resources.h:368
 msgid "Move &down"
 msgstr "下移(&D)"
 
-#: resources.h:357
+#: resources.h:367
 msgid "Move &up"
 msgstr "上移(&U)"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1067
+#: ../../locales/../src/interface/LocalTreeView.cpp:1061
 msgid "My Computer"
 msgstr "我的電腦"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1057
+#: ../../locales/../src/interface/LocalTreeView.cpp:1051
 msgid "My Documents"
 msgstr "我的文件"
 
 #: ../../locales/../src/interface/sitemanager.cpp:290
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:717
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:719
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:718
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:720
 msgid "My Sites"
 msgstr "我的站台"
 
@@ -4519,33 +4580,33 @@
 msgid "N/a"
 msgstr "N/a"
 
-#: resources.h:399
+#: resources.h:409
 msgid "Name"
 msgstr "名稱"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:713
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1180
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1190
 msgid "Name already exists"
 msgstr "名稱已存在"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
+#: ../../locales/../src/interface/sitemanager.cpp:757
 msgid "Name of bookmark already exists."
 msgstr "書籤名稱已存在"
 
-#: resources.h:120 resources.h:168
+#: resources.h:129 resources.h:178
 msgid "Name:"
 msgstr "名稱:"
 
-#: ../../locales/../src/interface/filteredit.cpp:347
+#: ../../locales/../src/interface/filteredit.cpp:349
 msgid "Need to enter filter name"
 msgstr "需要輸入篩選器名稱"
 
-#: ../../locales/../src/interface/search.cpp:682
+#: ../../locales/../src/interface/search.cpp:683
 msgid "Need to enter valid remote path"
 msgstr "需要輸入有效的遠端路徑"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1005
 msgid "Need to specify a character encoding"
 msgstr "需要指定字元編碼"
 
@@ -4553,19 +4614,23 @@
 msgid "Network unreachable"
 msgstr "連不上網路"
 
-#: resources.h:73
+#: resources.h:969
+msgid "Never"
+msgstr "永不檢查"
+
+#: resources.h:82
 msgid "New &Folder"
 msgstr "新增資料夾(&F)"
 
-#: resources.h:494
+#: resources.h:511
 msgid "New &tab"
 msgstr "新頁籤(&T)"
 
-#: resources.h:74 resources.h:414
+#: resources.h:83 resources.h:424
 msgid "New Book&mark"
 msgstr "新增書籤(&M)"
 
-#: resources.h:395 ../../locales/../src/interface/bookmarks_dialog.cpp:55
+#: resources.h:405 ../../locales/../src/interface/bookmarks_dialog.cpp:55
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:69
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
@@ -4578,41 +4643,41 @@
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:557
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:580
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:836
-#: ../../locales/../src/interface/sitemanager.cpp:759
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2115
+#: ../../locales/../src/interface/sitemanager.cpp:757
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2125
 msgid "New bookmark"
 msgstr "新書籤"
 
-#: ../../locales/../src/interface/LocalTreeView.cpp:1185
-#: ../../locales/../src/interface/RemoteListView.cpp:1618
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1288
+#: ../../locales/../src/interface/LocalTreeView.cpp:1179
+#: ../../locales/../src/interface/RemoteListView.cpp:1641
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1290
 msgid "New directory"
 msgstr "新目錄"
 
-#: ../../locales/../src/interface/welcome_dialog.cpp:50
+#: ../../locales/../src/interface/welcome_dialog.cpp:52
 #, c-format
 msgid "New features and improvements in %s"
 msgstr "%s 版的新功能與改進"
 
-#: ../../locales/../src/interface/filteredit.cpp:129
+#: ../../locales/../src/interface/filteredit.cpp:131
 msgid "New filter"
 msgstr "新篩選器"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:913
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:914
 msgid "New folder"
 msgstr "新資料夾"
 
 #: ../../locales/../src/interface/sitemanager.cpp:622
 #: ../../locales/../src/interface/sitemanager.cpp:636
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2091
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2101
 msgid "New site"
 msgstr "新站台"
 
-#: resources.h:868
+#: resources.h:889
 msgid "Next to the transfer queue"
 msgstr "在傳輸佇列的旁邊"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:877
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:878
 msgid "No"
 msgstr "否"
 
@@ -4620,25 +4685,25 @@
 msgid "No category to export selected"
 msgstr "沒有選定要匯出的分類目錄"
 
-#: ../../locales/../src/interface/QueueView.cpp:2297
+#: ../../locales/../src/interface/QueueView.cpp:2286
 msgid "No command given, aborting."
 msgstr "沒有給定指令, 正在中止."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3898
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3929
 msgid "No external IP address set, trying default."
-msgstr "沒有外部 IP Address, 嘗試使用預設值."
+msgstr "沒有外部 IP Address, 正在嘗試使用預設值."
 
-#: ../../locales/../src/interface/edithandler.cpp:1219
+#: ../../locales/../src/interface/edithandler.cpp:1227
 msgid "No files are currently being edited."
 msgstr "未有正在編輯的檔案."
 
-#: ../../locales/../src/interface/filteredit.cpp:141
+#: ../../locales/../src/interface/filteredit.cpp:143
 msgid "No filter name given"
 msgstr "沒有給定篩選器的名稱"
 
-#: ../../locales/../src/engine/server.cpp:76
-#: ../../locales/../src/engine/server.cpp:187
-#: ../../locales/../src/engine/server.cpp:216
+#: ../../locales/../src/engine/server.cpp:78
+#: ../../locales/../src/engine/server.cpp:189
+#: ../../locales/../src/engine/server.cpp:218
 msgid "No host given, please enter a host."
 msgstr "未填入主機, 請輸入主機名稱."
 
@@ -4646,25 +4711,25 @@
 msgid "No images available"
 msgstr "沒有可用的圖示"
 
-#: ../../locales/../src/interface/QueueView.cpp:3168
+#: ../../locales/../src/interface/QueueView.cpp:3152
 msgid "No more files in the queue!"
-msgstr "佇列裡不再有檔案!"
+msgstr "佇列裡已無檔案!"
 
-#: ../../locales/../src/interface/filter.cpp:351
-#: ../../locales/../src/interface/filter.cpp:420
+#: ../../locales/../src/interface/filter.cpp:350
+#: ../../locales/../src/interface/filter.cpp:419
 msgid "No name for the filterset given."
 msgstr "沒有給定篩選集的名稱."
 
-#: resources.h:430
+#: resources.h:440
 msgid "No program associated with filetype"
-msgstr "沒有程式關聯到檔案型態"
+msgstr "沒有程式關聯到檔案類型"
 
-#: resources.h:420
+#: resources.h:430
 #, c-format
 msgid "No program has been associated to edit files with the extension '%s'."
-msgstr "沒有程式關聯到編輯副檔名為 '%s' 的檔案."
+msgstr "沒有程式關聯到編輯副檔名為 \"%s\" 的檔案."
 
-#: ../../locales/../src/interface/search.cpp:540
+#: ../../locales/../src/interface/search.cpp:541
 msgid "No search results"
 msgstr "沒有搜尋結果"
 
@@ -4682,23 +4747,23 @@
 msgid "No username given."
 msgstr "沒有給定使用者名稱"
 
-#: resources.h:924 resources.h:929
+#: resources.h:945 resources.h:950
 #: ../../locales/../src/interface/verifycertdialog.cpp:54
 msgid "None"
 msgstr "無"
 
-#: resources.h:374
+#: resources.h:384
 msgid "None selected yet"
 msgstr "尚未選取"
 
-#: resources.h:816 ../../locales/../src/engine/server.cpp:847
-#: ../../locales/../src/engine/server.cpp:866
+#: resources.h:837 ../../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:560
-#: ../../locales/../src/interface/queue.cpp:920
-#: ../../locales/../src/interface/queue.cpp:1007
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1287
+#: ../../locales/../src/interface/manual_transfer.cpp:569
+#: ../../locales/../src/interface/queue.cpp:922
+#: ../../locales/../src/interface/queue.cpp:1009
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1297
 msgid "Normal"
 msgstr "一般"
 
@@ -4708,15 +4773,15 @@
 msgstr "並非所有項目皆可要求檢視/編輯."
 
 #: ../../locales/../src/interface/state.cpp:199
-#: ../../locales/../src/interface/state.cpp:504
+#: ../../locales/../src/interface/state.cpp:527
 msgid "Not connected"
 msgstr "未連線"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2347
+#: ../../locales/../src/interface/RemoteListView.cpp:2378
 msgid "Not connected to any server"
 msgstr "未連線到任何伺服器"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:562
+#: ../../locales/../src/interface/Mainfrm.cpp:566
 msgid "Not connected to any server."
 msgstr "未連線到任何伺服器."
 
@@ -4724,161 +4789,167 @@
 msgid "Not connected."
 msgstr "未連線."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:666
+#: ../../locales/../src/interface/Mainfrm.cpp:678
 msgid "Note that this feature is only supported using the FTP protocol."
 msgstr "請注意這個功能只在使用 FTP 協定時才支援."
 
-#: resources.h:784
+#: resources.h:805
 msgid "Note: This only works with plain, unencrypted FTP connections."
 msgstr "注意: 這只能在純粹, 未加密的 FTP 連線下運作."
 
-#: resources.h:801
+#: resources.h:822
 msgid "Note: Using a generic proxy forces passive mode on FTP connections."
 msgstr "注意: 使用通用 Proxy 會強制在 FTP 連線使用被動模式."
 
-#: resources.h:903
+#: resources.h:924
 msgid "Number of decimal places:"
 msgstr "小數位數:"
 
 #: ../../locales/../src/interface/settings/optionspage_connection.cpp:35
 msgid "Number of retries has to be between 0 and 99."
-msgstr "重試次數 (介於 0 到 99 之間)"
+msgstr "重試次數必須介於 0 到 99 之間."
 
-#: resources.h:333
+#: resources.h:343
 msgid "O&pen file"
 msgstr "開啟檔案(&P)"
 
-#: resources.h:24 resources.h:46 resources.h:68 resources.h:130
-#: resources.h:152 resources.h:173 resources.h:183 resources.h:196
-#: resources.h:211 resources.h:228 resources.h:279 resources.h:288
-#: resources.h:295 resources.h:303 resources.h:326 resources.h:334
-#: resources.h:353 resources.h:359 resources.h:392 resources.h:406
-#: resources.h:428 resources.h:451 resources.h:460 resources.h:474
-#: resources.h:487 resources.h:727
+#: resources.h:29 resources.h:55 resources.h:77 resources.h:139
+#: resources.h:161 resources.h:183 resources.h:193 resources.h:206
+#: resources.h:221 resources.h:238 resources.h:289 resources.h:298
+#: resources.h:305 resources.h:313 resources.h:336 resources.h:344
+#: resources.h:363 resources.h:369 resources.h:402 resources.h:416
+#: resources.h:438 resources.h:461 resources.h:470 resources.h:484
+#: resources.h:497 resources.h:504 resources.h:748
 msgid "OK"
 msgstr "確認"
 
-#: resources.h:683
+#: resources.h:704
 msgid ""
 "On the following pages, the selected transfer mode will be configured, as "
 "well as the fallback mode if enabled."
 msgstr "在接下來的幾個頁面裡將要設定所選的傳輸模式以及回復模式 (如果有啟用)."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:887
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:888
 msgid "Once"
 msgstr "一次"
 
-#: resources.h:954
-msgid ""
-"Only the versions of FileZilla and the operating system you are using will "
-"be submitted to the server."
-msgstr "只有您使用的 FileZilla 和作業系統版本資訊會傳到伺服器上."
+#: resources.h:970
+msgid "Once a week"
+msgstr "一週一次"
 
-#: resources.h:652
+#: resources.h:673
 msgid "Open directory in system's file manager"
 msgstr "於檔案總管內開啟目錄"
 
-#: resources.h:976 resources.h:977
+#: resources.h:1001
 msgid "Open the Site Manager"
 msgstr "開啟站台管理員"
 
-#: resources.h:564
+#: resources.h:1002
+msgid "Open the Site Manager."
+msgstr "開啟站台管理員."
+
+#: resources.h:1003
+msgid "Open the Site Manager. Right-click for a list of sites."
+msgstr "開啟站台管理員. 按右鍵顯示站台列表."
+
+#: resources.h:581
 msgid "Open the file."
 msgstr "開啟檔案."
 
-#: resources.h:507
+#: resources.h:524
 msgid "Open the settings dialog of FileZilla"
 msgstr "開啟 FileZilla 設定對話框"
 
-#: resources.h:309
+#: resources.h:319
 msgid "Opened as:"
 msgstr "開啟為:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/LocalListView.cpp:2174
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../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
 msgid "Opening failed"
 msgstr "開啟失敗"
 
-#: resources.h:495
+#: resources.h:512
 msgid "Opens a new tab"
 msgstr "開啟新頁籤"
 
-#: resources.h:492
+#: resources.h:509
 msgid "Opens the Site Manager"
 msgstr "開啟站台管理員"
 
-#: resources.h:997
+#: resources.h:1023
 msgid ""
 "Opens the directory listing filter dialog. Right-click to toggle filters."
 msgstr "開啟目錄列表篩選器對話框. 按右鍵切換篩選器."
 
-#: resources.h:171
+#: resources.h:181
 msgid "Operating system"
 msgstr "作業系統"
 
-#: ../../locales/../src/interface/FileZilla.cpp:306
+#: ../../locales/../src/interface/FileZilla.cpp:310
 msgid "Operating system problem detected"
 msgstr "偵測到作業系統問題"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:177
+#: ../../locales/../src/interface/verifycertdialog.cpp:180
 msgid "Organization:"
 msgstr "組織:"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:199
+#: ../../locales/../src/interface/verifycertdialog.cpp:202
 msgid "Other:"
 msgstr "其它:"
 
-#: resources.h:729
+#: resources.h:750
 msgid "Overview"
 msgstr "預覽"
 
-#: resources.h:59
+#: resources.h:68
 msgid "Overwrite &if source newer"
 msgstr "如果來源較新就覆寫(&I)"
 
-#: resources.h:260 resources.h:270 resources.h:839 resources.h:848
+#: resources.h:270 resources.h:280 resources.h:860 resources.h:869
 msgid "Overwrite file"
 msgstr "覆寫檔案"
 
-#: resources.h:262 resources.h:272 resources.h:841 resources.h:850
+#: resources.h:272 resources.h:282 resources.h:862 resources.h:871
 msgid "Overwrite file if size differs"
 msgstr "如果大小不同就覆寫檔案"
 
-#: resources.h:263 resources.h:273 resources.h:842 resources.h:851
+#: resources.h:273 resources.h:283 resources.h:863 resources.h:872
 msgid "Overwrite file if size differs or source file is newer"
 msgstr "如果大小不同或來源較新就覆寫檔案"
 
-#: resources.h:261 resources.h:271 resources.h:840 resources.h:849
+#: resources.h:271 resources.h:281 resources.h:861 resources.h:870
 msgid "Overwrite file if source file newer"
 msgstr "如果來源較新就覆寫檔案"
 
-#: resources.h:60
+#: resources.h:69
 msgid "Overwrite if &different size"
 msgstr "如果大小不同就覆寫(&D)"
 
-#: resources.h:61
+#: resources.h:70
 msgid "Overwrite if different si&ze or source newer"
 msgstr "如果大小不同或來源較新就覆寫(&Z)"
 
-#: resources.h:134
+#: resources.h:143
 msgid "Owner permissions"
 msgstr "擁有人權限"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:363
+#: ../../locales/../src/interface/RemoteListView.cpp:377
 #: ../../locales/../src/interface/search.cpp:385
 msgid "Owner/Group"
 msgstr "擁有人/群組"
 
-#: resources.h:874
+#: resources.h:895
 msgid ""
 "P&revent system from entering idle sleep during transfers and other "
 "operations"
 msgstr "當系統在傳輸與其它操作時, 避免進入閒置睡眠狀態(&S)"
 
-#: resources.h:781 resources.h:797
+#: resources.h:802 resources.h:818
 #, no-c-format
 msgid "P&roxy host:"
 msgstr "Proxy 主機 (&R):"
@@ -4887,27 +4958,27 @@
 msgid "PORT command tainted by router or firewall."
 msgstr "PORT 指令已被路由器或防火牆影響."
 
-#: resources.h:743
+#: resources.h:764
 msgid "Pa&ssive (recommended)"
 msgstr "被動模式(推薦)(&S)"
 
-#: ../../locales/../src/interface/updatewizard.cpp:324
+#: ../../locales/../src/interface/updatewizard.cpp:332
 msgid "Package"
 msgstr "套件"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2474
+#: ../../locales/../src/interface/Mainfrm.cpp:2566
 msgid "Parameter not a valid URL"
 msgstr "參數不是有效的網址"
 
-#: resources.h:85 resources.h:383 resources.h:721
+#: resources.h:94 resources.h:393 resources.h:742
 msgid "Pass&word:"
 msgstr "密碼(&W):"
 
-#: resources.h:679
+#: resources.h:700
 msgid "Passive (recommended)"
 msgstr "被動模式(推薦)"
 
-#: resources.h:763
+#: resources.h:784
 #: ../../locales/../src/interface/settings/settingsdialog.cpp:119
 msgid "Passive mode"
 msgstr "被動模式"
@@ -4922,42 +4993,46 @@
 msgid "Password required"
 msgstr "需要密碼"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:147
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:150
 #: ../../locales/../src/interface/search.cpp:380
 msgid "Path"
 msgstr "檔案路徑"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3185
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2355
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3216
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2356
 #, c-format
 msgid "Path cannot be constructed for directory %s and subdir %s"
 msgstr "目錄 %s 下無法建構子目錄路徑 %s"
 
-#: resources.h:401
+#: ../../locales/../src/interface/Mainfrm.cpp:2512
+msgid "Path not found:"
+msgstr "找不到路徑:"
+
+#: resources.h:411
 msgid "Paths"
 msgstr "路徑"
 
-#: ../../locales/../src/interface/edithandler.cpp:1257
-#: ../../locales/../src/interface/edithandler.cpp:1400
-#: ../../locales/../src/interface/edithandler.cpp:1499
-#: ../../locales/../src/interface/edithandler.cpp:1512
+#: ../../locales/../src/interface/edithandler.cpp:1265
+#: ../../locales/../src/interface/edithandler.cpp:1408
+#: ../../locales/../src/interface/edithandler.cpp:1507
+#: ../../locales/../src/interface/edithandler.cpp:1520
 msgid "Pending removal"
 msgstr "等待移除"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:142
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:145
 msgid "Permission"
 msgstr "權限"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:362
+#: ../../locales/../src/interface/RemoteListView.cpp:376
 #: ../../locales/../src/interface/search.cpp:384
 msgid "Permissions"
 msgstr "權限"
 
-#: resources.h:170
+#: resources.h:180
 msgid "Platform:"
 msgstr "平台:"
 
-#: resources.h:250
+#: resources.h:260
 msgid ""
 "Please check http://filezilla-project.org for the most recent version of "
 "FileZilla."
@@ -4971,7 +5046,7 @@
 "請檢查 http://filezilla-project.org/probe.php 有在運作並請再次仔細地檢查您的"
 "設定."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1076
+#: ../../locales/../src/interface/updatewizard.cpp:1091
 msgid ""
 "Please check the package manager of your system for an updated package or "
 "visit http://filezilla-project.org to download the source code of FileZilla."
@@ -4979,7 +5054,7 @@
 "請檢查您系統的套件管理程式來更新套件, 或是拜訪 http://filezilla-project.org "
 "下載 FileZilla 的原始碼."
 
-#: resources.h:685
+#: resources.h:706
 msgid ""
 "Please configure any firewalls and routers so that FileZilla can establish "
 "outgoing connection to arbitrary ports."
@@ -5003,7 +5078,7 @@
 msgid "Please enter a custom time format."
 msgstr "請輸入自訂的時間格式."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:695
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:736
 msgid ""
 "Please enter a date of the form YYYY-MM-DD such as for example 2010-07-18."
 msgstr "請輸入格式為 YYYY-MM-DD 的日期, 如 2010-07-18."
@@ -5014,20 +5089,20 @@
 msgid "Please enter a download speed limit greater or equal to 0 %s/s."
 msgstr "請輸入大於等於 0 %s/s 的下載速度限制."
 
-#: ../../locales/../src/interface/filteredit.cpp:134
+#: ../../locales/../src/interface/filteredit.cpp:136
 msgid "Please enter a name for the new filter."
 msgstr "請輸入新篩選器的名稱."
 
-#: ../../locales/../src/interface/filteredit.cpp:241
+#: ../../locales/../src/interface/filteredit.cpp:243
 msgid "Please enter a new name for the copied filter."
 msgstr "請輸入欲複製篩選器的新名稱."
 
-#: ../../locales/../src/interface/filter.cpp:404
+#: ../../locales/../src/interface/filter.cpp:403
 #, c-format
 msgid "Please enter a new name for the filter set \"%s\""
 msgstr "請輸入篩選集 \"%s\" 的新名稱"
 
-#: ../../locales/../src/interface/filteredit.cpp:194
+#: ../../locales/../src/interface/filteredit.cpp:196
 msgid "Please enter a new name for the filter."
 msgstr "請輸入篩選器的新名稱."
 
@@ -5048,11 +5123,11 @@
 "transfers."
 msgstr "請輸入 0 到 10 之間的整數做為並行傳輸數目."
 
-#: resources.h:117
+#: resources.h:126
 msgid "Please enter a password for this server:"
 msgstr "請輸入此伺服器的密碼:"
 
-#: ../../locales/../src/interface/QueueView.cpp:2286
+#: ../../locales/../src/interface/QueueView.cpp:2275
 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"
@@ -5068,11 +5143,11 @@
 "Please enter a timeout between 5 and 9999 seconds or 0 to disable timeouts."
 msgstr "請輸入 5 到 9999 秒之間的逾時時間, 或是輸入 0 停用逾時時間."
 
-#: ../../locales/../src/interface/filter.cpp:344
+#: ../../locales/../src/interface/filter.cpp:343
 msgid "Please enter a unique name for this filter set"
 msgstr "請輸入這篩選集的唯一名稱:"
 
-#: resources.h:118
+#: resources.h:127
 msgid "Please enter a username for this server:"
 msgstr "請輸入此伺服器的使用者名稱:"
 
@@ -5084,17 +5159,13 @@
 msgid "Please enter an URL where to get your external address from"
 msgstr "請輸入可以取得外部 IP Address 的網址."
 
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:41
-msgid "Please enter an update interval of at least 7 days"
-msgstr "請輸入最少 7 日的更新間隔:"
-
 #: ../../locales/../src/interface/settings/optionspage_transfer.cpp:118
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 #, c-format
 msgid "Please enter an upload speed limit greater or equal to 0 %s/s."
 msgstr "請輸入大於等於 0 %s/s 的上傳速度限制."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:574
+#: ../../locales/../src/interface/Mainfrm.cpp:578
 msgid ""
 "Please enter raw FTP command.\n"
 "Using raw ftp commands will clear the directory cache."
@@ -5102,14 +5173,18 @@
 "請直接輸入 FTP 指令.\n"
 "使用直接的 FTP 指令會清除目錄快取."
 
-#: ../../locales/../src/interface/LocalListView.cpp:1183
-#: ../../locales/../src/interface/LocalTreeView.cpp:1182
-#: ../../locales/../src/interface/RemoteListView.cpp:1604
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1274
+#: ../../locales/../src/interface/LocalListView.cpp:1187
+#: ../../locales/../src/interface/LocalTreeView.cpp:1176
+#: ../../locales/../src/interface/RemoteListView.cpp:1627
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1276
 msgid "Please enter the name of the directory which should be created:"
 msgstr "請輸入欲建立的目錄名稱:"
 
-#: resources.h:119
+#: ../../locales/../src/interface/RemoteListView.cpp:3181
+msgid "Please enter the name of the file which should be created:"
+msgstr "請輸入欲建立的檔案名稱:"
+
+#: resources.h:128
 msgid "Please enter username and password for this server:"
 msgstr "請輸入此伺服器的使用者名稱與密碼:"
 
@@ -5127,7 +5202,7 @@
 "請在此精靈的主動模式頁面下輸入您的外部 IP Address. 若您使用動態 IP 或是您不知"
 "道您的外部 IP Address, 請使用外部解析器這選項."
 
-#: resources.h:672
+#: resources.h:693
 msgid ""
 "Please follow the instructions carefully, as wrong configuration will "
 "prevent successful FTP connections."
@@ -5141,7 +5216,7 @@
 "請確認已允許 FileZilla 建立對外連線以及確認您已正確鍵入位址解析器的 IP "
 "Address."
 
-#: ../../locales/../src/interface/FileZilla.cpp:258
+#: ../../locales/../src/interface/FileZilla.cpp:262
 msgid "Please make sure the requested locale is installed on your system."
 msgstr "請確認要求的語系地域 (Locale) 有安裝進您的系統裡."
 
@@ -5153,10 +5228,10 @@
 "'game mode'."
 msgstr ""
 "請確認您的路由器已採用最新的韌體. 此外, 您的伺服器也得設定正確. 您必須手動設"
-"定轉送連接埠 (port forwarding). 別在 'DMZ mode' 或 'game mode' 下執行您的伺服"
-"器."
+"定轉送連接埠 (port forwarding). 別在 \"DMZ mode\" 或 \"game mode\" 下執行您的"
+"伺服器."
 
-#: resources.h:686
+#: resources.h:707
 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 "
@@ -5167,7 +5242,7 @@
 "火牆認為是只有特洛依木馬或是其他惡意軟體所使用的連接埠. 這可能會引發錯誤的警"
 "告, 但您可以放心地略過."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:716
+#: ../../locales/../src/interface/Mainfrm.cpp:728
 msgid ""
 "Please note that preserving timestamps on uploads on FTP, FTPS and FTPES "
 "servers only works if they support the MFMT command."
@@ -5175,14 +5250,14 @@
 "請留意上傳時保留時間戳記的功能只能在支援 MFMT 指令的 FTP, FTPS, FTPES 等伺服"
 "器上運作."
 
-#: resources.h:740
+#: resources.h:761
 msgid ""
 "Please note that some servers might ban you if you try to reconnect too "
 "often or in too short intervals."
 msgstr ""
 "請留意若您重新連線過於頻繁或是在太短的時間間隔內, 部份伺服器可能會擋掉您."
 
-#: resources.h:890 resources.h:896
+#: resources.h:911 resources.h:917
 #, no-c-format
 msgid ""
 "Please read http://wiki.filezilla-project.org/Date_and_Time_formatting for "
@@ -5190,11 +5265,12 @@
 msgstr ""
 "更多資訊請參閱 http://wiki.filezilla-project.org/Date_and_Time_formatting"
 
-#: resources.h:246
+#: resources.h:256
 msgid ""
 "Please retry downloading the update. Possible reasons if the problem "
 "persists (listed in order of decreasing probability):"
-msgstr "請重新嘗試下載更新. 如果此問題依舊持續, 可能的問題有 (可能性遞減排列):"
+msgstr ""
+"請重新嘗試下載更新. 如果此問題依舊持續, 可能的問題有 (依可能性遞減排列):"
 
 #: ../../locales/../src/interface/netconfwizard.cpp:570
 msgid ""
@@ -5205,40 +5281,40 @@
 "在變更網路環境後, 或是假如先前正確運作的伺服器突然發生問題時, 請您應再次執行"
 "精靈."
 
-#: resources.h:456
+#: resources.h:466
 msgid "Please select an action:"
 msgstr "請選擇動作:"
 
-#: resources.h:302
+#: resources.h:312
 msgid "Please select the categories you would like to import."
 msgstr "請選擇您想要匯入的分類目錄."
 
-#: resources.h:674
+#: resources.h:695
 msgid "Please select the default transfer mode you would like to use."
 msgstr "請選擇您想要的預設傳輸模式."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:38
+#: ../../locales/../src/interface/chmoddialog.cpp:51
 #, c-format
 msgid "Please select the new attributes for the directory \"%s\"."
-msgstr "請為目錄 \"%s\" 選擇新的屬性."
+msgstr "請為目錄 \"%s\" 選擇新屬性."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:27
+#: ../../locales/../src/interface/chmoddialog.cpp:40
 #, c-format
 msgid "Please select the new attributes for the file \"%s\"."
-msgstr "請為檔案 \"%s\" 選擇新的屬性."
+msgstr "請為檔案 \"%s\" 選擇新屬性."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:41
+#: ../../locales/../src/interface/chmoddialog.cpp:54
 msgid "Please select the new attributes for the selected directories."
-msgstr "請為選取的目錄選擇新的屬性."
+msgstr "請為選取的目錄選擇新屬性."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:44
+#: ../../locales/../src/interface/chmoddialog.cpp:57
 msgid ""
 "Please select the new attributes for the selected files and directories."
-msgstr "請為選擇選取的檔案與目錄的新屬性."
+msgstr "請為選取的檔案與目錄選擇新屬性."
 
-#: ../../locales/../src/interface/chmoddialog.cpp:30
+#: ../../locales/../src/interface/chmoddialog.cpp:43
 msgid "Please select the new attributes for the selected files."
-msgstr "請為選擇選取的檔案的新屬性."
+msgstr "請為選取的檔案選擇新屬性."
 
 #: ../../locales/../src/interface/netconfwizard.cpp:581
 msgid ""
@@ -5252,30 +5328,30 @@
 "才行. 您必須手動設定連接埠轉送 (port forwarding). 別在 \"DMZ mode\" 或 "
 "\"game mode\" 下執行您的路由器. 得停用像是協定檢查或是特定協定修正之類的東西"
 
-#: resources.h:253
+#: resources.h:263
 msgid ""
 "Please visit http://filezilla-project.org for more information about "
 "FileZilla."
 msgstr "請拜訪 http://filezilla-project.org 以獲得更多關於 FileZilla 的資訊."
 
-#: ../../locales/../src/interface/updatewizard.cpp:1074
-#: ../../locales/../src/interface/updatewizard.cpp:1090
+#: ../../locales/../src/interface/updatewizard.cpp:1089
+#: ../../locales/../src/interface/updatewizard.cpp:1111
 msgid ""
 "Please visit http://filezilla-project.org to download the most recent "
 "version."
 msgstr "請到 http://filezilla-project.org 下載最近的版本."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:184
-#: ../../locales/../src/interface/verifycertdialog.cpp:185
+#: ../../locales/../src/interface/verifycertdialog.cpp:187
+#: ../../locales/../src/interface/verifycertdialog.cpp:188
 msgid "Postal code:"
 msgstr "郵遞區號:"
 
 #: ../../locales/../src/interface/sitemanager.cpp:289
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1816
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1826
 msgid "Predefined Sites"
 msgstr "預先定義的站台"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:715
+#: ../../locales/../src/interface/Mainfrm.cpp:727
 msgid "Preserving file timestamps"
 msgstr "保留檔案時間戳記"
 
@@ -5283,47 +5359,59 @@
 msgid "Preview:"
 msgstr "預覽:"
 
-#: ../../locales/../src/engine/tlssocket.cpp:910
+#: ../../locales/../src/engine/tlssocket.cpp:1127
 msgid "Primary connection and data connection certificates don't match."
-msgstr "初次連線與資料連線的憑證未相符."
+msgstr "主要連線與資料連線的憑證未相符."
 
-#: ../../locales/../src/interface/cmdline.cpp:17
+#: ../../locales/../src/interface/cmdline.cpp:19
+msgid "Print diagnostic information related to startup of FileZilla"
+msgstr "印出與 FileZilla 啟動有關的檢測資訊"
+
+#: ../../locales/../src/interface/cmdline.cpp:18
 msgid "Print version information to stdout and exit"
 msgstr "將版本資訊列印到標準輸出 (stdout) 並離開"
 
-#: resources.h:913
+#: resources.h:934
 msgid "Prioritize directories (default)"
 msgstr "目錄優先(預設)"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Priority"
 msgstr "優先權"
 
-#: resources.h:953
-msgid "Privacy policy:"
-msgstr "隱私權政策:"
+#: resources.h:978
+msgid ""
+"Privacy policy: Only your version of FileZilla, your used operating system "
+"and your CPU architecture will be submitted to the server."
+msgstr ""
+"隱私權政策: 只有您的 FileZilla 版本, 使用的作業系統和 CPU 架構資訊會傳到伺服"
+"器上."
 
-#: resources.h:787
+#: resources.h:808
 msgid "Private &keys:"
 msgstr "私鑰(&K):"
 
-#: resources.h:81
+#: resources.h:90
 msgid "Pro&tocol:"
 msgstr "協定(&T):"
 
-#: resources.h:783 resources.h:800
+#: resources.h:804 resources.h:821
 msgid "Pro&xy password:"
 msgstr "Proxy 密碼(&X):"
 
-#: resources.h:525 resources.h:592
+#: resources.h:542 resources.h:611
 msgid "Process &Queue"
 msgstr "處理佇列(&Q)"
 
-#: resources.h:798
+#: resources.h:19 resources.h:47
+msgid "Protocol:"
+msgstr "協定:"
+
+#: resources.h:819
 msgid "Proxy &port:"
 msgstr "Proxy 連接埠 (&P):"
 
-#: resources.h:782 resources.h:799
+#: resources.h:803 resources.h:820
 msgid "Proxy &user:"
 msgstr "Proxy 使用者 (&U):"
 
@@ -5331,12 +5419,16 @@
 msgid "Proxy authentication failed"
 msgstr "Proxy 認證失敗"
 
-#: ../../locales/../src/engine/transfersocket.cpp:132
-#: ../../locales/../src/engine/transfersocket.cpp:146
+#: ../../locales/../src/engine/transfersocket.cpp:131
+#: ../../locales/../src/engine/transfersocket.cpp:145
 #, c-format
 msgid "Proxy handshake failed: %s"
 msgstr "Proxy 交握失敗: %s"
 
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4410
+msgid "Proxy host starts with '[' but no closing bracket found."
+msgstr "Proxy 主機以 \"[\" 起始, 卻沒有找到對應的結束括弧."
+
 #: ../../locales/../src/engine/proxy.cpp:309
 #, c-format
 msgid "Proxy reply: %s"
@@ -5351,23 +5443,23 @@
 msgid "Proxy request failed: Unknown address type in CONNECT reply"
 msgstr "Proxy 請求失敗: CONNECT 的回應裡有未知的位址型態"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4382
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4443
 msgid "Proxy set but proxy host or port invalid"
 msgstr "已設定 Proxy, 但 Proxy 主機或是連接埠的設定無效"
 
-#: resources.h:785
+#: resources.h:806
 msgid "Public Key Authentication"
 msgstr "公開金鑰認證"
 
-#: resources.h:8 resources.h:32
+#: resources.h:8 resources.h:37
 msgid "Public key algorithm:"
 msgstr "公開金鑰演算法:"
 
-#: resources.h:142
+#: resources.h:151
 msgid "Public permissions"
 msgstr "公開權限"
 
-#: ../../locales/../src/interface/QueueView.cpp:3224
+#: ../../locales/../src/interface/QueueView.cpp:3208
 msgid "Queue has been fully processed"
 msgstr "佇列已處理完成"
 
@@ -5386,39 +5478,39 @@
 msgid "Queue: empty"
 msgstr "佇列: 空"
 
-#: ../../locales/../src/interface/QueueView.cpp:453
+#: ../../locales/../src/interface/QueueView.cpp:455
 msgid "Queued files"
 msgstr "等候的檔案"
 
-#: resources.h:448
+#: resources.h:458
 msgid "Queueing:"
 msgstr "等候:"
 
-#: resources.h:608
+#: resources.h:627
 msgid "R&eboot system"
 msgstr "重新啟動系統(&E)"
 
-#: resources.h:522
+#: resources.h:539
 msgid "R&emote directory tree"
 msgstr "遠端樹狀目錄(&E)"
 
-#: resources.h:622 resources.h:626
+#: resources.h:643 resources.h:647
 msgid "R&eset and requeue selected files"
 msgstr "重設與重排所選的檔案(&E)"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:590
+#: ../../locales/../src/interface/Mainfrm.cpp:594
 msgid "Raw FTP command"
 msgstr "直接的 FTP 指令"
 
-#: resources.h:139
+#: resources.h:148
 msgid "Re&ad"
 msgstr "讀取(&A)"
 
-#: resources.h:569 resources.h:583
+#: resources.h:586 resources.h:602
 msgid "Re&fresh"
 msgstr "重新整理(&F)"
 
-#: resources.h:63
+#: resources.h:72
 msgid "Re&name"
 msgstr "更名(&N)"
 
@@ -5428,63 +5520,71 @@
 "routers and firewalls accordingly."
 msgstr "重新執行精靈仔細檢查您的設定, 並依此配置所有路由器與防火牆."
 
-#: resources.h:143
+#: resources.h:152
 msgid "Rea&d"
 msgstr "讀取(&D)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:106
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
 msgid "Read-only"
 msgstr "唯讀"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1080
+#: ../../locales/../src/interface/Mainfrm.cpp:1129
 msgid "Really cancel current operation?"
 msgstr "真的要取消當前的操作?"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1692
-#: ../../locales/../src/interface/search.cpp:1025
+#: ../../locales/../src/interface/RemoteListView.cpp:1717
+#: ../../locales/../src/interface/search.cpp:1026
 #, c-format
-msgid "Really delete %d directory with its contents?"
-msgid_plural "Really delete %d directories with their contents?"
-msgstr[0] "真的要刪除 %d 個目錄與其內容嗎?"
+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:1690
-#: ../../locales/../src/interface/search.cpp:1023
+#: ../../locales/../src/interface/RemoteListView.cpp:1715
+#: ../../locales/../src/interface/search.cpp:1024
 #, c-format
-msgid "Really delete %d file?"
-msgid_plural "Really delete %d files?"
-msgstr[0] "真的要刪除 %d 個檔案嗎?"
+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:1697
-#: ../../locales/../src/interface/search.cpp:1030
+#: ../../locales/../src/interface/RemoteListView.cpp:1722
+#: ../../locales/../src/interface/search.cpp:1031
 #, c-format
-msgid "Really delete %s and %s?"
-msgstr "真的要刪除 %s 與 %s 嗎?"
+msgid "Really delete %s and %s from the server?"
+msgstr "真的要從伺服器刪除 %s 與 %s 嗎?"
+
+#: ../../locales/../src/interface/RemoteTreeView.cpp:1125
+msgid "Really delete all selected files and/or directories from the server?"
+msgstr "真的要從伺服器刪除所有選擇的檔案/目錄?"
 
 #: ../../locales/../src/engine/local_filesys.cpp:136
-#: ../../locales/../src/interface/RemoteTreeView.cpp:1123
-msgid "Really delete all selected files and/or directories?"
-msgstr "真的要刪除所有選擇的檔案/目錄?"
+msgid "Really delete all selected files and/or directories from your computer?"
+msgstr "真的要從您的電腦刪除所有選擇的檔案/目錄?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Reason"
 msgstr "原因"
 
-#: ../../locales/../src/interface/QueueView.cpp:3231
+#: ../../locales/../src/interface/QueueView.cpp:3215
 msgid "Reboot now"
 msgstr "立即重開機"
 
-#: resources.h:148
+#: resources.h:157
 msgid "Rec&urse into subdirectories"
 msgstr "包含子目錄(&U)"
 
-#: ../../locales/../src/engine/directorylistingparser.cpp:2110
-#: ../../locales/../src/engine/directorylistingparser.cpp:2125
+#: ../../locales/../src/engine/directorylistingparser.cpp:3110
+msgid "Received a directory listing which appears to be encoded in EBCDIC."
+msgstr "已取得目錄清單, 該清單似乎是以 EBCDIC 編碼而成."
+
+#: ../../locales/../src/engine/directorylistingparser.cpp:2123
+#: ../../locales/../src/engine/directorylistingparser.cpp:2138
 msgid "Received a line exceeding 10000 characters, aborting."
 msgstr "單行接收超過 10000 字元, 正在中止."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:998
-#: ../../locales/../src/interface/netconfwizard.cpp:1007
-#: ../../locales/../src/interface/netconfwizard.cpp:1031
+#: ../../locales/../src/interface/netconfwizard.cpp:1004
+#: ../../locales/../src/interface/netconfwizard.cpp:1013
+#: ../../locales/../src/interface/netconfwizard.cpp:1037
 msgid "Received data tainted"
 msgstr "收到的資料遭受影響."
 
@@ -5496,11 +5596,11 @@
 "連線到伺服器時無法清除重新連線資訊.\n"
 "如果您要繼續, 您的連線將會斷線."
 
-#: resources.h:741
+#: resources.h:762
 msgid "Reconnection settings"
 msgstr "重新連線設定"
 
-#: resources.h:994 resources.h:995
+#: resources.h:1020 resources.h:1021
 msgid "Reconnects to the last used server"
 msgstr "重新連線到先前的伺服器"
 
@@ -5508,34 +5608,38 @@
 msgid "Redirection to invalid address"
 msgstr "重導至無效的位址"
 
-#: resources.h:986 resources.h:987
+#: resources.h:1012 resources.h:1013
 msgid "Refresh the file and folder lists"
 msgstr "重新整理檔案與資料夾列表"
 
-#: ../../locales/../src/interface/edithandler.cpp:1241
+#: resources.h:506
+msgid "Remember passwords?"
+msgstr "記憶密碼?"
+
+#: ../../locales/../src/interface/edithandler.cpp:1249
 msgid "Remote"
 msgstr "遠端"
 
-#: ../../locales/../src/engine/tlssocket.cpp:833
+#: ../../locales/../src/engine/tlssocket.cpp:916
 msgid "Remote certificate not trusted."
-msgstr "遠端憑證尚未信任."
+msgstr "遠端憑證未被信任."
 
-#: resources.h:367 ../../locales/../src/interface/queue.cpp:1223
+#: resources.h:377 ../../locales/../src/interface/queue.cpp:1225
 msgid "Remote file"
 msgstr "遠端檔案"
 
-#: resources.h:440 ../../locales/../src/interface/search.cpp:676
-#: ../../locales/../src/interface/search.cpp:682
-#: ../../locales/../src/interface/search.cpp:692
-#: ../../locales/../src/interface/search.cpp:698
+#: resources.h:450 ../../locales/../src/interface/search.cpp:677
+#: ../../locales/../src/interface/search.cpp:683
+#: ../../locales/../src/interface/search.cpp:693
+#: ../../locales/../src/interface/search.cpp:699
 msgid "Remote file search"
 msgstr "遠端檔案搜尋"
 
-#: resources.h:206
+#: resources.h:216
 msgid "Remote filters:"
 msgstr "遠端篩選器:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1232
+#: ../../locales/../src/interface/edithandler.cpp:1240
 msgid "Remote path"
 msgstr "遠端路徑"
 
@@ -5548,7 +5652,7 @@
 "無法解析遠端路徑. 請確定這是有效的絕對路徑, 且被目前站台的伺服器型態 (%s) 支"
 "援."
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1084
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1094
 #, c-format
 msgid ""
 "Remote path cannot be parsed. Make sure it is a valid absolute path and is "
@@ -5559,7 +5663,7 @@
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:432
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:436
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1086
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1096
 msgid "Remote path cannot be parsed. Make sure it is a valid absolute path."
 msgstr "無法解析遠端路徑. 請確定這是有效的絕對路徑."
 
@@ -5567,11 +5671,11 @@
 msgid "Remote path could not be parsed."
 msgstr "遠端路徑無法解析."
 
-#: resources.h:445
+#: resources.h:455
 msgid "Remote path handling:"
 msgstr "遠端路徑處理:"
 
-#: resources.h:313
+#: resources.h:323
 msgid "Remote path:"
 msgstr "遠端路徑:"
 
@@ -5579,113 +5683,113 @@
 msgid "Remote site:"
 msgstr "遠端站台:"
 
-#: resources.h:619 resources.h:623
+#: resources.h:640 resources.h:644
 msgid "Remove &all"
 msgstr "全部移除(&A)"
 
-#: resources.h:621 resources.h:625
+#: resources.h:642 resources.h:646
 msgid "Remove &selected"
 msgstr "移除所選項目(&S)"
 
-#: resources.h:265 resources.h:275 resources.h:844 resources.h:853
+#: resources.h:275 resources.h:285 resources.h:865 resources.h:874
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:256
 msgid "Rename file"
 msgstr "更名檔案"
 
-#: resources.h:637 resources.h:658
+#: resources.h:658 resources.h:679
 msgid "Rename selected directory"
 msgstr "更改所選的目錄名稱"
 
-#: resources.h:573 resources.h:587
+#: resources.h:590 resources.h:606
 msgid "Rename selected files and directories"
-msgstr "更改所選的檔案和目錄名稱"
+msgstr "更名所選的檔案和目錄"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3531
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2557
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3562
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2558
 #, c-format
 msgid "Renaming '%s' to '%s'"
-msgstr "'%s' 更名為 '%s'"
+msgstr "\"%s\" 更名為 \"%s\""
 
-#: resources.h:472
+#: resources.h:482
 msgid "Reporting bugs and feature requests"
 msgstr "回報臭蟲與功能請求"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
 msgid "Require explicit FTP over TLS"
 msgstr "需要透過外顯式 TLS 的 FTP"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:514
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:515
 msgid "Require implicit FTP over TLS"
 msgstr "需要透過隱含式 TLS 的 FTP"
 
-#: resources.h:624
+#: resources.h:645
 msgid "Reset and requeue &all"
 msgstr "重設與重排所有檔案(&A)"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1198
+#: ../../locales/../src/engine/ControlSocket.cpp:1204
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:497
 #, c-format
 msgid "Resolving address of %s"
 msgstr "正在解析 %s 的 IP Address"
 
-#: ../../locales/../src/interface/updatewizard.cpp:1159
+#: ../../locales/../src/interface/updatewizard.cpp:1179
 msgid "Resolving hostname"
 msgstr "正在解析主機名稱"
 
 #: ../../locales/../src/engine/logging.cpp:215
 #: ../../locales/../src/interface/netconfwizard.cpp:395
-#: ../../locales/../src/interface/StatusView.cpp:290
-#: ../../locales/../src/interface/StatusView.cpp:344
-#: ../../locales/../src/interface/updatewizard.cpp:544
+#: ../../locales/../src/interface/StatusView.cpp:288
+#: ../../locales/../src/interface/StatusView.cpp:342
+#: ../../locales/../src/interface/updatewizard.cpp:555
 msgid "Response:"
 msgstr "回應:"
 
-#: resources.h:439
+#: resources.h:449
 msgid "Results:"
 msgstr "結果:"
 
-#: resources.h:264 resources.h:274 resources.h:843 resources.h:852
+#: resources.h:274 resources.h:284 resources.h:864 resources.h:873
 msgid "Resume file transfer"
 msgstr "續傳檔案"
 
-#: resources.h:858
+#: resources.h:879
 msgid ""
 "Resuming ASCII files can cause problems if server uses a different line "
 "ending format than the client."
 msgstr "如果伺服器使用和客戶端不同的換行格式時, 續傳文字檔案可能會造成問題."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1292
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:955
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1313
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:956
 msgid "Retrieving directory listing..."
 msgstr "正在取得目錄列表..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3916
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3947
 #: ../../locales/../src/interface/netconfwizard.cpp:707
 #, c-format
 msgid "Retrieving external IP address from %s"
 msgstr "正從 %s 取得外部 IP Address"
 
-#: ../../locales/../src/engine/tlssocket.cpp:891
+#: ../../locales/../src/engine/tlssocket.cpp:1108
 msgid "Root certificate is not trusted"
 msgstr "根憑證不被信任"
 
-#: resources.h:500
+#: resources.h:517
 msgid "S&how files currently being edited..."
 msgstr "顯示正被編輯的檔案(&H)..."
 
-#: resources.h:875
+#: resources.h:896
 msgid "S&how the Site Manager on startup"
 msgstr "啟動時顯示站台管理員(&H)"
 
-#: resources.h:609
+#: resources.h:628
 msgid "S&hutdown system"
 msgstr "系統關機(&H)"
 
-#: resources.h:437
+#: resources.h:447
 msgid "S&top"
 msgstr "停止(&T)"
 
-#: resources.h:516
+#: resources.h:533
 msgid "S&ynchronized browsing"
 msgstr "同步瀏覽(&Y)"
 
@@ -5693,31 +5797,45 @@
 msgid "SFTP"
 msgstr "SFTP"
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: resources.h:176
+msgid "SQLite:"
+msgstr "SQLite:"
+
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "Save settings?"
 msgstr "儲存設定?"
 
-#: ../../locales/../src/interface/QueueView.cpp:1831
+#: ../../locales/../src/interface/manual_transfer.cpp:455
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:967
+msgid "Saving of password has been disabled by your system administrator."
+msgstr "儲存密碼的功能已被您的系統管理員停用."
+
+#: ../../locales/../src/interface/manual_transfer.cpp:457
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:969
+msgid "Saving of passwords has been disabled by you."
+msgstr "儲存密碼的功能已被您停用."
+
+#: ../../locales/../src/interface/QueueView.cpp:1822
 msgid "Scanning for files to add to queue"
 msgstr "正在掃描欲加入佇列的檔案"
 
-#: ../../locales/../src/interface/QueueView.cpp:1833
+#: ../../locales/../src/interface/QueueView.cpp:1824
 msgid "Scanning for files to upload"
 msgstr "正在掃描欲上傳的檔案"
 
-#: resources.h:433
+#: resources.h:443
 msgid "Search &conditions:"
 msgstr "搜尋條件(&C):"
 
-#: resources.h:431
+#: resources.h:441
 msgid "Search &directory:"
 msgstr "搜尋目錄(&D):"
 
-#: resources.h:1002
+#: resources.h:1028
 msgid "Search for files recursively."
 msgstr "遞迴式搜尋檔案."
 
-#: resources.h:541
+#: resources.h:558
 msgid "Search server for files"
 msgstr "搜尋伺服器的檔案"
 
@@ -5730,25 +5848,25 @@
 msgid "See also: http://wiki.filezilla-project.org/Network_Configuration"
 msgstr "也請見: http://wiki.filezilla-project.org/Network_Configuration"
 
-#: resources.h:375
+#: resources.h:385
 msgid "Sele&ct server"
 msgstr "選擇伺服器(&C)"
 
-#: resources.h:726
+#: resources.h:747
 msgid "Select &page:"
 msgstr "選擇頁面(&P):"
 
-#: resources.h:878
+#: resources.h:899
 msgid "Select Theme"
 msgstr "選擇佈景主題"
 
-#: resources.h:836
+#: resources.h:857
 msgid ""
 "Select default action to perform if target file of a transfer already exists."
 msgstr "請選擇如果欲傳輸的目標檔案已存在時的預設處理動作."
 
-#: ../../locales/../src/interface/edithandler.cpp:1702
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:162
+#: ../../locales/../src/interface/edithandler.cpp:1710
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:168
 msgid "Select default editor"
 msgstr "選擇預設編輯器"
 
@@ -5756,7 +5874,7 @@
 msgid ""
 "Select default file exists action if the target file already exists. This "
 "selection is valid only for the current session."
-msgstr "請選擇如果目標檔案已存在時的預設處理動作. 該選擇只在目前的連線有效."
+msgstr "選擇如果目標檔案已存在時的預設處理動作. 該選擇只在目前的連線有效."
 
 #: ../../locales/../src/interface/defaultfileexistsdlg.cpp:16
 msgid ""
@@ -5764,7 +5882,7 @@
 "the queue."
 msgstr "選擇目前在佇列內選取檔案的預設存在動作."
 
-#: ../../locales/../src/interface/updatewizard.cpp:328
+#: ../../locales/../src/interface/updatewizard.cpp:336
 msgid "Select download location for package"
 msgstr "選擇套件的下載位置"
 
@@ -5785,7 +5903,7 @@
 msgstr "選擇用以匯出設定的檔案"
 
 #: ../../locales/../src/interface/export.cpp:32
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:2168
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:2178
 msgid "Select file for exported sites"
 msgstr "選擇用以匯出站台的檔案"
 
@@ -5801,28 +5919,28 @@
 msgid "Select filename for converted keyfile"
 msgstr "選擇轉換後金鑰檔案名稱"
 
-#: resources.h:421
+#: resources.h:431
 #, no-c-format
 msgid "Select how these files should be opened."
 msgstr "選擇該如何開啟這些檔案."
 
-#: ../../locales/../src/interface/search.cpp:805
+#: ../../locales/../src/interface/search.cpp:806
 msgid "Select target download directory"
-msgstr "選取目標下載目錄"
+msgstr "選擇目標下載目錄"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:245
 msgid "Select target filename"
 msgstr "選擇目標檔案名稱"
 
-#: resources.h:291
+#: resources.h:301
 msgid "Select the categories to export:"
 msgstr "選擇要匯出的分類目錄:"
 
-#: resources.h:282
+#: resources.h:292
 msgid "Select the private data you would like to delete."
 msgstr "請選擇您要刪除的私人資料."
 
-#: ../../locales/../src/interface/search.cpp:772
+#: ../../locales/../src/interface/search.cpp:773
 #, c-format
 msgid "Selected %d directory with its contents for transfer."
 msgid_plural "Selected %d directories with their contents for transfer."
@@ -5834,7 +5952,7 @@
 msgid_plural "Selected %d directories."
 msgstr[0] "選取 %d 個目錄."
 
-#: ../../locales/../src/interface/search.cpp:770
+#: ../../locales/../src/interface/search.cpp:771
 #, c-format
 msgid "Selected %d file for transfer."
 msgid_plural "Selected %d files for transfer."
@@ -5852,7 +5970,7 @@
 msgid_plural "Selected %d files. Total size: At least %s"
 msgstr[0] "選取 %d 個檔案. 總共大小: 至少 %s"
 
-#: ../../locales/../src/interface/search.cpp:777
+#: ../../locales/../src/interface/search.cpp:778
 #, c-format
 msgid "Selected %s and %s for transfer."
 msgstr "選擇傳輸 %s 與 %s."
@@ -5867,13 +5985,13 @@
 msgid "Selected %s and %s. Total size: At least %s"
 msgstr "選取 %s與 %s. 總共大小: 至少 %s"
 
-#: ../../locales/../src/interface/edithandler.cpp:1643
-#: ../../locales/../src/interface/edithandler.cpp:1722
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:182
+#: ../../locales/../src/interface/edithandler.cpp:1651
+#: ../../locales/../src/interface/edithandler.cpp:1730
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:188
 msgid "Selected editor does not exist."
 msgstr "所選的編輯器不存在."
 
-#: resources.h:320 ../../locales/../src/interface/LocalListView.cpp:2058
+#: resources.h:330 ../../locales/../src/interface/LocalListView.cpp:2066
 msgid "Selected file already being edited"
 msgstr "已在編輯所選的檔案."
 
@@ -5881,15 +5999,15 @@
 msgid "Selected file is already loaded"
 msgstr "已載入所選的檔案"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2679
+#: ../../locales/../src/interface/RemoteListView.cpp:2710
 msgid "Selected file is already opened"
 msgstr "已開啟所選的檔案"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid "Selected file is still being edited"
 msgstr "仍在編輯所選的檔案."
 
-#: ../../locales/../src/interface/filter.cpp:311
+#: ../../locales/../src/interface/filter.cpp:310
 msgid "Selected filter only works for local files."
 msgstr "所選的篩選器只能處理本地檔案."
 
@@ -5898,86 +6016,91 @@
 "Selected global bookmark and current server use a different server type.\n"
 "Use site-specific bookmarks for this server."
 msgstr ""
-"選定的全域書籤與目前伺服器使用的伺服器型態不同.\n"
+"選取的全域書籤與目前伺服器使用的伺服器型態不同.\n"
 "請在此伺服器使用站台書籤."
 
 #: ../../locales/../src/engine/engineprivate.cpp:281
 msgid "Selected port usually in use by a different protocol."
-msgstr "所選的連接埠通常是使用於其它協定."
+msgstr "選取的連接埠通常是使用於其它協定."
 
-#: resources.h:748
+#: resources.h:769
 msgid "Send FTP &keep-alive commands"
 msgstr "送出 FTP 維持連線指令(&K)"
 
-#: resources.h:543
+#: resources.h:560
 msgid "Send custom command to the server otherwise not available"
 msgstr "送出自訂的命令到伺服器否則就不可用"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4464
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4525
 msgid "Sending keep-alive command"
 msgstr "送出維持連線指令"
 
-#: resources.h:7 resources.h:31
-#: ../../locales/../src/interface/verifycertdialog.cpp:188
+#: resources.h:7 resources.h:36
+#: ../../locales/../src/interface/verifycertdialog.cpp:191
 msgid "Serial number:"
 msgstr "憑證序號:"
 
-#: resources.h:89
+#: resources.h:98
 msgid "Server &Type:"
 msgstr "伺服器種類(&T):"
 
-#: ../../locales/../src/engine/tlssocket.cpp:717
+#: ../../locales/../src/engine/tlssocket.cpp:794
 msgid "Server did not properly shut down TLS connection"
 msgstr "伺服器未正確結束 TLS 連線"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4315
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:921
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:984
+msgid "Server does not support non-ASCII characters."
+msgstr "伺服器不支援非 ASCII 字元."
+
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4349
 #, c-format
 msgid "Server does not support resume of files > %d GB."
 msgstr "伺服器不支援大於 %d GB 的檔案續傳."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4311
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4345
 #, 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:2546
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2577
 msgid "Server does not support resume of files > 2GB."
 msgstr "伺服器不支援大於 2GB 的檔案續傳."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2541
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2572
 msgid "Server does not support resume of files > 4GB."
 msgstr "伺服器不支援大於 4GB 的檔案續傳."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4326
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4360
 #, 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:856
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:863
 msgid ""
 "Server might require an account. Try specifying an account using the Site "
 "Manager"
 msgstr "伺服器可能需要帳號 (Account). 請嘗試用站台管理員指定帳號"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:417
+#: ../../locales/../src/engine/ControlSocket.cpp:420
 msgid "Server returned empty path."
 msgstr "伺服器回傳了空的路徑."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:675
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:676
 msgid ""
 "Server sent an additional login prompt. You need to use the interactive "
 "login type."
 msgstr "伺服器傳送了額外的登入提示. 您需要使用交談式登入型態."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3858
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3889
 msgid "Server sent passive reply with unroutable address. Passive mode failed."
 msgstr "伺服器以無法路由的 IP Address 送出了被動式回應. 被動模式失敗."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3852
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3883
 msgid ""
 "Server sent passive reply with unroutable address. Using server address "
 "instead."
@@ -5996,101 +6119,112 @@
 msgid "Server sent unexpected reply."
 msgstr "伺服器送出了非預期的回應."
 
-#: resources.h:351
+#: resources.h:361
 msgid "Server to client MAC:"
 msgstr "伺服器對客戶 MAC:"
 
-#: resources.h:349
+#: resources.h:359
 msgid "Server to client cipher:"
 msgstr "伺服器對客戶 Cipher:"
 
-#: resources.h:380
+#: resources.h:390
 msgid "Server&type:"
 msgstr "伺服器種類(&T):"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Server/Local file"
 msgstr "伺服器/本地檔案"
 
-#: resources.h:311 resources.h:373
+#: resources.h:321 resources.h:383
 msgid "Server:"
 msgstr "伺服器:"
 
-#: resources.h:15 resources.h:39
+#: resources.h:16 resources.h:44
 msgid "Session details"
 msgstr "連線細節"
 
-#: resources.h:596
+#: resources.h:615
 msgid "Set &Priority"
 msgstr "設定優先權(&P)"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3683
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2435
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:3714
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:2436
 #, c-format
 msgid "Set permissions of '%s' to '%s'"
-msgstr "修改 '%s' 權限為 '%s'"
+msgstr "修改 \"%s\" 權限為 \"%s\""
 
-#: ../../locales/../src/engine/transfersocket.cpp:860
+#: ../../locales/../src/engine/transfersocket.cpp:870
 msgid "SetSocketBufferSize called without socket"
 msgstr "呼叫 SetSocketBufferSize 時未有 socket"
 
-#: resources.h:725
+#: resources.h:746
 msgid "Settings"
 msgstr "設定"
 
-#: resources.h:975
+#: resources.h:1000
 msgid "Show &raw directory listing"
 msgstr "顯示原始目錄列表(&R)"
 
-#: resources.h:552
+#: resources.h:569
 msgid "Show &welcome dialog..."
 msgstr "顯示歡迎對話框(&W)..."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2326
+#: ../../locales/../src/interface/Mainfrm.cpp:2399
 msgid "Show both directory trees and continue comparing?"
 msgstr "顯示兩端的樹狀目錄然後並進行比對?"
 
+#: resources.h:639
+msgid "Shows available TLS ciphers"
+msgstr "顯示可用的 TLS Cipher"
+
 #: ../../locales/../src/interface/cmdline.cpp:6
 msgid "Shows this help dialog"
 msgstr "顯示此說明"
 
-#: ../../locales/../src/interface/QueueView.cpp:3233
+#: ../../locales/../src/interface/QueueView.cpp:3217
 msgid "Shutdown now"
 msgstr "立即關機"
 
-#: resources.h:299
+#: resources.h:9
+msgid "Signature algorithm:"
+msgstr "簽章演算法:"
+
+#: resources.h:309
 msgid "Site &Manager entries"
 msgstr "站台管理員欄位(&M)"
 
-#: resources.h:70
+#: resources.h:79
 msgid "Site Manager"
 msgstr "站台管理員"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:955
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:964
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:981
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:995
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:975
+msgid "Site Manager - Cannot remember password"
+msgstr "站台管理員 - 無法記憶密碼"
+
+#: ../../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:1051
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1062
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1087
+#: ../../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:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 msgid "Site Manager - Invalid data"
 msgstr "站台管理員 - 無效的資料"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:316
 msgid "Site Manager already open"
 msgstr "已開啟站台管理員"
 
 #: ../../locales/../src/interface/sitemanager.cpp:439
 #: ../../locales/../src/interface/sitemanager.cpp:456
 #: ../../locales/../src/interface/sitemanager.cpp:470
-#: ../../locales/../src/interface/sitemanager.cpp:742
-#: ../../locales/../src/interface/sitemanager.cpp:829
+#: ../../locales/../src/interface/sitemanager.cpp:740
+#: ../../locales/../src/interface/sitemanager.cpp:825
 msgid "Site does not exist."
 msgstr "站台不存在."
 
@@ -6100,8 +6234,8 @@
 
 #: ../../locales/../src/interface/sitemanager.cpp:463
 #: ../../locales/../src/interface/sitemanager.cpp:556
-#: ../../locales/../src/interface/sitemanager.cpp:735
-#: ../../locales/../src/interface/sitemanager.cpp:822
+#: ../../locales/../src/interface/sitemanager.cpp:733
+#: ../../locales/../src/interface/sitemanager.cpp:818
 msgid "Site path is malformed."
 msgstr "站台路徑的格式有誤."
 
@@ -6119,11 +6253,11 @@
 "站台書籤需要將伺服器存進站台管理員.\n"
 "要將目前的連線加進站台管理員?"
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Size"
 msgstr "大小"
 
-#: resources.h:897
+#: resources.h:918
 msgid "Size formatting"
 msgstr "大小格式"
 
@@ -6132,31 +6266,31 @@
 msgid "Size unknown"
 msgstr "未知大小"
 
-#: resources.h:266 resources.h:276 resources.h:845 resources.h:854
+#: resources.h:276 resources.h:286 resources.h:866 resources.h:875
 msgid "Skip file"
 msgstr "略過檔案"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1270
-#: ../../locales/../src/engine/ControlSocket.cpp:1289
-#: ../../locales/../src/engine/ControlSocket.cpp:1314
-#: ../../locales/../src/engine/ControlSocket.cpp:1380
+#: ../../locales/../src/engine/ControlSocket.cpp:1276
+#: ../../locales/../src/engine/ControlSocket.cpp:1295
+#: ../../locales/../src/engine/ControlSocket.cpp:1320
+#: ../../locales/../src/engine/ControlSocket.cpp:1386
 #, c-format
 msgid "Skipping download of %s"
 msgstr "略過 %s 的下載"
 
-#: ../../locales/../src/engine/ControlSocket.cpp:1274
-#: ../../locales/../src/engine/ControlSocket.cpp:1293
-#: ../../locales/../src/engine/ControlSocket.cpp:1318
-#: ../../locales/../src/engine/ControlSocket.cpp:1384
+#: ../../locales/../src/engine/ControlSocket.cpp:1280
+#: ../../locales/../src/engine/ControlSocket.cpp:1299
+#: ../../locales/../src/engine/ControlSocket.cpp:1324
+#: ../../locales/../src/engine/ControlSocket.cpp:1390
 #, c-format
 msgid "Skipping upload of %s"
 msgstr "略過 %s 的上傳"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:1148
+#: ../../locales/../src/interface/Mainfrm.cpp:1270
 msgid "Some files are still being edited or need to be uploaded."
 msgstr "部分檔案依然被編輯或是需要上傳."
 
-#: resources.h:688 resources.h:764
+#: resources.h:709 resources.h:785
 msgid ""
 "Some misconfigured remote servers which are behind a router, may reply with "
 "their local IP address."
@@ -6164,19 +6298,19 @@
 "一些位於路由器後方且組態配置錯誤的遠端伺服器也許會回應它們自己的本地 IP "
 "Address."
 
-#: resources.h:915
+#: resources.h:936
 msgid "Sort directories inline"
 msgstr "一併排序目錄"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:446
+#: ../../locales/../src/interface/filelistctrl.cpp:450
 msgid "Sort order cannot be changed if comparing directories."
 msgstr "比對目錄時不能變更目錄排序."
 
-#: resources.h:911
+#: resources.h:932
 msgid "Sorting"
 msgstr "排序"
 
-#: resources.h:912
+#: resources.h:933
 msgid "Sorting &mode:"
 msgstr "排序模式(&M):"
 
@@ -6188,20 +6322,20 @@
 msgid "Source and target file may not be the same"
 msgstr "來源和目標檔案不能相同"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:140
+#: ../../locales/../src/interface/RemoteListView.cpp:141
 msgid "Source and target of the drop operation are identical"
 msgstr "拖曳功能的來源和目標位置相同"
 
-#: resources.h:49
+#: resources.h:58
 msgid "Source file:"
 msgstr "來源檔案:"
 
-#: resources.h:489 ../../locales/../src/interface/speedlimits_dialog.cpp:54
+#: resources.h:499 ../../locales/../src/interface/speedlimits_dialog.cpp:54
 #: ../../locales/../src/interface/speedlimits_dialog.cpp:62
 msgid "Speed Limits"
 msgstr "速度限制"
 
-#: resources.h:809
+#: resources.h:830
 msgid "Speed limits"
 msgstr "速度限制"
 
@@ -6213,51 +6347,63 @@
 msgid "Speed limits are enabled, click to change."
 msgstr "速度限制已啟用, 按此變更."
 
-#: resources.h:391
+#: resources.h:975
+msgid "Stable and beta versions"
+msgstr "穩定與 Beta 測試版本"
+
+#: resources.h:974
+msgid "Stable versions only"
+msgstr "僅穩定版本"
+
+#: resources.h:401
 msgid "Start transfer &immediately"
-msgstr "立即啟動傳輸"
+msgstr "立即啟動傳輸(&I)"
 
 #: ../../locales/../src/interface/cmdline.cpp:7
 msgid "Start with opened Site Manager"
 msgstr "啟動時開啟站台管理員"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2225
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1633
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2256
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1634
 #, c-format
 msgid "Starting download of %s"
 msgstr "開始 %s 的下載"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2229
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1637
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:2260
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1638
 #, c-format
 msgid "Starting upload of %s"
 msgstr "開始 %s 的上傳"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:182
+#: ../../locales/../src/interface/cmdline.cpp:9
+msgid "Starts the local site in the given path"
+msgstr "啟動時將給定路徑視為本地目錄"
+
+#: ../../locales/../src/interface/verifycertdialog.cpp:185
 msgid "State or province:"
 msgstr "州郡省份:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1233
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/edithandler.cpp:1241
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Status"
 msgstr "狀態"
 
 #: ../../locales/../src/engine/logging.cpp:212
-#: ../../locales/../src/interface/StatusView.cpp:299
-#: ../../locales/../src/interface/StatusView.cpp:368
-#: ../../locales/../src/interface/updatewizard.cpp:538
+#: ../../locales/../src/interface/StatusView.cpp:297
+#: ../../locales/../src/interface/StatusView.cpp:366
+#: ../../locales/../src/interface/updatewizard.cpp:549
 msgid "Status:"
 msgstr "狀態:"
 
-#: resources.h:593
+#: resources.h:612
 msgid "Stop and remove &all"
 msgstr "停止且全部移除(&A)"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:186
+#: ../../locales/../src/interface/verifycertdialog.cpp:189
 msgid "Street:"
 msgstr "街:"
 
-#: resources.h:11 resources.h:35
+#: resources.h:12 resources.h:40
 msgid "Subject of certificate"
 msgstr "憑證主體"
 
@@ -6265,54 +6411,55 @@
 msgid "Successful transfers"
 msgstr "傳輸成功"
 
-#: resources.h:716
+#: resources.h:737
 msgid "Summary of test results:"
 msgstr "測試結果摘要:"
 
-#: resources.h:459
+#: resources.h:469
 msgid ""
 "Symlinks to files are not affected by this choice, such symlinks are always "
 "deleted."
-msgstr "指向檔案的軟連結則不受選擇影響, 這類軟連結則總會被刪除."
+msgstr "指向檔案的軟連結則不受選擇影響, 這類軟連結則總是會刪除."
 
-#: resources.h:1001 ../../locales/../src/interface/state.cpp:249
+#: resources.h:1027 ../../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:373
-#: ../../locales/../src/interface/state.cpp:383
-#: ../../locales/../src/interface/state.cpp:392
-#: ../../locales/../src/interface/state.cpp:1016
-#: ../../locales/../src/interface/state.cpp:1025
-#: ../../locales/../src/interface/state.cpp:1032
-#: ../../locales/../src/interface/state.cpp:1043
-#: ../../locales/../src/interface/state.cpp:1050
+#: ../../locales/../src/interface/state.cpp: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
 msgid "Synchronized browsing"
 msgstr "同步瀏覽"
 
-#: ../../locales/../src/interface/state.cpp:391
+#: ../../locales/../src/interface/state.cpp:414
 msgid "Synchronized browsing has been disabled."
 msgstr "同步瀏覽已停用."
 
-#: ../../locales/../src/interface/quickconnectbar.cpp:87
-#: ../../locales/../src/interface/quickconnectbar.cpp:122
+#: ../../locales/../src/interface/quickconnectbar.cpp:88
+#: ../../locales/../src/interface/quickconnectbar.cpp:126
 msgid "Syntax error"
 msgstr "語法錯誤"
 
-#: ../../locales/../src/interface/cmdline.cpp:68
-#: ../../locales/../src/interface/cmdline.cpp:74
-#: ../../locales/../src/interface/cmdline.cpp:80
-#: ../../locales/../src/interface/cmdline.cpp:89
-#: ../../locales/../src/interface/cmdline.cpp:95
-#: ../../locales/../src/interface/Mainfrm.cpp:2476
+#: ../../locales/../src/interface/cmdline.cpp:76
+#: ../../locales/../src/interface/cmdline.cpp:82
+#: ../../locales/../src/interface/cmdline.cpp:88
+#: ../../locales/../src/interface/cmdline.cpp:97
+#: ../../locales/../src/interface/cmdline.cpp:103
+#: ../../locales/../src/interface/Mainfrm.cpp:2514
+#: ../../locales/../src/interface/Mainfrm.cpp:2568
 msgid "Syntax error in command line"
 msgstr "命令列模式的語法錯誤"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:107
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
 msgid "System"
 msgstr "系統"
 
-#: resources.h:518
+#: resources.h:535
 msgid "T&oolbar"
 msgstr "工具列(&O)"
 
@@ -6320,11 +6467,11 @@
 msgid "TLS/SSL connection established, sending HTTP request"
 msgstr "TLS/SSL 連線已建立, 正在傳送 HTTP 請求"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:407
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:414
 msgid "TLS/SSL connection established, waiting for welcome message..."
-msgstr "TLS/SSL 連線已建立, 正等候歡迎訊息..."
+msgstr "TLS/SSL 連線已建立, 正在等候歡迎訊息..."
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:411
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:418
 msgid "TLS/SSL connection established."
 msgstr "TLS/SSL 連線已建立."
 
@@ -6332,34 +6479,38 @@
 msgid "TTL expired"
 msgstr "TTL 逾期"
 
-#: resources.h:47
+#: resources.h:56
 msgid "Target file already exists"
 msgstr "目標檔案已經存在"
 
-#: resources.h:53
+#: resources.h:62
 msgid "Target file:"
 msgstr "目的檔案:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:1908
+#: ../../locales/../src/interface/RemoteListView.cpp:3215
+msgid "Target filename already exists!"
+msgstr "目標檔名已經存在!"
+
+#: ../../locales/../src/interface/RemoteListView.cpp:1935
 msgid "Target filename already exists, really continue?"
 msgstr "目標檔名已經存在, 確定要繼續?"
 
-#: resources.h:715
+#: resources.h:736
 msgid "Test results"
 msgstr "測試結果"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4332
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4366
 msgid "Testing resume capabilities of server"
 msgstr "測試伺服器的續傳相容性"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:314
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:315
 msgid ""
 "The Site Manager is opened in another instance of FileZilla 3.\n"
 "Do you want to continue? Any changes made in the Site Manager won't be saved "
 "then."
 msgstr ""
 "另一個 FileZilla 3 程式已啟動站台管理員.\n"
-"您確定還要繼續嗎? 目前對站台管理員所做的變更都不會儲存."
+"您還要繼續嗎? 對站台管理員所做的任何變更都不會儲存."
 
 #: ../../locales/../src/interface/clearprivatedata.cpp:103
 msgid ""
@@ -6369,7 +6520,7 @@
 "另一個 FileZilla 3 程式已啟動站台管理員.\n"
 "請將其關閉, 否則資料都不會被刪除."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:424
+#: ../../locales/../src/interface/xmlfunctions.cpp:426
 #, c-format
 msgid "The XML document is not well-formed: %s"
 msgstr "此 XML 文件並未滿足格式: %s"
@@ -6380,11 +6531,11 @@
 msgstr "您輸入的 IP Address 是: %s"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:820
-#: ../../locales/../src/interface/sitemanager.cpp:722
+#: ../../locales/../src/interface/sitemanager.cpp:720
 msgid "The bookmark could not be added."
 msgstr "無法加入書籤."
 
-#: ../../locales/../src/interface/sitemanager.cpp:809
+#: ../../locales/../src/interface/sitemanager.cpp:805
 msgid "The bookmarks could not be cleared."
 msgstr "無法清除書籤."
 
@@ -6396,26 +6547,31 @@
 msgid "The custom login sequence cannot be empty."
 msgstr "自訂的登入程序不能是空的."
 
-#: resources.h:424 ../../locales/../src/interface/edithandler.cpp:1682
+#: ../../locales/../src/engine/transfersocket.cpp:172
+#, c-format
+msgid "The data connection could not be established: %s"
+msgstr "無法建立資料連線: %s"
+
+#: resources.h:434 ../../locales/../src/interface/edithandler.cpp:1690
 #, no-c-format
 msgid "The default editor for text files could not be found."
 msgstr "無法找到文字檔案的預設的編輯器."
 
-#: resources.h:423
+#: resources.h:433
 #, c-format
 msgid "The default editor for text files is '%s'."
 msgstr "文字檔案的預設編輯器是 '%s'."
 
-#: ../../locales/../src/interface/filteredit.cpp:147
-#: ../../locales/../src/interface/filteredit.cpp:215
-#: ../../locales/../src/interface/filteredit.cpp:254
+#: ../../locales/../src/interface/filteredit.cpp:149
+#: ../../locales/../src/interface/filteredit.cpp:217
+#: ../../locales/../src/interface/filteredit.cpp:256
 msgid "The entered filter name already exists, please choose a different name."
 msgstr "輸入的篩選器名稱已經存在, 請選擇不同的名稱."
 
 #: ../../locales/../src/interface/settings/optionspage_filetype.cpp:160
 #, c-format
 msgid "The extension '%s' does already exist in the list"
-msgstr "副檔名 '%s' 已存在於列表裡"
+msgstr "副檔名 \"%s\" 已存在於列表裡"
 
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:246
 #: ../../locales/../src/interface/asyncrequestqueue.cpp:253
@@ -6427,48 +6583,48 @@
 "檔案 %s 已存在.\n"
 "請輸入新的名稱:"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2035
-#: ../../locales/../src/interface/LocalListView.cpp:2166
-#: ../../locales/../src/interface/RemoteListView.cpp:2653
+#: ../../locales/../src/interface/LocalListView.cpp:2043
+#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/RemoteListView.cpp:2684
 #, c-format
 msgid ""
 "The file '%s' cannot be opened:\n"
 "The associated program (%s) could not be found.\n"
 "Please check your filetype associations."
 msgstr ""
-"無法開啟檔案 '%s':\n"
+"無法開啟檔案 \"%s\":\n"
 "找不到相關聯的程式 (%s).\n"
-"請檢查您的檔案型態關聯."
+"請檢查您的檔案類型關聯."
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:222
 #, c-format
 msgid "The file '%s' could not be loaded or does not contain a private key."
-msgstr "檔案 '%s' 無法載入或是不包含私鑰."
+msgstr "檔案 \"%s\" 無法載入或是不包含私鑰."
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:61
+#: ../../locales/../src/interface/xmlfunctions.cpp:63
 #, c-format
 msgid "The file '%s' could not be loaded."
 msgstr "無法載入檔案 '%s'."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2029
-#: ../../locales/../src/interface/LocalListView.cpp:2161
-#: ../../locales/../src/interface/RemoteListView.cpp:2647
+#: ../../locales/../src/interface/LocalListView.cpp:2037
+#: ../../locales/../src/interface/LocalListView.cpp:2169
+#: ../../locales/../src/interface/RemoteListView.cpp:2678
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "No program has been associated on your system with this file type."
 msgstr ""
-"無法開啟檔案 '%s':\n"
-"您的系統裡沒有程式關聯到這個檔案型態."
+"無法開啟檔案 \"%s\":\n"
+"您的系統裡沒有程式關聯到這個檔案類型."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2074
-#: ../../locales/../src/interface/LocalListView.cpp:2174
+#: ../../locales/../src/interface/LocalListView.cpp:2082
+#: ../../locales/../src/interface/LocalListView.cpp:2182
 #, c-format
 msgid ""
 "The file '%s' could not be opened:\n"
 "The associated command failed"
 msgstr ""
-"無法開啟檔案 '%s':\n"
+"無法開啟檔案 \"%s\":\n"
 "關聯到的指令失敗"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:268
@@ -6479,7 +6635,7 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into a supported, unprotected format?"
 msgstr ""
-"檔案 '%s' 沒有使用 FileZilla 支援的格式.\n"
+"檔案 \"%s\" 並非為 FileZilla 支援的格式.\n"
 "該檔案也有使用密碼保護. FileZilla 尚未支援有密碼保護的金鑰檔案.\n"
 "您想將其轉換成有支援且無保護的格式嗎?"
 
@@ -6489,7 +6645,7 @@
 "The file '%s' is not in a format supported by FileZilla.\n"
 "Would you like to convert it into a supported format?"
 msgstr ""
-"檔案 '%s' 沒有使用 FileZilla 支援的格式.\n"
+"檔案 \"%s\" 並非為 FileZilla 支援的格式.\n"
 "您想將其轉換成支援的格式?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_sftp.cpp:271
@@ -6499,10 +6655,10 @@
 "supported by FileZilla yet.\n"
 "Would you like to convert it into an unprotected file?"
 msgstr ""
-"檔案 '%s' 有使用密碼保護. FileZilla 尚未支援有密碼保護的金鑰檔案.\n"
+"檔案 \"%s\" 有使用密碼保護. FileZilla 尚未支援有密碼保護的金鑰檔案.\n"
 "您想將其轉換成無保護的格式嗎?"
 
-#: ../../locales/../src/interface/settings/optionspage_edit.cpp:144
+#: ../../locales/../src/interface/settings/optionspage_edit.cpp:150
 msgid "The file selected as default editor does not exist."
 msgstr "選為預設編輯器的檔案不存在."
 
@@ -6536,11 +6692,11 @@
 msgid "The following characters will be replaced: %s"
 msgstr "以下字元會被取代: %s"
 
-#: resources.h:328
+#: resources.h:338
 msgid "The following files are currently being edited:"
 msgstr "正在編輯以下檔案:"
 
-#: resources.h:463
+#: resources.h:473
 msgid "The free open source FTP solution"
 msgstr "自由且開放原始碼的 FTP 解決方案"
 
@@ -6548,7 +6704,7 @@
 msgid "The global bookmarks could not be saved."
 msgstr "無法儲存全域書籤."
 
-#: resources.h:973
+#: resources.h:998
 msgid ""
 "The higher the debug level, the more information will be displayed in the "
 "message log. Displaying debug information has a negative impact on "
@@ -6566,7 +6722,7 @@
 "The local directory '%s' is not below the synchronization root (%s).\n"
 "Disable synchronized browsing and continue changing the local directory?"
 msgstr ""
-"本地目錄 '%s' 並不在同步根目錄 (%s) 之下.\n"
+"本地目錄 \"%s\" 並不在同步根目錄 (%s) 之下.\n"
 "要停用同步瀏覽並繼續變更本地目錄?"
 
 #: ../../locales/../src/interface/settings/optionspage_connection_active.cpp:76
@@ -6575,51 +6731,51 @@
 "port."
 msgstr "最低可用連接埠必須小於或等於最高可用連接埠."
 
-#: ../../locales/../src/interface/updatewizard.cpp:607
+#: ../../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 "已經下載了最近的版本. 請按 Finish 來關閉 FileZilla 啟動安裝程式."
 
-#: ../../locales/../src/interface/updatewizard.cpp:609
+#: ../../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 "已經下載了最近的版本. 請以相同的方式安裝此板本.."
 
-#: ../../locales/../src/interface/QueueView.cpp:1964
+#: ../../locales/../src/interface/QueueView.cpp:1955
 msgid "The queue will not be saved."
 msgstr "不會儲存佇列."
 
-#: ../../locales/../src/interface/state.cpp:1022
+#: ../../locales/../src/interface/state.cpp:1086
 #, 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:84
 msgid "The selected categories have been imported."
 msgstr "已匯入選定的分類目錄."
 
-#: resources.h:298
+#: resources.h:308
 msgid ""
 "The selected file contains importable data for the following categories:"
 msgstr "選定的檔案可匯入以下分類目錄:"
 
-#: resources.h:321
+#: resources.h:331
 msgid "The selected file is already being edited:"
 msgstr "已在編輯所選的檔案:"
 
-#: ../../locales/../src/interface/RemoteListView.cpp:2707
+#: ../../locales/../src/interface/RemoteListView.cpp:2738
 msgid ""
 "The selected file is still opened in some other program, please close it."
 msgstr "所選的檔案仍舊被其它程式開啟, 請關閉它."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2041
-#: ../../locales/../src/interface/RemoteListView.cpp:2659
+#: ../../locales/../src/interface/LocalListView.cpp:2049
+#: ../../locales/../src/interface/RemoteListView.cpp:2690
 msgid ""
 "The selected file would be executed directly.\n"
 "This can be dangerous and damage your system.\n"
@@ -6637,7 +6793,7 @@
 msgid "The server sent an unexpected or unrecognized reply."
 msgstr "伺服器送出了非預期或未認可的回應."
 
-#: resources.h:106
+#: resources.h:115
 msgid "The server uses following charset encoding for filenames:"
 msgstr "此伺服器於檔案名稱使用以下的字集編碼:"
 
@@ -6647,7 +6803,7 @@
 "certificate to make sure the server can be trusted."
 msgstr "這個伺服器的憑證不明. 請留心測試憑證以確保伺服器可以信任."
 
-#: resources.h:187
+#: resources.h:197
 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 "
@@ -6656,7 +6812,7 @@
 "此伺服器的主機金鑰未與快取內的資料相符. 這意味著不是該機器管理者更換了主機金"
 "鑰, 就是您實際嘗試連線到的是偽裝成此伺服器的其它台電腦."
 
-#: resources.h:175
+#: resources.h:185
 msgid ""
 "The server's host key is unknown. You have no guarantee that the server is "
 "the computer you think it is."
@@ -6668,15 +6824,15 @@
 "settings to have effect."
 msgstr "已匯入設定. 您得重新啟動 FileZilla 才能使用新設定."
 
-#: ../../locales/../src/interface/QueueView.cpp:3222
+#: ../../locales/../src/interface/QueueView.cpp:3206
 msgid "The system will soon reboot unless you click Cancel."
 msgstr "除非您按下 Cancel, 否則系統即將會重開機."
 
-#: ../../locales/../src/interface/QueueView.cpp:3220
+#: ../../locales/../src/interface/QueueView.cpp:3204
 msgid "The system will soon shut down unless you click Cancel."
 msgstr "除非您按下 Cancel, 否則系統即將會關機."
 
-#: resources.h:48
+#: resources.h:57
 msgid ""
 "The target file already exists.\n"
 "Please choose an action."
@@ -6684,7 +6840,7 @@
 "目標檔案已存在.\n"
 "請選擇動作."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:846
+#: ../../locales/../src/interface/netconfwizard.cpp:852
 msgid "The test did not succeed. Do you really want to save the settings?"
 msgstr "測試未成功. 您真的要儲存設定嗎?"
 
@@ -6692,11 +6848,11 @@
 msgid "Themes"
 msgstr "佈景主題"
 
-#: ../../locales/../src/interface/filter.cpp:463
+#: ../../locales/../src/interface/filter.cpp:462
 msgid "This filter set cannot be removed."
 msgstr "此篩選集無法移除."
 
-#: ../../locales/../src/interface/filter.cpp:398
+#: ../../locales/../src/interface/filter.cpp:397
 msgid "This filter set cannot be renamed."
 msgstr "此篩選集無法更名."
 
@@ -6706,63 +6862,63 @@
 "FileZilla."
 msgstr "這表示某些路由器或是防火牆依舊干擾 FileZilla."
 
-#: resources.h:693
+#: resources.h:714
 msgid ""
 "This only works if you are not behind a router, else your system would just "
 "return your internal address."
 msgstr ""
 "這只當您不在路由器後方時才能運作, 不然系統可能只回傳您的內部 IP Address."
 
-#: resources.h:671
+#: resources.h:692
 msgid ""
 "This wizard will help you to properly configure any routers and firewalls "
 "you have and tests your configuration."
 msgstr "這個精靈將會幫助您正確地配置您的路由器與防火牆並且測試您的組態."
 
-#: ../../locales/../src/interface/queue.cpp:1223
+#: ../../locales/../src/interface/queue.cpp:1225
 msgid "Time"
 msgstr "時間"
 
-#: resources.h:891
+#: resources.h:912
 msgid "Time formatting"
 msgstr "時間格式"
 
-#: resources.h:732
+#: resources.h:753
 msgid "Time&out in seconds:"
 msgstr "多少秒內逾時:"
 
-#: resources.h:735 ../../locales/../src/interface/QueueView.cpp:1066
-#: ../../locales/../src/interface/QueueView.cpp:1110
+#: resources.h:756 ../../locales/../src/interface/QueueView.cpp:1049
+#: ../../locales/../src/interface/QueueView.cpp:1093
 msgid "Timeout"
 msgstr "逾時時間"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1684
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1079
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1715
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1080
 #, c-format
 msgid ""
 "Timezone offsets: Server: %d seconds. Local: %d seconds. Difference: %d "
 "seconds."
 msgstr "時區偏移量: 伺服器: %d 秒. 本地端: %d 秒. 相差: %d 秒."
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:180
+#: ../../locales/../src/interface/verifycertdialog.cpp:183
 msgid "Title:"
 msgstr "標題:"
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2324
+#: ../../locales/../src/interface/Mainfrm.cpp:2397
 msgid "To compare directories, both file lists have to be aligned."
 msgstr "兩端的檔案列表必須排列整齊才能進行目錄比對."
 
-#: ../../locales/../src/interface/Mainfrm.cpp:2325
+#: ../../locales/../src/interface/Mainfrm.cpp:2398
 msgid "To do this, the directory trees need to be both shown or both hidden."
 msgstr "兩端的樹狀目錄必須同時顯示或隱藏才能執行此動作."
 
-#: resources.h:786
+#: resources.h:807
 msgid ""
 "To support public key authentication, FileZilla needs to know the private "
 "keys to use."
 msgstr "要支援公開金鑰認證, FileZilla 必須知道欲使用的私鑰."
 
-#: resources.h:998
+#: resources.h:1024
 msgid ""
 "Toggle directory comparison. Right-click to change comparison mode.\n"
 "\n"
@@ -6778,7 +6934,7 @@
 "綠: 檔案較另一側未標記的檔案來得新\n"
 "紅: 檔案大小不同"
 
-#: resources.h:1000
+#: resources.h:1026
 msgid ""
 "Toggle synchronized browsing.\n"
 "If enabled, navigating the local directory hierarchy will also change the "
@@ -6787,23 +6943,23 @@
 "切換同步瀏覽.\n"
 "如果啟用同步瀏覽, 在瀏覽本地或遠端的目錄階層時, 對應的另一邊也會跟著改變."
 
-#: resources.h:988 resources.h:989
+#: resources.h:1014 resources.h:1015
 msgid "Toggles processing of the transfer queue"
 msgstr "切換處理傳輸佇列"
 
-#: resources.h:980 resources.h:981
+#: resources.h:1006 resources.h:1007
 msgid "Toggles the display of the local directory tree"
 msgstr "切換顯示本地樹狀目錄"
 
-#: resources.h:978 resources.h:979
+#: resources.h:1004 resources.h:1005
 msgid "Toggles the display of the message log"
 msgstr "切換顯示訊息記錄"
 
-#: resources.h:982 resources.h:983
+#: resources.h:1008 resources.h:1009
 msgid "Toggles the display of the remote directory tree"
 msgstr "切換顯示遠端樹狀目錄"
 
-#: resources.h:984 resources.h:985
+#: resources.h:1010 resources.h:1011
 msgid "Toggles the display of the transfer queue"
 msgstr "切換顯示傳輸佇列"
 
@@ -6816,37 +6972,37 @@
 msgstr "過多的重導"
 
 #: ../../locales/../src/engine/logging.cpp:216
-#: ../../locales/../src/interface/StatusView.cpp:293
-#: ../../locales/../src/interface/StatusView.cpp:354
+#: ../../locales/../src/interface/StatusView.cpp:291
+#: ../../locales/../src/interface/StatusView.cpp:352
 msgid "Trace:"
 msgstr "歷程:"
 
-#: resources.h:921 resources.h:927
+#: resources.h:942 resources.h:948
 msgid "Transfer"
 msgstr "傳輸"
 
-#: resources.h:361
+#: resources.h:371
 msgid "Transfer &direction"
 msgstr "傳輸方向(&D)"
 
-#: resources.h:527
+#: resources.h:544
 msgid "Transfer &type"
 msgstr "傳輸型態(&T)"
 
-#: resources.h:742
+#: resources.h:763
 msgid "Transfer Mode"
 msgstr "傳輸模式"
 
-#: resources.h:877
+#: resources.h:898
 msgid "Transfer Queue"
 msgstr "傳輸佇列"
 
-#: resources.h:98
+#: resources.h:107
 msgid "Transfer Settings"
 msgstr "傳輸設定"
 
-#: ../../locales/../src/engine/transfersocket.cpp:498
-#: ../../locales/../src/engine/transfersocket.cpp:522
+#: ../../locales/../src/engine/transfersocket.cpp:509
+#: ../../locales/../src/engine/transfersocket.cpp:533
 #, c-format
 msgid "Transfer connection interrupted: %s"
 msgstr "傳輸連線中斷: %s"
@@ -6855,8 +7011,8 @@
 msgid "Transferred data got tainted."
 msgstr "傳輸的資料遭受影響."
 
-#: ../../locales/../src/interface/QueueView.cpp:1491
-#: ../../locales/../src/interface/statuslinectrl.cpp:278
+#: ../../locales/../src/interface/QueueView.cpp:1474
+#: ../../locales/../src/interface/statuslinectrl.cpp:283
 msgid "Transferring"
 msgstr "正在傳輸"
 
@@ -6864,69 +7020,69 @@
 msgid "Transfers"
 msgstr "傳輸"
 
-#: ../../locales/../src/interface/QueueView.cpp:3136
-#: ../../locales/../src/interface/QueueView.cpp:3139
+#: ../../locales/../src/interface/QueueView.cpp:3120
+#: ../../locales/../src/interface/QueueView.cpp:3123
 msgid "Transfers finished"
 msgstr "傳輸完成"
 
-#: resources.h:833
+#: resources.h:854
 msgid "Treat files &without extension as ASCII file"
-msgstr "將無副檔名的檔案視作文字檔案(&W)"
+msgstr "將無副檔名的檔案視作文字類檔案(&W)"
 
-#: resources.h:829
+#: resources.h:850
 msgid "Treat the &following filetypes as ASCII files:"
-msgstr "將以下的檔案類別視作文字檔案(&F):"
+msgstr "將以下的檔案類型視作文字類檔案(&F):"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:873
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:874
 msgid "Trust changed Hostkey:"
 msgstr "信任已改變的主機金鑰:"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:871
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:872
 msgid "Trust new Hostkey:"
 msgstr "信任新的主機金鑰:"
 
-#: resources.h:194
+#: resources.h:204
 msgid "Trust the new key and carry on connecting?"
 msgstr "要信任新的金鑰並且繼續連線?"
 
-#: resources.h:22
+#: resources.h:27
 msgid "Trust this certificate and carry on connecting?"
 msgstr "要信任這個憑證並且繼續連線?"
 
-#: resources.h:181
+#: resources.h:191
 msgid "Trust this host and carry on connecting?"
 msgstr "要信任這台主機並且繼續連線?"
 
-#: resources.h:396 ../../locales/../src/interface/edithandler.cpp:1231
+#: resources.h:406 ../../locales/../src/interface/edithandler.cpp:1239
 msgid "Type"
 msgstr "型態"
 
-#: resources.h:768
+#: resources.h:789
 msgid "Type of FTP Proxy:"
 msgstr "FTP Proxy 型態:"
 
-#: resources.h:793
+#: resources.h:814
 msgid "Type of generic proxy:"
 msgstr "通用 Proxy 型態:"
 
-#: resources.h:331
+#: resources.h:341
 msgid "U&pload"
 msgstr "上傳(&P)"
 
-#: resources.h:484 resources.h:813
+#: resources.h:494 resources.h:834
 #, no-c-format
 msgid "U&pload limit:"
 msgstr "上傳限制(&P)"
 
-#: resources.h:939
+#: resources.h:960
 msgid "U&se filetype associations if available"
-msgstr "允許的話使用檔案型態關聯(&S)"
+msgstr "允許的話使用檔案類型關聯(&S)"
 
-#: resources.h:892
+#: resources.h:913
 msgid "U&se system defaults"
 msgstr "使用系統預設值(&S)"
 
-#: resources.h:770
+#: resources.h:791
 msgid "USER@&HOST"
 msgstr "USER@HOST (&H)"
 
@@ -6935,18 +7091,18 @@
 msgid "Unassigned error code %d"
 msgstr "未指定的錯誤碼 %d"
 
-#: ../../locales/../src/interface/verifycertdialog.cpp:179
+#: ../../locales/../src/interface/verifycertdialog.cpp:182
 msgid "Unit:"
 msgstr "單位:"
 
-#: ../../locales/../src/interface/edithandler.cpp:1263
-#: ../../locales/../src/interface/edithandler.cpp:1291
+#: ../../locales/../src/interface/edithandler.cpp:1271
+#: ../../locales/../src/interface/edithandler.cpp:1299
 msgid "Unknown"
 msgstr "未知"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:702
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:709
 msgid "Unknown FTP proxy type, cannot generate login sequence."
-msgstr "未知的 FTP Proxy 型態, 無法產生登入程序."
+msgstr "未知的 FTP Proxy 類型, 無法產生登入程序."
 
 #: ../../locales/../src/engine/proxy.cpp:368
 #, c-format
@@ -6957,13 +7113,13 @@
 msgid "Unknown certificate"
 msgstr "未知的憑證"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:412
+#: ../../locales/../src/interface/xmlfunctions.cpp:414
 msgid ""
 "Unknown error opening the file. Make sure the file can be accessed and is a "
 "well-formed XML document."
 msgstr "未知的開啟檔案錯誤. 請確認可以找到檔案並且內容為滿足格式的 XML 文件."
 
-#: resources.h:174
+#: resources.h:184
 msgid "Unknown host key"
 msgstr "未知的主機金鑰"
 
@@ -6974,7 +7130,7 @@
 "subnegotiation: %d"
 msgstr "未知的 SOCKS 使用者名稱/密碼認證子協議版本: %d"
 
-#: ../../locales/../src/interface/xmlfunctions.cpp:457
+#: ../../locales/../src/interface/xmlfunctions.cpp:459
 msgid ""
 "Unknown root element, the file does not appear to be generated by FileZilla."
 msgstr "未知的根元素, 該檔案似乎不是由 FileZilla 產生的."
@@ -6992,33 +7148,32 @@
 "mode has to be used."
 msgstr "除非這個問題解決了, 否則 FTP 主動模式不會運作並且會轉為使用被動模式."
 
-#: ../../locales/../src/engine/tlssocket.cpp:862
+#: ../../locales/../src/engine/tlssocket.cpp:1079
 msgid "Unsupported certificate type"
-msgstr "未支援的憑證型態"
+msgstr "未支援的憑證類型"
 
 #: ../../locales/../src/engine/httpcontrolsocket.cpp:650
 msgid "Unsupported redirect"
 msgstr "未支援的重導"
 
-#: resources.h:332
+#: resources.h:342
 msgid "Up&load and unedit"
 msgstr "上傳與反編輯(&L)"
 
-#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
-msgid "Update Check"
-msgstr "更新檢查"
-
-#: ../../locales/../src/interface/settings/optionspage_updatecheck.cpp:61
-#: ../../locales/../src/interface/updatewizard.cpp:251
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:259
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid "Update wizard"
 msgstr "更新精靈"
 
-#: resources.h:363
+#: ../../locales/../src/interface/settings/settingsdialog.cpp:137
+msgid "Updates"
+msgstr "更新"
+
+#: resources.h:373
 msgid "Upload"
 msgstr "上傳"
 
-#: ../../locales/../src/interface/edithandler.cpp:1254
+#: ../../locales/../src/interface/edithandler.cpp:1262
 msgid "Upload failed"
 msgstr "上傳失敗"
 
@@ -7031,96 +7186,96 @@
 msgid "Upload limit: none"
 msgstr "上傳限制: 無"
 
-#: resources.h:648
+#: resources.h:669
 msgid "Upload selected directory"
-msgstr "下載選取的目錄"
+msgstr "上傳選取的目錄"
 
-#: resources.h:558
+#: resources.h:575
 msgid "Upload selected files and directories"
 msgstr "上傳選取的檔案與目錄"
 
-#: resources.h:316
+#: resources.h:326
 msgid "Upload this file back to the server?"
-msgstr "上傳檔案回伺服器?"
+msgstr "上傳該檔案回伺服器?"
 
-#: resources.h:315
+#: resources.h:325
 msgid "Upload this file to the server?"
 msgstr "上傳該檔案到伺服器?"
 
-#: ../../locales/../src/interface/edithandler.cpp:1248
-#: ../../locales/../src/interface/edithandler.cpp:1282
-#: ../../locales/../src/interface/edithandler.cpp:1447
+#: ../../locales/../src/interface/edithandler.cpp:1256
+#: ../../locales/../src/interface/edithandler.cpp:1290
+#: ../../locales/../src/interface/edithandler.cpp:1455
 msgid "Uploading"
 msgstr "正在上傳"
 
-#: ../../locales/../src/interface/edithandler.cpp:1251
-#: ../../locales/../src/interface/edithandler.cpp:1449
+#: ../../locales/../src/interface/edithandler.cpp:1259
+#: ../../locales/../src/interface/edithandler.cpp:1457
 msgid "Uploading and pending removal"
 msgstr "上傳與等待移除"
 
-#: ../../locales/../src/interface/edithandler.cpp:1285
-#: ../../locales/../src/interface/edithandler.cpp:1451
+#: ../../locales/../src/interface/edithandler.cpp:1293
+#: ../../locales/../src/interface/edithandler.cpp:1459
 msgid "Uploading and unediting"
 msgstr "上傳與反編輯"
 
-#: resources.h:110
+#: resources.h:119
 msgid "Use &custom charset"
 msgstr "使用自訂字碼集(&C)"
 
-#: resources.h:936
+#: resources.h:957
 msgid "Use &custom editor:"
 msgstr "使用自訂編輯器(&C):"
 
-#: resources.h:422
+#: resources.h:432
 msgid "Use &default editor for text files"
 msgstr "使用文字檔案的預設編輯器(&D)"
 
-#: resources.h:405 resources.h:411
+#: resources.h:415 resources.h:421
 msgid "Use &synchronized browsing"
 msgstr "使用同步瀏覽(&S)"
 
-#: resources.h:108
+#: resources.h:117
 msgid "Use UTF-8 if the server supports it, else use local charset."
 msgstr "如果伺服器支援就使用 UTF-8, 否則就使用本地字碼集."
 
-#: resources.h:258 resources.h:268
+#: resources.h:268 resources.h:278
 msgid "Use default action"
 msgstr "使用預設動作"
 
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:512
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:513
 msgid "Use plain FTP"
 msgstr "使用純粹的 FTP"
 
-#: resources.h:371
+#: resources.h:381
 msgid "Use server currently connected to"
 msgstr "使用目前已連線的伺服器"
 
-#: resources.h:372
+#: resources.h:382
 msgid "Use server from site manager"
 msgstr "使用站台管理員裡的伺服器"
 
-#: resources.h:886
+#: resources.h:907
 msgid "Use system &defaults"
 msgstr "使用系統預設值(&D)"
 
-#: resources.h:694
+#: resources.h:715
 msgid "Use the following IP address:"
 msgstr "使用以下的 IP Address:"
 
-#: resources.h:704
+#: resources.h:725
 msgid "Use the following port range:"
 msgstr "使用以下的連接埠範圍:"
 
-#: resources.h:689
+#: resources.h:710
 msgid "Use the server's external IP address instead"
 msgstr "改為使用伺服器的外部 IP Address"
 
-#: resources.h:695 resources.h:758
+#: resources.h:716 resources.h:779
 msgid ""
 "Use this if you're behind a router and have a static external IP address."
-msgstr "當您位在路由器後方並且有個靜態外部 IP Address 時才用."
+msgstr "當您位在路由器後方並且有個靜態的外部 IP Address 時才用."
 
-#: resources.h:698
+#: resources.h:719
 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 "
@@ -7129,90 +7284,90 @@
 "如果您的是浮動 IP 才用這選項. FileZilla 會在您使用主動模式時於每個連線的第一"
 "回連到上述伺服器."
 
-#: resources.h:122
+#: resources.h:131
 msgid "User:"
 msgstr "使用者:"
 
-#: ../../locales/../src/interface/manual_transfer.cpp:509
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1027
+#: ../../locales/../src/interface/manual_transfer.cpp:518
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
 msgid "Username cannot be a series of spaces"
 msgstr "使用者名稱不能是一串空白"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4387
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:4448
 #, c-format
 msgid "Using proxy %s"
 msgstr "使用 Proxy %s"
 
-#: resources.h:112
+#: resources.h:121
 msgid ""
 "Using the wrong charset can result in filenames not displaying properly."
 msgstr "使用錯誤的字碼集會導致檔名無法正確顯示."
 
-#: resources.h:231
+#: resources.h:241
 msgid "Using this wizard you can check for available updates to FileZilla."
 msgstr "使用這個精靈您可以檢查 FileZilla 可用的更新."
 
-#: resources.h:5 resources.h:29
+#: resources.h:5 resources.h:34
 msgid "Valid from:"
 msgstr "有效從:"
 
-#: resources.h:6 resources.h:30
+#: resources.h:6 resources.h:35
 msgid "Valid to:"
 msgstr "有效至:"
 
-#: ../../locales/../src/interface/cmdline.cpp:16
+#: ../../locales/../src/interface/cmdline.cpp:17
 msgid "Verbose log messages from wxWidgets"
 msgstr "wxWidgiets 的詳細訊息記錄"
 
-#: ../../locales/../src/engine/tlssocket.cpp:1052
+#: ../../locales/../src/engine/tlssocket.cpp:1165
 msgid "Verifying certificate..."
-msgstr "驗證憑證中..."
+msgstr "正在驗證憑證..."
 
-#: resources.h:169
+#: resources.h:179
 msgid "Version:"
 msgstr "版本:"
 
-#: resources.h:818
+#: resources.h:839
 msgid "Very high"
 msgstr "非常高"
 
-#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1420
+#: ../../locales/../src/engine/ftpcontrolsocket.cpp:1448
 msgid "View hidden option set, but unsupported by server"
 msgstr "已經設定了顯示隱藏的選項, 但是伺服器端並未支援"
 
-#: resources.h:923
+#: resources.h:944
 msgid "View/Edit"
 msgstr "檢視/編輯"
 
-#: resources.h:355
+#: resources.h:365
 msgid "Visible columns"
 msgstr "可視欄位"
 
-#: resources.h:140
+#: resources.h:149
 msgid "W&rite"
 msgstr "寫入(&R)"
 
-#: ../../locales/../src/interface/QueueView.cpp:1790
+#: ../../locales/../src/interface/QueueView.cpp:1781
 msgid "Waiting"
-msgstr "等待中"
+msgstr "正在等待"
 
-#: ../../locales/../src/interface/QueueView.cpp:1398
+#: ../../locales/../src/interface/QueueView.cpp:1381
 msgid "Waiting for browsing connection"
-msgstr "等待瀏覽連線"
+msgstr "正在等待瀏覽連線"
 
-#: ../../locales/../src/interface/QueueView.cpp:1441
+#: ../../locales/../src/interface/QueueView.cpp:1424
 msgid "Waiting for password"
-msgstr "等待密碼"
+msgstr "正在等待密碼"
 
-#: ../../locales/../src/interface/statuslinectrl.cpp:272
+#: ../../locales/../src/interface/statuslinectrl.cpp:277
 msgid "Waiting for transfer to be cancelled"
-msgstr "等待傳輸到取消"
+msgstr "正在等待傳輸取消"
 
 #: ../../locales/../src/engine/engineprivate.cpp:203
 msgid "Waiting to retry..."
-msgstr "等待重試中..."
+msgstr "正在等待重試..."
 
-#: ../../locales/../src/interface/FileZilla.cpp:297
+#: ../../locales/../src/interface/FileZilla.cpp:301
 msgid ""
 "Warning!\n"
 "\n"
@@ -7241,11 +7396,11 @@
 "除非您停用 Windows 防火牆或是應用程式層閘道服務,\n"
 "否則 FileZilla 在大型傳輸時將會逾時."
 
-#: ../../locales/../src/interface/netconfwizard.cpp:966
+#: ../../locales/../src/interface/netconfwizard.cpp:972
 msgid "Warning, ignoring data connection from wrong IP."
 msgstr "警告, 忽略來自錯誤 IP Address 的資料連線."
 
-#: ../../locales/../src/interface/updatewizard.cpp:264
+#: ../../locales/../src/interface/updatewizard.cpp:272
 msgid ""
 "Warning, use nightly builds at your own risk.\n"
 "No support is given for nightly builds.\n"
@@ -7259,33 +7414,45 @@
 "\n"
 "您真的要檢查每日組建版?"
 
-#: resources.h:186
+#: resources.h:196
 msgid "Warning: Potential security breach!"
 msgstr "警告: 可能有潛藏的安全性漏洞!"
 
-#: resources.h:475
+#: resources.h:485
 msgid "Welcome to FileZilla"
 msgstr "歡迎使用 FileZilla"
 
-#: resources.h:464
+#: resources.h:474
 msgid "What's new"
-msgstr "新玩意兒"
+msgstr "最新消息"
 
-#: resources.h:241
+#: resources.h:251
 msgid "What's new:"
 msgstr "最新消息:"
 
-#: resources.h:821
+#: resources.h:501
+msgid ""
+"When allowing FileZilla to remember passwords, you can reconnnect without "
+"having to re-enter a password after restarting FileZilla."
+msgstr ""
+"允許 FileZilla 記憶密碼後, 您就無須在往後啟動 FileZilla 再次連線時重新輸入密"
+"碼."
+
+#: resources.h:842
 msgid ""
 "When enabled, characters that are not supported by the local operating "
 "system in filenames are replaced if downloading such a file."
 msgstr "啟用後如果下載檔案, 檔名內不被本地作業系統支援的字元就會被取代."
 
-#: resources.h:863
+#: resources.h:884
 msgid "Widescreen"
 msgstr "寬螢幕"
 
-#: resources.h:144
+#: resources.h:500
+msgid "Would you like FileZilla to remember passwords?"
+msgstr "您想讓 FileZilla 記憶密碼嗎?"
+
+#: resources.h:153
 msgid "Wr&ite"
 msgstr "寫入(&I)"
 
@@ -7298,25 +7465,31 @@
 msgid "Wrong line endings"
 msgstr "錯誤的換行格式"
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:885
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:886
 msgid "Yes"
 msgstr "是"
 
-#: resources.h:252
+#: ../../locales/../src/interface/netconfwizard.cpp:771
+msgid ""
+"You appear to be using an IPv6-only host. This wizard does not support this "
+"environment."
+msgstr "您似乎正使用僅有 IPv6 的主機.此精靈不支援這類環境."
+
+#: resources.h:262
 msgid ""
 "You are already using the most recent version of FileZilla. Please check "
 "again in future."
 msgstr "您已在使用最近版本的 FileZilla. 請於未來再次檢查."
 
-#: resources.h:473
+#: resources.h:483
 msgid "You can always open this dialog again through the help menu."
 msgstr "您總是能透過工具列說明選單開啟這個對話框."
 
-#: ../../locales/../src/engine/server.cpp:63
+#: ../../locales/../src/engine/server.cpp:65
 msgid "You can leave the port field empty to use the default port."
 msgstr "您可以不輸入連接埠欄位來使用預設的連接埠."
 
-#: resources.h:147
+#: resources.h:156
 msgid ""
 "You can use an x at any position to keep the permission the original files "
 "have."
@@ -7336,29 +7509,29 @@
 msgid "You did not enter a new name for the file. Overwrite the file instead?"
 msgstr "您未為這個檔案輸入新的檔名. 是想要覆蓋這個檔案嗎?"
 
-#: resources.h:454
+#: resources.h:464
 msgid "You have selected at least one symbolic link."
 msgstr "您已選擇至少一個軟連結."
 
-#: ../../locales/../src/interface/LocalListView.cpp:2008
-#: ../../locales/../src/interface/RemoteListView.cpp:2626
+#: ../../locales/../src/interface/LocalListView.cpp:2016
+#: ../../locales/../src/interface/RemoteListView.cpp:2657
 msgid ""
 "You have selected more than 10 files for editing, do you really want to "
 "continue?"
 msgstr "您已選擇要編輯十個以上的檔案, 是否真要繼續?"
 
-#: ../../locales/../src/interface/LocalListView.cpp:2128
+#: ../../locales/../src/interface/LocalListView.cpp:2136
 msgid ""
 "You have selected more than 10 files or directories to open, do you really "
 "want to continue?"
 msgstr "您已選擇要開啟十個以上的檔案或目錄, 是否真要繼續?"
 
 #: ../../locales/../src/interface/manual_transfer.cpp:433
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:944
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:945
 msgid "You have to enter a hostname."
 msgstr "您必須輸入主機名稱."
 
-#: ../../locales/../src/interface/search.cpp:817
+#: ../../locales/../src/interface/search.cpp:818
 msgid "You have to enter a local directory."
 msgstr "您必須輸入本地目錄."
 
@@ -7367,17 +7540,17 @@
 msgid "You have to enter a valid IP address."
 msgstr "您必須輸入有效的 IP Address."
 
-#: ../../locales/../src/interface/search.cpp:823
+#: ../../locales/../src/interface/search.cpp:824
 msgid "You have to enter a writable local directory."
 msgstr "您必須輸入可寫入的本地目錄."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:520
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1037
+#: ../../locales/../src/interface/manual_transfer.cpp:529
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1047
 msgid "You have to enter an account name"
 msgstr "您必須輸入帳號名稱."
 
-#: ../../locales/../src/interface/manual_transfer.cpp:490
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1008
+#: ../../locales/../src/interface/manual_transfer.cpp:499
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1018
 msgid "You have to specify a user name"
 msgstr "您必須指定使用者名稱"
 
@@ -7395,34 +7568,34 @@
 msgid "You need to enter a name for the log file."
 msgstr "您必須輸入記錄檔案的名稱."
 
-#: ../../locales/../src/interface/edithandler.cpp:1638
+#: ../../locales/../src/interface/edithandler.cpp:1646
 msgid "You need to enter a properly quoted command."
 msgstr "您必須輸入正確引用的指令."
 
 #: ../../locales/../src/interface/settings/optionspage_ftpproxy.cpp:82
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:70
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:73
 msgid "You need to enter a proxy host."
 msgstr "您必須輸入 Proxy 主機."
 
-#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:75
+#: ../../locales/../src/interface/settings/optionspage_proxy.cpp:82
 msgid "You need to enter a proxy port in the range from 1 to 65535"
 msgstr "您必須輸入 Proxy 連接埠, 範圍在 1 到 65535 之間"
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:76
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:446
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1097
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1107
 msgid "You need to enter at least one path, empty bookmarks are not supported."
-msgstr "您必須輸入最少一個路徑, 不支援空的書籤."
+msgstr "不支援空的書籤, 您必須輸入最少一個路徑."
 
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:83
 #: ../../locales/../src/interface/bookmarks_dialog.cpp:453
-#: ../../locales/../src/interface/sitemanager_dialog.cpp:1106
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1116
 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:1062
+#: ../../locales/../src/interface/sitemanager_dialog.cpp:1072
 msgid ""
 "You need to enter both a local and a remote path to enable synchronized "
 "browsing for this site."
@@ -7450,44 +7623,49 @@
 "should work properly."
 msgstr "您應沒任何連到其他伺服器的問題. 檔案傳輸應該正確運作."
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:125
 msgid "after"
 msgstr "晚於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:122
 msgid "before"
 msgstr "早於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:89
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
 msgid "begins with"
 msgstr "起始於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:87
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:176
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:446
+msgid "bytes"
+msgstr "bytes"
+
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
 msgid "contains"
 msgstr "包含"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:92
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
 msgid "does not contain"
 msgstr "不包含"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:96
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:121
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:124
 msgid "does not equal"
 msgstr "不等於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:90
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:93
 msgid "ends with"
 msgstr "終止於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:95
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:98
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:123
 msgid "equals"
 msgstr "等於"
 
-#: ../../locales/../src/interface/filelistctrl.cpp:497
-#: ../../locales/../src/interface/filelistctrl.cpp:515
-#: ../../locales/../src/interface/filelistctrl.cpp:540
-#: ../../locales/../src/interface/filelistctrl.cpp:556
+#: ../../locales/../src/interface/filelistctrl.cpp:511
+#: ../../locales/../src/interface/filelistctrl.cpp:530
+#: ../../locales/../src/interface/filelistctrl.cpp:555
+#: ../../locales/../src/interface/filelistctrl.cpp:571
 msgid "file"
 msgstr "檔案"
 
@@ -7505,82 +7683,130 @@
 "無法啟動 fzputtygen.\n"
 "請確定該執行檔和 FileZilla 主程式存在同一目錄下."
 
-#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1558
+#: ../../locales/../src/engine/sftpcontrolsocket.cpp:1559
 msgid "fzsftp could not be started"
 msgstr "無法啟動 fzsftp"
 
-#: ../../locales/../src/engine/tlssocket.cpp:900
+#: ../../locales/../src/engine/tlssocket.cpp:1117
 msgid "gnutls_certificate_get_peers returned no certificates"
 msgstr "gnutls_certificate_get_peers 沒有回傳任何憑證"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
 msgid "greater than"
 msgstr "大於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
 msgid "group executable"
 msgstr "群組可執行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
 msgid "group readable"
 msgstr "群組可讀取"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
 msgid "group writeable"
 msgstr "群組可寫入"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:88
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
 msgid "is equal to"
 msgstr "等於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:99
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:102
 msgid "is set"
 msgstr "已設定"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:103
 msgid "is unset"
 msgstr "未設定"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:97
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:100
 msgid "less than"
 msgstr "小於"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:91
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:94
 msgid "matches regex"
 msgstr "比對常規表示法 (regex)"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:111
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:114
 msgid "owner executable"
 msgstr "擁有人可執行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:109
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:112
 msgid "owner readable"
 msgstr "擁有人可讀取"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:110
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:113
 msgid "owner writeable"
 msgstr "擁有人可寫入"
 
+#: ../../locales/../src/engine/tlssocket.cpp:1176
+#: ../../locales/../src/engine/tlssocket.cpp:1187
+#: ../../locales/../src/engine/tlssocket.cpp:1202
 #: ../../locales/../src/interface/sftp_crypt_info_dlg.cpp:29
 msgid "unknown"
 msgstr "未知"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:117
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:120
 msgid "world executable"
 msgstr "全世界都可執行"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:115
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:118
 msgid "world readable"
 msgstr "全世界都可讀取"
 
-#: ../../locales/../src/interface/filter_conditions_dialog.cpp:116
+#: ../../locales/../src/interface/filter_conditions_dialog.cpp:119
 msgid "world writeable"
 msgstr "全世界都可寫入"
 
-#: resources.h:165
+#: resources.h:174
 msgid "wxWidgets:"
 msgstr "wxWidgets:"
 
+#~ msgid "%s (%d.%d KB/s)"
+#~ msgstr "%s (%d.%d KB/s)"
+
+#~ msgid "%s (%d.%d MB/s)"
+#~ msgstr "%s (%d.%d MB/s)"
+
+#~ msgid "%s bytes (%d.%d KB/s)"
+#~ msgstr "%s bytes (%d.%d KB/s)"
+
+#~ msgid "%s bytes (%d.%d MB/s)"
+#~ msgstr "%s bytes (%d.%d MB/s)"
+
+#~ msgid "&Copy"
+#~ msgstr "複製(&C)"
+
+#~ msgid "&Enable automatic update check"
+#~ msgstr "啟用自動更新檢查(&E)"
+
+#~ msgid "&Number of days between update checks:"
+#~ msgstr "更新檢查間隔日數(&N):"
+
+#~ msgid "(At least 7 days)"
+#~ msgstr "(最少 7 日)"
+
+#~ msgid "Automatic update check"
+#~ msgstr "自動更新檢查"
+
+#~ msgid "Check for &beta versions and release candidates"
+#~ msgstr "檢查 Beta 測試版本與正式候選版本的 FileZilla(&B)"
+
+#~ msgid "Cop&y"
+#~ msgstr "複製(&Y)"
+
+#~ msgid "Please enter an update interval of at least 7 days"
+#~ msgstr "請輸入最少 7 日的更新間隔:"
+
+#~ msgid "Privacy policy:"
+#~ msgstr "隱私權政策:"
+
+#~ msgid "&Remember this and all future passwords"
+#~ msgstr "記憶此次與往後所有的密碼(&R)"
+
+#~ msgid "Wrong opState: %d"
+#~ msgstr "錯誤的 opState: %d"
+
 #~ msgid "Duplicate filter name"
 #~ msgstr "重複的篩選器名稱"
 
diff -Nru filezilla-3.5.3/m4/check_cxx0x.m4 filezilla-3.7.3~precise/m4/check_cxx0x.m4
--- filezilla-3.5.3/m4/check_cxx0x.m4	2012-01-08 13:25:38.000000000 +0000
+++ filezilla-3.7.3~precise/m4/check_cxx0x.m4	2012-11-14 04:30:05.000000000 +0000
@@ -1,16 +1,13 @@
 dnl Checks C++0x support, in particular we look for unordered_map
 
-AC_DEFUN([CHECK_CXX0X], [
-
-  AC_LANG_PUSH(C++)
-
-  cxx_has_cxx0x=""
-  if test "X$GCC" = "Xyes"; then
+dnl Internal function, don't call CHECK_CXX_VER_SPECIFIC directly
+AC_DEFUN([CHECK_CXX_VER_SPECIFIC], [
 
-    AC_MSG_CHECKING([whether compiler supports -std=gnu++0x])
+  AC_MSG_CHECKING([whether compiler supports -std=$1])
+  if test "X${cxx_has_cxx0x}" = "X"; then
 
     old_cxxflags="$CXXFLAGS"
-    CXXFLAGS="$CXXFLAGS -std=gnu++0x"
+    CXXFLAGS="$CXXFLAGS -std=$1"
 
     AC_COMPILE_IFELSE([
       AC_LANG_PROGRAM([[
@@ -19,31 +16,28 @@
       ]])
     ], [
       AC_MSG_RESULT([yes])
-      cxx_has_cxx0x="-std=gnu++0x"
+      cxx_has_cxx0x="-std=$1"
     ], [
       AC_MSG_RESULT([no])
       CXXFLAGS="$old_cxxflags"
+    ])
+  else
+    AC_MSG_RESULT([skipped])
+  fi
+])
 
-      AC_MSG_CHECKING([whether compiler supports -std=C++0x])
 
-      old_cxxflags="$CXXFLAGS"
-      CXXFLAGS="$CXXFLAGS -std=c++0x"
+AC_DEFUN([CHECK_CXX0X], [
 
-      AC_COMPILE_IFELSE([
-        AC_LANG_PROGRAM([[
-        ]], [[
-          return 0;
-        ]])
-      ], [
-        AC_MSG_RESULT([yes])
-        cxx_has_cxx0x="-std=c++0x"
-      ], [
-        AC_MSG_RESULT([no])
-        CXXFLAGS="$old_cxxflags"
-      ])
+  AC_LANG_PUSH(C++)
 
-    ])
+  cxx_has_cxx0x=""
+  if test "X$GCC" = "Xyes"; then
 
+    CHECK_CXX_VER_SPECIFIC([gnu++11])
+    CHECK_CXX_VER_SPECIFIC([c++11])
+    CHECK_CXX_VER_SPECIFIC([gnu++0x])
+    CHECK_CXX_VER_SPECIFIC([c++11])
   fi
 
   AC_MSG_CHECKING([for whether we can include <unordered_map>])
diff -Nru filezilla-3.5.3/m4/cppunit.m4 filezilla-3.7.3~precise/m4/cppunit.m4
--- filezilla-3.5.3/m4/cppunit.m4	2010-07-31 03:30:22.000000000 +0000
+++ filezilla-3.7.3~precise/m4/cppunit.m4	2013-04-05 03:30:06.000000000 +0000
@@ -47,13 +47,13 @@
     if test "x${cppunit_major_min}" = "x" ; then
        cppunit_major_min=0
     fi
-    
+
     cppunit_minor_min=`echo $cppunit_version_min | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\2/'`
     if test "x${cppunit_minor_min}" = "x" ; then
        cppunit_minor_min=0
     fi
-    
+
     cppunit_micro_min=`echo $cppunit_version_min | \
            sed 's/\([[0-9]]*\).\([[0-9]]*\).\([[0-9]]*\)/\3/'`
     if test "x${cppunit_micro_min}" = "x" ; then
@@ -77,7 +77,7 @@
   fi
 
   if test "x$no_cppunit" = x ; then
-     ifelse([$2], , :, [$2])     
+     ifelse([$2], , :, [$2])
   else
      CPPUNIT_CFLAGS=""
      CPPUNIT_LIBS=""
@@ -87,6 +87,3 @@
   AC_SUBST(CPPUNIT_CFLAGS)
   AC_SUBST(CPPUNIT_LIBS)
 ])
-
-
-
diff -Nru filezilla-3.5.3/m4/fz_check_tinyxml.m4 filezilla-3.7.3~precise/m4/fz_check_tinyxml.m4
--- filezilla-3.5.3/m4/fz_check_tinyxml.m4	2010-08-14 03:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/m4/fz_check_tinyxml.m4	2013-04-05 03:30:06.000000000 +0000
@@ -96,4 +96,3 @@
 
   AC_SUBST(TINYXML_LIBS)
 ])
-
diff -Nru filezilla-3.5.3/m4/icopyhookw.m4 filezilla-3.7.3~precise/m4/icopyhookw.m4
--- filezilla-3.5.3/m4/icopyhookw.m4	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/m4/icopyhookw.m4	2013-04-05 03:30:06.000000000 +0000
@@ -0,0 +1,25 @@
+dnl Checks whether MinGW headers declare ICopyHookW
+
+AC_DEFUN([FZ_CHECK_ICOPYHOOKW], [
+
+  AC_LANG_PUSH(C)
+
+  AC_MSG_CHECKING([whether MinGW headers declare ICopyHookW])
+  AC_COMPILE_IFELSE([
+    AC_LANG_PROGRAM([[
+        #include <objbase.h>
+        #include <shlobj.h>
+      ]], [[
+    ICopyHookW* foo;
+        return 0;
+      ]])
+    ], [
+      AC_MSG_RESULT([yes])
+      AC_DEFINE([HAVE_ICOPYHOOKW], [1], [Headers delare ICopyHookW])
+    ], [
+      AC_MSG_RESULT([no])
+    ])
+
+
+  AC_LANG_POP(C)
+])
diff -Nru filezilla-3.5.3/m4/pkg.m4 filezilla-3.7.3~precise/m4/pkg.m4
--- filezilla-3.5.3/m4/pkg.m4	2010-07-31 03:30:22.000000000 +0000
+++ filezilla-3.7.3~precise/m4/pkg.m4	2013-04-05 03:30:06.000000000 +0000
@@ -1,5 +1,5 @@
 # pkg.m4 - Macros to locate and utilise pkg-config.            -*- Autoconf -*-
-# 
+#
 # Copyright © 2004 Scott James Remnant <scott@netsplit.com>.
 #
 # This program is free software; you can redistribute it and/or modify
@@ -28,18 +28,18 @@
 m4_pattern_allow([^PKG_CONFIG(_PATH)?$])
 AC_ARG_VAR([PKG_CONFIG], [path to pkg-config utility])dnl
 if test "x$ac_cv_env_PKG_CONFIG_set" != "xset"; then
-	AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
+    AC_PATH_TOOL([PKG_CONFIG], [pkg-config])
 fi
 if test -n "$PKG_CONFIG"; then
-	_pkg_min_version=m4_default([$1], [0.9.0])
-	AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
-	if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
-		AC_MSG_RESULT([yes])
-	else
-		AC_MSG_RESULT([no])
-		PKG_CONFIG=""
-	fi
-		
+    _pkg_min_version=m4_default([$1], [0.9.0])
+    AC_MSG_CHECKING([pkg-config is at least version $_pkg_min_version])
+    if $PKG_CONFIG --atleast-pkgconfig-version $_pkg_min_version; then
+        AC_MSG_RESULT([yes])
+    else
+        AC_MSG_RESULT([no])
+        PKG_CONFIG=""
+    fi
+
 fi[]dnl
 ])# PKG_PROG_PKG_CONFIG
 
@@ -71,7 +71,7 @@
  elif test -n "$PKG_CONFIG"; then
     PKG_CHECK_EXISTS([$3],
                      [pkg_cv_[]$1=`$PKG_CONFIG --[]$2 "$3" 2>/dev/null`],
-		     [pkg_failed=yes])
+                     [pkg_failed=yes])
  else
     pkg_failed=untried
 fi[]dnl
@@ -117,14 +117,14 @@
 if test $pkg_failed = yes; then
         _PKG_SHORT_ERRORS_SUPPORTED
         if test $_pkg_short_errors_supported = yes; then
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
-        else 
-	        $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
+            $1[]_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "$2" 2>&1`
+        else
+            $1[]_PKG_ERRORS=`$PKG_CONFIG --print-errors "$2" 2>&1`
         fi
-	# Put the nasty error message in config.log where it belongs
-	echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
+    # Put the nasty error message in config.log where it belongs
+    echo "$$1[]_PKG_ERRORS" >&AS_MESSAGE_LOG_FD
 
-	ifelse([$4], , [AC_MSG_ERROR(dnl
+    ifelse([$4], , [AC_MSG_ERROR(dnl
 [Package requirements ($2) were not met:
 
 $$1_PKG_ERRORS
@@ -134,10 +134,10 @@
 
 _PKG_TEXT
 ])],
-		[AC_MSG_RESULT([no])
+        [AC_MSG_RESULT([no])
                 $4])
 elif test $pkg_failed = untried; then
-	ifelse([$4], , [AC_MSG_FAILURE(dnl
+    ifelse([$4], , [AC_MSG_FAILURE(dnl
 [The pkg-config script could not be found or is too old.  Make sure it
 is in your PATH or set the PKG_CONFIG environment variable to the full
 path to pkg-config.
@@ -145,11 +145,11 @@
 _PKG_TEXT
 
 To get pkg-config, see <http://pkg-config.freedesktop.org/>.])],
-		[$4])
+        [$4])
 else
-	$1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
-	$1[]_LIBS=$pkg_cv_[]$1[]_LIBS
+    $1[]_CFLAGS=$pkg_cv_[]$1[]_CFLAGS
+    $1[]_LIBS=$pkg_cv_[]$1[]_LIBS
         AC_MSG_RESULT([yes])
-	ifelse([$3], , :, [$3])
+    ifelse([$3], , :, [$3])
 fi[]dnl
 ])# PKG_CHECK_MODULES
diff -Nru filezilla-3.5.3/m4/wxwin.m4 filezilla-3.7.3~precise/m4/wxwin.m4
--- filezilla-3.5.3/m4/wxwin.m4	2010-07-31 03:30:22.000000000 +0000
+++ filezilla-3.7.3~precise/m4/wxwin.m4	2013-04-05 03:30:06.000000000 +0000
@@ -307,7 +307,7 @@
 dnl     if test "x$HAVE_WXRC" != x1; then
 dnl         AC_MSG_ERROR([
 dnl                The wxrc program was not installed or not found.
-dnl     
+dnl
 dnl                Please check the wxWidgets installation.
 dnl         ])
 dnl     fi
@@ -338,13 +338,13 @@
 AC_DEFUN([AM_PATH_WXRC],
 [
   AC_ARG_VAR([WXRC], [Path to wxWidget's wxrc resource compiler])
-    
+
   if test "x$WX_CONFIG_NAME" = x; then
     AC_MSG_ERROR([The wxrc tests must run after wxWidgets test.])
   else
-    
+
     AC_MSG_CHECKING([for wxrc])
-    
+
     if test "x$WXRC" = x ; then
       dnl wx-config --utility is a new addition to wxWidgets:
       _WX_PRIVATE_CHECK_VERSION(2,5,3)
@@ -360,7 +360,7 @@
       AC_MSG_RESULT([$WXRC])
       ifelse([$1], , :, [$1])
     fi
-    
+
     AC_SUBST(WXRC)
   fi
 ])
diff -Nru filezilla-3.5.3/src/FileZilla.sln filezilla-3.7.3~precise/src/FileZilla.sln
--- filezilla-3.5.3/src/FileZilla.sln	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/FileZilla.sln	2013-04-29 03:30:06.000000000 +0000
@@ -1,14 +1,10 @@
-Microsoft Visual Studio Solution File, Format Version 10.00
-# Visual Studio 2008
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcproj", "{AAD2642D-D07A-4415-BB32-D678D89D546F}"
+Microsoft Visual Studio Solution File, Format Version 12.00
+# Visual Studio 2012
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "engine", "engine\engine.vcxproj", "{AAD2642D-D07A-4415-BB32-D678D89D546F}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileZilla", "interface\interface.vcproj", "{760BA430-BB7F-44AB-9542-F8705CAFF92B}"
-	ProjectSection(ProjectDependencies) = postProject
-		{AAD2642D-D07A-4415-BB32-D678D89D546F} = {AAD2642D-D07A-4415-BB32-D678D89D546F}
-		{593A4FB1-1787-4192-BF73-9C43BF8FC142} = {593A4FB1-1787-4192-BF73-9C43BF8FC142}
-	EndProjectSection
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "FileZilla", "interface\interface.vcxproj", "{760BA430-BB7F-44AB-9542-F8705CAFF92B}"
 EndProject
-Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml\tinyxml.vcproj", "{593A4FB1-1787-4192-BF73-9C43BF8FC142}"
+Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "tinyxml", "tinyxml\tinyxml.vcxproj", "{593A4FB1-1787-4192-BF73-9C43BF8FC142}"
 EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -32,4 +28,7 @@
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
 	EndGlobalSection
+	GlobalSection(Performance) = preSolution
+		HasPerformanceSessions = true
+	EndGlobalSection
 EndGlobal
diff -Nru filezilla-3.5.3/src/Makefile.in filezilla-3.7.3~precise/src/Makefile.in
--- filezilla-3.5.3/src/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/src/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -59,6 +77,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
@@ -117,6 +140,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -154,6 +178,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -199,6 +224,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -232,7 +258,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -464,13 +489,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -505,10 +527,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/dbus/Makefile.in filezilla-3.7.3~precise/src/dbus/Makefile.in
--- filezilla-3.5.3/src/dbus/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,6 +19,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,8 +62,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -78,6 +96,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libfzdbus_a_SOURCES)
 DIST_SOURCES = $(libfzdbus_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -104,6 +127,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -141,6 +165,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -186,6 +211,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -219,7 +245,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -294,7 +319,7 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfzdbus.a: $(libfzdbus_a_OBJECTS) $(libfzdbus_a_DEPENDENCIES) 
+libfzdbus.a: $(libfzdbus_a_OBJECTS) $(libfzdbus_a_DEPENDENCIES) $(EXTRA_libfzdbus_a_DEPENDENCIES) 
 	-rm -f libfzdbus.a
 	$(libfzdbus_a_AR) libfzdbus.a $(libfzdbus_a_OBJECTS) $(libfzdbus_a_LIBADD)
 	$(RANLIB) libfzdbus.a
@@ -504,10 +529,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/dbus/desktop_notification.cpp filezilla-3.7.3~precise/src/dbus/desktop_notification.cpp
--- filezilla-3.5.3/src/dbus/desktop_notification.cpp	2011-07-22 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/desktop_notification.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -35,7 +35,7 @@
 	};
 	std::list<struct _notification> m_notifications;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSignal(wxDBusConnectionEvent& event);
 	void OnAsyncReply(wxDBusConnectionEvent& event);
 };
diff -Nru filezilla-3.5.3/src/dbus/desktop_notification.h filezilla-3.7.3~precise/src/dbus/desktop_notification.h
--- filezilla-3.5.3/src/dbus/desktop_notification.h	2011-07-12 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/desktop_notification.h	2012-10-25 03:30:09.000000000 +0000
@@ -20,4 +20,3 @@
 };
 
 #endif //__DESKTOP_NOTIFICATION_H__
-
diff -Nru filezilla-3.5.3/src/dbus/power_management_inhibitor.cpp filezilla-3.7.3~precise/src/dbus/power_management_inhibitor.cpp
--- filezilla-3.5.3/src/dbus/power_management_inhibitor.cpp	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/power_management_inhibitor.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -15,7 +15,7 @@
 private:
 	wxDBusConnection* m_pConnection;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSignal(wxDBusConnectionEvent& event);
 	void OnAsyncReply(wxDBusConnectionEvent& event);
 
@@ -227,7 +227,7 @@
 		m_state = busy;
 		msg->GetUInt(m_cookie);
 		if (m_debug)
-			printf("wxD-Bus: CPowerManagementInhibitor: Request successful, cookie is %d\n", m_cookie);
+			printf("wxD-Bus: CPowerManagementInhibitor: Request successful, cookie is %u\n", m_cookie);
 		if (m_intended_state == idle)
 			RequestIdle();
 		return;
diff -Nru filezilla-3.5.3/src/dbus/session_manager.cpp filezilla-3.7.3~precise/src/dbus/session_manager.cpp
--- filezilla-3.5.3/src/dbus/session_manager.cpp	2010-02-14 21:00:57.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/session_manager.cpp	2012-11-02 04:30:06.000000000 +0000
@@ -86,7 +86,7 @@
 		m_state = register_client;
 
 		char pid[sizeof(unsigned long) * 8 + 10];
-		sprintf(pid, "FileZilla %lu", wxGetProcessId()); 
+		sprintf(pid, "FileZilla %lu", wxGetProcessId());
 		call.AddString(pid);
 		call.AddString(pid); // What's this "startup identifier"?
 
@@ -154,7 +154,7 @@
 			printf("wxD-Bus: Signal from %s, member %s\n", msg->GetPath(), msg->GetMember());
 		return;
 	}
-	
+
 	if (m_client_object_path && !strcmp(path, m_client_object_path))
 	{
 		const char* member = msg->GetMember();
@@ -296,9 +296,9 @@
 	wxCloseEvent evt(query ? wxEVT_QUERY_END_SESSION : wxEVT_END_SESSION);
 	evt.SetCanVeto(veto && *veto);
 
-	if (!pTop->ProcessEvent(evt))
+	if (!pTop->GetEventHandler()->ProcessEvent(evt))
 		return false;
-	
+
 	if (veto)
 		*veto = evt.GetVeto();
 
diff -Nru filezilla-3.5.3/src/dbus/wxdbusconnection.cpp filezilla-3.7.3~precise/src/dbus/wxdbusconnection.cpp
--- filezilla-3.5.3/src/dbus/wxdbusconnection.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/wxdbusconnection.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -55,7 +55,7 @@
 	bool Init();
 	inline void SetExit() { m_exit = true; }
 	inline int GetID() { return m_ID; }
-	
+
 	void Wakeup();
 
 	inline void EnterCriticalSection() { m_critical_section.Enter(); }
@@ -71,7 +71,7 @@
 	int m_wakeup_pipe[2];
 	wxCriticalSection m_critical_section;
 	bool m_thread_holds_lock;
-	
+
 	int m_ID;
 	DBusConnection * m_connection;
 	wxDBusConnection * m_parent;
@@ -119,7 +119,7 @@
 		return false;
 
 	fcntl(m_wakeup_pipe[0], F_SETFL, O_NONBLOCK);
-	
+
 	m_parent_id = pthread_self();
 
 	dbus_connection_set_watch_functions(m_connection, add_watch, remove_watch, toggle_watch, (void *)this, NULL);
@@ -139,16 +139,16 @@
 
 wxThread::ExitCode DBusThread::Entry()
 {
-	while (!m_exit)	{
+	while (!m_exit) {
 
 		EnterCriticalSection();
 
-		while (dbus_connection_get_dispatch_status(m_connection) == DBUS_DISPATCH_DATA_REMAINS) 
+		while (dbus_connection_get_dispatch_status(m_connection) == DBUS_DISPATCH_DATA_REMAINS)
 			dbus_connection_dispatch(m_connection);
 
 		// Prepare list of file descriptors to pull
 		struct pollfd *fd_array = new struct pollfd[bus_watches.size() + 1];
-		
+
 		fd_array[0].fd = m_wakeup_pipe[0];
 		fd_array[0].events = POLLIN;
 
@@ -167,13 +167,12 @@
 					fd_array[nfds].events |= POLLIN;
 				if (flags & DBUS_WATCH_WRITABLE)
 					fd_array[nfds].events |= POLLOUT;
-				++nfds;				
+				++nfds;
 			}
 		}
 		LeaveCriticalSection();
 
-		int res;
-		if ((res = poll(fd_array, nfds, -1)) > 0) {
+		if (poll(fd_array, nfds, -1) > 0) {
 
 			EnterCriticalSection();
 			m_thread_holds_lock = true;
@@ -386,7 +385,7 @@
 {
 	dbus_connection_return_message(m_connection, message);
 }
-	
+
 DBusMessage * wxDBusConnection::PopMessage()
 {
 	return dbus_connection_pop_message(m_connection);
@@ -463,13 +462,13 @@
 {
 	return m_error;
 }
-	
+
 void wxDBusError::Reset()
 {
 	dbus_error_free(&m_error);
 	dbus_error_init(&m_error);
 }
-	
+
 const char * wxDBusError::GetName()
 {
 	return m_error.name;
@@ -479,7 +478,7 @@
 {
 	return m_error.message;
 }
-	
+
 bool wxDBusError::IsSet()
 {
 	return (bool) dbus_error_is_set(&m_error);
diff -Nru filezilla-3.5.3/src/dbus/wxdbusconnection.h filezilla-3.7.3~precise/src/dbus/wxdbusconnection.h
--- filezilla-3.5.3/src/dbus/wxdbusconnection.h	2010-10-01 03:30:15.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/wxdbusconnection.h	2013-06-09 03:30:07.000000000 +0000
@@ -22,7 +22,7 @@
 
 ****************************************************************************/
 
-#ifndef WX_DBUSCONNECTION 
+#ifndef WX_DBUSCONNECTION
 #define WX_DBUSCONNECTION
 
 #include "wx/wx.h"
@@ -48,36 +48,36 @@
 class wxDBusConnectionEvent : public wxNotifyEvent
 {
 public:
-    wxDBusConnectionEvent(wxEventType commandType = wxEVT_NULL,
-      int id = 0, DBusMessage * message = NULL): wxNotifyEvent(commandType, id)
+	wxDBusConnectionEvent(wxEventType commandType = wxEVT_NULL,
+	  int id = 0, DBusMessage * message = NULL): wxNotifyEvent(commandType, id)
 		{m_message = message; };
 
 	wxDBusConnectionEvent(const wxDBusConnectionEvent &event): wxNotifyEvent(event)
 		{m_message = event.m_message;};
 
-    virtual wxEvent *Clone() const
+	virtual wxEvent *Clone() const
 		{return new wxDBusConnectionEvent(*this);};
 
 	DBusMessage * GetMessage()
 		{ return m_message; };
 
-DECLARE_DYNAMIC_CLASS(wxDBusConnectionEvent);
+DECLARE_DYNAMIC_CLASS(wxDBusConnectionEvent)
 private:
 	DBusMessage * m_message;
 };
 
 typedef void (wxEvtHandler::*wxDBusConnectionEventFunction)
-                                        (wxDBusConnectionEvent&);
+										(wxDBusConnectionEvent&);
 /*
-  There are three events declared for the wxDBusConnection object. 
+  There are three events declared for the wxDBusConnection object.
   wxEVT_DBUS_SIGNAL informs the application about any signal that appearrs on the bus.
-  wxEVT_DBUS_NOTIFICATION informs the application about any messages that it 
+  wxEVT_DBUS_NOTIFICATION informs the application about any messages that it
   is has registered to recieve by calling RegisterObjectPath.
   These messages may be either signals or method calls.
   Note that all the messages that raise wxEVT_DBUS_NOTIFICATION also
   raise wxEVT_DBUS_SIGNAL.
   Your app may be uninterested in processing wxEVT_DBUS_SIGNAL, but it is
-  a good practice to process it anyway. Each time the event is called a copy of a D-Bus 
+  a good practice to process it anyway. Each time the event is called a copy of a D-Bus
   message is allocated for it.
   This copy should be freed in the event's handler. There are two ways to do it.
   the two following handlers do nothing else but release a copy of D-BUS message:
@@ -92,7 +92,7 @@
 
 void MainFrame::OnSignal(wxDBusConnectionEvent& event)
 {
-	dbus_message_unref(event.GetMessage()); // here we call a low level D-Bus function to release the message. 
+	dbus_message_unref(event.GetMessage()); // here we call a low level D-Bus function to release the message.
 }
 
   The wxEVT_DBUS_ASYNC_RESPONSE event is raised when a response to an asynchronous
diff -Nru filezilla-3.5.3/src/dbus/wxdbusmessage.cpp filezilla-3.7.3~precise/src/dbus/wxdbusmessage.cpp
--- filezilla-3.5.3/src/dbus/wxdbusmessage.cpp	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/wxdbusmessage.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -29,7 +29,7 @@
 wxDBusMessage::wxDBusMessage(DBusMessage * message)
 {
 	m_message = message;
-	m_get_iter_initialized = false;	
+	m_get_iter_initialized = false;
 	m_add_iter_initialized = false;
 }
 
@@ -94,7 +94,7 @@
 	}
 	return (bool) dbus_message_iter_next(&m_iter);
 }
-	
+
 int wxDBusMessage::GetAgrType()
 {
 	if (!m_get_iter_initialized)
@@ -136,7 +136,7 @@
 {
 	return dbus_message_iter_get_element_type(&m_iter);
 }
-	
+
 /*
 int wxDBusMessage::GetArrayLength()
 {
@@ -197,7 +197,7 @@
 {
 	init_add_iter();
 	DBusMessageIter sub;
-	dbus_message_iter_open_container(&m_iter, DBUS_TYPE_ARRAY, 
+	dbus_message_iter_open_container(&m_iter, DBUS_TYPE_ARRAY,
 		DBUS_DICT_ENTRY_BEGIN_CHAR_AS_STRING DBUS_TYPE_STRING_AS_STRING DBUS_TYPE_VARIANT_AS_STRING DBUS_DICT_ENTRY_END_CHAR_AS_STRING,
 		&sub);
 	for (int i = 0; i < n_elements; i += 2)
@@ -271,7 +271,7 @@
 	return connection->SendWithReply(GetMessage(), timeout);
 }
 
-wxDBusSignal::wxDBusSignal(const char *path, const char *interface, const char *name) : 
+wxDBusSignal::wxDBusSignal(const char *path, const char *interface, const char *name) :
 	wxDBusMessage(dbus_message_new_signal(path, interface, name))
 {
 }
diff -Nru filezilla-3.5.3/src/dbus/wxdbusmessage.h filezilla-3.7.3~precise/src/dbus/wxdbusmessage.h
--- filezilla-3.5.3/src/dbus/wxdbusmessage.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/dbus/wxdbusmessage.h	2012-10-06 03:30:12.000000000 +0000
@@ -60,7 +60,7 @@
 	bool AddObjectPath(const char* value);
 	bool AddDict(const char** value, int n_elements); // Call with null to add empty dictionary. n_elements needs to be divisible by 2
 	bool Send(wxDBusConnection * connection, unsigned int * serial);
-	
+
 private:
 	DBusMessage * m_message;
 	DBusMessageIter m_iter;
diff -Nru filezilla-3.5.3/src/engine/ControlSocket.cpp filezilla-3.7.3~precise/src/engine/ControlSocket.cpp
--- filezilla-3.5.3/src/engine/ControlSocket.cpp	2011-08-15 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ControlSocket.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -30,7 +30,7 @@
 BEGIN_EVENT_TABLE(CControlSocket, wxEvtHandler)
 	EVT_TIMER(wxID_ANY, CControlSocket::OnTimer)
 	EVT_COMMAND(wxID_ANY, fzOBTAINLOCK, CControlSocket::OnObtainLock)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 COpData::COpData(enum Command op_Id)
 	: opId(op_Id)
@@ -103,7 +103,7 @@
 		wxString time = wxString::Format(
 			wxPLURAL("%d second", "%d seconds", elapsed),
 			elapsed);
-		
+
 		wxLongLong transferred = m_pTransferStatus->currentOffset - m_pTransferStatus->startOffset;
 		wxString size = CSizeFormatBase::Format(m_pEngine->GetOptions(), transferred, true);
 
@@ -405,7 +405,10 @@
 				reply = _T("");
 		}
 		else
+		{
 			reply = reply.Mid(pos1 + 1, pos2 - pos1 - 1);
+			reply.Replace(_T("\"\""), _T("\""));
+		}
 	}
 
 	m_CurrentPath.SetType(m_pCurrentServer->GetType());
@@ -515,7 +518,7 @@
 
 CFileTransferOpData::CFileTransferOpData(bool is_download, const wxString& local_file, const wxString& remote_file, const CServerPath& remote_path) :
 	COpData(cmd_transfer),
- 	localFile(local_file), remoteFile(remote_file), remotePath(remote_path),
+	localFile(local_file), remoteFile(remote_file), remotePath(remote_path),
 	download(is_download),
 	localFileSize(-1), remoteFileSize(-1),
 	tryAbsolutePath(false), resume(false), transferInitiated(false)
@@ -757,7 +760,7 @@
 		wxASSERT(own->reason == reason);
 	}
 
-	// Needs to be set in any case so that ResetOperation 
+	// Needs to be set in any case so that ResetOperation
 	// unlocks or cancels the lock wait
 	m_pCurOpData->holdsLock = true;
 
@@ -1031,17 +1034,17 @@
 	case CSocketEvent::hostaddress:
 		{
 			const wxString& address = event.GetData();
-			LogMessage(Status, _("Connecting to %s..."), address.c_str()); 
+			LogMessage(Status, _("Connecting to %s..."), address.c_str());
 		}
 		break;
 	case CSocketEvent::connection_next:
 		if (event.GetError())
-			LogMessage(Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(event.GetError()).c_str()); 
+			LogMessage(Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(event.GetError()).c_str());
 		break;
 	case CSocketEvent::connection:
 		if (event.GetError())
 		{
-			LogMessage(Status, _("Connection attempt failed with \"%s\"."), CSocket::GetErrorDescription(event.GetError()).c_str()); 
+			LogMessage(Status, _("Connection attempt failed with \"%s\"."), CSocket::GetErrorDescription(event.GetError()).c_str());
 			OnClose(event.GetError());
 		}
 		else
@@ -1141,7 +1144,10 @@
 	SetWait(true);
 
 	if (server.GetEncodingType() == ENCODING_CUSTOM)
+	{
+		LogMessage(Debug_Info, _T("Using custom encoding: %s"), server.GetCustomEncoding().c_str());
 		m_pCSConv = new wxCSConv(server.GetCustomEncoding());
+	}
 
 	delete m_pCurrentServer;
 	m_pCurrentServer = new CServer(server);
@@ -1438,3 +1444,45 @@
 	n->dir = last_successful;
 	m_pEngine->AddNotification(n);
 }
+
+int CControlSocket::List(CServerPath, wxString, int)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::FileTransfer(const wxString, const CServerPath &,
+					const wxString &, bool,
+					const CFileTransferCommand::t_transferSettings&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::RawCommand(const wxString&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::Delete(const CServerPath&, const std::list<wxString>&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::RemoveDir(const CServerPath&, const wxString&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::Mkdir(const CServerPath&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::Rename(const CRenameCommand&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
+
+int CControlSocket::Chmod(const CChmodCommand&)
+{
+	return FZ_REPLY_NOTSUPPORTED;
+}
\ No newline at end of file
diff -Nru filezilla-3.5.3/src/engine/ControlSocket.h filezilla-3.7.3~precise/src/engine/ControlSocket.h
--- filezilla-3.5.3/src/engine/ControlSocket.h	2010-02-13 22:51:47.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ControlSocket.h	2013-06-18 20:02:25.000000000 +0000
@@ -102,7 +102,7 @@
 	none,
 	successful,
 	timeout,
-	transfer_failure,					// Error during transfer, like lost connection. Retry automatcally
+	transfer_failure,					// Error during transfer, like lost connection. Retry automatically
 	transfer_failure_critical,			// Error during transfer like lack of diskspace. Needs user interaction
 	pre_transfer_command_failure,		// If a command fails prior to sending the transfer command
 	transfer_command_failure_immediate,	// Used if server does not send the 150 reply after the transfer command
@@ -121,23 +121,23 @@
 	virtual int Connect(const CServer &server) = 0;
 	virtual int Disconnect();
 	virtual void Cancel();
-	virtual int List(CServerPath path = CServerPath(), wxString subDir = _T(""), int flags = 0) { return FZ_REPLY_NOTSUPPORTED; }
+	virtual int List(CServerPath path = CServerPath(), wxString subDir = _T(""), int flags = 0);
 	virtual int FileTransfer(const wxString localFile, const CServerPath &remotePath,
 							 const wxString &remoteFile, bool download,
-							 const CFileTransferCommand::t_transferSettings& transferSettings) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int RawCommand(const wxString& command = _T("")) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int Delete(const CServerPath& path, const std::list<wxString>& files) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int RemoveDir(const CServerPath& path = CServerPath(), const wxString& subDir = _T("")) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int Mkdir(const CServerPath& path) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int Rename(const CRenameCommand& command) { return FZ_REPLY_NOTSUPPORTED; }
-	virtual int Chmod(const CChmodCommand& command) { return FZ_REPLY_NOTSUPPORTED; }
+							 const CFileTransferCommand::t_transferSettings& transferSettings);
+	virtual int RawCommand(const wxString& command = _T(""));
+	virtual int Delete(const CServerPath& path, const std::list<wxString>& files);
+	virtual int RemoveDir(const CServerPath& path = CServerPath(), const wxString& subDir = _T(""));
+	virtual int Mkdir(const CServerPath& path);
+	virtual int Rename(const CRenameCommand& command);
+	virtual int Chmod(const CChmodCommand& command);
 	virtual bool Connected() = 0;
 
 	// If m_pCurrentOpData is zero, this function returns the current command
 	// from the engine.
 	enum Command GetCurrentCommandId() const;
 
-	virtual void TransferEnd() { }
+	virtual void TransferEnd() {}
 
 	void SendAsyncRequest(CAsyncRequestNotification* pNotification);
 	virtual bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification) = 0;
@@ -161,10 +161,10 @@
 	// ---
 	// The following two functions control the timeout behaviour:
 	// ---
-    
+
 	// Call this if data could be sent or retrieved
 	void SetAlive();
-	
+
 	// Set to true if waiting for data
 	void SetWait(bool waiting);
 
@@ -187,7 +187,7 @@
 
 	// Called by ResetOperation if there's a queued operation
 	virtual int ParseSubcommandResult(int prevResult);
-	
+
 	wxString ConvertDomainName(wxString domain);
 
 	int CheckOverwriteFile();
@@ -202,10 +202,10 @@
 	CServer *m_pCurrentServer;
 
 	CServerPath m_CurrentPath;
-	
+
 	CTransferStatus *m_pTransferStatus;
 	int m_transferStatusSendState;
-	
+
 	wxCSConv *m_pCSConv;
 	bool m_useUTF8;
 
@@ -269,7 +269,7 @@
 
 	bool m_invalidateCurrentPath;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTimer(wxTimerEvent& event);
 	void OnObtainLock(wxCommandEvent& event);
 };
@@ -295,7 +295,7 @@
 	virtual void OnReceive();
 	virtual void OnSend();
 	virtual void OnClose(int error);
-	
+
 	virtual bool Send(const char *buffer, int len);
 
 	CSocket* m_pSocket;
diff -Nru filezilla-3.5.3/src/engine/FileZillaEngine.cpp filezilla-3.7.3~precise/src/engine/FileZillaEngine.cpp
--- filezilla-3.5.3/src/engine/FileZillaEngine.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/FileZillaEngine.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -78,13 +78,13 @@
 		ResetOperation(res);
 
 	m_bIsInCommand = false;
-	
+
 	if (command.GetId() != cmd_disconnect)
 		res |= m_nControlSocketError;
 	else if (res & FZ_REPLY_DISCONNECTED)
 		res = FZ_REPLY_OK;
 	m_nControlSocketError = 0;
-	
+
 	return res;
 }
 
@@ -108,13 +108,13 @@
 		if (m_NotificationList.empty())
 			return 0;
 
-		m_NotificationList.push_back(0);
+		m_NotificationList.push_back(static_cast<CNotification*>(0));
 	}
 	else if (m_NotificationList.empty())
 		return 0;
 	CNotification* pNotification = m_NotificationList.front();
 	m_NotificationList.pop_front();
-		
+
 	return pNotification;
 }
 
diff -Nru filezilla-3.5.3/src/engine/Makefile.am filezilla-3.7.3~precise/src/engine/Makefile.am
--- filezilla-3.5.3/src/engine/Makefile.am	2011-11-08 20:33:10.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/Makefile.am	2012-11-26 04:30:06.000000000 +0000
@@ -29,6 +29,7 @@
 		pathcache.cpp \
 		proxy.cpp \
 		ratelimiter.cpp \
+		rtt.cpp \
 		server.cpp serverpath.cpp\
 		servercapabilities.cpp \
 		sftpcontrolsocket.cpp \
@@ -51,6 +52,7 @@
 		pathcache.h \
 		proxy.h \
 		ratelimiter.h \
+		rtt.h \
 		servercapabilities.h \
 		sftpcontrolsocket.h \
 		tlssocket.h \
diff -Nru filezilla-3.5.3/src/engine/Makefile.in filezilla-3.7.3~precise/src/engine/Makefile.in
--- filezilla-3.5.3/src/engine/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -20,6 +20,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -46,8 +63,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -75,8 +93,8 @@
 	libengine_a-misc.$(OBJEXT) libengine_a-notification.$(OBJEXT) \
 	libengine_a-option_change_event_handler.$(OBJEXT) \
 	libengine_a-pathcache.$(OBJEXT) libengine_a-proxy.$(OBJEXT) \
-	libengine_a-ratelimiter.$(OBJEXT) libengine_a-server.$(OBJEXT) \
-	libengine_a-serverpath.$(OBJEXT) \
+	libengine_a-ratelimiter.$(OBJEXT) libengine_a-rtt.$(OBJEXT) \
+	libengine_a-server.$(OBJEXT) libengine_a-serverpath.$(OBJEXT) \
 	libengine_a-servercapabilities.$(OBJEXT) \
 	libengine_a-sftpcontrolsocket.$(OBJEXT) \
 	libengine_a-sizeformatting_base.$(OBJEXT) \
@@ -101,6 +119,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libengine_a_SOURCES)
 DIST_SOURCES = $(libengine_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -128,6 +151,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -165,6 +189,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -210,6 +235,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -243,7 +269,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -289,6 +314,7 @@
 		pathcache.cpp \
 		proxy.cpp \
 		ratelimiter.cpp \
+		rtt.cpp \
 		server.cpp serverpath.cpp\
 		servercapabilities.cpp \
 		sftpcontrolsocket.cpp \
@@ -311,6 +337,7 @@
 		pathcache.h \
 		proxy.h \
 		ratelimiter.h \
+		rtt.h \
 		servercapabilities.h \
 		sftpcontrolsocket.h \
 		tlssocket.h \
@@ -357,7 +384,7 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libengine.a: $(libengine_a_OBJECTS) $(libengine_a_DEPENDENCIES) 
+libengine.a: $(libengine_a_OBJECTS) $(libengine_a_DEPENDENCIES) $(EXTRA_libengine_a_DEPENDENCIES) 
 	-rm -f libengine.a
 	$(libengine_a_AR) libengine.a $(libengine_a_OBJECTS) $(libengine_a_LIBADD)
 	$(RANLIB) libengine.a
@@ -389,6 +416,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-pathcache.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-proxy.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-ratelimiter.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-rtt.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-server.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-servercapabilities.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/libengine_a-serverpath.Po@am__quote@
@@ -716,6 +744,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-ratelimiter.obj `if test -f 'ratelimiter.cpp'; then $(CYGPATH_W) 'ratelimiter.cpp'; else $(CYGPATH_W) '$(srcdir)/ratelimiter.cpp'; fi`
 
+libengine_a-rtt.o: rtt.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.o -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libengine_a-rtt.Tpo $(DEPDIR)/libengine_a-rtt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='rtt.cpp' object='libengine_a-rtt.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.o `test -f 'rtt.cpp' || echo '$(srcdir)/'`rtt.cpp
+
+libengine_a-rtt.obj: rtt.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-rtt.obj -MD -MP -MF $(DEPDIR)/libengine_a-rtt.Tpo -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libengine_a-rtt.Tpo $(DEPDIR)/libengine_a-rtt.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='rtt.cpp' object='libengine_a-rtt.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -c -o libengine_a-rtt.obj `if test -f 'rtt.cpp'; then $(CYGPATH_W) 'rtt.cpp'; else $(CYGPATH_W) '$(srcdir)/rtt.cpp'; fi`
+
 libengine_a-server.o: server.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(libengine_a_CPPFLAGS) $(CPPFLAGS) $(libengine_a_CXXFLAGS) $(CXXFLAGS) -MT libengine_a-server.o -MD -MP -MF $(DEPDIR)/libengine_a-server.Tpo -c -o libengine_a-server.o `test -f 'server.cpp' || echo '$(srcdir)/'`server.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/libengine_a-server.Tpo $(DEPDIR)/libengine_a-server.Po
@@ -974,10 +1016,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/engine/backend.cpp filezilla-3.7.3~precise/src/engine/backend.cpp
--- filezilla-3.5.3/src/engine/backend.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/backend.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -39,7 +39,7 @@
 		len = max.GetLo();
 
 	int written = m_pSocket->Write(buffer, len, error);
-	
+
 	if (written > 0 && max != -1)
 		UpdateUsage(CRateLimiter::outbound, written);
 
@@ -78,6 +78,6 @@
 		evt = new CSocketEvent(m_pEvtHandler, this, CSocketEvent::write);
 	else
 		evt = new CSocketEvent(m_pEvtHandler, this, CSocketEvent::read);
-	
+
 	CSocketEventDispatcher::Get().SendEvent(evt);
 }
diff -Nru filezilla-3.5.3/src/engine/directorycache.cpp filezilla-3.7.3~precise/src/engine/directorycache.cpp
--- filezilla-3.5.3/src/engine/directorycache.cpp	2011-01-01 04:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/directorycache.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -53,7 +53,7 @@
 	if (Lookup(cit, sit, listing.path, true, unused))
 	{
 		cit->modificationTime = CTimeEx::Now();
-		
+
 		m_totalFileCount -= cit->listing.GetCount();
 		cit->listing = listing;
 
@@ -161,7 +161,7 @@
 		matchedCase = false;
 		return true;
 	}
-			
+
 	return false;
 }
 
@@ -351,7 +351,7 @@
 			{
 				m_leastRecentlyUsedList.erase(*lruIt);
 				delete lruIt;
-			}	
+			}
 
 			m_totalFileCount -= cit->listing.GetCount();
 		}
@@ -515,7 +515,7 @@
 	{
 		m_leastRecentlyUsedList.erase(*lruIt);
 		*lruIt = m_leastRecentlyUsedList.insert(m_leastRecentlyUsedList.end(), std::make_pair(sit, cit));
-	}		
+	}
 	else
 		cit->lruIt = (void*)new tLruList::iterator(m_leastRecentlyUsedList.insert(m_leastRecentlyUsedList.end(), std::make_pair(sit, cit)));
 }
diff -Nru filezilla-3.5.3/src/engine/directorycache.h filezilla-3.7.3~precise/src/engine/directorycache.h
--- filezilla-3.5.3/src/engine/directorycache.h	2010-07-26 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/directorycache.h	2012-10-25 03:30:08.000000000 +0000
@@ -40,7 +40,7 @@
 	void InvalidateServer(const CServer& server);
 	void RemoveDir(const CServer& server, const CServerPath& path, const wxString& filename, const CServerPath& target);
 	void Rename(const CServer& server, const CServerPath& pathFrom, const wxString& fileFrom, const CServerPath& pathTo, const wxString& fileTo);
-	
+
 protected:
 
 	class CCacheEntry
@@ -68,7 +68,7 @@
 
 	tServerIter CreateServerEntry(const CServer& server);
 	tServerIter GetServerEntry(const CServer& server);
-	
+
 	typedef std::list<CCacheEntry>::iterator tCacheIter;
 	typedef std::list<CCacheEntry>::const_iterator tCacheConstIter;
 
@@ -81,7 +81,7 @@
 	void UpdateLru(tServerIter const& sit, tCacheIter const& cit);
 
 	void Prune();
-	
+
 	typedef std::pair<tServerIter, tCacheIter> tFullEntryPosition;
 	typedef std::list<tFullEntryPosition> tLruList;
 	static tLruList m_leastRecentlyUsedList;
@@ -90,4 +90,3 @@
 };
 
 #endif
-
diff -Nru filezilla-3.5.3/src/engine/directorylisting.cpp filezilla-3.7.3~precise/src/engine/directorylisting.cpp
--- filezilla-3.5.3/src/engine/directorylisting.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/directorylisting.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -86,13 +86,13 @@
 
 	if (flags != op.flags)
 		return false;
-	
+
 	if (flags & flag_timestamp_date)
 	{
 		if (time != op.time)
 			return false;
 	}
-	
+
 	return true;
 }
 
@@ -116,7 +116,7 @@
 	}
 
 	m_entries.Get().resize(count);
-	
+
 	m_entryCount = count;
 }
 
@@ -141,11 +141,11 @@
 	std::vector<CRefcountObject<CDirentry> >& own_entries = m_entries.Get();
 	own_entries.clear();
 	own_entries.reserve(m_entryCount);
-	
+
 	m_hasDirs = false;
 	m_has_perms = false;
 	m_has_usergroup = false;
-	
+
 	for (std::list<CDirentry>::const_iterator iter = entries.begin(); iter != entries.end(); ++iter)
 	{
 		if (iter->is_dir())
diff -Nru filezilla-3.5.3/src/engine/directorylistingparser.cpp filezilla-3.7.3~precise/src/engine/directorylistingparser.cpp
--- filezilla-3.5.3/src/engine/directorylistingparser.cpp	2011-08-28 20:36:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/directorylistingparser.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -447,14 +447,16 @@
 	wxChar* m_pLine;
 };
 
-CDirectoryListingParser::CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server)
-	: m_pControlSocket(pControlSocket), m_server(server)
+CDirectoryListingParser::CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding)
+	: m_pControlSocket(pControlSocket)
+	, m_currentOffset(0)
+	, m_totalData()
+	, m_prevLine(0)
+	, m_server(server)
+	, m_fileListOnly(true)
+	, m_maybeMultilineVms(false)
+	, m_listingEncoding(encoding)
 {
-	m_currentOffset = 0;
-	m_prevLine = 0;
-	m_fileListOnly = true;
-	m_maybeMultilineVms = false;
-
 	if (m_MonthNamesMap.empty())
 	{
 		//Fill the month names map
@@ -514,7 +516,7 @@
 
 		//French month names
 		m_MonthNamesMap[_T("janv")] = 1;
-		m_MonthNamesMap[_T("f\xe9")_T("b")] = 1;
+		m_MonthNamesMap[_T("f\xe9") _T("b")] = 1;
 		m_MonthNamesMap[_T("f\xe9v")] = 2;
 		m_MonthNamesMap[_T("fev")] = 2;
 		m_MonthNamesMap[_T("f\xe9vr")] = 2;
@@ -528,7 +530,7 @@
 		m_MonthNamesMap[_T("ao\xfb")] = 8;
 		m_MonthNamesMap[_T("ao\xfbt")] = 8;
 		m_MonthNamesMap[_T("aout")] = 8;
-		m_MonthNamesMap[_T("d\xe9")_T("c")] = 12;
+		m_MonthNamesMap[_T("d\xe9") _T("c")] = 12;
 		m_MonthNamesMap[_T("dec")] = 12;
 
 		//Italian month names
@@ -628,6 +630,9 @@
 		m_MonthNamesMap[_T("lap")] = 11;
 		m_MonthNamesMap[_T("grd")] = 12;
 
+		// Hungarian
+		m_MonthNamesMap[_T("szept")] = 9;
+
 		//There are more languages and thus month
 		//names, but as long as nobody reports a
 		//problem, I won't add them, there are way
@@ -688,6 +693,8 @@
 
 bool CDirectoryListingParser::ParseData(bool partial)
 {
+	DeduceEncoding();
+
 	bool error = false;
 	CLine *pLine = GetLine(partial, error);
 	while (pLine)
@@ -1193,7 +1200,7 @@
 			int fileDayOfYear = (month - 1) * 31 + day;
 
 			// We have to compare with an offset of one. In the worst case,
-			// the server's timezone might be up to 24 hours ahead of the 
+			// the server's timezone might be up to 24 hours ahead of the
 			// client.
 			// Problem: Servers which do send the time but not the year even
 			// one day away from getting 1 year old. This is far more uncommon
@@ -1680,7 +1687,7 @@
 	// Current token is either size or date
 	bool gotSize = false;
 	pos = token.Find('/');
-	
+
 	if (!pos)
 		return false;
 
@@ -1838,7 +1845,7 @@
 		entry.name.RemoveLast();
 		entry.flags |= CDirentry::flag_dir;
 	}
-	
+
 	if (entry.has_time())
 		entry.time.Add(m_timezoneOffset);
 
@@ -2025,11 +2032,17 @@
 
 bool CDirectoryListingParser::AddData(char *pData, int len)
 {
+	ConvertEncoding( pData, len );
+
 	t_list item;
 	item.p = pData;
 	item.len = len;
 
 	m_DataList.push_back(item);
+	m_totalData += len;
+
+	if (m_totalData < 512)
+		return true;
 
 	return ParseData(true);
 }
@@ -2132,7 +2145,7 @@
 		char *res = new char[reslen + 1];
 		res[reslen] = 0;
 
-		int	respos = 0;
+		int respos = 0;
 
 		// Copy line data
 		std::list<t_list>::iterator i = m_DataList.begin();
@@ -2534,7 +2547,7 @@
 	entry.ownerGroup = _T("");
 	entry.permissions = _T("");
 	entry.size = -1;
-	
+
 	if (pLine->GetToken(index++, token))
 		return false;
 
@@ -3006,8 +3019,99 @@
 		if (iter == m_MonthNamesMap.end())
 			return false;
 	}
-	
+
 	month = iter->second;
-	
+
 	return true;
 }
+
+char ebcdic_table[256] = {
+	' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // 0
+	' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '\n', // 1
+	' ',  ' ',  ' ',  ' ',  ' ',  '\n', ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // 2
+	' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // 3
+	' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '.',  '<',  '(',  '+',  '|',  // 4
+	'&',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '!',  '$',  '*',  ')',  ';',  ' ',  // 5
+	'-',  '/',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '|',  ',',  '%',  '_',  '>',  '?',  // 6
+	' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '`',  ':',  '#',  '@',  '\'', '=',  '"',  // 7
+	' ',  'a',  'b',  'c',  'd',  'e',  'f',  'g',  'h',  'i',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // 8
+	' ',  'j',  'k',  'l',  'm',  'n',  'o',  'p',  'q',  'r',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // 9
+	' ',  '~',  's',  't',  'u',  'v',  'w',  'x',  'y',  'z',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // a
+	'^',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  '[',  ']',  ' ',  ' ',  ' ',  ' ',  // b
+	'{',  'A',  'B',  'C',  'D',  'E',  'F',  'G',  'H',  'I',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // c
+	'}',  'J',  'K',  'L',  'M',  'N',  'O',  'P',  'Q',  'R',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // d
+	'\\', ' ',  'S',  'T',  'U',  'V',  'W',  'X',  'Y',  'Z',  ' ',  ' ',  ' ',  ' ',  ' ',  ' ',  // e
+	'0',  '1',  '2',  '3',  '4',  '5',  '6',  '7',  '8',  '9',  ' ',  ' ',  ' ',  ' ',  ' ',  ' '   // f
+};
+
+void CDirectoryListingParser::ConvertEncoding(char *pData, int len)
+{
+	if (m_listingEncoding != listingEncoding::ebcdic)
+		return;
+
+	for (int i = 0; i < len; ++i)
+	{
+		pData[i] = ebcdic_table[static_cast<unsigned char>(pData[i])];
+	}
+}
+
+void CDirectoryListingParser::DeduceEncoding()
+{
+	if (m_listingEncoding != listingEncoding::unknown)
+		return;
+
+	int count[256];
+
+	memset(&count, 0, sizeof(int)*256);
+
+	for (std::list<t_list>::const_iterator it = m_DataList.begin(); it != m_DataList.end(); ++it)
+	{
+		for (int i = 0; i < it->len; ++i)
+			++count[static_cast<unsigned char>(it->p[i])];
+	}
+
+	int count_normal = 0;
+	int count_ebcdic = 0;
+	for (int i = '0'; i <= '9'; ++i ) {
+		count_normal += count[i];
+	}
+	for (int i = 'a'; i <= 'Z'; ++i ) {
+		count_normal += count[i];
+	}
+	for (int i = 'A'; i <= 'Z'; ++i ) {
+		count_normal += count[i];
+	}
+
+	for (int i = 0x81; i <= 0x89; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0x91; i <= 0x99; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0xa2; i <= 0xa9; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0xc1; i <= 0x89; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0xd1; i <= 0x99; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0xe2; i <= 0xa9; ++i ) {
+		count_ebcdic += count[i];
+	}
+	for (int i = 0xf0; i <= 0xf9; ++i ) {
+		count_ebcdic += count[i];
+	}
+
+
+	if ((count[0x1f] || count[0x25]) && !count[0x0a] && count['@'] && count['@'] > count[' '] && count_ebcdic > count_normal)
+	{
+		m_pControlSocket->LogMessage(::Status, _("Received a directory listing which appears to be encoded in EBCDIC."));
+		m_listingEncoding = listingEncoding::ebcdic;
+		for (std::list<t_list>::iterator it = m_DataList.begin(); it != m_DataList.end(); ++it)
+			ConvertEncoding(it->p, it->len);
+	}
+	else
+		m_listingEncoding = listingEncoding::normal;
+}
diff -Nru filezilla-3.5.3/src/engine/directorylistingparser.h filezilla-3.7.3~precise/src/engine/directorylistingparser.h
--- filezilla-3.5.3/src/engine/directorylistingparser.h	2010-07-18 03:30:15.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/directorylistingparser.h	2012-10-06 03:30:12.000000000 +0000
@@ -4,7 +4,7 @@
 /* This class is responsible for parsing the directory listings returned by
  * the server.
  * Unfortunatly, RFC959 did not specify the format of directory listings, so
- * each server uses its own format. In addition to that, in most cases the 
+ * each server uses its own format. In addition to that, in most cases the
  * listings were not designed to be machine-parsable, they were meant to be
  * human readable by users of that particular server.
  * By far the most common format is the one returned by the Unix "ls -l"
@@ -17,8 +17,8 @@
  * Some servers send multiline listings where a single entry can span two
  * lines, this has to be detected as well, as far as possible.
  *
- * Some servers send MVS style listings which can consist of just the 
- * filename without any additional data. In order to prevent problems, this 
+ * Some servers send MVS style listings which can consist of just the
+ * filename without any additional data. In order to prevent problems, this
  * format is only parsed if the server is in fact recognizes as MVS server.
  *
  * Please see tests/dirparsertest.cpp for a list of supported formats and the
@@ -35,10 +35,22 @@
 class CLine;
 class CToken;
 class CControlSocket;
+
+namespace listingEncoding
+{
+	enum type
+	{
+		unknown,
+		normal,
+		ebcdic
+	};
+}
+
+
 class CDirectoryListingParser
 {
 public:
-	CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server);
+	CDirectoryListingParser(CControlSocket* pControlSocket, const CServer& server, listingEncoding::type encoding = listingEncoding::unknown);
 	~CDirectoryListingParser();
 
 	CDirectoryListing Parse(const CServerPath &path);
@@ -73,7 +85,7 @@
 	bool ParseAsIBM_MVS_Tape(CLine *pLine, CDirentry &entry);
 	int ParseAsMlsd(CLine *pLine, CDirentry &entry);
 	bool ParseAsOS9(CLine *pLine, CDirentry &entry);
-	
+
 	// Only call this if servertype set to ZVM since it conflicts
 	// with other formats.
 	bool ParseAsZVM(CLine *pLine, CDirentry &entry);
@@ -92,10 +104,13 @@
 
 	bool GetMonthFromName(const wxString& name, int &month);
 
+	void DeduceEncoding();
+	void ConvertEncoding(char *pData, int len);
+
 	CControlSocket* m_pControlSocket;
 
 	static std::map<wxString, int> m_MonthNamesMap;
-	
+
 	struct t_list
 	{
 		char *p;
@@ -105,6 +120,7 @@
 
 	std::list<t_list> m_DataList;
 	std::list<CDirentry> m_entryList;
+	wxLongLong m_totalData;
 
 	CLine *m_prevLine;
 
@@ -112,10 +128,12 @@
 
 	bool m_fileListOnly;
 	std::list<wxString> m_fileList;
-	
+
 	bool m_maybeMultilineVms;
 
 	wxTimeSpan m_timezoneOffset;
+
+	listingEncoding::type m_listingEncoding;
 };
 
 #endif
diff -Nru filezilla-3.5.3/src/engine/engineprivate.cpp filezilla-3.7.3~precise/src/engine/engineprivate.cpp
--- filezilla-3.5.3/src/engine/engineprivate.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/engineprivate.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -22,11 +22,11 @@
 typedef void (wxEvtHandler::*fzEngineEventFunction)(wxFzEngineEvent&);
 
 #define EVT_FZ_ENGINE_NOTIFICATION(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        fzEVT_ENGINE_NOTIFICATION, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( fzEngineEventFunction, &fn ), \
-        (wxObject *) NULL \
-    ),
+	DECLARE_EVENT_TABLE_ENTRY(             \
+		fzEVT_ENGINE_NOTIFICATION, id, -1, \
+		(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( fzEngineEventFunction, &fn ), \
+		(wxObject *) NULL                  \
+	),
 
 std::list<CFileZillaEnginePrivate*> CFileZillaEnginePrivate::m_engineList;
 int CFileZillaEnginePrivate::m_activeStatus[2] = {0, 0};
@@ -49,7 +49,7 @@
 BEGIN_EVENT_TABLE(CFileZillaEnginePrivate, wxEvtHandler)
 	EVT_FZ_ENGINE_NOTIFICATION(wxID_ANY, CFileZillaEnginePrivate::OnEngineEvent)
 	EVT_TIMER(wxID_ANY, CFileZillaEnginePrivate::OnTimer)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CFileZillaEnginePrivate::CFileZillaEnginePrivate()
 	: m_retryTimer(this)
@@ -171,7 +171,7 @@
 int CFileZillaEnginePrivate::ResetOperation(int nErrorCode)
 {
 	m_pLogging->LogMessage(Debug_Debug, _T("CFileZillaEnginePrivate::ResetOperation(%d)"), nErrorCode);
-					
+
 	if (nErrorCode & FZ_REPLY_DISCONNECTED)
 		m_lastListDir.Clear();
 
@@ -185,8 +185,8 @@
 
 		if (m_pCurrentCommand->GetId() == cmd_connect)
 		{
-			if (!(nErrorCode & ~(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_TIMEOUT | FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED)) && 
-				nErrorCode & (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED))				
+			if (!(nErrorCode & ~(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED | FZ_REPLY_TIMEOUT | FZ_REPLY_CRITICALERROR | FZ_REPLY_PASSWORDFAILED)) &&
+				nErrorCode & (FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED))
 			{
 				const CConnectCommand *pConnectCommand = (CConnectCommand *)m_pCurrentCommand;
 
@@ -280,7 +280,7 @@
 		if (protocol != UNKNOWN && protocol != command.GetServer().GetProtocol())
 			m_pLogging->LogMessage(Status, _("Selected port usually in use by a different protocol."));
 	}
-	
+
 	return ContinueConnect();
 }
 
@@ -311,7 +311,7 @@
 
 		delete m_pControlSocket;
 		m_pControlSocket = 0;
-		
+
 		delete m_pCurrentCommand;
 		m_pCurrentCommand = 0;
 
@@ -500,7 +500,7 @@
 void CFileZillaEnginePrivate::SendDirectoryListingNotification(const CServerPath& path, bool onList, bool modified, bool failed)
 {
 	wxASSERT(m_pControlSocket);
-	
+
 	const CServer* const pOwnServer = m_pControlSocket->GetCurrentServer();
 	wxASSERT(pOwnServer);
 
@@ -517,11 +517,11 @@
 	}
 
 	CDirectoryCache cache;
-	
+
 	CTimeEx changeTime;
 	if (!cache.GetChangeTime(changeTime, *pOwnServer, path))
 		return;
-	
+
 	CDirectoryListingNotification *pNotification = new CDirectoryListingNotification(path, !onList);
 	AddNotification(pNotification);
 	m_lastListTime = changeTime;
@@ -546,7 +546,7 @@
 
 		if (pEngine->m_lastListTime.GetTime().IsValid() && changeTime <= pEngine->m_lastListTime)
 			continue;
-		
+
 		pEngine->m_lastListTime = changeTime;
 		CDirectoryListingNotification *pNotification = new CDirectoryListingNotification(path, true);
 		pEngine->AddNotification(pNotification);
diff -Nru filezilla-3.5.3/src/engine/externalipresolver.cpp filezilla-3.7.3~precise/src/engine/externalipresolver.cpp
--- filezilla-3.5.3/src/engine/externalipresolver.cpp	2010-09-14 03:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/externalipresolver.cpp	2012-10-28 04:30:04.000000000 +0000
@@ -21,15 +21,16 @@
 bool CExternalIPResolver::m_checked = false;
 
 CExternalIPResolver::CExternalIPResolver(wxEvtHandler* handler, int id /*=wxID_ANY*/)
-	: m_handler(handler), m_id(id)
+	: m_port(80)
+	, m_handler(handler)
+	, m_id(id)
+	, m_done(false)
+	, m_pSocket(0)
+	, m_pSendBuffer(0)
+	, m_sendBufferPos(0)
+	, m_pRecvBuffer(0)
+	, m_recvBufferPos(0)
 {
-	m_pSocket = 0;
-	m_done = false;
-	m_pSendBuffer = 0;
-	m_sendBufferPos = 0;
-	m_pRecvBuffer = 0;
-	m_recvBufferPos = 0;
-
 	ResetHttpData(true);
 }
 
@@ -257,7 +258,7 @@
 	// We do just the neccessary parsing and silently ignore most header fields
 	// Redirects are supported though if the server sends the Location field.
 
-	while (true)
+	for (;;)
 	{
 		// Find line ending
 		unsigned int i = 0;
@@ -469,7 +470,7 @@
 	char* p = m_pRecvBuffer;
 	unsigned int len = m_recvBufferPos;
 
-	while (true)
+	for (;;)
 	{
 		if (m_chunkData.size != 0)
 		{
@@ -480,7 +481,7 @@
 			if (!m_pRecvBuffer)
 				return;
 
-            m_chunkData.size -= dataLen;
+			m_chunkData.size -= dataLen;
 			p += dataLen;
 			len -= dataLen;
 
diff -Nru filezilla-3.5.3/src/engine/ftpcontrolsocket.cpp filezilla-3.7.3~precise/src/engine/ftpcontrolsocket.cpp
--- filezilla-3.5.3/src/engine/ftpcontrolsocket.cpp	2011-03-20 21:56:40.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ftpcontrolsocket.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -38,7 +38,7 @@
 BEGIN_EVENT_TABLE(CFtpControlSocket, CRealControlSocket)
 EVT_FZ_EXTERNALIPRESOLVE(wxID_ANY, CFtpControlSocket::OnExternalIPAddress)
 EVT_TIMER(wxID_ANY, CFtpControlSocket::OnIdleTimer)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CRawTransferOpData::CRawTransferOpData()
 	: COpData(cmd_rawtransfer)
@@ -167,7 +167,7 @@
 	{
 	}
 
-	virtual ~CFtpDeleteOpData() { }
+	virtual ~CFtpDeleteOpData() {}
 
 	CServerPath path;
 	std::list<wxString> files;
@@ -200,10 +200,16 @@
 	// Enable SO_KEEPALIVE, lots of clueless users have broken routers and
 	// firewalls which terminate the control connection on long transfers.
 	m_pSocket->SetFlags(CSocket::flag_nodelay | CSocket::flag_keepalive);
+
+	// The GUI and file operations can easily block our thread. But the socket has an
+	// internal thread. Register read callback to get timely update to rtt.
+	m_pSocket->SetSynchronousReadCallback(&m_rtt);
 }
 
 CFtpControlSocket::~CFtpControlSocket()
 {
+	m_pSocket->SetSynchronousReadCallback(0);
+
 	DoClose();
 
 	m_idleTimer.Stop();
@@ -213,7 +219,7 @@
 {
 	LogMessage(Debug_Verbose, _T("CFtpControlSocket::OnReceive()"));
 
-	while (true)
+	for (;;)
 	{
 		int error;
 		int read = m_pBackend->Read(m_receiveBuffer + m_bufferLen, RECVBUFFERSIZE - m_bufferLen, error);
@@ -278,6 +284,7 @@
 
 void CFtpControlSocket::ParseLine(wxString line)
 {
+	m_rtt.Stop();
 	LogMessageRaw(Response, line);
 	SetAlive();
 
@@ -745,7 +752,7 @@
 		{
 			if (pData->opState == LOGON_AUTH_SSL)
 			{
-				if (m_pCurrentServer->GetProtocol() == FTP) 
+				if (m_pCurrentServer->GetProtocol() == FTP)
 				{
 					// For now. In future make TLS mandatory unless explicitly requested INSECURE_FTP as protocol
 					LogMessage(Status, _("Insecure server, it does not support FTP over TLS."));
@@ -910,7 +917,10 @@
 
 		const enum CharsetEncoding encoding = m_pCurrentServer->GetEncodingType();
 		if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != yes)
+		{
+			LogMessage(Status, _("Server does not support non-ASCII characters."));
 			m_useUTF8 = false;
+		}
 	}
 	else if (pData->opState == LOGON_PROT)
 	{
@@ -924,7 +934,7 @@
 			return SendNextCommand();
 	}
 
-	while (true)
+	for (;;)
 	{
 		++pData->opState;
 
@@ -932,6 +942,7 @@
 		{
 			LogMessage(Status, _("Connected"));
 			ResetOperation(FZ_REPLY_OK);
+			LogMessage(Debug_Info, _T("Measured latency of %d ms"), m_rtt.GetLatency());
 			return true;
 		}
 
@@ -967,6 +978,12 @@
 			enum capabilities cap = CServerCapabilities::GetCapability(*GetCurrentServer(), feat_command);
 			if (cap == unknown)
 				break;
+			const enum CharsetEncoding encoding = m_pCurrentServer->GetEncodingType();
+			if (encoding == ENCODING_AUTO && CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) != yes)
+			{
+				LogMessage(Status, _("Server does not support non-ASCII characters."));
+				m_useUTF8 = false;
+			}
 		}
 		else if (pData->opState == LOGON_CLNT)
 		{
@@ -1005,7 +1022,7 @@
 					int delim = facts.Find(';');
 					if (delim == -1)
 						break;
-						
+
 					if (!delim)
 					{
 						facts = facts.Mid(1);
@@ -1086,10 +1103,10 @@
 		LogMessage(Debug_Info, _T("LogonSend() called during LOGON_AUTH_WAIT, ignoring"));
 		break;
 	case LOGON_AUTH_TLS:
-		res = Send(_T("AUTH TLS"));
+		res = Send(_T("AUTH TLS"), false, false);
 		break;
 	case LOGON_AUTH_SSL:
-		res = Send(_T("AUTH SSL"));
+		res = Send(_T("AUTH SSL"), false, false);
 		break;
 	case LOGON_SYST:
 		res = Send(_T("SYST"));
@@ -1213,7 +1230,7 @@
 	return m_Response[0] - '0';
 }
 
-bool CFtpControlSocket::Send(wxString str, bool maskArgs /*=false*/)
+bool CFtpControlSocket::Send(wxString str, bool maskArgs, bool measureRTT)
 {
 	int pos;
 	if (maskArgs && (pos = str.Find(_T(" "))) != -1)
@@ -1235,6 +1252,10 @@
 	bool res = CRealControlSocket::Send(buffer, len);
 	if (res)
 		++m_pendingReplies;
+
+	if (measureRTT)
+		m_rtt.Start();
+
 	return res;
 }
 
@@ -1398,7 +1419,14 @@
 
 		delete m_pTransferSocket;
 		m_pTransferSocket = new CTransferSocket(m_pEngine, this, ::list);
-		pData->m_pDirectoryListingParser = new CDirectoryListingParser(this, *m_pCurrentServer);
+
+		// Assume that a server supporting UTF-8 does not send EBCDIC listings.
+		listingEncoding::type encoding = listingEncoding::unknown;
+		if (CServerCapabilities::GetCapability(*m_pCurrentServer, utf8_command) == yes)
+			encoding = listingEncoding::normal;
+
+		pData->m_pDirectoryListingParser = new CDirectoryListingParser(this, *m_pCurrentServer, encoding);
+
 		pData->m_pDirectoryListingParser->SetTimezoneOffset(GetTimezoneOffset());
 		m_pTransferSocket->m_pDirectoryListingParser = pData->m_pDirectoryListingParser;
 
@@ -1571,6 +1599,7 @@
 	}
 	else
 	{
+		LogMessage(__TFILE__, __LINE__, this, Debug_Warning, _T("Wrong opState: %d"), pData->opState);
 		ResetOperation(FZ_REPLY_INTERNALERROR);
 		return FZ_REPLY_ERROR;
 	}
@@ -1616,6 +1645,8 @@
 			return FZ_REPLY_OK;
 		}
 
+		pData->opState = list_waitcwd;
+
 		return ListSubcommandResult(FZ_REPLY_OK);
 	}
 	if (pData->opState == list_mdtm)
@@ -3009,7 +3040,7 @@
 
 	CRawCommandOpData *pData = static_cast<CRawCommandOpData *>(m_pCurOpData);
 
-	if (!Send(pData->m_command))
+	if (!Send(pData->m_command, false, false))
 		return FZ_REPLY_ERROR;
 
 	return FZ_REPLY_WOULDBLOCK;
@@ -3162,7 +3193,7 @@
 	{
 	}
 
-	virtual ~CFtpRemoveDirOpData() { }
+	virtual ~CFtpRemoveDirOpData() {}
 
 	CServerPath path;
 	CServerPath fullPath;
@@ -3506,7 +3537,7 @@
 		m_useAbsolute = false;
 	}
 
-	virtual ~CFtpRenameOpData() { }
+	virtual ~CFtpRenameOpData() {}
 
 	CRenameCommand m_cmd;
 	bool m_useAbsolute;
@@ -3659,7 +3690,7 @@
 		m_useAbsolute = false;
 	}
 
-	virtual ~CFtpChmodOpData() { }
+	virtual ~CFtpChmodOpData() {}
 
 	CChmodCommand m_cmd;
 	bool m_useAbsolute;
@@ -3801,7 +3832,7 @@
 	if (!number.ToULong(&port))
 		 return false;
 
-	if (port <= 0 || port > 65535)
+	if (port == 0 || port > 65535)
 	   return false;
 
 	pData->port = port;
@@ -3865,7 +3896,7 @@
 		// Always use server address
 		pData->host = peerIP;
 	}
-		
+
 
 	return true;
 }
@@ -4041,7 +4072,7 @@
 	switch (pData->opState)
 	{
 	case rawtransfer_type:
-		if (code != 2 && code != 2)
+		if (code != 2 && code != 3)
 			error = true;
 		else
 		{
@@ -4190,6 +4221,7 @@
 	LogMessage(Debug_Debug, _T("  state = %d"), pData->opState);
 
 	wxString cmd;
+	bool measureRTT = false;
 	switch (pData->opState)
 	{
 	case rawtransfer_type:
@@ -4198,6 +4230,7 @@
 			cmd = _T("TYPE I");
 		else
 			cmd = _T("TYPE A");
+		measureRTT = true;
 		break;
 	case rawtransfer_port_pasv:
 		if (pData->bPasv)
@@ -4248,6 +4281,7 @@
 		cmd = _T("REST ") + pData->pOldData->resumeOffset.ToString();
 		if (pData->pOldData->resumeOffset > 0)
 			m_sentRestartOffset = true;
+		measureRTT = true;
 		break;
 	case rawtransfer_transfer:
 		if (pData->bPasv)
@@ -4277,7 +4311,7 @@
 		return FZ_REPLY_ERROR;
 	}
 	if (cmd != _T(""))
-		if (!Send(cmd))
+		if (!Send(cmd, false, measureRTT))
 			return FZ_REPLY_ERROR;
 
 	return FZ_REPLY_WOULDBLOCK;
@@ -4365,7 +4399,34 @@
 		(pData->ftp_proxy_type = m_pEngine->GetOptions()->GetOptionVal(OPTION_FTP_PROXY_TYPE)) && !server.GetBypassProxy())
 	{
 		pData->host = m_pEngine->GetOptions()->GetOption(OPTION_FTP_PROXY_HOST);
-		int pos = pData->host.Find(':');
+
+		int pos = -1;
+		if (pData->host[0] == '[')
+		{
+			// Probably IPv6 address
+			pos = pData->host.Find(']');
+			if (pos == -1)
+			{
+				LogMessage(::Error, _("Proxy host starts with '[' but no closing bracket found."));
+				DoClose(FZ_REPLY_CRITICALERROR);
+				return FZ_REPLY_ERROR;
+			}
+			if (pData->host[pos + 1])
+			{
+				if (pData->host[pos + 1] != ':')
+				{
+					LogMessage(::Error, _("Invalid proxy host, after closing bracket only colon and port may follow."));
+					DoClose(FZ_REPLY_CRITICALERROR);
+					return FZ_REPLY_ERROR;
+				}
+				++pos;
+			}
+			else
+				pos = -1;
+		}
+		else
+			pos = pData->host.Find(':');
+
 		if (pos != -1)
 		{
 			unsigned long port = 0;
diff -Nru filezilla-3.5.3/src/engine/ftpcontrolsocket.h filezilla-3.7.3~precise/src/engine/ftpcontrolsocket.h
--- filezilla-3.5.3/src/engine/ftpcontrolsocket.h	2010-02-13 22:51:47.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ftpcontrolsocket.h	2013-06-09 03:30:07.000000000 +0000
@@ -4,6 +4,7 @@
 #include "logging_private.h"
 #include "ControlSocket.h"
 #include "externalipresolver.h"
+#include "rtt.h"
 
 #define RECVBUFFERSIZE 4096
 #define MAXLINELEN 2000
@@ -12,6 +13,7 @@
 class CFtpTransferOpData;
 class CRawTransferOpData;
 class CTlsSocket;
+
 class CFtpControlSocket : public CRealControlSocket
 {
 	friend class CTransferSocket;
@@ -81,7 +83,7 @@
 	virtual void OnConnect();
 	virtual void OnReceive();
 
-	virtual bool Send(wxString str, bool maskArgs = false);
+	virtual bool Send(wxString str, bool maskArgs = false, bool measureRTT = true);
 
 	// Parse the latest reply line from the server
 	void ParseLine(wxString line);
@@ -147,7 +149,9 @@
 
 	wxTimer m_idleTimer;
 
-	DECLARE_EVENT_TABLE();
+	CLatencyMeasurement m_rtt;
+
+	DECLARE_EVENT_TABLE()
 	void OnExternalIPAddress(fzExternalIPResolveEvent& event);
 	void OnIdleTimer(wxTimerEvent& event);
 };
diff -Nru filezilla-3.5.3/src/engine/httpcontrolsocket.cpp filezilla-3.7.3~precise/src/engine/httpcontrolsocket.cpp
--- filezilla-3.5.3/src/engine/httpcontrolsocket.cpp	2010-02-14 21:00:56.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/httpcontrolsocket.cpp	2012-11-02 04:30:06.000000000 +0000
@@ -297,7 +297,7 @@
 	wxASSERT(GetCurrentCommandId() == cmd_connect);
 
 	CHttpConnectOpData *pData = static_cast<CHttpConnectOpData *>(m_pCurOpData);
-	
+
 	if (pData->tls)
 	{
 		if (!m_pTlsSocket)
@@ -460,9 +460,9 @@
 	if (pData->m_newLocation == _T(""))
 	{
 		if (m_pCurrentServer->GetProtocol() == HTTPS)
-			location = _T("https://") + m_pCurrentServer->FormatHost() + pData->remotePath.FormatFilename(pData->remoteFile).c_str();
+			location = _T("https://") + wxString(m_pCurrentServer->FormatHost()) + wxString(pData->remotePath.FormatFilename(pData->remoteFile).c_str());
 		else
-			location = _T("http://") + m_pCurrentServer->FormatHost() + pData->remotePath.FormatFilename(pData->remoteFile).c_str();
+			location = _T("http://") + wxString(m_pCurrentServer->FormatHost()) + wxString(pData->remotePath.FormatFilename(pData->remoteFile).c_str());
 		hostWithPort = wxString::Format(_T("%s:%d"), m_pCurrentServer->FormatHost(true).c_str(), m_pCurrentServer->GetPort());
 	}
 	else
@@ -522,7 +522,7 @@
 
 	if (res && res != EINPROGRESS)
 		return ResetOperation(FZ_REPLY_ERROR);
-	
+
 	return FZ_REPLY_WOULDBLOCK;
 }
 
@@ -580,7 +580,7 @@
 	// We do just the neccessary parsing and silently ignore most header fields
 	// Redirects are supported though if the server sends the Location field.
 
-	while (true)
+	for (;;)
 	{
 		// Find line ending
 		unsigned int i = 0;
@@ -793,7 +793,7 @@
 	char* p = m_pRecvBuffer;
 	unsigned int len = m_recvBufferPos;
 
-	while (true)
+	for (;;)
 	{
 		if (pData->m_chunkData.size != 0)
 		{
@@ -805,7 +805,7 @@
 			if (res != FZ_REPLY_WOULDBLOCK)
 				return res;
 
-            pData->m_chunkData.size -= dataLen;
+			pData->m_chunkData.size -= dataLen;
 			p += dataLen;
 			len -= dataLen;
 
@@ -954,7 +954,7 @@
 		ResetOperation(FZ_REPLY_ERROR | FZ_REPLY_DISCONNECTED);
 		return;
 	}
-	
+
 	if (DoReceive() == FZ_REPLY_REDIRECTED)
 		return; // Socket got closed already
 
diff -Nru filezilla-3.5.3/src/engine/httpcontrolsocket.h filezilla-3.7.3~precise/src/engine/httpcontrolsocket.h
--- filezilla-3.5.3/src/engine/httpcontrolsocket.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/httpcontrolsocket.h	2012-10-06 03:30:12.000000000 +0000
@@ -35,7 +35,7 @@
 	virtual int Disconnect();
 
 	virtual int ResetOperation(int nErrorCode);
-	
+
 	virtual void ResetHttpData(CHttpOpData* pData);
 
 	int ParseHeader(CHttpOpData* pData);
diff -Nru filezilla-3.5.3/src/engine/iothread.cpp filezilla-3.7.3~precise/src/engine/iothread.cpp
--- filezilla-3.5.3/src/engine/iothread.cpp	2010-12-29 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/iothread.cpp	2012-10-25 03:30:08.000000000 +0000
@@ -142,7 +142,7 @@
 		}
 		m_mutex.Unlock();
 
-		while (true)
+		for (;;)
 		{
 			m_mutex.Lock();
 			while (m_curThreadBuf == m_curAppBuf)
diff -Nru filezilla-3.5.3/src/engine/iothread.h filezilla-3.7.3~precise/src/engine/iothread.h
--- filezilla-3.5.3/src/engine/iothread.h	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/iothread.h	2012-10-06 03:30:12.000000000 +0000
@@ -18,11 +18,11 @@
 
 extern const wxEventType fzEVT_IOTHREAD;
 #define EVT_IOTHREAD(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        fzEVT_IOTHREAD, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( CIOThreadEventFunction, &fn ), \
-        (wxObject *) NULL \
-    ),
+	DECLARE_EVENT_TABLE_ENTRY(  \
+		fzEVT_IOTHREAD, id, -1, \
+		(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( CIOThreadEventFunction, &fn ), \
+		(wxObject *) NULL       \
+	),
 
 enum IORet
 {
diff -Nru filezilla-3.5.3/src/engine/local_filesys.cpp filezilla-3.7.3~precise/src/engine/local_filesys.cpp
--- filezilla-3.5.3/src/engine/local_filesys.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/local_filesys.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -15,16 +15,17 @@
 #endif
 
 CLocalFileSystem::CLocalFileSystem()
-{
-	m_dirs_only = false;
+	: m_dirs_only()
 #ifdef __WXMSW__
-	m_found = false;
-	m_hFind = INVALID_HANDLE_VALUE;
+	, m_hFind(INVALID_HANDLE_VALUE)
+	, m_found()
 #else
-	m_raw_path = 0;
-	m_file_part = 0;
-	m_dir = 0;
+	, m_raw_path()
+	, m_file_part()
+	, m_buffer_length()
+	, m_dir()
 #endif
+{
 }
 
 CLocalFileSystem::~CLocalFileSystem()
@@ -85,7 +86,6 @@
 	// SHFileOperation accepts a list of null-terminated strings. Go through all
 	// paths to get the required buffer length
 
-	;
 	int len = 1; // String list terminated by empty string
 
 	for (std::list<wxString>::const_iterator const_iter = dirsToVisit.begin(); const_iter != dirsToVisit.end(); ++const_iter)
@@ -133,7 +133,7 @@
 #else
 	if (parent)
 	{
-		if (wxMessageBox(_("Really delete all selected files and/or directories?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, parent) != wxYES)
+		if (wxMessageBox(_("Really delete all selected files and/or directories from your computer?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, parent) != wxYES)
 			return true;
 	}
 
@@ -355,8 +355,8 @@
 		m_found = false;
 		return false;
 	}
-	
-	m_found = true;	
+
+	m_found = true;
 	return true;
 #else
 	if (path != _T("/") && path.Last() == '/')
@@ -428,7 +428,7 @@
 		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)
@@ -481,17 +481,17 @@
 		return false;
 	do
 	{
-		name = m_find_data.cFileName;
-		if (name == _T(""))
+		if (!m_find_data.cFileName[0])
 		{
 			m_found = FindNextFile(m_hFind, &m_find_data) != 0;
 			return true;
 		}
-		if (name == _T(".") || name == _T(".."))
+		if (m_dirs_only && !(m_find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
 			continue;
 
-		if (m_dirs_only && !(m_find_data.dwFileAttributes & FILE_ATTRIBUTE_DIRECTORY))
+		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;
 
 		isLink = false;
 
@@ -517,7 +517,7 @@
 		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)
@@ -571,10 +571,10 @@
 				*mode = 0;
 		}
 		if (m_dirs_only && type != dir)
-			continue;	
+			continue;
 
 		is_dir = type == dir;
-		
+
 		name = wxString(entry->d_name, *wxConvFileName);
 
 		return true;
diff -Nru filezilla-3.5.3/src/engine/logging.cpp filezilla-3.7.3~precise/src/engine/logging.cpp
--- filezilla-3.5.3/src/engine/logging.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/logging.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -83,8 +83,8 @@
 	}
 
 	va_list ap;
-    
-    va_start(ap, msgFormat);
+
+	va_start(ap, msgFormat);
 	wxString text = wxString::FormatV(msgFormat, ap);
 	va_end(ap);
 
@@ -171,7 +171,7 @@
 		SourceFile = SourceFile.Mid(pos+1);
 
 	va_list ap;
-    
+
 	va_start(ap, msgFormat);
 	wxString text = wxString::FormatV(msgFormat, ap);
 	va_end(ap);
@@ -281,7 +281,7 @@
 				if (GetFileSizeEx(hFile, &size) && size.QuadPart > m_max_size)
 				{
 					CloseHandle(hFile);
-					
+
 					// MoveFileEx can fail if trying to access a deleted file for which another process still has
 					// a handle. Move it far away first.
 					// Todo: Handle the case in which logdir and tmpdir are on different volumes.
diff -Nru filezilla-3.5.3/src/engine/misc.cpp filezilla-3.7.3~precise/src/engine/misc.cpp
--- filezilla-3.5.3/src/engine/misc.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/misc.cpp	2012-10-24 03:30:07.000000000 +0000
@@ -1,5 +1,8 @@
 #include <filezilla.h>
 #include <gnutls/gnutls.h>
+#include <sqlite3.h>
+
+#include "tlssocket.h"
 
 bool VerifySetDate(wxDateTime& date, int year, wxDateTime::Month month, int day, int hour /*=0*/, int minute /*=0*/, int second /*=0*/)
 {
@@ -302,7 +305,7 @@
 		bool zero = false;
 		while (r)
 		{
-			if (!r & 1)
+			if (!(r & 1))
 				zero = true;
 			r >>= 1;
 			random_bits++;
@@ -368,16 +371,47 @@
 	}
 }
 
-wxString GetDependencyVersion(enum _dependency dependency)
+wxString GetDependencyVersion(dependency::type d)
 {
-	if (dependency == dependency_gnutls)
+	switch (d)
 	{
-		const char* v = gnutls_check_version(0);
-		if (!v || !*v)
-			return _T("unknown");
-	
-		return wxString(v, wxConvLibc);	
+	case dependency::wxwidgets:
+		return wxVERSION_NUM_DOT_STRING_T;
+	case dependency::gnutls:
+		{
+			const char* v = gnutls_check_version(0);
+			if (!v || !*v)
+				return _T("unknown");
+
+			return wxString(v, wxConvLibc);
+		}
+	case dependency::sqlite:
+		return wxString::FromUTF8(sqlite3_libversion());
+	default:
+		return _T("");
 	}
 
-	return _T("No such dependency");
+	return _T("");
+}
+
+wxString GetDependencyName(dependency::type d)
+{
+	switch (d)
+	{
+	case dependency::wxwidgets:
+		return _T("wxWidgets");
+	case dependency::gnutls:
+		return _T("GnuTLS");
+	case dependency::sqlite:
+		return _T("SQLite");
+	default:
+		return _T("");
+	}
+
+	return _T("");
+}
+
+wxString ListTlsCiphers(const wxString& priority)
+{
+	return CTlsSocket::ListTlsCiphers(priority);
 }
diff -Nru filezilla-3.5.3/src/engine/notification.cpp filezilla-3.7.3~precise/src/engine/notification.cpp
--- filezilla-3.5.3/src/engine/notification.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/notification.cpp	2013-06-01 07:37:58.000000000 +0000
@@ -184,11 +184,19 @@
 	return pData;
 }
 
+CCertificate::CCertificate()
+	: m_rawData()
+	, m_len()
+	, m_pkalgobits()
+{
+}
+
 CCertificate::CCertificate(
 		const unsigned char* rawData, unsigned int len,
 		wxDateTime activationTime, wxDateTime expirationTime,
 		const wxString& serial,
 		const wxString& pkalgoname, unsigned int bits,
+		const wxString& signalgoname,
 		const wxString& fingerprint_md5,
 		const wxString& fingerprint_sha1,
 		const wxString& subject,
@@ -211,6 +219,8 @@
 	m_pkalgoname = pkalgoname;
 	m_pkalgobits = bits;
 
+	m_signalgoname = signalgoname;
+
 	m_fingerprint_md5 = fingerprint_md5;
 	m_fingerprint_sha1 = fingerprint_sha1;
 
@@ -242,6 +252,8 @@
 	m_pkalgoname = op.m_pkalgoname;
 	m_pkalgobits = op.m_pkalgobits;
 
+	m_signalgoname = op.m_signalgoname;
+
 	m_fingerprint_md5 = op.m_fingerprint_md5;
 	m_fingerprint_sha1 = op.m_fingerprint_sha1;
 
@@ -282,6 +294,8 @@
 	m_pkalgoname = op.m_pkalgoname;
 	m_pkalgobits = op.m_pkalgobits;
 
+	m_signalgoname = op.m_signalgoname;
+
 	m_fingerprint_md5 = op.m_fingerprint_md5;
 	m_fingerprint_sha1 = op.m_fingerprint_sha1;
 
@@ -292,9 +306,13 @@
 }
 
 CCertificateNotification::CCertificateNotification(const wxString& host, unsigned int port,
+		const wxString& protocol,
+		const wxString& keyExchange,
 		const wxString& sessionCipher,
 		const wxString& sessionMac,
 		const std::vector<CCertificate> &certificates)
+	: m_protocol( protocol )
+	, m_keyExchange( keyExchange )
 {
 	m_host = host;
 	m_port = port;
diff -Nru filezilla-3.5.3/src/engine/option_change_event_handler.cpp filezilla-3.7.3~precise/src/engine/option_change_event_handler.cpp
--- filezilla-3.5.3/src/engine/option_change_event_handler.cpp	2011-11-08 20:33:10.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/option_change_event_handler.cpp	2012-09-07 03:30:05.000000000 +0000
@@ -9,7 +9,7 @@
 
 COptionChangeEventHandler::~COptionChangeEventHandler()
 {
-	for (std::set<int>::const_iterator iter = m_handled_options.begin(); iter != m_handled_options.end(); iter++)
+	for (std::set<int>::const_iterator iter = m_handled_options.begin(); iter != m_handled_options.end(); ++iter)
 		m_handlers[*iter].erase(this);
 }
 
@@ -35,7 +35,7 @@
 {
 	for (std::size_t i = 0; i < m_handlers.size(); i++)
 	{
-		for (std::set<COptionChangeEventHandler*>::iterator iter = m_handlers[i].begin(); iter != m_handlers[i].end(); iter++)
+		for (std::set<COptionChangeEventHandler*>::iterator iter = m_handlers[i].begin(); iter != m_handlers[i].end(); ++iter)
 		{
 			(*iter)->m_handled_options.clear();
 		}
@@ -48,7 +48,7 @@
 	if (option < 0 || static_cast<std::size_t>(option) >= m_handlers.size())
 		return;
 
-	for (std::set<COptionChangeEventHandler*>::iterator iter = m_handlers[option].begin(); iter != m_handlers[option].end(); iter++)
+	for (std::set<COptionChangeEventHandler*>::iterator iter = m_handlers[option].begin(); iter != m_handlers[option].end(); ++iter)
 	{
 		(*iter)->OnOptionChanged(option);
 	}
diff -Nru filezilla-3.5.3/src/engine/pathcache.cpp filezilla-3.7.3~precise/src/engine/pathcache.cpp
--- filezilla-3.5.3/src/engine/pathcache.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/pathcache.cpp	2012-11-14 04:30:05.000000000 +0000
@@ -38,7 +38,7 @@
 	tServerCache &serverCache = *pServerCache;
 
 	CSourcePath sourcePath;
-	
+
 	sourcePath.source = source;
 	sourcePath.subdir = subdir;
 
@@ -91,7 +91,7 @@
 		return;
 
 	CSourcePath sourcePath;
-	
+
 	sourcePath.source = path;
 	sourcePath.subdir = subdir;
 
@@ -102,7 +102,7 @@
 		target = serverIter->second;
 		iter->second->erase(serverIter);
 	}
-	
+
 	if (target.IsEmpty() && subdir != _T(""))
 	{
 		target = path;
@@ -127,7 +127,7 @@
 
 void CPathCache::Clear()
 {
-	for (tCacheIterator iter = m_cache.begin(); iter != m_cache.end(); iter++)
+	for (tCacheIterator iter = m_cache.begin(); iter != m_cache.end(); ++iter)
 		delete iter->second;
 
 	m_cache.clear();
diff -Nru filezilla-3.5.3/src/engine/pathcache.h filezilla-3.7.3~precise/src/engine/pathcache.h
--- filezilla-3.5.3/src/engine/pathcache.h	2008-11-18 03:00:30.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/pathcache.h	2012-10-06 03:30:12.000000000 +0000
@@ -38,7 +38,7 @@
 			return source < op.source;
 		}
 	};
-	
+
 	typedef std::map<CSourcePath, CServerPath> tServerCache;
 	typedef tServerCache::iterator tServerCacheIterator;
 	typedef tServerCache::const_iterator tServerCacheConstIterator;
diff -Nru filezilla-3.5.3/src/engine/proxy.cpp filezilla-3.7.3~precise/src/engine/proxy.cpp
--- filezilla-3.5.3/src/engine/proxy.cpp	2010-02-07 15:40:22.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/proxy.cpp	2012-11-02 04:30:06.000000000 +0000
@@ -47,7 +47,7 @@
 	static const char *base64 = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/";
 
 	wxString buf;
-	
+
 	const wxWX2MBbuf utf8 = str.mb_str(wxConvUTF8);
 	const char* from = utf8;
 
@@ -109,7 +109,7 @@
 		}
 		else
 		{
-			challenge = 0;
+			challenge = (size_t)0;
 			challenge_len = 0;
 		}
 
@@ -118,13 +118,13 @@
 
 		if (!challenge)
 		{
-			m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\nUser-Agent: FileZilla\r\n\r\n",
+			m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%u HTTP/1.1\r\nHost: %s:%u\r\nUser-Agent: FileZilla\r\n\r\n",
 				(const char*)host_raw, port,
 				(const char*)host_raw, port);
 		}
 		else
 		{
-			m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%d HTTP/1.1\r\nHost: %s:%d\r\nProxy-Authorization: Basic %s\r\nUser-Agent: FileZilla\r\n\r\n",
+			m_sendBufferLen = sprintf(m_pSendBuffer, "CONNECT %s:%u HTTP/1.1\r\nHost: %s:%u\r\nProxy-Authorization: Basic %s\r\nUser-Agent: FileZilla\r\n\r\n",
 				(const char*)host_raw, port,
 				(const char*)host_raw, port,
 				(const char*)challenge);
@@ -169,11 +169,11 @@
 	case CSocketEvent::hostaddress:
 		{
 			const wxString& address = event.GetData();
-			m_pOwner->LogMessage(Status, _("Connecting to %s..."), address.c_str()); 
+			m_pOwner->LogMessage(Status, _("Connecting to %s..."), address.c_str());
 		}
 	case CSocketEvent::connection_next:
 		if (event.GetError())
-			m_pOwner->LogMessage(Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(event.GetError()).c_str()); 
+			m_pOwner->LogMessage(Status, _("Connection attempt failed with \"%s\", trying next address."), CSocket::GetErrorDescription(event.GetError()).c_str());
 		break;
 	case CSocketEvent::connection:
 		if (event.GetError())
@@ -225,7 +225,7 @@
 	switch (m_handshakeState)
 	{
 	case http_wait:
-		while (true)
+		for (;;)
 		{
 			int error;
 			int do_read = m_recvBufferLen - m_recvBufferPos - 1;
@@ -301,7 +301,7 @@
 
 			if (!end)
 				continue;
-			
+
 			end = strchr(m_pRecvBuffer, '\r');
 			wxASSERT(end);
 			*end = 0;
@@ -358,7 +358,7 @@
 				continue;
 
 			m_recvBufferPos = 0;
-			
+
 			// All data got read, parse it
 			switch (m_handshakeState)
 			{
@@ -574,7 +574,7 @@
 
 					m_pSendBuffer[addrlen + 4] = (m_port >> 8) & 0xFF; // Port in network order
 					m_pSendBuffer[addrlen + 5] = m_port & 0xFF;
-					
+
 					m_sendBufferLen = 6 + addrlen;
 					m_recvBufferLen = 2;
 				}
@@ -606,7 +606,7 @@
 	if (m_proxyState != handshake || !m_pSendBuffer)
 		return;
 
-	while (true)
+	for (;;)
 	{
 		int error;
 		int written = m_pSocket->Write(m_pSendBuffer, m_sendBufferLen, error);
diff -Nru filezilla-3.5.3/src/engine/proxy.h filezilla-3.7.3~precise/src/engine/proxy.h
--- filezilla-3.5.3/src/engine/proxy.h	2008-12-20 03:00:25.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/proxy.h	2012-10-06 03:30:12.000000000 +0000
@@ -22,7 +22,7 @@
 		unknown,
 		HTTP,
 		SOCKS5,
-		
+
 		proxytype_count
 	};
 
diff -Nru filezilla-3.5.3/src/engine/ratelimiter.cpp filezilla-3.7.3~precise/src/engine/ratelimiter.cpp
--- filezilla-3.5.3/src/engine/ratelimiter.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ratelimiter.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -28,7 +28,7 @@
 		m_pTheRateLimiter = new CRateLimiter(pOptions);
 	else
 		++m_pTheRateLimiter->m_usageCount;
-	
+
 	return m_pTheRateLimiter;
 }
 
@@ -139,12 +139,11 @@
 
 void CRateLimiter::OnTimer(wxTimerEvent& event)
 {
-	std::list<CRateLimiterObject*> objectsToUnwait;
 	for (int i = 0; i < 2; ++i)
 	{
 		m_tokenDebt[i] = 0;
 
-		if (!m_objectList.size())
+		if (m_objectList.empty())
 			continue;
 
 		wxLongLong limit = GetLimit((enum rate_direction)i);
@@ -164,7 +163,7 @@
 
 		// Get amount of tokens for each object
 		wxLongLong tokensPerObject = tokens / m_objectList.size();
-		
+
 		if (tokensPerObject == 0)
 			tokensPerObject = 1;
 		tokens = 0;
@@ -237,7 +236,7 @@
 			m_wakeupList[i].pop_front();
 			if (!pObject->m_waiting[i])
 				continue;
-			
+
 			wxASSERT(pObject->m_bytesAvailable != 0);
 			pObject->m_waiting[i] = false;
 
diff -Nru filezilla-3.5.3/src/engine/ratelimiter.h filezilla-3.7.3~precise/src/engine/ratelimiter.h
--- filezilla-3.5.3/src/engine/ratelimiter.h	2010-01-19 03:00:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/ratelimiter.h	2013-06-09 03:30:07.000000000 +0000
@@ -44,7 +44,7 @@
 
 	void WakeupWaitingObjects();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTimer(wxTimerEvent& event);
 };
 
@@ -54,7 +54,7 @@
 
 public:
 	CRateLimiterObject();
-	virtual ~CRateLimiterObject() { }
+	virtual ~CRateLimiterObject() {}
 	wxLongLong GetAvailableBytes(enum CRateLimiter::rate_direction direction) const { return m_bytesAvailable[direction]; }
 
 	bool IsWaiting(enum CRateLimiter::rate_direction direction) const;
@@ -63,7 +63,7 @@
 	void UpdateUsage(enum CRateLimiter::rate_direction direction, int usedBytes);
 	void Wait(enum CRateLimiter::rate_direction direction);
 
-	virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction) { }
+	virtual void OnRateAvailable(enum CRateLimiter::rate_direction) {}
 
 private:
 	bool m_waiting[2];
diff -Nru filezilla-3.5.3/src/engine/rtt.cpp filezilla-3.7.3~precise/src/engine/rtt.cpp
--- filezilla-3.5.3/src/engine/rtt.cpp	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/rtt.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -0,0 +1,58 @@
+#include <filezilla.h>
+#include "rtt.h"
+
+CLatencyMeasurement::CLatencyMeasurement()
+	: m_measurements()
+{
+}
+
+int CLatencyMeasurement::GetLatency() const
+{
+	wxCriticalSectionLocker lock(m_sync);
+	if (!m_measurements)
+		return -1;
+
+	return static_cast<int>(m_summed_latency.GetValue() / m_measurements);
+}
+
+bool CLatencyMeasurement::Start()
+{
+	wxCriticalSectionLocker lock(m_sync);
+	if (m_start.IsValid())
+		return false;
+
+	m_start = wxDateTime::UNow();
+
+	return true;
+}
+
+bool CLatencyMeasurement::Stop()
+{
+	wxCriticalSectionLocker lock(m_sync);
+	if (!m_start.IsValid())
+		return false;
+
+	wxTimeSpan diff = wxDateTime::UNow() - m_start;
+	m_start = wxDateTime();
+
+	if (diff.GetMilliseconds() < 0)
+		return false;
+
+	m_summed_latency += diff.GetMilliseconds();
+	++m_measurements;
+
+	return true;
+}
+
+void CLatencyMeasurement::Reset()
+{
+	wxCriticalSectionLocker lock(m_sync);
+	m_summed_latency = 0;
+	m_measurements = 0;
+	m_start = wxDateTime();
+}
+
+void CLatencyMeasurement::cb()
+{
+	Stop();
+}
\ No newline at end of file
diff -Nru filezilla-3.5.3/src/engine/rtt.h filezilla-3.7.3~precise/src/engine/rtt.h
--- filezilla-3.5.3/src/engine/rtt.h	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/rtt.h	2012-11-26 04:30:06.000000000 +0000
@@ -0,0 +1,34 @@
+#ifndef FZ_RTT_HEADER
+#define FZ_RTT_HEADER
+
+#include "socket.h"
+
+class CLatencyMeasurement : public CCallback
+{
+public:
+	CLatencyMeasurement();
+
+	// Returns false if measurement cannot be started due to
+	// a measurement already running
+	bool Start();
+
+	// Returns fals if there was no measurement running
+	bool Stop();
+
+	// In ms, returns -1 if no data is available.
+	int GetLatency() const;
+
+	void Reset();
+
+	virtual void cb();
+
+protected:
+	wxDateTime m_start;
+
+	wxLongLong m_summed_latency;
+	int m_measurements;
+
+	mutable wxCriticalSection m_sync;
+};
+
+#endif
\ No newline at end of file
diff -Nru filezilla-3.5.3/src/engine/server.cpp filezilla-3.7.3~precise/src/engine/server.cpp
--- filezilla-3.5.3/src/engine/server.cpp	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/server.cpp	2013-01-14 04:30:09.000000000 +0000
@@ -51,11 +51,13 @@
 	Initialize();
 }
 
-bool CServer::ParseUrl(wxString host, const wxString& port, wxString user, wxString pass, wxString &error, CServerPath &path)
+bool CServer::ParseUrl(wxString host, wxString port, wxString user, wxString pass, wxString &error, CServerPath &path)
 {
 	unsigned long nPort = 0;
 	if (!port.empty())
 	{
+		port.Trim(false);
+		port.Trim(true);
 		if (port.size() > 5 || !port.ToULong(&nPort) || !nPort || nPort > 65535)
 		{
 			error = _("Invalid port given. The port has to be a value from 1 to 65535.");
@@ -88,7 +90,7 @@
 		if (m_protocol == UNKNOWN)
 		{
 			// TODO: http:// once WebDAV is officially supported
-			error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over SSL (implicit) and\nftpes:// for FTP over SSL (explicit).");
+			error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over TLS (implicit) and\nftpes:// for FTP over TLS (explicit).");
 			return false;
 		}
 	}
@@ -582,9 +584,9 @@
 	}
 	else
 		m_pass = pass;
-	
+
 	m_user = user;
-	
+
 	return true;
 }
 
diff -Nru filezilla-3.5.3/src/engine/servercapabilities.h filezilla-3.7.3~precise/src/engine/servercapabilities.h
--- filezilla-3.5.3/src/engine/servercapabilities.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/servercapabilities.h	2012-10-06 03:30:12.000000000 +0000
@@ -36,7 +36,7 @@
 	// can return different times than the UTC based times using the MLST or
 	// MDTM commands.
 	// Note that the user can invoke an additional timezone offset on top of
-	// this for server not supporting auto-detection or to compensate 
+	// this for server not supporting auto-detection or to compensate
 	// unsynchronized clocks.
 	timezone_offset
 };
diff -Nru filezilla-3.5.3/src/engine/serverpath.cpp filezilla-3.7.3~precise/src/engine/serverpath.cpp
--- filezilla-3.5.3/src/engine/serverpath.cpp	2011-04-26 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/serverpath.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -18,16 +18,16 @@
 };
 
 static const CServerTypeTraits traits[SERVERTYPE_MAX] = {
-	{ _T("/"),  true,  0,    0,    false, 0, 0,   true,  false }, // Failsafe
-	{ _T("/"),  true,  0,    0,    false, 0, 0,   true,  false },
-	{ _T("."),  false, '[',  ']',  false, 0, '^', false, false },
-	{ _T("\\/"), false, 0,    0,    false, 0, 0,   true,  false },
-	{ _T("."),  false, '\'', '\'', true,  1, 0,   false, false },
-	{ _T("/"),  true,  0,    0,    false, 0, 0,   true,  false },
-	{ _T("/"),  true,  0,    0,    false, 0, 0,   true,  false }, // Same as Unix
-	{ _T("."),  false, 0,    0,    false, 0, 0,   false, false },
-	{ _T("\\"), true,  0,    0,    false, 0, 0,   true,  false },
-	{ _T("/"),  true,  0,    0,    false, 0, 0,   true,  true  } // Cygwin is like Unix but has optional prefix of form "//server"
+	{ _T("/"),   true,     0,    0,    false, 0, 0,   true,  false }, // Failsafe
+	{ _T("/"),   true,     0,    0,    false, 0, 0,   true,  false },
+	{ _T("."),   false,  '[',  ']',    false, 0, '^', false, false },
+	{ _T("\\/"), false,    0,    0,    false, 0, 0,   true,  false },
+	{ _T("."),   false, '\'', '\'',     true, 1, 0,   false, false },
+	{ _T("/"),   true,     0,    0,    false, 0, 0,   true,  false },
+	{ _T("/"),   true,     0,    0,    false, 0, 0,   true,  false }, // Same as Unix
+	{ _T("."),   false,    0,    0,    false, 0, 0,   false, false },
+	{ _T("\\"),  true,     0,    0,    false, 0, 0,   true,  false },
+	{ _T("/"),   true,     0,    0,    false, 0, 0,   true,  true  }  // Cygwin is like Unix but has optional prefix of form "//server"
 };
 
 CServerPathData::CServerPathData()
@@ -35,9 +35,9 @@
 }
 
 CServerPathData::CServerPathData(const CServerPathData& v)
+	: m_segments(v.m_segments)
+	, m_prefix(v.m_prefix)
 {
-	m_prefix = v.m_prefix;
-	m_segments = v.m_segments;
 }
 
 bool CServerPathData::operator==(const CServerPathData& cmp) const
@@ -52,17 +52,16 @@
 }
 
 CServerPath::CServerPath()
+	: m_bEmpty(true)
+	, m_type(DEFAULT)
 {
-	m_type = DEFAULT;
-	m_bEmpty = true;
 }
 
 CServerPath::CServerPath(const CServerPath &path, wxString subdir)
-	: m_data(path.m_data)
+	: m_bEmpty(path.m_bEmpty)
+	, m_type(path.m_type)
+	, m_data(path.m_data)
 {
-	m_type = path.m_type;
-	m_bEmpty = path.m_bEmpty;
-
 	if (subdir == _T(""))
 		return;
 
@@ -71,16 +70,15 @@
 }
 
 CServerPath::CServerPath(const CServerPath &path)
-	: m_data(path.m_data)
+	: m_bEmpty(path.m_bEmpty)
+	, m_type(path.m_type)
+	, m_data(path.m_data)
 {
-	m_type = path.m_type;
-	m_bEmpty = path.m_bEmpty;
 }
 
 CServerPath::CServerPath(wxString path, ServerType type /*=DEFAULT*/)
+	: m_type(type)
 {
-	m_type = type;
-
 	SetPath(path);
 }
 
@@ -380,7 +378,7 @@
 
 		p += prefix_len + 1;
 	}
-	
+
 	while (len > (p - begin))
 	{
 		int segment_len = 0;
@@ -926,7 +924,7 @@
 	parent.m_type = m_type;
 
 	CServerPathData& parentData = parent.m_data.Get();
-	
+
 	tConstSegmentIter last = m_data->m_segments.end();
 	tConstSegmentIter last2 = path.m_data->m_segments.end();
 	if (traits[m_type].prefixmode == 1)
diff -Nru filezilla-3.5.3/src/engine/sftpcontrolsocket.cpp filezilla-3.7.3~precise/src/engine/sftpcontrolsocket.cpp
--- filezilla-3.5.3/src/engine/sftpcontrolsocket.cpp	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/sftpcontrolsocket.cpp	2013-06-09 03:30:07.000000000 +0000
@@ -50,7 +50,7 @@
 BEGIN_EVENT_TABLE(CSftpControlSocket, CControlSocket)
 EVT_COMMAND(wxID_ANY, fzEVT_SFTP, CSftpControlSocket::OnSftpEvent)
 EVT_END_PROCESS(wxID_ANY, CSftpControlSocket::OnTerminate)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 class CSftpInputThread : public wxThreadEx
 {
@@ -303,7 +303,7 @@
 		}
 loopexit:
 
-		return (ExitCode)Close();
+		return reinterpret_cast<ExitCode>(Close());
 	};
 
 	int Close()
@@ -328,7 +328,7 @@
 		m_deleteFailed = false;
 	}
 
-	virtual ~CSftpDeleteOpData() { }
+	virtual ~CSftpDeleteOpData() {}
 
 	CServerPath path;
 	std::list<wxString> files;
@@ -399,6 +399,7 @@
 	delete m_pCSConv;
 	if (server.GetEncodingType() == ENCODING_CUSTOM)
 	{
+		LogMessage(Debug_Info, _T("Using custom encoding: %s"), server.GetCustomEncoding().c_str());
 		m_pCSConv = new wxCSConv(server.GetCustomEncoding());
 		m_useUTF8 = false;
 	}
@@ -509,7 +510,7 @@
 		return FZ_REPLY_OK;
 	default:
 		LogMessage(__TFILE__, __LINE__, this, Debug_Warning, _T("Unknown op state: %d"), pData->opState);
-        DoClose(FZ_REPLY_INTERNALERROR);
+		DoClose(FZ_REPLY_INTERNALERROR);
 		return FZ_REPLY_ERROR;
 	}
 
@@ -580,7 +581,7 @@
 		break;
 	default:
 		LogMessage(__TFILE__, __LINE__, this, Debug_Warning, _T("Unknown op state: %d"), pData->opState);
-        DoClose(FZ_REPLY_INTERNALERROR);
+		DoClose(FZ_REPLY_INTERNALERROR);
 		return FZ_REPLY_ERROR;
 	}
 
@@ -1883,7 +1884,7 @@
 		}
 
 		wxString quotedFilename = QuoteFilename(pData->remotePath.FormatFilename(pData->remoteFile, !pData->tryAbsolutePath));
-		// Y2K38		
+		// Y2K38
 		time_t ticks = pData->fileTime.GetTicks(); // Already in UTC
 		wxString seconds = wxString::Format(_T("%d"), (int)ticks);
 		if (!Send(_T("chmtime ") + seconds + _T(" ") + WildcardEscape(quotedFilename),
@@ -2329,7 +2330,7 @@
 	{
 	}
 
-	virtual ~CSftpRemoveDirOpData() { }
+	virtual ~CSftpRemoveDirOpData() {}
 
 	CServerPath path;
 	wxString subDir;
@@ -2411,7 +2412,7 @@
 		m_useAbsolute = false;
 	}
 
-	virtual ~CSftpChmodOpData() { }
+	virtual ~CSftpChmodOpData() {}
 
 	CChmodCommand m_cmd;
 	bool m_useAbsolute;
@@ -2533,7 +2534,7 @@
 		m_useAbsolute = false;
 	}
 
-	virtual ~CSftpRenameOpData() { }
+	virtual ~CSftpRenameOpData() {}
 
 	CRenameCommand m_cmd;
 	bool m_useAbsolute;
diff -Nru filezilla-3.5.3/src/engine/sftpcontrolsocket.h filezilla-3.7.3~precise/src/engine/sftpcontrolsocket.h
--- filezilla-3.5.3/src/engine/sftpcontrolsocket.h	2008-11-30 03:00:34.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/sftpcontrolsocket.h	2013-06-09 03:30:07.000000000 +0000
@@ -126,12 +126,12 @@
 	CSftpInputThread* m_pInputThread;
 	int m_pid;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTerminate(wxProcessEvent& event);
 	void OnSftpEvent(wxCommandEvent& event);
 
 	// Set to true in destructor of CSftpControlSocket
-	// If sftp process dies (or gets killed), OnTerminate will be called. 
+	// If sftp process dies (or gets killed), OnTerminate will be called.
 	// To avoid a race condition, abort OnTerminate if m_inDestructor is set
 	bool m_inDestructor;
 	bool m_termindatedInDestructor;
diff -Nru filezilla-3.5.3/src/engine/socket.cpp filezilla-3.7.3~precise/src/engine/socket.cpp
--- filezilla-3.5.3/src/engine/socket.cpp	2010-12-30 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/socket.cpp	2013-06-10 18:45:04.000000000 +0000
@@ -53,7 +53,7 @@
 // Apparently it is too hard for the richest company in the
 // world to add this simple function with a service pack...
 
-extern "C" 
+extern "C"
 {
 	typedef int (WINAPI *t_getaddrinfo)(const char *nodename, const char *servname,
 						const struct addrinfo *hints, struct addrinfo **res);
@@ -141,6 +141,8 @@
 		return EFAULT;
 	case WSAEACCES:
 		return EACCES;
+	case WSAETIMEDOUT:
+		return ETIMEDOUT;
 	default:
 		return error;
 	}
@@ -445,7 +447,7 @@
 	{
 		if (!already_locked)
 			m_sync.Lock();
-			
+
 		if (!m_started || m_finished)
 		{
 			if (!already_locked)
@@ -503,7 +505,7 @@
 
 			return 0;
 		}
-		
+
 #if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
 		// We do not want SIGPIPE if writing to socket.
 		const int value = 1;
@@ -759,7 +761,7 @@
 	{
 		m_waiting |= wait;
 
-		while (true)
+		for (;;)
 		{
 #ifdef __WXMSW__
 			int wait_events = FD_CLOSE;
@@ -859,7 +861,7 @@
 			int res = select(max, &readfds, &writefds, 0, 0);
 
 			m_sync.Lock();
-			
+
 			if (res > 0 && FD_ISSET(m_pipe[0], &readfds))
 			{
 				char buffer[100];
@@ -937,6 +939,8 @@
 			return;
 		if (m_triggered & WAIT_READ)
 		{
+			if (m_pSocket->m_synchronous_read_cb)
+				m_pSocket->m_synchronous_read_cb->cb();
 			CSocketEvent *evt = new CSocketEvent(m_pSocket->m_pEvtHandler, m_pSocket, CSocketEvent::read, m_triggered_errors[1]);
 			CSocketEventDispatcher::Get().SendEvent(evt);
 			m_triggered &= ~WAIT_READ;
@@ -981,7 +985,7 @@
 	virtual ExitCode Entry()
 	{
 		m_sync.Lock();
-		while (true)
+		for (;;)
 		{
 			if (!IdleLoop())
 			{
@@ -1077,10 +1081,13 @@
 
 	// Thread waits for instructions
 	bool m_threadwait;
+
+	CCallback* m_synchronous_read_cb;
 };
 
 CSocket::CSocket(CSocketEventHandler* pEvtHandler)
 	: m_pEvtHandler(pEvtHandler)
+	, m_synchronous_read_cb()
 {
 #ifdef ERRORCODETEST
 	CErrorCodeTest test;
@@ -1343,6 +1350,7 @@
 	ERRORDECL(WSAEPROTOTYPE, "Protocol not supported on given socket type")
 	ERRORDECL(WSAESOCKTNOSUPPORT, "Socket type not supported for address family")
 	ERRORDECL(WSAEADDRNOTAVAIL, "Cannot assign requested address")
+	ERRORDECL(ERROR_NETNAME_DELETED, "The specified network name is no longer available")
 #endif
 	{ 0, 0, 0 }
 };
@@ -1793,7 +1801,7 @@
 
 int CSocket::GetRemotePort(int& error)
 {
-	sockaddr_u addr;		
+	sockaddr_u addr;
 	socklen_t addr_len = sizeof(addr);
 	error = getpeername(m_fd, &addr.sockaddr, &addr_len);
 	if (error)
@@ -1832,7 +1840,7 @@
 #endif
 		return 0;
 	}
-	
+
 #if defined(SO_NOSIGPIPE) && !defined(MSG_NOSIGNAL)
 	// We do not want SIGPIPE if writing to socket.
 	const int value = 1;
@@ -1957,3 +1965,14 @@
 
 	return 0;
 }
+
+void CSocket::SetSynchronousReadCallback(CCallback* cb)
+{
+	if (m_pSocketThread)
+		m_pSocketThread->m_sync.Lock();
+
+	m_synchronous_read_cb = cb;
+
+	if (m_pSocketThread)
+		m_pSocketThread->m_sync.Unlock();
+}
diff -Nru filezilla-3.5.3/src/engine/string_coalescer.cpp filezilla-3.7.3~precise/src/engine/string_coalescer.cpp
--- filezilla-3.5.3/src/engine/string_coalescer.cpp	2011-05-15 21:29:46.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/string_coalescer.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -71,7 +71,7 @@
 };
 
 
-// Can't use wxHashMap as it doesn't like forward declarations. That 
+// Can't use wxHashMap as it doesn't like forward declarations. That
 // contraption is actually implemented as a series of ugly macros and
 // not using beautiful templates.
 
@@ -148,7 +148,7 @@
 	{
 		s.push_back(it->first);
 	}
-	
+
 	wxDateTime start = wxDateTime::UNow();
 	for (int i = 0; i < 100; ++i)
 	{
diff -Nru filezilla-3.5.3/src/engine/timeex.cpp filezilla-3.7.3~precise/src/engine/timeex.cpp
--- filezilla-3.5.3/src/engine/timeex.cpp	2010-07-23 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/timeex.cpp	2012-10-06 03:30:12.000000000 +0000
@@ -35,7 +35,7 @@
 		return true;
 	if (m_time > op.m_time)
 		return false;
-	
+
 	return m_offset < op.m_offset;
 }
 
@@ -45,7 +45,7 @@
 		return true;
 	if (m_time > op.m_time)
 		return false;
-	
+
 	return m_offset <= op.m_offset;
 }
 
@@ -55,7 +55,7 @@
 		return true;
 	if (m_time < op.m_time)
 		return false;
-	
+
 	return m_offset > op.m_offset;
 }
 
@@ -65,7 +65,7 @@
 		return true;
 	if (m_time < op.m_time)
 		return false;
-	
+
 	return m_offset >= op.m_offset;
 }
 
@@ -73,6 +73,6 @@
 {
 	if (m_time != op.m_time)
 		return false;
-	
+
 	return m_offset == op.m_offset;
 }
diff -Nru filezilla-3.5.3/src/engine/tlssocket.cpp filezilla-3.7.3~precise/src/engine/tlssocket.cpp
--- filezilla-3.5.3/src/engine/tlssocket.cpp	2012-01-08 13:25:38.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/tlssocket.cpp	2013-06-01 07:37:58.000000000 +0000
@@ -6,13 +6,20 @@
 #include <gnutls/x509.h>
 #include <errno.h>
 
+#if GNUTLS_VERSION_NUMBER >= 0x030100
+char const ciphers[] = "SECURE256:+SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP";
+#else
+// Versions before 3.1.0 cannot combine level keywords
+char const ciphers[] = "SECURE128:+ARCFOUR-128:-3DES-CBC:-MD5:+SIGN-ALL:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP";
+#endif
+
 //#define TLSDEBUG 1
 #if TLSDEBUG
 // This is quite ugly
 CControlSocket* pLoggingControlSocket;
 void log_func(int level, const char* msg)
 {
-	if (!msg)
+	if (!msg || !pLoggingControlSocket)
 		return;
 	wxString s(msg, wxConvLocal);
 	s.Trim();
@@ -71,36 +78,57 @@
 	int res = gnutls_global_init();
 	if (res)
 	{
-		LogError(res);
+		LogError(res, _T("gnutls_global_init"));
 		Uninit();
 		return false;
 	}
 
 #if TLSDEBUG
-	pLoggingControlSocket = m_pOwner;
-	gnutls_global_set_log_function(log_func);
-	gnutls_global_set_log_level(99);
+	if (!pLoggingControlSocket)
+	{
+		pLoggingControlSocket = m_pOwner;
+		gnutls_global_set_log_function(log_func);
+		gnutls_global_set_log_level(99);
+	}
 #endif
 	res = gnutls_certificate_allocate_credentials(&m_certCredentials);
 	if (res < 0)
 	{
-		LogError(res);
+		LogError(res, _T("gnutls_certificate_allocate_credentials"));
 		Uninit();
 		return false;
 	}
 
-	res = gnutls_init(&m_session, GNUTLS_CLIENT);
+	if (!InitSession())
+		return false;
+
+	m_shutdown_requested = false;
+
+	// At this point, we can start shaking hands.
+
+	return true;
+}
+
+bool CTlsSocket::InitSession()
+{
+	int res = gnutls_init(&m_session, GNUTLS_CLIENT);
 	if (res)
 	{
-		LogError(res);
+		LogError(res, _T("gnutls_init"));
 		Uninit();
 		return false;
 	}
 
-	res = gnutls_priority_set_direct(m_session, "NORMAL:-3DES-CBC:-MD5:-SIGN-RSA-MD5:+CTYPE-X509:-CTYPE-OPENPGP", 0);
+	// Even though the name gnutls_db_set_cache_expiration
+	// implies expiration of some cache, it also governs
+	// the actual session lifetime, independend whether the
+	// session is cached or not.
+	gnutls_db_set_cache_expiration(m_session, 100000000);
+
+	res = gnutls_priority_set_direct(m_session, ciphers, 0);
 	if (res)
 	{
-		LogError(res);
+		LogError(res, _T("gnutls_priority_set_direct"));
 		Uninit();
 		return false;
 	}
@@ -117,20 +145,12 @@
 	gnutls_transport_set_lowat(m_session, 0);
 #endif
 
-	m_shutdown_requested = false;
-
-	// At this point, we can start shaking hands.
-
 	return true;
 }
 
 void CTlsSocket::Uninit()
 {
-	if (m_session)
-	{
-		gnutls_deinit(m_session);
-		m_session = 0;
-	}
+	UninitSession();
 
 	if (m_certCredentials)
 	{
@@ -154,9 +174,25 @@
 	m_implicitTrustedCert.data = 0;
 
 	m_require_root_trust = false;
+
+#if TLSDEBUG
+	if (pLoggingControlSocket == m_pOwner)
+		pLoggingControlSocket = 0;
+#endif
+}
+
+
+void CTlsSocket::UninitSession()
+{
+	if (m_session)
+	{
+		gnutls_deinit(m_session);
+		m_session = 0;
+	}
 }
 
-void CTlsSocket::LogError(int code)
+
+void CTlsSocket::LogError(int code, const wxString& function)
 {
 	if (code == GNUTLS_E_WARNING_ALERT_RECEIVED || code == GNUTLS_E_FATAL_ALERT_RECEIVED)
 		PrintAlert();
@@ -170,10 +206,18 @@
 #else
 		wxString str(error);
 #endif
-		m_pOwner->LogMessage(::Error, _T("GnuTLS error %d: %s"), code, str.c_str());
+		if (function.IsEmpty())
+			m_pOwner->LogMessage(::Error, _T("GnuTLS error %d: %s"), code, str.c_str());
+		else
+			m_pOwner->LogMessage(::Error, _T("GnuTLS error %d in %s: %s"), code, function.c_str(), str.c_str());
 	}
 	else
-		m_pOwner->LogMessage(::Error, _T("GnuTLS error %d"), code);
+	{
+		if (function.IsEmpty())
+			m_pOwner->LogMessage(::Error, _T("GnuTLS error %d"), code);
+		else
+			m_pOwner->LogMessage(::Error, _T("GnuTLS error %d in %s"), code, function.c_str());
+	}
 }
 
 void CTlsSocket::PrintAlert()
@@ -398,10 +442,10 @@
 
 	// Get buffer size
 	int res = gnutls_session_get_data(pPrimarySocket->m_session, 0, &session_data_size);
-	if (res)
+	if (res && res != GNUTLS_E_SHORT_MEMORY_BUFFER )
 	{
-		m_pOwner->LogMessage(Debug_Info, _T("gnutls_session_get_data on primary socket failed: %d"), res);
-		return false;
+		m_pOwner->LogMessage(Debug_Warning, _T("gnutls_session_get_data on primary socket failed: %d"), res);
+		return true;
 	}
 
 	// Get session data
@@ -410,20 +454,22 @@
 	if (res)
 	{
 		delete [] session_data;
-		m_pOwner->LogMessage(Debug_Info, _T("gnutls_session_get_data on primary socket failed: %d"), res);
-		return false;
+		m_pOwner->LogMessage(Debug_Warning, _T("gnutls_session_get_data on primary socket failed: %d"), res);
+		return true;
 	}
 
 	// Set session data
-	res = gnutls_session_set_data(m_session, session_data, session_data_size);
+	res = gnutls_session_set_data(m_session, session_data, session_data_size );
 	delete [] session_data;
 	if (res)
 	{
-		m_pOwner->LogMessage(Debug_Info, _T("gnutls_session_set_data failed: %d"), res);
-		return false;
+		m_pOwner->LogMessage(Debug_Info, _T("gnutls_session_set_data failed: %d. Going to reinitialize session."), res);
+		UninitSession();
+		if (!InitSession())
+			return false;
 	}
-
-	m_pOwner->LogMessage(Debug_Info, _T("Trying to resume existing TLS session."));
+	else
+		m_pOwner->LogMessage(Debug_Info, _T("Trying to resume existing TLS session."));
 
 	return true;
 }
@@ -447,13 +493,17 @@
 		const gnutls_datum_t* const cert_list = gnutls_certificate_get_peers(pPrimarySocket->m_session, &cert_list_size);
 		if (cert_list && cert_list_size)
 		{
+			delete [] m_implicitTrustedCert.data;
 			m_implicitTrustedCert.data = new unsigned char[cert_list[0].size];
 			memcpy(m_implicitTrustedCert.data, cert_list[0].data, cert_list[0].size);
 			m_implicitTrustedCert.size = cert_list[0].size;
 		}
 
 		if (try_resume)
-			CopySessionData(pPrimarySocket);
+		{
+			if (!CopySessionData(pPrimarySocket))
+				return FZ_REPLY_ERROR;
+		}
 	}
 
 	return ContinueHandshake();
@@ -466,6 +516,13 @@
 	wxASSERT(m_tlsState == handshake);
 
 	int res = gnutls_handshake(m_session);
+	while (res == GNUTLS_E_AGAIN || res == GNUTLS_E_INTERRUPTED)
+	{
+		if ( gnutls_record_get_direction(m_session) != 1 || !m_canWriteToSocket )
+			break;
+
+		res = gnutls_handshake(m_session);
+	}
 	if (!res)
 	{
 		m_pOwner->LogMessage(Debug_Info, _T("TLS Handshake successful"));
@@ -473,10 +530,12 @@
 		if (ResumedSession())
 			m_pOwner->LogMessage(Debug_Info, _T("TLS Session resumed"));
 
-		const wxString& cipherName = GetCipherName();
-		const wxString& macName = GetMacName();
+		const wxString protocol = GetProtocolName();
+		const wxString keyExchange = GetKeyExchange();
+		const wxString cipherName = GetCipherName();
+		const wxString macName = GetMacName();
 
-		m_pOwner->LogMessage(Debug_Info, _T("Cipher: %s, MAC: %s"), cipherName.c_str(), macName.c_str());
+		m_pOwner->LogMessage(Debug_Info, _T("Protocol: %s, Key exchange: %s, Cipher: %s, MAC: %s"), protocol.c_str(), keyExchange.c_str(), cipherName.c_str(), macName.c_str());
 
 		res = VerifyCertificate();
 		if (res != FZ_REPLY_OK)
@@ -569,7 +628,7 @@
 	}
 	else
 	{
-		Failure(res, 0);
+		Failure(res, 0, _T("gnutls_record_recv"));
 		error = ECONNABORTED;
 	}
 
@@ -605,6 +664,10 @@
 	buffer = (char*)buffer + m_writeSkip;
 
 	int res = gnutls_record_send(m_session, buffer, len);
+
+	while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket)
+		res = gnutls_record_send(m_session, 0, 0);
+
 	if (res >= 0)
 	{
 		error = 0;
@@ -633,7 +696,7 @@
 	}
 	else
 	{
-		Failure(res, 0);
+		Failure(res, 0, _T("gnutls_record_send"));
 		error = ECONNABORTED;
 		return -1;
 	}
@@ -663,7 +726,10 @@
 {
 	if (m_lastWriteFailed)
 	{
-		int res = gnutls_record_send(m_session, 0, 0);
+		int res = GNUTLS_E_AGAIN;
+		while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket)
+			res = gnutls_record_send(m_session, 0, 0);
+
 		if (res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN)
 			return;
 
@@ -711,14 +777,23 @@
 	}
 }
 
-void CTlsSocket::Failure(int code, int socket_error)
+void CTlsSocket::Failure(int code, int socket_error, const wxString& function)
 {
 	m_pOwner->LogMessage(::Debug_Debug, _T("CTlsSocket::Failure(%d, %d)"), code, socket_error);
 	if (code)
 	{
-		LogError(code);
-		if (code == GNUTLS_E_UNEXPECTED_PACKET_LENGTH && m_socket_eof)
-			m_pOwner->LogMessage(Status, _("Server did not properly shut down TLS connection"));
+		LogError(code, function);
+		if (m_socket_eof)
+		{
+			if (code == GNUTLS_E_UNEXPECTED_PACKET_LENGTH
+#ifdef GNUTLS_E_PREMATURE_TERMINATION
+				|| code == GNUTLS_E_PREMATURE_TERMINATION
+#endif
+				)
+			{
+				m_pOwner->LogMessage(Status, _("Server did not properly shut down TLS connection"));
+			}
+		}
 	}
 	Uninit();
 
@@ -775,6 +850,8 @@
 	m_tlsState = closing;
 
 	int res = gnutls_bye(m_session, GNUTLS_SHUT_WR);
+	while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket)
+		res = gnutls_bye(m_session, GNUTLS_SHUT_WR);
 	if (!res)
 	{
 		m_tlsState = closed;
@@ -793,6 +870,8 @@
 	m_pOwner->LogMessage(Debug_Verbose, _T("CTlsSocket::ContinueShutdown()"));
 
 	int res = gnutls_bye(m_session, GNUTLS_SHUT_WR);
+	while ((res == GNUTLS_E_INTERRUPTED || res == GNUTLS_E_AGAIN) && m_canWriteToSocket)
+		res = gnutls_bye(m_session, GNUTLS_SHUT_WR);
 	if (!res)
 	{
 		m_tlsState = closed;
@@ -851,6 +930,140 @@
 	return str;
 }
 
+
+bool CTlsSocket::ExtractCert(const void* in, CCertificate& out)
+{
+	const gnutls_datum_t* datum = reinterpret_cast<const gnutls_datum_t*>(in);
+	
+	gnutls_x509_crt_t cert;
+	if (gnutls_x509_crt_init(&cert))
+	{
+		m_pOwner->LogMessage(::Error, _("Could not initialize structure for peer certificates, gnutls_x509_crt_init failed"));
+		return false;
+	}
+
+	if (gnutls_x509_crt_import(cert, datum, GNUTLS_X509_FMT_DER))
+	{
+		m_pOwner->LogMessage(::Error, _("Could not import peer certificates, gnutls_x509_crt_import failed"));
+		gnutls_x509_crt_deinit(cert);
+		return false;
+	}
+
+	wxDateTime expirationTime = gnutls_x509_crt_get_expiration_time(cert);
+	wxDateTime activationTime = gnutls_x509_crt_get_activation_time(cert);
+
+	// Get the serial number of the certificate
+	unsigned char buffer[40];
+	size_t size = sizeof(buffer);
+	int res = gnutls_x509_crt_get_serial(cert, buffer, &size);
+	if( res != 0 ) {
+		size = 0;
+	}
+
+	wxString serial = bin2hex(buffer, size);
+
+	unsigned int pkBits;
+	int pkAlgo = gnutls_x509_crt_get_pk_algorithm(cert, &pkBits);
+	wxString pkAlgoName;
+	if (pkAlgo >= 0)
+	{
+		const char* pAlgo = gnutls_pk_algorithm_get_name((gnutls_pk_algorithm_t)pkAlgo);
+		if (pAlgo)
+			pkAlgoName = wxString(pAlgo, wxConvUTF8);
+	}
+
+	int signAlgo = gnutls_x509_crt_get_signature_algorithm(cert);
+	wxString signAlgoName;
+	if (signAlgo >= 0)
+	{
+		const char* pAlgo = gnutls_sign_algorithm_get_name((gnutls_sign_algorithm_t)signAlgo);
+		if (pAlgo)
+			signAlgoName = wxString(pAlgo, wxConvUTF8);
+	}
+
+	wxString subject, issuer;
+
+	size = 0;
+	res = gnutls_x509_crt_get_dn(cert, 0, &size);
+	if (size)
+	{
+		char* dn = new char[size + 1];
+		dn[size] = 0;
+		if (!(res = gnutls_x509_crt_get_dn(cert, dn, &size)))
+		{
+			dn[size] = 0;
+			subject = wxString(dn, wxConvUTF8);
+		}
+		else
+			LogError(res, _T("gnutls_x509_crt_get_dn"));
+		delete [] dn;
+	}
+	else
+		LogError(res, _T("gnutls_x509_crt_get_dn"));
+	if (subject == _T(""))
+	{
+		m_pOwner->LogMessage(::Error, _("Could not get distinguished name of certificate subject, gnutls_x509_get_dn failed"));
+		gnutls_x509_crt_deinit(cert);
+		return false;
+	}
+
+	size = 0;
+	res = gnutls_x509_crt_get_issuer_dn(cert, 0, &size);
+	if (size)
+	{
+		char* dn = new char[++size + 1];
+		dn[size] = 0;
+		if (!(res = gnutls_x509_crt_get_issuer_dn(cert, dn, &size)))
+		{
+			dn[size] = 0;
+			issuer = wxString(dn, wxConvUTF8);
+		}
+		else
+			LogError(res, _T("gnutls_x509_crt_get_issuer_dn"));
+		delete [] dn;
+	}
+	else
+		LogError(res, _T("gnutls_x509_crt_get_issuer_dn"));
+	if (issuer == _T(""))
+	{
+		m_pOwner->LogMessage(::Error, _("Could not get distinguished name of certificate issuer, gnutls_x509_get_issuer_dn failed"));
+		gnutls_x509_crt_deinit(cert);
+		return false;
+	}
+
+	wxString fingerprint_md5;
+	wxString fingerprint_sha1;
+
+	unsigned char digest[100];
+	size = sizeof(digest) - 1;
+	if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_MD5, digest, &size))
+	{
+		digest[size] = 0;
+		fingerprint_md5 = bin2hex(digest, size);
+	}
+	size = sizeof(digest) - 1;
+	if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, &size))
+	{
+		digest[size] = 0;
+		fingerprint_sha1 = bin2hex(digest, size);
+	}
+
+	gnutls_x509_crt_deinit(cert);
+
+	out = CCertificate(
+		datum->data, datum->size,
+		activationTime, expirationTime,
+		serial,
+		pkAlgoName, pkBits,
+		signAlgoName,
+		fingerprint_md5,
+		fingerprint_sha1,
+		subject,
+		issuer);
+
+	return true;
+}
+
 int CTlsSocket::VerifyCertificate()
 {
 	if (m_tlsState != handshake)
@@ -926,127 +1139,23 @@
 	std::vector<CCertificate> certificates;
 	for (unsigned int i = 0; i < cert_list_size; i++)
 	{
-		gnutls_x509_crt_t cert;
-		if (gnutls_x509_crt_init(&cert))
-		{
-			m_pOwner->LogMessage(::Error, _("Could not initialize structure for peer certificates, gnutls_x509_crt_init failed"));
-			Failure(0, ECONNABORTED);
-			return FZ_REPLY_ERROR;
-		}
-
-		if (gnutls_x509_crt_import(cert, cert_list, GNUTLS_X509_FMT_DER))
-		{
-			m_pOwner->LogMessage(::Error, _("Could not import peer certificates, gnutls_x509_crt_import failed"));
-			Failure(0, ECONNABORTED);
-			gnutls_x509_crt_deinit(cert);
-			return FZ_REPLY_ERROR;
-		}
-
-		wxDateTime expirationTime = gnutls_x509_crt_get_expiration_time(cert);
-		wxDateTime activationTime = gnutls_x509_crt_get_activation_time(cert);
-
-		// Get the serial number of the certificate
-		unsigned char buffer[40];
-		size_t size = sizeof(buffer);
-		int res = gnutls_x509_crt_get_serial(cert, buffer, &size);
-
-		wxString serial = bin2hex(buffer, size);
-
-		unsigned int bits;
-		int algo = gnutls_x509_crt_get_pk_algorithm(cert, &bits);
-
-		wxString algoName;
-		const char* pAlgo = gnutls_pk_algorithm_get_name((gnutls_pk_algorithm_t)algo);
-		if (pAlgo)
-			algoName = wxString(pAlgo, wxConvUTF8);
-
-		//int version = gnutls_x509_crt_get_version(cert);
-
-		wxString subject, issuer;
-
-		size = 0;
-		res = gnutls_x509_crt_get_dn(cert, 0, &size);
-		if (size)
-		{
-			char* dn = new char[size + 1];
-			dn[size] = 0;
-			if (!(res = gnutls_x509_crt_get_dn(cert, dn, &size)))
-			{
-				dn[size] = 0;
-				subject = wxString(dn, wxConvUTF8);
-			}
-			else
-				LogError(res);
-			delete [] dn;
-		}
-		else
-			LogError(res);
-		if (subject == _T(""))
-		{
-			m_pOwner->LogMessage(::Error, _("Could not get distinguished name of certificate subject, gnutls_x509_get_dn failed"));
-			Failure(0, ECONNABORTED);
-			gnutls_x509_crt_deinit(cert);
-			return FZ_REPLY_ERROR;
-		}
-
-		size = 0;
-		res = gnutls_x509_crt_get_issuer_dn(cert, 0, &size);
-		if (size)
-		{
-			char* dn = new char[++size + 1];
-			dn[size] = 0;
-			if (!(res = gnutls_x509_crt_get_issuer_dn(cert, dn, &size)))
-			{
-				dn[size] = 0;
-				issuer = wxString(dn, wxConvUTF8);
-			}
-			else
-				LogError(res);
-			delete [] dn;
-		}
+		CCertificate cert;
+		if (ExtractCert(cert_list, cert))
+			certificates.push_back(cert);
 		else
-			LogError(res);
-		if (issuer == _T(""))
 		{
-			m_pOwner->LogMessage(::Error, _("Could not get distinguished name of certificate issuer, gnutls_x509_get_issuer_dn failed"));
 			Failure(0, ECONNABORTED);
-			gnutls_x509_crt_deinit(cert);
 			return FZ_REPLY_ERROR;
 		}
 
-		wxString fingerprint_md5;
-		wxString fingerprint_sha1;
-
-		unsigned char digest[100];
-		size = sizeof(digest) - 1;
-		if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_MD5, digest, &size))
-		{
-			digest[size] = 0;
-			fingerprint_md5 = bin2hex(digest, size);
-		}
-		size = sizeof(digest) - 1;
-		if (!gnutls_x509_crt_get_fingerprint(cert, GNUTLS_DIG_SHA1, digest, &size))
-		{
-			digest[size] = 0;
-			fingerprint_sha1 = bin2hex(digest, size);
-		}
-
-		certificates.push_back(CCertificate(
-			cert_list->data, cert_list->size,
-			activationTime, expirationTime,
-			serial,
-			algoName, bits,
-			fingerprint_md5,
-			fingerprint_sha1,
-			subject,
-			issuer));
-
-		cert_list++;
+		++cert_list;
 	}
 
 	CCertificateNotification *pNotification = new CCertificateNotification(
 		m_pOwner->GetCurrentServer()->GetHost(),
 		m_pOwner->GetCurrentServer()->GetPort(),
+		GetProtocolName(),
+		GetKeyExchange(),
 		GetCipherName(),
 		GetMacName(),
 		certificates);
@@ -1062,13 +1171,35 @@
 {
 }
 
+wxString CTlsSocket::GetProtocolName()
+{
+	wxString protocol = _("unknown");
+
+	const char* s = gnutls_protocol_get_name( gnutls_protocol_get_version( m_session ) );
+	if (s && *s)
+		protocol = wxString(s, wxConvUTF8);
+
+	return protocol;
+}
+
+wxString CTlsSocket::GetKeyExchange()
+{
+	wxString keyExchange = _("unknown");
+
+	const char* s = gnutls_kx_get_name( gnutls_kx_get( m_session ) );
+	if (s && *s)
+		keyExchange = wxString(s, wxConvUTF8);
+
+	return keyExchange;
+}
+
 wxString CTlsSocket::GetCipherName()
 {
 	const char* cipher = gnutls_cipher_get_name(gnutls_cipher_get(m_session));
 	if (cipher && *cipher)
 		return wxString(cipher, wxConvUTF8);
 	else
-		return _T("unknown");
+		return _("unknown");
 }
 
 wxString CTlsSocket::GetMacName()
@@ -1098,3 +1229,52 @@
 
 	return gnutls_certificate_set_x509_trust_mem(m_certCredentials, &datum, GNUTLS_X509_FMT_PEM) > 0;
 }
+
+wxString CTlsSocket::ListTlsCiphers(wxString priority)
+{
+	if (priority.IsEmpty())
+		priority = wxString::FromUTF8(ciphers);
+
+	wxString list = wxString::Format(_T("Ciphers for %s:\n"), priority.c_str());
+
+#if GNUTLS_VERSION_NUMBER >= 0x030009
+	gnutls_priority_t pcache;
+	const char *err = 0;
+	int ret = gnutls_priority_init(&pcache, priority.mb_str(), &err);
+	if (ret < 0)
+	{
+		list += wxString::Format(_T("gnutls_priority_init failed with code %d: %s"), ret, wxString::FromUTF8(err ? err : "").c_str());
+		return list;
+	}
+	else
+	{
+		for (size_t i = 0; ; i++)
+		{
+			unsigned int idx;
+			ret = gnutls_priority_get_cipher_suite_index(pcache, i, &idx);
+			if (ret == GNUTLS_E_REQUESTED_DATA_NOT_AVAILABLE)
+				break;
+			if (ret == GNUTLS_E_UNKNOWN_CIPHER_SUITE)
+				continue;
+
+			gnutls_protocol_t version;
+			unsigned char id[2];
+			const char* name = gnutls_cipher_suite_info(idx, id, NULL, NULL, NULL, &version);
+
+			if (name != 0)
+			{
+				list += wxString::Format(
+					_T("%-50s    0x%02x, 0x%02x    %s\n"),
+					wxString::FromUTF8(name).c_str(),
+					(unsigned char)id[0],
+					(unsigned char)id[1],
+					wxString::FromUTF8(gnutls_protocol_get_name(version)).c_str());
+			}
+		}
+	}
+#else
+	list += _T("Unknown\n");
+#endif
+
+	return list;
+}
diff -Nru filezilla-3.5.3/src/engine/tlssocket.h filezilla-3.7.3~precise/src/engine/tlssocket.h
--- filezilla-3.5.3/src/engine/tlssocket.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/tlssocket.h	2013-06-02 03:30:08.000000000 +0000
@@ -1,7 +1,6 @@
 #ifndef __TLSSOCKET_H__
 #define __TLSSOCKET_H__
 
-#define ssize_t long
 #include <gnutls/gnutls.h>
 #include "backend.h"
 #include "socket.h"
@@ -38,22 +37,29 @@
 
 	enum TlsState GetState() const { return m_tlsState; }
 
+	wxString GetProtocolName();
+	wxString GetKeyExchange();
 	wxString GetCipherName();
 	wxString GetMacName();
 
 	bool ResumedSession() const;
-	
+
 	// PEM formatted
 	bool AddTrustedRootCertificate(const wxString& cert);
+
+	static wxString ListTlsCiphers(wxString priority);
+
 protected:
 
+	bool InitSession();
+	void UninitSession();
 	bool CopySessionData(const CTlsSocket* pPrimarySocket);
 
 	virtual void OnRateAvailable(enum CRateLimiter::rate_direction direction);
 
 	int ContinueHandshake();
 	void ContinueShutdown();
-	
+
 	int VerifyCertificate();
 
 	enum TlsState m_tlsState;
@@ -65,11 +71,11 @@
 
 	gnutls_certificate_credentials_t m_certCredentials;
 
-	void LogError(int code);
+	void LogError(int code, const wxString& function);
 	void PrintAlert();
-	
+
 	// Failure logs the error, uninits the session and sends a close event
-	void Failure(int code, int socket_error);
+	void Failure(int code, int socket_error, const wxString& function = _T(""));
 
 	static ssize_t PushFunction(gnutls_transport_ptr_t ptr, const void* data, size_t len);
 	static ssize_t PullFunction(gnutls_transport_ptr_t ptr, void* data, size_t len);
@@ -82,6 +88,8 @@
 	void OnRead();
 	void OnSend();
 
+	bool ExtractCert(const void* in, CCertificate& out);
+
 	bool m_canReadFromSocket;
 	bool m_canWriteToSocket;
 	bool m_canCheckCloseSocket;
diff -Nru filezilla-3.5.3/src/engine/transfersocket.cpp filezilla-3.7.3~precise/src/engine/transfersocket.cpp
--- filezilla-3.5.3/src/engine/transfersocket.cpp	2010-10-04 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/transfersocket.cpp	2013-06-10 18:45:04.000000000 +0000
@@ -11,7 +11,7 @@
 
 BEGIN_EVENT_TABLE(CTransferSocket, wxEvtHandler)
 	EVT_IOTHREAD(wxID_ANY, CTransferSocket::OnIOThreadEvent)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CTransferSocket::CTransferSocket(CFileZillaEnginePrivate *pEngine, CFtpControlSocket *pControlSocket, enum TransferMode transferMode)
 {
@@ -66,7 +66,7 @@
 	{
 		if (m_transferMode == upload || m_transferMode == download)
 		{
-			CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);;
+			CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);
 			if (pData && pData->pIOThread)
 			{
 				if (m_transferMode == download)
@@ -83,9 +83,8 @@
 	delete m_pSocket;
 	m_pSocket = 0;
 	delete m_pSocketServer;
-	m_pSocketServer = 0;
-
 	m_pSocketServer = CreateSocketServer();
+
 	if (!m_pSocketServer)
 	{
 		m_pControlSocket->LogMessage(::Debug_Warning, _T("CreateSocketServer failed"));
@@ -166,7 +165,16 @@
 	switch (event.GetType())
 	{
 	case CSocketEvent::connection:
-		OnConnect();
+		if (event.GetError())
+		{
+			if (!m_transferEndReason)
+			{
+				m_pControlSocket->LogMessage(::Error, _("The data connection could not be established: %s"), CSocket::GetErrorDescription(event.GetError()).c_str());
+				TransferEnd(transfer_failure);
+			}
+		}
+		else
+			OnConnect();
 		break;
 	case CSocketEvent::read:
 		OnReceive();
@@ -266,7 +274,7 @@
 
 	if (m_transferMode == list)
 	{
-		while (true)
+		for (;;)
 		{
 			char *pBuffer = new char[4096];
 			int error;
@@ -311,7 +319,7 @@
 	}
 	else if (m_transferMode == download)
 	{
-		while (true)
+		for (;;)
 		{
 			if (!CheckGetNextWriteBuffer())
 				return;
@@ -355,7 +363,7 @@
 	}
 	else if (m_transferMode == resumetest)
 	{
-		while (true)
+		for (;;)
 		{
 			char buffer[2];
 			int error;
@@ -406,7 +414,10 @@
 void CTransferSocket::OnSend()
 {
 	if (!m_pBackend)
+	{
+		m_pControlSocket->LogMessage(::Debug_Verbose, _T("OnSend called without backend. Ignoring event."));
 		return;
+	}
 
 	if (!m_bActive)
 	{
@@ -539,7 +550,6 @@
 {
 	// Void all previous attempts to createt a socket
 	delete m_pSocket;
-	m_pSocket = 0;
 	delete m_pSocketServer;
 	m_pSocketServer = 0;
 
@@ -587,7 +597,7 @@
 		return;
 	if (m_transferMode == download || m_transferMode == upload)
 	{
-		CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);;
+		CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);
 		if (pData && pData->pIOThread)
 			pData->pIOThread->SetEventHandler(this);
 	}
@@ -595,7 +605,7 @@
 	m_bActive = true;
 	if (!m_pSocket)
 		return;
-	
+
 	if (m_pSocket->GetState() == CSocket::connected || m_pSocket->GetState() == CSocket::closing)
 		TriggerPostponedEvents();
 }
@@ -618,7 +628,7 @@
 	{
 		if (m_pBackend == m_pTlsSocket)
 			m_pBackend = 0;
-        delete m_pTlsSocket;
+		delete m_pTlsSocket;
 		m_pTlsSocket = 0;
 	}
 
@@ -696,7 +706,7 @@
 
 bool CTransferSocket::CheckGetNextWriteBuffer()
 {
-	CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);;
+	CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);
 	if (!m_transferBufferLen)
 	{
 		int res = pData->pIOThread->GetNextWriteBuffer(&m_pTransferBuffer);
@@ -722,7 +732,7 @@
 
 bool CTransferSocket::CheckGetNextReadBuffer()
 {
-	CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);;
+	CFtpFileTransferOpData *pData = static_cast<CFtpFileTransferOpData *>(static_cast<CRawTransferOpData *>(m_pControlSocket->m_pCurOpData)->pOldData);
 	if (!m_transferBufferLen)
 	{
 		int res = pData->pIOThread->GetNextReadBuffer(&m_pTransferBuffer);
@@ -739,7 +749,7 @@
 			if (m_pTlsSocket)
 			{
 				m_shutdown = true;
-				
+
 				int error = m_pTlsSocket->Shutdown();
 				if (error != 0)
 				{
diff -Nru filezilla-3.5.3/src/engine/transfersocket.h filezilla-3.7.3~precise/src/engine/transfersocket.h
--- filezilla-3.5.3/src/engine/transfersocket.h	2008-09-05 02:00:38.000000000 +0000
+++ filezilla-3.7.3~precise/src/engine/transfersocket.h	2013-06-09 03:30:07.000000000 +0000
@@ -60,7 +60,7 @@
 
 	void SetSocketBufferSizes(CSocket* pSocket);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 
 	CSocket *m_pSocket;
 
diff -Nru filezilla-3.5.3/src/fzshellext/Makefile.in filezilla-3.7.3~precise/src/fzshellext/Makefile.in
--- filezilla-3.5.3/src/fzshellext/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/src/fzshellext/Makefile.in	2013-08-07 19:17:13.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -45,8 +62,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -74,6 +92,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(libdir)"
 LTLIBRARIES = $(lib_LTLIBRARIES)
 libfzshellext_la_LIBADD =
@@ -97,6 +121,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libfzshellext_la_SOURCES)
 DIST_SOURCES = $(libfzshellext_la_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -124,6 +153,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -161,6 +191,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -206,6 +237,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -239,7 +271,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -311,7 +342,6 @@
 	cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@
 install-libLTLIBRARIES: $(lib_LTLIBRARIES)
 	@$(NORMAL_INSTALL)
-	test -z "$(libdir)" || $(MKDIR_P) "$(DESTDIR)$(libdir)"
 	@list='$(lib_LTLIBRARIES)'; test -n "$(libdir)" || list=; \
 	list2=; for p in $$list; do \
 	  if test -f $$p; then \
@@ -319,6 +349,8 @@
 	  else :; fi; \
 	done; \
 	test -z "$$list2" || { \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(libdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(libdir)" || exit 1; \
 	  echo " $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 '$(DESTDIR)$(libdir)'"; \
 	  $(LIBTOOL) $(AM_LIBTOOLFLAGS) $(LIBTOOLFLAGS) --mode=install $(INSTALL) $(INSTALL_STRIP_FLAG) $$list2 "$(DESTDIR)$(libdir)"; \
 	}
@@ -340,7 +372,7 @@
 	  echo "rm -f \"$${dir}/so_locations\""; \
 	  rm -f "$${dir}/so_locations"; \
 	done
-libfzshellext.la: $(libfzshellext_la_OBJECTS) $(libfzshellext_la_DEPENDENCIES) 
+libfzshellext.la: $(libfzshellext_la_OBJECTS) $(libfzshellext_la_DEPENDENCIES) $(EXTRA_libfzshellext_la_DEPENDENCIES) 
 	$(libfzshellext_la_LINK) -rpath $(libdir) $(libfzshellext_la_OBJECTS) $(libfzshellext_la_LIBADD) $(LIBS)
 
 mostlyclean-compile:
@@ -479,10 +511,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/fzshellext/fzshellext.rc filezilla-3.7.3~precise/src/fzshellext/fzshellext.rc
--- filezilla-3.5.3/src/fzshellext/fzshellext.rc	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/fzshellext/fzshellext.rc	2013-04-29 03:30:06.000000000 +0000
@@ -25,7 +25,7 @@
             VALUE "FileDescription", "fzshellext Dynamic Link Library"
             VALUE "FileVersion", "3, 2, 7, 0"
             VALUE "InternalName", "fzshellext"
-            VALUE "LegalCopyright", "Copyright (C) 2006-2011"
+            VALUE "LegalCopyright", "Copyright (C) 2006-2013"
             VALUE "OriginalFilename", "fzshellext.dll"
             VALUE "ProductName", " fzshellext Dynamic Link Library"
             VALUE "ProductVersion", "3, 2, 7, 0"
diff -Nru filezilla-3.5.3/src/fzshellext/shellext.cpp filezilla-3.7.3~precise/src/fzshellext/shellext.cpp
--- filezilla-3.5.3/src/fzshellext/shellext.cpp	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/fzshellext/shellext.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -5,17 +5,20 @@
 #define _UNICODE
 #endif
 
+
 //---------------------------------------------------------------------------
 #ifdef _MSC_VER
 	#include <objbase.h>
 	#define snprintf _snprintf
-	
-	// The decision what will get exported is done using fzshellext.def 
+
+	// The decision what will get exported is done using fzshellext.def
 	#define STDEXPORTAPI STDAPI
 #else
 	#define STDEXPORTAPI extern "C" __declspec(dllexport) HRESULT STDAPICALLTYPE
 
-	// Currently, the MinGW w32api has no unicode version of ICopyHook. As such,
+	#include <config.h>
+#if !HAVE_ICOPYHOOKW
+	// Some versions of the MinGW w32api have no unicode version of ICopyHook. As such,
 	// declare ICopyHookW manually.
 
 	// Use some #define magic to prevent LPCOPYHOOK being declared
@@ -33,6 +36,7 @@
 	};
 	#undef INTERFACE
 	typedef ICopyHookW *LPCOPYHOOK;
+#endif // !HAVE_ICOPYHOOKW
 
 #endif
 
@@ -58,11 +62,11 @@
 	{ \
 		DebugW(MSG); \
 	}
-	
+
 //---------------------------------------------------------------------------
 #define DRAG_EXT_REG_KEY _T("Software\\FileZilla 3\\fzshellext")
 #define DRAG_EXT_REG_KEY_PARENT _T("Software\\FileZilla 3")
-#define DRAG_EXT_NAME _T("FileZilla 3 Shell Extension")
+#define DRAG_EXT_NAME   _T("FileZilla 3 Shell Extension")
 #define THREADING_MODEL _T("Apartment")
 #define CLSID_SIZE 39
 
@@ -183,7 +187,7 @@
 		Debug("WideCharToMultiByte failed");
 	else
 	{
-        buffer[written] = 0;
+		buffer[written] = 0;
 		Debug(buffer);
 	}
 	delete [] buffer;
@@ -220,13 +224,13 @@
 
 	VS_FIXEDFILEINFO* VersionInfo;
 	unsigned int VersionInfoSize;
-	if (!VerQueryValueA(Info, "\\", reinterpret_cast<void**>(&VersionInfo),	&VersionInfoSize))
+	if (!VerQueryValueA(Info, "\\", reinterpret_cast<void**>(&VersionInfo), &VersionInfoSize))
 	{
 		delete [] Info;
 		Debug("LogVersion return: no fixed version info");
 		return;
 	}
-	
+
 	char VersionStr[100];
 	snprintf(VersionStr, sizeof(VersionStr), "LogVersion %d.%d.%d.%d",
 		HIWORD(VersionInfo->dwFileVersionMS),
@@ -434,24 +438,24 @@
 static bool RegDeleteEmptyKey(HKEY root, LPCTSTR name)
 {
 	HKEY key;
-	
+
 	// Can't use SHDeleteEmptyKey, it gives a linking error
 	if (RegOpenKeyEx(root, name, 0, KEY_READ, &key) != ERROR_SUCCESS)
 		return false;
 
 	DWORD subKeys, values;
 	int ret = RegQueryInfoKey(key, 0, 0, 0, &subKeys, 0, 0, &values, 0, 0, 0,0);
-	
+
 	RegCloseKey(key);
-	
+
 	if (ret != ERROR_SUCCESS)
 		return false;
-	
+
 	if (subKeys || values)
 		return false;
 
 	RegDeleteKey(root, name);
-	
+
 	return true;
 }
 
@@ -884,7 +888,7 @@
 		DEBUG_MSG("CShellExt::CopyCallback mapview NOT created");
 	}
 
-	CloseHandle(MapFile);	
-	
+	CloseHandle(MapFile);
+
 	return Result;
 }
diff -Nru filezilla-3.5.3/src/fzshellext/shellext.h filezilla-3.7.3~precise/src/fzshellext/shellext.h
--- filezilla-3.5.3/src/fzshellext/shellext.h	2007-11-23 11:34:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/fzshellext/shellext.h	2012-10-06 03:30:12.000000000 +0000
@@ -11,11 +11,11 @@
 #define DRAG_EXT_DUMMY_DIR_PREFIX_LEN 4
 
 // {DB70412E-EEC9-479c-BBA9-BE36BFDDA41B}
-DEFINE_GUID(CLSID_ShellExtension, 
+DEFINE_GUID(CLSID_ShellExtension,
 0xdb70412e, 0xeec9, 0x479c, 0xbb, 0xa9, 0xbe, 0x36, 0xbf, 0xdd, 0xa4, 0x1b);
 
 // Internal structure of the file mapping
-// (Note: direct mappings to some struct cannot be used since structs are 
+// (Note: direct mappings to some struct cannot be used since structs are
 //  usually aligned differently depending on used compiler)
 //
 // Version number: 1 byte
diff -Nru filezilla-3.5.3/src/fzshellext/version.rc.in filezilla-3.7.3~precise/src/fzshellext/version.rc.in
--- filezilla-3.5.3/src/fzshellext/version.rc.in	2011-05-24 03:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/fzshellext/version.rc.in	2013-04-29 03:30:06.000000000 +0000
@@ -17,7 +17,7 @@
         BEGIN
             VALUE "FileDescription", "fzshellext Dynamic Link Library"
             VALUE "InternalName", "fzshellext"
-            VALUE "LegalCopyright", "Copyright (C) 2006-2011"
+            VALUE "LegalCopyright", "Copyright (C) 2006-2013"
             VALUE "OriginalFilename", "fzshellext.dll"
             VALUE "ProductName", " fzshellext Dynamic Link Library"
             VALUE "Comments", "Version @PACKAGE_VERSION@"
diff -Nru filezilla-3.5.3/src/include/FileZillaEngine.h filezilla-3.7.3~precise/src/include/FileZillaEngine.h
--- filezilla-3.5.3/src/include/FileZillaEngine.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/FileZillaEngine.h	2012-10-06 03:30:11.000000000 +0000
@@ -16,16 +16,16 @@
 	// The COptionsBase instance has to be the same for every instance of CFileZillaEngine
 	int Init(wxEvtHandler *pEventHandler, COptionsBase *pOptions);
 
-	// TODO: Init function with a function pointer for a callback function for 
+	// TODO: Init function with a function pointer for a callback function for
 	// notifications. Not all users of the engine use wxWidgets.
 
-    // Execute the given command. See commands.h for a list of the available 
+	// Execute the given command. See commands.h for a list of the available
 	// commands and reply codes.
 	int Command(const CCommand &command);
 
 	bool IsBusy() const;
 	bool IsConnected() const;
-	
+
 	// IsActive returns true only if data has been transferred in the
 	// given direction since the last time IsActive was called with
 	// the same argument.
@@ -50,7 +50,7 @@
 	// See notifiction.h for details.
 	bool IsPendingAsyncRequestReply(const CAsyncRequestNotification *pNotification);
 	bool SetAsyncRequestReply(CAsyncRequestNotification *pNotification);
-	
+
 	// Get a progress update about the current transfer. changed will be set
 	// to true if the data has been updated compared to the last time
 	// GetTransferStatus was called.
diff -Nru filezilla-3.5.3/src/include/Makefile.in filezilla-3.7.3~precise/src/include/Makefile.in
--- filezilla-3.5.3/src/include/Makefile.in	2012-01-08 13:29:12.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 # these are the headers for your project
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,8 +61,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -54,6 +72,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -80,6 +103,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -117,6 +141,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -162,6 +187,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -195,7 +221,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -274,10 +299,8 @@
 $(am__aclocal_m4_deps):
 
 config.h: stamp-h1
-	@if test ! -f $@; then \
-	  rm -f stamp-h1; \
-	  $(MAKE) $(AM_MAKEFLAGS) stamp-h1; \
-	else :; fi
+	@if test ! -f $@; then rm -f stamp-h1; else :; fi
+	@if test ! -f $@; then $(MAKE) $(AM_MAKEFLAGS) stamp-h1; else :; fi
 
 stamp-h1: $(srcdir)/config.h.in $(top_builddir)/config.status
 	@rm -f stamp-h1
@@ -392,10 +415,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/include/commands.h filezilla-3.7.3~precise/src/include/commands.h
--- filezilla-3.5.3/src/include/commands.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/commands.h	2012-10-25 03:30:07.000000000 +0000
@@ -36,7 +36,7 @@
 #define FZ_REPLY_SYNTAXERROR	(0x0010 | FZ_REPLY_ERROR)
 #define FZ_REPLY_NOTCONNECTED	(0x0020 | FZ_REPLY_ERROR)
 #define FZ_REPLY_DISCONNECTED	(0x0040)
-#define FZ_REPLY_INTERNALERROR	(0x0080 | FZ_REPLY_ERROR) // If you get this reply, the error description will be 
+#define FZ_REPLY_INTERNALERROR	(0x0080 | FZ_REPLY_ERROR) // If you get this reply, the error description will be
 														  // given by the last Debug_Warning log message. This
 														  // should not happen unless there is a bug in FileZilla 3.
 #define FZ_REPLY_BUSY			(0x0100 | FZ_REPLY_ERROR)
@@ -64,8 +64,8 @@
 class CCommand
 {
 public:
-	CCommand() { }
-	virtual ~CCommand() { }
+	CCommand() {}
+	virtual ~CCommand() {}
 	virtual enum Command GetId() const = 0;
 	virtual CCommand *Clone() const = 0;
 };
@@ -94,7 +94,7 @@
 	// Without a given directory, the current directory will be listed.
 	// Directories can either be given as absolute path or as
 	// pair of an absolute path and the very last path segments.
-	
+
 	// Set LIST_FLAG_REFRESH to get a directory listing even if a cache
 	// lookup can be made after finding out true remote directory.
 	//
@@ -110,7 +110,7 @@
 	// directories.
 	CListCommand(int flags = 0);
 	CListCommand(CServerPath path, wxString subDir = _T(""), int flags = 0);
-	
+
 	CServerPath GetPath() const;
 	wxString GetSubDir() const;
 
@@ -124,8 +124,13 @@
 
 DECLARE_COMMAND(CFileTransferCommand, cmd_transfer)
 
-	struct t_transferSettings
+	class t_transferSettings
 	{
+	public:
+		t_transferSettings()
+			: binary(true)
+		{}
+
 		bool binary;
 	};
 
@@ -160,7 +165,7 @@
 
 DECLARE_COMMAND(CDeleteCommand, cmd_delete)
 	CDeleteCommand(const CServerPath& path, const std::list<wxString>& files);
-	
+
 	CServerPath GetPath() const { return m_path; }
 	const std::list<wxString>& GetFiles() const { return m_files; }
 
@@ -171,8 +176,8 @@
 };
 
 DECLARE_COMMAND(CRemoveDirCommand, cmd_removedir)
-    // Directories can either be given as absolute path or as
-    // pair of an absolute path and the very last path segments.
+	// Directories can either be given as absolute path or as
+	// pair of an absolute path and the very last path segments.
 	CRemoveDirCommand(const CServerPath& path, const wxString& subdDir);
 
 	CServerPath GetPath() const { return m_path; }
@@ -213,7 +218,7 @@
 DECLARE_COMMAND(CChmodCommand, cmd_chmod)
 	// The permission string should be given in a format understandable by the server.
 	// Most likely it's the defaut octal representation used by the unix chmod command,
-    // i.e. chmod 755 foo.bar
+	// i.e. chmod 755 foo.bar
 	CChmodCommand(const CServerPath& path, const wxString& file, const wxString& permission);
 
 	CServerPath GetPath() const { return m_path; }
diff -Nru filezilla-3.5.3/src/include/config.h.in filezilla-3.7.3~precise/src/include/config.h.in
--- filezilla-3.5.3/src/include/config.h.in	2012-01-08 13:29:09.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/config.h.in	2013-08-07 19:17:11.000000000 +0000
@@ -25,6 +25,9 @@
 /* Define to 1 if you have the `gettimeofday' function. */
 #undef HAVE_GETTIMEOFDAY
 
+/* Headers delare ICopyHookW */
+#undef HAVE_ICOPYHOOKW
+
 /* Define to 1 if you have the `in6addr_any' function. */
 #undef HAVE_IN6ADDR_ANY
 
diff -Nru filezilla-3.5.3/src/include/directorylisting.h filezilla-3.7.3~precise/src/include/directorylisting.h
--- filezilla-3.5.3/src/include/directorylisting.h	2010-07-23 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/directorylisting.h	2012-10-06 03:30:11.000000000 +0000
@@ -104,7 +104,7 @@
 	// 3rd bit indicates a file got changed.
 	// 4th bit is set if an update cannot be applied to
 	// one of the other categories.
-	// 
+	//
 	// These bits should help the user interface to choose an appropriate sorting
 	// algorithm for modified listings
 	int m_hasUnsureEntries;
diff -Nru filezilla-3.5.3/src/include/engineprivate.h filezilla-3.7.3~precise/src/include/engineprivate.h
--- filezilla-3.5.3/src/include/engineprivate.h	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/engineprivate.h	2012-10-06 03:30:11.000000000 +0000
@@ -16,7 +16,7 @@
 class CFileZillaEnginePrivate : public wxEvtHandler
 {
 public:
-	int ResetOperation(int nErrorCode);	
+	int ResetOperation(int nErrorCode);
 	void SetActive(int direction);
 
 	// Add new pending notification
@@ -41,7 +41,7 @@
 	// engine's CControlSocket instance still has that directory as
 	// current working directory (m_CurrentPath)
 	// Since this would cause problems, this function interate over all engines
-	// connected ot the same server and invalidates the current working 
+	// connected ot the same server and invalidates the current working
 	// directories if they match or if it is a subdirectory of the changed
 	// directory.
 	void InvalidateCurrentWorkingDirs(const CServerPath& path);
@@ -78,7 +78,7 @@
 
 	// Indicicates if data has been received/sent and whether to send any notifications
 	static int m_activeStatus[2];
-	
+
 	// Remember last path used in a dirlisting.
 	CServerPath m_lastListDir;
 	CTimeEx m_lastListTime;
diff -Nru filezilla-3.5.3/src/include/externalipresolver.h filezilla-3.7.3~precise/src/include/externalipresolver.h
--- filezilla-3.5.3/src/include/externalipresolver.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/externalipresolver.h	2012-10-06 03:30:11.000000000 +0000
@@ -14,11 +14,11 @@
 
 extern const wxEventType fzEVT_EXTERNALIPRESOLVE;
 #define EVT_FZ_EXTERNALIPRESOLVE(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        fzEVT_EXTERNALIPRESOLVE, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( fzExternalIPResolveEventFunction, &fn ), \
-        (wxObject *) NULL \
-    ),
+	DECLARE_EVENT_TABLE_ENTRY(           \
+		fzEVT_EXTERNALIPRESOLVE, id, -1, \
+		(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( fzExternalIPResolveEventFunction, &fn ), \
+		(wxObject *) NULL                \
+	),
 
 class CExternalIPResolver : public CSocketEventHandler
 {
diff -Nru filezilla-3.5.3/src/include/local_filesys.h filezilla-3.7.3~precise/src/include/local_filesys.h
--- filezilla-3.5.3/src/include/local_filesys.h	2010-03-08 03:00:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/local_filesys.h	2012-10-06 03:30:11.000000000 +0000
@@ -23,7 +23,7 @@
 
 	static const wxChar path_separator;
 
-	// If called with a symlink, GetFileType stats the link, not 
+	// If called with a symlink, GetFileType stats the link, not
 	// the target.
 	static enum local_fileType GetFileType(const wxString& path);
 
@@ -41,7 +41,7 @@
 	bool GetNextFile(wxString& name);
 	bool GetNextFile(wxString& name, bool &isLink, bool &is_dir, wxLongLong* size, wxDateTime* modificationTime, int* mode);
 	void EndFindFiles();
-	
+
 protected:
 #ifdef __WXMSW__
 	static bool ConvertFileTimeToWxDateTime(wxDateTime& time, const FILETIME &ft);
diff -Nru filezilla-3.5.3/src/include/local_path.h filezilla-3.7.3~precise/src/include/local_path.h
--- filezilla-3.5.3/src/include/local_path.h	2011-05-01 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/local_path.h	2012-10-25 03:30:07.000000000 +0000
@@ -9,7 +9,7 @@
 class CLocalPath
 {
 public:
-	CLocalPath() { }
+	CLocalPath() {}
 	CLocalPath(const CLocalPath &path);
 
 	// Creates path. If the path is not syntactically
@@ -24,7 +24,7 @@
 
 	bool empty() const;
 	void clear();
-	
+
 	// On failure the path is undefined
 	bool ChangePath(const wxString& path);
 
diff -Nru filezilla-3.5.3/src/include/misc.h filezilla-3.7.3~precise/src/include/misc.h
--- filezilla-3.5.3/src/include/misc.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/misc.h	2012-10-25 03:30:07.000000000 +0000
@@ -18,18 +18,26 @@
 
 // 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 
+// 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
 void MakeLowerAscii(wxString& str);
 
-enum _dependency
-{
-	dependency_gnutls
+// Strongly typed enum would be nice, but we need to support older compilers still.
+namespace dependency {
+enum type {
+	wxwidgets,
+	gnutls,
+	sqlite,
+	count
 };
+}
 
-wxString GetDependencyVersion(enum _dependency dependency);
+wxString GetDependencyName( dependency::type d );
+wxString GetDependencyVersion( dependency::type d );
+
+wxString ListTlsCiphers(const wxString& priority);
 
 #endif //__MISC_H__
diff -Nru filezilla-3.5.3/src/include/notification.h filezilla-3.7.3~precise/src/include/notification.h
--- filezilla-3.5.3/src/include/notification.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/notification.h	2013-06-01 07:37:58.000000000 +0000
@@ -17,19 +17,19 @@
 // or you will lose important notifications or your memory will fill with
 // pending notifications.
 
-// A special class of notifications are the asynchronous requests. These 
-// requests have to be answered. Once proessed, call 
+// A special class of notifications are the asynchronous requests. These
+// requests have to be answered. Once proessed, call
 // CFileZillaEngine::SetAsyncRequestReply to continue the current operation.
 
 #include "local_path.h"
 
 extern const wxEventType fzEVT_NOTIFICATION;
 #define EVT_FZ_NOTIFICATION(id, fn) \
-    DECLARE_EVENT_TABLE_ENTRY( \
-        fzEVT_NOTIFICATION, id, -1, \
-        (wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxEventFunction, &fn ), \
-        (wxObject *) NULL \
-    ),
+	DECLARE_EVENT_TABLE_ENTRY(      \
+		fzEVT_NOTIFICATION, id, -1, \
+		(wxObjectEventFunction)(wxEventFunction) wxStaticCastEvent( wxEventFunction, &fn ), \
+		(wxObject *) NULL           \
+	),
 
 class wxFzEvent : public wxEvent
 {
@@ -90,7 +90,7 @@
 	COperationNotification();
 	virtual ~COperationNotification();
 	virtual enum NotificationId GetID() const;
-	
+
 	int nReplyCode;
 	enum Command commandId;
 };
@@ -167,10 +167,10 @@
 
 	// Set overwriteAction to the desired action
 	enum OverwriteAction overwriteAction;
-	
+
 	// Set to new filename if overwriteAction is rename. Might trigger further
 	// file exists notifications if new target file exists as well.
-	wxString newName; 
+	wxString newName;
 };
 
 class CInteractiveLoginNotification : public CAsyncRequestNotification
@@ -229,8 +229,8 @@
 	virtual ~CTransferStatusNotification();
 	virtual enum  NotificationId GetID() const;
 
-    const CTransferStatus *GetStatus() const;
-	
+	const CTransferStatus *GetStatus() const;
+
 protected:
 	CTransferStatus *m_pStatus;
 };
@@ -240,27 +240,27 @@
 class CHostKeyNotification : public CAsyncRequestNotification
 {
 public:
-    CHostKeyNotification(wxString host, int port, wxString fingerprint, bool changed = false);
-    virtual ~CHostKeyNotification();
-    virtual enum RequestId GetRequestID() const;
-
-    wxString GetHost() const;
-    int GetPort() const;
-    wxString GetFingerprint() const;
+	CHostKeyNotification(wxString host, int port, wxString fingerprint, bool changed = false);
+	virtual ~CHostKeyNotification();
+	virtual enum RequestId GetRequestID() const;
+
+	wxString GetHost() const;
+	int GetPort() const;
+	wxString GetFingerprint() const;
 
 	// Set to true if you trust the server
 	bool m_trust;
 
-	// If m_truest is true, set this to true to always trust this server 
+	// If m_truest is true, set this to true to always trust this server
 	// in future.
 	bool m_alwaysTrust;
 
 protected:
 
-    const wxString m_host;
-    const int m_port;
-    const wxString m_fingerprint;
-    const bool m_changed;
+	const wxString m_host;
+	const int m_port;
+	const wxString m_fingerprint;
+	const bool m_changed;
 };
 
 class CDataNotification : public CNotification
@@ -280,11 +280,14 @@
 class CCertificate
 {
 public:
+	CCertificate();
+
 	CCertificate(
 		const unsigned char* rawData, unsigned int len,
 		wxDateTime activationTime, wxDateTime expirationTime,
 		const wxString& serial,
 		const wxString& pkalgoname, unsigned int bits,
+		const wxString& signalgoname,
 		const wxString& fingerprint_md5,
 		const wxString& fingerprint_sha1,
 		const wxString& subject,
@@ -300,6 +303,8 @@
 	const wxString& GetPkAlgoName() const { return m_pkalgoname; }
 	unsigned int GetPkAlgoBits() const { return m_pkalgobits; }
 
+	const wxString& GetSignatureAlgorithm() const { return m_signalgoname; }
+
 	const wxString& GetFingerPrintMD5() const { return m_fingerprint_md5; }
 	const wxString& GetFingerPrintSHA1() const { return m_fingerprint_sha1; }
 
@@ -319,6 +324,8 @@
 	wxString m_pkalgoname;
 	unsigned int m_pkalgobits;
 
+	wxString m_signalgoname;
+
 	wxString m_fingerprint_md5;
 	wxString m_fingerprint_sha1;
 
@@ -330,6 +337,8 @@
 {
 public:
 	CCertificateNotification(const wxString& host, unsigned int port,
+		const wxString& protocol,
+		const wxString& keyExchange,
 		const wxString& sessionCipher,
 		const wxString& sessionMac,
 		const std::vector<CCertificate> &certificates);
@@ -346,10 +355,15 @@
 
 	const std::vector<CCertificate> GetCertificates() const { return m_certificates; }
 
+	const wxString& GetProtocol() const { return m_protocol; }
+	const wxString& GetKeyExchange() const { return m_keyExchange; }
+
 protected:
 	wxString m_host;
 	unsigned int m_port;
 
+	wxString m_protocol;
+	wxString m_keyExchange;
 	wxString m_sessionCipher;
 	wxString m_sessionMac;
 
diff -Nru filezilla-3.5.3/src/include/option_change_event_handler.h filezilla-3.7.3~precise/src/include/option_change_event_handler.h
--- filezilla-3.5.3/src/include/option_change_event_handler.h	2011-11-08 20:33:09.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/option_change_event_handler.h	2012-10-06 03:30:11.000000000 +0000
@@ -25,7 +25,7 @@
 
 	static void DoNotify(int option);
 	static void UnregisterAll();
-	
+
 	static std::vector<std::set<COptionChangeEventHandler*> > m_handlers;
 };
 
diff -Nru filezilla-3.5.3/src/include/optionsbase.h filezilla-3.7.3~precise/src/include/optionsbase.h
--- filezilla-3.5.3/src/include/optionsbase.h	2010-02-13 13:43:11.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/optionsbase.h	2012-10-06 03:30:11.000000000 +0000
@@ -9,16 +9,16 @@
 
 enum engineOptions
 {
-	OPTION_USEPASV,			// Use passive mode unless overridden by 
+	OPTION_USEPASV,			// Use passive mode unless overridden by
 							// server settings
 	OPTION_LIMITPORTS,
 	OPTION_LIMITPORTS_LOW,
 	OPTION_LIMITPORTS_HIGH,
 	OPTION_EXTERNALIPMODE,		/* External IP Address mode for use in active mode
 								   Values: 0: ask operating system
-								           1: use provided IP
+										   1: use provided IP
 										   2: use provided resolver
-							    */
+								*/
 	OPTION_EXTERNALIP,
 	OPTION_EXTERNALIPRESOLVER,
 	OPTION_LASTRESOLVEDIP,
diff -Nru filezilla-3.5.3/src/include/server.h filezilla-3.7.3~precise/src/include/server.h
--- filezilla-3.5.3/src/include/server.h	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/server.h	2013-01-14 04:30:08.000000000 +0000
@@ -71,7 +71,7 @@
 	CServer(enum ServerProtocol protocol, enum ServerType type, wxString host, unsigned int, wxString user, wxString pass = _T(""), wxString account = _T(""));
 
 	void SetType(enum ServerType type);
-	
+
 	enum ServerProtocol GetProtocol() const;
 	enum ServerType GetType() const;
 	wxString GetHost() const;
@@ -84,12 +84,12 @@
 	enum PasvMode GetPasvMode() const;
 	int MaximumMultipleConnections() const;
 	bool GetBypassProxy() const;
-	
+
 	// Return true if URL could be parsed correctly, false otherwise.
 	// If parsing fails, pError is filled with the reason and the CServer instance may be left an undefined state.
 	bool ParseUrl(wxString host, unsigned int port, wxString user, wxString pass, wxString &error, CServerPath &path);
-	bool ParseUrl(wxString host, const wxString& port, wxString user, wxString pass, wxString &error, CServerPath &path);
-	
+	bool ParseUrl(wxString host, wxString port, wxString user, wxString pass, wxString &error, CServerPath &path);
+
 	void SetProtocol(enum ServerProtocol serverProtocol);
 	bool SetHost(wxString Host, unsigned int port);
 
@@ -103,7 +103,7 @@
 	bool operator!=(const CServer &op) const;
 	bool EqualsNoPass(const CServer &op) const;
 
-	bool SetTimezoneOffset(int minutes);	
+	bool SetTimezoneOffset(int minutes);
 	void SetPasvMode(enum PasvMode pasvMode);
 	void MaximumMultipleConnections(int maximum);
 
diff -Nru filezilla-3.5.3/src/include/setup.h filezilla-3.7.3~precise/src/include/setup.h
--- filezilla-3.5.3/src/include/setup.h	2010-11-21 13:41:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/setup.h	2013-04-05 03:30:06.000000000 +0000
@@ -16,7 +16,7 @@
 
 #ifdef __WXMSW__
   // IE 6 or higher
-  #ifndef _WIN32_IE 
+  #ifndef _WIN32_IE
     #define _WIN32_IE 0x0600
   #elif _WIN32_IE <= 0x0600
     #undef _WIN32_IE
@@ -24,7 +24,7 @@
   #endif
 
   // Win XP or higher
-  #ifndef _WIN32_WINNT 
+  #ifndef _WIN32_WINNT
     #define _WIN32_WINNT 0x0501
   #elif _WIN32_WINNT <= 0x0501
     #undef _WIN32_WINNT
@@ -32,7 +32,7 @@
   #endif
 
   // Win XP or higher
-  #ifndef WINVER 
+  #ifndef WINVER
     #define WINVER 0x0501
   #elif WINVER <= 0x0501
     #undef WINVER
diff -Nru filezilla-3.5.3/src/include/socket.h filezilla-3.7.3~precise/src/include/socket.h
--- filezilla-3.5.3/src/include/socket.h	2011-08-21 17:53:50.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/socket.h	2012-11-26 04:30:05.000000000 +0000
@@ -59,7 +59,7 @@
 	~CSocketEventDispatcher();
 
 	virtual bool ProcessEvent(wxEvent& event);
-	
+
 	std::list<CSocketEvent*> m_pending_events;
 
 	wxCriticalSection m_sync;
@@ -84,6 +84,12 @@
 	virtual ~CSocketEventSource();
 };
 
+class CCallback
+{
+public:
+	virtual void cb() {}
+};
+
 class CSocketThread;
 class CSocket : public CSocketEventSource
 {
@@ -116,8 +122,8 @@
 		unspec, // AF_UNSPEC
 		ipv4,   // AF_INET
 		ipv6    // AF_INET6
-	};		
-		
+	};
+
 	// Connects to the given host, given as name, IPv4 or IPv6 address.
 	// Returns 0 on success, else an error code. Note: EINPROGRESS is
 	// not really an error. On success, you should still wait for the
@@ -172,6 +178,8 @@
 	// accepted sockets
 	void SetBufferSizes(int size_read, int size_write);
 
+	void SetSynchronousReadCallback(CCallback* cb);
+
 protected:
 	static int DoSetFlags(int fd, int flags, int flags_mask);
 	static int DoSetBufferSizes(int fd, int size_read, int size_write);
@@ -194,6 +202,8 @@
 	int m_flags;
 
 	int m_buffer_sizes[2];
+
+	CCallback* m_synchronous_read_cb;
 };
 
 #ifdef __WXMSW__
diff -Nru filezilla-3.5.3/src/include/threadex.h filezilla-3.7.3~precise/src/include/threadex.h
--- filezilla-3.5.3/src/include/threadex.h	2007-11-23 11:33:57.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/threadex.h	2012-10-06 03:30:11.000000000 +0000
@@ -34,7 +34,7 @@
 // Implementation is fully transparent: All the user has to do is to replace
 // wxThread with wxThreadEx.
 
-// TODO: Implement missing functions as provided by wxThread should they ever 
+// TODO: Implement missing functions as provided by wxThread should they ever
 //       be needed
 
 #include <wx/thread.h>
diff -Nru filezilla-3.5.3/src/include/timeex.h filezilla-3.7.3~precise/src/include/timeex.h
--- filezilla-3.5.3/src/include/timeex.h	2010-07-23 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/include/timeex.h	2012-10-06 03:30:11.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef __TIMEEX_H__
 #define __TIMEEX_H__
 
-/* If called multiple times in a row, wxDateTime::Now may return the same 
+/* If called multiple times in a row, wxDateTime::Now may return the same
  * time. This causes problems with the cache logic. This class implements
  * an extended time class in wich Now() never returns the same value.
  */
@@ -20,9 +20,9 @@
 
 	bool IsValid() const { return m_time.IsValid(); }
 
-	bool operator < (const CTimeEx& op) const; 
+	bool operator < (const CTimeEx& op) const;
 	bool operator <= (const CTimeEx& op) const;
-	bool operator > (const CTimeEx& op) const; 
+	bool operator > (const CTimeEx& op) const;
 	bool operator >= (const CTimeEx& op) const;
 	bool operator == (const CTimeEx& op) const;
 
diff -Nru filezilla-3.5.3/src/interface/FileZilla.cpp filezilla-3.7.3~precise/src/interface/FileZilla.cpp
--- filezilla-3.5.3/src/interface/FileZilla.cpp	2011-06-26 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/FileZilla.cpp	2012-12-16 09:39:23.000000000 +0000
@@ -75,6 +75,8 @@
 	m_pWrapEngine = 0;
 	m_pLocale = 0;
 	m_pCommandLine = 0;
+	m_profilingActive = true;
+	AddStartupProfileRecord(_T("CFileZillaApp::CFileZillaApp()"));
 }
 
 CFileZillaApp::~CFileZillaApp()
@@ -147,7 +149,7 @@
 	return true;
 }
 
-extern "C" 
+extern "C"
 {
 	typedef HRESULT (WINAPI *t_SetCurrentProcessExplicitAppUserModelID)(PCWSTR AppID);
 }
@@ -174,6 +176,8 @@
 
 bool CFileZillaApp::OnInit()
 {
+	AddStartupProfileRecord(_T("CFileZillaApp::OnInit()"));
+
 	srand( (unsigned)time( NULL ) );
 
 #if wxUSE_DEBUGREPORT && wxUSE_ON_FATAL_EXCEPTION
@@ -274,7 +278,7 @@
 #ifndef _DEBUG
 	const wxString& buildType = CBuildInfo::GetBuildType();
 	if (buildType == _T("nightly"))
-        wxMessageBox(_T("You are using a nightly development version of FileZilla 3, do not expect anything to work.\r\nPlease use the official releases instead.\r\n\r\n\
+		wxMessageBox(_T("You are using a nightly development version of FileZilla 3, do not expect anything to work.\r\nPlease use the official releases instead.\r\n\r\n\
 Unless explicitly instructed otherwise,\r\n\
 DO NOT post bugreports,\r\n\
 DO NOT use it in production environments,\r\n\
@@ -330,6 +334,8 @@
 	frame->ProcessCommandLine();
 	frame->PostInitialize();
 
+	ShowStartupProfile();
+
 	return true;
 }
 
@@ -444,7 +450,7 @@
 
 	// For each path, check for the resources
 	wxPathList::const_iterator node;
-	for (node = pathList.begin(); node != pathList.end(); node++)
+	for (node = pathList.begin(); node != pathList.end(); ++node)
 	{
 		wxString cur = *node;
 		if (FileExists(cur + fileToFind))
@@ -455,7 +461,7 @@
 			return cur + _T("/filezilla");
 	}
 
-	for (node = pathList.begin(); node != pathList.end(); node++)
+	for (node = pathList.begin(); node != pathList.end(); ++node)
 	{
 		wxString cur = *node;
 		if (FileExists(cur + _T("/..") + fileToFind))
@@ -464,7 +470,7 @@
 			return cur + _T("/../share/filezilla");
 	}
 
-	for (node = pathList.begin(); node != pathList.end(); node++)
+	for (node = pathList.begin(); node != pathList.end(); ++node)
 	{
 		wxString cur = *node;
 		if (FileExists(cur + _T("/../../") + fileToFind))
@@ -477,6 +483,7 @@
 
 bool CFileZillaApp::LoadResourceFiles()
 {
+	AddStartupProfileRecord(_T("CFileZillaApp::LoadResourceFiles"));
 	m_resourceDir = GetDataDir(_T("/resources/menus.xrc"));
 
 	wxImage::AddHandler(new wxPNGHandler());
@@ -538,6 +545,7 @@
 
 bool CFileZillaApp::InitDefaultsDir()
 {
+	AddStartupProfileRecord(_T("InitDefaultsDir"));
 #ifdef __WXGTK__
 	wxFileName fn = wxFileName(wxGetHomeDir(), _T("fzdefaults.xml"));
 	fn.AppendDir(_T(".filezilla"));
@@ -554,6 +562,7 @@
 
 bool CFileZillaApp::LoadLocales()
 {
+	AddStartupProfileRecord(_T("CFileZillaApp::LoadLocales"));
 #ifndef __WXMAC__
 	m_localesDir = GetDataDir(_T("/../locale/*/filezilla.mo"));
 	if (m_localesDir == _T(""))
@@ -688,6 +697,7 @@
 
 void CFileZillaApp::CheckExistsFzsftp()
 {
+	AddStartupProfileRecord(_T("CFileZillaApp::CheckExistsFzstp"));
 	// Get the correct path to the fzsftp executable
 
 #ifdef __WXMAC__
@@ -820,6 +830,7 @@
 
 int CFileZillaApp::ProcessCommandLine()
 {
+	AddStartupProfileRecord(_T("CFileZillaApp::ProcessCommandLine"));
 	m_pCommandLine = new CCommandLine(argc, argv);
 	int res = m_pCommandLine->Parse() ? 1 : -1;
 
@@ -847,3 +858,76 @@
 
 	return res;
 }
+
+#if USE_CHUNKED_PROCESS_PENDING_EVENTS
+void CFileZillaApp::ProcessPendingEvents()
+{
+	// Code copied from wxAppConsole::ProcessPendingEvents, adapted to
+	// process only 100 events in one go.
+#if wxUSE_THREADS
+	if ( !wxPendingEventsLocker )
+		return;
+#endif
+
+	// ensure that we're the only thread to modify the pending events list
+	wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+
+	if ( !wxPendingEvents )
+	{
+		wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+		return;
+	}
+
+	// iterate until the list becomes empty or 100 events have been
+	// processed, whichever comes first
+	wxList::compatibility_iterator node = wxPendingEvents->GetFirst();
+	int idleCounter = 100;
+	while (node)
+	{
+		wxEvtHandler *handler = (wxEvtHandler *)node->GetData();
+		wxPendingEvents->Erase(node);
+
+		// In ProcessPendingEvents(), new handlers might be add
+		// and we can safely leave the critical section here.
+		wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+
+		handler->ProcessPendingEvents();
+
+		wxENTER_CRIT_SECT( *wxPendingEventsLocker );
+
+		node = --idleCounter ? wxPendingEvents->GetFirst() : 0;
+	}
+
+	wxLEAVE_CRIT_SECT( *wxPendingEventsLocker );
+}
+#endif
+
+void CFileZillaApp::AddStartupProfileRecord(const wxString& msg)
+{
+	if (!m_profilingActive)
+		return;
+
+	m_startupProfile.push_back(std::make_pair(wxDateTime::UNow(), msg));
+}
+
+void CFileZillaApp::ShowStartupProfile()
+{
+	m_profilingActive = false;
+
+	std::list<std::pair<wxDateTime, wxString> > profile;
+	profile.swap(m_startupProfile);
+
+	if (m_pCommandLine && !m_pCommandLine->HasSwitch(CCommandLine::debug_startup))
+		return;
+
+	wxString msg = _T("Profile:\n");
+	for (std::list<std::pair<wxDateTime, wxString> >::const_iterator it = profile.begin(); it != profile.end(); ++it)
+	{
+		msg += it->first.Format(_T("%Y-%m-%d %H:%M:%S %l"));
+		msg += _T(" ");
+		msg += it->second;
+		msg += _T("\n");
+	}
+
+	wxMessageBox(msg);
+}
diff -Nru filezilla-3.5.3/src/interface/LocalListView.cpp filezilla-3.7.3~precise/src/interface/LocalListView.cpp
--- filezilla-3.5.3/src/interface/LocalListView.cpp	2011-10-10 03:30:24.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/LocalListView.cpp	2013-06-10 03:30:03.000000000 +0000
@@ -8,7 +8,6 @@
 #include "filter.h"
 #include "inputdialog.h"
 #include <algorithm>
-#include <wx/dnd.h>
 #include "dndobjects.h"
 #include "Options.h"
 #ifdef __WXMSW__
@@ -27,11 +26,13 @@
 #define new DEBUG_NEW
 #endif
 
-class CLocalListViewDropTarget : public wxDropTarget
+
+class CLocalListViewDropTarget : public CListCtrlDropTarget
 {
 public:
 	CLocalListViewDropTarget(CLocalListView* pLocalListView)
-		: m_pLocalListView(pLocalListView), m_pFileDataObject(new wxFileDataObject()),
+		: CListCtrlDropTarget(pLocalListView)
+		, m_pLocalListView(pLocalListView), m_pFileDataObject(new wxFileDataObject()),
 		m_pRemoteDataObject(new CRemoteDataObject())
 	{
 		m_pDataObject = new wxDataObjectComposite;
@@ -119,6 +120,7 @@
 
 	virtual bool OnDrop(wxCoord x, wxCoord y)
 	{
+		CListCtrlDropTarget::OnDrop(x, y);
 		ClearDropHighlight();
 
 		if (m_pLocalListView->m_fileData.empty())
@@ -127,7 +129,12 @@
 		return true;
 	}
 
-	wxString DisplayDropHighlight(wxPoint point)
+	virtual void DisplayDropHighlight(wxPoint point)
+	{
+		DoDisplayDropHighlight(point);
+	}
+
+	virtual wxString DoDisplayDropHighlight(wxPoint point)
 	{
 		wxString subDir;
 
@@ -174,6 +181,8 @@
 
 	virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
 	{
+		CListCtrlDropTarget::OnDragOver(x, y, def);
+
 		if (def == wxDragError ||
 			def == wxDragNone ||
 			def == wxDragCancel)
@@ -188,7 +197,7 @@
 			return wxDragNone;
 		}
 
-		const wxString& subdir = DisplayDropHighlight(wxPoint(x, y));
+		const wxString& subdir = DoDisplayDropHighlight(wxPoint(x, y));
 
 		CLocalPath dir = m_pLocalListView->m_pState->GetLocalDir();
 		if (subdir == _T(""))
@@ -214,11 +223,13 @@
 
 	virtual void OnLeave()
 	{
+		CListCtrlDropTarget::OnLeave();
 		ClearDropHighlight();
 	}
 
 	virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
 	{
+		CListCtrlDropTarget::OnEnter(x, y, def);
 		return OnDragOver(x, y, def);
 	}
 
@@ -254,6 +265,7 @@
 	: CFileListCtrl<CLocalFileData>(pParent, pState, pQueue),
 	CStateEventHandler(pState)
 {
+	wxGetApp().AddStartupProfileRecord(_T("CLocalListView::CLocalListView"));
 	m_pState->RegisterHandler(this, STATECHANGE_LOCAL_DIR);
 	m_pState->RegisterHandler(this, STATECHANGE_APPLYFILTER);
 	m_pState->RegisterHandler(this, STATECHANGE_LOCAL_REFRESH_FILE);
@@ -299,6 +311,7 @@
 
 	wxString focused;
 	std::list<wxString> selectedNames;
+	bool ensureVisible = false;
 	if (m_dir != dirname)
 	{
 		ResetSearchPrefix();
@@ -307,7 +320,10 @@
 			ExitComparisonMode();
 
 		ClearSelection();
-		focused = _T("..");
+		focused = m_pState->GetPreviouslyVisitedLocalSubdir();
+		ensureVisible = !focused.IsEmpty();
+		if (focused.IsEmpty())
+			focused = _T("..");
 
 		if (GetItemCount())
 			EnsureVisible(0);
@@ -443,7 +459,7 @@
 		RefreshComparison();
 	}
 
-	ReselectItems(selectedNames, focused);
+	ReselectItems(selectedNames, focused, ensureVisible);
 
 	RefreshListOnly();
 
@@ -483,7 +499,7 @@
 	bool back = false;
 
 	int item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -791,7 +807,7 @@
 	{
 	}
 
-	virtual ~CLocalListViewSort() { }
+	virtual ~CLocalListViewSort() {}
 
 	virtual bool operator()(int a, int b) const = 0;
 
@@ -1074,16 +1090,13 @@
 		const CLocalFileData* const data = GetData(index);
 		if (!data || (!index && m_hasParent))
 		{
-			pMenu->Enable(XRCID("ID_UPLOAD"), false);
-			pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false);
-			pMenu->Enable(XRCID("ID_DELETE"), false);
-			pMenu->Enable(XRCID("ID_RENAME"), false);
 			pMenu->Enable(XRCID("ID_OPEN"), false);
+			pMenu->Enable(XRCID("ID_RENAME"), false);
 			pMenu->Enable(XRCID("ID_EDIT"), false);
 		}
-		if (data->flags == fill)
+		if (data && data->flags == fill || (!index && m_hasParent))
 			fillCount++;
-		if (data->dir)
+		if (data && data->dir)
 			selectedDir = true;
 		index = GetNextItem(index, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	}
@@ -1116,17 +1129,6 @@
 
 void CLocalListView::OnMenuUpload(wxCommandEvent& event)
 {
-	long item = -1;
-	while (true)
-	{
-		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
-		if (item == -1)
-			break;
-
-		if (!item && m_hasParent)
-			return;
-	}
-
 	const CServer* pServer = m_pState->GetServer();
 	if (!pServer)
 	{
@@ -1138,10 +1140,12 @@
 
 	bool queue_only = event.GetId() == XRCID("ID_ADDTOQUEUE");
 
-	item = -1;
-	while (true)
+	long item = -1;
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (!item && m_hasParent)
+			continue;
 		if (item == -1)
 			break;
 
@@ -1482,7 +1486,7 @@
 #endif
 	{
 		int item = -1;
-		while (true)
+		for (;;)
 		{
 			item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 			if (item == -1)
@@ -1512,7 +1516,7 @@
 	return selectedNames;
 }
 
-void CLocalListView::ReselectItems(const std::list<wxString>& selectedNames, wxString focused)
+void CLocalListView::ReselectItems(const std::list<wxString>& selectedNames, wxString focused, bool ensureVisible)
 {
 	// Reselect previous items if neccessary.
 	// Sorting direction did not change. We just have to scan through items once
@@ -1527,6 +1531,8 @@
 			if (data.name == focused)
 			{
 				SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+				if (ensureVisible)
+					EnsureVisible(i);
 				return;
 			}
 		}
@@ -1536,7 +1542,7 @@
 	int firstSelected = -1;
 
 	int i = -1;
-	for (std::list<wxString>::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); ++iter)
 	{
 		while (++i < (int)m_indexMapping.size())
 		{
@@ -1544,6 +1550,8 @@
 			if (data.name == focused)
 			{
 				SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+				if (ensureVisible)
+					EnsureVisible(i);
 				focused = _T("");
 			}
 			if (data.dir && *iter == (_T("d") + data.name))
@@ -1593,7 +1601,7 @@
 void CLocalListView::OnBeginDrag(wxListEvent& event)
 {
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -1610,7 +1618,7 @@
 	pDragDropManager->localParent = m_dir;
 
 	item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -1678,7 +1686,7 @@
 
 	// Look if file data already exists
 	unsigned int i = 0;
-	for (std::vector<CLocalFileData>::iterator iter = m_fileData.begin(); iter != m_fileData.end(); iter++, i++)
+	for (std::vector<CLocalFileData>::iterator iter = m_fileData.begin(); iter != m_fileData.end(); ++iter, ++i)
 	{
 		const CLocalFileData& oldData = *iter;
 		if (oldData.name != file)
@@ -1693,7 +1701,7 @@
 #endif
 			{
 				int item = -1;
-				while (true)
+				for (;;)
 				{
 					item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 					if (item == -1)
@@ -1763,7 +1771,7 @@
 	// Find correct position in index mapping
 	std::vector<unsigned int>::iterator start = m_indexMapping.begin();
 	if (m_hasParent)
-		start++;
+		++start;
 	CFileListCtrl<CLocalFileData>::CSortComparisonObject compare = GetSortComparisonObject();
 	std::vector<unsigned int>::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), index, compare);
 	compare.Destroy();
@@ -2011,7 +2019,7 @@
 			return;
 	}
 
-	for (std::list<CLocalFileData>::const_iterator data = selected_item_list.begin(); data != selected_item_list.end(); data++)
+	for (std::list<CLocalFileData>::const_iterator data = selected_item_list.begin(); data != selected_item_list.end(); ++data)
 	{
 		wxFileName fn(m_dir, data->name);
 
@@ -2082,7 +2090,7 @@
 	long item = GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	if (item == -1)
 	{
-		wxLaunchDefaultBrowser(CState::GetAsURL(m_dir));
+		CState::OpenInFileManager(m_dir);
 		return;
 	}
 
@@ -2131,7 +2139,7 @@
 			return;
 	}
 
-	for (std::list<CLocalFileData>::const_iterator data = selected_item_list.begin(); data != selected_item_list.end(); data++)
+	for (std::list<CLocalFileData>::const_iterator data = selected_item_list.begin(); data != selected_item_list.end(); ++data)
 	{
 		if (data->dir)
 		{
@@ -2142,7 +2150,7 @@
 				continue;
 			}
 
-			wxLaunchDefaultBrowser(CState::GetAsURL(path.GetPath()));
+			CState::OpenInFileManager(path.GetPath());
 			continue;
 		}
 
@@ -2204,7 +2212,7 @@
 	if (m_dir != _T("\\"))
 		return;
 
-	for (std::list<CVolumeDescriptionEnumeratorThread::t_VolumeInfo>::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); iter++)
+	for (std::list<CVolumeDescriptionEnumeratorThread::t_VolumeInfo>::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); ++iter)
 	{
 		wxString drive = iter->volume;
 
@@ -2219,7 +2227,7 @@
 			continue;
 
 		m_fileData[index].label = drive + _T(" (") + iter->volumeName + _T(")");
-		
+
 		RefreshItem(item);
 	}
 }
diff -Nru filezilla-3.5.3/src/interface/LocalListView.h filezilla-3.7.3~precise/src/interface/LocalListView.h
--- filezilla-3.5.3/src/interface/LocalListView.h	2011-02-28 04:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/LocalListView.h	2013-06-10 03:30:03.000000000 +0000
@@ -51,7 +51,7 @@
 	// Select a list of items based in their names.
 	// Sort order may not change between call to RememberSelectedItems and
 	// ReselectItems
-	void ReselectItems(const std::list<wxString>& selectedNames, wxString focused);
+	void ReselectItems(const std::list<wxString>& selectedNames, wxString focused, bool ensureVisible = false);
 
 #ifdef __WXMSW__
 	void DisplayDrives();
@@ -88,7 +88,7 @@
 	int m_dropTarget;
 
 	// Event handlers
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnItemActivated(wxListEvent& event);
 	void OnContextMenu(wxContextMenuEvent& event);
 	void OnMenuUpload(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/LocalTreeView.cpp filezilla-3.7.3~precise/src/interface/LocalTreeView.cpp
--- filezilla-3.5.3/src/interface/LocalTreeView.cpp	2011-10-10 03:30:24.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/LocalTreeView.cpp	2013-04-17 03:30:10.000000000 +0000
@@ -231,6 +231,7 @@
 	CStateEventHandler(pState),
 	m_pQueueView(pQueueView)
 {
+	wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::CLocalTreeView"));
 #ifdef __WXMAC__
 	SetFont(wxSystemSettings::GetFont(wxSYS_DEFAULT_GUI_FONT));
 #endif
@@ -386,6 +387,7 @@
 
 bool CLocalTreeView::DisplayDrives(wxTreeItemId parent)
 {
+	wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::DisplayDrives"));
 	long drivesToHide = 0;
 	// Adhere to the NODRIVES group policy
 	wxRegKey key(_T("HKEY_CURRENT_USER\\Software\\Microsoft\\Windows\\CurrentVersion\\Policies\\Explorer"));
@@ -438,6 +440,7 @@
 		if (drive.Right(1) == _T("\\"))
 			drive = drive.RemoveLast();
 
+		wxGetApp().AddStartupProfileRecord(wxString::Format(_T("CLocalTreeView::DisplayDrives adding drive %s"), drive.c_str()));
 		wxTreeItemId item = AppendItem(parent, drive, GetIconIndex(dir, pDrive));
 		AppendItem(item, _T(""));
 		SortChildren(parent);
@@ -445,6 +448,8 @@
 		pDrive += wxStrlen(pDrive) + 1;
 	}
 
+	wxGetApp().AddStartupProfileRecord(_T("CLocalTreeView::DisplayDrives adding drives done"));
+
 	delete [] drives;
 
 	return true;
@@ -556,7 +561,7 @@
 	wxLogNull nullLog;
 
 	CFilterManager filter;
-	
+
 	CLocalFileSystem local_filesystem;
 	if (!local_filesystem.BeginFindFiles(dirname, true))
 		return _T("");
@@ -748,6 +753,7 @@
 		t_dir dir = dirsToCheck.front();
 		dirsToCheck.pop_front();
 
+		// Step 1: Check if directory exists
 		CLocalFileSystem local_filesystem;
 		if (!local_filesystem.BeginFindFiles(dir.dir, true))
 		{
@@ -767,9 +773,9 @@
 			continue;
 		}
 
+		// Step 2: Enumerate subdirectories on disk and sort them
 		std::list<wxString> dirs;
 
-		
 		wxString file;
 		const wxLongLong size(-1);
 		bool was_link;
@@ -789,21 +795,30 @@
 
 			dirs.push_back(file);
 		}
-		dirs.sort(sortfunc);		
+		dirs.sort(sortfunc);
 
 		bool inserted = false;
 
+		// Step 3: Merge list of subdirectories with subtree.
 		wxTreeItemId child = GetLastChild(dir.item);
 		std::list<wxString>::reverse_iterator iter = dirs.rbegin();
-		while (child && iter != dirs.rend())
+		while (child || iter != dirs.rend())
 		{
+			int cmp;
+			if (child && iter != dirs.rend())
 #ifdef __WXMSW__
-			int cmp = GetItemText(child).CmpNoCase(*iter);
+				cmp = GetItemText(child).CmpNoCase(*iter);
 #else
-			int cmp = GetItemText(child).Cmp(*iter);
+				cmp = GetItemText(child).Cmp(*iter);
 #endif
+			else if (child)
+				cmp = 1;
+			else
+				cmp = -1;
+
 			if (!cmp)
 			{
+				// Found item with same name. Mark it for further processing
 				if (!IsExpanded(child))
 				{
 					wxString path = dir.dir + *iter + separator;
@@ -823,10 +838,13 @@
 					dirsToCheck.push_front(subdir);
 				}
 				child = GetPrevSibling(child);
-				iter++;
+				++iter;
 			}
 			else if (cmp > 0)
 			{
+				// Subdirectory currently in tree no longer exists.
+				// Delete child from tree, unless current selection
+				// is in the subtree.
 				wxTreeItemId sel = GetSelection();
 				while (sel && sel != child)
 					sel = GetItemParent(sel);
@@ -837,6 +855,7 @@
 			}
 			else if (cmp < 0)
 			{
+				// New subdirectory, add treeitem
 				wxString fullname = dir.dir + *iter + separator;
 				wxTreeItemId newItem = AppendItem(dir.item, *iter, GetIconIndex(::dir, fullname),
 #ifdef __WXMSW__
@@ -847,35 +866,10 @@
 					);
 
 				CheckSubdirStatus(newItem, fullname);
-				iter++;
+				++iter;
 				inserted = true;
 			}
 		}
-		while (child)
-		{
-			wxTreeItemId sel = GetSelection();
-			while (sel && sel != child)
-				sel = GetItemParent(sel);
-			wxTreeItemId prev = GetPrevSibling(child);
-			if (!sel)
-				Delete(child);
-			child = prev;
-		}
-		while (iter != dirs.rend())
-		{
-			wxString fullname = dir.dir + *iter + separator;
-			wxTreeItemId newItem = AppendItem(dir.item, *iter, GetIconIndex(::dir, fullname),
-#ifdef __WXMSW__
-					-1
-#else
-					GetIconIndex(opened_dir, fullname)
-#endif
-				);
-
-			CheckSubdirStatus(newItem, fullname);
-			iter++;
-			inserted = true;
-		}
 		if (inserted)
 			SortChildren(dir.item);
 	}
@@ -1026,7 +1020,7 @@
 	wxString name = shFinfo.szDisplayName;
 
 	LPMALLOC pMalloc;
-    SHGetMalloc(&pMalloc);
+	SHGetMalloc(&pMalloc);
 
 	if (pMalloc)
 	{
@@ -1091,7 +1085,7 @@
 		m_pVolumeEnumeratorThread = 0;
 	}
 
-	for (std::list<CVolumeDescriptionEnumeratorThread::t_VolumeInfo>::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); iter++)
+	for (std::list<CVolumeDescriptionEnumeratorThread::t_VolumeInfo>::const_iterator iter = volumeInfo.begin(); iter != volumeInfo.end(); ++iter)
 	{
 		wxString drive = iter->volume;
 
@@ -1619,9 +1613,5 @@
 	if (path == _T(""))
 		return;
 
-	wxString url = CState::GetAsURL(path);
-	if (url == _T(""))
-		return;
-
-	wxLaunchDefaultBrowser(url);
+	CState::OpenInFileManager(path);
 }
diff -Nru filezilla-3.5.3/src/interface/Mainfrm.cpp filezilla-3.7.3~precise/src/interface/Mainfrm.cpp
--- filezilla-3.5.3/src/interface/Mainfrm.cpp	2011-12-29 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Mainfrm.cpp	2013-06-25 17:11:01.000000000 +0000
@@ -73,6 +73,7 @@
 	EVT_SIZE(CMainFrame::OnSize)
 	EVT_MENU(wxID_ANY, CMainFrame::OnMenuHandler)
 	EVT_FZ_NOTIFICATION(wxID_ANY, CMainFrame::OnEngineEvent)
+	EVT_COMMAND(wxID_ANY, fzEVT_UPDATE_LED_TOOLTIP, CMainFrame::OnUpdateLedTooltip)
 	EVT_TOOL(XRCID("ID_TOOLBAR_DISCONNECT"), CMainFrame::OnDisconnect)
 	EVT_MENU(XRCID("ID_MENU_SERVER_DISCONNECT"), CMainFrame::OnDisconnect)
 	EVT_TOOL(XRCID("ID_TOOLBAR_CANCEL"), CMainFrame::OnCancel)
@@ -208,6 +209,7 @@
 CMainFrame::CMainFrame()
 	: m_comparisonToggleAcceleratorId(wxNewId())
 {
+	wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CMainFrame"));
 	wxRect screen_size = CWindowStateManager::GetScreenDimensions();
 
 	wxSize initial_size;
@@ -335,8 +337,6 @@
 
 	m_pContextControl->CreateTab();
 
-	m_pContextControl->GetCurrentControls();
-	
 	switch (message_log_position)
 	{
 	case 1:
@@ -502,13 +502,14 @@
 
 bool CMainFrame::CreateMenus()
 {
+	wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateMenus"));
 	if (m_pMenuBar)
 	{
 		SetMenuBar(0);
 		delete m_pMenuBar;
 	}
 	m_pMenuBar = CMenuBar::Load(this);
-	
+
 	if (!m_pMenuBar)
 		return false;
 
@@ -523,6 +524,7 @@
 
 bool CMainFrame::CreateQuickconnectBar()
 {
+	wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateQuickconnectBar"));
 	delete m_pQuickconnectBar;
 
 	m_pQuickconnectBar = new CQuickconnectBar();
@@ -623,6 +625,14 @@
 		int *x = 0;
 		*x = 0;
 	}
+	else if (event.GetId() == XRCID("ID_CIPHERS"))
+	{
+		CInputDialog dlg;
+		dlg.Create(this, _T("Ciphers"), _T("Priority string:"));
+		dlg.AllowEmpty(true);
+		if (dlg.ShowModal() == wxID_OK)
+			wxMessageBox(ListTlsCiphers(dlg.GetValue()), _T("Ciphers"));
+	}
 	else if (event.GetId() == XRCID("ID_CLEARCACHE_LAYOUT"))
 	{
 		CWrapEngine::ClearCache();
@@ -674,7 +684,7 @@
 
 		COptions::Get()->SetOption(OPTION_VIEW_HIDDEN_FILES, showHidden ? 1 : 0);
 		const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 		{
 			CState* pState = *iter;
 			CServerPath path = pState->GetRemotePath();
@@ -728,7 +738,7 @@
 	else if (event.GetId() == XRCID("ID_MENU_HELP_GETTINGHELP") ||
 			 event.GetId() == XRCID("ID_MENU_HELP_BUGREPORT"))
 	{
-		wxString url(_T("http://filezilla-project.org/support.php?type=client&mode="));
+		wxString url(_T("https://filezilla-project.org/support.php?type=client&mode="));
 		if (event.GetId() == XRCID("ID_MENU_HELP_GETTINGHELP"))
 			url += _T("help");
 		else
@@ -854,7 +864,7 @@
 			CSiteManager::GetBookmarks(controls->site_bookmarks->path, controls->site_bookmarks->bookmarks);
 			if (m_pMenuBar)
 				m_pMenuBar->UpdateBookmarkMenu();
-		}	
+		}
 	}
 	else if (event.GetId() == XRCID("ID_MENU_HELP_WELCOME"))
 	{
@@ -942,11 +952,11 @@
 
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
 	CState* pState = 0;
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		if ((*iter)->m_pEngine != pEngine)
 			continue;
-		
+
 		pState = *iter;
 		break;
 	}
@@ -1000,7 +1010,7 @@
 			{
 				CAsyncRequestNotification* pAsyncRequest = reinterpret_cast<CAsyncRequestNotification *>(pNotification);
 				if (pAsyncRequest->GetRequestID() == reqId_fileexists)
-					m_pQueueView->ProcessNotification(pNotification);
+					m_pQueueView->ProcessNotification(pEngine, pNotification);
 				else
 				{
 					if (pAsyncRequest->GetRequestID() == reqId_certificate)
@@ -1017,7 +1027,7 @@
 			}
 			break;
 		case nId_transferstatus:
-			m_pQueueView->ProcessNotification(pNotification);
+			m_pQueueView->ProcessNotification(pEngine, pNotification);
 			break;
 		case nId_sftp_encryption:
 			{
@@ -1042,8 +1052,32 @@
 	}
 }
 
+void CMainFrame::OnUpdateLedTooltip(wxCommandEvent& event)
+{
+	wxString tooltipText;
+
+	wxFileOffset downloadSpeed = m_pQueueView->GetCurrentDownloadSpeed();
+	wxFileOffset uploadSpeed = m_pQueueView->GetCurrentUploadSpeed();
+
+	CSizeFormat::_format format = static_cast<CSizeFormat::_format>(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
+	if (format == CSizeFormat::bytes)
+		format = CSizeFormat::iec;
+
+	const wxString downloadSpeedStr = CSizeFormat::Format(downloadSpeed, true, format,
+														  COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+														  COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+	const wxString uploadSpeedStr = CSizeFormat::Format(uploadSpeed, true, format,
+														COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+														COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+	tooltipText.Printf(_("Download speed: %s/s\nUpload speed: %s/s"), downloadSpeedStr.c_str(), uploadSpeedStr.c_str());
+
+	m_pActivityLed[0]->SetToolTip(tooltipText);
+	m_pActivityLed[1]->SetToolTip(tooltipText);
+}
+
 bool CMainFrame::CreateToolBar()
 {
+	wxGetApp().AddStartupProfileRecord(_T("CMainFrame::CreateToolBar"));
 	if (m_pToolBar)
 	{
 #ifdef __WXMAC__
@@ -1118,6 +1152,79 @@
 }
 #endif //__WXMSW__
 
+
+bool CMainFrame::CloseDialogsAndQuit(wxCloseEvent &event)
+{
+#ifndef __WXMAC__
+	if (m_taskBarIcon)
+	{
+		delete m_taskBarIcon;
+		m_taskBarIcon = 0;
+		m_closeEvent = event.GetEventType();
+		m_closeEventTimer.Start(1, true);
+		return false;
+	}
+#endif
+
+	// We need to close all other top level windows on the stack before closing the main frame.
+	// In other words, all open dialogs need to be closed.
+	static int prev_size = 0;
+
+	int size = wxTopLevelWindows.size();
+	static wxTopLevelWindow* pLast = 0;
+	if (wxTopLevelWindows.size())
+	{
+		wxWindowList::reverse_iterator iter = wxTopLevelWindows.rbegin();
+		wxTopLevelWindow* pTop = (wxTopLevelWindow*)(*iter);
+		while (pTop != this && (size != prev_size || pLast != pTop))
+		{
+			wxDialog* pDialog = wxDynamicCast(pTop, wxDialog);
+			if (pDialog)
+				pDialog->EndModal(wxID_CANCEL);
+			else
+			{
+				wxWindow* pParent = pTop->GetParent();
+				if (m_pQueuePane && pParent == m_pQueuePane)
+				{
+					// It's the AUI frame manager hint window. Ignore it
+					++iter;
+					if (iter == wxTopLevelWindows.rend())
+						break;
+					pTop = (wxTopLevelWindow*)(*iter);
+					continue;
+				}
+				wxString title = pTop->GetTitle();
+				pTop->Destroy();
+			}
+
+			prev_size = size;
+			pLast = pTop;
+
+			m_closeEvent = event.GetEventType();
+			m_closeEventTimer.Start(1, true);
+
+			return false;
+		}
+	}
+
+#ifdef __WXMSW__
+	// wxMessageBox does not use wxTopLevelWindow, close it too
+	bool dialog = false;
+	EnumThreadWindows(GetCurrentThreadId(), FzEnumThreadWndProc, (LPARAM)&dialog);
+	if (dialog)
+	{
+		m_closeEvent = event.GetEventType();
+		m_closeEventTimer.Start(1, true);
+
+		return false;
+	}
+#endif //__WXMSW__
+
+	// At this point all other top level windows should be closed.
+	return true;
+}
+
+
 void CMainFrame::OnClose(wxCloseEvent &event)
 {
 	if (!m_bQuit)
@@ -1177,60 +1284,6 @@
 			quit_confirmation_displayed = false;
 		}
 
-		if (!event.CanVeto())
-		{
-			// We need to close all other top level windows on the stack before closing the main frame.
-			// In other words, all open dialogs need to be closed.
-			static int prev_size = 0;
-
-			int size = wxTopLevelWindows.size();
-			static wxTopLevelWindow* pLast = 0;
-			wxWindowList::reverse_iterator iter = wxTopLevelWindows.rbegin();
-			wxTopLevelWindow* pTop = (wxTopLevelWindow*)(*iter);
-			while (pTop != this && (size != prev_size || pLast != pTop))
-			{
-				wxDialog* pDialog = wxDynamicCast(pTop, wxDialog);
-				if (pDialog)
-					pDialog->EndModal(wxID_CANCEL);
-				else
-				{
-					wxWindow* pParent = pTop->GetParent();
-					if (m_pQueuePane && pParent == m_pQueuePane)
-					{
-						// It's the AUI frame manager hint window. Ignore it
-						iter++;
-						pTop = (wxTopLevelWindow*)(*iter);
-						continue;
-					}
-					wxString title = pTop->GetTitle();
-					pTop->Destroy();
-				}
-
-				prev_size = size;
-				pLast = pTop;
-
-				m_closeEvent = event.GetEventType();
-				m_closeEventTimer.Start(1, true);
-
-				return;
-			}
-
-#ifdef __WXMSW__
-			// wxMessageBox does not use wxTopLevelWindow, close it too
-			bool dialog = false;
-			EnumThreadWindows(GetCurrentThreadId(), FzEnumThreadWndProc, (LPARAM)&dialog);
-			if (dialog)
-			{
-				m_closeEvent = event.GetEventType();
-				m_closeEventTimer.Start(1, true);
-
-				return;
-			}
-#endif //__WXMSW__
-
-			// At this point all other top level windows should be closed.
-		}
-
 		if (m_pWindowStateManager)
 		{
 			m_pWindowStateManager->Remember(OPTION_MAINWINDOW_POSITION);
@@ -1239,7 +1292,7 @@
 		}
 
 		RememberSplitterPositions();
-		
+
 #ifdef __WXMAC__
 		if (m_pToolBar)
 			COptions::Get()->SetOption(OPTION_TOOLBAR_HIDDEN, m_pToolBar->IsShown() ? 0 : 1);
@@ -1248,6 +1301,8 @@
 	}
 
 	Show(false);
+	if (!CloseDialogsAndQuit(event))
+		return;
 
 	// Getting deleted by wxWidgets
 	for (int i = 0; i < 2; i++)
@@ -1277,7 +1332,7 @@
 
 	bool res = true;
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		CState* pState = *iter;
 		if (!pState->m_pCommandQueue)
@@ -1301,7 +1356,7 @@
 		COptions::Get()->SetOption(OPTION_LAST_CONNECTED_SITE, controls->site_bookmarks->path);
 	}
 
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		CState *pState = *iter;
 		pState->DestroyEngine();
@@ -1581,7 +1636,7 @@
 			shown = true;
 		}
 	}
-	
+
 	if (COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION) != 2)
 		COptions::Get()->SetOption(OPTION_SHOW_MESSAGELOG, shown);
 }
@@ -1632,7 +1687,7 @@
 			continue;
 
 		controls->pLocalTreeViewPanel->SetHeader(controls->pLocalListViewPanel->DetachHeader());
-		
+
 		if (layout == 3 && swap)
 			controls->pLocalSplitter->SplitVertically(controls->pLocalListViewPanel, controls->pLocalTreeViewPanel);
 		else if (layout)
@@ -1796,12 +1851,12 @@
 
 	if (messagelog_position == -1)
 		messagelog_position = COptions::Get()->GetOptionVal(OPTION_MESSAGELOG_POSITION);
-	
+
 	// First handle changes in message log position as it can make size of the other panes change
 	{
 		bool shown = m_pStatusView->IsShown();
 		wxWindow* parent = m_pStatusView->GetParent();
-	
+
 		bool changed;
 		if (parent == m_pTopSplitter && messagelog_position != 0)
 		{
@@ -1987,7 +2042,7 @@
 	ShowDropdownMenu(pMenu, m_pToolBar, event);
 }
 
-bool CMainFrame::ConnectToSite(CSiteManagerItemData_Site* const pData)
+bool CMainFrame::ConnectToSite(CSiteManagerItemData_Site* const pData, bool newTab)
 {
 	wxASSERT(pData);
 
@@ -1998,6 +2053,9 @@
 			return false;
 	}
 
+	if (newTab)
+		m_pContextControl->CreateTab();
+
 	if (!ConnectToServer(pData->m_server, pData->m_remoteDir))
 		return false;
 
@@ -2094,7 +2152,7 @@
 	windowOrder.push_back(m_pQueuePane);
 
 	std::list<wxWindow*>::iterator iter;
-	for (iter = windowOrder.begin(); iter != windowOrder.end(); iter++)
+	for (iter = windowOrder.begin(); iter != windowOrder.end(); ++iter)
 	{
 		if (*iter == event.GetEventObject())
 			break;
@@ -2150,7 +2208,7 @@
 	else
 	{
 		wxWindow *parent = focused->GetParent();
-		for (iter = windowOrder.begin(); iter != windowOrder.end(); iter++)
+		for (iter = windowOrder.begin(); iter != windowOrder.end(); ++iter)
 		{
 			if (*iter == focused || *iter == parent)
 			{
@@ -2177,7 +2235,7 @@
 		skipFirst = false;
 		if (forward)
 		{
-			iter++;
+			++iter;
 			if (iter == windowOrder.end())
 				iter = windowOrder.begin();
 		}
@@ -2185,7 +2243,7 @@
 		{
 			if (iter == windowOrder.begin())
 				iter = windowOrder.end();
-			iter--;
+			--iter;
 		}
 
 		if (iter == start)
@@ -2203,7 +2261,7 @@
 	CContextControl::_context_controls* controls = m_pContextControl->GetCurrentControls();
 	if (!controls)
 		return;
-	
+
 	wxString posString;
 
 	// top_pos
@@ -2398,7 +2456,7 @@
 	{
 #ifdef __WXMSW__
 		RECT r;
-        if (::SendMessage((HWND)pToolBar->GetHandle(), TB_GETITEMRECT, pToolBar->GetToolPos(event.GetId()), (LPARAM)&r))
+		if (::SendMessage((HWND)pToolBar->GetHandle(), TB_GETITEMRECT, pToolBar->GetToolPos(event.GetId()), (LPARAM)&r))
 			pToolBar->PopupMenu(pMenu, r.left, r.bottom);
 		else
 #endif
@@ -2445,6 +2503,25 @@
 	if (!pCommandLine)
 		return;
 
+	wxString local;
+	if ((local = pCommandLine->GetOption(CCommandLine::local)) != _T(""))
+	{
+		
+		if (!wxDir::Exists(local))
+		{
+			wxString str = _("Path not found:");
+			str += _T("\n") + local;
+			wxMessageBox(str, _("Syntax error in command line"));
+			return;
+		}
+		
+		CState *pState = CContextManager::Get()->GetCurrentContext();
+		if (!pState)
+			return;
+			
+		pState->SetLocalDir(local);
+	}	
+	
 	wxString site;
 	if (pCommandLine->HasSwitch(CCommandLine::sitemanager))
 	{
@@ -2460,7 +2537,7 @@
 
 		if (pData)
 		{
-            if (ConnectToSite(pData))
+			if (ConnectToSite(pData))
 			{
 				SetBookmarksFromPath(site);
 				if (m_pMenuBar)
@@ -2549,9 +2626,9 @@
 		// create another instance of the module and call its Exit() member.
 		// After that, the next call to a wxDisplay will create a new factory and
 		// get the new display layout from Windows.
-		// 
+		//
 		// Note: Both the factory pattern as well as the dynamic object system
-		//       are perfect example of bad design.
+		//	   are perfect example of bad design.
 		//
 		wxModule* pDisplayModule = (wxModule*)wxCreateDynamicObject(_T("wxDisplayModule"));
 		if (pDisplayModule)
diff -Nru filezilla-3.5.3/src/interface/Mainfrm.h filezilla-3.7.3~precise/src/interface/Mainfrm.h
--- filezilla-3.5.3/src/interface/Mainfrm.h	2011-12-06 04:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Mainfrm.h	2012-12-03 04:30:05.000000000 +0000
@@ -55,14 +55,15 @@
 	void ProcessCommandLine();
 
 	void PostInitialize();
-	
+
 	bool ConnectToServer(const CServer& server, const CServerPath& path = CServerPath());
 
 	CContextControl* GetContextControl() { return m_pContextControl; }
 
-	bool ConnectToSite(CSiteManagerItemData_Site* const pData);
+	bool ConnectToSite(CSiteManagerItemData_Site* const pData, bool newTab = false);
 
 protected:
+	bool CloseDialogsAndQuit(wxCloseEvent &event);
 	bool CreateMenus();
 	bool CreateQuickconnectBar();
 	bool CreateToolBar();
@@ -108,6 +109,7 @@
 	void OnSize(wxSizeEvent& event);
 	void OnMenuHandler(wxCommandEvent& event);
 	void OnEngineEvent(wxEvent& event);
+	void OnUpdateLedTooltip(wxCommandEvent& event);
 	void OnDisconnect(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 	void OnClose(wxCloseEvent& event);
diff -Nru filezilla-3.5.3/src/interface/Makefile.am filezilla-3.7.3~precise/src/interface/Makefile.am
--- filezilla-3.5.3/src/interface/Makefile.am	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Makefile.am	2013-04-05 03:30:06.000000000 +0000
@@ -12,6 +12,7 @@
 
 # the application source, library search path, and link libraries
 filezilla_SOURCES = aboutdialog.cpp \
+		asksavepassworddialog.cpp \
 		asyncrequestqueue.cpp \
 		aui_notebook_ex.cpp \
 		auto_ascii_files.cpp \
@@ -116,12 +117,13 @@
 		xh_text_ex.cpp \
 		xh_toolb_ex.cpp \
 		xmlfunctions.cpp
- 
+
 if USE_BINRELOC
 filezilla_SOURCES += prefix.cpp
 endif
 
 noinst_HEADERS = aboutdialog.h \
+		 asksavepassworddialog.h \
 		 asyncrequestqueue.h \
 		 aui_notebook_ex.h \
 		 auto_ascii_files.h \
@@ -277,7 +279,7 @@
 if MACAPPBUNDLE
 noinst_DATA = $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT)
 endif
- 
+
 $(top_builddir)/FileZilla.app/Contents/MacOS/filezilla$(EXEEXT): filezilla
 	mkdir -p $(top_builddir)/FileZilla.app/Contents/MacOS
 	mkdir -p $(top_builddir)/FileZilla.app/Contents/SharedSupport/resources
diff -Nru filezilla-3.5.3/src/interface/Makefile.in filezilla-3.7.3~precise/src/interface/Makefile.in
--- filezilla-3.5.3/src/interface/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -51,8 +68,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -61,10 +79,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 am__installdirs = "$(DESTDIR)$(bindir)"
 PROGRAMS = $(bin_PROGRAMS)
-am__filezilla_SOURCES_DIST = aboutdialog.cpp asyncrequestqueue.cpp \
-	aui_notebook_ex.cpp auto_ascii_files.cpp bookmarks_dialog.cpp \
-	buildinfo.cpp chmoddialog.cpp clearprivatedata.cpp cmdline.cpp \
-	commandqueue.cpp conditionaldialog.cpp context_control.cpp \
+am__filezilla_SOURCES_DIST = aboutdialog.cpp asksavepassworddialog.cpp \
+	asyncrequestqueue.cpp aui_notebook_ex.cpp auto_ascii_files.cpp \
+	bookmarks_dialog.cpp buildinfo.cpp chmoddialog.cpp \
+	clearprivatedata.cpp cmdline.cpp commandqueue.cpp \
+	conditionaldialog.cpp context_control.cpp \
 	customheightlistctrl.cpp defaultfileexistsdlg.cpp dialogex.cpp \
 	dndobjects.cpp dragdropmanager.cpp edithandler.cpp export.cpp \
 	fileexistsdlg.cpp filelistctrl.cpp filelist_statusbar.cpp \
@@ -111,6 +130,7 @@
 am__dirstamp = $(am__leading_dot)dirstamp
 @USE_BINRELOC_TRUE@am__objects_1 = filezilla-prefix.$(OBJEXT)
 am_filezilla_OBJECTS = filezilla-aboutdialog.$(OBJEXT) \
+	filezilla-asksavepassworddialog.$(OBJEXT) \
 	filezilla-asyncrequestqueue.$(OBJEXT) \
 	filezilla-aui_notebook_ex.$(OBJEXT) \
 	filezilla-auto_ascii_files.$(OBJEXT) \
@@ -225,6 +245,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA) $(noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -283,6 +308,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -320,6 +346,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -365,6 +392,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -398,7 +426,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -428,10 +455,11 @@
 AUTOMAKE_OPTIONS = subdir-objects
 
 # the application source, library search path, and link libraries
-filezilla_SOURCES = aboutdialog.cpp asyncrequestqueue.cpp \
-	aui_notebook_ex.cpp auto_ascii_files.cpp bookmarks_dialog.cpp \
-	buildinfo.cpp chmoddialog.cpp clearprivatedata.cpp cmdline.cpp \
-	commandqueue.cpp conditionaldialog.cpp context_control.cpp \
+filezilla_SOURCES = aboutdialog.cpp asksavepassworddialog.cpp \
+	asyncrequestqueue.cpp aui_notebook_ex.cpp auto_ascii_files.cpp \
+	bookmarks_dialog.cpp buildinfo.cpp chmoddialog.cpp \
+	clearprivatedata.cpp cmdline.cpp commandqueue.cpp \
+	conditionaldialog.cpp context_control.cpp \
 	customheightlistctrl.cpp defaultfileexistsdlg.cpp dialogex.cpp \
 	dndobjects.cpp dragdropmanager.cpp edithandler.cpp export.cpp \
 	fileexistsdlg.cpp filelistctrl.cpp filelist_statusbar.cpp \
@@ -477,6 +505,7 @@
 	xh_text_ex.cpp xh_toolb_ex.cpp xmlfunctions.cpp \
 	$(am__append_1)
 noinst_HEADERS = aboutdialog.h \
+		 asksavepassworddialog.h \
 		 asyncrequestqueue.h \
 		 aui_notebook_ex.h \
 		 auto_ascii_files.h \
@@ -637,8 +666,11 @@
 $(am__aclocal_m4_deps):
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -730,7 +762,7 @@
 	settings/$(am__dirstamp) settings/$(DEPDIR)/$(am__dirstamp)
 settings/filezilla-settingsdialog.$(OBJEXT): settings/$(am__dirstamp) \
 	settings/$(DEPDIR)/$(am__dirstamp)
-filezilla$(EXEEXT): $(filezilla_OBJECTS) $(filezilla_DEPENDENCIES) 
+filezilla$(EXEEXT): $(filezilla_OBJECTS) $(filezilla_DEPENDENCIES) $(EXTRA_filezilla_DEPENDENCIES) 
 	@rm -f filezilla$(EXEEXT)
 	$(filezilla_LINK) $(filezilla_OBJECTS) $(filezilla_LDADD) $(LIBS)
 
@@ -773,6 +805,7 @@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-RemoteTreeView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-StatusView.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-aboutdialog.Po@am__quote@
+@AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-asksavepassworddialog.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-asyncrequestqueue.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-aui_notebook_ex.Po@am__quote@
 @AMDEP_TRUE@@am__include@ @am__quote@./$(DEPDIR)/filezilla-auto_ascii_files.Po@am__quote@
@@ -908,6 +941,20 @@
 @AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
 @am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-aboutdialog.obj `if test -f 'aboutdialog.cpp'; then $(CYGPATH_W) 'aboutdialog.cpp'; else $(CYGPATH_W) '$(srcdir)/aboutdialog.cpp'; fi`
 
+filezilla-asksavepassworddialog.o: asksavepassworddialog.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-asksavepassworddialog.o -MD -MP -MF $(DEPDIR)/filezilla-asksavepassworddialog.Tpo -c -o filezilla-asksavepassworddialog.o `test -f 'asksavepassworddialog.cpp' || echo '$(srcdir)/'`asksavepassworddialog.cpp
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/filezilla-asksavepassworddialog.Tpo $(DEPDIR)/filezilla-asksavepassworddialog.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='asksavepassworddialog.cpp' object='filezilla-asksavepassworddialog.o' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-asksavepassworddialog.o `test -f 'asksavepassworddialog.cpp' || echo '$(srcdir)/'`asksavepassworddialog.cpp
+
+filezilla-asksavepassworddialog.obj: asksavepassworddialog.cpp
+@am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-asksavepassworddialog.obj -MD -MP -MF $(DEPDIR)/filezilla-asksavepassworddialog.Tpo -c -o filezilla-asksavepassworddialog.obj `if test -f 'asksavepassworddialog.cpp'; then $(CYGPATH_W) 'asksavepassworddialog.cpp'; else $(CYGPATH_W) '$(srcdir)/asksavepassworddialog.cpp'; fi`
+@am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/filezilla-asksavepassworddialog.Tpo $(DEPDIR)/filezilla-asksavepassworddialog.Po
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	source='asksavepassworddialog.cpp' object='filezilla-asksavepassworddialog.obj' libtool=no @AMDEPBACKSLASH@
+@AMDEP_TRUE@@am__fastdepCXX_FALSE@	DEPDIR=$(DEPDIR) $(CXXDEPMODE) $(depcomp) @AMDEPBACKSLASH@
+@am__fastdepCXX_FALSE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -c -o filezilla-asksavepassworddialog.obj `if test -f 'asksavepassworddialog.cpp'; then $(CYGPATH_W) 'asksavepassworddialog.cpp'; else $(CYGPATH_W) '$(srcdir)/asksavepassworddialog.cpp'; fi`
+
 filezilla-asyncrequestqueue.o: asyncrequestqueue.cpp
 @am__fastdepCXX_TRUE@	$(CXX) $(DEFS) $(DEFAULT_INCLUDES) $(INCLUDES) $(filezilla_CPPFLAGS) $(CPPFLAGS) $(filezilla_CXXFLAGS) $(CXXFLAGS) -MT filezilla-asyncrequestqueue.o -MD -MP -MF $(DEPDIR)/filezilla-asyncrequestqueue.Tpo -c -o filezilla-asyncrequestqueue.o `test -f 'asyncrequestqueue.cpp' || echo '$(srcdir)/'`asyncrequestqueue.cpp
 @am__fastdepCXX_TRUE@	$(am__mv) $(DEPDIR)/filezilla-asyncrequestqueue.Tpo $(DEPDIR)/filezilla-asyncrequestqueue.Po
@@ -2551,13 +2598,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -2597,10 +2641,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/Options.cpp filezilla-3.7.3~precise/src/interface/Options.cpp
--- filezilla-3.5.3/src/interface/Options.cpp	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Options.cpp	2013-01-14 04:30:08.000000000 +0000
@@ -171,12 +171,13 @@
 	{ "Filteredit window size", string, _T(""), normal },
 	{ "Enable invalid char filter", number, _T("1"), normal },
 	{ "Invalid char replace", string, _T("_"), normal },
-	{ "Already connected choice", number, _T("0"), normal },	
+	{ "Already connected choice", number, _T("0"), normal },
 	{ "Edit status dialog size", string, _T(""), normal },
 	{ "Display current speed", number, _T("0"), normal },
 	{ "Toolbar hidden", number, _T("0"), normal },
 	{ "Strip VMS revisions", number, _T("0"), normal },
 	{ "Show Site Manager on startup", number, _T("0"), normal },
+	{ "Prompt password change", number, _T("0"), normal },
 
 	// Default/internal options
 	{ "Config Location", string, _T(""), default_only },
@@ -209,7 +210,7 @@
 
 	CInterProcessMutex mutex(MUTEX_OPTIONS);
 	m_pXmlFile = new CXmlFile(_T("filezilla"));
-	if (!m_pXmlFile->Load())
+	if (!m_pXmlFile->Load(wxFileName()))
 	{
 		wxString msg = m_pXmlFile->GetError() + _T("\n\n") + _("For this session the default settings will be used. Any changes to the settings will not be saved.");
 		wxMessageBox(msg, _("Error loading xml file"), wxICON_ERROR);
@@ -357,10 +358,7 @@
 			wxString s(wxString::Format(_T("%d"), m_optionsCache[i].numValue));
 			SetXmlValue(i, s);
 		}
-		
 	}
-
-	m_pXmlFile->Save();
 }
 
 void COptions::SetXmlValue(unsigned int nID, wxString value)
@@ -556,7 +554,7 @@
 
 	if (GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 2)
 		return;
-	
+
 	CInterProcessMutex mutex(MUTEX_OPTIONS);
 	m_pXmlFile->Save();
 }
@@ -736,7 +734,7 @@
 	const wxString& defaultsDir = wxGetApp().GetDefaultsDir();
 	if (defaultsDir == _T(""))
 		return;
-	
+
 	wxFileName name(defaultsDir, _T("fzdefaults.xml"));
 	CXmlFile file(name);
 	if (!file.Load())
diff -Nru filezilla-3.5.3/src/interface/Options.h filezilla-3.7.3~precise/src/interface/Options.h
--- filezilla-3.5.3/src/interface/Options.h	2011-11-01 16:41:52.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/Options.h	2013-06-09 03:30:06.000000000 +0000
@@ -82,6 +82,7 @@
 	OPTION_TOOLBAR_HIDDEN,
 	OPTION_STRIP_VMS_REVISION,
 	OPTION_INTERFACE_SITEMANAGER_ON_STARTUP,
+	OPTION_PROMPTPASSWORDSAVE,
 
 	// Default/internal options
 	OPTION_DEFAULT_SETTINGSDIR,
@@ -111,7 +112,7 @@
 	virtual bool SetOption(unsigned int nID, wxString value);
 
 	bool OptionFromFzDefaultsXml(unsigned int nID);
-	
+
 	void SetLastServer(const CServer& server);
 	bool GetLastServer(CServer& server);
 
@@ -158,7 +159,7 @@
 
 	wxTimer m_save_timer;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTimer(wxTimerEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/QueueView.cpp filezilla-3.7.3~precise/src/interface/QueueView.cpp
--- filezilla-3.5.3/src/interface/QueueView.cpp	2011-10-10 03:30:24.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/QueueView.cpp	2013-05-13 03:30:10.000000000 +0000
@@ -133,7 +133,7 @@
 			if (!pState)
 				return wxDragNone;
 			if (!pState->GetLocalDir().IsWriteable())
-				return wxDragNone;			
+				return wxDragNone;
 		}
 
 		def = wxDragCopy;
@@ -227,9 +227,9 @@
 
 	virtual ~CFolderProcessingThread()
 	{
-		for (std::list<CFolderProcessingEntry*>::iterator iter = m_entryList.begin(); iter != m_entryList.end(); iter++)
+		for (std::list<CFolderProcessingEntry*>::iterator iter = m_entryList.begin(); iter != m_entryList.end(); ++iter)
 			delete *iter;
-		for (std::list<t_internalDirPair*>::iterator iter = m_dirsToCheck.begin(); iter != m_dirsToCheck.end(); iter++)
+		for (std::list<t_internalDirPair*>::iterator iter = m_dirsToCheck.begin(); iter != m_dirsToCheck.end(); ++iter)
 			delete *iter;
 	}
 
@@ -398,8 +398,9 @@
 			}
 
 			t_dirPair* pair2 = new t_dirPair;
-	
+
 			{
+				// wx' refcounted wxString isn't thread-safe. Force a deep copy.
 				pair2->localPath = pair->localPath.c_str();
 				pair2->remotePath = pair->remotePath.GetSafePath().c_str();
 			}
@@ -415,6 +416,7 @@
 			{
 				if (is_link)
 					continue;
+				// wx' refcounted wxString isn't thread-safe. Force a deep copy.
 				entry->name = name.c_str();
 				entry->dir = is_dir;
 
@@ -480,16 +482,6 @@
 	extraCols.push_back(colTransferStatus);
 	CreateColumns(extraCols);
 
-	//Initialize the engine data
-	t_EngineData *pData = new t_EngineData;
-	pData->active = false;
-	pData->pItem = 0;
-	pData->pStatusLineCtrl = 0;
-	pData->state = t_EngineData::none;
-	pData->pEngine = 0; // TODO: Primary transfer engine data
-	pData->m_idleDisconnectTimer = 0;
-	m_engineData.push_back(pData);
-
 	SettingsChanged();
 
 	SetDropTarget(new CQueueViewDropTarget(this));
@@ -529,7 +521,8 @@
 bool CQueueView::QueueFile(const bool queueOnly, const bool download,
 						   const wxString& sourceFile, const wxString& targetFile,
 						   const CLocalPath& localPath, const CServerPath& remotePath,
-						   const CServer& server, const wxLongLong size, enum CEditHandler::fileType edit /*=CEditHandler::none*/)
+						   const CServer& server, const wxLongLong size, enum CEditHandler::fileType edit,
+						   QueuePriority priority)
 {
 	CServerItem* pServerItem = CreateServerItem(server);
 
@@ -558,6 +551,7 @@
 			fileItem->m_onetime_action = CFileExistsNotification::overwrite;
 	}
 
+	fileItem->SetPriorityRaw(priority);
 	InsertItem(pServerItem, fileItem);
 
 	return true;
@@ -598,7 +592,7 @@
 
 	const std::list<CRemoteDataObject::t_fileInfo>& files = dataObject.GetFiles();
 
-	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		if (iter->dir)
 			continue;
@@ -623,17 +617,10 @@
 
 void CQueueView::OnEngineEvent(wxEvent &event)
 {
-	std::vector<t_EngineData*>::iterator iter;
-	for (iter = m_engineData.begin(); iter != m_engineData.end(); iter++)
-	{
-		if ((wxObject *)(*iter)->pEngine == event.GetEventObject())
-			break;
-	}
-	if (iter == m_engineData.end())
+	t_EngineData* const pEngineData = GetEngineData(reinterpret_cast<CFileZillaEngine*>(event.GetEventObject()));
+	if (!pEngineData)
 		return;
 
-	t_EngineData* const pEngineData = *iter;
-
 	CNotification *pNotification = pEngineData->pEngine->GetNextNotification();
 	while (pNotification)
 	{
@@ -646,16 +633,10 @@
 	}
 }
 
-void CQueueView::ProcessNotification(CNotification* pNotification)
+void CQueueView::ProcessNotification(CFileZillaEngine* pEngine, CNotification* pNotification)
 {
-	if (m_engineData.empty())
-	{
-		delete pNotification;
-		return;
-	}
-
-	t_EngineData* pEngineData = m_engineData[0];
-	if (!pEngineData->active)
+	t_EngineData* pEngineData = GetEngineData(pEngine);
+	if (!pEngineData || !pEngineData->active || !pEngineData->transient)
 	{
 		delete pNotification;
 		return;
@@ -736,7 +717,7 @@
 
 			if (pEngineData->active)
 			{
-				if (pStatus && pStatus->madeProgress && !pStatus->list && 
+				if (pStatus && pStatus->madeProgress && !pStatus->list &&
 					pEngineData->pItem->GetType() == QueueItemType_File)
 				{
 					CFileItem* pItem = (CFileItem*)pEngineData->pItem;
@@ -751,7 +732,7 @@
 		{
 			CLocalDirCreatedNotification *pLocalDirCreatedNotification = reinterpret_cast<CLocalDirCreatedNotification *>(pNotification);
 			const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 				(*iter)->LocalDirCreated(pLocalDirCreatedNotification->dir);
 		}
 		delete pNotification;
@@ -771,12 +752,11 @@
 
 	int active_count = server_item.m_activeCount;
 
-	bool browsing_on_same = false;
+	CState* browsingStateOnSameServer = 0;
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-	CState* pState = 0;
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
-		pState = *iter;
+		CState* pState = *iter;
 		const CServer* pBrowsingServer = pState->GetServer();
 		if (!pBrowsingServer)
 			continue;
@@ -784,7 +764,7 @@
 		if (*pBrowsingServer == server)
 		{
 			active_count++;
-			browsing_on_same = true;
+			browsingStateOnSameServer = pState;
 			break;
 		}
 	}
@@ -794,30 +774,33 @@
 
 	// Max count has been reached
 
-	// If we got an idle engine connected to this very server, start the
-	// transfer anyhow. Let's not get this connection go to waste.
-	pEngineData = GetIdleEngine(&server);
-	if (pEngineData->pEngine->IsConnected() && pEngineData->lastServer == server)
-		return true;
+	pEngineData = GetIdleEngine(&server, true);
+	if (pEngineData)
+	{
+		// If we got an idle engine connected to this very server, start the
+		// transfer anyhow. Let's not get this connection go to waste.
+		if (pEngineData->lastServer == server && pEngineData->pEngine->IsConnected())
+			return true;
+	}
 
-	if (!browsing_on_same || active_count > 1)
+	if (!browsingStateOnSameServer || active_count > 1)
 		return false;
 
 	// At this point the following holds:
 	// max_count is limited to 1, only connection to server is held by the browsing connection
-	pEngineData = m_engineData[0];
 
-	if (pEngineData->active)
-		return false;
-
-	if (pEngineData->pEngine != pState->m_pEngine)
+	pEngineData = GetEngineData(browsingStateOnSameServer->m_pEngine);
+	if (pEngineData)
 	{
-		if (pEngineData->pEngine)
-			ReleaseExclusiveEngineLock(pEngineData->pEngine);
-		pEngineData->state = t_EngineData::waitprimary;
-		pEngineData->pEngine = pState->m_pEngine;
+		wxASSERT(pEngineData->transient);
+		return pEngineData->transient && !pEngineData->active;
 	}
 
+	pEngineData = new t_EngineData;
+	pEngineData->transient = true;
+	pEngineData->state = t_EngineData::waitprimary;
+	pEngineData->pEngine = browsingStateOnSameServer->m_pEngine;
+	m_engineData.push_back(pEngineData);
 	return true;
 }
 
@@ -855,7 +838,7 @@
 
 	// Find inactive file. Check all servers for
 	// the file with the highest priority
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		t_EngineData* pEngineData = 0;
 		CServerItem* currentServerItem = *iter;
@@ -871,7 +854,7 @@
 			localPath.AddSegment(newFileItem->GetLocalFile());
 			wxFileName::Mkdir(localPath.GetPath(), 0777, wxPATH_MKDIR_FULL);
 			const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 				(*iter)->RefreshLocalFile(localPath.GetPath());
 			if (RemoveItem(newFileItem, true))
 			{
@@ -1076,7 +1059,7 @@
 					return;
 			}
 
-			if (pEngineData != m_engineData[0])
+			if (!pEngineData->transient)
 				SwitchEngine(&pEngineData);
 		}
 		break;
@@ -1127,7 +1110,7 @@
 			if (!IncreaseErrorCount(*pEngineData))
 				return;
 
-			if (replyCode & FZ_REPLY_DISCONNECTED && pEngineData == m_engineData[0])
+			if (replyCode & FZ_REPLY_DISCONNECTED && pEngineData->transient)
 			{
 				ResetEngine(*pEngineData, retry);
 				return;
@@ -1150,7 +1133,7 @@
 			if (!IncreaseErrorCount(*pEngineData))
 				return;
 
-			if (pEngineData == m_engineData[0])
+			if (pEngineData->transient)
 			{
 				ResetEngine(*pEngineData, retry);
 				return;
@@ -1214,7 +1197,7 @@
 		if (data.pItem->GetType() == QueueItemType_File)
 		{
 			wxASSERT(data.pStatusLineCtrl);
-			for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); iter++)
+			for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter)
 			{
 				if (*iter == data.pStatusLineCtrl)
 				{
@@ -1235,7 +1218,7 @@
 			if (pFileItem->Download())
 			{
 				const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-				for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+				for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 					(*iter)->RefreshLocalFile(pFileItem->GetLocalPath().GetPath() + pFileItem->GetLocalFile());
 			}
 
@@ -1337,7 +1320,7 @@
 	if (data.state == t_EngineData::waitprimary && data.pEngine)
 	{
 		const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 		{
 			CState* pState = *iter;
 			if (pState->m_pEngine != data.pEngine)
@@ -1391,7 +1374,7 @@
 
 void CQueueView::SendNextCommand(t_EngineData& engineData)
 {
-	while (true)
+	for (;;)
 	{
 		if (engineData.state == t_EngineData::waitprimary)
 		{
@@ -1406,7 +1389,7 @@
 
 			CState* pState = 0;
 			const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 			{
 				if ((*iter)->m_pEngine != engineData.pEngine)
 					continue;
@@ -1499,7 +1482,7 @@
 
 			if (res == FZ_REPLY_NOTCONNECTED)
 			{
-				if (&engineData == m_engineData[0])
+				if (engineData.transient)
 				{
 					ResetEngine(engineData, retry);
 					return;
@@ -1535,7 +1518,7 @@
 
 			if (res == FZ_REPLY_NOTCONNECTED)
 			{
-				if (&engineData == m_engineData[0])
+				if (engineData.transient)
 				{
 					ResetEngine(engineData, retry);
 					return;
@@ -1563,11 +1546,11 @@
 	if (!active)
 	{
 		m_activeMode = 0;
-		for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+		for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 			(*iter)->QueueImmediateFiles();
 
 		const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+		for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 		{
 			CState* pState = *iter;
 
@@ -1584,8 +1567,7 @@
 		UpdateStatusLinePositions();
 
 		// Send active engines the cancel command
-		unsigned int engineIndex;
-		for (engineIndex = 0; engineIndex < m_engineData.size(); engineIndex++)
+		for (unsigned int engineIndex = 0; engineIndex < m_engineData.size(); engineIndex++)
 		{
 			t_EngineData* const pEngineData = m_engineData[engineIndex];
 			if (!pEngineData->active)
@@ -1649,7 +1631,7 @@
 		if (!m_queuedFolders[i].empty())
 		{
 			canQuit = false;
-			for (std::list<CFolderScanItem*>::iterator iter = m_queuedFolders[i].begin(); iter != m_queuedFolders[i].end(); iter++)
+			for (std::list<CFolderScanItem*>::iterator iter = m_queuedFolders[i].begin(); iter != m_queuedFolders[i].end(); ++iter)
 				(*iter)->m_remove = true;
 		}
 	}
@@ -1676,10 +1658,19 @@
 
 void CQueueView::CheckQueueState()
 {
-	if (!m_engineData.empty() && !m_engineData[0]->active && m_engineData[0]->pEngine)
+	for (unsigned int i = 0; i < m_engineData.size(); )
 	{
-		ReleaseExclusiveEngineLock(m_engineData[0]->pEngine);
-		m_engineData[0]->pEngine = 0;
+		t_EngineData* data = m_engineData[i];
+		if (!data->active && data->transient)
+		{
+			if (data->pEngine)
+				ReleaseExclusiveEngineLock(data->pEngine);
+			delete data;
+			m_engineData.erase(m_engineData.begin() + i);
+		}
+		else {
+			++i;
+		}
 	}
 
 	if (m_activeCount)
@@ -1732,7 +1723,7 @@
 	m_lastTopItem = GetTopItem();
 	int bottomItem = m_lastTopItem + GetCountPerPage();
 
-	for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); iter++)
+	for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter)
 	{
 		CStatusLineCtrl *pCtrl = *iter;
 		int index = GetItemIndex(pCtrl->GetItem()) + 1;
@@ -1765,7 +1756,7 @@
 	m_folderScanCount = 0;
 
 	m_filesWithUnknownSize = 0;
-	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		m_totalQueueSize += (*iter)->GetTotalSize(m_filesWithUnknownSize, m_fileCount, m_folderScanCount);
 
 	DisplayQueueSize();
@@ -1870,13 +1861,13 @@
 int CQueueView::QueueFiles(const std::list<CFolderProcessingEntry*> &entryList, bool queueOnly, bool download, CServerItem* pServerItem, const enum CFileExistsNotification::OverwriteAction defaultFileExistsAction)
 {
 	wxASSERT(pServerItem);
-	
+
 	CFolderScanItem* pFolderScanItem = m_pFolderProcessingThread->GetFolderScanItem();
 
 	int added = 0;
 
 	CFilterManager filters;
-	for (std::list<CFolderProcessingEntry*>::const_iterator iter = entryList.begin(); iter != entryList.end(); iter++)
+	for (std::list<CFolderProcessingEntry*>::const_iterator iter = entryList.begin(); iter != entryList.end(); ++iter)
 	{
 		const CFolderProcessingEntry* entry = *iter;
 		if (entry->m_type == CFolderProcessingEntry::dir)
@@ -1956,7 +1947,7 @@
 {
 	wxFileName file(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), _T("queue.xml"));
 	CXmlFile xml(file);
-	TiXmlElement* pDocument = xml.Load(wxFileName(), false);
+	TiXmlElement* pDocument = xml.Load(wxFileName());
 	if (!pDocument)
 	{
 		if (!xml.GetError().empty())
@@ -2040,7 +2031,7 @@
 		if (!m_queue_storage.Vacuum())
 			error = true;
 	}
-	
+
 	m_insertionStart = -1;
 	m_insertionCount = 0;
 	CommitChanges();
@@ -2080,7 +2071,7 @@
 
 				int dataType = GetTextElementInt(pFile, "DataType", -1);
 				if (dataType == -1)
-					dataType = GetTextElementInt(pFile, "TransferMode", 1); 
+					dataType = GetTextElementInt(pFile, "TransferMode", 1);
 				bool binary = dataType != 0;
 				int overwrite_action = GetTextElementInt(pFile, "OverwriteAction", CFileExistsNotification::unknown);
 
@@ -2176,19 +2167,17 @@
 void CQueueView::SettingsChanged()
 {
 	// Create missing engines if needed
-	const int engineCount = m_engineData.size();
+	int engineCount = 0;
+	for (std::vector<t_EngineData*>::const_iterator it = m_engineData.begin(); it != m_engineData.end(); ++it)
+		if (!(*it)->transient)
+			++engineCount;
+
 	const int newEngineCount = COptions::Get()->GetOptionVal(OPTION_NUMTRANSFERS);
-	if (newEngineCount >= engineCount)
+	if (newEngineCount > engineCount)
 	{
-		for (int i = 0; i < (newEngineCount - engineCount + 1); i++)
+		for (int i = 0; i < (newEngineCount - engineCount); i++)
 		{
 			t_EngineData *pData = new t_EngineData;
-			pData->active = false;
-			pData->pItem = 0;
-			pData->pStatusLineCtrl = 0;
-			pData->state = t_EngineData::none;
-			pData->m_idleDisconnectTimer = 0;
-
 			pData->pEngine = new CFileZillaEngine();
 			pData->pEngine->Init(this, COptions::Get());
 
@@ -2331,7 +2320,7 @@
 
 	std::vector<CServerItem*> newServerList;
 	m_itemCount = 0;
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		if ((*iter)->TryRemoveAll())
 			delete *iter;
@@ -2368,7 +2357,7 @@
 {
 	for (unsigned int i = 0; i < 2; i++)
 	{
-		for (std::list<CFolderScanItem*>::iterator iter = m_queuedFolders[i].begin(); iter != m_queuedFolders[i].end(); iter++)
+		for (std::list<CFolderScanItem*>::iterator iter = m_queuedFolders[i].begin(); iter != m_queuedFolders[i].end(); ++iter)
 		{
 			if (*iter != pFolder)
 				continue;
@@ -2389,7 +2378,7 @@
 
 	std::list<CQueueItem*> selectedItems;
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2491,7 +2480,7 @@
 	for (unsigned int i = 0; i < pServerItem->GetChildrenCount(false); i++)
 		items.push_back(pServerItem->GetChild(i, false));
 
-	for (std::list<CQueueItem*>::reverse_iterator iter = items.rbegin(); iter != items.rend(); iter++)
+	for (std::list<CQueueItem*>::reverse_iterator iter = items.rbegin(); iter != items.rend(); ++iter)
 	{
 		CQueueItem* pItem = *iter;
 		if (pItem->GetType() == QueueItemType_FolderScan)
@@ -2552,7 +2541,7 @@
 
 void CQueueView::SetDefaultFileExistsAction(enum CFileExistsNotification::OverwriteAction action, const enum TransferDirection direction)
 {
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		(*iter)->SetDefaultFileExistsAction(action, direction);
 }
 
@@ -2574,7 +2563,7 @@
 	bool upload_unknown = false;
 
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2635,7 +2624,7 @@
 		return;
 
 	item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2684,15 +2673,19 @@
 	}
 }
 
-t_EngineData* CQueueView::GetIdleEngine(const CServer* pServer /*=0*/)
+t_EngineData* CQueueView::GetIdleEngine(const CServer* pServer, bool allowTransient)
 {
+	wxASSERT(!allowTransient || pServer);
+
 	t_EngineData* pFirstIdle = 0;
 
-	// We start with 1, since 0 is the primary connection
-	for (unsigned int i = 1; i < m_engineData.size(); i++)
+	for (unsigned int i = 0; i < m_engineData.size(); i++)
 	{
 		if (m_engineData[i]->active)
 			continue;
+		
+		if (m_engineData[i]->transient && !allowTransient)
+			continue;
 
 		if (!pServer)
 			return m_engineData[i];
@@ -2707,13 +2700,24 @@
 	return pFirstIdle;
 }
 
+
+t_EngineData* CQueueView::GetEngineData(const CFileZillaEngine* pEngine)
+{
+	for (unsigned int i = 0; i < m_engineData.size(); ++i)
+		if (m_engineData[i]->pEngine == pEngine)
+			return m_engineData[i];
+
+	return 0;
+}
+
+
 void CQueueView::TryRefreshListings()
 {
 	if (m_quit)
 		return;
 
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		CState* pState = *iter;
 
@@ -2727,7 +2731,7 @@
 
 		// See if there's an engine that is already listing
 		unsigned int i;
-		for (i = 1; i < m_engineData.size(); i++)
+		for (i = 0; i < m_engineData.size(); i++)
 		{
 			if (!m_engineData[i]->active || m_engineData[i]->state != t_EngineData::list)
 				continue;
@@ -2778,20 +2782,13 @@
 	{
 		const CFileZillaEngine* const pEngine = m_waitingForPassword.front();
 
-		std::vector<t_EngineData*>::iterator iter;
-		for (iter = m_engineData.begin(); iter != m_engineData.end(); iter++)
-		{
-			if ((*iter)->pEngine == pEngine)
-				break;
-		}
-		if (iter == m_engineData.end())
+		t_EngineData* pEngineData = GetEngineData(pEngine);
+		if (!pEngineData)
 		{
 			m_waitingForPassword.pop_front();
 			continue;
 		}
 
-		t_EngineData* pEngineData = *iter;
-
 		if (pEngineData->state != t_EngineData::askpassword)
 		{
 			m_waitingForPassword.pop_front();
@@ -2855,9 +2852,9 @@
 	}
 
 	// Set timer for connected, idle engines
-	for (unsigned int i = 1; i < m_engineData.size(); i++)
+	for (unsigned int i = 0; i < m_engineData.size(); i++)
 	{
-		if (m_engineData[i]->active)
+		if (m_engineData[i]->active || m_engineData[i]->transient)
 			continue;
 
 		if (m_engineData[i]->m_idleDisconnectTimer)
@@ -2939,7 +2936,7 @@
 		return;
 	}
 
-	for (unsigned int i = 1; i < m_engineData.size(); i++)
+	for (unsigned int i = 0; i < m_engineData.size(); i++)
 	{
 		t_EngineData* pData = m_engineData[i];
 		if (pData->m_idleDisconnectTimer && !pData->m_idleDisconnectTimer->IsRunning())
@@ -2957,17 +2954,11 @@
 
 void CQueueView::DeleteEngines()
 {
-	for (unsigned int engineIndex = 1; engineIndex < m_engineData.size(); engineIndex++)
+	for (unsigned int engineIndex = 0; engineIndex < m_engineData.size(); engineIndex++)
 	{
 		t_EngineData* const data = m_engineData[engineIndex];
-		wxASSERT(!data->active);
-		delete data->pEngine;
-		data->pEngine = 0;
-		delete data->m_idleDisconnectTimer;
-		data->m_idleDisconnectTimer = 0;
+		delete data;
 	}
-	for (unsigned int engineIndex = 0; engineIndex < m_engineData.size(); engineIndex++)
-		delete m_engineData[engineIndex];
 	m_engineData.clear();
 }
 
@@ -2981,7 +2972,7 @@
 
 	wxASSERT(pQueue);
 
-	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		(*iter)->SaveItem(pQueue);
 }
 
@@ -3031,13 +3022,11 @@
 
 void CQueueView::OnExclusiveEngineRequestGranted(wxCommandEvent& event)
 {
-	t_EngineData* pEngineData = m_engineData[0];
-
 	CFileZillaEngine* pEngine = 0;
 	CState* pState;
 	CCommandQueue* pCommandQueue;
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		pState = *iter;
 		pCommandQueue = pState->m_pCommandQueue;
@@ -3048,25 +3037,20 @@
 		if (!pEngine)
 			continue;
 
-		if (pEngine != pEngineData->pEngine)
-		{
-			pCommandQueue->ReleaseEngine();
-			pEngine = 0;
-			continue;
-		}
-
 		break;
 	}
 
 	if (!pEngine)
 		return;
 
-	if (!pEngineData->active)
+	t_EngineData* pEngineData = GetEngineData(pEngine);
+	wxASSERT(!pEngineData || pEngineData->transient);
+	if (!pEngineData || !pEngineData->transient || !pEngineData->active)
 	{
 		pCommandQueue->ReleaseEngine();
 		return;
 	}
-
+	
 	wxASSERT(pEngineData->state == t_EngineData::waitprimary);
 	if (pEngineData->state != t_EngineData::waitprimary)
 		return;
@@ -3150,7 +3134,7 @@
 		case ActionAfterState_Disconnect:
 		{
 			const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+			for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 			{
 				CState* pState = *iter;
 				if (pState->IsRemoteConnected() && pState->IsRemoteIdle())
@@ -3292,14 +3276,13 @@
 	t_EngineData* pEngineData = *ppEngineData;
 
 	std::vector<t_EngineData*>::iterator iter = m_engineData.begin();
-	iter++;
-	for (; iter != m_engineData.end(); iter++)
+	for (; iter != m_engineData.end(); ++iter)
 	{
 		t_EngineData* pNewEngineData = *iter;
 		if (pNewEngineData == pEngineData)
 			continue;
 
-		if (pNewEngineData->active)
+		if (pNewEngineData->active || pNewEngineData->transient)
 			continue;
 
 		if (pNewEngineData->lastServer != pEngineData->lastServer)
@@ -3346,7 +3329,7 @@
 
 bool CQueueView::IsOtherEngineConnected(t_EngineData* pEngineData)
 {
-	for (std::vector<t_EngineData*>::iterator iter = m_engineData.begin(); iter != m_engineData.end(); iter++)
+	for (std::vector<t_EngineData*>::iterator iter = m_engineData.begin(); iter != m_engineData.end(); ++iter)
 	{
 		t_EngineData* current = *iter;
 
@@ -3408,19 +3391,10 @@
 
 void CQueueView::RenameFileInTransfer(CFileZillaEngine *pEngine, const wxString& newName, bool local)
 {
-	std::vector<t_EngineData*>::iterator iter;
-	for (iter = m_engineData.begin(); iter != m_engineData.end(); iter++)
-	{
-		if ((*iter)->pEngine == pEngine)
-			break;
-	}
-	if (iter == m_engineData.end())
+	t_EngineData* const pEngineData = GetEngineData(pEngine);
+	if (!pEngineData || !pEngineData->pItem)
 		return;
 
-	t_EngineData* const pEngineData = *iter;
-	if (!pEngineData->pItem)
-		return;
-	
 	if (pEngineData->pItem->GetType() != QueueItemType_File)
 		return;
 
@@ -3488,6 +3462,39 @@
 	return result;
 }
 
+wxFileOffset CQueueView::GetCurrentDownloadSpeed()
+{
+	wxFileOffset speed = GetCurrentSpeed(true, false);
+	return speed;
+}
+
+wxFileOffset CQueueView::GetCurrentUploadSpeed()
+{
+	wxFileOffset speed = GetCurrentSpeed(false, true);
+	return speed;
+}
+
+wxFileOffset CQueueView::GetCurrentSpeed(bool countDownload, bool countUpload)
+{
+	wxFileOffset totalSpeed = 0;
+
+	for (std::list<CStatusLineCtrl*>::iterator iter = m_statusLineList.begin(); iter != m_statusLineList.end(); ++iter)
+	{
+		CStatusLineCtrl *pCtrl = *iter;
+		const CFileItem *pItem = pCtrl->GetItem();
+		bool isDownload = pItem->Download();
+
+		if ((isDownload && countDownload) || (!isDownload && countUpload))
+		{
+			wxFileOffset speed = pCtrl->GetCurrentSpeed();
+			if (speed != -1)
+				totalSpeed += speed;
+		}
+	}
+
+	return totalSpeed;
+}
+
 void CQueueView::ReleaseExclusiveEngineLock(CFileZillaEngine* pEngine)
 {
 	wxASSERT(pEngine);
@@ -3495,7 +3502,7 @@
 		return;
 
 	const std::vector<CState*> *pStates = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = pStates->begin(); iter != pStates->end(); ++iter)
 	{
 		CState* pState = *iter;
 		if (pState->m_pEngine != pEngine)
@@ -3511,7 +3518,7 @@
 #ifdef __WXMSW__
 
 #ifndef WM_DWMCOMPOSITIONCHANGED
-#define WM_DWMCOMPOSITIONCHANGED        0x031E
+#define WM_DWMCOMPOSITIONCHANGED		0x031E
 #endif // WM_DWMCOMPOSITIONCHANGED
 
 WXLRESULT CQueueView::MSWWindowProc(WXUINT nMsg, WXWPARAM wParam, WXLPARAM lParam)
@@ -3524,7 +3531,7 @@
 	}
 	else if (nMsg == WM_LBUTTONDOWN)
 	{
-		// If clicking a partially selected item, Windows starts an internal timer with the double-click interval (as seen in the 
+		// If clicking a partially selected item, Windows starts an internal timer with the double-click interval (as seen in the
 		// disassembly). After the timer expires, the given item is selected. But there's a huge bug in Windows: We don't get
 		// notified about this change in scroll position in any way (verified using Spy++), so on left button down, start our
 		// own timer with a slightly higher interval.
diff -Nru filezilla-3.5.3/src/interface/QueueView.h filezilla-3.7.3~precise/src/interface/QueueView.h
--- filezilla-3.5.3/src/interface/QueueView.h	2011-05-17 03:30:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/QueueView.h	2013-06-09 03:30:06.000000000 +0000
@@ -27,7 +27,12 @@
 class t_newEntry : public CFolderProcessingEntry
 {
 public:
-	t_newEntry() : CFolderProcessingEntry(CFolderProcessingEntry::file) {}
+	t_newEntry()
+		: CFolderProcessingEntry(CFolderProcessingEntry::file)
+		, attributes()
+		, dir()
+	{}
+
 	wxString name;
 	wxLongLong size;
 	wxDateTime time;
@@ -55,8 +60,28 @@
 class CFileItem;
 struct t_EngineData
 {
+	t_EngineData()
+		: pEngine()
+		, active()
+		, transient()
+		, state(t_EngineData::none)
+		, pItem()
+		, pStatusLineCtrl()
+		, m_idleDisconnectTimer()
+	{
+	}
+
+	~t_EngineData()
+	{
+		wxASSERT(!active);
+		if (!transient)
+			delete pEngine;
+		delete m_idleDisconnectTimer;
+	}
+
 	CFileZillaEngine* pEngine;
 	bool active;
+	bool transient;
 
 	enum EngineDataState
 	{
@@ -98,7 +123,8 @@
 	bool QueueFile(const bool queueOnly, const bool download,
 		const wxString& localFile, const wxString& remoteFile,
 		const CLocalPath& localPath, const CServerPath& remotePath,
-		const CServer& server, const wxLongLong size, enum CEditHandler::fileType edit = CEditHandler::none);
+		const CServer& server, const wxLongLong size, enum CEditHandler::fileType edit = CEditHandler::none,
+		QueuePriority priority = priority_normal);
 
 	void QueueFile_Finish(const bool start); // Need to be called after QueueFile
 	bool QueueFiles(const bool queueOnly, const CLocalPath& localPath, const CRemoteDataObject& dataObject);
@@ -132,12 +158,20 @@
 
 	void WriteToFile(TiXmlElement* pElement) const;
 
-	void ProcessNotification(CNotification* pNotification);
+	void ProcessNotification(CFileZillaEngine* pEngine, CNotification* pNotification);
 
 	void RenameFileInTransfer(CFileZillaEngine *pEngine, const wxString& newName, bool local);
 
 	static wxString ReplaceInvalidCharacters(const wxString& filename);
 
+	// Get the current download speed as the sum of all active downloads.
+	// Unit is byte/s.
+	wxFileOffset GetCurrentDownloadSpeed();
+
+	// Get the current upload speed as the sum of all active uploads.
+	// Unit is byte/s.
+	wxFileOffset GetCurrentUploadSpeed();
+
 protected:
 
 #ifdef __WXMSW__
@@ -208,7 +242,8 @@
 
 	bool IsOtherEngineConnected(t_EngineData* pEngineData);
 
-	t_EngineData* GetIdleEngine(const CServer* pServer = 0);
+	t_EngineData* GetIdleEngine(const CServer* pServer = 0, bool allowTransient = false);
+	t_EngineData* GetEngineData(const CFileZillaEngine* pEngine);
 
 	std::vector<t_EngineData*> m_engineData;
 	std::list<CStatusLineCtrl*> m_statusLineList;
@@ -223,7 +258,7 @@
 	void RemoveQueuedFolderItem(CFolderScanItem* pFolder);
 
 	CFolderProcessingThread *m_pFolderProcessingThread;
-	
+
 	/*
 	 * Don't update status line positions if m_waitStatusLineUpdate is true.
 	 * This assures we are updating the status line positions only once,
@@ -277,7 +312,11 @@
 
 	CQueueStorage m_queue_storage;
 
-	DECLARE_EVENT_TABLE();
+	// Get the current transfer speed.
+	// Unit is byte/s.
+	wxFileOffset GetCurrentSpeed(bool countDownload, bool countUpload);
+
+	DECLARE_EVENT_TABLE()
 	void OnEngineEvent(wxEvent &event);
 	void OnFolderThreadComplete(wxCommandEvent& event);
 	void OnFolderThreadFiles(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/RemoteListView.cpp filezilla-3.7.3~precise/src/interface/RemoteListView.cpp
--- filezilla-3.5.3/src/interface/RemoteListView.cpp	2011-10-10 03:30:24.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/RemoteListView.cpp	2013-06-10 03:30:03.000000000 +0000
@@ -28,11 +28,12 @@
 #define new DEBUG_NEW
 #endif
 
-class CRemoteListViewDropTarget : public wxDropTarget
+class CRemoteListViewDropTarget : public CListCtrlDropTarget
 {
 public:
 	CRemoteListViewDropTarget(CRemoteListView* pRemoteListView)
-		: m_pRemoteListView(pRemoteListView),
+		: CListCtrlDropTarget(pRemoteListView)
+		, m_pRemoteListView(pRemoteListView),
 		  m_pFileDataObject(new wxFileDataObject()),
 		  m_pRemoteDataObject(new CRemoteDataObject()),
 		  m_pDataObject(new wxDataObjectComposite())
@@ -142,14 +143,16 @@
 		}
 
 		const std::list<CRemoteDataObject::t_fileInfo>& files = m_pRemoteDataObject->GetFiles();
-		for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+		for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 		{
 			const CRemoteDataObject::t_fileInfo& info = *iter;
 			if (info.dir)
 			{
 				CServerPath dir = m_pRemoteDataObject->GetServerPath();
 				dir.AddSegment(info.name);
-				if (dir == target || dir.IsParentOf(target, false))
+				if (dir == target)
+					return wxDragNone;
+				else if (dir.IsParentOf(target, false))
 				{
 					wxMessageBox(_("A directory cannot be dragged into one of its subdirectories."));
 					return wxDragNone;
@@ -157,7 +160,7 @@
 			}
 		}
 
-		for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+		for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 		{
 			const CRemoteDataObject::t_fileInfo& info = *iter;
 			m_pRemoteListView->m_pState->m_pCommandQueue->ProcessCommand(
@@ -175,6 +178,7 @@
 
 	virtual bool OnDrop(wxCoord x, wxCoord y)
 	{
+		CListCtrlDropTarget::OnDrop(x, y);
 		ClearDropHighlight();
 
 		if (!m_pRemoteListView->m_pDirectoryListing)
@@ -183,7 +187,12 @@
 		return true;
 	}
 
-	int DisplayDropHighlight(wxPoint point)
+	virtual void DisplayDropHighlight(wxPoint point)
+	{
+		DoDisplayDropHighlight(point);
+	}
+
+	int DoDisplayDropHighlight(wxPoint point)
 	{
 		int flags;
 		int hit = m_pRemoteListView->HitTest(point, flags, 0);
@@ -228,6 +237,8 @@
 
 	virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
 	{
+		CListCtrlDropTarget::OnDragOver(x, y, def);
+
 		if (def == wxDragError ||
 			def == wxDragNone ||
 			def == wxDragCancel)
@@ -245,7 +256,7 @@
 		const CServer* const pServer = m_pRemoteListView->m_pState->GetServer();
 		wxASSERT(pServer);
 
-		int hit = DisplayDropHighlight(wxPoint(x, y));
+		int hit = DoDisplayDropHighlight(wxPoint(x, y));
 		const CDragDropManager* pDragDropManager = CDragDropManager::Get();
 
 		if (hit == -1 && pDragDropManager &&
@@ -258,11 +269,13 @@
 
 	virtual void OnLeave()
 	{
+		CListCtrlDropTarget::OnLeave();
 		ClearDropHighlight();
 	}
 
 	virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def)
 	{
+		CListCtrlDropTarget::OnEnter(x, y, def);
 		return OnDragOver(x, y, def);
 	}
 
@@ -313,7 +326,7 @@
 
 	wxSize m_textSize;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 };
 
 BEGIN_EVENT_TABLE(CInfoText, wxWindow)
@@ -327,6 +340,7 @@
 	EVT_MENU(XRCID("ID_DOWNLOAD"), CRemoteListView::OnMenuDownload)
 	EVT_MENU(XRCID("ID_ADDTOQUEUE"), CRemoteListView::OnMenuDownload)
 	EVT_MENU(XRCID("ID_MKDIR"), CRemoteListView::OnMenuMkdir)
+	EVT_MENU(XRCID("ID_NEW_FILE"), CRemoteListView::OnMenuNewfile)
 	EVT_MENU(XRCID("ID_DELETE"), CRemoteListView::OnMenuDelete)
 	EVT_MENU(XRCID("ID_RENAME"), CRemoteListView::OnMenuRename)
 	EVT_MENU(XRCID("ID_CHMOD"), CRemoteListView::OnMenuChmod)
@@ -474,7 +488,7 @@
 		// Find correct position in index mapping
 		std::vector<unsigned int>::iterator start = m_indexMapping.begin();
 		if (m_hasParent)
-			start++;
+			++start;
 		CFileListCtrl<CGenericFileData>::CSortComparisonObject compare = GetSortComparisonObject();
 		std::vector<unsigned int>::iterator insertPos = std::lower_bound(start, m_indexMapping.end(), i, compare);
 		compare.Destroy();
@@ -482,7 +496,7 @@
 		const int item = insertPos - m_indexMapping.begin();
 		m_indexMapping.insert(insertPos, i);
 
-		for (std::list<unsigned int>::iterator iter = added.begin(); iter != added.end(); iter++)
+		for (std::list<unsigned int>::iterator iter = added.begin(); iter != added.end(); ++iter)
 		{
 			unsigned int &pos = *iter;
 			if (pos >= (unsigned int)item)
@@ -572,7 +586,7 @@
 
 		// j is the offset the index has to be adjusted
 		int j = 0;
-		for (std::list<unsigned int>::const_iterator iter = removedItems.begin(); iter != removedItems.end(); iter++, j++)
+		for (std::list<unsigned int>::const_iterator iter = removedItems.begin(); iter != removedItems.end(); ++iter, ++j)
 		{
 			if (*iter > index)
 				break;
@@ -588,7 +602,7 @@
 
 		// Get old selection
 		bool isSelected = GetItemState(i, wxLIST_STATE_SELECTED) != 0;
-		
+
 		// Update statusbar info
 		if (removed && m_pFilelistStatusBar)
 		{
@@ -634,7 +648,7 @@
 	}
 
 	// Erase file data
-	for (std::list<unsigned int>::reverse_iterator iter = removedItems.rbegin(); iter != removedItems.rend(); iter++)
+	for (std::list<unsigned int>::reverse_iterator iter = removedItems.rbegin(); iter != removedItems.rend(); ++iter)
 	{
 		m_fileData.erase(m_fileData.begin() + *iter);
 	}
@@ -642,7 +656,7 @@
 	// Erase indexes
 	wxASSERT(!toRemove);
 	wxASSERT(removedIndexes.size() == removed);
-	for (std::list<int>::iterator iter = removedIndexes.begin(); iter != removedIndexes.end(); iter++)
+	for (std::list<int>::iterator iter = removedIndexes.begin(); iter != removedIndexes.end(); ++iter)
 	{
 		m_indexMapping.erase(m_indexMapping.begin() + *iter);
 	}
@@ -684,7 +698,7 @@
 		wxASSERT(pDirectoryListing->GetCount() == m_pDirectoryListing->GetCount());
 		if (pDirectoryListing->GetCount() != m_pDirectoryListing->GetCount())
 			return false;
-		
+
 		m_pDirectoryListing = pDirectoryListing;
 
 		// We don't have to do anything
@@ -738,6 +752,7 @@
 
 	wxString prevFocused;
 	std::list<wxString> selectedNames;
+	bool ensureVisible = false;
 	if (reset)
 	{
 		ResetSearchPrefix();
@@ -746,6 +761,9 @@
 			ExitComparisonMode();
 
 		ClearSelection();
+
+		prevFocused = m_pState->GetPreviouslyVisitedRemoteSubdir();
+		ensureVisible = !prevFocused.IsEmpty();
 	}
 	else
 	{
@@ -756,7 +774,7 @@
 	if (m_pFilelistStatusBar)
 	{
 		m_pFilelistStatusBar->UnselectAll();
-		m_pFilelistStatusBar->SetConnected(pDirectoryListing); 
+		m_pFilelistStatusBar->SetConnected(pDirectoryListing);
 	}
 
 	m_pDirectoryListing = pDirectoryListing;
@@ -868,11 +886,11 @@
 	{
 		m_originalIndexMapping.clear();
 		RefreshComparison();
-		ReselectItems(selectedNames, prevFocused);
+		ReselectItems(selectedNames, prevFocused, ensureVisible);
 	}
 	else
 	{
-		ReselectItems(selectedNames, prevFocused);
+		ReselectItems(selectedNames, prevFocused, ensureVisible);
 		RefreshListOnly(eraseBackground);
 	}
 }
@@ -1193,7 +1211,7 @@
 	bool back = false;
 
 	int item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -1404,16 +1422,7 @@
 		pMenu->Enable(XRCID("ID_EDIT"), false);
 		pMenu->Enable(XRCID("ID_GETURL"), false);
 		pMenu->Enable(XRCID("ID_CONTEXT_REFRESH"), false);
-	}
-	else if ((GetItemCount() && GetItemState(0, wxLIST_STATE_SELECTED)))
-	{
-		pMenu->Enable(XRCID("ID_DOWNLOAD"), false);
-		pMenu->Enable(XRCID("ID_ADDTOQUEUE"), false);
-		pMenu->Enable(XRCID("ID_DELETE"), false);
-		pMenu->Enable(XRCID("ID_RENAME"), false);
-		pMenu->Enable(XRCID("ID_CHMOD"), false);
-		pMenu->Enable(XRCID("ID_EDIT"), false);
-		pMenu->Enable(XRCID("ID_GETURL"), false);
+		pMenu->Enable(XRCID("ID_NEW_FILE"), false);
 	}
 	else if (GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) == -1)
 	{
@@ -1428,12 +1437,27 @@
 	}
 	else
 	{
+		if ((GetItemCount() && GetItemState(0, wxLIST_STATE_SELECTED)))
+		{
+			pMenu->Enable(XRCID("ID_RENAME"), false);
+			pMenu->Enable(XRCID("ID_CHMOD"), false);
+			pMenu->Enable(XRCID("ID_EDIT"), false);
+			pMenu->Enable(XRCID("ID_GETURL"), false);
+		}
+
 		int count = 0;
 		int fillCount = 0;
 		bool selectedDir = false;
 		int item = -1;
 		while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1)
 		{
+			if (!item)
+			{
+				++count;
+				++fillCount;
+				continue;
+			}
+
 			int index = GetItemIndex(item);
 			if (index == -1)
 				continue;
@@ -1495,17 +1519,14 @@
 	}
 
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
 			break;
 
 		if (!item)
-		{
-			wxBell();
-			return;
-		}
+			continue;
 
 		int index = GetItemIndex(item);
 		if (index == -1)
@@ -1541,11 +1562,13 @@
 	bool added = false;
 	bool startRecursive = false;
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
 			break;
+		if (!item)
+			continue;
 
 		int index = GetItemIndex(item);
 		if (index == -1)
@@ -1656,13 +1679,15 @@
 	bool selected_link = false;
 
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (!item)
+			continue;
 		if (item == -1)
 			break;
 
-		if (!item || !IsItemValid(item))
+		if (!IsItemValid(item))
 		{
 			wxBell();
 			return;
@@ -1687,14 +1712,14 @@
 
 	wxString question;
 	if (!count_dirs)
-		question.Printf(wxPLURAL("Really delete %d file?", "Really delete %d files?", count_files), count_files);
+		question.Printf(wxPLURAL("Really delete %d file from the server?", "Really delete %d files from the server?", count_files), count_files);
 	else if (!count_files)
-		question.Printf(wxPLURAL("Really delete %d directory with its contents?", "Really delete %d directories with their contents?", count_dirs), count_dirs);
+		question.Printf(wxPLURAL("Really delete %d directory with its contents from the server?", "Really delete %d directories with their contents from the server?", count_dirs), count_dirs);
 	else
 	{
 		wxString files = wxString::Format(wxPLURAL("%d file", "%d files", count_files), count_files);
 		wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", count_dirs), count_dirs);
-		question.Printf(_("Really delete %s and %s?"), files.c_str(), dirs.c_str());
+		question.Printf(_("Really delete %s and %s from the server?"), files.c_str(), dirs.c_str());
 	}
 
 	if (wxMessageBox(question, _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, this) != wxYES)
@@ -1722,9 +1747,11 @@
 
 	bool startRecursive = false;
 	item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
+		if (!item)
+			continue;
 		if (item == -1)
 			break;
 
@@ -1933,7 +1960,7 @@
 	char permissions[9] = {0};
 
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2008,7 +2035,7 @@
 	wxASSERT(pRecursiveOperation);
 
 	item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2193,7 +2220,7 @@
 	return selectedNames;
 }
 
-void CRemoteListView::ReselectItems(std::list<wxString>& selectedNames, wxString focused)
+void CRemoteListView::ReselectItems(std::list<wxString>& selectedNames, wxString focused, bool ensureVisible)
 {
 	if (!GetItemCount())
 		return;
@@ -2218,6 +2245,8 @@
 			if ((*m_pDirectoryListing)[index].name == focused)
 			{
 				SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+				if (ensureVisible)
+					EnsureVisible(i);
 				return;
 			}
 		}
@@ -2235,7 +2264,7 @@
 	// Reselect previous items if neccessary.
 	// Sorting direction did not change. We just have to scan through items once
 	unsigned int i = 0;
-	for (std::list<wxString>::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = selectedNames.begin(); iter != selectedNames.end(); ++iter)
 	{
 		while (++i < m_indexMapping.size())
 		{
@@ -2246,6 +2275,8 @@
 			if (entry.name == focused)
 			{
 				SetItemState(i, wxLIST_STATE_FOCUSED, wxLIST_STATE_FOCUSED);
+				if (ensureVisible)
+					EnsureVisible(i);
 				focused = _T("");
 			}
 			if (entry.is_dir() && *iter == (_T("d") + entry.name))
@@ -2254,7 +2285,7 @@
 					firstSelected = i;
 				if (m_pFilelistStatusBar)
 					m_pFilelistStatusBar->SelectDirectory();
-                SetSelection(i, true);
+				SetSelection(i, true);
 				break;
 			}
 			else if (*iter == (_T("-") + entry.name))
@@ -2392,7 +2423,7 @@
 
 	long item = -1;
 	int count = 0;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2439,7 +2470,7 @@
 
 	// Add files to remote data object
 	item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -2511,7 +2542,7 @@
 			bool idle = m_pState->m_pCommandQueue->Idle();
 
 			long item = -1;
-			while (true)
+			for (;;)
 			{
 				item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 				if (item == -1)
@@ -2570,7 +2601,7 @@
 	}
 
 	long item = -1;
-	
+
 	std::list<CDirentry> selected_item_list;
 	while ((item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1)
 	{
@@ -2629,7 +2660,7 @@
 			return;
 	}
 
-	for (std::list<CDirentry>::const_iterator iter = selected_item_list.begin(); iter != selected_item_list.end(); iter++)
+	for (std::list<CDirentry>::const_iterator iter = selected_item_list.begin(); iter != selected_item_list.end(); ++iter)
 	{
 		const CDirentry& entry = *iter;
 
@@ -2726,7 +2757,7 @@
 		CLocalPath localPath(file, &localFile);
 
 		m_pQueue->QueueFile(false, true, entry.name, (localFile != entry.name) ? localFile : wxString(),
-			localPath, path, server, entry.size, CEditHandler::remote);
+			localPath, path, server, entry.size, CEditHandler::remote, priority_high);
 		m_pQueue->QueueFile_Finish(true);
 	}
 }
@@ -3075,7 +3106,7 @@
 	else
 	{
 		wxString urls;
-		for (std::list<CDirentry>::const_iterator iter = selected_item_list.begin(); iter != selected_item_list.end(); iter++)
+		for (std::list<CDirentry>::const_iterator iter = selected_item_list.begin(); iter != selected_item_list.end(); ++iter)
 		{
 			urls += server;
 			urls += path.FormatFilename(iter->name, false);
@@ -3137,3 +3168,74 @@
 		m_pState->ChangeRemoteDir(m_pDirectoryListing->path, _T(".."));
 	}
 }
+
+void CRemoteListView::OnMenuNewfile(wxCommandEvent& event)
+{
+	if (!m_pState->IsRemoteIdle())
+	{
+		wxBell();
+		return;
+	}
+
+	CInputDialog dlg;
+	if (!dlg.Create(this, _("Create empty file"), _("Please enter the name of the file which should be created:")))
+		return;
+
+	if (dlg.ShowModal() != wxID_OK)
+		return;
+
+	if (dlg.GetValue() == _T(""))
+	{
+		wxBell();
+		return;
+	}
+
+	wxString newFileName = dlg.GetValue();
+
+	// Copied from elsewhere in the source, checks for characters that Windows deems invalid
+	if ((newFileName.Find('/')  != -1) ||
+		(newFileName.Find('\\') != -1) ||
+		(newFileName.Find(':')  != -1) ||
+		(newFileName.Find('*')  != -1) ||
+		(newFileName.Find('?')  != -1) ||
+		(newFileName.Find('"')  != -1) ||
+		(newFileName.Find('<')  != -1) ||
+		(newFileName.Find('>')  != -1) ||
+		(newFileName.Find('|')  != -1))
+	{
+		wxMessageBox(_("Filename may not contain any of the following characters: / \\ : * ? \" < > |"), _("Invalid filename"), wxICON_EXCLAMATION);
+		return;
+	}
+
+	// Check if target file already exists
+	for (unsigned int i = 0; i < m_pDirectoryListing->GetCount(); i++)
+	{
+		if (newFileName == (*m_pDirectoryListing)[i].name)
+		{
+			wxMessageBox(_("Target filename already exists!"));
+			return;
+		}
+	}
+
+	CEditHandler* edithandler = CEditHandler::Get(); // Used to get the temporary folder
+
+	wxString emptyfile_name = _T("empty_file_yq744zm");
+	wxString emptyfile = edithandler->GetLocalDirectory() + emptyfile_name;
+
+	// Create the empty temporary file
+	{
+		wxFile file;
+		wxLogNull log;
+		file.Create(emptyfile);
+	}
+
+	const CServer* pServer = m_pState->GetServer();
+	if (!pServer)
+	{
+		wxBell();
+		return;
+	}
+
+	CFileTransferCommand *cmd = new CFileTransferCommand(emptyfile, m_pDirectoryListing->path, newFileName, false, CFileTransferCommand::t_transferSettings());
+	m_pState->m_pCommandQueue->ProcessCommand(cmd);
+}
diff -Nru filezilla-3.5.3/src/interface/RemoteListView.h filezilla-3.7.3~precise/src/interface/RemoteListView.h
--- filezilla-3.5.3/src/interface/RemoteListView.h	2011-02-28 04:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/RemoteListView.h	2013-06-10 03:30:03.000000000 +0000
@@ -36,7 +36,7 @@
 	// Select a list of items based in their names.
 	// Sort order may not change between call to RememberSelectedItems and
 	// ReselectItems
-	void ReselectItems(std::list<wxString>& selectedNames, wxString focused);
+	void ReselectItems(std::list<wxString>& selectedNames, wxString focused, bool ensureVisible = false);
 
 
 	// Declared const due to design error in wxWidgets.
@@ -115,6 +115,7 @@
 	void OnMenuEnter(wxCommandEvent& event);
 	void OnMenuGeturl(wxCommandEvent& event);
 	void OnMenuRefresh(wxCommandEvent& event);
+	void OnMenuNewfile(wxCommandEvent& event);
 };
 
 #endif
diff -Nru filezilla-3.5.3/src/interface/RemoteTreeView.cpp filezilla-3.7.3~precise/src/interface/RemoteTreeView.cpp
--- filezilla-3.5.3/src/interface/RemoteTreeView.cpp	2011-10-10 03:30:24.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/RemoteTreeView.cpp	2013-01-14 04:30:08.000000000 +0000
@@ -103,14 +103,16 @@
 			}
 
 			const std::list<CRemoteDataObject::t_fileInfo>& files = m_pRemoteDataObject->GetFiles();
-			for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+			for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 			{
 				const CRemoteDataObject::t_fileInfo& info = *iter;
 				if (info.dir)
 				{
 					CServerPath dir = m_pRemoteDataObject->GetServerPath();
 					dir.AddSegment(info.name);
-					if (dir == path || dir.IsParentOf(path, false))
+					if (dir == path)
+						return wxDragNone;
+					else if (dir.IsParentOf(path, false))
 					{
 						wxMessageBox(_("A directory cannot be dragged into one of its subdirectories."));
 						return wxDragNone;
@@ -118,7 +120,7 @@
 				}
 			}
 
-			for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+			for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 			{
 				const CRemoteDataObject::t_fileInfo& info = *iter;
 				m_pRemoteTreeView->m_pState->m_pCommandQueue->ProcessCommand(
@@ -247,13 +249,13 @@
 	pState->RegisterHandler(this, STATECHANGE_REMOTE_DIR_MODIFIED);
 	pState->RegisterHandler(this, STATECHANGE_APPLYFILTER);
 
+	CreateImageList();
+
 	m_busy = false;
 	m_pQueue = pQueue;
 	AddRoot(_T(""));
 	m_ExpandAfterList = wxTreeItemId();
 
-	CreateImageList();
-
 	SetDropTarget(new CRemoteTreeViewDropTarget(this));
 
 	Enable(false);
@@ -374,7 +376,7 @@
 	const wxTreeItemId root = GetRootItem();
 	wxTreeItemId parent = root;
 
-	for (std::list<wxString>::const_iterator iter = pieces.begin(); iter != pieces.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = pieces.begin(); iter != pieces.end(); ++iter)
 	{
 		if (iter != pieces.begin())
 			path.AddSegment(*iter);
@@ -411,7 +413,7 @@
 			SortChildren(parent);
 
 			std::list<wxString>::const_iterator nextIter = iter;
-			nextIter++;
+			++nextIter;
 			if (nextIter != pieces.end())
 				DisplayItem(child, listing);
 		}
@@ -470,7 +472,7 @@
 		dc.DrawBitmap(unknownIcon, 0, 0, true);
 	}
 
-    dc.SelectObject(wxNullBitmap);
+	dc.SelectObject(wxNullBitmap);
 	return bmp;
 }
 
@@ -617,7 +619,7 @@
 				SetItemImages(child, true);
 
 			child = GetPrevSibling(child);
-			iter++;
+			++iter;
 		}
 		else if (cmp > 0)
 		{
@@ -652,7 +654,7 @@
 					SetItemImages(child, true);
 			}
 
-			iter++;
+			++iter;
 			inserted = true;
 		}
 	}
@@ -687,7 +689,7 @@
 			SetItemImages(child, true);
 		}
 
-		iter++;
+		++iter;
 		inserted = true;
 	}
 
@@ -750,7 +752,7 @@
 void CRemoteTreeView::OnSelectionChanged(wxTreeEvent& event)
 {
 	if (event.GetItem() != m_ExpandAfterList)
-        m_ExpandAfterList = wxTreeItemId();
+		m_ExpandAfterList = wxTreeItemId();
 	if (m_busy)
 		return;
 
@@ -789,7 +791,7 @@
 		if (pData)
 		{
 			CServerPath path = pData->m_path;
-			for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); iter++)
+			for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); ++iter)
 			{
 				if (!path.AddSegment(*iter))
 					return CServerPath();
@@ -1120,13 +1122,13 @@
 	if (path.IsEmpty())
 		return;
 
-	if (wxMessageBox(_("Really delete all selected files and/or directories?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, this) != wxYES)
+	if (wxMessageBox(_("Really delete all selected files and/or directories from the server?"), _("Confirmation needed"), wxICON_QUESTION | wxYES_NO, this) != wxYES)
 		return;
 
 	const bool hasParent = path.HasParent();
 
 	CRecursiveOperation* pRecursiveOperation = m_pState->GetRecursiveOperationHandler();
-	
+
 	CServerPath startDir;
 	if (hasParent)
 	{
@@ -1250,7 +1252,7 @@
 		}
 		currentPath = parent;
 		currentPath.AddSegment(newName);
-		for (std::list<wxString>::const_iterator iter = subdirs.begin(); iter != subdirs.end(); iter++)
+		for (std::list<wxString>::const_iterator iter = subdirs.begin(); iter != subdirs.end(); ++iter)
 			currentPath.AddSegment(*iter);
 		m_pState->ChangeRemoteDir(currentPath);
 	}
@@ -1375,7 +1377,7 @@
 		dir.path = path;
 		parents.push_back(dir);
 	}
-	
+
 	CFilterManager filter;
 	while (!parents.empty())
 	{
@@ -1404,7 +1406,7 @@
 						continue;
 					}
 				}
-				
+
 				struct _parents dir;
 				dir.item = child;
 				dir.path = path;
diff -Nru filezilla-3.5.3/src/interface/StatusView.cpp filezilla-3.7.3~precise/src/interface/StatusView.cpp
--- filezilla-3.5.3/src/interface/StatusView.cpp	2010-02-21 15:12:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/StatusView.cpp	2013-06-09 03:30:05.000000000 +0000
@@ -31,7 +31,7 @@
 	{
 		DoSetSelection(from, to, false);
 
-		m_updatesCount = -2;        // suppress any update event
+		m_updatesCount = -2;		// suppress any update event
 
 		::SendMessage((HWND)GetHandle(), EM_REPLACESEL, 0, (LPARAM)_T(""));
 	}
@@ -44,7 +44,7 @@
 	}
 #endif
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 
 	void OnText(wxCommandEvent& event)
 	{
@@ -94,7 +94,6 @@
 CStatusView::CStatusView(wxWindow* parent, wxWindowID id)
 	: wxWindow(parent, id, wxDefaultPosition, wxDefaultSize, wxSUNKEN_BORDER)
 {
-	m_pTextCtrl = 0;
 	m_pTextCtrl = new CFastTextCtrl(this);
 
 #ifdef __WXMAC__
@@ -110,7 +109,7 @@
 	InitDefAttr();
 
 	m_shown = IsShown();
-	
+
 #ifdef __WXMAC__
 	m_insertionPoint = 0;
 #endif
@@ -172,7 +171,7 @@
 #endif
 		m_pTextCtrl->Remove(0, oldLength + 1);
 		m_lineLengths.pop_front();
-		
+
 #ifdef __WXMAC__
 		m_pTextCtrl->SetInsertionPoint(m_insertionPoint);
 #endif
@@ -279,11 +278,10 @@
 		timestampWidth = width;
 	}
 
-	int maxWidth = 0;
 	wxCoord width = 0;
 	wxCoord height = 0;
 	dc.GetTextExtent(_("Error:"), &width, &height);
-	maxWidth = width;
+	int maxWidth = width;
 	dc.GetTextExtent(_("Command:"), &width, &height);
 	if (width > maxWidth)
 		maxWidth = width;
@@ -392,7 +390,7 @@
 		m_pTextCtrl->Clear();
 	m_nLineCount = 0;
 	m_lineLengths.clear();
-	
+
 #ifdef __WXMAC__
 	m_insertionPoint = 0;
 #endif
@@ -436,7 +434,7 @@
 			m_lineLengths.clear();
 		}
 
-		for (std::list<t_line>::const_iterator iter = m_hiddenLines.begin(); iter != m_hiddenLines.end(); iter++)
+		for (std::list<t_line>::const_iterator iter = m_hiddenLines.begin(); iter != m_hiddenLines.end(); ++iter)
 		{
 			AddToLog(iter->messagetype, iter->message, iter->time);
 		}
diff -Nru filezilla-3.5.3/src/interface/StatusView.h filezilla-3.7.3~precise/src/interface/StatusView.h
--- filezilla-3.5.3/src/interface/StatusView.h	2008-09-13 02:00:35.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/StatusView.h	2013-06-09 03:30:05.000000000 +0000
@@ -2,7 +2,7 @@
 #define __STATUSVIEW_H__
 
 class CFastTextCtrl;
-class CStatusView :	public wxWindow
+class CStatusView : public wxWindow
 {
 public:
 	CStatusView(wxWindow* parent, wxWindowID id);
@@ -25,7 +25,7 @@
 
 	void OnSize(wxSizeEvent &event);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnContextMenu(wxContextMenuEvent& event);
 	void OnClear(wxCommandEvent& event);
 	void OnCopy(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/aboutdialog.cpp filezilla-3.7.3~precise/src/interface/aboutdialog.cpp
--- filezilla-3.5.3/src/interface/aboutdialog.cpp	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/aboutdialog.cpp	2013-06-25 17:11:01.000000000 +0000
@@ -11,16 +11,16 @@
 BEGIN_EVENT_TABLE(CAboutDialog, wxDialogEx)
 EVT_BUTTON(XRCID("wxID_OK"), CAboutDialog::OnOK)
 EVT_BUTTON(XRCID("ID_COPY"), CAboutDialog::OnCopy)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 bool CAboutDialog::Create(wxWindow* parent)
 {
 	if (!Load(parent, _T("ID_ABOUT")))
 		return false;
 
-	XRCCTRL(*this, "ID_URL", wxHyperlinkCtrl)->SetLabel(_T("http://filezilla-project.org"));
+	XRCCTRL(*this, "ID_URL", wxHyperlinkCtrl)->SetLabel(_T("https://filezilla-project.org"));
 
-	XRCCTRL(*this, "ID_COPYRIGHT", wxStaticText)->SetLabel(_T("Copyright (C) 2004-2012  Tim Kosse"));
+	XRCCTRL(*this, "ID_COPYRIGHT", wxStaticText)->SetLabel(_T("Copyright (C) 2004-2013  Tim Kosse"));
 
 	wxString version = CBuildInfo::GetVersion();
 	if (CBuildInfo::GetBuildType() == _T("nightly"))
@@ -90,11 +90,15 @@
 
 	wxStaticText* pVer_wx = XRCCTRL(*this, "ID_VER_WX", wxStaticText);
 	if (pVer_wx)
-		pVer_wx->SetLabel(wxVERSION_NUM_DOT_STRING_T);
+		pVer_wx->SetLabel(GetDependencyVersion(dependency::wxwidgets));
 
 	wxStaticText* pVer_gnutls = XRCCTRL(*this, "ID_VER_GNUTLS", wxStaticText);
 	if (pVer_gnutls)
-		pVer_gnutls->SetLabel(GetDependencyVersion(dependency_gnutls));
+		pVer_gnutls->SetLabel(GetDependencyVersion(dependency::gnutls));
+
+	wxStaticText* pVer_sqlite = XRCCTRL(*this, "ID_VER_SQLITE", wxStaticText);
+	if (pVer_sqlite)
+		pVer_sqlite->SetLabel(GetDependencyVersion(dependency::sqlite));
 
 	wxStaticText* pSystemName = XRCCTRL(*this, "ID_SYSTEM_NAME", wxStaticText);
 	if (!pSystemName)
@@ -132,7 +136,7 @@
 		pSystemVersionDesc->Hide();
 		pSystemVersion->Hide();
 	}
-   
+
 	wxStaticText* pSystemPlatform = XRCCTRL(*this, "ID_SYSTEM_PLATFORM", wxStaticText);
 	if (!pSystemPlatform)
 		return false;
@@ -173,7 +177,7 @@
 	text += '\n';
 
 	text += _T("\nBuild information:\n");
-	
+
 	wxString host = CBuildInfo::GetHostname();
 	if (!host.empty())
 		text += _T("  Compiled for:   ") + host + _T("\n");
@@ -190,15 +194,19 @@
 	if (!compilerFlags.empty())
 		text += _T("  Compiler flags: ") + compilerFlags + _T("\n");
 
-	text += _T("\nLinked against:\n  wxWidgets:      ") + wxString(wxVERSION_NUM_DOT_STRING_T) + _T("\n");
-	text += _T("  GnuTLS:         ") + GetDependencyVersion(dependency_gnutls) + _T("\n");
-
+	text += _T("\nLinked against:\n");
+	for (int i = 0; i < dependency::count; ++i)
+	{
+		text += wxString::Format(_T("  % -15s %s\n"),
+			(GetDependencyName(dependency::type(i)) + _T(":")).c_str(),
+			GetDependencyVersion(dependency::type(i)).c_str());
+	}
 
 	text += _T("\nOperating system:\n");
 	wxString os = wxGetOsDescription();
 	if (!os.empty())
 		text += _T("  Name:           ") + os + _T("\n");
-	
+
 	int major, minor;
 	if (wxGetOsVersion(&major, &minor) != wxOS_UNKNOWN)
 		text += wxString::Format(_T("  Version:        %d.%d\n"), major, minor);
diff -Nru filezilla-3.5.3/src/interface/aboutdialog.h filezilla-3.7.3~precise/src/interface/aboutdialog.h
--- filezilla-3.5.3/src/interface/aboutdialog.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/aboutdialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -7,13 +7,13 @@
 {
 public:
 	CAboutDialog() {}
-	virtual ~CAboutDialog() { }
+	virtual ~CAboutDialog() {}
 
 	bool Create(wxWindow* parent);
 
 protected:
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnOK(wxCommandEvent& event);
 	void OnCopy(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/asksavepassworddialog.cpp filezilla-3.7.3~precise/src/interface/asksavepassworddialog.cpp
--- filezilla-3.5.3/src/interface/asksavepassworddialog.cpp	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/asksavepassworddialog.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -0,0 +1,52 @@
+#include "filezilla.h"
+#include "asksavepassworddialog.h"
+#include "Options.h"
+#include "filezillaapp.h"
+
+BEGIN_EVENT_TABLE(CAskSavePasswordDialog, wxDialogEx)
+EVT_RADIOBUTTON(XRCID("ID_REMEMBER_YES"), CAskSavePasswordDialog::OnRadioButtonChanged)
+EVT_RADIOBUTTON(XRCID("ID_REMEMBER_NO"), CAskSavePasswordDialog::OnRadioButtonChanged)
+END_EVENT_TABLE()
+
+CAskSavePasswordDialog::CAskSavePasswordDialog(wxWindow*)
+{
+	Load(0, _T("ID_ASK_SAVE_PASSWORD"));
+	wxButton* ok = XRCCTRL(*this, "wxID_OK", wxButton);
+	if (ok)
+		ok->Enable(false);
+
+	wxGetApp().GetWrapEngine()->WrapRecursive(this, 2, "");
+}
+
+
+bool CAskSavePasswordDialog::Run(wxWindow* parent)
+{
+	bool ret = true;
+
+	if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) == 0 && COptions::Get()->GetOptionVal(OPTION_PROMPTPASSWORDSAVE) != 0)
+	{
+		CAskSavePasswordDialog dlg(parent);
+
+		ret = dlg.ShowModal() == wxID_OK;
+		if (ret)
+		{
+			wxRadioButton* btn = XRCCTRL(dlg, "ID_REMEMBER_NO", wxRadioButton);
+			if (btn && btn->GetValue())
+				COptions::Get()->SetOption(OPTION_DEFAULT_KIOSKMODE, 1);
+			COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 0);
+		}
+	}
+	else
+		COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 0);
+
+	return ret;
+}
+
+void CAskSavePasswordDialog::OnRadioButtonChanged(wxCommandEvent& event)
+{
+	wxRadioButton* yes = XRCCTRL(*this, "ID_REMEMBER_NO", wxRadioButton);
+	wxRadioButton* no = XRCCTRL(*this, "ID_REMEMBER_YES", wxRadioButton);
+	wxButton* ok = XRCCTRL(*this, "wxID_OK", wxButton);
+	if (yes && no && ok)
+		ok->Enable(yes->GetValue() || no->GetValue());
+}
diff -Nru filezilla-3.5.3/src/interface/asksavepassworddialog.h filezilla-3.7.3~precise/src/interface/asksavepassworddialog.h
--- filezilla-3.5.3/src/interface/asksavepassworddialog.h	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/asksavepassworddialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -0,0 +1,17 @@
+#ifndef __ASKSAVEPASSWORDDIALOG_H__
+#define __ASKSAVEPASSWORDDIALOG_H__
+
+#include "dialogex.h"
+
+class CAskSavePasswordDialog : public wxDialogEx
+{
+public:
+	static bool Run(wxWindow* parent);
+private:
+	CAskSavePasswordDialog(wxWindow* parent);
+
+	DECLARE_EVENT_TABLE()
+	void OnRadioButtonChanged(wxCommandEvent& event);
+};
+
+#endif
diff -Nru filezilla-3.5.3/src/interface/asyncrequestqueue.cpp filezilla-3.7.3~precise/src/interface/asyncrequestqueue.cpp
--- filezilla-3.5.3/src/interface/asyncrequestqueue.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/asyncrequestqueue.cpp	2012-10-25 03:30:07.000000000 +0000
@@ -67,7 +67,7 @@
 			}
 
 			pFileExistsNotification->overwriteAction = action;
-			
+
 			pEngine->SetAsyncRequestReply(pNotification);
 			delete pNotification;
 
@@ -80,7 +80,7 @@
 
 			if (!CVerifyHostkeyDialog::IsTrusted(pHostKeyNotification))
 				break;
-			
+
 			pHostKeyNotification->m_trust = true;
 			pHostKeyNotification->m_alwaysTrust = false;
 
@@ -100,7 +100,7 @@
 			pEngine->SetAsyncRequestReply(pNotification);
 			delete pNotification;
 
-			return true;			
+			return true;
 		}
 		break;
 	default:
@@ -190,7 +190,7 @@
 					else
 					{
 						// For the notifications already in the request queue, we have to set the queue action directly
-						for (std::list<t_queueEntry>::iterator iter = ++m_requestList.begin(); iter != m_requestList.end(); iter++)
+						for (std::list<t_queueEntry>::iterator iter = ++m_requestList.begin(); iter != m_requestList.end(); ++iter)
 						{
 							if (pNotification->GetRequestID() != reqId_fileexists)
 								continue;
@@ -256,7 +256,7 @@
 				wxTextEntryDialog dlg(m_pMainFrame, msg, _("Rename file"), defaultName);
 
 				// Repeat until user cancels or enters a new name
-				while (1)
+				for (;;)
 				{
 					int res = dlg.ShowModal();
 					if (res == wxID_OK)
@@ -265,7 +265,7 @@
 							continue; // Disallow empty names
 						if (dlg.GetValue() == defaultName)
 						{
-							wxMessageDialog dlg2(m_pMainFrame, _("You did not enter a new name for the file. Overwrite the file instead?"), _("Filename unchanged"), 
+							wxMessageDialog dlg2(m_pMainFrame, _("You did not enter a new name for the file. Overwrite the file instead?"), _("Filename unchanged"),
 								wxYES_NO | wxNO_DEFAULT | wxICON_QUESTION | wxCANCEL);
 							int res = dlg2.ShowModal();
 
@@ -371,16 +371,16 @@
 {
 	if (m_requestList.empty())
 		return;
-	
+
 	// Remove older requests coming from the same engine, but never the first
 	// entry in the list as that one displays a dialog at this moment.
-	for (std::list<t_queueEntry>::iterator iter = ++m_requestList.begin(); iter != m_requestList.end(); iter++)
+	for (std::list<t_queueEntry>::iterator iter = ++m_requestList.begin(); iter != m_requestList.end(); ++iter)
 	{
 		if (iter->pEngine == pEngine)
 		{
 			m_requestList.erase(iter);
 
-			// At most one pending request per engine possible, 
+			// At most one pending request per engine possible,
 			// so we can stop here
 			break;
 		}
@@ -397,7 +397,7 @@
 	while (cur != m_requestList.end())
 	{
 		next = cur;
-		next++;
+		++next;
 
 		if (ProcessDefaults(cur->pEngine, cur->pNotification))
 			m_requestList.erase(cur);
diff -Nru filezilla-3.5.3/src/interface/asyncrequestqueue.h filezilla-3.7.3~precise/src/interface/asyncrequestqueue.h
--- filezilla-3.5.3/src/interface/asyncrequestqueue.h	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/asyncrequestqueue.h	2013-06-09 03:30:06.000000000 +0000
@@ -39,7 +39,7 @@
 	};
 	std::list<t_queueEntry> m_requestList;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnProcessQueue(wxCommandEvent &event);
 	void OnTimer(wxTimerEvent& event);
 
diff -Nru filezilla-3.5.3/src/interface/aui_notebook_ex.cpp filezilla-3.7.3~precise/src/interface/aui_notebook_ex.cpp
--- filezilla-3.5.3/src/interface/aui_notebook_ex.cpp	2011-04-27 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/aui_notebook_ex.cpp	2013-02-10 04:30:06.000000000 +0000
@@ -248,19 +248,22 @@
 
 
 	virtual void DrawTab(wxDC& dc,
-                         wxWindow* wnd,
-                         const wxAuiNotebookPage& pane,
-                         const wxRect& in_rect,
-                         int close_button_state,
-                         wxRect* out_tab_rect,
-                         wxRect* out_button_rect,
-                         int* x_extent)
+						 wxWindow* wnd,
+						 const wxAuiNotebookPage& pane,
+						 const wxRect& in_rect,
+						 int close_button_state,
+						 wxRect* out_tab_rect,
+						 wxRect* out_button_rect,
+						 int* x_extent)
 	{
 #ifndef __WXMAC__
 		m_base_colour = wxSystemSettings::GetColour(TABCOLOUR);
 #endif
 		if (!pane.active)
 		{
+			if (m_base_colour.Red() + m_base_colour.Green() + m_base_colour.Blue() >= 384)
+				m_base_colour = wxColour( m_base_colour.Red() * 0.95, m_base_colour.Green() * 0.95, m_base_colour.Blue() * 0.95 );
+
 			dc.SetTextForeground(wxSystemSettings::GetColour(wxSYS_COLOUR_WINDOWTEXT));
 			if (m_pNotebook->Highlighted(m_pNotebook->GetPageIndex(pane.window)))
 			{
@@ -280,6 +283,8 @@
 
 		CFilterDC filter_dc(dc, pane.active ? 1 : 0, (m_tab_ctrl_height % 2) != 0, m_bottom);
 		wxAuiDefaultTabArt::DrawTab(*((wxDC*)&filter_dc), wnd, pane, in_rect, close_button_state, out_tab_rect, out_button_rect, x_extent);
+
+		m_base_colour = wxSystemSettings::GetColour(TABCOLOUR);
 	}
 
 	virtual void DrawBackground(wxDC& dc, wxWindow* wnd, const wxRect& rect)
@@ -383,7 +388,7 @@
 	size_t page = (size_t)GetSelection();
 	if (page >= m_highlighted.size())
 		return;
-	
+
 	m_highlighted[page] = false;
 }
 
diff -Nru filezilla-3.5.3/src/interface/auto_ascii_files.cpp filezilla-3.7.3~precise/src/interface/auto_ascii_files.cpp
--- filezilla-3.5.3/src/interface/auto_ascii_files.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/auto_ascii_files.cpp	2012-09-07 03:30:05.000000000 +0000
@@ -76,7 +76,7 @@
 	if (remote_file == _T(""))
 		return false;
 
-	for (std::list<wxString>::const_iterator iter = m_ascii_extensions.begin(); iter != m_ascii_extensions.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = m_ascii_extensions.begin(); iter != m_ascii_extensions.end(); ++iter)
 		if (!remote_file.CmpNoCase(*iter))
 			return true;
 
diff -Nru filezilla-3.5.3/src/interface/bookmarks_dialog.cpp filezilla-3.7.3~precise/src/interface/bookmarks_dialog.cpp
--- filezilla-3.5.3/src/interface/bookmarks_dialog.cpp	2010-12-29 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/bookmarks_dialog.cpp	2012-10-25 03:30:07.000000000 +0000
@@ -38,7 +38,7 @@
 	XRCCTRL(*this, "ID_LOCALPATH", wxTextCtrl)->ChangeValue(local_path);
 	if (!remote_path.IsEmpty())
 		XRCCTRL(*this, "ID_REMOTEPATH", wxTextCtrl)->ChangeValue(remote_path.GetPath());
-	
+
 	if (!m_server)
 		XRCCTRL(*this, "ID_TYPE_SITE", wxRadioButton)->Enable(false);
 
@@ -101,7 +101,7 @@
 				return;
 			}
 		}
-		for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); iter++)
+		for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter)
 		{
 			if (*iter == name)
 			{
@@ -218,7 +218,7 @@
 	if (!CSiteManager::GetBookmarks(m_site_path, bookmarks))
 		return;
 
-	for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = bookmarks.begin(); iter != bookmarks.end(); ++iter)
 	{
 		wxString path = *iter;
 		path.Replace(_T("\\"), _T("\\\\"));
@@ -368,7 +368,7 @@
 	wxTreeItemId item = m_pTree->GetSelection();
 	if (!item)
 		return;
-	
+
 	CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
 	if (!data)
 		return;
@@ -403,7 +403,7 @@
 	wxTreeItemId item = m_pTree->GetSelection();
 	if (!item)
 		return true;
-	
+
 	CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
 	if (!data)
 		return true;
@@ -462,7 +462,7 @@
 	wxTreeItemId item = m_pTree->GetSelection();
 	if (!item)
 		return;
-	
+
 	CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
 	if (!data)
 		return;
@@ -499,7 +499,7 @@
 		XRCCTRL(*this, "ID_NOTEBOOK", wxNotebook)->Enable(false);
 		return;
 	}
-	
+
 	CBookmarkItemData *data = (CBookmarkItemData *)m_pTree->GetItemData(item);
 	if (!data)
 	{
@@ -556,7 +556,7 @@
 
 	wxString newName = _("New bookmark");
 	int index = 2;
-	while (true)
+	for (;;)
 	{
 		wxTreeItemId child;
 		wxTreeItemIdValue cookie;
@@ -627,7 +627,7 @@
 	const wxString name = m_pTree->GetItemText(item);
 	wxString newName = wxString::Format(_("Copy of %s"), name.c_str());
 	int index = 2;
-	while (true)
+	for (;;)
 	{
 		wxTreeItemId child;
 		wxTreeItemIdValue cookie;
@@ -777,7 +777,7 @@
 	for (TiXmlElement *pBookmark = pDocument->FirstChildElement("Bookmark"); pBookmark; pBookmark = pBookmark->NextSiblingElement("Bookmark"))
 	{
 		wxString remote_dir_raw;
-	
+
 		if (name != GetTextElement(pBookmark, "Name"))
 			continue;
 
@@ -830,7 +830,7 @@
 		wxString remote_dir_raw;
 
 		wxString old_name = GetTextElement(pBookmark, "Name");
-	
+
 		if (!name.CmpNoCase(old_name))
 		{
 			wxMessageBox(_("Name of bookmark already exists."), _("New bookmark"), wxICON_EXCLAMATION);
diff -Nru filezilla-3.5.3/src/interface/bookmarks_dialog.h filezilla-3.7.3~precise/src/interface/bookmarks_dialog.h
--- filezilla-3.5.3/src/interface/bookmarks_dialog.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/bookmarks_dialog.h	2012-10-25 03:30:07.000000000 +0000
@@ -7,7 +7,7 @@
 {
 public:
 	CNewBookmarkDialog(wxWindow* parent, wxString& site_path, const CServer* server);
-	virtual ~CNewBookmarkDialog() { }
+	virtual ~CNewBookmarkDialog() {}
 
 	virtual int ShowModal(const wxString &local_path, const CServerPath &remote_path);
 
@@ -25,7 +25,7 @@
 {
 public:
 	CBookmarksDialog(wxWindow* parent, wxString& site_path, const CServer* server);
-	virtual ~CBookmarksDialog() { }
+	virtual ~CBookmarksDialog() {}
 
 	virtual int ShowModal(const wxString &local_path, const CServerPath &remote_path);
 
diff -Nru filezilla-3.5.3/src/interface/buildinfo.cpp filezilla-3.7.3~precise/src/interface/buildinfo.cpp
--- filezilla-3.5.3/src/interface/buildinfo.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/buildinfo.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -14,7 +14,7 @@
 	while (date.Replace(_T("  "), _T(" ")));
 
 	const wxChar months[][4] = { _T("Jan"), _T("Feb"), _T("Mar"),
-								_T("Apr"), _T("May"), _T("Jun"), 
+								_T("Apr"), _T("May"), _T("Jun"),
 								_T("Jul"), _T("Aug"), _T("Sep"),
 								_T("Oct"), _T("Nov"), _T("Dec") };
 
diff -Nru filezilla-3.5.3/src/interface/buildinfo.h filezilla-3.7.3~precise/src/interface/buildinfo.h
--- filezilla-3.5.3/src/interface/buildinfo.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/buildinfo.h	2012-10-25 03:30:07.000000000 +0000
@@ -4,7 +4,7 @@
 class CBuildInfo
 {
 protected:
-	CBuildInfo() { }
+	CBuildInfo() {}
 
 public:
 
diff -Nru filezilla-3.5.3/src/interface/chmoddialog.cpp filezilla-3.7.3~precise/src/interface/chmoddialog.cpp
--- filezilla-3.5.3/src/interface/chmoddialog.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/chmoddialog.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -6,7 +6,20 @@
 EVT_BUTTON(XRCID("wxID_CANCEL"), CChmodDialog::OnCancel)
 EVT_TEXT(XRCID("ID_NUMERIC"), CChmodDialog::OnNumericChanged)
 EVT_CHECKBOX(XRCID("ID_RECURSE"), CChmodDialog::OnRecurseChanged)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
+
+CChmodDialog::CChmodDialog()
+	: m_noUserTextChange()
+	, lastChangedNumeric()
+	, m_recursive()
+	, m_applyType()
+{
+	for (int i = 0; i < 9; ++i)
+	{
+		m_checkBoxes[i] = 0;
+		m_permissions[i] = 0;
+	}
+}
 
 bool CChmodDialog::Create(wxWindow* parent, int fileCount, int dirCount,
 						  const wxString& name, const char permissions[9])
@@ -43,7 +56,7 @@
 		else
 			title = _("Please select the new attributes for the selected files and directories.");
 	}
-	
+
 	if (!wxXmlResource::Get()->LoadDialog(this, parent, _T("ID_CHMODDIALOG")))
 		return false;
 
@@ -94,7 +107,7 @@
 	{
 		int id = wxXmlResource::GetXRCID(IDs[i]);
 		m_checkBoxes[i] = wxDynamicCast(FindWindow(id), wxCheckBox);
-		
+
 		if (!m_checkBoxes[i])
 			return false;
 
@@ -164,7 +177,7 @@
 			break;
 		}
 	}
-	
+
 	wxString numericValue;
 	for (int i = 0; i < 3; i++)
 	{
@@ -192,12 +205,12 @@
 		return;
 
 	lastChangedNumeric = true;
-	
+
 	wxTextCtrl *pTextCtrl = XRCCTRL(*this, "ID_NUMERIC", wxTextCtrl);
 	wxString numeric = pTextCtrl->GetValue();
 	if (numeric.Length() < 3)
 		return;
-	
+
 	numeric = numeric.Right(3);
 	for (int i = 0; i < 3; i++)
 	{
diff -Nru filezilla-3.5.3/src/interface/chmoddialog.h filezilla-3.7.3~precise/src/interface/chmoddialog.h
--- filezilla-3.5.3/src/interface/chmoddialog.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/chmoddialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -6,10 +6,10 @@
 class CChmodDialog : public wxDialogEx
 {
 public:
-	CChmodDialog() {}
-	virtual ~CChmodDialog() { }
+	CChmodDialog();
+	virtual ~CChmodDialog() {}
 
-	bool Create(wxWindow* parent, int fileCount, int dirCount, 
+	bool Create(wxWindow* parent, int fileCount, int dirCount,
 				const wxString& name, const char permissions[9]);
 
 	wxString GetPermissions(const char* previousPermissions, bool dir);
@@ -28,17 +28,17 @@
 
 protected:
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnOK(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 	void OnRecurseChanged(wxCommandEvent& event);
 
-	wxCheckBox* m_checkBoxes[9];
-	char m_permissions[9];
-
 	void OnCheckboxClick(wxCommandEvent& event);
 	void OnNumericChanged(wxCommandEvent& event);
 
+	wxCheckBox* m_checkBoxes[9];
+	char m_permissions[9];
+
 	bool m_noUserTextChange;
 	wxString oldNumeric;
 	bool lastChangedNumeric;
diff -Nru filezilla-3.5.3/src/interface/clearprivatedata.cpp filezilla-3.7.3~precise/src/interface/clearprivatedata.cpp
--- filezilla-3.5.3/src/interface/clearprivatedata.cpp	2010-07-19 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/clearprivatedata.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -60,14 +60,14 @@
 	}
 
 	pCheck = XRCCTRL(*this, "ID_CLEARRECONNECT", wxCheckBox);
-	
+
 	if (pCheck->GetValue())
 	{
 		bool asked = false;
 
 		const std::vector<CState*> *states = CContextManager::Get()->GetAllStates();
 
-		for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); iter++)
+		for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); ++iter)
 		{
 			CState* pState = *iter;
 			if (pState->IsRemoteConnected() || !pState->IsRemoteIdle())
@@ -122,7 +122,7 @@
 {
 	const std::vector<CState*> *states = CContextManager::Get()->GetAllStates();
 
-	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); ++iter)
 	{
 		CState* pState = *iter;
 
@@ -158,7 +158,7 @@
 	COptions::Get()->SetOption(OPTION_LASTSERVERPATH, _T(""));
 
 	const std::vector<CState*> *states = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); ++iter)
 	{
 		CState* pState = *iter;
 
diff -Nru filezilla-3.5.3/src/interface/clearprivatedata.h filezilla-3.7.3~precise/src/interface/clearprivatedata.h
--- filezilla-3.5.3/src/interface/clearprivatedata.h	2007-11-23 11:33:57.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/clearprivatedata.h	2013-06-09 03:30:06.000000000 +0000
@@ -15,7 +15,7 @@
 
 protected:
 	CClearPrivateDataDialog(CMainFrame* pMainFrame);
-	~CClearPrivateDataDialog() { }
+	~CClearPrivateDataDialog() {}
 
 	bool ClearReconnect();
 
@@ -25,7 +25,7 @@
 
 	wxTimer m_timer;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTimer(wxTimerEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/cmdline.cpp filezilla-3.7.3~precise/src/interface/cmdline.cpp
--- filezilla-3.5.3/src/interface/cmdline.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/cmdline.cpp	2013-05-31 19:05:46.000000000 +0000
@@ -6,6 +6,7 @@
 	m_parser.AddSwitch(_T("h"), _T("help"), _("Shows this help dialog"), wxCMD_LINE_OPTION_HELP);
 	m_parser.AddSwitch(_T("s"), _T("site-manager"), _("Start with opened Site Manager"));
 	m_parser.AddOption(_T("c"), _T("site"), _("Connect to specified Site Manager site"));
+	m_parser.AddOption(_T("a"), _T("local"), _("Starts the local site in the given path"));
 
 	wxString desc = wxString::Format(_("Logontype, can only be used together with FTP URL. Argument has to be either '%s' or '%s'"), _T("ask"), _T("interactive"));
 	m_parser.AddOption(_T("l"), _T("logontype"), desc);
@@ -15,6 +16,7 @@
 #endif
 	m_parser.AddSwitch(_T(""), _T("verbose"), _("Verbose log messages from wxWidgets"));
 	m_parser.AddSwitch(_T("v"), _T("version"), _("Print version information to stdout and exit"));
+	m_parser.AddSwitch(_T(""), _T("debug-startup"), _("Print diagnostic information related to startup of FileZilla"));
 	wxString str = _T("<");
 	str += _("FTP URL");
 	str += _T(">");
@@ -35,6 +37,8 @@
 #endif
 	else if (s == version)
 		return m_parser.Found(_T("v"));
+	else if (s == debug_startup)
+		return m_parser.Found(_T("debug-startup"));
 
 	return false;
 }
@@ -52,6 +56,10 @@
 		if (m_parser.Found(_T("l"), &value))
 			return value;
 		break;
+	case local:
+		if (m_parser.Found(_T("a"), &value))
+			return value;
+		break;		
 	}
 
 	return _T("");
diff -Nru filezilla-3.5.3/src/interface/cmdline.h filezilla-3.7.3~precise/src/interface/cmdline.h
--- filezilla-3.5.3/src/interface/cmdline.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/cmdline.h	2013-05-31 19:05:46.000000000 +0000
@@ -10,13 +10,15 @@
 	{
 		sitemanager,
 		close,
-		version
+		version,
+		debug_startup
 	};
 
 	enum t_option
 	{
 		logontype,
-		site
+		site,
+		local
 	};
 
 	CCommandLine(int argc, wxChar** argv);
diff -Nru filezilla-3.5.3/src/interface/commandqueue.cpp filezilla-3.7.3~precise/src/interface/commandqueue.cpp
--- filezilla-3.5.3/src/interface/commandqueue.cpp	2010-07-26 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/commandqueue.cpp	2013-05-13 03:30:10.000000000 +0000
@@ -24,7 +24,7 @@
 
 CCommandQueue::~CCommandQueue()
 {
-	for (std::list<CCommand *>::iterator iter = m_CommandList.begin(); iter != m_CommandList.end(); iter++)
+	for (std::list<CCommand *>::iterator iter = m_CommandList.begin(); iter != m_CommandList.end(); ++iter)
 		delete *iter;
 }
 
@@ -71,7 +71,7 @@
 		CCommand *pCommand = m_CommandList.front();
 
 		int res = m_pEngine->Command(*pCommand);
-		
+
 		if (pCommand->GetId() != cmd_cancel &&
 			pCommand->GetId() != cmd_connect &&
 			pCommand->GetId() != cmd_disconnect)
@@ -116,7 +116,7 @@
 		else
 		{
 			wxBell();
-			
+
 			if (pCommand->GetId() == cmd_list)
 				m_pState->ListingFailed(res);
 
@@ -146,11 +146,11 @@
 
 	if (m_CommandList.empty())
 		return true;
-	
+
 	std::list<CCommand *>::iterator iter = m_CommandList.begin();
 	CCommand *pCommand = *(iter++);
 
-	for (; iter != m_CommandList.end(); iter++)
+	for (; iter != m_CommandList.end(); ++iter)
 		delete *iter;
 
 	m_CommandList.clear();
@@ -192,7 +192,7 @@
 
 	if (m_exclusiveEngineLock)
 	{
-		m_pMainFrame->GetQueue()->ProcessNotification(pNotification);
+		m_pMainFrame->GetQueue()->ProcessNotification(m_pEngine, pNotification);
 		return;
 	}
 
@@ -246,9 +246,9 @@
 	}
 	else
 		m_CommandList.pop_front();
-	
+
 	delete pCommand;
-	
+
 	delete pNotification;
 
 	m_inside_commandqueue = false;
diff -Nru filezilla-3.5.3/src/interface/conditionaldialog.cpp filezilla-3.7.3~precise/src/interface/conditionaldialog.cpp
--- filezilla-3.5.3/src/interface/conditionaldialog.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/conditionaldialog.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -21,7 +21,7 @@
 	pMainSizer->Add(pSizer, 0, wxALL, 5);
 	m_pTextSizer = new wxFlexGridSizer(1, 5, 6);
 	pSizer->Add(m_pTextSizer, 0, wxTOP, 5);
-	
+
 	wxCheckBox *pCheckBox = new wxCheckBox(this, wxID_HIGHEST + 1, _("&Don't show this dialog again."));
 	pCheckBox->SetValue(checked);
 	pSizer->Add(pCheckBox, 0, wxTOP | wxBOTTOM, 5);
@@ -42,13 +42,13 @@
 
 		wxSizer* pGrid = new wxGridSizer(2, 5, 5);
 		pVertSizer->Add(pGrid, 0, wxLEFT | wxRIGHT | wxBOTTOM | wxALIGN_CENTER_HORIZONTAL, 5);
-		
+
 		wxButton* pYes = new wxButton(this, wxID_YES);
 		pYes->SetDefault();
 		pGrid->Add(pYes, 0, wxGROW);
 
 		pGrid->Add(new wxButton(this, wxID_NO), 0, wxGROW);
-		
+
 		SetEscapeId(wxID_NO);
 	}
 
diff -Nru filezilla-3.5.3/src/interface/conditionaldialog.h filezilla-3.7.3~precise/src/interface/conditionaldialog.h
--- filezilla-3.5.3/src/interface/conditionaldialog.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/conditionaldialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -34,7 +34,7 @@
 
 	wxSizer* m_pTextSizer;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnButton(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/context_control.cpp filezilla-3.7.3~precise/src/interface/context_control.cpp
--- filezilla-3.5.3/src/interface/context_control.cpp	2010-06-13 19:13:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/context_control.cpp	2012-12-16 09:39:23.000000000 +0000
@@ -2,6 +2,7 @@
 #include "commandqueue.h"
 #include "context_control.h"
 #include "filelist_statusbar.h"
+#include "filezillaapp.h"
 #include "LocalListView.h"
 #include "LocalTreeView.h"
 #include "Mainfrm.h"
@@ -49,16 +50,17 @@
 
 void CContextControl::CreateTab()
 {
+	wxGetApp().AddStartupProfileRecord(_T("CContextControl::CreateTab"));
 	Freeze();
 
 	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;
@@ -105,6 +107,7 @@
 
 void CContextControl::CreateContextControls(CState* pState)
 {
+	wxGetApp().AddStartupProfileRecord(_T("CContextControl::CreateContextControls"));
 	wxWindow* parent = this;
 
 #ifdef __WXGTK__
@@ -116,7 +119,7 @@
 
 	if (!m_context_controls.empty())
 	{
-		if (!m_tabs )
+		if (!m_tabs)
 		{
 			m_tabs = new wxAuiNotebookEx();
 
@@ -275,7 +278,7 @@
 	{
 		context_controls.tab_index = 0;
 		context_controls.site_bookmarks = new CContextControl::_context_controls::_site_bookmarks;
-		
+
 		context_controls.site_bookmarks->path = COptions::Get()->GetOption(OPTION_LAST_CONNECTED_SITE);
 		CSiteManager::GetBookmarks(context_controls.site_bookmarks->path,
 			context_controls.site_bookmarks->bookmarks);
diff -Nru filezilla-3.5.3/src/interface/context_control.h filezilla-3.7.3~precise/src/interface/context_control.h
--- filezilla-3.5.3/src/interface/context_control.h	2010-06-13 19:13:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/context_control.h	2013-06-09 03:30:06.000000000 +0000
@@ -31,7 +31,7 @@
 		CRemoteListView* pRemoteListView;
 		CViewHeader* pLocalViewHeader;
 		CViewHeader* pRemoteViewHeader;
-	
+
 		CSplitterWindowEx* pViewSplitter; // Contains local and remote splitters
 		CSplitterWindowEx* pLocalSplitter;
 		CSplitterWindowEx* pRemoteSplitter;
@@ -58,7 +58,7 @@
 
 	struct _context_controls* GetCurrentControls();
 	struct _context_controls* GetControlsFromState(CState* pState);
-	
+
 	int GetCurrentTab() const;
 	int GetTabCount() const;
 	struct _context_controls* GetControlsFromTabIndex(int i);
@@ -67,7 +67,7 @@
 	void AdvanceTab(bool forward);
 
 protected:
-	
+
 	void CreateContextControls(CState* pState);
 
 	std::vector<struct _context_controls> m_context_controls;
@@ -78,7 +78,7 @@
 	CMainFrame* m_pMainFrame;
 
 protected:
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTabRefresh(wxCommandEvent& event);
 	void OnTabChanged(wxAuiNotebookEvent& event);
 	void OnTabClosing(wxAuiNotebookEvent& event);
diff -Nru filezilla-3.5.3/src/interface/customheightlistctrl.cpp filezilla-3.7.3~precise/src/interface/customheightlistctrl.cpp
--- filezilla-3.5.3/src/interface/customheightlistctrl.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/customheightlistctrl.cpp	2013-06-09 03:30:05.000000000 +0000
@@ -3,7 +3,7 @@
 
 BEGIN_EVENT_TABLE(wxCustomHeightListCtrl, wxScrolledWindow)
 EVT_MOUSE_EVENTS(wxCustomHeightListCtrl::OnMouseEvent)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 wxCustomHeightListCtrl::wxCustomHeightListCtrl(wxWindow* parent, wxWindowID id /*=-1*/, const wxPoint& pos /*=wxDefaultPosition*/, const wxSize& size /*=wxDefaultSize*/, long style /*=wxHSCROLL|wxVSCROLL*/, const wxString& name /*=_T("scrolledWindow")*/)
 	: wxScrolledWindow(parent, id, pos, size, style, name)
@@ -34,7 +34,7 @@
 	{
 		std::set<int> selectedLines = m_selectedLines;
 		m_selectedLines.clear();
-		for (std::set<int>::const_iterator iter = selectedLines.begin(); iter != selectedLines.end(); iter++)
+		for (std::set<int>::const_iterator iter = selectedLines.begin(); iter != selectedLines.end(); ++iter)
 			if (*iter < count)
 				m_selectedLines.insert(*iter);
 	}
@@ -89,7 +89,7 @@
 	dc.SetBrush(wxBrush(wxSystemSettings::GetColour(wxSYS_COLOUR_HIGHLIGHT)));
 	dc.SetPen(*wxTRANSPARENT_PEN);
 
-	for (std::set<int>::const_iterator iter = m_selectedLines.begin(); iter != m_selectedLines.end(); iter++)
+	for (std::set<int>::const_iterator iter = m_selectedLines.begin(); iter != m_selectedLines.end(); ++iter)
 	{
 		if (*iter == m_focusedLine)
 			dc.SetPen(wxPen(wxColour(0, 0, 0), 1, wxDOT));
@@ -162,7 +162,7 @@
 				changed = true;
 			}
 
-			m_focusedLine = line;				
+			m_focusedLine = line;
 
 		}
 		Refresh();
diff -Nru filezilla-3.5.3/src/interface/customheightlistctrl.h filezilla-3.7.3~precise/src/interface/customheightlistctrl.h
--- filezilla-3.5.3/src/interface/customheightlistctrl.h	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/customheightlistctrl.h	2013-06-09 03:30:06.000000000 +0000
@@ -24,7 +24,7 @@
 protected:
 	virtual void OnDraw(wxDC& dc);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnMouseEvent(wxMouseEvent& event);
 
 	int m_lineHeight;
diff -Nru filezilla-3.5.3/src/interface/dialogex.h filezilla-3.7.3~precise/src/interface/dialogex.h
--- filezilla-3.5.3/src/interface/dialogex.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/dialogex.h	2013-06-09 03:30:06.000000000 +0000
@@ -19,7 +19,7 @@
 
 protected:
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	virtual void OnChar(wxKeyEvent& event);
 
 	static int m_shown_dialogs;
diff -Nru filezilla-3.5.3/src/interface/dndobjects.cpp filezilla-3.7.3~precise/src/interface/dndobjects.cpp
--- filezilla-3.5.3/src/interface/dndobjects.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/dndobjects.cpp	2012-10-15 03:30:11.000000000 +0000
@@ -120,7 +120,7 @@
 		target = wxString((wchar_t*)(data + 2), wxConvFile);
 #endif
 	}
-	
+
 	ReleaseMutex(m_hMutex);
 
 	UnmapViewOfFile(data);
@@ -174,7 +174,7 @@
 		delete ext;
 		return 0;
 	}
-	
+
 	if (ext->InitDrag() == _T(""))
 	{
 		delete ext;
@@ -189,16 +189,19 @@
 #endif //__WXMSW__
 
 CRemoteDataObject::CRemoteDataObject(const CServer& server, const CServerPath& path)
-	: wxDataObjectSimple(wxDataFormat(_T("FileZilla3RemoteDataObject"))),
-	  m_server(server), m_path(path), m_processId(wxGetProcessId())
+	: wxDataObjectSimple(wxDataFormat(_T("FileZilla3RemoteDataObject")))
+	, m_server(server)
+	, m_path(path)
+	, m_didSendData()
+	, m_processId(wxGetProcessId())
 {
-	m_didSendData = false;
 }
 
 CRemoteDataObject::CRemoteDataObject()
 	: wxDataObjectSimple(wxDataFormat(_T("FileZilla3RemoteDataObject")))
+	, m_didSendData()
+	, m_processId(wxGetProcessId())
 {
-	m_didSendData = false;
 }
 
 size_t CRemoteDataObject::GetDataSize() const
@@ -237,7 +240,7 @@
 	AddTextElement(pElement, "Path", m_path.GetSafePath());
 
 	TiXmlElement* pFiles = pElement->LinkEndChild(new TiXmlElement("Files"))->ToElement();
-	for (std::list<t_fileInfo>::const_iterator iter = m_fileList.begin(); iter != m_fileList.end(); iter++)
+	for (std::list<t_fileInfo>::const_iterator iter = m_fileList.begin(); iter != m_fileList.end(); ++iter)
 	{
 		TiXmlElement* pFile = pFiles->LinkEndChild(new TiXmlElement("File"))->ToElement();
 		AddTextElement(pFile, "Name", iter->name);
@@ -267,7 +270,7 @@
 	TiXmlElement* pServer = pElement->FirstChildElement("Server");
 	if (!pServer || !::GetServer(pServer, m_server))
 		return false;
-	
+
 	wxString path = GetTextElement(pElement, "Path");
 	if (path == _T("") || !m_path.SetSafePath(path))
 		return false;
diff -Nru filezilla-3.5.3/src/interface/dndobjects.h filezilla-3.7.3~precise/src/interface/dndobjects.h
--- filezilla-3.5.3/src/interface/dndobjects.h	2008-11-14 03:00:31.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/dndobjects.h	2012-10-06 03:30:11.000000000 +0000
@@ -23,7 +23,7 @@
 public:
 	CRemoteDataObject(const CServer& server, const CServerPath& path);
 	CRemoteDataObject();
-	
+
 	virtual size_t GetDataSize() const;
 	virtual bool GetDataHere(void *buf ) const;
 
@@ -76,7 +76,7 @@
 	bool IsLoaded() const { return m_shellExtension != 0; }
 
 	wxString InitDrag();
-	
+
 	wxString GetTarget();
 
 	wxString GetDragDirectory() const { return m_dragDirectory; }
diff -Nru filezilla-3.5.3/src/interface/edithandler.cpp filezilla-3.7.3~precise/src/interface/edithandler.cpp
--- filezilla-3.5.3/src/interface/edithandler.cpp	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/edithandler.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -8,12 +8,12 @@
 #include "local_filesys.h"
 
 // Defined in optionspage_edit.cpp
-bool UnquoteCommand(wxString& command, wxString& arguments);
+bool UnquoteCommand(wxString& command, wxString& arguments, bool is_dde = false);
 bool ProgramExists(const wxString& editor);
 
 class CChangedFileDialog : public wxDialogEx
 {
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnYes(wxCommandEvent& event);
 	void OnNo(wxCommandEvent& event);
 };
@@ -205,6 +205,8 @@
 			close(m_lockfile_descriptor);
 #endif
 
+		wxRemoveFile(m_localDir + _T("empty_file_yq744zm"));
+
 		RemoveAll(true);
 		wxRmdir(m_localDir);
 	}
@@ -246,7 +248,7 @@
 	{
 		if (type != remote)
 		{
-			for (std::list<t_fileData>::const_iterator iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); iter++)
+			for (std::list<t_fileData>::const_iterator iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter)
 			{
 				if (iter->state != state)
 					continue;
@@ -257,7 +259,7 @@
 		}
 		if (type != local)
 		{
-			for (std::list<t_fileData>::const_iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+			for (std::list<t_fileData>::const_iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 			{
 				if (iter->state != state)
 					continue;
@@ -355,7 +357,7 @@
 {
 	std::list<t_fileData> keep;
 
-	for (std::list<t_fileData>::iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+	for (std::list<t_fileData>::iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 	{
 		if (!force && (iter->state == download || iter->state == upload || iter->state == upload_and_remove))
 		{
@@ -376,7 +378,7 @@
 	m_fileDataList[remote].swap(keep);
 	keep.clear();
 
-	for (std::list<t_fileData>::iterator iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); iter++)
+	for (std::list<t_fileData>::iterator iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter)
 	{
 		if (force)
 			continue;
@@ -401,7 +403,7 @@
 
 	std::list<t_fileData> keep;
 
-	for (std::list<t_fileData>::iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+	for (std::list<t_fileData>::iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 	{
 		if (iter->state != state)
 		{
@@ -433,7 +435,7 @@
 std::list<CEditHandler::t_fileData>::iterator CEditHandler::GetFile(const wxString& fileName)
 {
 	std::list<t_fileData>::iterator iter;
-	for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); iter++)
+	for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter)
 	{
 		if (iter->file == fileName)
 			break;
@@ -445,7 +447,7 @@
 std::list<CEditHandler::t_fileData>::const_iterator CEditHandler::GetFile(const wxString& fileName) const
 {
 	std::list<t_fileData>::const_iterator iter;
-	for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); iter++)
+	for (iter = m_fileDataList[local].begin(); iter != m_fileDataList[local].end(); ++iter)
 	{
 		if (iter->file == fileName)
 			break;
@@ -457,7 +459,7 @@
 std::list<CEditHandler::t_fileData>::iterator CEditHandler::GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server)
 {
 	std::list<t_fileData>::iterator iter;
-	for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+	for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 	{
 		if (iter->name != fileName)
 			continue;
@@ -477,7 +479,7 @@
 std::list<CEditHandler::t_fileData>::const_iterator CEditHandler::GetFile(const wxString& fileName, const CServerPath& remotePath, const CServer& server) const
 {
 	std::list<t_fileData>::const_iterator iter;
-	for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+	for (iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 	{
 		if (iter->name != fileName)
 			continue;
@@ -629,7 +631,7 @@
 	for (int i = 0; i < 2; i++)
 	{
 checkmodifications_loopbegin:
-		for (std::list<t_fileData>::iterator iter = m_fileDataList[i].begin(); iter != m_fileDataList[i].end(); iter++)
+		for (std::list<t_fileData>::iterator iter = m_fileDataList[i].begin(); iter != m_fileDataList[i].end(); ++iter)
 		{
 			if (iter->state != edit)
 				continue;
@@ -740,7 +742,7 @@
 		int pos = file.Find(wxFileName::GetPathSeparator(), true);
 		wxASSERT(pos != -1);
 		file = file.Mid(pos + 1);
-	
+
 		if (file == iter->name)
 		{
 			XRCCTRL(dlg, "ID_DESC_OPENEDAS", wxStaticText)->Hide();
@@ -811,7 +813,7 @@
 		return false;
 	}
 
-	m_pQueue->QueueFile(false, false, file, iter->name, localPath, iter->remotePath, iter->server, wxLongLong(size.GetHi(), size.GetLo()), type);
+	m_pQueue->QueueFile(false, false, file, iter->name, localPath, iter->remotePath, iter->server, wxLongLong(size.GetHi(), size.GetLo()), type, priority_high);
 	m_pQueue->QueueFile_Finish(true);
 
 	return true;
@@ -963,7 +965,7 @@
 	if (ext == _T(""))
 		return _T("");
 
-	while (true)
+	for (;;)
 	{
 		wxFileType* pType = wxTheMimeTypesManager->GetFileTypeFromExtension(ext);
 		if (!pType)
@@ -983,6 +985,8 @@
 		program_exists = false;
 
 		wxString editor;
+		bool is_dde = false;
+#ifdef __WXMSW__
 		if (cmd.Left(7) == _T("WX_DDE#"))
 		{
 			// See wxWidget's wxExecute in src/msw/utilsexc.cpp
@@ -992,12 +996,16 @@
 			if (pos < 1)
 				return cmd;
 			editor = editor.Left(pos);
+			is_dde = true;
 		}
 		else
+#endif
+		{
 			editor = cmd;
+		}
 
 		wxString args;
-		if (!UnquoteCommand(editor, args) || editor.empty())
+		if (!UnquoteCommand(editor, args, is_dde) || editor.empty())
 			return cmd;
 
 		if (!PathExpand(editor))
@@ -1071,7 +1079,7 @@
 			program_exists = false;
 			return prog;
 		}
-		
+
 		program_exists = true;
 		return command + _T(" \"") + fn.GetFullPath() + _T("\"");
 	}
@@ -1152,13 +1160,13 @@
 			return name.Left(max - pathlen - extlen) + name.Mid(pos);
 		}
 	}
-	
+
 	return name;
 }
 
 bool CEditHandler::FilenameExists(const wxString& file)
 {
-	for (std::list<t_fileData>::const_iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); iter++)
+	for (std::list<t_fileData>::const_iterator iter = m_fileDataList[remote].begin(); iter != m_fileDataList[remote].end(); ++iter)
 	{
 #ifdef __WXMSW__
 		if (!iter->file.CmpNoCase(file))
@@ -1235,7 +1243,7 @@
 	{
 		const std::list<CEditHandler::t_fileData>& files = pEditHandler->GetFiles(CEditHandler::remote);
 		unsigned int i = 0;
-		for (std::list<CEditHandler::t_fileData>::const_iterator iter = files.begin(); iter != files.end(); iter++, i++)
+		for (std::list<CEditHandler::t_fileData>::const_iterator iter = files.begin(); iter != files.end(); ++iter, ++i)
 		{
 			pListCtrl->InsertItem(i, iter->name);
 			pListCtrl->SetItem(i, COLUMN_TYPE, _("Remote"));
@@ -1272,7 +1280,7 @@
 	{
 		const std::list<CEditHandler::t_fileData>& files = pEditHandler->GetFiles(CEditHandler::local);
 		unsigned int i = 0;
-		for (std::list<CEditHandler::t_fileData>::const_iterator iter = files.begin(); iter != files.end(); iter++, i++)
+		for (std::list<CEditHandler::t_fileData>::const_iterator iter = files.begin(); iter != files.end(); ++iter, ++i)
 		{
 			pListCtrl->InsertItem(i, iter->file);
 			pListCtrl->SetItem(i, COLUMN_TYPE, _("Local"));
@@ -1376,13 +1384,13 @@
 		files.push_front(item);
 	}
 
-	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		const int i = *iter;
 
 		enum CEditHandler::fileType type;
 		CEditHandler::t_fileData* pData = GetDataFromItem(i, type);
-		
+
 		if (type == CEditHandler::local)
 		{
 			pEditHandler->Remove(pData->file);
@@ -1429,7 +1437,7 @@
 		files.push_front(item);
 	}
 
-	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		const int i = *iter;
 
@@ -1467,7 +1475,7 @@
 	while ((item = pListCtrl->GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED)) != -1)
 	{
 		pListCtrl->SetItemState(item, 0, wxLIST_STATE_SELECTED);
-		
+
 		enum CEditHandler::fileType type;
 		CEditHandler::t_fileData* pData = GetDataFromItem(item, type);
 
@@ -1479,7 +1487,7 @@
 		files.push_front(item);
 	}
 
-	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<int>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		const int i = *iter;
 
@@ -1559,7 +1567,7 @@
 	if (!pos)
 		m_ext = _T(".");
 	else if (pos != -1)
-		m_ext = file.Mid(pos + 1);	
+		m_ext = file.Mid(pos + 1);
 	else
 		m_ext.clear();
 
diff -Nru filezilla-3.5.3/src/interface/edithandler.h filezilla-3.7.3~precise/src/interface/edithandler.h
--- filezilla-3.5.3/src/interface/edithandler.h	2010-01-24 03:00:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/edithandler.h	2013-06-09 03:30:06.000000000 +0000
@@ -71,7 +71,7 @@
 	wxString CanOpen(enum fileType type, const wxString& fileName, bool &dangerous, bool& program_exists);
 	bool StartEditing(const wxString& file);
 	bool StartEditing(const wxString& file, const CServerPath& remotePath, const CServer& server);
-	
+
 	struct t_fileData
 	{
 		wxString name; // The name of the file
@@ -94,7 +94,7 @@
 
 protected:
 	CEditHandler();
-	virtual ~CEditHandler() { }
+	virtual ~CEditHandler() {}
 
 	static CEditHandler* m_pEditHandler;
 
@@ -119,7 +119,7 @@
 
 	wxTimer m_timer;
 	wxTimer m_busyTimer;
-	
+
 	void RemoveTemporaryFiles(const wxString& temp);
 
 	wxString GetTemporaryFile(wxString name);
@@ -176,7 +176,7 @@
 	wxWindow* m_pParent;
 	wxString m_ext;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnRadioButton(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
 	void OnBrowseEditor(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/export.cpp filezilla-3.7.3~precise/src/interface/export.cpp
--- filezilla-3.5.3/src/interface/export.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/export.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -37,8 +37,8 @@
 	else
 		str = _("Select file for exported data");
 
-	wxFileDialog dlg(m_parent, str, _T(""), 
-					_T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"), 
+	wxFileDialog dlg(m_parent, str, _T(""),
+					_T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"),
 					wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 
 	if (dlg.ShowModal() != wxID_OK)
diff -Nru filezilla-3.5.3/src/interface/fileexistsdlg.cpp filezilla-3.7.3~precise/src/interface/fileexistsdlg.cpp
--- filezilla-3.5.3/src/interface/fileexistsdlg.cpp	2010-09-28 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/fileexistsdlg.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -47,8 +47,8 @@
 	wxString localFile = m_pNotification->localFile;
 
 	wxString remoteFile = m_pNotification->remotePath.FormatFilename(m_pNotification->remoteFile);
-    localFile = GetPathEllipsis(localFile, FindWindow(XRCID("ID_FILE1_NAME")));
-    remoteFile = GetPathEllipsis(remoteFile, FindWindow(XRCID("ID_FILE2_NAME")));
+	localFile = GetPathEllipsis(localFile, FindWindow(XRCID("ID_FILE1_NAME")));
+	remoteFile = GetPathEllipsis(remoteFile, FindWindow(XRCID("ID_FILE2_NAME")));
 
 	localFile.Replace(_T("&"), _T("&&"));
 	remoteFile.Replace(_T("&"), _T("&&"));
@@ -301,7 +301,7 @@
 wxString CFileExistsDlg::GetPathEllipsis(wxString path, wxWindow *window)
 {
 	int string_width; // width of the path string in pixels
-	int y;            // dummy variable
+	int y;			// dummy variable
 	window->GetTextExtent(path, &string_width, &y);
 
 	wxDisplay display(wxDisplay::GetFromWindow(window));
diff -Nru filezilla-3.5.3/src/interface/fileexistsdlg.h filezilla-3.7.3~precise/src/interface/fileexistsdlg.h
--- filezilla-3.5.3/src/interface/fileexistsdlg.h	2008-07-05 15:37:33.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/fileexistsdlg.h	2012-10-06 03:30:11.000000000 +0000
@@ -4,7 +4,7 @@
 #include "dialogex.h"
 
 class CFileExistsDlg: public wxDialogEx
-{	
+{
 	DECLARE_EVENT_TABLE()
 
 public:
@@ -16,7 +16,7 @@
 
 	/// Creates the controls and sizers
 	void CreateControls();
-	
+
 	enum CFileExistsNotification::OverwriteAction GetAction() const;
 	bool Always(bool &directionOnly, bool &queueOnly) const;
 
@@ -24,7 +24,7 @@
 	void OnOK(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 	void OnCheck(wxCommandEvent& event);
-	
+
 	void LoadIcon(int id, const wxString &file);
 	wxString GetPathEllipsis(wxString path, wxWindow *window);
 
diff -Nru filezilla-3.5.3/src/interface/filelistctrl.cpp filezilla-3.7.3~precise/src/interface/filelistctrl.cpp
--- filezilla-3.5.3/src/interface/filelistctrl.cpp	2010-09-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filelistctrl.cpp	2012-11-15 04:30:05.000000000 +0000
@@ -81,7 +81,7 @@
 
 		return wxListCtrlEx::MSWWindowProc(nMsg, wParam, lParam);
 	}
-	
+
 	return wxListCtrlEx::MSWWindowProc(nMsg, wParam, lParam);
 }
 
@@ -102,7 +102,7 @@
 
 		if (!m_pFilelistStatusBar)
 			return true;
-		
+
 		if (wxGetKeyState(WXK_CONTROL) && wxGetKeyState(WXK_SHIFT))
 		{
 			// The behavior of Ctrl+Shift+Click is highly erratic.
@@ -210,6 +210,7 @@
 {
 public:
 	virtual void OnNavigationEvent(bool forward) = 0;
+	virtual ~CGtkEventCallbackProxyBase() {}
 };
 
 template <class CFileData> class CGtkEventCallbackProxy : public CGtkEventCallbackProxyBase
@@ -277,6 +278,9 @@
 	GtkWidget* widget = GetMainWindow()->GetConnectWidget();
 	g_signal_connect(widget, "button_release_event", G_CALLBACK(gtk_button_release_event), m_gtkEventCallbackProxy.Value());
 #endif
+
+	m_genericTypes[genericTypes::file] = _("File");
+	m_genericTypes[genericTypes::directory] = _("Directory");
 }
 
 template<class CFileData> CFileListCtrl<CFileData>::~CFileListCtrl()
@@ -321,7 +325,7 @@
 
 #ifndef __WXMSW__
 		// GetNextItem is O(n) if nothing is selected, GetSelectedItemCount() is O(1)
-		if (GetSelectedItemCount())		
+		if (GetSelectedItemCount())
 #endif
 		{
 			int item = -1;
@@ -343,7 +347,7 @@
 		m_sortColumn = column;
 		std::vector<unsigned int>::iterator start = m_indexMapping.begin();
 		if (m_hasParent)
-			start++;
+			++start;
 		std::reverse(start, m_indexMapping.end());
 
 		if (updateSelections)
@@ -368,7 +372,7 @@
 
 	std::vector<unsigned int>::iterator start = m_indexMapping.begin();
 	if (m_hasParent)
-		start++;
+		++start;
 	CSortComparisonObject object = GetSortComparisonObject();
 	std::sort(start, m_indexMapping.end(), object);
 	object.Destroy();
@@ -460,10 +464,21 @@
 	RefreshListOnly(false);
 }
 
+static wxString GetExt(const wxString& file)
+{
+	wxString ret;
+
+	int pos = file.Find('.', true);
+	if (pos > 0 && file[pos + 1] != 0) // Does neither starts nor end with dot
+		ret = file.Mid(pos + 1);
+
+	return ret;
+}
+
 template<class CFileData> wxString CFileListCtrl<CFileData>::GetType(wxString name, bool dir, const wxString& path /*=_T("")*/)
 {
 #ifdef __WXMSW__
-	wxString ext = wxFileName(name).GetExt();
+	wxString ext = GetExt(name);
 	ext.MakeLower();
 	std::map<wxString, wxString>::iterator typeIter = m_fileTypeMap.find(ext);
 	if (typeIter != m_fileTypeMap.end())
@@ -471,7 +486,7 @@
 
 	wxString type;
 	int flags = SHGFI_TYPENAME;
-	if (path == _T(""))
+	if (path.IsEmpty())
 		flags |= SHGFI_USEFILEATTRIBUTES;
 	else if (path == _T("\\"))
 		name += _T("\\");
@@ -486,45 +501,45 @@
 		sizeof(shFinfo),
 		flags))
 	{
-		type = shFinfo.szTypeName;
-		if (type == _T(""))
+		if (!*shFinfo.szTypeName)
 		{
-			type = ext;
-			type.MakeUpper();
-			if (!type.IsEmpty())
+			if (!ext.IsEmpty())
 			{
+				type = ext;
+				type.MakeUpper();
 				type += _T("-");
 				type += _("file");
 			}
 			else
-				type = _("File");
+				type = m_genericTypes[genericTypes::file];
 		}
 		else
 		{
-			if (!dir && ext != _T(""))
+			type = shFinfo.szTypeName;
+			if (!dir && !ext.IsEmpty())
 				m_fileTypeMap[ext.MakeLower()] = type;
 		}
 	}
 	else
 	{
-		type = ext;
-		type.MakeUpper();
-		if (!type.IsEmpty())
+		if (!ext.IsEmpty())
 		{
+			type = ext;
+			type.MakeUpper();
 			type += _T("-");
 			type += _("file");
 		}
 		else
-			type = _("File");
+			type = m_genericTypes[genericTypes::file];
 	}
 	return type;
 #else
 	if (dir)
-		return _("Directory");
+		return m_genericTypes[genericTypes::directory];
 
 	int pos = name.Find('.', true);
 	if (pos < 1 || !name[pos + 1]) // Starts or ends with dot
-		return _("File");
+		return m_genericTypes[genericTypes::file];
 	wxString ext = name.Mid(pos + 1);
 	wxString lower_ext = ext.Lower();
 
diff -Nru filezilla-3.5.3/src/interface/filelistctrl.h filezilla-3.7.3~precise/src/interface/filelistctrl.h
--- filezilla-3.5.3/src/interface/filelistctrl.h	2010-09-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filelistctrl.h	2012-11-13 04:30:05.000000000 +0000
@@ -35,9 +35,16 @@
 	};
 
 	virtual bool operator()(int a, int b) const = 0;
-	virtual ~CListViewSort() { } // Without this empty destructor GCC complains
+	virtual ~CListViewSort() {} // Without this empty destructor GCC complains
 };
 
+namespace genericTypes {
+	enum type {
+		file,
+		directory
+	};
+}
+
 template<class CFileData> class CFileListCtrl : public wxListCtrlEx, public CComparableListing
 {
 public:
@@ -148,6 +155,8 @@
 	CSharedPointer<CGtkEventCallbackProxyBase> m_gtkEventCallbackProxy;
 #endif
 
+	wxString m_genericTypes[2];
+
 	DECLARE_EVENT_TABLE()
 	void OnColumnClicked(wxListEvent &event);
 	void OnColumnRightClicked(wxListEvent& event);
diff -Nru filezilla-3.5.3/src/interface/filezillaapp.h filezilla-3.7.3~precise/src/interface/filezillaapp.h
--- filezilla-3.5.3/src/interface/filezillaapp.h	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filezillaapp.h	2012-12-16 09:39:23.000000000 +0000
@@ -5,6 +5,8 @@
 #include <wx/debugrpt.h>
 #endif
 
+#include <list>
+
 class CWrapEngine;
 class CCommandLine;
 class CFileZillaApp : public wxApp
@@ -32,6 +34,18 @@
 
 	const CCommandLine* GetCommandLine() const { return m_pCommandLine; }
 
+#if 0 // Disabled for now due to some wx controls expecting wxYield to process all events.
+#if wxMAJOR_VERSION == 2 && wxMINOR_VERSION == 8
+	#define USE_CHUNKED_PROCESS_PENDING_EVENTS 1
+#endif
+#endif
+#if USE_CHUNKED_PROCESS_PENDING_EVENTS
+	virtual void ProcessPendingEvents();
+#endif
+
+	void ShowStartupProfile();
+	void AddStartupProfileRecord(const wxString& msg);
+
 protected:
 	bool InitDefaultsDir();
 	bool LoadResourceFiles();
@@ -60,6 +74,9 @@
 	CWrapEngine* m_pWrapEngine;
 
 	CCommandLine* m_pCommandLine;
+
+	bool m_profilingActive;
+	std::list<std::pair<wxDateTime, wxString> > m_startupProfile;
 };
 
 DECLARE_APP(CFileZillaApp)
diff -Nru filezilla-3.5.3/src/interface/filter.cpp filezilla-3.7.3~precise/src/interface/filter.cpp
--- filezilla-3.5.3/src/interface/filter.cpp	2010-08-02 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filter.cpp	2013-06-09 03:30:05.000000000 +0000
@@ -31,7 +31,7 @@
 EVT_BUTTON(XRCID("ID_LOCAL_DISABLEALL"), CFilterDialog::OnChangeAll)
 EVT_BUTTON(XRCID("ID_REMOTE_ENABLEALL"), CFilterDialog::OnChangeAll)
 EVT_BUTTON(XRCID("ID_REMOTE_DISABLEALL"), CFilterDialog::OnChangeAll)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CFilterCondition::CFilterCondition()
 {
@@ -57,7 +57,7 @@
 
 bool CFilter::HasConditionOfType(enum t_filterType type) const
 {
-	for (std::vector<CFilterCondition>::const_iterator iter = filters.begin(); iter != filters.end(); iter++)
+	for (std::vector<CFilterCondition>::const_iterator iter = filters.begin(); iter != filters.end(); ++iter)
 	{
 		if (iter->type == type)
 			return true;
@@ -72,13 +72,12 @@
 }
 
 CFilterDialog::CFilterDialog()
+	: m_shiftClick()
+	, m_pMainFrame()
+	, m_filters(m_globalFilters)
+	, m_filterSets(m_globalFilterSets)
+	, m_currentFilterSet(m_globalCurrentFilterSet)
 {
-	m_pMainFrame = 0;
-	m_shiftClick = false;
-
-	m_filters = m_globalFilters;
-	m_filterSets = m_globalFilterSets;
-	m_currentFilterSet = m_globalCurrentFilterSet;
 }
 
 bool CFilterDialog::Create(CMainFrame* parent)
@@ -149,7 +148,7 @@
 	AddTextElement(pElement, "MatchCase", filter.matchCase ? _T("1") : _T("0"));
 
 	TiXmlElement* pConditions = pElement->LinkEndChild(new TiXmlElement("Conditions"))->ToElement();
-	for (std::vector<CFilterCondition>::const_iterator conditionIter = filter.filters.begin(); conditionIter != filter.filters.end(); conditionIter++)
+	for (std::vector<CFilterCondition>::const_iterator conditionIter = filter.filters.begin(); conditionIter != filter.filters.end(); ++conditionIter)
 	{
 		const CFilterCondition& condition = *conditionIter;
 
@@ -222,7 +221,7 @@
 
 	pFilters = pDocument->LinkEndChild(new TiXmlElement("Filters"))->ToElement();
 
-	for (std::vector<CFilter>::const_iterator iter = m_globalFilters.begin(); iter != m_globalFilters.end(); iter++)
+	for (std::vector<CFilter>::const_iterator iter = m_globalFilters.begin(); iter != m_globalFilters.end(); ++iter)
 	{
 		const CFilter& filter = *iter;
 
@@ -241,7 +240,7 @@
 	pSets = pDocument->LinkEndChild(new TiXmlElement("Sets"))->ToElement();
 	SetTextAttribute(pSets, "Current", wxString::Format(_T("%d"), m_currentFilterSet));
 
-	for (std::vector<CFilterSet>::const_iterator iter = m_globalFilterSets.begin(); iter != m_globalFilterSets.end(); iter++)
+	for (std::vector<CFilterSet>::const_iterator iter = m_globalFilterSets.begin(); iter != m_globalFilterSets.end(); ++iter)
 	{
 		const CFilterSet& set = *iter;
 		TiXmlElement* pSet = pSets->LinkEndChild(new TiXmlElement("Set"))->ToElement();
@@ -258,7 +257,7 @@
 	}
 
 	xml.Save();
-	
+
 	m_filters_disabled = false;
 }
 
@@ -636,7 +635,7 @@
 
 bool CFilterManager::FilenameFiltered(const std::list<CFilter> &filters, const wxString& name, const wxString& path, bool dir, wxLongLong size, bool local, int attributes, const wxDateTime* date) const
 {
-	for (std::list<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); iter++)
+	for (std::list<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); ++iter)
 	{
 		if (FilenameFilteredByFilter(*iter, name, path, dir, size, attributes, date))
 			return true;
@@ -723,7 +722,7 @@
 		}
 		break;
 	}
-	
+
 	return match;
 }
 
@@ -734,7 +733,7 @@
 	else if (!dir && !filter.filterFiles)
 		return false;
 
-	for (std::vector<CFilterCondition>::const_iterator iter = filter.filters.begin(); iter != filter.filters.end(); iter++)
+	for (std::vector<CFilterCondition>::const_iterator iter = filter.filters.begin(); iter != filter.filters.end(); ++iter)
 	{
 		bool match = false;
 		const CFilterCondition& condition = *iter;
@@ -903,7 +902,7 @@
 
 bool CFilterManager::CompileRegexes(CFilter& filter)
 {
-	for (std::vector<CFilterCondition>::iterator iter = filter.filters.begin(); iter != filter.filters.end(); iter++)
+	for (std::vector<CFilterCondition>::iterator iter = filter.filters.begin(); iter != filter.filters.end(); ++iter)
 	{
 		CFilterCondition& condition = *iter;
 		if ((condition.type == filter_name || condition.type == filter_path) && condition.condition == 4)
@@ -987,7 +986,7 @@
 		condition.matchCase = filter.matchCase;
 		if (condition.strValue == _T(""))
 			continue;
-		
+
 		// TODO: 64bit filesize
 		if (condition.type == filter_size)
 		{
@@ -1005,7 +1004,7 @@
 		else if (condition.type == filter_date)
 		{
 			if (!condition.date.ParseFormat(condition.strValue, _T("%Y-%m-%d")) || !condition.date.IsValid())
-				continue;			
+				continue;
 		}
 
 		filter.filters.push_back(condition);
@@ -1024,19 +1023,8 @@
 	CInterProcessMutex mutex(MUTEX_FILTERS);
 
 	wxFileName file(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), _T("filters.xml"));
-	if (!file.FileExists())
-	{
-		wxFileName defaults(wxGetApp().GetResourceDir(), _T("defaultfilters.xml"));
-		if (defaults.FileExists())
-		{
-			TiXmlElement* pDocument = GetXmlFile(defaults);
-			if (pDocument)
-			{
-				SaveXmlFile(file, pDocument);
-				delete pDocument->GetDocument();
-			}
-		}
-	}
+	if (!file.FileExists() || file.GetSize() == 0)
+		file = wxFileName(wxGetApp().GetResourceDir(), _T("defaultfilters.xml"));
 
 	CXmlFile xml(file);
 	TiXmlElement* pDocument = xml.Load();
diff -Nru filezilla-3.5.3/src/interface/filter.h filezilla-3.7.3~precise/src/interface/filter.h
--- filezilla-3.5.3/src/interface/filter.h	2010-08-02 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filter.h	2013-06-09 03:30:06.000000000 +0000
@@ -111,7 +111,7 @@
 {
 public:
 	CFilterDialog();
-	virtual ~CFilterDialog() { }
+	virtual ~CFilterDialog() {}
 
 	bool Create(CMainFrame* parent);
 
@@ -125,7 +125,7 @@
 
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnOK(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 	void OnApply(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/filter_conditions_dialog.cpp filezilla-3.7.3~precise/src/interface/filter_conditions_dialog.cpp
--- filezilla-3.5.3/src/interface/filter_conditions_dialog.cpp	2011-06-26 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filter_conditions_dialog.cpp	2013-01-14 04:30:08.000000000 +0000
@@ -35,6 +35,7 @@
 	pCondition = 0;
 	pValue = 0;
 	pSet = 0;
+	pLabel = 0;
 	pRemove = 0;
 }
 
@@ -44,12 +45,14 @@
 	delete pCondition;
 	delete pValue;
 	delete pSet;
+	delete pLabel;
 	delete pRemove;
 
 	pType = 0;
 	pCondition = 0;
 	pValue = 0;
 	pSet = 0;
+	pLabel = 0;
 	pRemove = 0;
 }
 
@@ -170,14 +173,18 @@
 
 	wxChoice *pStringCondition = new wxChoice(m_pListCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, stringConditionTypes);
 	wxChoice *pSizeCondition = new wxChoice(m_pListCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, sizeConditionTypes);
+	wxStaticText *pSizeLabel = new wxStaticText(m_pListCtrl, wxID_ANY, _("bytes"));
 	wxChoice *pDateCondition = new wxChoice(m_pListCtrl, wxID_ANY, wxDefaultPosition, wxDefaultSize, dateConditionTypes);
 
-	int w = wxMax(pStringCondition->GetBestSize().GetWidth(), pSizeCondition->GetBestSize().GetWidth());
+	int w = wxMax(pStringCondition->GetBestSize().GetWidth(), pSizeCondition->GetBestSize().GetWidth() + 5 + pSizeLabel->GetBestSize().GetWidth());
 	w = wxMax(w, pDateCondition->GetBestSize().GetWidth());
 	requiredWidth += w;
 
+	m_size_label_size = pSizeLabel->GetBestSize();
+
 	pStringCondition->Destroy();
 	pSizeCondition->Destroy();
+	pSizeLabel->Destroy();
 	pDateCondition->Destroy();
 
 	requiredWidth += m_pListCtrl->GetWindowBorderSize().x;
@@ -235,7 +242,7 @@
 	std::set<int> selected;
 	selected.insert(item);
 	OnRemove(selected);
-	if (!m_filterControls.size())
+	if (m_filterControls.empty())
 		OnMore();
 }
 
@@ -282,6 +289,12 @@
 				pos.y -= delta_y;
 				controls.pSet->SetPosition(pos);
 			}
+			if (controls.pLabel)
+			{
+				pos = controls.pLabel->GetPosition();
+				pos.y -= delta_y;
+				controls.pLabel->SetPosition(pos);
+			}
 
 			pos = controls.pRemove->GetPosition();
 			pos.y -= delta_y;
@@ -416,12 +429,33 @@
 		controls.pRemove->SetPosition(wxPoint(client_size.GetWidth() - 5 - m_button_size.x, posy));
 
 	posx = 15 + typeRect.GetWidth() + conditionsRect.GetWidth();
-	const int maxwidth = client_size.GetWidth() - posx - 10 - m_button_size.x;
+	int maxwidth = client_size.GetWidth() - posx - 10 - m_button_size.x;
 	if (condition.type == filter_name || condition.type == filter_size || condition.type == filter_path || condition.type == filter_date)
 	{
 		delete controls.pSet;
 		controls.pSet = 0;
 
+		if (condition.type == filter_size)
+		{
+			// Label needs to be aligned
+			int size_posy = posy;
+			if (conditionsRect.GetHeight() > m_size_label_size.GetHeight())
+				size_posy += (conditionsRect.GetHeight() - m_size_label_size.GetHeight()) / 2;
+			maxwidth -= m_size_label_size.GetWidth() + 5;
+			if (!controls.pLabel)
+				controls.pLabel = new wxStaticText(m_pListCtrl, wxID_ANY, _("bytes"), wxPoint(posx + maxwidth + 5, size_posy), m_size_label_size);
+			else
+			{
+				controls.pLabel->SetPosition(wxPoint(posx + maxwidth + 5, size_posy));
+				controls.pLabel->SetSize(m_size_label_size);
+			}
+		}
+		else
+		{
+			delete controls.pLabel;
+			controls.pLabel = 0;
+		}
+
 		pos = wxPoint(posx, posy);
 		wxSize size(maxwidth, -1);
 
@@ -497,6 +531,13 @@
 		wxPoint pos = controls.pRemove->GetPosition();
 		pos.x += deltaX;
 		controls.pRemove->SetPosition(pos);
+
+		if (controls.pLabel)
+		{
+			wxPoint pos = controls.pLabel->GetPosition();
+			pos.x += deltaX;
+			controls.pLabel->SetPosition(pos);
+		}
 	}
 
 	// Move add button
@@ -515,7 +556,7 @@
 	// Create new controls
 	m_currentFilter = filter;
 
-	if (!m_currentFilter.filters.size())
+	if (m_currentFilter.filters.empty())
 		m_currentFilter.filters.push_back(CFilterCondition());
 
 	for (unsigned int i = 0; i < m_currentFilter.filters.size(); i++)
@@ -603,7 +644,7 @@
 
 		filter.filters.push_back(condition);
 	}
-	
+
 	switch (XRCCTRL(*this, "ID_MATCHTYPE", wxChoice)->GetSelection())
 	{
 	case 1:
@@ -782,7 +823,7 @@
 	{
 		if (source == m_pAdd)
 		{
-			if (m_filterControls.size())
+			if (!m_filterControls.empty())
 				target = m_filterControls[m_filterControls.size() - 1].pRemove;
 		}
 		else
diff -Nru filezilla-3.5.3/src/interface/filter_conditions_dialog.h filezilla-3.7.3~precise/src/interface/filter_conditions_dialog.h
--- filezilla-3.5.3/src/interface/filter_conditions_dialog.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filter_conditions_dialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -9,13 +9,14 @@
 {
 public:
 	CFilterControls();
-	
+
 	void Reset();
 
 	wxChoice* pType;
 	wxChoice* pCondition;
 	wxTextCtrl* pValue;
 	wxChoice* pSet;
+	wxStaticText* pLabel;
 	wxButton* pRemove;
 };
 
@@ -61,6 +62,7 @@
 
 	wxButton* m_pAdd;
 	wxSize m_button_size;
+	wxSize m_size_label_size;
 
 	void OnMore();
 	void OnRemove(int item);
@@ -68,7 +70,7 @@
 
 	void OnListSize(wxSizeEvent& event);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnButton(wxCommandEvent& event);
 	void OnFilterTypeChange(wxCommandEvent& event);
 	void OnConditionSelectionChange(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/filteredit.cpp filezilla-3.7.3~precise/src/interface/filteredit.cpp
--- filezilla-3.5.3/src/interface/filteredit.cpp	2011-08-30 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filteredit.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -12,11 +12,13 @@
 EVT_BUTTON(XRCID("ID_RENAME"), CFilterEditDialog::OnRename)
 EVT_BUTTON(XRCID("ID_COPY"), CFilterEditDialog::OnCopy)
 EVT_LISTBOX(XRCID("ID_FILTERS"), CFilterEditDialog::OnFilterSelect)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CFilterEditDialog::CFilterEditDialog()
+	: m_pFilterListCtrl(0)
+	, m_currentSelection(-1)
+	, m_pWindowStateManager(0)
 {
-	m_pWindowStateManager = 0;
 }
 
 CFilterEditDialog::~CFilterEditDialog()
@@ -58,7 +60,7 @@
 bool CFilterEditDialog::Create(wxWindow* parent, const std::vector<CFilter>& filters, const std::vector<CFilterSet>& filterSets)
 {
 	bool has_foreign_type = false;
-	for (std::vector<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); iter++)
+	for (std::vector<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); ++iter)
 	{
 		const CFilter& filter = *iter;
 		if (!filter.HasConditionOfType(filter_foreign))
@@ -76,7 +78,7 @@
 		conditions |= filter_foreign;
 	if (!CreateListControl(conditions))
 		return false;
-	
+
 	m_pFilterListCtrl = XRCCTRL(*this, "ID_FILTERS", wxListBox);
 	if (!m_pFilterListCtrl)
 		return false;
@@ -84,7 +86,7 @@
 
 	m_filters = filters;
 	m_filterSets = filterSets;
-	for (std::vector<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); iter++)
+	for (std::vector<CFilter>::const_iterator iter = filters.begin(); iter != filters.end(); ++iter)
 		m_pFilterListCtrl->Append(iter->name);
 
 	m_pWindowStateManager = new CWindowStateManager(this);
@@ -153,7 +155,7 @@
 
 	m_filters.push_back(filter);
 
-	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); iter++)
+	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); ++iter)
 	{
 		CFilterSet& set = *iter;
 		set.local.push_back(false);
@@ -177,7 +179,7 @@
 	m_filters.erase(m_filters.begin() + item);
 
 	// Remote filter from all filter sets
-	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); iter++)
+	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); ++iter)
 	{
 		CFilterSet& set = *iter;
 		set.local.erase(set.local.begin() + item);
@@ -259,7 +261,7 @@
 
 	m_filters.push_back(filter);
 
-	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); iter++)
+	for (std::vector<CFilterSet>::iterator iter = m_filterSets.begin(); iter != m_filterSets.end(); ++iter)
 	{
 		CFilterSet& set = *iter;
 		set.local.push_back(false);
diff -Nru filezilla-3.5.3/src/interface/filteredit.h filezilla-3.7.3~precise/src/interface/filteredit.h
--- filezilla-3.5.3/src/interface/filteredit.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/filteredit.h	2013-06-09 03:30:06.000000000 +0000
@@ -21,7 +21,7 @@
 
 protected:
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnOK(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 	void OnNew(wxCommandEvent& event);
@@ -29,7 +29,7 @@
 	void OnRename(wxCommandEvent& event);
 	void OnCopy(wxCommandEvent& event);
 	void OnFilterSelect(wxCommandEvent& event);
-		
+
 	void ShowFilter(const CFilter& filter);
 	void SaveFilter(CFilter& filter);
 
diff -Nru filezilla-3.5.3/src/interface/import.cpp filezilla-3.7.3~precise/src/interface/import.cpp
--- filezilla-3.5.3/src/interface/import.cpp	2010-07-19 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/import.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -12,8 +12,8 @@
 
 void CImportDialog::Show()
 {
-	wxFileDialog dlg(m_parent, _("Select file to import settings from"), _T(""), 
-					_T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"), 
+	wxFileDialog dlg(m_parent, _("Select file to import settings from"), _T(""),
+					_T("FileZilla.xml"), _T("XML files (*.xml)|*.xml"),
 					wxFD_OPEN | wxFD_FILE_MUST_EXIST);
 	dlg.CenterOnParent();
 
@@ -80,7 +80,7 @@
 				COptions::Get()->Import(fz3Root->FirstChildElement("Settings"));
 				wxMessageBox(_("The settings have been imported. You have to restart FileZilla for all settings to have effect."), _("Import successful"), wxOK, this);
 			}
-			
+
 			wxMessageBox(_("The selected categories have been imported."), _("Import successful"), wxOK, this);
 
 			delete xmlDocument;
@@ -94,7 +94,7 @@
 		{
 			int res = wxMessageBox(_("The file you have selected contains site manager data from a previous version of FileZilla.\nDue to differences in the storage format, only host, port, username and password will be imported.\nContinue with the import?"),
 				_("Import data from older version"), wxICON_QUESTION | wxYES_NO);
-			
+
 			if (res == wxYES)
 				ImportLegacySites(fz2Root->FirstChildElement("Sites"));
 
@@ -169,7 +169,7 @@
 		{
 			newName = wxString::Format(_T("%s %d"), name.c_str(), i++);
 		}
-		
+
 		ImportLegacySites(pImportFolder, pFolder);
 	}
 
@@ -340,7 +340,7 @@
 		{
 			newName = wxString::Format(_T("%s %d"), name.c_str(), i++);
 		}
-		
+
 		ImportSites(pImportFolder, pFolder);
 	}
 
diff -Nru filezilla-3.5.3/src/interface/inputdialog.cpp filezilla-3.7.3~precise/src/interface/inputdialog.cpp
--- filezilla-3.5.3/src/interface/inputdialog.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/inputdialog.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -6,7 +6,13 @@
 EVT_TEXT(XRCID("ID_STRING_PW"), CInputDialog::OnValueChanged)
 EVT_BUTTON(XRCID("wxID_OK"), CInputDialog::OnOK)
 EVT_BUTTON(XRCID("wxID_CANCEL"), CInputDialog::OnCancel)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
+
+CInputDialog::CInputDialog()
+	: m_allowEmpty()
+	, m_pTextCtrl()
+{
+}
 
 bool CInputDialog::Create(wxWindow* parent, const wxString& title, wxString text)
 {
diff -Nru filezilla-3.5.3/src/interface/inputdialog.h filezilla-3.7.3~precise/src/interface/inputdialog.h
--- filezilla-3.5.3/src/interface/inputdialog.h	2008-02-25 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/inputdialog.h	2013-06-09 03:30:06.000000000 +0000
@@ -6,8 +6,8 @@
 class CInputDialog : public wxDialogEx
 {
 public:
-	CInputDialog() {}
-	virtual ~CInputDialog() { }
+	CInputDialog();
+	virtual ~CInputDialog() {}
 
 	bool Create(wxWindow* parent, const wxString& title, wxString text);
 
@@ -20,13 +20,12 @@
 	bool SelectText(int start, int end);
 
 protected:
-	bool m_allowEmpty;
-
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnValueChanged(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
 	void OnCancel(wxCommandEvent& event);
 
+	bool m_allowEmpty;
 	wxTextCtrl* m_pTextCtrl;
 };
 
diff -Nru filezilla-3.5.3/src/interface/ipcmutex.cpp filezilla-3.7.3~precise/src/interface/ipcmutex.cpp
--- filezilla-3.5.3/src/interface/ipcmutex.cpp	2010-07-23 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/ipcmutex.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -62,7 +62,7 @@
 		f.l_start = m_type;
 		f.l_len = 1;
 		f.l_pid = getpid();
-		
+
 		while (fcntl(m_fd, F_SETLKW, &f) == -1)
 		{
 			if (errno == EINTR) // Interrupted by signal, retry
@@ -155,12 +155,12 @@
 	m_type = mutexType;
 
 	std::list<t_data>::iterator iter;
-	for (iter = m_mutexes.begin(); iter != m_mutexes.end(); iter++)
+	for (iter = m_mutexes.begin(); iter != m_mutexes.end(); ++iter)
 	{
 		if (iter->pMutex->GetType() == mutexType)
 			break;
 	}
-	
+
 	if (iter != m_mutexes.end())
 	{
 		iter->lockCount++;
@@ -177,12 +177,12 @@
 CReentrantInterProcessMutexLocker::~CReentrantInterProcessMutexLocker()
 {
 	std::list<t_data>::iterator iter;
-	for (iter = m_mutexes.begin(); iter != m_mutexes.end(); iter++)
+	for (iter = m_mutexes.begin(); iter != m_mutexes.end(); ++iter)
 	{
 		if (iter->pMutex->GetType() == m_type)
 			break;
 	}
-	
+
 	wxASSERT(iter != m_mutexes.end());
 	if (iter == m_mutexes.end())
 		return;
diff -Nru filezilla-3.5.3/src/interface/ipcmutex.h filezilla-3.7.3~precise/src/interface/ipcmutex.h
--- filezilla-3.5.3/src/interface/ipcmutex.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/ipcmutex.h	2012-10-06 03:30:11.000000000 +0000
@@ -1,7 +1,7 @@
 #ifndef __IPCMUTEX_H__
 #define __IPCMUTEX_H__
 
-/* 
+/*
  * Unfortunately wxWidgets does not provide interprocess mutexes, so I've to
  * use platform specific code here.
  * CInterProcessMutex represents an interprocess mutex. The mutex will be
@@ -13,7 +13,7 @@
 enum t_ipcMutexType
 {
 	// Important: Never ever change a value.
-	// If adding a new mutex type, give it the value of MUTEX_LASTFREE and 
+	// If adding a new mutex type, give it the value of MUTEX_LASTFREE and
 	// increase MUTEX_LASTFREE by one.
 	// Otherwise this will cause interesting effects between different
 	// versions of FileZilla
@@ -27,7 +27,7 @@
 	MUTEX_TRUSTEDCERTS = 8,
 	MUTEX_GLOBALBOOKMARKS = 9,
 	MUTEX_SEARCHCONDITIONS = 10,
-	
+
 	MUTEX_LASTFREE = 11
 };
 
diff -Nru filezilla-3.5.3/src/interface/led.cpp filezilla-3.7.3~precise/src/interface/led.cpp
--- filezilla-3.5.3/src/interface/led.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/led.cpp	2012-12-03 04:30:05.000000000 +0000
@@ -6,9 +6,12 @@
 #define new DEBUG_NEW
 #endif
 
+DEFINE_EVENT_TYPE(fzEVT_UPDATE_LED_TOOLTIP)
+
 BEGIN_EVENT_TABLE(CLed, wxWindow)
 	EVT_PAINT(CLed::OnPaint)
 	EVT_TIMER(wxID_ANY, CLed::OnTimer)
+	EVT_ENTER_WINDOW(CLed::OnEnterWindow)
 #ifdef __WXMSW__
 	EVT_ERASE_BACKGROUND(CLed::OnEraseBackground)
 #endif
@@ -90,8 +93,13 @@
 		Unset();
 		m_timer.Stop();
 	}
+}
 
-	return;
+void CLed::OnEnterWindow(wxMouseEvent& event)
+{
+	wxCommandEvent requestUpdateEvent(fzEVT_UPDATE_LED_TOOLTIP, GetId());
+	requestUpdateEvent.SetEventObject(this);
+	GetEventHandler()->ProcessEvent(requestUpdateEvent);
 }
 
 void CLed::Ping()
@@ -101,7 +109,7 @@
 
 	if (m_timer.IsRunning())
 		return;
-	
+
 	Set();
 	m_timer.Start(100);
 }
diff -Nru filezilla-3.5.3/src/interface/led.h filezilla-3.7.3~precise/src/interface/led.h
--- filezilla-3.5.3/src/interface/led.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/led.h	2012-12-03 04:30:05.000000000 +0000
@@ -1,7 +1,10 @@
 #ifndef __LED_H__
 #define __LED_H__
 
-class CFileZillaEngine;
+#include "wx/event.h"
+
+DECLARE_EVENT_TYPE(fzEVT_UPDATE_LED_TOOLTIP, -1)
+
 class CLed : public wxWindow
 {
 public:
@@ -25,6 +28,7 @@
 	DECLARE_EVENT_TABLE()
 	void OnPaint(wxPaintEvent& event);
 	void OnTimer(wxTimerEvent& event);
+	void OnEnterWindow(wxMouseEvent& event);
 #ifdef __WXMSW__
 	void OnEraseBackground(wxEraseEvent& event);
 #endif
diff -Nru filezilla-3.5.3/src/interface/listctrlex.cpp filezilla-3.7.3~precise/src/interface/listctrlex.cpp
--- filezilla-3.5.3/src/interface/listctrlex.cpp	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/listctrlex.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -9,10 +9,10 @@
 #include "commctrl.h"
 
 #ifndef HDF_SORTUP
-#define HDF_SORTUP              0x0400
+#define HDF_SORTUP				0x0400
 #endif
 #ifndef HDF_SORTDOWN
-#define HDF_SORTDOWN            0x0200
+#define HDF_SORTDOWN			0x0200
 #endif
 #else
 #include "themeprovider.h"
@@ -71,7 +71,7 @@
 }
 
 #ifndef __WXMSW__
-wxScrolledWindow* wxListCtrlEx::GetMainWindow()
+wxScrolledWindow* wxListCtrlEx::GetMainWindow() const
 {
 #ifdef __WXMAC__
 	return (wxScrolledWindow*)m_genericImpl->m_mainWin;
@@ -303,7 +303,7 @@
 		event.Skip();
 		return;
 	}
-	
+
 	key = buffer[0];
 
 	if (key < 32)
@@ -626,11 +626,11 @@
 			info.order++;
 	}
 
-	int icon = -1;
-
 	t_columnInfo& info = m_columnInfo[col];
+
 	if (info.shown)
 	{
+		int icon = -1;
 		// Remove old column
 		for (unsigned int i = 0; i < (unsigned int)GetColumnCount(); i++)
 		{
@@ -1112,7 +1112,7 @@
 	NMHDR *nmhdr = (NMHDR *)lParam;
 	HWND hwndHdr = ListView_GetHeader((HWND)GetHandle());
 
-    if (nmhdr->hwndFrom != hwndHdr)
+	if (nmhdr->hwndFrom != hwndHdr)
 		return wxListCtrl::MSWOnNotify(idCtrl, lParam, result);
 
 	HD_NOTIFY *nmHDR = (HD_NOTIFY *)nmhdr;
@@ -1143,7 +1143,7 @@
 				return false;
 			}
 		}
-		else 
+		else
 			return false;
 	}
 
@@ -1160,3 +1160,163 @@
 	return GetNextItem(-1, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED) != -1;
 #endif
 }
+
+
+wxRect wxListCtrlEx::GetListRect() const
+{
+#ifdef __WXMSW__
+	wxRect windowRect = GetClientRect();
+	{
+		wxRect topRect;
+		if (GetItemRect(0, topRect))
+		{
+			windowRect.height -= topRect.y;
+			windowRect.y += topRect.y;
+		}
+	}
+#else
+	wxRect windowRect = GetMainWindow()->GetClientRect();
+#endif
+
+	return windowRect;
+}
+
+
+CListCtrlDropTarget::CListCtrlDropTarget(wxListCtrlEx* pListCtrl)
+	: m_pListCtrl(pListCtrl)
+	, m_count()
+{
+	m_timer.SetOwner(this);
+}
+
+
+bool CListCtrlDropTarget::OnDrop(wxCoord x, wxCoord y)
+{
+	m_timer.Stop();
+	return true;
+}
+
+
+wxDragResult CListCtrlDropTarget::OnDragOver(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (!m_timer.IsRunning() && IsScroll(wxPoint(x, y)))
+	{
+		m_timer.Start(100, true);
+		m_count = 0;
+	}
+	return def;
+}
+
+
+
+void CListCtrlDropTarget::OnLeave()
+{
+	m_timer.Stop();
+}
+
+
+wxDragResult CListCtrlDropTarget::OnEnter(wxCoord x, wxCoord y, wxDragResult def)
+{
+	if (!m_timer.IsRunning() && IsScroll(wxPoint(x, y)))
+	{
+		m_timer.Start(100, true);
+		m_count = 0;
+	}
+	return def;
+}
+
+
+bool CListCtrlDropTarget::IsScroll(wxPoint p) const
+{
+	return IsTopScroll(p) || IsBottomScroll(p);
+}
+
+
+bool CListCtrlDropTarget::IsTopScroll(wxPoint p) const
+{
+	wxRect itemRect;
+	if (!m_pListCtrl->GetItemRect(m_pListCtrl->GetTopItem(), itemRect))
+		return false;
+
+	wxRect windowRect = m_pListCtrl->GetListRect();
+
+	if (itemRect.GetHeight() > windowRect.GetHeight() / 4 ) {
+		itemRect.SetHeight( wxMax( windowRect.GetHeight() / 4, 8 ) );
+	}
+
+	if (p.y < 0 || p.y >= itemRect.GetBottom())
+		return false;
+
+	if (p.x < 0 || p.x > windowRect.GetWidth())
+		return false;
+
+	int top = m_pListCtrl->GetTopItem();
+	if( top <= 0 ) {
+		return false;
+	}
+
+	return true;
+}
+
+
+bool CListCtrlDropTarget::IsBottomScroll(wxPoint p) const
+{
+	wxRect itemRect;
+	if (!m_pListCtrl->GetItemRect(0, itemRect))
+		return false;
+
+	wxRect windowRect = m_pListCtrl->GetListRect();
+	if (itemRect.GetHeight() > windowRect.GetHeight() / 4 ) {
+		itemRect.SetHeight( wxMax( windowRect.GetHeight() / 4, 8 ) );
+	}
+
+	if (p.y > windowRect.GetBottom() || p.y < windowRect.GetBottom() - itemRect.GetHeight())
+		return false;
+
+	if (p.x < 0 || p.x > windowRect.GetWidth())
+		return false;
+
+	int bottom = m_pListCtrl->GetTopItem() + m_pListCtrl->GetCountPerPage();
+	if (bottom >= m_pListCtrl->GetItemCount())
+		return false;
+
+	return true;
+}
+
+
+void CListCtrlDropTarget::OnTimer(wxTimerEvent& /*event*/)
+{
+	wxPoint p = wxGetMousePosition();
+#ifdef __WXMSW__
+	wxWindow* ctrl = m_pListCtrl;
+#else
+	wxWindow* ctrl = m_pListCtrl->GetMainWindow();
+#endif
+	p = ctrl->ScreenToClient(p);
+
+	if (IsTopScroll(p))
+	{
+		int top = m_pListCtrl->GetTopItem();
+		m_pListCtrl->EnsureVisible(top - 1);
+	}
+	else if (IsBottomScroll(p))
+	{
+		int top = m_pListCtrl->GetTopItem();
+		m_pListCtrl->EnsureVisible(top + m_pListCtrl->GetCountPerPage());
+	}
+	else
+	{
+		m_timer.Stop();
+		return;
+	}
+
+	DisplayDropHighlight(p);
+
+	if (m_count < 90)
+		++m_count;
+	m_timer.Start(100 - m_count, true);
+}
+
+BEGIN_EVENT_TABLE(CListCtrlDropTarget, wxEvtHandler)
+EVT_TIMER(wxID_ANY, CListCtrlDropTarget::OnTimer)
+END_EVENT_TABLE()
diff -Nru filezilla-3.5.3/src/interface/listctrlex.h filezilla-3.7.3~precise/src/interface/listctrlex.h
--- filezilla-3.5.3/src/interface/listctrlex.h	2010-09-27 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/listctrlex.h	2013-06-09 03:30:06.000000000 +0000
@@ -2,6 +2,7 @@
 #define __LISTCTRLEX_H__
 
 #include "systemimagelist.h"
+#include <wx/dnd.h>
 
 class wxListCtrlEx : public wxListCtrl, public CSystemImageList
 {
@@ -21,7 +22,7 @@
 	void EnablePrefixSearch(bool enable) { m_prefixSearch_enabled = enable; }
 
 	// Reducing item count does not reset the focused item
- 	// if using the generic list control. Work around it.
+	// if using the generic list control. Work around it.
 	void SaveSetItemCount(long count);
 
 	void ShowColumnEditor();
@@ -31,10 +32,10 @@
 	// Moves column. Target position includes both hidden
 	// as well as shown columns
 	void MoveColumn(unsigned int col, unsigned int before);
-	
+
 	// Do not call after calling LoadColumnSettings
 	void AddColumn(const wxString& name, int align, int initialWidth, bool fixed = false);
-	
+
 	// LoadColumnSettings needs to be called exactly once after adding
 	// all columns
 	void LoadColumnSettings(int widthsOptionId, int visibilityOptionId, int sortOptionId);
@@ -49,11 +50,14 @@
 	void SetLabelEditBlock(bool block);
 
 #ifndef __WXMSW__
-	wxScrolledWindow* GetMainWindow();
+	wxScrolledWindow* GetMainWindow() const;
 #endif
 
 	bool HasSelection() const;
 
+	// Returns the true rect of the area containing the actual list items
+	wxRect GetListRect() const;
+
 protected:
 	virtual void OnPostScroll();
 	virtual void OnPreEmitPostScrollEvent();
@@ -84,7 +88,7 @@
 	void HandlePrefixSearch(wxChar character);
 	int FindItemWithPrefix(const wxString& searchPrefix, int start);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnPostScrollEvent(wxCommandEvent& event);
 	void OnScrollEvent(wxScrollWinEvent& event);
 	void OnMouseWheel(wxMouseEvent& event);
@@ -138,4 +142,35 @@
 	wxListCtrlEx& m_listCtrl;
 };
 
+class CListCtrlDropTarget : public wxEvtHandler, public wxDropTarget
+{
+public:
+	CListCtrlDropTarget(wxListCtrlEx* pListCtrl);
+
+	virtual bool OnDrop(wxCoord x, wxCoord y);
+
+	virtual wxDragResult OnDragOver(wxCoord x, wxCoord y, wxDragResult def);
+
+	virtual void OnLeave();
+
+	virtual wxDragResult OnEnter(wxCoord x, wxCoord y, wxDragResult def);
+
+	virtual void DisplayDropHighlight(wxPoint) = 0;
+
+protected:
+	bool IsScroll(wxPoint p) const;
+	bool IsTopScroll(wxPoint p) const;
+	bool IsBottomScroll(wxPoint p) const;
+
+	void OnTimer(wxTimerEvent& /*event*/);
+
+protected:
+	wxListCtrlEx *m_pListCtrl;
+
+	wxTimer m_timer;
+	int m_count;
+
+	DECLARE_EVENT_TABLE()
+};
+
 #endif //__LISTCTRLEX_H__
diff -Nru filezilla-3.5.3/src/interface/listingcomparison.cpp filezilla-3.7.3~precise/src/interface/listingcomparison.cpp
--- filezilla-3.5.3/src/interface/listingcomparison.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/listingcomparison.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -169,7 +169,7 @@
 						localFlag = CComparableListing::normal;
 						remoteFlag = CComparableListing::newer;
 					}
-					else 
+					else
 					{
 						localFlag = CComparableListing::newer;
 						remoteFlag = CComparableListing::normal;
diff -Nru filezilla-3.5.3/src/interface/listingcomparison.h filezilla-3.7.3~precise/src/interface/listingcomparison.h
--- filezilla-3.5.3/src/interface/listingcomparison.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/listingcomparison.h	2012-10-06 03:30:11.000000000 +0000
@@ -25,7 +25,7 @@
 	virtual void FinishComparison() = 0;
 	virtual void ScrollTopItem(int item) = 0;
 	virtual void OnExitComparisonMode() = 0;
-	
+
 	void RefreshComparison();
 	void ExitComparisonMode();
 
diff -Nru filezilla-3.5.3/src/interface/locale_initializer.cpp filezilla-3.7.3~precise/src/interface/locale_initializer.cpp
--- filezilla-3.5.3/src/interface/locale_initializer.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/locale_initializer.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -33,7 +33,7 @@
 	{ "en", "en_US" },
 	{ "en_US", "en_GB" },
 	{ "en_GB", "C" },
-	
+
 	// Base names
 	{ "ar", "ar_EG" },
 	{ "ca", "ca_ES" },
diff -Nru filezilla-3.5.3/src/interface/loginmanager.cpp filezilla-3.7.3~precise/src/interface/loginmanager.cpp
--- filezilla-3.5.3/src/interface/loginmanager.cpp	2011-05-08 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/loginmanager.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -12,7 +12,7 @@
 	if (server.GetLogonType() == ASK)
 	{
 		std::list<t_passwordcache>::const_iterator iter;
-		for (iter = m_passwordCache.begin(); iter != m_passwordCache.end(); iter++)
+		for (iter = m_passwordCache.begin(); iter != m_passwordCache.end(); ++iter)
 		{
 			if (iter->host != server.GetHost())
 				continue;
@@ -20,7 +20,7 @@
 				continue;
 			if (iter->user != server.GetUser())
 				continue;
-	
+
 			server.SetUser(server.GetUser(), iter->password);
 			return true;
 		}
@@ -128,8 +128,8 @@
 {
 	if (server.GetLogonType() != ASK)
 		return;
-	
-	for (std::list<t_passwordcache>::iterator iter = m_passwordCache.begin(); iter != m_passwordCache.end(); iter++)
+
+	for (std::list<t_passwordcache>::iterator iter = m_passwordCache.begin(); iter != m_passwordCache.end(); ++iter)
 	{
 		if (iter->host != server.GetHost())
 			continue;
@@ -137,7 +137,7 @@
 			continue;
 		if (iter->user != server.GetUser())
 			continue;
-	
+
 		m_passwordCache.erase(iter);
 		return;
 	}
diff -Nru filezilla-3.5.3/src/interface/loginmanager.h filezilla-3.7.3~precise/src/interface/loginmanager.h
--- filezilla-3.5.3/src/interface/loginmanager.h	2007-11-23 11:33:57.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/loginmanager.h	2012-10-06 03:30:11.000000000 +0000
@@ -12,7 +12,7 @@
 	static CLoginManager& Get() { return m_theLoginManager; }
 
 	bool GetPassword(CServer& server, bool silent, wxString name = _T(""), wxString challenge = _T(""));
-	
+
 	void CachedPasswordFailed(const CServer& server);
 
 protected:
diff -Nru filezilla-3.5.3/src/interface/manual_transfer.cpp filezilla-3.7.3~precise/src/interface/manual_transfer.cpp
--- filezilla-3.5.3/src/interface/manual_transfer.cpp	2011-04-27 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/manual_transfer.cpp	2013-05-01 03:30:04.000000000 +0000
@@ -352,7 +352,7 @@
 	}
 
 	int old_data_type = COptions::Get()->GetOptionVal(OPTION_ASCIIBINARY);
-	
+
 	// Set data type for the file to add
 	if (XRCCTRL(*this, "ID_TYPE_ASCII", wxRadioButton)->GetValue())
 		COptions::Get()->SetOption(OPTION_ASCIIBINARY, 1);
@@ -450,8 +450,17 @@
 		(logon_type == ACCOUNT || logon_type == NORMAL))
 	{
 		XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetFocus();
-		wxMessageBox(_("FileZilla is running in kiosk mode.\n'Normal' and 'Account' logontypes are not available in this mode."));
-		return false;
+		wxString msg;
+		if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE))
+			msg = _("Saving of password has been disabled by your system administrator.");
+		else
+			msg = _("Saving of passwords has been disabled by you.");
+		msg += _T("\n");
+		msg += _("'Normal' and 'Account' logontypes are not available, using 'Ask for password' instead.");
+		XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(CServer::GetNameFromLogonType(ASK));
+		XRCCTRL(*this, "ID_PASS", wxTextCtrl)->SetValue(_T(""));
+		logon_type = ASK;
+		wxMessageBox(msg, _("Cannot remember password"), wxICON_INFORMATION, this);
 	}
 
 	CServer server;
diff -Nru filezilla-3.5.3/src/interface/menu_bar.cpp filezilla-3.7.3~precise/src/interface/menu_bar.cpp
--- filezilla-3.5.3/src/interface/menu_bar.cpp	2011-08-15 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/menu_bar.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -23,9 +23,9 @@
 
 CMenuBar::~CMenuBar()
 {
-	for (std::map<wxMenu*, std::map<int, wxMenuItem*> >::iterator menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); menu_iter++)
+	for (std::map<wxMenu*, std::map<int, wxMenuItem*> >::iterator menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); ++menu_iter)
 	{
-		for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); iter++)
+		for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter)
 			delete iter->second;
 	}
 
@@ -40,7 +40,7 @@
 
 	menubar->m_pMainFrame = pMainFrame;
 
-	
+
 #if FZ_MANUALUPDATECHECK
 	if (COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK))
 #endif
@@ -145,13 +145,13 @@
 		return;
 
 	// Delete old bookmarks
-	for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); iter++)
+	for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_global.begin(); iter != m_bookmark_menu_id_map_global.end(); ++iter)
 	{
 		pMenu->Delete(iter->first);
 	}
 	m_bookmark_menu_id_map_global.clear();
 
-	for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); iter++)
+	for (std::map<int, wxString>::const_iterator iter = m_bookmark_menu_id_map_site.begin(); iter != m_bookmark_menu_id_map_site.end(); ++iter)
 	{
 		pMenu->Delete(iter->first);
 	}
@@ -173,7 +173,7 @@
 	{
 		pMenu->AppendSeparator();
 
-		for (std::list<wxString>::const_iterator iter = global_bookmarks.begin(); iter != global_bookmarks.end(); iter++)
+		for (std::list<wxString>::const_iterator iter = global_bookmarks.begin(); iter != global_bookmarks.end(); ++iter)
 		{
 			int id;
 			if (ids == m_bookmark_menu_ids.end())
@@ -184,7 +184,7 @@
 			else
 			{
 				id = *ids;
-				ids++;
+				++ids;
 			}
 			wxString name(*iter);
 			name.Replace(_T("&"), _T("&&"));
@@ -205,7 +205,7 @@
 
 	pMenu->AppendSeparator();
 
-	for (std::list<wxString>::const_iterator iter = controls->site_bookmarks->bookmarks.begin(); iter != controls->site_bookmarks->bookmarks.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = controls->site_bookmarks->bookmarks.begin(); iter != controls->site_bookmarks->bookmarks.end(); ++iter)
 	{
 		int id;
 		if (ids == m_bookmark_menu_ids.end())
@@ -216,7 +216,7 @@
 		else
 		{
 			id = *ids;
-			ids++;
+			++ids;
 		}
 		wxString name(*iter);
 		name.Replace(_T("&"), _T("&&"));
@@ -486,11 +486,11 @@
 
 bool CMenuBar::ShowItem(int id)
 {
-	for (std::map<wxMenu*, std::map<int, wxMenuItem*> >::iterator menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); menu_iter++)
+	for (std::map<wxMenu*, std::map<int, wxMenuItem*> >::iterator menu_iter = m_hidden_items.begin(); menu_iter != m_hidden_items.end(); ++menu_iter)
 	{
 		int offset = 0;
 
-		for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); iter++)
+		for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter)
 		{
 			if (iter->second->GetId() != id)
 			{
@@ -525,14 +525,14 @@
 
 	std::map<wxMenu*, std::map<int, wxMenuItem*> >::iterator menu_iter = m_hidden_items.insert(std::make_pair(pMenu, std::map<int, wxMenuItem*>())).first;
 
-	for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); iter++)
+	for (std::map<int, wxMenuItem*>::iterator iter = menu_iter->second.begin(); iter != menu_iter->second.end(); ++iter)
 	{
 		if (iter->first > (int)pos)
 			break;
-		
+
 		pos++;
 	}
-	
+
 	menu_iter->second[(int)pos] = pItem;
 
 	return true;
diff -Nru filezilla-3.5.3/src/interface/menu_bar.h filezilla-3.7.3~precise/src/interface/menu_bar.h
--- filezilla-3.5.3/src/interface/menu_bar.h	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/menu_bar.h	2013-06-09 03:30:06.000000000 +0000
@@ -30,9 +30,9 @@
 	virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2);
 	virtual void OnOptionChanged(int option);
 
-	DECLARE_DYNAMIC_CLASS(CMenuBar);
+	DECLARE_DYNAMIC_CLASS(CMenuBar)
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnMenuEvent(wxCommandEvent& event);
 
 	std::map<wxMenu*, std::map<int, wxMenuItem*> > m_hidden_items;
diff -Nru filezilla-3.5.3/src/interface/netconfwizard.cpp filezilla-3.7.3~precise/src/interface/netconfwizard.cpp
--- filezilla-3.5.3/src/interface/netconfwizard.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/netconfwizard.cpp	2012-11-10 18:36:36.000000000 +0000
@@ -356,7 +356,7 @@
 		}
 		if (m_recvBuffer[i] != '\r')
 			continue;
-		
+
 		if (m_recvBuffer[i + 1] != '\n')
 		{
 			m_testResult = servererror;
@@ -524,7 +524,7 @@
 		}
 		break;
 	}
-	
+
 	m_state++;
 
 	SendNextCommand();
@@ -766,6 +766,12 @@
 			wxString ip = GetExternalIPAddress();
 			if (ip == _T(""))
 				return;
+			if (!GetIPV6LongForm(ip).IsEmpty())
+			{
+				PrintMessage(_("You appear to be using an IPv6-only host. This wizard does not support this environment."), 1);
+				CloseSocket();
+				return;
+			}
 			m_externalIP = ip;
 
 			wxString hexIP = ip;
@@ -862,7 +868,7 @@
 	long tmp;
 	XRCCTRL(*this, "ID_ACTIVE_PORTMIN", wxTextCtrl)->GetValue().ToLong(&tmp); m_pOptions->SetOption(OPTION_LIMITPORTS_LOW, tmp);
 	XRCCTRL(*this, "ID_ACTIVE_PORTMAX", wxTextCtrl)->GetValue().ToLong(&tmp); m_pOptions->SetOption(OPTION_LIMITPORTS_HIGH, tmp);
-	
+
 	m_pOptions->SetOption(OPTION_EXTERNALIP, XRCCTRL(*this, "ID_ACTIVEIP", wxTextCtrl)->GetValue());
 	m_pOptions->SetOption(OPTION_EXTERNALIPRESOLVER, XRCCTRL(*this, "ID_ACTIVERESOLVER", wxTextCtrl)->GetValue());
 	m_pOptions->SetOption(OPTION_NOEXTERNALONLOCAL, XRCCTRL(*this, "ID_NOEXTERNALONLOCAL", wxCheckBox)->GetValue());
@@ -883,7 +889,7 @@
 		long high;
 		XRCCTRL(*this, "ID_ACTIVE_PORTMIN", wxTextCtrl)->GetValue().ToLong(&low);
 		XRCCTRL(*this, "ID_ACTIVE_PORTMAX", wxTextCtrl)->GetValue().ToLong(&high);
-		
+
 		int mid = GetRandomNumber(low, high);
 		wxASSERT(mid >= low && mid <= high);
 
@@ -1032,7 +1038,7 @@
 		CloseSocket();
 		return;
 	}
-	
+
 	delete m_pDataSocket;
 	m_pDataSocket = 0;
 
diff -Nru filezilla-3.5.3/src/interface/netconfwizard.h filezilla-3.7.3~precise/src/interface/netconfwizard.h
--- filezilla-3.5.3/src/interface/netconfwizard.h	2008-07-10 15:16:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/netconfwizard.h	2013-06-09 03:30:06.000000000 +0000
@@ -30,7 +30,7 @@
 
 	std::vector<wxWizardPageSimple*> m_pages;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnPageChanging(wxWizardEvent& event);
 	void OnPageChanged(wxWizardEvent& event);
 	void OnSocketEvent(wxSocketEvent& event);
@@ -38,7 +38,7 @@
 	void OnRestart(wxCommandEvent& event);
 	void OnFinish(wxWizardEvent& event);
 	void OnTimer(wxTimerEvent& event);
-	
+
 	void OnReceive();
 	void ParseResponse(const char* line);
 	void OnClose();
@@ -54,7 +54,7 @@
 	void SendNextCommand();
 
 	wxString GetExternalIPAddress();
-	
+
 	int CreateListenSocket();
 	int CreateListenSocket(unsigned int port);
 
diff -Nru filezilla-3.5.3/src/interface/power_management.cpp filezilla-3.7.3~precise/src/interface/power_management.cpp
--- filezilla-3.5.3/src/interface/power_management.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/power_management.cpp	2012-09-07 03:30:05.000000000 +0000
@@ -58,7 +58,7 @@
 	}
 
 	const std::vector<CState*> *states = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); ++iter)
 	{
 		if (!(*iter)->IsRemoteIdle())
 		{
diff -Nru filezilla-3.5.3/src/interface/power_management.h filezilla-3.7.3~precise/src/interface/power_management.h
--- filezilla-3.5.3/src/interface/power_management.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/power_management.h	2012-10-06 03:30:11.000000000 +0000
@@ -27,7 +27,7 @@
 protected:
 	CPowerManagement(CMainFrame* pMainFrame);
 	virtual ~CPowerManagement();
-	
+
 	static CPowerManagement* m_pPowerManagement;
 
 	virtual void OnStateChange(CState* pState, enum t_statechange_notifications notification, const wxString& data, const void* data2);
@@ -36,7 +36,7 @@
 	void DoSetIdle();
 
 	bool m_busy;
-	
+
 	CMainFrame* m_pMainFrame;
 
 #ifdef WITH_LIBDBUS
diff -Nru filezilla-3.5.3/src/interface/prefix.cpp filezilla-3.7.3~precise/src/interface/prefix.cpp
--- filezilla-3.5.3/src/interface/prefix.cpp	2010-12-30 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/prefix.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -3,7 +3,7 @@
  * Written by: Mike Hearn <mike@theoretic.com>
  *             Hongli Lai <h.lai@chello.nl>
  * http://autopackage.org/
- * 
+ *
  * This source code is public domain. You can relicense this code
  * under whatever license you want.
  *
diff -Nru filezilla-3.5.3/src/interface/queue.cpp filezilla-3.7.3~precise/src/interface/queue.cpp
--- filezilla-3.5.3/src/interface/queue.cpp	2011-05-02 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queue.cpp	2013-01-07 04:30:19.000000000 +0000
@@ -7,27 +7,26 @@
 #include "timeformatting.h"
 #include "themeprovider.h"
 
-CQueueItem::CQueueItem()
+CQueueItem::CQueueItem(CQueueItem* parent)
+	: m_parent(parent)
+	, m_visibleOffspring(0)
+	, m_indent(0)
+	, m_maxCachedIndex(-1)
+	, m_removed_at_front(0)
 {
-	m_visibleOffspring = 0;
-	m_parent = 0;
-	m_maxCachedIndex = -1;
-
-	m_removed_at_front = 0;
-	m_indent = 0;
 }
 
 CQueueItem::~CQueueItem()
 {
 	std::vector<CQueueItem*>::iterator iter;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 		delete *iter;
 }
 
 void CQueueItem::SetPriority(enum QueuePriority priority)
 {
 	std::vector<CQueueItem*>::iterator iter;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 		(*iter)->SetPriority(priority);
 }
 
@@ -93,7 +92,7 @@
 		child = m_lookupCache[m_maxCachedIndex].child + 1;
 	}
 
-	for (; iter != m_children.end(); iter++, child++)
+	for (; iter != m_children.end(); ++iter, ++child)
 	{
 		if (!item)
 			return *iter;
@@ -132,7 +131,7 @@
 	int oldVisibleOffspring = m_visibleOffspring;
 	std::vector<CQueueItem*>::iterator iter;
 	bool deleted = false;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		if (*iter == pItem)
 		{
@@ -204,7 +203,7 @@
 	std::vector<CQueueItem*>::iterator iter;
 	std::vector<CQueueItem*> keepChildren;
 	m_visibleOffspring = 0;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		CQueueItem* pItem = *iter;
 		if (pItem->TryRemoveAll())
@@ -270,7 +269,7 @@
 		return 0;
 
 	int index = 1;
-	for (std::vector<CQueueItem*>::const_iterator iter = pParent->m_children.begin() + pParent->m_removed_at_front; iter != pParent->m_children.end(); iter++)
+	for (std::vector<CQueueItem*>::const_iterator iter = pParent->m_children.begin() + pParent->m_removed_at_front; iter != pParent->m_children.end(); ++iter)
 	{
 		if (*iter == this)
 			break;
@@ -282,10 +281,10 @@
 }
 
 const wxString& CQueueItem::GetIndent() const
-{ 
+{
 	wxASSERT(m_indent < 5);
-	static const wxString indents[5] = 
-	{ 
+	static const wxString indents[5] =
+	{
 		_T(""),
 		_T("  "),
 		_T("    "),
@@ -298,23 +297,24 @@
 CFileItem::CFileItem(CServerItem* parent, bool queued, bool download,
 					 const wxString& sourceFile, const wxString& targetFile,
 					 const CLocalPath& localPath, const CServerPath& remotePath, wxLongLong size)
-	: m_sourceFile(sourceFile), m_targetFile(targetFile)
-	, m_localPath(localPath), m_remotePath(remotePath)
+	: CQueueItem(parent)
+	, m_errorCount(0)
+	, m_edit(CEditHandler::none)
+	, m_pEngineData(0)
+	, m_defaultFileExistsAction(CFileExistsNotification::unknown)
+	, m_onetime_action(CFileExistsNotification::unknown)
+	, flags(0)
+	, m_priority(priority_normal)
+	, m_sourceFile(sourceFile)
+	, m_targetFile(targetFile)
+	, m_localPath(localPath)
+	, m_remotePath(remotePath)
 	, m_size(size)
 {
-	m_parent = parent;
-	m_priority = priority_normal;
-
-	flags = 0;
 	if (download)
 		flags |= flag_download;
 	if (queued)
 		flags |= flag_queued;
-	m_errorCount = 0;
-	m_pEngineData = 0;
-	m_defaultFileExistsAction = CFileExistsNotification::unknown;
-	m_edit = CEditHandler::none;
-	m_onetime_action = CFileExistsNotification::unknown;
 }
 
 CFileItem::~CFileItem()
@@ -326,8 +326,11 @@
 	if (priority == m_priority)
 		return;
 
-	CServerItem* parent = (CServerItem*)m_parent;
-	parent->SetChildPriority(this, m_priority, priority);
+	if (m_parent)
+	{
+		CServerItem* parent = reinterpret_cast<CServerItem*>(m_parent);
+		parent->SetChildPriority(this, m_priority, priority);
+	}
 	m_priority = priority;
 }
 
@@ -431,9 +434,9 @@
 }
 
 CServerItem::CServerItem(const CServer& server)
+	: m_activeCount(0)
+	, m_server(server)
 {
-	m_server = server;
-	m_activeCount = 0;
 }
 
 CServerItem::~CServerItem()
@@ -469,7 +472,7 @@
 void CServerItem::RemoveFileItemFromList(CFileItem* pItem)
 {
 	std::list<CFileItem*>& fileList = m_fileList[pItem->queued() ? 0 : 1][pItem->GetPriority()];
-	for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); iter++)
+	for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); ++iter)
 	{
 		if (*iter == pItem)
 		{
@@ -482,7 +485,7 @@
 
 void CServerItem::SetDefaultFileExistsAction(enum CFileExistsNotification::OverwriteAction action, const enum TransferDirection direction)
 {
-	for (std::vector<CQueueItem*>::iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (std::vector<CQueueItem*>::iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		CQueueItem *pItem = *iter;
 		if (pItem->GetType() == QueueItemType_File)
@@ -509,7 +512,7 @@
 	for (i = (PRIORITY_COUNT - 1); i >= 0; i--)
 	{
 		std::list<CFileItem*>& fileList = m_fileList[1][i];
-		for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); iter++)
+		for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); ++iter)
 		{
 			CFileItem* item = *iter;
 			if (item->IsActive())
@@ -533,7 +536,7 @@
 	for (i = (PRIORITY_COUNT - 1); i >= 0; i--)
 	{
 		std::list<CFileItem*>& fileList = m_fileList[0][i];
-		for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); iter++)
+		for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); ++iter)
 		{
 			CFileItem* item = *iter;
 			if (item->IsActive())
@@ -575,7 +578,7 @@
 	{
 		std::list<CFileItem*> activeList;
 		std::list<CFileItem*>& fileList = m_fileList[1][i];
-		for (std::list<CFileItem*>::reverse_iterator iter = fileList.rbegin(); iter != fileList.rend(); iter++)
+		for (std::list<CFileItem*>::reverse_iterator iter = fileList.rbegin(); iter != fileList.rend(); ++iter)
 		{
 			CFileItem* item = *iter;
 			wxASSERT(!item->queued());
@@ -597,7 +600,7 @@
 		return;
 
 	std::list<CFileItem*>& fileList = m_fileList[1][pItem->GetPriority()];
-	for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); iter++)
+	for (std::list<CFileItem*>::iterator iter = fileList.begin(); iter != fileList.end(); ++iter)
 	{
 		if (*iter != pItem)
 			continue;
@@ -615,7 +618,7 @@
 	TiXmlElement *server = new TiXmlElement("Server");
 	SetServer(server, m_server);
 
-	for (std::vector<CQueueItem*>::const_iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (std::vector<CQueueItem*>::const_iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 		(*iter)->SaveItem(server);
 
 	pElement->LinkEndChild(server);
@@ -629,7 +632,7 @@
 		for (int j = 0; j < 2; j++)
 		{
 			const std::list<CFileItem*>& fileList = m_fileList[j][i];
-			for (std::list<CFileItem*>::const_iterator iter = fileList.begin(); iter != fileList.end(); iter++)
+			for (std::list<CFileItem*>::const_iterator iter = fileList.begin(); iter != fileList.end(); ++iter)
 			{
 				const CFileItem* item = *iter;
 				wxLongLong size = item->GetSize();
@@ -641,7 +644,7 @@
 		}
 	}
 
-	for (std::vector<CQueueItem*>::const_iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (std::vector<CQueueItem*>::const_iterator iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		if ((*iter)->GetType() == QueueItemType_File ||
 			(*iter)->GetType() == QueueItemType_Folder)
@@ -659,7 +662,7 @@
 	std::vector<CQueueItem*>::iterator iter;
 	std::vector<CQueueItem*> keepChildren;
 	m_visibleOffspring = 0;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		CQueueItem* pItem = *iter;
 		if (pItem->TryRemoveAll())
@@ -708,7 +711,7 @@
 void CServerItem::SetPriority(enum QueuePriority priority)
 {
 	std::vector<CQueueItem*>::iterator iter;
-	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); iter++)
+	for (iter = m_children.begin() + m_removed_at_front; iter != m_children.end(); ++iter)
 	{
 		if ((*iter)->GetType() == QueueItemType_File)
 			((CFileItem*)(*iter))->SetPriorityRaw(priority);
@@ -726,7 +729,7 @@
 {
 	int i = pItem->queued() ? 0 : 1;
 
-	for (std::list<CFileItem*>::iterator iter = m_fileList[i][oldPriority].begin(); iter != m_fileList[i][oldPriority].end(); iter++)
+	for (std::list<CFileItem*>::iterator iter = m_fileList[i][oldPriority].begin(); iter != m_fileList[i][oldPriority].end(); ++iter)
 	{
 		if (*iter != pItem)
 			continue;
@@ -740,19 +743,17 @@
 }
 
 CFolderScanItem::CFolderScanItem(CServerItem* parent, bool queued, bool download, const CLocalPath& localPath, const CServerPath& remotePath)
+	: CQueueItem(parent)
+	, m_remove(false)
+	, m_active(false)
+	, m_count(0)
+	, m_defaultFileExistsAction(CFileExistsNotification::unknown)
+	, m_dir_is_empty(false)
+	, m_queued(queued)
+	, m_localPath(localPath)
+	, m_remotePath(remotePath)
+	, m_download(download)
 {
-	m_parent = parent;
-
-	m_download = download;
-	m_localPath = localPath;
-	m_remotePath = remotePath;
-	m_queued = queued;
-	m_remove = false;
-	m_active = false;
-	m_count = 0;
-	m_dir_is_empty = false;
-
-	m_defaultFileExistsAction = CFileExistsNotification::unknown;
 }
 
 bool CFolderScanItem::TryRemoveAll()
@@ -778,8 +779,9 @@
 END_EVENT_TABLE()
 
 CQueueViewBase::CQueueViewBase(CQueue* parent, int index, const wxString& title)
-	: wxListCtrlEx(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN | wxLC_REPORT | wxLC_VIRTUAL | wxSUNKEN_BORDER | wxTAB_TRAVERSAL),
-	  m_pageIndex(index), m_title(title)
+	: wxListCtrlEx(parent, wxID_ANY, wxDefaultPosition, wxDefaultSize, wxCLIP_CHILDREN | wxLC_REPORT | wxLC_VIRTUAL | wxSUNKEN_BORDER | wxTAB_TRAVERSAL)
+	, m_pageIndex(index)
+	, m_title(title)
 {
 	m_pQueue = parent;
 	m_insertionStart = -1;
@@ -808,14 +810,14 @@
 
 CQueueViewBase::~CQueueViewBase()
 {
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		delete *iter;
 }
 
 CQueueItem* CQueueViewBase::GetQueueItem(unsigned int item)
 {
 	std::vector<CServerItem*>::iterator iter;
-	for (iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		if (!item)
 			return *iter;
@@ -837,7 +839,7 @@
 	const CQueueItem* pTopLevelItem = item->GetTopLevelItem();
 
 	int index = 0;
-	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::const_iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		if (pTopLevelItem == *iter)
 			break;
@@ -1131,7 +1133,7 @@
 
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	}
-	for (std::list<int>::const_iterator iter = itemsToSelect.begin(); iter != itemsToSelect.end(); iter++)
+	for (std::list<int>::const_iterator iter = itemsToSelect.begin(); iter != itemsToSelect.end(); ++iter)
 		SetItemState(*iter, wxLIST_STATE_SELECTED, wxLIST_STATE_SELECTED);
 }
 
@@ -1212,7 +1214,7 @@
 
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 	}
-	for (std::list<int>::const_iterator iter = itemsToUnselect.begin(); iter != itemsToUnselect.end(); iter++)
+	for (std::list<int>::const_iterator iter = itemsToUnselect.begin(); iter != itemsToUnselect.end(); ++iter)
 		SetItemState(*iter, 0, wxLIST_STATE_SELECTED);
 }
 
@@ -1242,7 +1244,7 @@
 
 CServerItem* CQueueViewBase::GetServerItem(const CServer& server)
 {
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		if ((*iter)->GetServer() == server)
 			return *iter;
@@ -1375,7 +1377,7 @@
 	if (!topLevelItem->GetChild(0))
 	{
 		std::vector<CServerItem*>::iterator iter;
-		for (iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+		for (iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		{
 			if (*iter == topLevelItem)
 				break;
diff -Nru filezilla-3.5.3/src/interface/queue.h filezilla-3.7.3~precise/src/interface/queue.h
--- filezilla-3.5.3/src/interface/queue.h	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queue.h	2013-06-09 03:30:06.000000000 +0000
@@ -51,7 +51,7 @@
 	CQueueItem* GetTopLevelItem();
 	const CQueueItem* GetTopLevelItem() const;
 	int GetItemIndex() const; // Return the visible item index relative to the topmost parent item.
-	virtual void SaveItem(TiXmlElement* pElement) const { }
+	virtual void SaveItem(TiXmlElement* pElement) const {}
 
 	virtual enum QueueItemType GetType() const = 0;
 
@@ -64,7 +64,7 @@
 	int GetRemovedAtFront() const { return m_removed_at_front; }
 
 protected:
-	CQueueItem();
+	CQueueItem(CQueueItem* parent = 0);
 
 	CQueueItem* m_parent;
 
@@ -117,8 +117,6 @@
 
 	void SetDefaultFileExistsAction(enum CFileExistsNotification::OverwriteAction action, const enum TransferDirection direction);
 
-	int m_activeCount;
-
 	virtual bool TryRemoveAll();
 
 	void DetachChildren();
@@ -127,6 +125,8 @@
 
 	void SetChildPriority(CFileItem* pItem, enum QueuePriority oldPriority, enum QueuePriority newPriority);
 
+	int m_activeCount;
+
 protected:
 	void AddFileItemToList(CFileItem* pItem);
 	void RemoveFileItemFromList(CFileItem* pItem);
@@ -163,7 +163,7 @@
 	const wxLongLong& GetSize() const { return m_size; }
 	void SetSize(wxLongLong size) { m_size = size; }
 	inline bool Download() const { return flags & flag_download; }
-	
+
 	inline bool queued() const { return (flags & flag_queued) != 0; }
 	inline void set_queued(bool q)
 	{
@@ -186,7 +186,7 @@
 
 	bool IsActive() const { return (flags & flag_active) != 0; }
 	virtual void SetActive(bool active);
-	
+
 	virtual void SaveItem(TiXmlElement* pElement) const;
 
 	virtual bool TryRemoveAll(); // Removes a inactive childrens, queues active children for removal.
@@ -241,7 +241,7 @@
 public:
 	CFolderItem(CServerItem* parent, bool queued, const CLocalPath& localPath);
 	CFolderItem(CServerItem* parent, bool queued, const CServerPath& remotePath, const wxString& remoteFile);
-	
+
 	virtual enum QueueItemType GetType() const { return QueueItemType_Folder; }
 
 	virtual void SaveItem(TiXmlElement* pElement) const;
@@ -253,7 +253,7 @@
 {
 public:
 	CFolderScanItem(CServerItem* parent, bool queued, bool download, const CLocalPath& localPath, const CServerPath& remotePath);
-	virtual ~CFolderScanItem() { }
+	virtual ~CFolderScanItem() {}
 
 	virtual enum QueueItemType GetType() const { return QueueItemType_FolderScan; }
 	CLocalPath GetLocalPath() const { return m_localPath; }
@@ -380,7 +380,7 @@
 
 	std::vector<ColumnId> m_columns;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnEraseBackground(wxEraseEvent& event);
 	void OnNavigationKey(wxNavigationKeyEvent& event);
 	void OnChar(wxKeyEvent& event);
diff -Nru filezilla-3.5.3/src/interface/queue_storage.cpp filezilla-3.7.3~precise/src/interface/queue_storage.cpp
--- filezilla-3.5.3/src/interface/queue_storage.cpp	2011-11-01 16:41:52.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queue_storage.cpp	2012-10-25 03:30:07.000000000 +0000
@@ -212,7 +212,7 @@
 
 	std::unordered_map<wxString, wxLongLong_t, wxStringHash, fast_equal> localPaths_;
 	std::unordered_map<wxString, wxLongLong_t, wxStringHash> remotePaths_; // No need for fast_equal as GetSafePath returns unshared string anyhow
-	
+
 	std::map<wxLongLong_t, CLocalPath> reverseLocalPaths_;
 	std::map<wxLongLong_t, CServerPath> reverseRemotePaths_;
 };
@@ -334,7 +334,7 @@
 	do {
 		res = sqlite3_step(insertLocalPathQuery_);
 	} while (res == SQLITE_BUSY);
-	
+
 	sqlite3_reset(insertLocalPathQuery_);
 
 	if (res == SQLITE_DONE)
@@ -361,7 +361,7 @@
 	do {
 		res = sqlite3_step(insertRemotePathQuery_);
 	} while (res == SQLITE_BUSY);
-	
+
 	sqlite3_reset(insertRemotePathQuery_);
 
 	if (res == SQLITE_DONE)
@@ -586,9 +586,9 @@
 bool CQueueStorage::Impl::SaveServer(const CServerItem& item)
 {
 	bool kiosk_mode = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0;
-	
+
 	const CServer& server = item.GetServer();
-	
+
 	Bind(insertServerQuery_, server_table_column_names::host, server.GetHost());
 	Bind(insertServerQuery_, server_table_column_names::port, static_cast<int>(server.GetPort()));
 	Bind(insertServerQuery_, server_table_column_names::protocol, static_cast<int>(server.GetProtocol()));
@@ -598,7 +598,7 @@
 	if (server.GetLogonType() != ANONYMOUS)
 	{
 		Bind(insertServerQuery_, server_table_column_names::user, server.GetUser());
-		
+
 		if (server.GetLogonType() == NORMAL || server.GetLogonType() == ACCOUNT)
 		{
 			if (kiosk_mode)
@@ -668,7 +668,7 @@
 		if (!postLoginCommands.empty())
 		{
 			wxString commands;
-			for (std::vector<wxString>::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); iter++)
+			for (std::vector<wxString>::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); ++iter)
 			{
 				if (!commands.empty())
 					commands += _T("\n");
@@ -692,7 +692,7 @@
 	do {
 		res = sqlite3_step(insertServerQuery_);
 	} while (res == SQLITE_BUSY);
-	
+
 	sqlite3_reset(insertServerQuery_);
 
 	bool ret = res == SQLITE_DONE;
@@ -947,7 +947,7 @@
 		if (!server.SetPostLoginCommands(postLoginCommands))
 			return INVALID_DATA;
 	}
-	
+
 
 	server.SetBypassProxy(GetColumnInt(selectServersQuery_, server_table_column_names::bypass_proxy) == 1 );
 	server.SetName( GetColumnText(selectServersQuery_, server_table_column_names::name) );
@@ -1011,7 +1011,7 @@
 			fileItem->m_defaultFileExistsAction = (CFileExistsNotification::OverwriteAction)overwrite_action;
 	}
 
-	return GetColumnInt64(selectFilesQuery_, file_table_column_names::id); 
+	return GetColumnInt64(selectFilesQuery_, file_table_column_names::id);
 }
 
 CQueueStorage::CQueueStorage()
@@ -1050,7 +1050,7 @@
 	bool ret = true;
 	if (sqlite3_exec(d_->db_, "BEGIN TRANSACTION", 0, 0, 0) == SQLITE_OK)
 	{
-		for (std::vector<CServerItem*>::const_iterator it = queue.begin(); it != queue.end(); ++it)	
+		for (std::vector<CServerItem*>::const_iterator it = queue.begin(); it != queue.end(); ++it)
 			ret &= d_->SaveServer(**it);
 
 		// Even on previous failure, we want to at least try to commit the data we have so far
@@ -1077,7 +1077,7 @@
 			sqlite3_reset(d_->selectServersQuery_);
 		}
 
-		while (true)
+		for (;;)
 		{
 			int res;
 			do
@@ -1085,7 +1085,7 @@
 				res = sqlite3_step(d_->selectServersQuery_);
 			}
 			while (res == SQLITE_BUSY);
-			
+
 			if (res == SQLITE_ROW)
 			{
 				ret = d_->ParseServerFromRow(server);
@@ -1127,7 +1127,7 @@
 			sqlite3_bind_int64(d_->selectFilesQuery_, 1, server);
 		}
 
-		while (true)
+		for (;;)
 		{
 			int res;
 			do
@@ -1135,7 +1135,7 @@
 				res = sqlite3_step(d_->selectFilesQuery_);
 			}
 			while (res == SQLITE_BUSY);
-			
+
 			if (res == SQLITE_ROW)
 			{
 				ret = d_->ParseFileFromRow(pItem);
diff -Nru filezilla-3.5.3/src/interface/queueview_failed.cpp filezilla-3.7.3~precise/src/interface/queueview_failed.cpp
--- filezilla-3.5.3/src/interface/queueview_failed.cpp	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queueview_failed.cpp	2012-10-25 03:30:07.000000000 +0000
@@ -64,7 +64,7 @@
 	if (pEditHandler)
 		pEditHandler->RemoveAll(CEditHandler::upload_and_remove_failed);
 
-	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (std::vector<CServerItem*>::iterator iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 		delete *iter;
 	m_serverList.clear();
 
@@ -91,7 +91,7 @@
 
 	std::list<CQueueItem*> selectedItems;
 	long item = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -232,7 +232,7 @@
 	delete pServerItem;
 
 	std::vector<CServerItem*>::iterator iter;
-	for (iter = m_serverList.begin(); iter != m_serverList.end(); iter++)
+	for (iter = m_serverList.begin(); iter != m_serverList.end(); ++iter)
 	{
 		if (*iter == pServerItem)
 			break;
@@ -261,7 +261,7 @@
 	std::list<CQueueItem*> selectedItems;
 	long item = -1;
 	long skipTo = -1;
-	while (true)
+	for (;;)
 	{
 		item = GetNextItem(item, wxLIST_NEXT_ALL, wxLIST_STATE_SELECTED);
 		if (item == -1)
@@ -314,7 +314,7 @@
 
 	if (pQueueView->IsActive())
 		pQueueView->AdvanceQueue(false);
-	
+
 	DisplayNumberQueuedFiles();
 	SaveSetItemCount(m_itemCount);
 	RefreshListOnly();
@@ -339,7 +339,7 @@
 
 	if (pQueueView->IsActive())
 		pQueueView->AdvanceQueue(false);
-	
+
 	DisplayNumberQueuedFiles();
 	SaveSetItemCount(m_itemCount);
 	RefreshListOnly();
diff -Nru filezilla-3.5.3/src/interface/queueview_failed.h filezilla-3.7.3~precise/src/interface/queueview_failed.h
--- filezilla-3.5.3/src/interface/queueview_failed.h	2010-09-26 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queueview_failed.h	2013-06-09 03:30:05.000000000 +0000
@@ -12,7 +12,7 @@
 	bool RequeueFileItem(CFileItem* pItem, CServerItem* pServerItem);
 	bool RequeueServerItem(CServerItem* pServerItem);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnContextMenu(wxContextMenuEvent& event);
 	void OnRemoveAll(wxCommandEvent& event);
 	void OnRemoveSelected(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/queueview_successful.h filezilla-3.7.3~precise/src/interface/queueview_successful.h
--- filezilla-3.5.3/src/interface/queueview_successful.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/queueview_successful.h	2013-06-09 03:30:05.000000000 +0000
@@ -14,7 +14,7 @@
 
 	bool m_autoClear;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnContextMenu(wxContextMenuEvent& event);
 	void OnMenuAutoClear(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/quickconnectbar.cpp filezilla-3.7.3~precise/src/interface/quickconnectbar.cpp
--- filezilla-3.5.3/src/interface/quickconnectbar.cpp	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/quickconnectbar.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -6,6 +6,7 @@
 #include "Options.h"
 #include "loginmanager.h"
 #include "Mainfrm.h"
+#include "asksavepassworddialog.h"
 
 BEGIN_EVENT_TABLE(CQuickconnectBar, wxPanel)
 EVT_BUTTON(XRCID("ID_QUICKCONNECT_OK"), CQuickconnectBar::OnQuickconnect)
@@ -13,7 +14,7 @@
 EVT_MENU(wxID_ANY, CQuickconnectBar::OnMenu)
 EVT_TEXT_ENTER(wxID_ANY, CQuickconnectBar::OnQuickconnect)
 EVT_NAVIGATION_KEY(CQuickconnectBar::OnKeyboardNavigation)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 CQuickconnectBar::CQuickconnectBar()
 	: m_pHost()
@@ -31,7 +32,7 @@
 bool CQuickconnectBar::Create(CMainFrame* pParent)
 {
 	m_pMainFrame = pParent;
-    if (!wxXmlResource::Get()->LoadPanel(this, pParent, _T("ID_QUICKCONNECTBAR")))
+	if (!wxXmlResource::Get()->LoadPanel(this, pParent, _T("ID_QUICKCONNECTBAR")))
 	{
 		wxLogError(_("Cannot load Quickconnect bar from resource file"));
 		return false;
@@ -73,7 +74,7 @@
 	wxString user = m_pUser->GetValue();
 	wxString pass = m_pPass->GetValue();
 	wxString port = m_pPort->GetValue();
-	
+
 	CServer server;
 
 	wxString error;
@@ -106,7 +107,7 @@
 		}
 		break;
 	}
-	
+
 	m_pHost->SetValue(host);
 	if (server.GetPort() != server.GetDefaultPort(server.GetProtocol()))
 		m_pPort->SetValue(wxString::Format(_T("%d"), server.GetPort()));
@@ -121,7 +122,7 @@
 
 	if (protocol == HTTP || protocol == HTTPS)
 	{
-		wxString error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over SSL (implicit) and\nftpes:// for FTP over SSL (explicit).");
+		wxString error = _("Invalid protocol specified. Valid protocols are:\nftp:// for normal FTP,\nsftp:// for SSH file transfer protocol,\nftps:// for FTP over TLS (implicit) and\nftpes:// for FTP over TLS (explicit).");
 		wxMessageBox(error, _("Syntax error"), wxICON_EXCLAMATION);
 		return;
 	}
@@ -129,6 +130,9 @@
 	if (event.GetId() == 1)
 		server.SetBypassProxy(true);
 
+	if (server.GetLogonType() != ANONYMOUS && !CAskSavePasswordDialog::Run(this))
+		return;
+
 	if (!m_pMainFrame->ConnectToServer(server, path))
 		return;
 
@@ -153,7 +157,7 @@
 		unsigned int i = 0;
 		for (std::list<CServer>::const_iterator iter = m_recentServers.begin();
 			iter != m_recentServers.end();
-			iter++, i++)
+			++iter, ++i)
 		{
 			wxString name(iter->FormatServer());
 			name.Replace(_T("&"), _T("&&"));
diff -Nru filezilla-3.5.3/src/interface/quickconnectbar.h filezilla-3.7.3~precise/src/interface/quickconnectbar.h
--- filezilla-3.5.3/src/interface/quickconnectbar.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/quickconnectbar.h	2013-06-09 03:30:06.000000000 +0000
@@ -16,7 +16,7 @@
 	// Only valid while menu is being displayed
 	std::list<CServer> m_recentServers;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnQuickconnect(wxCommandEvent& event);
 	void OnQuickconnectDropdown(wxCommandEvent& event);
 	void OnMenu(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/recentserverlist.cpp filezilla-3.7.3~precise/src/interface/recentserverlist.cpp
--- filezilla-3.5.3/src/interface/recentserverlist.cpp	2011-06-07 03:30:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/recentserverlist.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -24,7 +24,7 @@
 		return m_mostRecentServers;
 
 	m_mostRecentServers.clear();
-    
+
 	bool modified = false;
 	TiXmlElement* pServer = pElement->FirstChildElement("Server");
 	while (pServer)
@@ -40,7 +40,7 @@
 		else
 		{
 			std::list<CServer>::const_iterator iter;
-			for (iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); iter++)
+			for (iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); ++iter)
 			{
 				if (*iter == server)
 					break;
@@ -68,7 +68,7 @@
 	GetMostRecentServers(false);
 
 	bool relocated = false;
-	for (std::list<CServer>::iterator iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); iter++)
+	for (std::list<CServer>::iterator iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); ++iter)
 	{
 		if (iter->EqualsNoPass(server))
 		{
@@ -91,13 +91,13 @@
 	TiXmlElement* pDocument = m_XmlFile.GetElement();
 	if (!pDocument)
 		return;
-	
+
 	TiXmlElement* pElement = pDocument->FirstChildElement("RecentServers");
 	if (!pElement)
 		pElement = pDocument->LinkEndChild(new TiXmlElement("RecentServers"))->ToElement();
 
 	pElement->Clear();
-	for (std::list<CServer>::const_iterator iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); iter++)
+	for (std::list<CServer>::const_iterator iter = m_mostRecentServers.begin(); iter != m_mostRecentServers.end(); ++iter)
 	{
 		TiXmlElement* pServer = pElement->LinkEndChild(new TiXmlElement("Server"))->ToElement();
 		SetServer(pServer, *iter);
diff -Nru filezilla-3.5.3/src/interface/recursive_operation.cpp filezilla-3.7.3~precise/src/interface/recursive_operation.cpp
--- filezilla-3.5.3/src/interface/recursive_operation.cpp	2011-05-15 21:29:46.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/recursive_operation.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -242,7 +242,7 @@
 	std::list<wxString> filesToDelete;
 
 	const wxString path = pDirectoryListing->path.GetPath();
-	
+
 	bool added = false;
 
 	for (int i = pDirectoryListing->GetCount() - 1; i >= 0; --i)
@@ -266,7 +266,7 @@
 				dirToVisit.subdir = entry.name;
 				dirToVisit.localDir = dir.localDir;
 				dirToVisit.start_dir = dir.start_dir;
-				
+
 				if (m_operationMode == recursive_download || m_operationMode == recursive_addtoqueue)
 					dirToVisit.localDir.AddSegment(CQueueView::ReplaceInvalidCharacters(entry.name));
 				if (entry.is_link())
diff -Nru filezilla-3.5.3/src/interface/recursive_operation.h filezilla-3.7.3~precise/src/interface/recursive_operation.h
--- filezilla-3.5.3/src/interface/recursive_operation.h	2010-08-05 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/recursive_operation.h	2012-10-06 03:30:11.000000000 +0000
@@ -43,7 +43,7 @@
 	void SetQueue(CQueueView* pQueue);
 
 	bool ChangeOperationMode(enum OperationMode mode);
-	
+
 protected:
 	// Processes the directory listing in case of a recursive operation
 	void ProcessDirectoryListing(const CDirectoryListing* pDirectoryListing);
diff -Nru filezilla-3.5.3/src/interface/resources/16x16/Makefile.in filezilla-3.7.3~precise/src/interface/resources/16x16/Makefile.in
--- filezilla-3.5.3/src/interface/resources/16x16/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/16x16/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -52,6 +70,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,6 +96,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)"
 DATA = $(dist_resources_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -98,6 +127,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -135,6 +165,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -180,6 +211,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -213,7 +245,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -299,8 +330,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -314,9 +348,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -371,10 +403,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/32x32/Makefile.in filezilla-3.7.3~precise/src/interface/resources/32x32/Makefile.in
--- filezilla-3.5.3/src/interface/resources/32x32/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/32x32/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -52,6 +70,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,6 +96,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)"
 DATA = $(dist_resources_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -98,6 +127,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -135,6 +165,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -180,6 +211,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -213,7 +245,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -278,8 +309,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -293,9 +327,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -350,10 +382,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/MacInfo.plist.in filezilla-3.7.3~precise/src/interface/resources/MacInfo.plist.in
--- filezilla-3.5.3/src/interface/resources/MacInfo.plist.in	2010-01-03 21:13:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/MacInfo.plist.in	2013-06-25 17:11:01.000000000 +0000
@@ -7,7 +7,7 @@
 	<key>CFBundleExecutable</key>
 	<string>filezilla</string>
 	<key>CFBundleGetInfoString</key>
-	<string>FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2010  Tim Kosse, Website: http://filezilla-project.org</string>
+	<string>FileZilla Client @PACKAGE_VERSION@, Copyright (C) 2004-2013  Tim Kosse, Website: https://filezilla-project.org</string>
 	<key>CFBundleIconFile</key>
 	<string>FileZilla.icns</string>
 	<key>CFBundleIdentifier</key>
@@ -31,6 +31,6 @@
 	<key>LSRequiresCarbon</key>
 	<true/>
 	<key>NSHumanReadableCopyright</key>
-	<string>Copyright (C) 2004-2010  Tim Kosse</string>
+	<string>Copyright (C) 2004-2013  Tim Kosse</string>
 </dict>
 </plist>
diff -Nru filezilla-3.5.3/src/interface/resources/Makefile.am filezilla-3.7.3~precise/src/interface/resources/Makefile.am
--- filezilla-3.5.3/src/interface/resources/Makefile.am	2010-11-02 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/Makefile.am	2013-04-05 03:30:06.000000000 +0000
@@ -1,4 +1,4 @@
-SUBDIRS = 16x16 32x32 cyril blukis lone minimal opencrystal
+SUBDIRS = 16x16 32x32 cyril blukis lone minimal opencrystal tango
 
 CLEANFILES = filezilla.o
 
@@ -57,13 +57,14 @@
 	for i in $(dist_resources48_DATA); \
 		do cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/48x48"; \
 	done
-	
+
 	$(MAKE) -C 16x16 mac-copy-resources
 	$(MAKE) -C 32x32 mac-copy-resources
 	$(MAKE) -C cyril mac-copy-resources
 	$(MAKE) -C blukis mac-copy-resources
 	$(MAKE) -C lone mac-copy-resources
 	$(MAKE) -C opencrystal mac-copy-resources
+	$(MAKE) -C tango mac-copy-resources
 endif
 
 pixmapsdir = $(datadir)/pixmaps
@@ -75,3 +76,6 @@
 hicolorapps32_DATA = 32x32/filezilla.png
 hicolorapps48dir = $(datadir)/icons/hicolor/48x48/apps
 hicolorapps48_DATA = 48x48/filezilla.png
+
+scalabledir = $(datadir)/icons/hicolor/scalable/apps
+dist_scalable_DATA = filezilla.svg
diff -Nru filezilla-3.5.3/src/interface/resources/Makefile.in filezilla-3.7.3~precise/src/interface/resources/Makefile.in
--- filezilla-3.5.3/src/interface/resources/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -37,16 +54,17 @@
 subdir = src/interface/resources
 DIST_COMMON = $(dist_noinst_DATA) $(dist_resources20_DATA) \
 	$(dist_resources24_DATA) $(dist_resources48_DATA) \
-	$(dist_resources_DATA) $(srcdir)/MacInfo.plist.in \
-	$(srcdir)/Makefile.am $(srcdir)/Makefile.in \
-	$(srcdir)/version.rc.in
+	$(dist_resources_DATA) $(dist_scalable_DATA) \
+	$(srcdir)/MacInfo.plist.in $(srcdir)/Makefile.am \
+	$(srcdir)/Makefile.in $(srcdir)/version.rc.in
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 am__aclocal_m4_deps = $(top_srcdir)/m4/check_cxx0x.m4 \
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -62,6 +80,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -83,16 +106,23 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)" \
 	"$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" \
-	"$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(hicolorapps16dir)" \
+	"$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(scalabledir)" \
+	"$(DESTDIR)$(hicolorapps16dir)" \
 	"$(DESTDIR)$(hicolorapps32dir)" \
 	"$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(pixmapsdir)"
 DATA = $(dist_noinst_DATA) $(dist_resources_DATA) \
 	$(dist_resources20_DATA) $(dist_resources24_DATA) \
-	$(dist_resources48_DATA) $(hicolorapps16_DATA) \
-	$(hicolorapps32_DATA) $(hicolorapps48_DATA) \
-	$(nodist_noinst_DATA) $(pixmaps_DATA)
+	$(dist_resources48_DATA) $(dist_scalable_DATA) \
+	$(hicolorapps16_DATA) $(hicolorapps32_DATA) \
+	$(hicolorapps48_DATA) $(nodist_noinst_DATA) $(pixmaps_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
   distclean-recursive maintainer-clean-recursive
 AM_RECURSIVE_TARGETS = $(RECURSIVE_TARGETS:-recursive=) \
@@ -149,6 +179,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -186,6 +217,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -231,6 +263,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -264,7 +297,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -284,7 +316,7 @@
 top_srcdir = @top_srcdir@
 xdgopen = @xdgopen@
 xgettext = @xgettext@
-SUBDIRS = 16x16 32x32 cyril blukis lone minimal opencrystal
+SUBDIRS = 16x16 32x32 cyril blukis lone minimal opencrystal tango
 CLEANFILES = filezilla.o
 resourcesdir = $(pkgdatadir)/resources
 dist_resources_DATA = defaultfilters.xml \
@@ -316,6 +348,8 @@
 hicolorapps32_DATA = 32x32/filezilla.png
 hicolorapps48dir = $(datadir)/icons/hicolor/48x48/apps
 hicolorapps48_DATA = 48x48/filezilla.png
+scalabledir = $(datadir)/icons/hicolor/scalable/apps
+dist_scalable_DATA = filezilla.svg
 all: all-recursive
 
 .SUFFIXES:
@@ -361,8 +395,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -376,13 +413,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 install-dist_resources20DATA: $(dist_resources20_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources20dir)" || $(MKDIR_P) "$(DESTDIR)$(resources20dir)"
 	@list='$(dist_resources20_DATA)'; test -n "$(resources20dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources20dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources20dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -396,13 +434,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources20_DATA)'; test -n "$(resources20dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources20dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources20dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources20dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources24DATA: $(dist_resources24_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources24dir)" || $(MKDIR_P) "$(DESTDIR)$(resources24dir)"
 	@list='$(dist_resources24_DATA)'; test -n "$(resources24dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources24dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources24dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -416,13 +455,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources24_DATA)'; test -n "$(resources24dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources24dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources24dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources24dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources48DATA: $(dist_resources48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources48dir)" || $(MKDIR_P) "$(DESTDIR)$(resources48dir)"
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -436,13 +476,35 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir)
+install-dist_scalableDATA: $(dist_scalable_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_scalable_DATA)'; test -n "$(scalabledir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(scalabledir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(scalabledir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(scalabledir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(scalabledir)" || exit $$?; \
+	done
+
+uninstall-dist_scalableDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_scalable_DATA)'; test -n "$(scalabledir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(scalabledir)'; $(am__uninstall_files_from_dir)
 install-hicolorapps16DATA: $(hicolorapps16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(hicolorapps16dir)" || $(MKDIR_P) "$(DESTDIR)$(hicolorapps16dir)"
 	@list='$(hicolorapps16_DATA)'; test -n "$(hicolorapps16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(hicolorapps16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(hicolorapps16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -456,13 +518,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hicolorapps16_DATA)'; test -n "$(hicolorapps16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(hicolorapps16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(hicolorapps16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(hicolorapps16dir)'; $(am__uninstall_files_from_dir)
 install-hicolorapps32DATA: $(hicolorapps32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(hicolorapps32dir)" || $(MKDIR_P) "$(DESTDIR)$(hicolorapps32dir)"
 	@list='$(hicolorapps32_DATA)'; test -n "$(hicolorapps32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(hicolorapps32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(hicolorapps32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -476,13 +539,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hicolorapps32_DATA)'; test -n "$(hicolorapps32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(hicolorapps32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(hicolorapps32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(hicolorapps32dir)'; $(am__uninstall_files_from_dir)
 install-hicolorapps48DATA: $(hicolorapps48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(hicolorapps48dir)" || $(MKDIR_P) "$(DESTDIR)$(hicolorapps48dir)"
 	@list='$(hicolorapps48_DATA)'; test -n "$(hicolorapps48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(hicolorapps48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(hicolorapps48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -496,13 +560,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(hicolorapps48_DATA)'; test -n "$(hicolorapps48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(hicolorapps48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(hicolorapps48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(hicolorapps48dir)'; $(am__uninstall_files_from_dir)
 install-pixmapsDATA: $(pixmaps_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(pixmapsdir)" || $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)"
 	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(pixmapsdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(pixmapsdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -516,9 +581,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(pixmaps_DATA)'; test -n "$(pixmapsdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(pixmapsdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(pixmapsdir)" && rm -f $$files
+	dir='$(DESTDIR)$(pixmapsdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -687,13 +750,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -718,7 +778,7 @@
 all-am: Makefile $(DATA)
 installdirs: installdirs-recursive
 installdirs-am:
-	for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(hicolorapps16dir)" "$(DESTDIR)$(hicolorapps32dir)" "$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(pixmapsdir)"; do \
+	for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources20dir)" "$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources48dir)" "$(DESTDIR)$(scalabledir)" "$(DESTDIR)$(hicolorapps16dir)" "$(DESTDIR)$(hicolorapps32dir)" "$(DESTDIR)$(hicolorapps48dir)" "$(DESTDIR)$(pixmapsdir)"; do \
 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
 	done
 install: install-recursive
@@ -731,10 +791,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -769,9 +834,9 @@
 
 install-data-am: install-dist_resources20DATA \
 	install-dist_resources24DATA install-dist_resources48DATA \
-	install-dist_resourcesDATA install-hicolorapps16DATA \
-	install-hicolorapps32DATA install-hicolorapps48DATA \
-	install-pixmapsDATA
+	install-dist_resourcesDATA install-dist_scalableDATA \
+	install-hicolorapps16DATA install-hicolorapps32DATA \
+	install-hicolorapps48DATA install-pixmapsDATA
 
 install-dvi: install-dvi-recursive
 
@@ -817,9 +882,9 @@
 
 uninstall-am: uninstall-dist_resources20DATA \
 	uninstall-dist_resources24DATA uninstall-dist_resources48DATA \
-	uninstall-dist_resourcesDATA uninstall-hicolorapps16DATA \
-	uninstall-hicolorapps32DATA uninstall-hicolorapps48DATA \
-	uninstall-pixmapsDATA
+	uninstall-dist_resourcesDATA uninstall-dist_scalableDATA \
+	uninstall-hicolorapps16DATA uninstall-hicolorapps32DATA \
+	uninstall-hicolorapps48DATA uninstall-pixmapsDATA
 
 .MAKE: $(RECURSIVE_CLEAN_TARGETS) $(RECURSIVE_TARGETS) ctags-recursive \
 	install-am install-strip tags-recursive
@@ -831,18 +896,19 @@
 	html-am info info-am install install-am install-data \
 	install-data-am install-dist_resources20DATA \
 	install-dist_resources24DATA install-dist_resources48DATA \
-	install-dist_resourcesDATA install-dvi install-dvi-am \
-	install-exec install-exec-am install-hicolorapps16DATA \
-	install-hicolorapps32DATA install-hicolorapps48DATA \
-	install-html install-html-am install-info install-info-am \
-	install-man install-pdf install-pdf-am install-pixmapsDATA \
-	install-ps install-ps-am install-strip installcheck \
-	installcheck-am installdirs installdirs-am maintainer-clean \
-	maintainer-clean-generic mostlyclean mostlyclean-generic \
-	mostlyclean-libtool pdf pdf-am ps ps-am tags tags-recursive \
-	uninstall uninstall-am uninstall-dist_resources20DATA \
-	uninstall-dist_resources24DATA uninstall-dist_resources48DATA \
-	uninstall-dist_resourcesDATA uninstall-hicolorapps16DATA \
+	install-dist_resourcesDATA install-dist_scalableDATA \
+	install-dvi install-dvi-am install-exec install-exec-am \
+	install-hicolorapps16DATA install-hicolorapps32DATA \
+	install-hicolorapps48DATA install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-pixmapsDATA install-ps install-ps-am \
+	install-strip installcheck installcheck-am installdirs \
+	installdirs-am maintainer-clean maintainer-clean-generic \
+	mostlyclean mostlyclean-generic mostlyclean-libtool pdf pdf-am \
+	ps ps-am tags tags-recursive uninstall uninstall-am \
+	uninstall-dist_resources20DATA uninstall-dist_resources24DATA \
+	uninstall-dist_resources48DATA uninstall-dist_resourcesDATA \
+	uninstall-dist_scalableDATA uninstall-hicolorapps16DATA \
 	uninstall-hicolorapps32DATA uninstall-hicolorapps48DATA \
 	uninstall-pixmapsDATA
 
@@ -879,6 +945,7 @@
 @MACAPPBUNDLE_TRUE@	$(MAKE) -C blukis mac-copy-resources
 @MACAPPBUNDLE_TRUE@	$(MAKE) -C lone mac-copy-resources
 @MACAPPBUNDLE_TRUE@	$(MAKE) -C opencrystal mac-copy-resources
+@MACAPPBUNDLE_TRUE@	$(MAKE) -C tango mac-copy-resources
 
 # Tell versions [3.59,3.63) of GNU make to not export all variables.
 # Otherwise a system limit (for SysV at least) may be exceeded.
diff -Nru filezilla-3.5.3/src/interface/resources/blukis/Makefile.in filezilla-3.7.3~precise/src/interface/resources/blukis/Makefile.in
--- filezilla-3.5.3/src/interface/resources/blukis/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/blukis/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +60,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -53,6 +71,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,6 +97,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)" \
 	"$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources32dir)" \
 	"$(DESTDIR)$(resources48dir)"
@@ -102,6 +131,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -139,6 +169,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -184,6 +215,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -217,7 +249,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -377,8 +408,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -392,13 +426,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 install-dist_resources16DATA: $(dist_resources16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources16dir)" || $(MKDIR_P) "$(DESTDIR)$(resources16dir)"
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -412,13 +447,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources32DATA: $(dist_resources32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources32dir)" || $(MKDIR_P) "$(DESTDIR)$(resources32dir)"
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -432,13 +468,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources48DATA: $(dist_resources48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources48dir)" || $(MKDIR_P) "$(DESTDIR)$(resources48dir)"
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -452,9 +489,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -509,10 +544,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/cyril/16x16/Makefile.in filezilla-3.7.3~precise/src/interface/resources/cyril/16x16/Makefile.in
--- filezilla-3.5.3/src/interface/resources/cyril/16x16/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/cyril/16x16/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -52,6 +70,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -73,6 +96,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)"
 DATA = $(dist_resources_DATA)
 DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
@@ -98,6 +127,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -135,6 +165,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -180,6 +211,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -213,7 +245,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -283,8 +314,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -298,9 +332,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -355,10 +387,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/cyril/Makefile.am filezilla-3.7.3~precise/src/interface/resources/cyril/Makefile.am
--- filezilla-3.5.3/src/interface/resources/cyril/Makefile.am	2008-02-29 03:00:11.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/cyril/Makefile.am	2013-04-05 03:30:06.000000000 +0000
@@ -4,15 +4,15 @@
 
 dist_resources_DATA = theme.xml
 
-dist_noinst_DATA = 
+dist_noinst_DATA =
 
 if MACAPPBUNDLE
 mac-copy-resources: $(dist_resources_DATA)
 	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"
 	for i in $(dist_resources_DATA); do \
-	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"; \
+		cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"; \
 	done
-	
+
 	$(MAKE) -C 16x16 mac-copy-resources
 #	$(MAKE) -C 32x32 mac-copy-resources
 endif
diff -Nru filezilla-3.5.3/src/interface/resources/cyril/Makefile.in filezilla-3.7.3~precise/src/interface/resources/cyril/Makefile.in
--- filezilla-3.5.3/src/interface/resources/cyril/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/cyril/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,8 +59,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -59,6 +77,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -80,6 +103,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)"
 DATA = $(dist_noinst_DATA) $(dist_resources_DATA)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -138,6 +167,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -175,6 +205,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -220,6 +251,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -253,7 +285,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -318,8 +349,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -333,9 +367,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 
 # This directory's subdirectories are mostly independent; you can cd
 # into them and run `make' without going through this Makefile.
@@ -504,13 +536,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -548,10 +577,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
@@ -651,7 +685,7 @@
 @MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA)
 @MACAPPBUNDLE_TRUE@	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"
 @MACAPPBUNDLE_TRUE@	for i in $(dist_resources_DATA); do \
-@MACAPPBUNDLE_TRUE@	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"; \
+@MACAPPBUNDLE_TRUE@		cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/cyril"; \
 @MACAPPBUNDLE_TRUE@	done
 
 @MACAPPBUNDLE_TRUE@	$(MAKE) -C 16x16 mac-copy-resources
diff -Nru filezilla-3.5.3/src/interface/resources/dialogs.xrc filezilla-3.7.3~precise/src/interface/resources/dialogs.xrc
--- filezilla-3.5.3/src/interface/resources/dialogs.xrc	2011-02-04 04:30:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/dialogs.xrc	2013-07-01 03:30:11.000000000 +0000
@@ -86,6 +86,16 @@
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
+                          <label>Signature algorithm:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_SIGNALGO">
+                          <label/>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
                           <label>Fingerprint (MD5):</label>
                         </object>
                       </object>
@@ -186,6 +196,26 @@
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
+                          <label>Protocol:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_PROTOCOL">
+                          <label>&lt;protocol&gt;</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
+                          <label>Key exchange:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_KEYEXCHANGE">
+                          <label>&lt;key exchange&gt;</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
                           <label>Cipher:</label>
                         </object>
                       </object>
@@ -339,6 +369,16 @@
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
+                          <label>Signature algorithm:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_SIGNALGO">
+                          <label/>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
                           <label>Fingerprint (MD5):</label>
                         </object>
                       </object>
@@ -439,6 +479,26 @@
                       </object>
                       <object class="sizeritem">
                         <object class="wxStaticText">
+                          <label>Protocol:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_PROTOCOL">
+                          <label>&lt;protocol&gt;</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
+                          <label>Key exchange:</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText" name="ID_KEYEXCHANGE">
+                          <label>&lt;key exchange&gt;</label>
+                        </object>
+                      </object>
+                      <object class="sizeritem">
+                        <object class="wxStaticText">
                           <label>Cipher:</label>
                         </object>
                       </object>
@@ -804,7 +864,7 @@
                   </object>
                   <object class="sizeritem">
                     <object class="wxButton" name="ID_COPY">
-                      <label>Cop&amp;y</label>
+                      <label>Dupl&amp;icate</label>
                     </object>
                     <flag>wxGROW</flag>
                   </object>
@@ -1734,7 +1794,7 @@
               </object>
               <object class="sizeritem">
                 <object class="wxStaticText" name="ID_COPYRIGHT">
-                  <label>&lt;Copyright 2004-2010&gt;</label>
+                  <label>&lt;Copyright 2004-2013&gt;</label>
                 </object>
                 <flag>wxTOP|wxBOTTOM</flag>
                 <border>5</border>
@@ -1749,8 +1809,8 @@
                   </object>
                   <object class="sizeritem">
                     <object class="wxHyperlinkCtrl" name="ID_URL">
-                      <label>&lt;http://filezilla-project.org&gt;</label>
-                      <url>http://filezilla-project.org</url>
+                      <label>&lt;https://filezilla-project.org&gt;</label>
+                      <url>https://filezilla-project.org</url>
                     </object>
                   </object>
                   <vgap>3</vgap>
@@ -1853,6 +1913,14 @@
               <object class="sizeritem">
                 <object class="wxStaticText" name="ID_VER_GNUTLS"/>
               </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="ID_VER_SQLITE_DESC">
+                  <label>SQLite:</label>
+                </object>
+              </object>
+              <object class="sizeritem">
+                <object class="wxStaticText" name="ID_VER_SQLITE"/>
+              </object>
               <vgap>3</vgap>
               <hgap>5</hgap>
             </object>
@@ -2369,7 +2437,7 @@
                   </object>
                   <object class="sizeritem">
                     <object class="wxButton" name="ID_COPY">
-                      <label>&amp;Copy</label>
+                      <label>D&amp;uplicate</label>
                     </object>
                     <flag>wxGROW</flag>
                   </object>
@@ -4143,7 +4211,7 @@
                   </object>
                   <object class="sizeritem">
                     <object class="wxButton" name="ID_COPY">
-                      <label>Cop&amp;y</label>
+                      <label>D&amp;uplicate</label>
                     </object>
                     <flag>wxGROW</flag>
                   </object>
@@ -4933,4 +5001,62 @@
     </object>
     <title>Speed Limits</title>
   </object>
+<object class="wxDialog" name="ID_ASK_SAVE_PASSWORD">
+  <object class="wxBoxSizer">
+    <object class="sizeritem">
+      <object class="wxFlexGridSizer">
+        <cols>1</cols>
+        <vgap>7</vgap>
+        <object class="sizeritem">
+          <object class="wxStaticText">
+            <label>Would you like FileZilla to remember passwords?</label>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <object class="wxStaticText">
+            <label>When allowing FileZilla to remember passwords, you can reconnnect without having to re-enter a password after restarting FileZilla.</label>
+          </object>
+        </object>
+        <object class="spacer"/>
+        <object class="sizeritem">
+          <object class="wxRadioButton" name="ID_REMEMBER_YES">
+            <label>&amp;Remember passwords</label>
+            <style>wxRB_GROUP</style>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <object class="wxRadioButton" name="ID_REMEMBER_NO">
+            <label>&amp;Do not remember passwords</label>
+          </object>
+        </object>
+        <object class="sizeritem">
+          <object class="wxStaticLine"/>
+          <flag>wxGROW</flag>
+        </object>
+        <object class="sizeritem">
+          <object class="wxFlexGridSizer">
+            <object class="sizeritem">
+              <object class="wxButton" name="wxID_OK">
+                <label>OK</label>
+                <default>1</default>
+              </object>
+            </object>
+            <object class="sizeritem">
+              <object class="wxButton" name="wxID_CANCEL">
+                <label>&amp;Cancel</label>
+              </object>
+            </object>
+            <cols>2</cols>
+            <hgap>5</hgap>
+          </object>
+          <flag>wxALIGN_RIGHT</flag>
+        </object>
+      </object>
+      <flag>wxALL</flag>
+      <border>7</border>
+    </object>
+    <orient>wxVERTICAL</orient>
+  </object>
+  <title>Remember passwords?</title>
+</object>
 </resource>
diff -Nru filezilla-3.5.3/src/interface/resources/filezilla.svg filezilla-3.7.3~precise/src/interface/resources/filezilla.svg
--- filezilla-3.5.3/src/interface/resources/filezilla.svg	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/filezilla.svg	2012-04-01 03:30:19.000000000 +0000
@@ -0,0 +1,76 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Generator: Adobe Illustrator 12.0.1, SVG Export Plug-In . SVG Version: 6.00 Build 51448)  -->
+<svg
+   xmlns:dc="http://purl.org/dc/elements/1.1/"
+   xmlns:cc="http://web.resource.org/cc/"
+   xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+   xmlns:svg="http://www.w3.org/2000/svg"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   version="1.1"
+   id="Layer_1"
+   width="379.955"
+   height="380.251"
+   viewBox="0 0 379.955 380.251"
+   overflow="visible"
+   enable-background="new 0 0 379.955 380.251"
+   xml:space="preserve"
+   sodipodi:version="0.32"
+   inkscape:version="0.45.1"
+   sodipodi:docname="fz3.svg"
+   inkscape:output_extension="org.inkscape.output.svg.inkscape"
+   sodipodi:docbase="C:\dev\test"><metadata
+   id="metadata2383"><rdf:RDF><cc:Work
+       rdf:about=""><dc:format>image/svg+xml</dc:format><dc:type
+         rdf:resource="http://purl.org/dc/dcmitype/StillImage" /></cc:Work></rdf:RDF></metadata><defs
+   id="defs2381">
+	
+	
+</defs><sodipodi:namedview
+   inkscape:window-height="719"
+   inkscape:window-width="1280"
+   inkscape:pageshadow="2"
+   inkscape:pageopacity="0.0"
+   guidetolerance="10.0"
+   gridtolerance="10.0"
+   objecttolerance="10.0"
+   borderopacity="1.0"
+   bordercolor="#666666"
+   pagecolor="#ffffff"
+   id="base"
+   inkscape:zoom="2.8339983"
+   inkscape:cx="190.33456"
+   inkscape:cy="331.44169"
+   inkscape:window-x="110"
+   inkscape:window-y="110"
+   inkscape:current-layer="Layer_1" />
+<g
+   id="g2305"
+   transform="matrix(2.1744356,0,0,2.1743734,-218.68734,-223.17239)">
+		<linearGradient
+   y2="258.86539"
+   x2="187.94679"
+   y1="123.8594"
+   x1="187.94679"
+   gradientUnits="userSpaceOnUse"
+   id="XMLID_2_">
+			<stop
+   id="stop2308"
+   style="stop-color:#BF0000"
+   offset="0" />
+			<stop
+   id="stop2310"
+   style="stop-color:#8F0000"
+   offset="1" />
+		</linearGradient>
+		<path
+   style="fill:url(#XMLID_2_)"
+   id="path2312"
+   d="M 100.572,108.605 L 100.572,116.32 C 103.798,116.32 106.423,118.945 106.423,122.17 C 106.423,125.397 103.798,128.022 100.572,128.022 L 100.572,135.737 C 103.798,135.737 106.423,138.362 106.423,141.587 C 106.423,144.814 103.798,147.439 100.572,147.439 L 100.572,155.154 C 103.798,155.154 106.423,157.779 106.423,161.008 C 106.423,164.237 103.798,166.862 100.572,166.862 L 100.572,174.577 C 103.798,174.577 106.423,177.2 106.423,180.427 C 106.423,183.654 103.798,186.279 100.572,186.279 L 100.572,193.994 C 103.798,193.994 106.423,196.617 106.423,199.844 C 106.423,203.071 103.798,205.696 100.572,205.696 L 100.572,213.411 C 103.798,213.411 106.423,216.034 106.423,219.261 C 106.423,222.488 103.798,225.113 100.572,225.113 L 100.572,232.828 C 103.798,232.828 106.423,235.451 106.423,238.678 C 106.423,241.905 103.798,244.53 100.572,244.53 L 100.572,252.245 C 103.798,252.245 106.423,254.868 106.423,258.095 C 106.423,261.322 103.798,263.947 100.572,263.947 L 100.572,271.666 C 102.112,271.666 103.62,272.289 104.71,273.379 C 105.798,274.467 106.423,275.975 106.423,277.516 L 114.138,277.516 C 114.138,274.289 116.763,271.666 119.989,271.666 C 123.215,271.666 125.84,274.289 125.84,277.516 L 133.555,277.516 C 133.555,274.289 136.18,271.666 139.406,271.666 C 142.632,271.666 145.257,274.289 145.257,277.516 L 152.972,277.516 C 152.972,274.289 155.597,271.666 158.823,271.666 C 162.049,271.666 164.674,274.289 164.674,277.516 L 172.389,277.516 C 172.389,274.289 175.014,271.666 178.24,271.666 C 181.466,271.666 184.091,274.289 184.091,277.516 L 191.806,277.516 C 191.806,274.289 194.431,271.666 197.657,271.666 C 200.883,271.666 203.508,274.289 203.508,277.516 L 211.223,277.516 C 211.223,274.289 213.848,271.666 217.074,271.666 C 220.3,271.666 222.925,274.289 222.925,277.516 L 230.64,277.516 C 230.64,274.289 233.265,271.666 236.491,271.666 C 239.717,271.666 242.342,274.289 242.342,277.516 L 250.057,277.516 C 250.057,274.289 252.682,271.666 255.908,271.666 C 259.134,271.666 261.759,274.289 261.759,277.516 L 269.478,277.516 C 269.478,275.975 270.103,274.467 271.193,273.379 C 272.281,272.289 273.789,271.666 275.33,271.666 L 275.33,263.951 C 272.103,263.951 269.478,261.326 269.478,258.099 C 269.478,254.872 272.103,252.249 275.33,252.249 L 275.33,244.534 C 272.103,244.534 269.478,241.909 269.478,238.682 C 269.478,235.455 272.103,232.832 275.33,232.832 L 275.33,225.117 C 272.103,225.117 269.478,222.492 269.478,219.265 C 269.478,216.038 272.103,213.415 275.33,213.415 L 275.33,205.7 C 272.103,205.7 269.478,203.075 269.478,199.848 C 269.478,196.621 272.103,193.998 275.33,193.998 L 275.33,186.283 C 272.103,186.283 269.478,183.658 269.478,180.431 C 269.478,177.204 272.103,174.581 275.33,174.581 L 275.33,166.866 C 272.103,166.866 269.478,164.241 269.478,161.012 C 269.478,157.783 272.103,155.158 275.33,155.158 L 275.33,147.443 C 272.103,147.443 269.478,144.818 269.478,141.591 C 269.478,138.366 272.103,135.741 275.33,135.741 L 275.33,128.026 C 272.103,128.026 269.478,125.401 269.478,122.174 C 269.478,118.949 272.103,116.324 275.33,116.324 L 275.33,108.605 C 273.789,108.605 272.281,107.98 271.193,106.892 C 270.103,105.802 269.478,104.294 269.478,102.753 L 261.763,102.753 C 261.763,105.98 259.138,108.605 255.912,108.605 C 252.686,108.605 250.061,105.98 250.061,102.753 L 242.346,102.753 C 242.346,105.98 239.721,108.605 236.495,108.605 C 233.269,108.605 230.644,105.98 230.644,102.753 L 222.929,102.753 C 222.929,105.98 220.304,108.605 217.078,108.605 C 213.852,108.605 211.227,105.98 211.227,102.753 L 203.512,102.753 C 203.512,105.98 200.887,108.605 197.661,108.605 C 194.435,108.605 191.81,105.98 191.81,102.753 L 184.095,102.753 C 184.095,105.98 181.47,108.605 178.244,108.605 C 175.018,108.605 172.393,105.98 172.393,102.753 L 164.678,102.753 C 164.678,105.98 162.053,108.605 158.827,108.605 C 155.601,108.605 152.976,105.98 152.976,102.753 L 145.261,102.753 C 145.261,105.98 142.636,108.605 139.41,108.605 C 136.184,108.605 133.559,105.98 133.559,102.753 L 125.844,102.753 C 125.844,105.98 123.219,108.605 119.993,108.605 C 116.767,108.605 114.142,105.98 114.142,102.753 L 106.423,102.753 C 106.423,104.294 105.798,105.802 104.71,106.892 C 103.62,107.98 102.112,108.605 100.572,108.605 z " />
+		<path
+   style="fill:#ffffff"
+   id="path2314"
+   d="M 249.444,172.681 L 162.239,172.681 L 166.79,151.388 L 219.94,151.388 L 224.816,128.47 L 148.422,128.47 L 124.366,241.924 L 147.447,241.924 L 158.01,192.348 L 213.371,192.348 L 165.266,239.973 L 173.718,254.926 C 177.618,252.326 183.957,252 188.346,252 C 196.149,252 203.788,254.602 211.75,254.602 C 219.051,254.602 226.525,254.114 238.717,248.262 L 242.977,228.27 C 234.686,231.682 222.419,234.934 211.75,234.934 C 207.364,234.934 203.3,233.959 199.074,233.309 L 245.705,187.961 L 249.444,172.681 z " />
+	</g>
+</svg>
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/16x16/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/16x16/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/16x16/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/16x16/bookmarks.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/32x32/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/32x32/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/32x32/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/32x32/bookmarks.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/48x48/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/48x48/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/lone/48x48/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/lone/48x48/bookmarks.png differ
diff -Nru filezilla-3.5.3/src/interface/resources/lone/Makefile.am filezilla-3.7.3~precise/src/interface/resources/lone/Makefile.am
--- filezilla-3.5.3/src/interface/resources/lone/Makefile.am	2008-07-24 18:12:47.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/lone/Makefile.am	2012-10-08 03:30:17.000000000 +0000
@@ -8,7 +8,7 @@
 dist_resources16_DATA = 16x16/ascii.png \
 		16x16/auto.png \
 		16x16/binary.png \
-		16x16/bookmarks.png \
+		16x16/bookmark.png \
 		16x16/cancel.png \
 		16x16/compare.png \
 		16x16/disconnect.png \
@@ -40,7 +40,7 @@
 dist_resources32_DATA = 32x32/ascii.png \
 		32x32/auto.png \
 		32x32/binary.png \
-		32x32/bookmarks.png \
+		32x32/bookmark.png \
 		32x32/cancel.png \
 		32x32/compare.png \
 		32x32/disconnect.png \
@@ -71,7 +71,7 @@
 dist_resources48_DATA = 48x48/ascii.png \
 		48x48/auto.png \
 		48x48/binary.png \
-		48x48/bookmarks.png \
+		48x48/bookmark.png \
 		48x48/cancel.png \
 		48x48/compare.png \
 		48x48/disconnect.png \
diff -Nru filezilla-3.5.3/src/interface/resources/lone/Makefile.in filezilla-3.7.3~precise/src/interface/resources/lone/Makefile.in
--- filezilla-3.5.3/src/interface/resources/lone/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/lone/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +60,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -53,6 +71,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,6 +97,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)" \
 	"$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources32dir)" \
 	"$(DESTDIR)$(resources48dir)"
@@ -102,6 +131,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -139,6 +169,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -184,6 +215,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -217,7 +249,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -245,7 +276,7 @@
 dist_resources16_DATA = 16x16/ascii.png \
 		16x16/auto.png \
 		16x16/binary.png \
-		16x16/bookmarks.png \
+		16x16/bookmark.png \
 		16x16/cancel.png \
 		16x16/compare.png \
 		16x16/disconnect.png \
@@ -277,7 +308,7 @@
 dist_resources32_DATA = 32x32/ascii.png \
 		32x32/auto.png \
 		32x32/binary.png \
-		32x32/bookmarks.png \
+		32x32/bookmark.png \
 		32x32/cancel.png \
 		32x32/compare.png \
 		32x32/disconnect.png \
@@ -308,7 +339,7 @@
 dist_resources48_DATA = 48x48/ascii.png \
 		48x48/auto.png \
 		48x48/binary.png \
-		48x48/bookmarks.png \
+		48x48/bookmark.png \
 		48x48/cancel.png \
 		48x48/compare.png \
 		48x48/disconnect.png \
@@ -377,8 +408,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -392,13 +426,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 install-dist_resources16DATA: $(dist_resources16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources16dir)" || $(MKDIR_P) "$(DESTDIR)$(resources16dir)"
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -412,13 +447,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources32DATA: $(dist_resources32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources32dir)" || $(MKDIR_P) "$(DESTDIR)$(resources32dir)"
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -432,13 +468,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources48DATA: $(dist_resources48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources48dir)" || $(MKDIR_P) "$(DESTDIR)$(resources48dir)"
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -452,9 +489,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -509,10 +544,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/menus.xrc filezilla-3.7.3~precise/src/interface/resources/menus.xrc
--- filezilla-3.5.3/src/interface/resources/menus.xrc	2011-08-30 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/menus.xrc	2012-10-24 03:30:07.000000000 +0000
@@ -299,6 +299,10 @@
       <label>&amp;Create directory</label>
       <help>Create a new subdirectory in the current directory</help>
     </object>
+    <object class="wxMenuItem" name="ID_NEW_FILE">
+      <label>Crea&amp;te new file</label>
+      <help>Create a new, empty file in the current directory</help>
+    </object>
     <object class="wxMenuItem" name="ID_CONTEXT_REFRESH">
       <label>Re&amp;fresh</label>
     </object>
@@ -423,6 +427,11 @@
       <label>&amp;Crash</label>
       <help>Crashes FileZilla instantly. Only used to debug the exception handler</help>
     </object>
+    <object class="separator"/>
+    <object class="wxMenuItem" name="ID_CIPHERS">
+      <label>&amp;TLS Ciphers</label>
+      <help>Shows available TLS ciphers</help>
+    </object>
   </object>
   <object class="wxMenu" name="ID_MENU_QUEUE_FAILED">
     <object class="wxMenuItem" name="ID_REMOVEALL">
diff -Nru filezilla-3.5.3/src/interface/resources/minimal/Makefile.in filezilla-3.7.3~precise/src/interface/resources/minimal/Makefile.in
--- filezilla-3.5.3/src/interface/resources/minimal/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/minimal/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +60,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -53,6 +71,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -74,6 +97,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)" \
 	"$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources32dir)"
 DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \
@@ -101,6 +130,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -138,6 +168,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -183,6 +214,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -216,7 +248,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -315,8 +346,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -330,13 +364,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 install-dist_resources16DATA: $(dist_resources16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources16dir)" || $(MKDIR_P) "$(DESTDIR)$(resources16dir)"
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -350,13 +385,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources32DATA: $(dist_resources32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources32dir)" || $(MKDIR_P) "$(DESTDIR)$(resources32dir)"
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -370,9 +406,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -427,10 +461,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/16x16/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/16x16/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/16x16/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/16x16/bookmarks.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/32x32/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/32x32/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/32x32/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/32x32/bookmarks.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/48x48/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/48x48/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/opencrystal/48x48/bookmarks.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/opencrystal/48x48/bookmarks.png differ
diff -Nru filezilla-3.5.3/src/interface/resources/opencrystal/Makefile.am filezilla-3.7.3~precise/src/interface/resources/opencrystal/Makefile.am
--- filezilla-3.5.3/src/interface/resources/opencrystal/Makefile.am	2010-11-04 04:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/opencrystal/Makefile.am	2012-10-08 03:30:21.000000000 +0000
@@ -10,7 +10,7 @@
 dist_resources16_DATA = 16x16/ascii.png \
 		16x16/auto.png \
 		16x16/binary.png \
-		16x16/bookmarks.png \
+		16x16/bookmark.png \
 		16x16/cancel.png \
 		16x16/compare.png \
 		16x16/disconnect.png \
@@ -47,7 +47,7 @@
 dist_resources32_DATA = 32x32/ascii.png \
 		32x32/auto.png \
 		32x32/binary.png \
-		32x32/bookmarks.png \
+		32x32/bookmark.png \
 		32x32/cancel.png \
 		32x32/compare.png \
 		32x32/disconnect.png \
@@ -79,7 +79,7 @@
 dist_resources48_DATA = 48x48/ascii.png \
 		48x48/auto.png \
 		48x48/binary.png \
-		48x48/bookmarks.png \
+		48x48/bookmark.png \
 		48x48/cancel.png \
 		48x48/compare.png \
 		48x48/disconnect.png \
diff -Nru filezilla-3.5.3/src/interface/resources/opencrystal/Makefile.in filezilla-3.7.3~precise/src/interface/resources/opencrystal/Makefile.in
--- filezilla-3.5.3/src/interface/resources/opencrystal/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/opencrystal/Makefile.in	2013-08-07 19:17:14.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -16,6 +16,23 @@
 @SET_MAKE@
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,8 +61,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -54,6 +72,11 @@
 CONFIG_CLEAN_VPATH_FILES =
 SOURCES =
 DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
 am__vpath_adj = case $$p in \
     $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
@@ -75,6 +98,12 @@
 am__base_list = \
   sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
   sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
 am__installdirs = "$(DESTDIR)$(resourcesdir)" \
 	"$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources20dir)" \
 	"$(DESTDIR)$(resources24dir)" "$(DESTDIR)$(resources32dir)" \
@@ -105,6 +134,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -142,6 +172,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -187,6 +218,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -220,7 +252,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -250,7 +281,7 @@
 dist_resources16_DATA = 16x16/ascii.png \
 		16x16/auto.png \
 		16x16/binary.png \
-		16x16/bookmarks.png \
+		16x16/bookmark.png \
 		16x16/cancel.png \
 		16x16/compare.png \
 		16x16/disconnect.png \
@@ -285,7 +316,7 @@
 dist_resources32_DATA = 32x32/ascii.png \
 		32x32/auto.png \
 		32x32/binary.png \
-		32x32/bookmarks.png \
+		32x32/bookmark.png \
 		32x32/cancel.png \
 		32x32/compare.png \
 		32x32/disconnect.png \
@@ -317,7 +348,7 @@
 dist_resources48_DATA = 48x48/ascii.png \
 		48x48/auto.png \
 		48x48/binary.png \
-		48x48/bookmarks.png \
+		48x48/bookmark.png \
 		48x48/cancel.png \
 		48x48/compare.png \
 		48x48/disconnect.png \
@@ -387,8 +418,11 @@
 	-rm -rf .libs _libs
 install-dist_resourcesDATA: $(dist_resources_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resourcesdir)" || $(MKDIR_P) "$(DESTDIR)$(resourcesdir)"
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -402,13 +436,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resourcesdir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resourcesdir)" && rm -f $$files
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
 install-dist_resources16DATA: $(dist_resources16_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources16dir)" || $(MKDIR_P) "$(DESTDIR)$(resources16dir)"
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -422,13 +457,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources16dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources16dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources20DATA: $(dist_resources20_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources20dir)" || $(MKDIR_P) "$(DESTDIR)$(resources20dir)"
 	@list='$(dist_resources20_DATA)'; test -n "$(resources20dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources20dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources20dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -442,13 +478,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources20_DATA)'; test -n "$(resources20dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources20dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources20dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources20dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources24DATA: $(dist_resources24_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources24dir)" || $(MKDIR_P) "$(DESTDIR)$(resources24dir)"
 	@list='$(dist_resources24_DATA)'; test -n "$(resources24dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources24dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources24dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -462,13 +499,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources24_DATA)'; test -n "$(resources24dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources24dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources24dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources24dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources32DATA: $(dist_resources32_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources32dir)" || $(MKDIR_P) "$(DESTDIR)$(resources32dir)"
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -482,13 +520,14 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources32dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources32dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir)
 install-dist_resources48DATA: $(dist_resources48_DATA)
 	@$(NORMAL_INSTALL)
-	test -z "$(resources48dir)" || $(MKDIR_P) "$(DESTDIR)$(resources48dir)"
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources48dir)" || exit 1; \
+	fi; \
 	for p in $$list; do \
 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
 	  echo "$$d$$p"; \
@@ -502,9 +541,7 @@
 	@$(NORMAL_UNINSTALL)
 	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
 	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
-	test -n "$$files" || exit 0; \
-	echo " ( cd '$(DESTDIR)$(resources48dir)' && rm -f" $$files ")"; \
-	cd "$(DESTDIR)$(resources48dir)" && rm -f $$files
+	dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir)
 tags: TAGS
 TAGS:
 
@@ -559,10 +596,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/interface/resources/quickconnectbar.xrc filezilla-3.7.3~precise/src/interface/resources/quickconnectbar.xrc
--- filezilla-3.5.3/src/interface/resources/quickconnectbar.xrc	2010-04-25 10:48:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/quickconnectbar.xrc	2012-12-02 04:30:06.000000000 +0000
@@ -42,7 +42,7 @@
               <style>wxTE_PROCESS_ENTER</style>
               <tooltip>Enter the address of the server.
 To specify the server protocol, prepend the host with the protocol identifier. If no protocol is specified, the default protocol (ftp://) will be used.
-You can also enter complete URLs in the form protocol://user:pass@host:port here, the values in the other fields will be overwritten then.</tooltip>
+You can also enter complete URLs in the form protocol://user:pass@host:port here, the values in the other fields will be overwritten then.\n\nSupported protocols are:\n- ftp:// for normal FTP\n- sftp:// for SSH file transfer protocol\n- ftps:// for FTP over TLS (implicit)\n- ftpes:// for FTP over TLS (explicit)</tooltip>
             </object>
           </object>
           <object class="sizeritem">
diff -Nru filezilla-3.5.3/src/interface/resources/settings.xrc filezilla-3.7.3~precise/src/interface/resources/settings.xrc
--- filezilla-3.5.3/src/interface/resources/settings.xrc	2011-11-01 16:41:52.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/settings.xrc	2013-05-01 03:30:03.000000000 +0000
@@ -1,4 +1,3 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <resource version="2.3.0.1" xmlns="http://www.wxwindows.org/wxxrc">
   <object class="wxDialog" name="ID_SETTINGS">
     <title>Settings</title>
@@ -976,7 +975,7 @@
                   <object class="sizeritem">
                     <object class="wxTextCtrl" name="ID_REPLACE"/>
                     <flag>wxALIGN_CENTER_VERTICAL</flag>
-                    <minsize>15,-1</minsize>
+                    <minsize>25,-1</minsize>
                   </object>
                 </object>
               </object>
@@ -1320,7 +1319,7 @@
                   <label>S&amp;how the Site Manager on startup</label>
                 </object>
                 <flag>wxALL|wxALIGN_LEFT|wxALIGN_CENTER_VERTICAL</flag>
-                </object>
+              </object>
               <cols>1</cols>
               <vgap>5</vgap>
             </object>
@@ -1963,74 +1962,72 @@
       <orient>wxVERTICAL</orient>
       <object class="sizeritem">
         <object class="wxStaticBoxSizer">
-          <label>Automatic update check</label>
-          <orient>wxVERTICAL</orient>
           <object class="sizeritem">
             <object class="wxFlexGridSizer">
               <object class="sizeritem">
-                <object class="wxCheckBox" name="ID_UPDATECHECK">
-                  <label>&amp;Enable automatic update check</label>
+                <object class="wxStaticText">
+                  <label>Check for FileZilla &amp;updates automatically:</label>
                 </object>
               </object>
               <object class="sizeritem">
-                <object class="wxBoxSizer">
-                  <orient>wxHORIZONTAL</orient>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>&amp;Number of days between update checks:</label>
-                    </object>
-                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxTextCtrl" name="ID_DAYS">
-                      <size>30,-1</size>
-                    </object>
-                    <flag>wxALIGN_CENTRE_VERTICAL|wxLEFT|wxRIGHT</flag>
-                    <border>5</border>
-                  </object>
-                  <object class="sizeritem">
-                    <object class="wxStaticText">
-                      <label>(At least 7 days)</label>
-                    </object>
-                    <flag>wxALIGN_CENTRE_VERTICAL</flag>
-                  </object>
+                <object class="wxChoice" name="ID_UPDATECHECK">
+                  <content>
+                    <item>Never</item>
+                    <item>Once a week</item>
+                    <item>Every two weeks</item>
+                    <item>Every month</item>
+                  </content>
+                  <selection>1</selection>
                 </object>
-              </object>
+              </object>              
               <object class="spacer">
                 <size>0,10</size>
               </object>
               <object class="sizeritem">
-                <object class="wxButton" name="ID_RUNUPDATECHECK">
-                  <label>&amp;Run update check now...</label>
+                <object class="wxStaticText">
+                  <label>&amp;When checking for updates, check for:</label>
                 </object>
               </object>
-              <cols>1</cols>
-              <vgap>3</vgap>
-              <object class="spacer">
-                <size>0,10</size>
+              <object class="sizeritem">
+                <object class="wxChoice" name="ID_UPDATETYPE">
+                  <content>
+                    <item>Stable versions only</item>
+                    <item>Stable and beta versions</item>
+<!--                    <item>Stable, beta and nightly versions</item>-->
+                  </content>
+                  <selection>0</selection>
+                </object>
               </object>
               <object class="sizeritem">
-                <object class="wxCheckBox" name="ID_CHECKBETA">
-                  <label>Check for &amp;beta versions and release candidates</label>
+                <object class="wxStaticText">
+                  <label>Advice: Unless you want to test new features, please keep using stable versions only. Beta versions and nightly builds are development versions meant for testing purposes. Nightly builds of FileZilla may not work as expected and might even damage your system. Use beta versions and nightly builds at your own risk.</label>
                 </object>
               </object>
               <object class="spacer">
                 <size>0,10</size>
               </object>
               <object class="sizeritem">
-                <object class="wxStaticText">
-                  <label>Privacy policy:</label>
+                <flag>wxALIGN_CENTRE_HORIZONTAL</flag>
+                <object class="wxButton" name="ID_RUNUPDATECHECK">
+                  <label>&amp;Run update check now...</label>
                 </object>
               </object>
               <object class="sizeritem">
                 <object class="wxStaticText">
-                  <label>Only the versions of FileZilla and the operating system you are using will be submitted to the server.</label>
+                  <label>Privacy policy: Only your version of FileZilla, your used operating system and your CPU architecture will be submitted to the server.</label>
                 </object>
               </object>
+              <cols>1</cols>
+              <vgap>3</vgap>
+              <growablecols>0</growablecols>
+              <growablerows>6</growablerows>
             </object>
-            <flag>wxALL</flag>
+            <flag>wxALL|wxGROW</flag>
+            <option>1</option>
             <border>5</border>
           </object>
+          <label>FileZilla updates</label>
+          <orient>wxVERTICAL</orient>
         </object>
         <option>1</option>
         <flag>wxGROW</flag>
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/ascii.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/ascii.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/auto.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/auto.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/binary.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/binary.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/cancel.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/cancel.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/compare.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/compare.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/disconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/disconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/download.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/download.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/downloadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/downloadadd.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/file.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/file.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/filter.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/filter.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/find.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/find.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/folder.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/folder.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/folderclosed.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/folderclosed.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/localtreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/localtreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/lock.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/lock.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/logview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/logview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/processqueue.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/processqueue.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/queueview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/queueview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/reconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/reconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/refresh.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/refresh.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/remotetreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/remotetreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/server.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/server.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/sitemanager.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/sitemanager.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/synchronize.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/synchronize.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/unknown.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/unknown.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/upload.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/upload.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/16x16/uploadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/16x16/uploadadd.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/ascii.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/ascii.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/auto.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/auto.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/binary.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/binary.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/cancel.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/cancel.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/compare.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/compare.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/disconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/disconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/download.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/download.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/downloadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/downloadadd.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/file.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/file.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/filter.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/filter.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/find.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/find.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/folder.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/folder.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/folderclosed.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/folderclosed.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/localtreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/localtreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/lock.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/lock.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/logview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/logview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/processqueue.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/processqueue.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/queueview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/queueview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/reconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/reconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/refresh.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/refresh.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/remotetreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/remotetreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/server.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/server.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/sitemanager.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/sitemanager.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/synchronize.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/synchronize.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/unknown.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/unknown.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/upload.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/upload.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/32x32/uploadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/32x32/uploadadd.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/ascii.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/ascii.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/auto.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/auto.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/binary.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/binary.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/bookmark.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/bookmark.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/cancel.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/cancel.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/compare.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/compare.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/disconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/disconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/download.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/download.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/downloadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/downloadadd.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/file.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/file.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/filter.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/filter.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/find.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/find.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/folder.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/folder.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/folderclosed.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/folderclosed.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/localtreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/localtreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/lock.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/lock.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/logview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/logview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/processqueue.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/processqueue.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/queueview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/queueview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/reconnect.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/reconnect.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/refresh.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/refresh.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/remotetreeview.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/remotetreeview.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/server.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/server.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/sitemanager.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/sitemanager.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/synchronize.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/synchronize.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/unknown.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/unknown.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/upload.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/upload.png differ
Binary files /tmp/8bj5EXcRK_/filezilla-3.5.3/src/interface/resources/tango/48x48/uploadadd.png and /tmp/Nu84t3txIh/filezilla-3.7.3~precise/src/interface/resources/tango/48x48/uploadadd.png differ
diff -Nru filezilla-3.5.3/src/interface/resources/tango/Makefile.am filezilla-3.7.3~precise/src/interface/resources/tango/Makefile.am
--- filezilla-3.5.3/src/interface/resources/tango/Makefile.am	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/tango/Makefile.am	2012-10-08 03:30:12.000000000 +0000
@@ -0,0 +1,113 @@
+resourcesdir = $(pkgdatadir)/resources/tango
+resources16dir = $(pkgdatadir)/resources/tango/16x16
+resources32dir = $(pkgdatadir)/resources/tango/32x32
+resources48dir = $(pkgdatadir)/resources/tango/48x48
+
+dist_resources_DATA = theme.xml
+
+dist_resources16_DATA = 16x16/ascii.png \
+		16x16/auto.png \
+		16x16/binary.png \
+		16x16/bookmark.png \
+		16x16/cancel.png \
+		16x16/compare.png \
+		16x16/disconnect.png \
+		16x16/download.png \
+		16x16/downloadadd.png \
+		16x16/file.png \
+		16x16/filter.png \
+		16x16/find.png \
+		16x16/folder.png \
+		16x16/folderclosed.png \
+		16x16/localtreeview.png \
+		16x16/lock.png \
+		16x16/logview.png \
+		16x16/processqueue.png \
+		16x16/queueview.png \
+		16x16/reconnect.png \
+		16x16/refresh.png \
+		16x16/remotetreeview.png \
+		16x16/server.png \
+		16x16/sitemanager.png \
+		16x16/synchronize.png \
+		16x16/unknown.png \
+		16x16/upload.png \
+		16x16/uploadadd.png
+
+dist_resources32_DATA = 32x32/ascii.png \
+		32x32/auto.png \
+		32x32/binary.png \
+		32x32/bookmark.png \
+		32x32/cancel.png \
+		32x32/compare.png \
+		32x32/disconnect.png \
+		32x32/download.png \
+		32x32/downloadadd.png \
+		32x32/file.png \
+		32x32/filter.png \
+		32x32/find.png \
+		32x32/folder.png \
+		32x32/folderclosed.png \
+		32x32/localtreeview.png \
+		32x32/lock.png \
+		32x32/logview.png \
+		32x32/processqueue.png \
+		32x32/queueview.png \
+		32x32/reconnect.png \
+		32x32/refresh.png \
+		32x32/remotetreeview.png \
+		32x32/server.png \
+		32x32/sitemanager.png \
+		32x32/synchronize.png \
+		32x32/unknown.png \
+		32x32/upload.png \
+		32x32/uploadadd.png
+
+dist_resources48_DATA = 48x48/ascii.png \
+		48x48/auto.png \
+		48x48/binary.png \
+		48x48/bookmark.png \
+		48x48/cancel.png \
+		48x48/compare.png \
+		48x48/disconnect.png \
+		48x48/download.png \
+		48x48/downloadadd.png \
+		48x48/file.png \
+		48x48/filter.png \
+		48x48/find.png \
+		48x48/folder.png \
+		48x48/folderclosed.png \
+		48x48/localtreeview.png \
+		48x48/lock.png \
+		48x48/logview.png \
+		48x48/processqueue.png \
+		48x48/queueview.png \
+		48x48/reconnect.png \
+		48x48/refresh.png \
+		48x48/remotetreeview.png \
+		48x48/server.png \
+		48x48/sitemanager.png \
+		48x48/synchronize.png \
+		48x48/unknown.png \
+		48x48/upload.png \
+		48x48/uploadadd.png
+
+if MACAPPBUNDLE
+mac-copy-resources: $(dist_resources_DATA)
+	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/16x16";
+	for i in $(dist_resources16_DATA); do \
+	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/16x16"; \
+	done
+	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/32x32";
+	for i in $(dist_resources32_DATA); do \
+	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/32x32"; \
+	done
+	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/48x48";
+	for i in $(dist_resources48_DATA); do \
+	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/48x48"; \
+	done
+	for i in $(dist_resources_DATA); do \
+	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango"; \
+	done
+endif
+
diff -Nru filezilla-3.5.3/src/interface/resources/tango/Makefile.in filezilla-3.7.3~precise/src/interface/resources/tango/Makefile.in
--- filezilla-3.5.3/src/interface/resources/tango/Makefile.in	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/tango/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -0,0 +1,667 @@
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
+# @configure_input@
+
+# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
+# This Makefile.in is free software; the Free Software Foundation
+# gives unlimited permission to copy and/or distribute it,
+# with or without modifications, as long as this notice is preserved.
+
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY, to the extent permitted by law; without
+# even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+# PARTICULAR PURPOSE.
+
+@SET_MAKE@
+
+VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
+pkgdatadir = $(datadir)/@PACKAGE@
+pkgincludedir = $(includedir)/@PACKAGE@
+pkglibdir = $(libdir)/@PACKAGE@
+pkglibexecdir = $(libexecdir)/@PACKAGE@
+am__cd = CDPATH="$${ZSH_VERSION+.}$(PATH_SEPARATOR)" && cd
+install_sh_DATA = $(install_sh) -c -m 644
+install_sh_PROGRAM = $(install_sh) -c
+install_sh_SCRIPT = $(install_sh) -c
+INSTALL_HEADER = $(INSTALL_DATA)
+transform = $(program_transform_name)
+NORMAL_INSTALL = :
+PRE_INSTALL = :
+POST_INSTALL = :
+NORMAL_UNINSTALL = :
+PRE_UNINSTALL = :
+POST_UNINSTALL = :
+build_triplet = @build@
+host_triplet = @host@
+subdir = src/interface/resources/tango
+DIST_COMMON = $(dist_resources16_DATA) $(dist_resources32_DATA) \
+	$(dist_resources48_DATA) $(dist_resources_DATA) \
+	$(srcdir)/Makefile.am $(srcdir)/Makefile.in
+ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
+am__aclocal_m4_deps = $(top_srcdir)/m4/check_cxx0x.m4 \
+	$(top_srcdir)/m4/cppunit.m4 \
+	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
+	$(top_srcdir)/m4/fz_checkversion.m4 \
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
+am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
+	$(ACLOCAL_M4)
+mkinstalldirs = $(install_sh) -d
+CONFIG_HEADER = $(top_builddir)/src/include/config.h
+CONFIG_CLEAN_FILES =
+CONFIG_CLEAN_VPATH_FILES =
+SOURCES =
+DIST_SOURCES =
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
+am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
+am__vpath_adj = case $$p in \
+    $(srcdir)/*) f=`echo "$$p" | sed "s|^$$srcdirstrip/||"`;; \
+    *) f=$$p;; \
+  esac;
+am__strip_dir = f=`echo $$p | sed -e 's|^.*/||'`;
+am__install_max = 40
+am__nobase_strip_setup = \
+  srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*|]/\\\\&/g'`
+am__nobase_strip = \
+  for p in $$list; do echo "$$p"; done | sed -e "s|$$srcdirstrip/||"
+am__nobase_list = $(am__nobase_strip_setup); \
+  for p in $$list; do echo "$$p $$p"; done | \
+  sed "s| $$srcdirstrip/| |;"' / .*\//!s/ .*/ ./; s,\( .*\)/[^/]*$$,\1,' | \
+  $(AWK) 'BEGIN { files["."] = "" } { files[$$2] = files[$$2] " " $$1; \
+    if (++n[$$2] == $(am__install_max)) \
+      { print $$2, files[$$2]; n[$$2] = 0; files[$$2] = "" } } \
+    END { for (dir in files) print dir, files[dir] }'
+am__base_list = \
+  sed '$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;$$!N;s/\n/ /g' | \
+  sed '$$!N;$$!N;$$!N;$$!N;s/\n/ /g'
+am__uninstall_files_from_dir = { \
+  test -z "$$files" \
+    || { test ! -d "$$dir" && test ! -f "$$dir" && test ! -r "$$dir"; } \
+    || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+         $(am__cd) "$$dir" && rm -f $$files; }; \
+  }
+am__installdirs = "$(DESTDIR)$(resourcesdir)" \
+	"$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources32dir)" \
+	"$(DESTDIR)$(resources48dir)"
+DATA = $(dist_resources_DATA) $(dist_resources16_DATA) \
+	$(dist_resources32_DATA) $(dist_resources48_DATA)
+DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+ACLOCAL = @ACLOCAL@
+AMTAR = @AMTAR@
+AR = @AR@
+AUTOCONF = @AUTOCONF@
+AUTOHEADER = @AUTOHEADER@
+AUTOMAKE = @AUTOMAKE@
+AWK = @AWK@
+CC = @CC@
+CCDEPMODE = @CCDEPMODE@
+CFLAGS = @CFLAGS@
+CPP = @CPP@
+CPPFLAGS = @CPPFLAGS@
+CPPUNIT_CFLAGS = @CPPUNIT_CFLAGS@
+CPPUNIT_CONFIG = @CPPUNIT_CONFIG@
+CPPUNIT_LIBS = @CPPUNIT_LIBS@
+CXX = @CXX@
+CXXCPP = @CXXCPP@
+CXXDEPMODE = @CXXDEPMODE@
+CXXFLAGS = @CXXFLAGS@
+CYGPATH_W = @CYGPATH_W@
+DEFS = @DEFS@
+DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
+DSYMUTIL = @DSYMUTIL@
+DUMPBIN = @DUMPBIN@
+ECHO_C = @ECHO_C@
+ECHO_N = @ECHO_N@
+ECHO_T = @ECHO_T@
+EGREP = @EGREP@
+EXEEXT = @EXEEXT@
+FGREP = @FGREP@
+FILEZILLA_LINGUAS = @FILEZILLA_LINGUAS@
+FILEZILLA_LINGUAS_MO = @FILEZILLA_LINGUAS_MO@
+FILEZILLA_LINGUAS_PO = @FILEZILLA_LINGUAS_PO@
+FILEZILLA_LINGUAS_PO_NEW = @FILEZILLA_LINGUAS_PO_NEW@
+GREP = @GREP@
+IDN_LIB = @IDN_LIB@
+INSTALL = @INSTALL@
+INSTALL_DATA = @INSTALL_DATA@
+INSTALL_PROGRAM = @INSTALL_PROGRAM@
+INSTALL_SCRIPT = @INSTALL_SCRIPT@
+INSTALL_STRIP_PROGRAM = @INSTALL_STRIP_PROGRAM@
+LD = @LD@
+LDFLAGS = @LDFLAGS@
+LIBDBUS_CFLAGS = @LIBDBUS_CFLAGS@
+LIBDBUS_LIBS = @LIBDBUS_LIBS@
+LIBGNUTLS_CFLAGS = @LIBGNUTLS_CFLAGS@
+LIBGNUTLS_CONFIG = @LIBGNUTLS_CONFIG@
+LIBGNUTLS_LIBS = @LIBGNUTLS_LIBS@
+LIBGTK_CFLAGS = @LIBGTK_CFLAGS@
+LIBGTK_LIBS = @LIBGTK_LIBS@
+LIBOBJS = @LIBOBJS@
+LIBS = @LIBS@
+LIBSQLITE3_CFLAGS = @LIBSQLITE3_CFLAGS@
+LIBSQLITE3_LIBS = @LIBSQLITE3_LIBS@
+LIBTOOL = @LIBTOOL@
+LIPO = @LIPO@
+LN_S = @LN_S@
+LTLIBOBJS = @LTLIBOBJS@
+MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
+MKDIR_P = @MKDIR_P@
+NM = @NM@
+NMEDIT = @NMEDIT@
+OBJDUMP = @OBJDUMP@
+OBJEXT = @OBJEXT@
+OTOOL = @OTOOL@
+OTOOL64 = @OTOOL64@
+PACKAGE = @PACKAGE@
+PACKAGE_BUGREPORT = @PACKAGE_BUGREPORT@
+PACKAGE_NAME = @PACKAGE_NAME@
+PACKAGE_STRING = @PACKAGE_STRING@
+PACKAGE_TARNAME = @PACKAGE_TARNAME@
+PACKAGE_URL = @PACKAGE_URL@
+PACKAGE_VERSION = @PACKAGE_VERSION@
+PACKAGE_VERSION_MAJOR = @PACKAGE_VERSION_MAJOR@
+PACKAGE_VERSION_MICRO = @PACKAGE_VERSION_MICRO@
+PACKAGE_VERSION_MINOR = @PACKAGE_VERSION_MINOR@
+PACKAGE_VERSION_NANO = @PACKAGE_VERSION_NANO@
+PATH_SEPARATOR = @PATH_SEPARATOR@
+PKG_CONFIG = @PKG_CONFIG@
+RANLIB = @RANLIB@
+SED = @SED@
+SET_MAKE = @SET_MAKE@
+SHELL = @SHELL@
+STRIP = @STRIP@
+TINYXML_LIBS = @TINYXML_LIBS@
+VERSION = @VERSION@
+WINDRES = @WINDRES@
+WINDRESFLAGS = @WINDRESFLAGS@
+WXRC = @WXRC@
+WX_CFLAGS = @WX_CFLAGS@
+WX_CFLAGS_ONLY = @WX_CFLAGS_ONLY@
+WX_CONFIG_PATH = @WX_CONFIG_PATH@
+WX_CONFIG_WITH_ARGS = @WX_CONFIG_WITH_ARGS@
+WX_CPPFLAGS = @WX_CPPFLAGS@
+WX_CXXFLAGS = @WX_CXXFLAGS@
+WX_CXXFLAGS_ONLY = @WX_CXXFLAGS_ONLY@
+WX_LIBS = @WX_LIBS@
+WX_LIBS_STATIC = @WX_LIBS_STATIC@
+WX_RESCOMP = @WX_RESCOMP@
+WX_VERSION = @WX_VERSION@
+abs_builddir = @abs_builddir@
+abs_srcdir = @abs_srcdir@
+abs_top_builddir = @abs_top_builddir@
+abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
+ac_ct_CC = @ac_ct_CC@
+ac_ct_CXX = @ac_ct_CXX@
+ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
+am__include = @am__include@
+am__leading_dot = @am__leading_dot@
+am__quote = @am__quote@
+am__tar = @am__tar@
+am__untar = @am__untar@
+bindir = @bindir@
+build = @build@
+build_alias = @build_alias@
+build_cpu = @build_cpu@
+build_os = @build_os@
+build_vendor = @build_vendor@
+builddir = @builddir@
+datadir = @datadir@
+datarootdir = @datarootdir@
+docdir = @docdir@
+dvidir = @dvidir@
+exec_prefix = @exec_prefix@
+host = @host@
+host_alias = @host_alias@
+host_cpu = @host_cpu@
+host_os = @host_os@
+host_vendor = @host_vendor@
+htmldir = @htmldir@
+includedir = @includedir@
+infodir = @infodir@
+install_sh = @install_sh@
+libdir = @libdir@
+libexecdir = @libexecdir@
+localedir = @localedir@
+localstatedir = @localstatedir@
+mandir = @mandir@
+mkdir_p = @mkdir_p@
+msgfmt = @msgfmt@
+msgmerge = @msgmerge@
+oldincludedir = @oldincludedir@
+pdfdir = @pdfdir@
+prefix = @prefix@
+program_transform_name = @program_transform_name@
+psdir = @psdir@
+sbindir = @sbindir@
+sharedstatedir = @sharedstatedir@
+srcdir = @srcdir@
+sysconfdir = @sysconfdir@
+target_alias = @target_alias@
+top_build_prefix = @top_build_prefix@
+top_builddir = @top_builddir@
+top_srcdir = @top_srcdir@
+xdgopen = @xdgopen@
+xgettext = @xgettext@
+resourcesdir = $(pkgdatadir)/resources/tango
+resources16dir = $(pkgdatadir)/resources/tango/16x16
+resources32dir = $(pkgdatadir)/resources/tango/32x32
+resources48dir = $(pkgdatadir)/resources/tango/48x48
+dist_resources_DATA = theme.xml
+dist_resources16_DATA = 16x16/ascii.png \
+		16x16/auto.png \
+		16x16/binary.png \
+		16x16/bookmark.png \
+		16x16/cancel.png \
+		16x16/compare.png \
+		16x16/disconnect.png \
+		16x16/download.png \
+		16x16/downloadadd.png \
+		16x16/file.png \
+		16x16/filter.png \
+		16x16/find.png \
+		16x16/folder.png \
+		16x16/folderclosed.png \
+		16x16/localtreeview.png \
+		16x16/lock.png \
+		16x16/logview.png \
+		16x16/processqueue.png \
+		16x16/queueview.png \
+		16x16/reconnect.png \
+		16x16/refresh.png \
+		16x16/remotetreeview.png \
+		16x16/server.png \
+		16x16/sitemanager.png \
+		16x16/synchronize.png \
+		16x16/unknown.png \
+		16x16/upload.png \
+		16x16/uploadadd.png
+
+dist_resources32_DATA = 32x32/ascii.png \
+		32x32/auto.png \
+		32x32/binary.png \
+		32x32/bookmark.png \
+		32x32/cancel.png \
+		32x32/compare.png \
+		32x32/disconnect.png \
+		32x32/download.png \
+		32x32/downloadadd.png \
+		32x32/file.png \
+		32x32/filter.png \
+		32x32/find.png \
+		32x32/folder.png \
+		32x32/folderclosed.png \
+		32x32/localtreeview.png \
+		32x32/lock.png \
+		32x32/logview.png \
+		32x32/processqueue.png \
+		32x32/queueview.png \
+		32x32/reconnect.png \
+		32x32/refresh.png \
+		32x32/remotetreeview.png \
+		32x32/server.png \
+		32x32/sitemanager.png \
+		32x32/synchronize.png \
+		32x32/unknown.png \
+		32x32/upload.png \
+		32x32/uploadadd.png
+
+dist_resources48_DATA = 48x48/ascii.png \
+		48x48/auto.png \
+		48x48/binary.png \
+		48x48/bookmark.png \
+		48x48/cancel.png \
+		48x48/compare.png \
+		48x48/disconnect.png \
+		48x48/download.png \
+		48x48/downloadadd.png \
+		48x48/file.png \
+		48x48/filter.png \
+		48x48/find.png \
+		48x48/folder.png \
+		48x48/folderclosed.png \
+		48x48/localtreeview.png \
+		48x48/lock.png \
+		48x48/logview.png \
+		48x48/processqueue.png \
+		48x48/queueview.png \
+		48x48/reconnect.png \
+		48x48/refresh.png \
+		48x48/remotetreeview.png \
+		48x48/server.png \
+		48x48/sitemanager.png \
+		48x48/synchronize.png \
+		48x48/unknown.png \
+		48x48/upload.png \
+		48x48/uploadadd.png
+
+all: all-am
+
+.SUFFIXES:
+$(srcdir)/Makefile.in:  $(srcdir)/Makefile.am  $(am__configure_deps)
+	@for dep in $?; do \
+	  case '$(am__configure_deps)' in \
+	    *$$dep*) \
+	      ( cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh ) \
+	        && { if test -f $@; then exit 0; else break; fi; }; \
+	      exit 1;; \
+	  esac; \
+	done; \
+	echo ' cd $(top_srcdir) && $(AUTOMAKE) --gnu src/interface/resources/tango/Makefile'; \
+	$(am__cd) $(top_srcdir) && \
+	  $(AUTOMAKE) --gnu src/interface/resources/tango/Makefile
+.PRECIOUS: Makefile
+Makefile: $(srcdir)/Makefile.in $(top_builddir)/config.status
+	@case '$?' in \
+	  *config.status*) \
+	    cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh;; \
+	  *) \
+	    echo ' cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe)'; \
+	    cd $(top_builddir) && $(SHELL) ./config.status $(subdir)/$@ $(am__depfiles_maybe);; \
+	esac;
+
+$(top_builddir)/config.status: $(top_srcdir)/configure $(CONFIG_STATUS_DEPENDENCIES)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+
+$(top_srcdir)/configure:  $(am__configure_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(ACLOCAL_M4):  $(am__aclocal_m4_deps)
+	cd $(top_builddir) && $(MAKE) $(AM_MAKEFLAGS) am--refresh
+$(am__aclocal_m4_deps):
+
+mostlyclean-libtool:
+	-rm -f *.lo
+
+clean-libtool:
+	-rm -rf .libs _libs
+install-dist_resourcesDATA: $(dist_resources_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resourcesdir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resourcesdir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resourcesdir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(resourcesdir)" || exit $$?; \
+	done
+
+uninstall-dist_resourcesDATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_resources_DATA)'; test -n "$(resourcesdir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(resourcesdir)'; $(am__uninstall_files_from_dir)
+install-dist_resources16DATA: $(dist_resources16_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources16dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources16dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources16dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(resources16dir)" || exit $$?; \
+	done
+
+uninstall-dist_resources16DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_resources16_DATA)'; test -n "$(resources16dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(resources16dir)'; $(am__uninstall_files_from_dir)
+install-dist_resources32DATA: $(dist_resources32_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources32dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources32dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources32dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(resources32dir)" || exit $$?; \
+	done
+
+uninstall-dist_resources32DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_resources32_DATA)'; test -n "$(resources32dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(resources32dir)'; $(am__uninstall_files_from_dir)
+install-dist_resources48DATA: $(dist_resources48_DATA)
+	@$(NORMAL_INSTALL)
+	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(resources48dir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(resources48dir)" || exit 1; \
+	fi; \
+	for p in $$list; do \
+	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+	  echo "$$d$$p"; \
+	done | $(am__base_list) | \
+	while read files; do \
+	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(resources48dir)'"; \
+	  $(INSTALL_DATA) $$files "$(DESTDIR)$(resources48dir)" || exit $$?; \
+	done
+
+uninstall-dist_resources48DATA:
+	@$(NORMAL_UNINSTALL)
+	@list='$(dist_resources48_DATA)'; test -n "$(resources48dir)" || list=; \
+	files=`for p in $$list; do echo $$p; done | sed -e 's|^.*/||'`; \
+	dir='$(DESTDIR)$(resources48dir)'; $(am__uninstall_files_from_dir)
+tags: TAGS
+TAGS:
+
+ctags: CTAGS
+CTAGS:
+
+
+distdir: $(DISTFILES)
+	@srcdirstrip=`echo "$(srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	topsrcdirstrip=`echo "$(top_srcdir)" | sed 's/[].[^$$\\*]/\\\\&/g'`; \
+	list='$(DISTFILES)'; \
+	  dist_files=`for file in $$list; do echo $$file; done | \
+	  sed -e "s|^$$srcdirstrip/||;t" \
+	      -e "s|^$$topsrcdirstrip/|$(top_builddir)/|;t"`; \
+	case $$dist_files in \
+	  */*) $(MKDIR_P) `echo "$$dist_files" | \
+			   sed '/\//!d;s|^|$(distdir)/|;s,/[^/]*$$,,' | \
+			   sort -u` ;; \
+	esac; \
+	for file in $$dist_files; do \
+	  if test -f $$file || test -d $$file; then d=.; else d=$(srcdir); fi; \
+	  if test -d $$d/$$file; then \
+	    dir=`echo "/$$file" | sed -e 's,/[^/]*$$,,'`; \
+	    if test -d "$(distdir)/$$file"; then \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    if test -d $(srcdir)/$$file && test $$d != $(srcdir); then \
+	      cp -fpR $(srcdir)/$$file "$(distdir)$$dir" || exit 1; \
+	      find "$(distdir)/$$file" -type d ! -perm -700 -exec chmod u+rwx {} \;; \
+	    fi; \
+	    cp -fpR $$d/$$file "$(distdir)$$dir" || exit 1; \
+	  else \
+	    test -f "$(distdir)/$$file" \
+	    || cp -p $$d/$$file "$(distdir)/$$file" \
+	    || exit 1; \
+	  fi; \
+	done
+check-am: all-am
+check: check-am
+all-am: Makefile $(DATA)
+installdirs:
+	for dir in "$(DESTDIR)$(resourcesdir)" "$(DESTDIR)$(resources16dir)" "$(DESTDIR)$(resources32dir)" "$(DESTDIR)$(resources48dir)"; do \
+	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+	done
+install: install-am
+install-exec: install-exec-am
+install-data: install-data-am
+uninstall: uninstall-am
+
+install-am: all-am
+	@$(MAKE) $(AM_MAKEFLAGS) install-exec-am install-data-am
+
+installcheck: installcheck-am
+install-strip:
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
+mostlyclean-generic:
+
+clean-generic:
+
+distclean-generic:
+	-test -z "$(CONFIG_CLEAN_FILES)" || rm -f $(CONFIG_CLEAN_FILES)
+	-test . = "$(srcdir)" || test -z "$(CONFIG_CLEAN_VPATH_FILES)" || rm -f $(CONFIG_CLEAN_VPATH_FILES)
+
+maintainer-clean-generic:
+	@echo "This command is intended for maintainers to use"
+	@echo "it deletes files that may require special tools to rebuild."
+clean: clean-am
+
+clean-am: clean-generic clean-libtool mostlyclean-am
+
+distclean: distclean-am
+	-rm -f Makefile
+distclean-am: clean-am distclean-generic
+
+dvi: dvi-am
+
+dvi-am:
+
+html: html-am
+
+html-am:
+
+info: info-am
+
+info-am:
+
+install-data-am: install-dist_resources16DATA \
+	install-dist_resources32DATA install-dist_resources48DATA \
+	install-dist_resourcesDATA
+
+install-dvi: install-dvi-am
+
+install-dvi-am:
+
+install-exec-am:
+
+install-html: install-html-am
+
+install-html-am:
+
+install-info: install-info-am
+
+install-info-am:
+
+install-man:
+
+install-pdf: install-pdf-am
+
+install-pdf-am:
+
+install-ps: install-ps-am
+
+install-ps-am:
+
+installcheck-am:
+
+maintainer-clean: maintainer-clean-am
+	-rm -f Makefile
+maintainer-clean-am: distclean-am maintainer-clean-generic
+
+mostlyclean: mostlyclean-am
+
+mostlyclean-am: mostlyclean-generic mostlyclean-libtool
+
+pdf: pdf-am
+
+pdf-am:
+
+ps: ps-am
+
+ps-am:
+
+uninstall-am: uninstall-dist_resources16DATA \
+	uninstall-dist_resources32DATA uninstall-dist_resources48DATA \
+	uninstall-dist_resourcesDATA
+
+.MAKE: install-am install-strip
+
+.PHONY: all all-am check check-am clean clean-generic clean-libtool \
+	distclean distclean-generic distclean-libtool distdir dvi \
+	dvi-am html html-am info info-am install install-am \
+	install-data install-data-am install-dist_resources16DATA \
+	install-dist_resources32DATA install-dist_resources48DATA \
+	install-dist_resourcesDATA install-dvi install-dvi-am \
+	install-exec install-exec-am install-html install-html-am \
+	install-info install-info-am install-man install-pdf \
+	install-pdf-am install-ps install-ps-am install-strip \
+	installcheck installcheck-am installdirs maintainer-clean \
+	maintainer-clean-generic mostlyclean mostlyclean-generic \
+	mostlyclean-libtool pdf pdf-am ps ps-am uninstall uninstall-am \
+	uninstall-dist_resources16DATA uninstall-dist_resources32DATA \
+	uninstall-dist_resources48DATA uninstall-dist_resourcesDATA
+
+
+@MACAPPBUNDLE_TRUE@mac-copy-resources: $(dist_resources_DATA)
+@MACAPPBUNDLE_TRUE@	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/16x16";
+@MACAPPBUNDLE_TRUE@	for i in $(dist_resources16_DATA); do \
+@MACAPPBUNDLE_TRUE@	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/16x16"; \
+@MACAPPBUNDLE_TRUE@	done
+@MACAPPBUNDLE_TRUE@	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/32x32";
+@MACAPPBUNDLE_TRUE@	for i in $(dist_resources32_DATA); do \
+@MACAPPBUNDLE_TRUE@	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/32x32"; \
+@MACAPPBUNDLE_TRUE@	done
+@MACAPPBUNDLE_TRUE@	mkdir -p "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/48x48";
+@MACAPPBUNDLE_TRUE@	for i in $(dist_resources48_DATA); do \
+@MACAPPBUNDLE_TRUE@	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango/48x48"; \
+@MACAPPBUNDLE_TRUE@	done
+@MACAPPBUNDLE_TRUE@	for i in $(dist_resources_DATA); do \
+@MACAPPBUNDLE_TRUE@	  cp -f "$(srcdir)/$$i" "$(top_builddir)/FileZilla.app/Contents/SharedSupport/resources/tango"; \
+@MACAPPBUNDLE_TRUE@	done
+
+# Tell versions [3.59,3.63) of GNU make to not export all variables.
+# Otherwise a system limit (for SysV at least) may be exceeded.
+.NOEXPORT:
diff -Nru filezilla-3.5.3/src/interface/resources/tango/theme.xml filezilla-3.7.3~precise/src/interface/resources/tango/theme.xml
--- filezilla-3.5.3/src/interface/resources/tango/theme.xml	1970-01-01 00:00:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/tango/theme.xml	2012-10-06 03:30:09.000000000 +0000
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
+<FileZilla3>
+  <Theme>
+    <Name>Tango</Name>
+    <Source>Tango Desktop Project</Source>
+    <Author>Christophe Meyer</Author>
+    <Mail>stombi@gmail.com</Mail>
+    <size>16x16</size>
+    <size>32x32</size>
+    <size>48x48</size>
+  </Theme>
+</FileZilla3>
diff -Nru filezilla-3.5.3/src/interface/resources/toolbar.xrc filezilla-3.7.3~precise/src/interface/resources/toolbar.xrc
--- filezilla-3.5.3/src/interface/resources/toolbar.xrc	2010-01-31 03:00:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/toolbar.xrc	2012-12-02 04:30:06.000000000 +0000
@@ -7,7 +7,8 @@
     <object class="tool" name="ID_TOOLBAR_SITEMANAGER">
       <bitmap stock_id="ART_SITEMANAGER"></bitmap>
       <longhelp>Open the Site Manager</longhelp>
-      <tooltip>Open the Site Manager</tooltip>
+      <tooltip platform="win">Open the Site Manager.</tooltip>
+      <tooltip platform="mac|unix">Open the Site Manager. Right-click for a list of sites.</tooltip>
     </object>
     <object class="separator"/>
     <object class="tool" name="ID_TOOLBAR_LOGVIEW">
diff -Nru filezilla-3.5.3/src/interface/resources/version.rc.in filezilla-3.7.3~precise/src/interface/resources/version.rc.in
--- filezilla-3.5.3/src/interface/resources/version.rc.in	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/resources/version.rc.in	2013-04-29 03:30:05.000000000 +0000
@@ -16,7 +16,7 @@
             VALUE "FileDescription", "FileZilla FTP Client"
             VALUE "FileVersion", "@PACKAGE_VERSION_MAJOR@, @PACKAGE_VERSION_MINOR@, @PACKAGE_VERSION_MICRO@, @PACKAGE_VERSION_NANO@"
             VALUE "InternalName", "FileZilla 3"
-            VALUE "LegalCopyright", "Copyright (C) 2006-2012"
+            VALUE "LegalCopyright", "Copyright (C) 2006-2013"
             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.5.3/src/interface/search.cpp filezilla-3.7.3~precise/src/interface/search.cpp
--- filezilla-3.5.3/src/interface/search.cpp	2011-05-15 21:29:46.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/search.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -514,11 +514,12 @@
 
 CSearchDialog::CSearchDialog(wxWindow* parent, CState* pState, CQueueView* pQueue)
 	: CStateEventHandler(pState)
+	, m_parent(parent)
+	, m_results(0)
+	, m_pQueue(pQueue)
+	, m_pWindowStateManager(0)
+	, m_searching(false)
 {
-	m_pQueue = pQueue;
-	m_parent = parent;
-	m_pWindowStateManager = 0;
-	m_searching = false;
 }
 
 CSearchDialog::~CSearchDialog()
@@ -625,7 +626,7 @@
 	// Do not process same directory multiple times
 	if (!m_visited.insert(listing->path).second)
 		return;
-	
+
 	int old_count = m_results->m_fileData.size();
 	int added = 0;
 
@@ -788,7 +789,7 @@
 
 protected:
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnBrowse(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
 };
@@ -878,7 +879,7 @@
 						continue;
 					}
 				}
-				iter++;
+				++iter;
 			}
 			if (!replaced)
 				selected_dirs.push_back(path);
@@ -889,11 +890,11 @@
 
 	// Now in a second phase filter out all files that are also in a directory
 	std::list<int> selected_files_new;
-	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); iter++)
+	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); ++iter)
 	{
 		CServerPath path = m_results->m_fileData[*iter].path;
 		std::list<CServerPath>::const_iterator path_iter;
-		for (path_iter = selected_dirs.begin(); path_iter != selected_dirs.end(); 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;
@@ -902,7 +903,7 @@
 			selected_files_new.push_back(*iter);
 	}
 	selected_files.swap(selected_files_new);
-	
+
 	// At this point selected_dirs contains uncomparable
 	// paths and selected_files contains only files not
 	// covered by any of those directories.
@@ -951,7 +952,7 @@
 	bool start = XRCCTRL(dlg, "ID_QUEUE_START", wxRadioButton)->GetValue();
 	bool flatten = XRCCTRL(dlg, "ID_PATHS_FLATTEN", wxRadioButton)->GetValue();
 
-	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); iter++)
+	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); ++iter)
 	{
 		const CDirentry& entry = m_results->m_fileData[*iter].entry;
 
@@ -966,7 +967,7 @@
 				segments.push_front(remote_path.GetLastSegment());
 				remote_path = remote_path.GetParent();
 			}
-			for (std::list<wxString>::const_iterator segment_iter = segments.begin(); segment_iter != segments.end(); segment_iter++)
+			for (std::list<wxString>::const_iterator segment_iter = segments.begin(); segment_iter != segments.end(); ++segment_iter)
 				target_path.AddSegment(*segment_iter);
 		}
 
@@ -987,7 +988,7 @@
 	else
 		mode = start ? CRecursiveOperation::recursive_download : CRecursiveOperation::recursive_addtoqueue;
 
-	for (std::list<CServerPath>::const_iterator iter = selected_dirs.begin(); iter != selected_dirs.end(); iter++)
+	for (std::list<CServerPath>::const_iterator iter = selected_dirs.begin(); iter != selected_dirs.end(); ++iter)
 	{
 		CLocalPath target_path = path;
 		if (!flatten && iter->HasParent())
@@ -1020,20 +1021,20 @@
 
 	wxString question;
 	if (selected_dirs.empty())
-		question.Printf(wxPLURAL("Really delete %d file?", "Really delete %d files?", selected_files.size()), selected_files.size());
+		question.Printf(wxPLURAL("Really delete %d file from the server?", "Really delete %d files from the server?", selected_files.size()), selected_files.size());
 	else if (selected_files.empty())
-		question.Printf(wxPLURAL("Really delete %d directory with its contents?", "Really delete %d directories with their contents?", selected_dirs.size()), selected_dirs.size());
+		question.Printf(wxPLURAL("Really delete %d directory with its contents from the server?", "Really delete %d directories with their contents from the server?", selected_dirs.size()), selected_dirs.size());
 	else
 	{
 		wxString files = wxString::Format(wxPLURAL("%d file", "%d files", selected_files.size()), selected_files.size());
 		wxString dirs = wxString::Format(wxPLURAL("%d directory with its contents", "%d directories with their contents", selected_dirs.size()), selected_dirs.size());
-		question.Printf(_("Really delete %s and %s?"), files.c_str(), dirs.c_str());
+		question.Printf(_("Really delete %s and %s from the server?"), files.c_str(), dirs.c_str());
 	}
 
 	if (wxMessageBox(question, _("Confirm deletion"), wxICON_QUESTION | wxYES_NO) != wxYES)
 		return;
 
-	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); iter++)
+	for (std::list<int>::const_iterator iter = selected_files.begin(); iter != selected_files.end(); ++iter)
 	{
 		const CDirentry& entry = m_results->m_fileData[*iter].entry;
 		std::list<wxString> files_to_delete;
@@ -1041,7 +1042,7 @@
 		m_pState->m_pCommandQueue->ProcessCommand(new CDeleteCommand(m_results->m_fileData[*iter].path, files_to_delete));
 	}
 
-	for (std::list<CServerPath>::const_iterator iter = selected_dirs.begin(); iter != selected_dirs.end(); iter++)
+	for (std::list<CServerPath>::const_iterator iter = selected_dirs.begin(); iter != selected_dirs.end(); ++iter)
 	{
 		CServerPath path = *iter;
 		if (!path.HasParent())
@@ -1087,7 +1088,7 @@
 	CInterProcessMutex mutex(MUTEX_SEARCHCONDITIONS);
 
 	CXmlFile file;
-	
+
 	TiXmlElement* pDocument = file.Load(_T("search"));
 	if (!pDocument)
 	{
@@ -1108,7 +1109,7 @@
 	CInterProcessMutex mutex(MUTEX_SEARCHCONDITIONS);
 
 	CXmlFile file;
-	
+
 	TiXmlElement* pDocument = file.Load(_T("search"));
 	if (!pDocument)
 	{
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage.h filezilla-3.7.3~precise/src/interface/settings/optionspage.h
--- filezilla-3.5.3/src/interface/settings/optionspage.h	2010-02-07 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage.h	2012-10-06 03:30:06.000000000 +0000
@@ -26,7 +26,7 @@
 	void SetChoice(int id, int selection, bool& failure);
 	bool SetText(int id, const wxString& text, bool& failure);
 
-	// The GetXXX functions do never return an error since the controls were 
+	// The GetXXX functions do never return an error since the controls were
 	// checked to exist while loading the dialog.
 	bool GetCheck(int id) const;
 	bool GetRCheck(int id) const;
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_connection_active.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_active.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_connection_active.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_active.cpp	2013-06-09 03:30:04.000000000 +0000
@@ -9,7 +9,7 @@
 EVT_RADIOBUTTON(XRCID("ID_ACTIVEMODE1"), COptionsPageConnectionActive::OnRadioOrCheckEvent)
 EVT_RADIOBUTTON(XRCID("ID_ACTIVEMODE2"), COptionsPageConnectionActive::OnRadioOrCheckEvent)
 EVT_RADIOBUTTON(XRCID("ID_ACTIVEMODE3"), COptionsPageConnectionActive::OnRadioOrCheckEvent)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 bool COptionsPageConnectionActive::LoadPage()
 {
@@ -17,7 +17,7 @@
 	SetCheckFromOption(XRCID("ID_LIMITPORTS"), OPTION_LIMITPORTS, failure);
 	SetTextFromOption(XRCID("ID_LOWESTPORT"), OPTION_LIMITPORTS_LOW, failure);
 	SetTextFromOption(XRCID("ID_HIGHESTPORT"), OPTION_LIMITPORTS_HIGH, failure);
-	
+
 	SetRCheck(XRCID("ID_ACTIVEMODE1"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 0, failure);
 	SetRCheck(XRCID("ID_ACTIVEMODE2"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 1, failure);
 	SetRCheck(XRCID("ID_ACTIVEMODE3"), m_pOptions->GetOptionVal(OPTION_EXTERNALIPMODE) == 2, failure);
@@ -35,10 +35,10 @@
 bool COptionsPageConnectionActive::SavePage()
 {
 	SetOptionFromCheck(XRCID("ID_LIMITPORTS"), OPTION_LIMITPORTS);
-	
+
 	SetIntOptionFromText(XRCID("ID_LOWESTPORT"), OPTION_LIMITPORTS_LOW);
 	SetIntOptionFromText(XRCID("ID_HIGHESTPORT"), OPTION_LIMITPORTS_HIGH);
-	
+
 	int mode;
 	if (GetRCheck(XRCID("ID_ACTIVEMODE1")))
 		mode = 0;
@@ -88,7 +88,7 @@
 		if (!IsIpAddress(pActiveIP->GetValue()))
 			return DisplayError(pActiveIP, _("You have to enter a valid IP address."));
 	}
-	
+
 	return true;
 }
 
@@ -105,7 +105,7 @@
 	FindWindow(XRCID("ID_ACTIVEIP"))->Enable(mode == 1);
 	FindWindow(XRCID("ID_ACTIVERESOLVER"))->Enable(mode == 2);
 
-	FindWindow(XRCID("ID_NOEXTERNALONLOCAL"))->Enable(mode != 0);	
+	FindWindow(XRCID("ID_NOEXTERNALONLOCAL"))->Enable(mode != 0);
 }
 
 void COptionsPageConnectionActive::OnRadioOrCheckEvent(wxCommandEvent& event)
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_connection_active.h filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_active.h
--- filezilla-3.5.3/src/interface/settings/optionspage_connection_active.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_active.h	2013-06-09 03:30:04.000000000 +0000
@@ -12,7 +12,7 @@
 protected:
 	virtual void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnRadioOrCheckEvent(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_connection_sftp.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_sftp.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_connection_sftp.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_connection_sftp.cpp	2012-10-25 03:30:05.000000000 +0000
@@ -39,7 +39,7 @@
 	pKeys->InsertColumn(0, _("Filename"), wxLIST_FORMAT_LEFT, 150);
 	pKeys->InsertColumn(1, _("Comment"), wxLIST_FORMAT_LEFT, 100);
 	pKeys->InsertColumn(2, _("Data"), wxLIST_FORMAT_LEFT, 350);
-	
+
 	// Generic wxListCtrl has gross minsize
 	wxSize size = pKeys->GetMinSize();
 	size.x = 1;
@@ -158,7 +158,7 @@
 
 	wxString input;
 
-	while (true)
+	for (;;)
 	{
 		int pos = input.Find('\n');
 		if (pos == wxNOT_FOUND)
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_dateformatting.h filezilla-3.7.3~precise/src/interface/settings/optionspage_dateformatting.h
--- filezilla-3.5.3/src/interface/settings/optionspage_dateformatting.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_dateformatting.h	2013-06-09 03:30:04.000000000 +0000
@@ -13,7 +13,7 @@
 
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnRadioChanged(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_edit.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_edit.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_edit.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_edit.cpp	2013-01-14 04:30:06.000000000 +0000
@@ -49,7 +49,7 @@
 
 	if (GetRCheck(XRCID("ID_DEFAULT_CUSTOM")))
 		pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, _T("2") + GetText(XRCID("ID_EDITOR")));
-	else 
+	else
 		pOptions->SetOption(OPTION_EDIT_DEFAULTEDITOR, GetRCheck(XRCID("ID_DEFAULT_TEXT")) ? _T("1") : _T("0"));
 
 	if (GetRCheck(XRCID("ID_USEDEFAULT")))
@@ -58,11 +58,11 @@
 		pOptions->SetOption(OPTION_EDIT_ALWAYSDEFAULT, 0);
 
 	SetOptionFromCheck(XRCID("ID_EDIT_TRACK_LOCAL"), OPTION_EDIT_TRACK_LOCAL);
-		
+
 	return true;
 }
 
-bool UnquoteCommand(wxString& command, wxString& arguments)
+bool UnquoteCommand(wxString& command, wxString& arguments, bool is_dde = false)
 {
 	arguments = _T("");
 
@@ -94,6 +94,12 @@
 			arguments.Trim(false);
 			break;
 		}
+		else if (is_dde && !inQuotes && (command[i] == ',' || command[i] == '#'))
+		{
+			arguments = command.Mid(i + 1);
+			arguments.Trim(false);
+			break;
+		}
 		else
 			file += command[i];
 	}
@@ -120,12 +126,12 @@
 
 bool COptionsPageEdit::Validate()
 {
-	bool failure = false;
-
 	const bool custom = GetRCheck(XRCID("ID_DEFAULT_CUSTOM"));
 	wxString editor;
 	if (custom)
 	{
+		bool failure = false;
+
 		editor = GetText(XRCID("ID_EDITOR"));
 		editor.Trim(true);
 		editor.Trim(false);
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_edit.h filezilla-3.7.3~precise/src/interface/settings/optionspage_edit.h
--- filezilla-3.5.3/src/interface/settings/optionspage_edit.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_edit.h	2013-06-09 03:30:04.000000000 +0000
@@ -13,7 +13,7 @@
 
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnBrowseEditor(wxCommandEvent& event);
 	void OnRadioButton(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_edit_associations.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_edit_associations.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_edit_associations.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_edit_associations.cpp	2013-01-14 04:30:06.000000000 +0000
@@ -22,14 +22,14 @@
 	COptions* pOptions = COptions::Get();
 
 	SetOptionFromText(XRCID("ID_ASSOCIATIONS"), OPTION_EDIT_CUSTOMASSOCIATIONS);
-	
+
 	pOptions->SetOption(OPTION_EDIT_INHERITASSOCIATIONS, GetCheck(XRCID("ID_INHERIT")) ? 1 : 0);
-		
+
 	return true;
 }
 
 // optionspage_edit.cpp
-extern bool UnquoteCommand(wxString& command, wxString& arguments);
+extern bool UnquoteCommand(wxString& command, wxString& arguments, bool is_dde = false);
 extern bool ProgramExists(const wxString& editor);
 
 bool COptionsPageEditAssociations::Validate()
@@ -55,7 +55,7 @@
 		wxString args;
 		if (!UnquoteCommand(command, args))
 			return DisplayError(_T("ID_ASSOCIATIONS"), _("Improperly quoted association."));
-		
+
 		if (command == _T(""))
 			return DisplayError(_T("ID_ASSOCIATIONS"), _("Empty command."));
 
@@ -65,7 +65,7 @@
 			error += '\n';
 			error += command;
 			return DisplayError(_T("ID_ASSOCIATIONS"), error);
-		}		
+		}
 	}
 
 	return true;
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_fileexists.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_fileexists.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_fileexists.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_fileexists.cpp	2012-10-06 03:30:06.000000000 +0000
@@ -19,7 +19,7 @@
 	SetChoice(XRCID("ID_UPLOAD_ACTION"), ulAction, failure);
 
 	SetCheck(XRCID("ID_ASCIIRESUME"), m_pOptions->GetOptionVal(OPTION_ASCIIRESUME) ? true : false, failure);
-	
+
 	return !failure;
 }
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_filelists.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_filelists.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_filelists.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_filelists.cpp	2012-10-06 03:30:06.000000000 +0000
@@ -23,7 +23,7 @@
 {
 	m_pOptions->SetOption(OPTION_FILELIST_DIRSORT, GetChoice(XRCID("ID_SORTMODE")));
 
-	SetOptionFromText(XRCID("ID_COMPARISON_THRESHOLD"), OPTION_COMPARISON_THRESHOLD); 
+	SetOptionFromText(XRCID("ID_COMPARISON_THRESHOLD"), OPTION_COMPARISON_THRESHOLD);
 
 	m_pOptions->SetOption(OPTION_DOUBLECLICK_ACTION_FILE, GetChoice(XRCID("ID_DOUBLECLICK_FILE")));
 	m_pOptions->SetOption(OPTION_DOUBLECLICK_ACTION_DIRECTORY, GetChoice(XRCID("ID_DOUBLECLICK_DIRECTORY")));
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_filetype.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_filetype.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_filetype.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_filetype.cpp	2012-10-06 03:30:06.000000000 +0000
@@ -15,7 +15,7 @@
 bool COptionsPageFiletype::LoadPage()
 {
 	bool failure = false;
-	
+
 	SetCheckFromOption(XRCID("ID_ASCIIWITHOUT"), OPTION_ASCIINOEXT, failure);
 	SetCheckFromOption(XRCID("ID_ASCIIDOTFILE"), OPTION_ASCIIDOTFILE, failure);
 
@@ -25,7 +25,7 @@
 	if (!FindWindow(XRCID("ID_EXTENSION")) || !FindWindow(XRCID("ID_ADD")) ||
 		!FindWindow(XRCID("ID_REMOVE")) || !FindWindow(XRCID("ID_EXTENSIONS")) ||
 		!FindWindow(XRCID("ID_TYPE_AUTO")) || !FindWindow(XRCID("ID_TYPE_ASCII")) ||
-		!FindWindow(XRCID("ID_TYPE_BINARY"))) 
+		!FindWindow(XRCID("ID_TYPE_BINARY")))
 		return false;
 
 	int mode = m_pOptions->GetOptionVal(OPTION_ASCIIBINARY);
@@ -39,7 +39,7 @@
 	wxListCtrl* pListCtrl = XRCCTRL(*this, "ID_EXTENSIONS", wxListCtrl);
 	pListCtrl->ClearAll();
 	pListCtrl->InsertColumn(0, _T(""));
-	
+
 	wxString extensions = m_pOptions->GetOption(OPTION_ASCIIFILES);
 	wxString ext;
 	int pos = extensions.Find(_T("|"));
@@ -49,7 +49,7 @@
 		{
 			if (ext != _T(""))
 			{
-				ext.Replace(_T("\\\\"), _T("\\")); 
+				ext.Replace(_T("\\\\"), _T("\\"));
 				pListCtrl->InsertItem(pListCtrl->GetItemCount(), ext);
 				ext = _T("");
 			}
@@ -57,7 +57,7 @@
 		else if (extensions.c_str()[pos - 1] != '\\')
 		{
 			ext += extensions.Left(pos);
-			ext.Replace(_T("\\\\"), _T("\\")); 
+			ext.Replace(_T("\\\\"), _T("\\"));
 			pListCtrl->InsertItem(pListCtrl->GetItemCount(), ext);
 			ext = _T("");
 		}
@@ -69,9 +69,9 @@
 		pos = extensions.Find(_T("|"));
 	}
 	ext += extensions;
-	ext.Replace(_T("\\\\"), _T("\\")); 
+	ext.Replace(_T("\\\\"), _T("\\"));
 	pListCtrl->InsertItem(pListCtrl->GetItemCount(), ext);
-	
+
 	SetCtrlState();
 
 	return true;
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_filetype.h filezilla-3.7.3~precise/src/interface/settings/optionspage_filetype.h
--- filezilla-3.5.3/src/interface/settings/optionspage_filetype.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_filetype.h	2013-06-09 03:30:04.000000000 +0000
@@ -12,7 +12,7 @@
 protected:
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnRemove(wxCommandEvent& event);
 	void OnAdd(wxCommandEvent& event);
 	void OnSelChanged(wxListEvent& event);
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_ftpproxy.h filezilla-3.7.3~precise/src/interface/settings/optionspage_ftpproxy.h
--- filezilla-3.5.3/src/interface/settings/optionspage_ftpproxy.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_ftpproxy.h	2013-06-09 03:30:04.000000000 +0000
@@ -13,7 +13,7 @@
 
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnProxyTypeChanged(wxCommandEvent& event);
 	void OnLoginSequenceChanged(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_interface.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_interface.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_interface.cpp	2011-11-01 16:41:52.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_interface.cpp	2012-10-06 03:30:06.000000000 +0000
@@ -26,7 +26,7 @@
 #endif
 
 	SetCheckFromOption(XRCID("ID_PREVENT_IDLESLEEP"), OPTION_PREVENT_IDLESLEEP, failure);
-	
+
 	SetCheckFromOption(XRCID("ID_SPEED_DISPLAY"), OPTION_SPEED_DISPLAY, failure);
 
 	if (!CPowerManagement::IsSupported())
@@ -57,7 +57,7 @@
 #endif
 
 	SetOptionFromCheck(XRCID("ID_PREVENT_IDLESLEEP"), OPTION_PREVENT_IDLESLEEP);
-	
+
 	SetOptionFromCheck(XRCID("ID_SPEED_DISPLAY"), OPTION_SPEED_DISPLAY);
 
 	if (!m_pOptions->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE) && m_pOptions->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 2)
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_interface.h filezilla-3.7.3~precise/src/interface/settings/optionspage_interface.h
--- filezilla-3.5.3/src/interface/settings/optionspage_interface.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_interface.h	2013-06-09 03:30:04.000000000 +0000
@@ -9,7 +9,7 @@
 	virtual bool SavePage();
 	virtual bool Validate();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnLayoutChange(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_language.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_language.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_language.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_language.cpp	2013-06-09 03:30:04.000000000 +0000
@@ -7,7 +7,7 @@
 #include <algorithm>
 
 BEGIN_EVENT_TABLE(COptionsPageLanguage, COptionsPage)
-END_EVENT_TABLE();
+END_EVENT_TABLE()
 
 bool COptionsPageLanguage::LoadPage()
 {
@@ -118,7 +118,7 @@
 	std::sort(m_locale.begin(), m_locale.end(), compareLangAsc);
 
 	std::vector<struct _locale_info>::const_iterator iter;
-	for (iter = m_locale.begin(); iter != m_locale.end(); iter++)
+	for (iter = m_locale.begin(); iter != m_locale.end(); ++iter)
 	{
 		n = pListBox->Append(iter->name + _T(" (") + iter->code + _T(")"));
 		if (iter->code == currentLanguage)
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_language.h filezilla-3.7.3~precise/src/interface/settings/optionspage_language.h
--- filezilla-3.5.3/src/interface/settings/optionspage_language.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_language.h	2013-06-09 03:30:04.000000000 +0000
@@ -14,7 +14,7 @@
 	struct _locale_info { wxString name; wxString code; };
 
 protected:
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 
 	std::vector<_locale_info> m_locale;
 };
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_proxy.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_proxy.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_proxy.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_proxy.cpp	2012-11-18 12:16:46.000000000 +0000
@@ -66,8 +66,15 @@
 		return true;
 
 	wxTextCtrl* pTextCtrl = XRCCTRL(*this, "ID_PROXY_HOST", wxTextCtrl);
-	if (pTextCtrl->GetValue() == _T(""))
+	wxString host = pTextCtrl->GetValue();
+	host.Trim(false);
+	host.Trim(true);
+	if (host == _T(""))
 		return DisplayError(_T("ID_PROXY_HOST"), _("You need to enter a proxy host."));
+	else
+	{
+		pTextCtrl->ChangeValue(host);
+	}
 
 	pTextCtrl = XRCCTRL(*this, "ID_PROXY_PORT", wxTextCtrl);
 	unsigned long port;
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_proxy.h filezilla-3.7.3~precise/src/interface/settings/optionspage_proxy.h
--- filezilla-3.5.3/src/interface/settings/optionspage_proxy.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_proxy.h	2013-06-09 03:30:04.000000000 +0000
@@ -13,7 +13,7 @@
 
 	void SetCtrlState();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnProxyTypeChanged(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_sizeformatting.h filezilla-3.7.3~precise/src/interface/settings/optionspage_sizeformatting.h
--- filezilla-3.5.3/src/interface/settings/optionspage_sizeformatting.h	2010-02-07 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_sizeformatting.h	2013-06-09 03:30:04.000000000 +0000
@@ -16,7 +16,7 @@
 
 	CSizeFormat::_format GetFormat() const;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnRadio(wxCommandEvent& event);
 	void OnCheck(wxCommandEvent& event);
 	void OnSpin(wxSpinEvent& event);
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_themes.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_themes.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_themes.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_themes.cpp	2012-10-06 03:30:06.000000000 +0000
@@ -26,14 +26,14 @@
 
 	virtual ~CIconPreview()
 	{
-		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); iter++)
+		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); ++iter)
 			delete *iter;
 	}
 
 	void LoadIcons(const wxString& theme, const wxSize& iconSize)
 	{
 		m_iconSize = iconSize;
-		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); iter++)
+		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); ++iter)
 			delete *iter;
 
 		m_icons = CThemeProvider::GetAllImages(theme, m_iconSize);
@@ -108,7 +108,7 @@
 		int x = BORDER;
 		int y = BORDER;
 
-		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); iter++)
+		for (std::list<wxBitmap*>::iterator iter = m_icons.begin(); iter != m_icons.end(); ++iter)
 		{
 			wxBitmap* bitmap = *iter;
 			dc.DrawBitmap(*bitmap, x, y, true);
@@ -193,7 +193,7 @@
 	pPreview->DeleteAllPages();
 
 	std::list<wxString> sizes = CThemeProvider::GetThemeSizes(theme);
-	for (std::list<wxString>::const_iterator iter = sizes.begin(); iter != sizes.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = sizes.begin(); iter != sizes.end(); ++iter)
 	{
 		const wxString& size = *iter;
 
@@ -201,7 +201,7 @@
 		if (pos <= 0 || pos >= (int)size.Len() - 1)
 			continue;
 
-        long width = 0;
+		long width = 0;
 		long height = 0;
 		if (!size.Left(pos).ToLong(&width) ||
 			!size.Mid(pos + 1).ToLong(&height) ||
@@ -262,7 +262,7 @@
 
 	wxString theme = m_pOptions->GetOption(OPTION_THEME);
 	wxString firstName;
-	for (std::list<wxString>::const_iterator iter = themes.begin(); iter != themes.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = themes.begin(); iter != themes.end(); ++iter)
 	{
 		wxString name, author, mail;
 		if (!CThemeProvider::GetThemeData(*iter, name, author, mail))
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_themes.h filezilla-3.7.3~precise/src/interface/settings/optionspage_themes.h
--- filezilla-3.5.3/src/interface/settings/optionspage_themes.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_themes.h	2013-06-09 03:30:04.000000000 +0000
@@ -15,7 +15,7 @@
 
 	virtual bool OnDisplayedFirstTime();
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnThemeChange(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_transfer.h filezilla-3.7.3~precise/src/interface/settings/optionspage_transfer.h
--- filezilla-3.5.3/src/interface/settings/optionspage_transfer.h	2010-01-19 03:00:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_transfer.h	2013-06-09 03:30:04.000000000 +0000
@@ -10,7 +10,7 @@
 	virtual bool Validate();
 
 protected:
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnToggleSpeedLimitEnable(wxCommandEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_updatecheck.cpp filezilla-3.7.3~precise/src/interface/settings/optionspage_updatecheck.cpp
--- filezilla-3.5.3/src/interface/settings/optionspage_updatecheck.cpp	2010-02-07 15:40:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_updatecheck.cpp	2012-12-31 04:30:05.000000000 +0000
@@ -10,37 +10,54 @@
 
 BEGIN_EVENT_TABLE(COptionsPageUpdateCheck, COptionsPage)
 EVT_BUTTON(XRCID("ID_RUNUPDATECHECK"), COptionsPageUpdateCheck::OnRunUpdateCheck)
-EVT_CHECKBOX(XRCID("ID_CHECKBETA"), COptionsPageUpdateCheck::OnCheckBeta)
 END_EVENT_TABLE()
 
 bool COptionsPageUpdateCheck::LoadPage()
 {
 	bool failure = false;
-	SetCheckFromOption(XRCID("ID_UPDATECHECK"), OPTION_UPDATECHECK, failure);
-	SetCheckFromOption(XRCID("ID_CHECKBETA"), OPTION_UPDATECHECK_CHECKBETA, failure);
-	SetTextFromOption(XRCID("ID_DAYS"), OPTION_UPDATECHECK_INTERVAL, failure);
+	int sel;
+	if (!m_pOptions->GetOptionVal(OPTION_UPDATECHECK))
+		sel = 0;
+	else
+	{
+		int days = m_pOptions->GetOptionVal(OPTION_UPDATECHECK_INTERVAL);
+		if (days <= 7)
+			sel = 1;
+		else if (days <= 14)
+			sel = 2;
+		else
+			sel = 3;
+	}
+	SetChoice(XRCID("ID_UPDATECHECK"), sel, failure);
+
+	SetChoice(XRCID("ID_UPDATETYPE"), (m_pOptions->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) != 0) ? 1 : 0, failure);
 
 	return !failure;
 }
 
 bool COptionsPageUpdateCheck::SavePage()
 {
-	SetOptionFromCheck(XRCID("ID_UPDATECHECK"), OPTION_UPDATECHECK);
-	SetOptionFromCheck(XRCID("ID_CHECKBETA"), OPTION_UPDATECHECK_CHECKBETA);
-	SetOptionFromText(XRCID("ID_DAYS"), OPTION_UPDATECHECK_INTERVAL);
-
-	return true;
-}
-
-bool COptionsPageUpdateCheck::Validate()
-{
-	unsigned long days;
-	if (!GetText(XRCID("ID_DAYS")).ToULong(&days) || days < 7)
+	int sel = GetChoice(XRCID("ID_UPDATECHECK"));
+	m_pOptions->SetOption(OPTION_UPDATECHECK, (sel > 0) ? 1 : 0);
+	int days = 0;
+	switch (sel)
 	{
-		XRCCTRL(*this, "ID_DAYS", wxTextCtrl)->SetFocus();
-		DisplayError(_T("ID_DAYS"), _("Please enter an update interval of at least 7 days"));
-		return false;
+	case 1:
+		days = 7;
+		break;
+	case 2:
+		days = 14;
+		break;
+	case 3:
+		days = 30;
+		break;
+	default:
+		break;
 	}
+	m_pOptions->SetOption(OPTION_UPDATECHECK_INTERVAL, days);
+
+	int type = GetChoice(XRCID("ID_UPDATETYPE"));
+	m_pOptions->SetOption(OPTION_UPDATECHECK_CHECKBETA, (type > 0) ? 1 : 0);
 
 	return true;
 }
@@ -54,16 +71,4 @@
 	dlg.Run();
 }
 
-void COptionsPageUpdateCheck::OnCheckBeta(wxCommandEvent& event)
-{
-	if (event.IsChecked())
-	{
-		if (wxMessageBox(_("Do you really want to check for beta versions?\nUnless you want to test new features, keep using stable versions."), _("Update wizard"), wxICON_QUESTION | wxYES_NO, this) != wxYES)
-		{
-			XRCCTRL(*this, "ID_CHECKBETA", wxCheckBox)->SetValue(0);
-			return;
-		}
-	}
-}
-
 #endif //FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK
diff -Nru filezilla-3.5.3/src/interface/settings/optionspage_updatecheck.h filezilla-3.7.3~precise/src/interface/settings/optionspage_updatecheck.h
--- filezilla-3.5.3/src/interface/settings/optionspage_updatecheck.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/optionspage_updatecheck.h	2013-06-09 03:30:04.000000000 +0000
@@ -9,13 +9,11 @@
 	virtual wxString GetResourceName() { return _T("ID_SETTINGS_UPDATECHECK"); }
 	virtual bool LoadPage();
 	virtual bool SavePage();
-	virtual bool Validate();
 
 protected:
 	void OnRunUpdateCheck(wxCommandEvent& event);
-	void OnCheckBeta(wxCommandEvent& event);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 };
 
 #endif //FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK
diff -Nru filezilla-3.5.3/src/interface/settings/settingsdialog.cpp filezilla-3.7.3~precise/src/interface/settings/settingsdialog.cpp
--- filezilla-3.5.3/src/interface/settings/settingsdialog.cpp	2010-07-19 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/settingsdialog.cpp	2012-12-31 04:30:05.000000000 +0000
@@ -55,16 +55,16 @@
 };
 
 // Helper macro to add pages in the most simplistic way
-#define ADD_PAGE(name, classname, parent) \
-	wxASSERT(parent < (int)m_pages.size()); \
-	page.page = new classname; \
-	if (parent == page_none) \
-		page.id = treeCtrl->AppendItem(root, name); \
-	else \
-	{ \
-		page.id = treeCtrl->AppendItem(m_pages[(unsigned int)parent].id, name); \
-		treeCtrl->Expand(m_pages[(unsigned int)parent].id); \
-	} \
+#define ADD_PAGE(name, classname, parent)										\
+	wxASSERT(parent < (int)m_pages.size());										\
+	page.page = new classname;													\
+	if (parent == page_none)													\
+		page.id = treeCtrl->AppendItem(root, name);								\
+	else																		\
+	{																			\
+		page.id = treeCtrl->AppendItem(m_pages[(unsigned int)parent].id, name);	\
+		treeCtrl->Expand(m_pages[(unsigned int)parent].id);						\
+	}																			\
 	m_pages.push_back(page);
 
 BEGIN_EVENT_TABLE(CSettingsDialog, wxDialogEx)
@@ -134,7 +134,7 @@
 #if FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK
 	if (!COptions::Get()->GetOptionVal(OPTION_DEFAULT_DISABLEUPDATECHECK))
 	{
-		ADD_PAGE(_("Update Check"), COptionsPageUpdateCheck, page_none);
+		ADD_PAGE(_("Updates"), COptionsPageUpdateCheck, page_none);
 	}
 #endif //FZ_MANUALUPDATECHECK && FZ_AUTOUPDATECHECK
 	ADD_PAGE(_("Logging"), COptionsPageLogging, page_none);
@@ -143,7 +143,7 @@
 	treeCtrl->SetQuickBestSize(false);
 	treeCtrl->InvalidateBestSize();
 	treeCtrl->SetInitialSize();
-	
+
 	// Compensate for scrollbar
 	wxSize size = treeCtrl->GetBestSize();
 	int scrollWidth = wxSystemSettings::GetMetric(wxSYS_VSCROLL_X, treeCtrl);
@@ -162,7 +162,7 @@
 	// Keep track of maximum page size
 	size = wxSize();
 
-	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); iter++)
+	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); ++iter)
 	{
 		if (!iter->page->CreatePage(m_pOptions, this, parentPanel, size))
 			return false;
@@ -188,7 +188,7 @@
 
 	// Keep track of maximum page size
 	size = wxSize(0, 0);
-	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); iter++)
+	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); ++iter)
 		size.IncTo(iter->page->GetSizer()->GetMinSize());
 
 #ifdef __WXGTK__
@@ -197,7 +197,7 @@
 	parentPanel->SetInitialSize(size);
 
 	// Adjust pages sizes according to maximum size
-	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); iter++)
+	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); ++iter)
 	{
 		iter->page->GetSizer()->SetMinSize(size);
 		iter->page->GetSizer()->Fit(iter->page);
@@ -212,7 +212,7 @@
 	Show();
 #endif
 
-	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); iter++)
+	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); ++iter)
 		iter->page->Hide();
 
 	// Select first page
@@ -228,7 +228,7 @@
 
 bool CSettingsDialog::LoadSettings()
 {
-	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); iter++)
+	for (std::vector<t_page>::iterator iter = m_pages.begin(); iter != m_pages.end(); ++iter)
 	{
 		if (!iter->page->LoadPage())
 			return false;
diff -Nru filezilla-3.5.3/src/interface/settings/settingsdialog.h filezilla-3.7.3~precise/src/interface/settings/settingsdialog.h
--- filezilla-3.5.3/src/interface/settings/settingsdialog.h	2010-01-02 14:42:27.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/settings/settingsdialog.h	2012-10-06 03:30:06.000000000 +0000
@@ -21,7 +21,7 @@
 	bool LoadPages();
 
 	COptions* m_pOptions;
-	
+
 	COptionsPage* m_activePanel;
 
 	struct t_page
diff -Nru filezilla-3.5.3/src/interface/sitemanager.cpp filezilla-3.7.3~precise/src/interface/sitemanager.cpp
--- filezilla-3.5.3/src/interface/sitemanager.cpp	2011-06-01 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/sitemanager.cpp	2012-10-25 03:30:07.000000000 +0000
@@ -582,7 +582,7 @@
 		if (localPath.empty() && remotePath.IsEmpty())
 			continue;
 
-		bookmarks.push_back(name);		
+		bookmarks.push_back(name);
 	}
 
 	return true;
@@ -622,7 +622,7 @@
 	wxString name = _("New site");
 	int i = 1;
 
-	while (true)
+	for (;;)
 	{
 		std::list<wxString>::const_iterator iter;
 		for (iter = names.begin(); iter != names.end(); ++iter)
@@ -658,7 +658,7 @@
 		wxMessageBox(msg, _("Error writing xml file"), wxICON_ERROR);
 		return _T("");
 	}
-	
+
 	name.Replace(_T("\\"), _T("\\\\"));
 	name.Replace(_T("/"), _T("\\/"));
 
@@ -713,9 +713,7 @@
 	CInterProcessMutex mutex(MUTEX_SITEMANAGER);
 
 	CXmlFile file;
-	TiXmlElement* pDocument = 0;
-
-	pDocument = file.Load(_T("sitemanager"));
+	TiXmlElement* pDocument = file.Load(_T("sitemanager"));
 
 	if (!pDocument)
 	{
@@ -800,9 +798,7 @@
 	CInterProcessMutex mutex(MUTEX_SITEMANAGER);
 
 	CXmlFile file;
-	TiXmlElement* pDocument = 0;
-
-	pDocument = file.Load(_T("sitemanager"));
+	TiXmlElement* pDocument = file.Load(_T("sitemanager"));
 
 	if (!pDocument)
 	{
diff -Nru filezilla-3.5.3/src/interface/sitemanager_dialog.cpp filezilla-3.7.3~precise/src/interface/sitemanager_dialog.cpp
--- filezilla-3.5.3/src/interface/sitemanager_dialog.cpp	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/sitemanager_dialog.cpp	2013-05-01 03:30:04.000000000 +0000
@@ -360,7 +360,7 @@
 	{
 		wxCoord w, h;
 		dc.GetTextExtent(m_pNotebook_Site->GetPageText(i), &w, &h);
-		
+
 		width += w;
 #ifdef __WXMAC__
 		width += 20; // Guessed
@@ -368,7 +368,7 @@
 		width += 10;
 #endif
 	}
-	
+
 	wxSize page_min_size = m_pNotebook_Site->GetPage(0)->GetSizer()->GetMinSize();
 	if (page_min_size.x < width)
 	{
@@ -857,7 +857,7 @@
 
 		// Save local dir
 		AddTextElement(pNode, "LocalDir", data->m_localDir);
-		
+
 		// Save remote dir
 		AddTextElement(pNode, "RemoteDir", data->m_remoteDir.GetSafePath());
 
@@ -884,13 +884,13 @@
 
 		// Save local dir
 		AddTextElement(pNode, "LocalDir", data->m_localDir);
-		
+
 		// Save remote dir
 		AddTextElement(pNode, "RemoteDir", data->m_remoteDir.GetSafePath());
 
 		AddTextElementRaw(pNode, "SyncBrowsing", data->m_sync ? "1" : "0");
 	}
-	
+
 	delete [] utf8;
 	return true;
 }
@@ -942,7 +942,7 @@
 		if (host == _T(""))
 		{
 			XRCCTRL(*this, "ID_HOST", wxTextCtrl)->SetFocus();
-			wxMessageBox(_("You have to enter a hostname."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this); 
+			wxMessageBox(_("You have to enter a hostname."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this);
 			return false;
 		}
 
@@ -962,8 +962,17 @@
 			(logon_type == ACCOUNT || logon_type == NORMAL))
 		{
 			XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetFocus();
-			wxMessageBox(_("FileZilla is running in kiosk mode.\n'Normal' and 'Account' logontypes are not available in this mode."), _("Site Manager - Invalid data"), wxICON_EXCLAMATION, this);
-			return false;
+			wxString msg;
+			if (COptions::Get()->OptionFromFzDefaultsXml(OPTION_DEFAULT_KIOSKMODE))
+				msg = _("Saving of password has been disabled by your system administrator.");
+			else
+				msg = _("Saving of passwords has been disabled by you.");
+			msg += _T("\n");
+			msg += _("'Normal' and 'Account' logontypes are not available. Your entry has been changed to 'Ask for password'.");
+			XRCCTRL(*this, "ID_LOGONTYPE", wxChoice)->SetStringSelection(CServer::GetNameFromLogonType(ASK));
+			XRCCTRL(*this, "ID_PASS", wxTextCtrl)->SetValue(_T(""));
+			logon_type = ASK;
+			wxMessageBox(msg, _("Site Manager - Cannot remember password"), wxICON_INFORMATION, this);
 		}
 
 		// Set selected type
@@ -1071,7 +1080,7 @@
 		CSiteManagerItemData_Site* pServer = reinterpret_cast<CSiteManagerItemData_Site* >(pTree->GetItemData(parent));
 		if (!pServer)
 			return false;
-		
+
 		const wxString remotePathRaw = XRCCTRL(*this, "ID_BOOKMARK_REMOTEDIR", wxTextCtrl)->GetValue();
 		if (remotePathRaw != _T(""))
 		{
@@ -1342,7 +1351,7 @@
 	}
 	server.m_server.SetHost(host, port);
 
-	
+
 	const enum ServerProtocol protocol = GetProtocol();
 	if (protocol != UNKNOWN)
 		server.m_server.SetProtocol(protocol);
@@ -1704,7 +1713,7 @@
 	wxChoice* pProtocol = XRCCTRL(*this, "ID_PROTOCOL", wxChoice);
 	wxChoice* pEncryption = XRCCTRL(*this, "ID_ENCRYPTION", wxChoice);
 	wxStaticText* pEncryptionDesc = XRCCTRL(*this, "ID_ENCRYPTION_DESC", wxStaticText);
-	
+
 	pEncryption->Show(pProtocol->GetSelection() != 1);
 	pEncryptionDesc->Show(pProtocol->GetSelection() != 1);
 }
@@ -1738,7 +1747,7 @@
 	const wxString name = pTree->GetItemText(item);
 	wxString newName = wxString::Format(_("Copy of %s"), name.c_str());
 	int index = 2;
-	while (true)
+	for (;;)
 	{
 		wxTreeItemId child;
 		wxTreeItemIdValue cookie;
@@ -1911,7 +1920,7 @@
 	if (IsPredefinedItem(source) && !copy)
 		return false;
 
-    wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl);
+	wxTreeCtrl *pTree = XRCCTRL(*this, "ID_SITETREE", wxTreeCtrl);
 
 	CSiteManagerItemData *pTargetData = (CSiteManagerItemData *)pTree->GetItemData(target);
 	CSiteManagerItemData *pSourceData = (CSiteManagerItemData *)pTree->GetItemData(source);
@@ -2056,7 +2065,7 @@
 
 	wxString newName = name;
 	int index = 2;
-	while (true)
+	for (;;)
 	{
 		wxTreeItemId child;
 		wxTreeItemIdValue cookie;
@@ -2166,8 +2175,8 @@
 
 void CSiteManagerDialog::OnExportSelected(wxCommandEvent& event)
 {
-	wxFileDialog dlg(this, _("Select file for exported sites"), _T(""), 
-					_T("sites.xml"), _T("XML files (*.xml)|*.xml"), 
+	wxFileDialog dlg(this, _("Select file for exported sites"), _T(""),
+					_T("sites.xml"), _T("XML files (*.xml)|*.xml"),
 					wxFD_SAVE | wxFD_OVERWRITE_PROMPT);
 
 	if (dlg.ShowModal() != wxID_OK)
@@ -2206,8 +2215,8 @@
 	wxDirDialog dlg(this, _("Choose the local directory"), XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->GetValue(), wxDD_NEW_DIR_BUTTON);
 	if (dlg.ShowModal() != wxID_OK)
 		return;
-	
-    XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->SetValue(dlg.GetPath());
+
+	XRCCTRL(*this, "ID_BOOKMARK_LOCALDIR", wxTextCtrl)->SetValue(dlg.GetPath());
 }
 
 void CSiteManagerDialog::OnNewBookmark(wxCommandEvent& event)
diff -Nru filezilla-3.5.3/src/interface/sitemanager_dialog.h filezilla-3.7.3~precise/src/interface/sitemanager_dialog.h
--- filezilla-3.5.3/src/interface/sitemanager_dialog.h	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/sitemanager_dialog.h	2013-06-09 03:30:05.000000000 +0000
@@ -11,7 +11,7 @@
 {
 	friend class CSiteManagerDropTarget;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 
 public:
 	struct _connected_site
diff -Nru filezilla-3.5.3/src/interface/speedlimits_dialog.h filezilla-3.7.3~precise/src/interface/speedlimits_dialog.h
--- filezilla-3.5.3/src/interface/speedlimits_dialog.h	2010-01-25 03:00:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/speedlimits_dialog.h	2013-06-09 03:30:05.000000000 +0000
@@ -12,7 +12,7 @@
 	void Run(wxWindow* parent);
 
 protected:
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnToggleEnable(wxCommandEvent& event);
 	void OnOK(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/splitter.cpp filezilla-3.7.3~precise/src/interface/splitter.cpp
--- filezilla-3.5.3/src/interface/splitter.cpp	2010-06-13 19:13:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/splitter.cpp	2013-06-09 03:30:05.000000000 +0000
@@ -1,7 +1,7 @@
 #include <filezilla.h>
 #include "splitter.h"
 
-IMPLEMENT_CLASS(CSplitterWindowEx, wxSplitterWindow);
+IMPLEMENT_CLASS(CSplitterWindowEx, wxSplitterWindow)
 
 BEGIN_EVENT_TABLE(CSplitterWindowEx, wxSplitterWindow)
 EVT_SIZE(CSplitterWindowEx::OnSize)
@@ -96,7 +96,7 @@
 					newPosition = size - m_minimumPaneSize - GetSashSize();
 			}
 		}
-		
+
 		if ( newPosition >= size - 5 )
 			newPosition = wxMax(10, size - 40);
 
@@ -236,7 +236,7 @@
 	}
 
 	// Needs to be set to avoid resizing oddity:
-	// Maximize window -> Unsplit -> Restore ->	Split -> Resize window
+	// Maximize window -> Unsplit -> Restore -> Split -> Resize window
 	m_lastSize = wxSize(w, h);
 
 	return wxSplitterWindow::SplitHorizontally(window1, window2, sashPosition);
@@ -265,7 +265,7 @@
 	}
 
 	// Needs to be set to avoid resizing oddity:
-	// Maximize window -> Unsplit -> Restore ->	Split -> Resize window
+	// Maximize window -> Unsplit -> Restore -> Split -> Resize window
 	m_lastSize = wxSize(w, h);
 
 	return wxSplitterWindow::SplitVertically(window1, window2, sashPosition);
diff -Nru filezilla-3.5.3/src/interface/splitter.h filezilla-3.7.3~precise/src/interface/splitter.h
--- filezilla-3.5.3/src/interface/splitter.h	2010-06-13 19:13:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/splitter.h	2013-06-09 03:30:05.000000000 +0000
@@ -31,9 +31,9 @@
 
 	int CalcSoftLimit(int newSashPosition);
 
-	DECLARE_CLASS(CSplitterWindowEx);
+	DECLARE_CLASS(CSplitterWindowEx)
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSize(wxSizeEvent& event);
 
 	double m_relative_sash_position;
diff -Nru filezilla-3.5.3/src/interface/state.cpp filezilla-3.7.3~precise/src/interface/state.cpp
--- filezilla-3.5.3/src/interface/state.cpp	2011-04-25 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/state.cpp	2013-04-17 03:30:10.000000000 +0000
@@ -97,7 +97,7 @@
 
 	std::list<t_handler> &handlers = m_handlers[notification];
 	std::list<t_handler>::const_iterator iter;
-	for (iter = handlers.begin(); iter != handlers.end(); iter++)
+	for (iter = handlers.begin(); iter != handlers.end(); ++iter)
 	{
 		if (iter->pHandler == pHandler)
 			return;
@@ -120,7 +120,7 @@
 		for (int i = 0; i < STATECHANGE_MAX; i++)
 		{
 			std::list<t_handler> &handlers = m_handlers[i];
-			for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+			for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 			{
 				if (iter->pHandler == pHandler)
 				{
@@ -133,7 +133,7 @@
 	else
 	{
 		std::list<t_handler> &handlers = m_handlers[notification];
-		for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+		for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 		{
 			if (iter->pHandler == pHandler)
 			{
@@ -155,7 +155,7 @@
 	wxASSERT(notification != STATECHANGE_NONE && notification != STATECHANGE_MAX);
 
 	const std::list<t_handler> &handlers = m_handlers[notification];
-	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 	{
 		if (blocked && iter->blockable)
 			continue;
@@ -184,7 +184,7 @@
 void CContextManager::NotifyGlobalHandlers(enum t_statechange_notifications notification, const wxString& data /*=_T("")*/, const void* data2 /*=0*/)
 {
 	const std::list<t_handler> &handlers = m_handlers[notification];
-	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 		iter->pHandler->OnStateChange(0, notification, data, data2);
 }
 
@@ -217,7 +217,7 @@
 CState::~CState()
 {
 	delete m_pServer;
-	
+
 	delete m_pCertificate;
 	delete m_pSftpEncryptionInfo;
 
@@ -228,7 +228,7 @@
 	// Unregister all handlers
 	for (int i = 0; i < STATECHANGE_MAX; i++)
 	{
-		for (std::list<t_handler>::iterator iter = m_handlers[i].begin(); iter != m_handlers[i].end(); iter++)
+		for (std::list<t_handler>::iterator iter = m_handlers[i].begin(); iter != m_handlers[i].end(); ++iter)
 		{
 			iter->pHandler->m_pState = 0;
 		}
@@ -269,7 +269,7 @@
 	if (!m_sync_browse.local_root.empty())
 	{
 		wxASSERT(m_pServer);
-		
+
 		if (p != m_sync_browse.local_root && !p.IsSubdirOf(m_sync_browse.local_root))
 		{
 			wxString msg = wxString::Format(_("The local directory '%s' is not below the synchronization root (%s).\nDisable synchronized browsing and continue changing the local directory?"),
@@ -306,7 +306,23 @@
 			return true;
 		}
 	}
-	
+
+	if (p == m_localDir.GetParent())
+	{
+#ifdef __WXMSW__
+		if (p.GetPath() == _T("\\"))
+		{
+			m_previouslyVisitedLocalSubdir = m_localDir.GetPath();
+			m_previouslyVisitedLocalSubdir.RemoveLast();
+		}
+		else
+#endif
+			m_previouslyVisitedLocalSubdir = m_localDir.GetLastSegment();
+	}
+	else
+		m_previouslyVisitedLocalSubdir = _T("");
+
+
 	m_localDir = p;
 
 	COptions::Get()->SetOption(OPTION_LASTLOCALDIR, m_localDir.GetPath());
@@ -329,11 +345,18 @@
 			m_pDirectoryListing = 0;
 			NotifyHandlers(STATECHANGE_REMOTE_DIR);
 		}
+		m_previouslyVisitedRemoteSubdir = _T("");
 		return true;
 	}
 
 	wxASSERT(pDirectoryListing->m_firstListTime.IsValid());
 
+	if (pDirectoryListing && m_pDirectoryListing &&
+		pDirectoryListing->path == m_pDirectoryListing->path.GetParent())
+		m_previouslyVisitedRemoteSubdir = m_pDirectoryListing->path.GetLastSegment();
+	else
+		m_previouslyVisitedRemoteSubdir = _T("");
+
 	if (modified)
 	{
 		if (!m_pDirectoryListing || m_pDirectoryListing->path != pDirectoryListing->path)
@@ -347,7 +370,7 @@
 		m_last_path = pDirectoryListing->path;
 
 	if (m_pDirectoryListing && m_pDirectoryListing->path == pDirectoryListing->path &&
-        pDirectoryListing->m_failed)
+		pDirectoryListing->m_failed)
 	{
 		// We still got an old listing, no need to display the new one
 		delete pDirectoryListing;
@@ -543,7 +566,7 @@
 
 	if (!IsRemoteConnected())
 		return true;
-	
+
 	if (!IsRemoteIdle())
 		return false;
 
@@ -585,7 +608,7 @@
 
 	std::list<t_handler> &handlers = m_handlers[notification];
 	std::list<t_handler>::const_iterator iter;
-	for (iter = handlers.begin(); iter != handlers.end(); iter++)
+	for (iter = handlers.begin(); iter != handlers.end(); ++iter)
 	{
 		if (iter->pHandler == pHandler)
 			return;
@@ -607,7 +630,7 @@
 		for (int i = 0; i < STATECHANGE_MAX; i++)
 		{
 			std::list<t_handler> &handlers = m_handlers[i];
-			for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+			for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 			{
 				if (iter->pHandler == pHandler)
 				{
@@ -620,7 +643,7 @@
 	else
 	{
 		std::list<t_handler> &handlers = m_handlers[notification];
-		for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+		for (std::list<t_handler>::iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 		{
 			if (iter->pHandler == pHandler)
 			{
@@ -663,7 +686,7 @@
 	wxASSERT(notification != STATECHANGE_NONE && notification != STATECHANGE_MAX);
 
 	const std::list<t_handler> &handlers = m_handlers[notification];
-	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); iter++)
+	for (std::list<t_handler>::const_iterator iter = handlers.begin(); iter != handlers.end(); ++iter)
 	{
 		if (m_blocked[notification] && iter->blockable)
 			continue;
@@ -684,7 +707,7 @@
 	CContextManager::Get()->UnregisterHandler(this, STATECHANGE_NONE);
 
 	const std::vector<CState*> *states = CContextManager::Get()->GetAllStates();
-	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); iter++)
+	for (std::vector<CState*>::const_iterator iter = states->begin(); iter != states->end(); ++iter)
 		(*iter)->UnregisterHandler(this, STATECHANGE_NONE);
 }
 
@@ -771,6 +794,7 @@
 	delete [] to;
 	delete [] from;
 #else
+	wxString error;
 	for (unsigned int i = 0; i < files.Count(); i++)
 	{
 		const wxString& file(files[i]);
@@ -784,24 +808,38 @@
 			CLocalPath sourcePath(file, &name);
 			if (name.empty())
 				continue;
+			wxString target = path.GetPath() + name;
+			if (file == target)
+				continue;
+
 			if (copy)
-				wxCopyFile(file, path.GetPath() + name);
+				wxCopyFile(file, target);
 			else
-				wxRenameFile(file, path.GetPath() + name);
+				wxRenameFile(file, target);
 		}
 		else if (type == CLocalFileSystem::dir)
 		{
+			CLocalPath sourcePath(file);
+			if (sourcePath == path || sourcePath.GetParent() == path)
+				continue;
+			if (sourcePath.IsParentOf(path))
+			{
+				error = _("A directory cannot be dragged into one of its subdirectories.");
+				continue;
+			}
+
 			if (copy)
-				RecursiveCopy(CLocalPath(file), path);
+				RecursiveCopy(sourcePath, path);
 			else
 			{
-				CLocalPath sourcePath(file);
 				if (!sourcePath.HasParent())
 					continue;
 				wxRenameFile(file, path.GetPath() + sourcePath.GetLastSegment());
 			}
 		}
 	}
+	if (!error.IsEmpty())
+		wxMessageBox(error, _("Could not complete operation"));
 #endif
 
 	RefreshLocal();
@@ -870,7 +908,7 @@
 	bool hasDirs = false;
 	bool hasFiles = false;
 	const std::list<CRemoteDataObject::t_fileInfo>& files = pRemoteDataObject->GetFiles();
-	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		if (iter->dir)
 			hasDirs = true;
@@ -890,7 +928,7 @@
 	if (!hasDirs)
 		return true;
 
-	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); iter++)
+	for (std::list<CRemoteDataObject::t_fileInfo>::const_iterator iter = files.begin(); iter != files.end(); ++iter)
 	{
 		if (!iter->dir)
 			continue;
@@ -932,7 +970,10 @@
 {
 	// Cheap URL encode
 	wxString encoded;
-	const wxWX2MBbuf utf8 = dir.mb_str();
+	const wxWX2MBbuf utf8 = dir.mb_str(wxConvUTF8);
+
+	if (!utf8)
+		return wxEmptyString;
 
 	const char* p = utf8;
 	while (*p)
@@ -982,10 +1023,33 @@
 	else
 		encoded = _T("/") + encoded;
 #endif
-
 	return _T("file://") + encoded;
 }
 
+bool CState::OpenInFileManager(const wxString& dir)
+{
+	bool ret = false;
+#ifdef __WXMSW__
+	// Unfortunately under Windows, UTF-8 encoded file:// URLs don't work, so use native paths.
+	// Unfortunatelier, we cannot use this for UNC paths, have to use file:// here
+	// Unfortunateliest, we again have a problem with UTF-8 characters which we cannot fix...
+	if (dir.Left(2) != _T("\\\\") && dir != _T("/"))
+		ret = wxLaunchDefaultBrowser(dir);
+	else
+#endif
+	{
+		wxString url = GetAsURL(dir);
+		if (!url.IsEmpty())
+			ret = wxLaunchDefaultBrowser(url);
+	}
+
+
+	if (!ret)
+		wxBell();
+
+	return ret;
+}
+
 void CState::ListingFailed(int error)
 {
 	m_sync_browse.is_changing = false;
@@ -1122,7 +1186,7 @@
 		return CLocalPath();
 
 	CLocalPath local_path = m_sync_browse.local_root;
-	for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); ++iter)
 		local_path.AddSegment(*iter);
 
 	return local_path;
@@ -1142,7 +1206,7 @@
 		return CServerPath();
 
 	CServerPath remote_path = m_sync_browse.remote_root;
-	for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = segments.begin(); iter != segments.end(); ++iter)
 		remote_path.AddSegment(*iter);
 
 	return remote_path;
@@ -1152,7 +1216,7 @@
 {
 	if (!m_pCommandQueue)
 		return false;
-	
+
 	if (!IsRemoteConnected() || !IsRemoteIdle())
 		return false;
 
@@ -1174,10 +1238,9 @@
 void CState::SetSecurityInfo(CCertificateNotification const& info)
 {
 	delete m_pCertificate;
-	m_pCertificate = 0;
+	m_pCertificate = new CCertificateNotification(info);
 	delete m_pSftpEncryptionInfo;
 	m_pSftpEncryptionInfo = 0;
-	m_pCertificate = new CCertificateNotification(info);
 }
 
 void CState::SetSecurityInfo(CSftpEncryptionNotification const& info)
@@ -1185,6 +1248,5 @@
 	delete m_pCertificate;
 	m_pCertificate = 0;
 	delete m_pSftpEncryptionInfo;
-	m_pSftpEncryptionInfo = 0;
 	m_pSftpEncryptionInfo = new CSftpEncryptionNotification(info);
 }
diff -Nru filezilla-3.5.3/src/interface/state.h filezilla-3.7.3~precise/src/interface/state.h
--- filezilla-3.5.3/src/interface/state.h	2010-01-31 03:00:20.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/state.h	2013-04-17 03:30:10.000000000 +0000
@@ -101,6 +101,9 @@
 	CLocalPath GetLocalDir() const;
 	bool SetLocalDir(const wxString& dir, wxString *error = 0);
 
+	// Opens specified directory in local file manager, e.g. Explorer on Windows
+	static bool OpenInFileManager(const wxString& dir);
+	
 	// Returns a file:// URL
 	static wxString GetAsURL(const wxString& dir);
 
@@ -163,6 +166,12 @@
 	bool GetSecurityInfo(CSftpEncryptionNotification *& pInfo);
 	void SetSecurityInfo(CCertificateNotification const& info);
 	void SetSecurityInfo(CSftpEncryptionNotification const& info);
+
+	// If the previously selected directory was a direct child of the current directory, this
+	// returns the relative name of the subdirectory.
+	wxString GetPreviouslyVisitedLocalSubdir() const { return m_previouslyVisitedLocalSubdir; }
+	wxString GetPreviouslyVisitedRemoteSubdir() const { return m_previouslyVisitedRemoteSubdir; }
+
 protected:
 	void SetServer(const CServer* server);
 
@@ -203,6 +212,9 @@
 
 	CCertificateNotification* m_pCertificate;
 	CSftpEncryptionNotification* m_pSftpEncryptionInfo;
+
+	wxString m_previouslyVisitedLocalSubdir;
+	wxString m_previouslyVisitedRemoteSubdir;
 };
 
 class CStateEventHandler
diff -Nru filezilla-3.5.3/src/interface/statusbar.cpp filezilla-3.7.3~precise/src/interface/statusbar.cpp
--- filezilla-3.5.3/src/interface/statusbar.cpp	2010-09-28 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/statusbar.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -41,7 +41,7 @@
 
 	int oldCount = GetFieldsCount();
 	int* oldWidths = m_columnWidths;
-	
+
 	m_columnWidths = new int[number];
 	if (!widths)
 	{
@@ -233,16 +233,16 @@
 {
 	wxRect rect;
 	GetFieldRect(field, rect);
-	
+
 	int offset = 2;
 
 	if (field + 1 == GetFieldsCount())
 	{
-		rect.SetWidth(m_columnWidths[field]);	
+		rect.SetWidth(m_columnWidths[field]);
 		offset += 5 + GetGripperWidth();
 	}
 
-	for (std::map<int, struct t_statbar_child>::iterator iter = m_children.begin(); iter != m_children.end(); iter++)
+	for (std::map<int, struct t_statbar_child>::iterator iter = m_children.begin(); iter != m_children.end(); ++iter)
 	{
 		if (iter->second.field != field)
 			continue;
@@ -273,7 +273,7 @@
 	};
 
 protected:
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 
 	// Make sure it is truly transparent, i.e. also works with
 	// themed status bars.
@@ -451,7 +451,7 @@
 	dc.SetFont(GetFont());
 
 	wxSize s = dc.GetTextExtent(_("Queue: empty"));
-	
+
 	wxString tmp = _T(">8888");
 	if (m_sizeFormatDecimalPlaces)
 	{
@@ -496,7 +496,7 @@
 
 void CStatusBar::UpdateSizeFormat()
 {
-	// 0 equals bytes, however just use IEC binary prefixes instead, 
+	// 0 equals bytes, however just use IEC binary prefixes instead,
 	// exact byte counts for queue make no sense.
 	m_sizeFormat = CSizeFormat::_format(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
 	if (!m_sizeFormat)
@@ -544,7 +544,7 @@
 		wxMenu* pMenu = wxXmlResource::Get()->LoadMenu(_T("ID_MENU_TRANSFER_TYPE_CONTEXT"));
 		if (!pMenu)
 			return;
-	
+
 		const int type = COptions::Get()->GetOptionVal(OPTION_ASCIIBINARY);
 		switch (type)
 		{
@@ -610,7 +610,7 @@
 		else
 			tooltip += _("Upload limit: none");
 	}
-	
+
 	if (!m_pSpeedLimitsIndicator)
 	{
 		m_pSpeedLimitsIndicator = new CIndicator(this, bmp);
diff -Nru filezilla-3.5.3/src/interface/statusbar.h filezilla-3.7.3~precise/src/interface/statusbar.h
--- filezilla-3.5.3/src/interface/statusbar.h	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/statusbar.h	2013-06-09 03:30:06.000000000 +0000
@@ -24,7 +24,7 @@
 
 	// We override these for two reasons:
 	// - wxWidgets does not provide a function to get the field widths back
-	// - fixup for last field. Under MSW it has a gripper if window is not 
+	// - fixup for last field. Under MSW it has a gripper if window is not
 	//   maximized, under GTK2 it always has a gripper. These grippers overlap
 	//   last field.
 	virtual void SetFieldsCount(int number = 1, const int* widths = NULL);
@@ -51,7 +51,7 @@
 
 	int* m_columnWidths;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSize(wxSizeEvent& event);
 };
 
@@ -65,7 +65,7 @@
 	// Positioned in the field given in the constructor,
 	// right aligned and in reverse order.
 	void AddChild(int field, int idx, wxWindow* pChild);
-	
+
 	void RemoveChild(int idx);
 
 	virtual void SetFieldWidth(int field, int width);
@@ -81,7 +81,7 @@
 
 	void PositionChildren(int field);
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSize(wxSizeEvent& event);
 };
 
@@ -117,7 +117,7 @@
 	wxStaticBitmap* m_pEncryptionIndicator;
 	wxStaticBitmap* m_pSpeedLimitsIndicator;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSpeedLimitsEnable(wxCommandEvent& event);
 	void OnSpeedLimitsConfigure(wxCommandEvent& event);
 };
diff -Nru filezilla-3.5.3/src/interface/statuslinectrl.cpp filezilla-3.7.3~precise/src/interface/statuslinectrl.cpp
--- filezilla-3.5.3/src/interface/statuslinectrl.cpp	2010-10-24 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/statuslinectrl.cpp	2013-04-05 03:30:06.000000000 +0000
@@ -45,7 +45,7 @@
 	m_pParent = pParent;
 	m_pStatus = 0;
 	m_lastOffset = -1;
-	
+
 	m_gcLastTimeStamp = wxDateTime::Now();
 	m_gcLastOffset = -1;
 	m_gcLastSpeed = -1;
@@ -99,6 +99,9 @@
 		delete m_mdc;
 		m_data = wxBitmap(rect.GetWidth(), rect.GetHeight());
 		m_mdc = new wxMemoryDC(m_data);
+		// Use same layout direction as the DC which bitmap is drawn on.
+		// This avoids problem with mirrored characters on RTL locales.
+		m_mdc->SetLayoutDirection(dc.GetLayoutDirection());
 		refresh = 31;
 	}
 
@@ -151,7 +154,7 @@
 		if (COptions::Get()->GetOptionVal(OPTION_SPEED_DISPLAY))
 			rate = GetCurrentSpeed();
 		else
-		    rate = GetSpeed(elapsed_seconds);
+			rate = GetSpeed(elapsed_seconds);
 
 		if (m_pStatus->totalSize > 0 && elapsed_seconds && rate > 0)
 		{
@@ -173,12 +176,14 @@
 		const wxString bytestr = CSizeFormat::Format(m_pStatus->currentOffset, true, CSizeFormat::bytes, COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0, 0);
 		if (elapsed_seconds && rate > -1)
 		{
-			if (rate > (1000*1000))
-				bytes_and_rate.Printf(_("%s (%d.%d MB/s)"), bytestr.c_str(), (int)(rate / 1000 / 1000), (int)((rate / 1000 / 100) % 10));
-			else if (rate > 1000)
-				bytes_and_rate.Printf(_("%s (%d.%d KB/s)"), bytestr.c_str(), (int)(rate / 1000), (int)((rate / 100) % 10));
-			else
-				bytes_and_rate.Printf(_("%s (%d B/s)"), bytestr.c_str(), (int)rate);
+			CSizeFormat::_format format = static_cast<CSizeFormat::_format>(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
+			if (format == CSizeFormat::bytes)
+				format = CSizeFormat::iec;
+			const wxString ratestr = CSizeFormat::Format(rate, true,
+														 format,
+														 COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+														 COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+			bytes_and_rate.Printf(_("%s (%s/s)"), bytestr.c_str(), ratestr.c_str() );
 		}
 		else
 			bytes_and_rate.Printf(_("%s (? B/s)"), bytestr.c_str());
@@ -215,7 +220,7 @@
 		m_mdc->SetPen(GetBackgroundColour());
 		m_mdc->SetBrush(GetBackgroundColour());
 		m_mdc->SetTextForeground(GetForegroundColour());
-	
+
 		// Get character height so that we can center the text vertically.
 		wxCoord h = (rect.GetHeight() - m_textHeight) / 2;
 
@@ -378,7 +383,7 @@
 		prefix = _T("> ");
 		permill = 1000;
 	}
-	
+
 	wxString text = wxString::Format(_T("%s%d.%d%%"), prefix.c_str(), permill / 10, permill % 10);
 
 	wxCoord w, h;
@@ -422,21 +427,21 @@
 {
 	if (!m_pStatus)
 		return -1;
-	
+
 	const wxTimeSpan timeDiff( wxDateTime::UNow().Subtract(m_gcLastTimeStamp) );
-	
+
 	if (timeDiff.GetMilliseconds().GetLo() <= 2000)
 		return m_gcLastSpeed;
 
 	m_gcLastTimeStamp = wxDateTime::UNow();
 
 	if (m_gcLastOffset == -1)
-	    m_gcLastOffset = m_pStatus->startOffset;
-	
+		m_gcLastOffset = m_pStatus->startOffset;
+
 	const wxFileOffset fileOffsetDiff = m_pStatus->currentOffset - m_gcLastOffset;
 	m_gcLastOffset = m_pStatus->currentOffset;
 	m_gcLastSpeed = fileOffsetDiff * 1000 / timeDiff.GetMilliseconds().GetLo();
-	
+
 	return m_gcLastSpeed;
 }
 
diff -Nru filezilla-3.5.3/src/interface/statuslinectrl.h filezilla-3.7.3~precise/src/interface/statuslinectrl.h
--- filezilla-3.5.3/src/interface/statuslinectrl.h	2010-05-03 03:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/statuslinectrl.h	2012-10-06 03:30:11.000000000 +0000
@@ -62,7 +62,7 @@
 	wxString m_last_bytes_and_rate;
 	int m_last_bar_split;
 	int m_last_permill;
-	
+
 	DECLARE_EVENT_TABLE()
 	void OnPaint(wxPaintEvent& event);
 	void OnTimer(wxTimerEvent& event);
diff -Nru filezilla-3.5.3/src/interface/systemimagelist.cpp filezilla-3.7.3~precise/src/interface/systemimagelist.cpp
--- filezilla-3.5.3/src/interface/systemimagelist.cpp	2010-09-28 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/systemimagelist.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -3,19 +3,19 @@
 #ifdef __WXMSW__
 #include "shlobj.h"
 
-  // Once again lots of the shell stuff is missing in MinGW's headers
-  #ifndef IDO_SHGIOI_LINK
-    #define IDO_SHGIOI_LINK 0x0FFFFFFE
-  #endif
-  #ifndef SHGetIconOverlayIndex
-    extern "C" int WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, int iIconIndex);
-    extern "C" int WINAPI SHGetIconOverlayIndexA(LPCSTR pszIconPath, int iIconIndex);
-    #if wxUSE_UNICODE
-      #define SHGetIconOverlayIndex SHGetIconOverlayIndexW
-    #else
-      #define SHGetIconOverlayIndex SHGetIconOverlayIndexA
-    #endif
-  #endif
+	// Once again lots of the shell stuff is missing in MinGW's headers
+	#ifndef IDO_SHGIOI_LINK
+		#define IDO_SHGIOI_LINK 0x0FFFFFFE
+	#endif
+	#ifndef SHGetIconOverlayIndex
+		extern "C" int WINAPI SHGetIconOverlayIndexW(LPCWSTR pszIconPath, int iIconIndex);
+		extern "C" int WINAPI SHGetIconOverlayIndexA(LPCSTR pszIconPath, int iIconIndex);
+		#if wxUSE_UNICODE
+			#define SHGetIconOverlayIndex SHGetIconOverlayIndexW
+		#else
+			#define SHGetIconOverlayIndex SHGetIconOverlayIndexA
+		#endif
+	#endif
 #endif
 #ifndef __WXMSW__
 #include "themeprovider.h"
@@ -74,10 +74,10 @@
 
 	int sx = bmp.GetWidth();
 	if (symlink.GetWidth() < sx)
-		sx = symlink.GetWidth();		
+		sx = symlink.GetWidth();
 	int sy = bmp.GetHeight();
 	if (symlink.GetHeight() < sy)
-		sy = symlink.GetHeight();		
+		sy = symlink.GetHeight();
 
 	// Do some rudimentary alpha copying
 	wxAlphaPixelData::Iterator t(target);
@@ -226,7 +226,7 @@
 		m_iconCache[ext] = icon;
 		return icon;
 	}
-	
+
 	wxIconLocation loc;
 	if (pType->GetIcon(&loc) && loc.IsOk())
 	{
diff -Nru filezilla-3.5.3/src/interface/systemimagelist.h filezilla-3.7.3~precise/src/interface/systemimagelist.h
--- filezilla-3.5.3/src/interface/systemimagelist.h	2010-09-21 03:30:17.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/systemimagelist.h	2012-10-25 03:30:07.000000000 +0000
@@ -19,7 +19,7 @@
 public:
 	wxImageListEx();
 	wxImageListEx(int width, int height, const bool mask = true, int initialCount = 1);
-	virtual ~wxImageListEx() {  }
+	virtual ~wxImageListEx() {}
 
 #ifdef __WXMSW__
 	wxImageListEx(WXHIMAGELIST hList) { m_hImageList = hList; }
@@ -32,7 +32,7 @@
 {
 public:
 	CSystemImageList(int size = -1);
-	
+
 	bool CreateSystemImageList(int size);
 	virtual ~CSystemImageList();
 
diff -Nru filezilla-3.5.3/src/interface/themeprovider.cpp filezilla-3.7.3~precise/src/interface/themeprovider.cpp
--- filezilla-3.5.3/src/interface/themeprovider.cpp	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/themeprovider.cpp	2013-01-14 04:30:08.000000000 +0000
@@ -71,12 +71,12 @@
 
 	wxLogNull logNull;
 
-	for (std::list<wxString>::const_iterator iter = dirs.begin(); iter != dirs.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = dirs.begin(); iter != dirs.end(); ++iter)
 	{
 		wxString fileName = *iter + name + _T(".png");
 //#ifdef __WXMSW__
 		// MSW toolbar only greys out disabled buttons in a visually
-		// pleasing way if the bitmap has an alpha channel. 
+		// pleasing way if the bitmap has an alpha channel.
 		wxImage img(fileName, wxBITMAP_TYPE_PNG);
 		if (!img.Ok())
 			continue;
@@ -165,7 +165,7 @@
 bool CThemeProvider::GetThemeData(const wxString& themePath, wxString& name, wxString& author, wxString& email)
 {
 	wxFileName fn(wxGetApp().GetResourceDir() + themePath, _T("theme.xml"));
-	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath(), false);
+	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath());
 	if (!pDocument)
 		return false;
 
@@ -186,7 +186,7 @@
 	std::list<wxString> sizes;
 
 	wxFileName fn(wxGetApp().GetResourceDir() + themePath, _T("theme.xml"));
-	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath(), false);
+	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath());
 	if (!pDocument)
 		return sizes;
 
@@ -241,7 +241,7 @@
 bool CThemeProvider::ThemeHasSize(const wxString& themePath, const wxString& size)
 {
 	wxFileName fn(wxGetApp().GetResourceDir() + themePath, _T("theme.xml"));
-	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath(), false);
+	TiXmlElement* pDocument = GetXmlFile(fn.GetFullPath());
 	if (!pDocument)
 		return false;
 
@@ -278,7 +278,7 @@
 	if (wxFile::Exists(themePath + _T("theme.xml")))
 		return themePath;
 
-    themePath = resourceDir + _T("opencrystal/");
+	themePath = resourceDir + _T("opencrystal/");
 	if (wxFile::Exists(themePath + _T("theme.xml")))
 		return themePath;
 
diff -Nru filezilla-3.5.3/src/interface/themeprovider.h filezilla-3.7.3~precise/src/interface/themeprovider.h
--- filezilla-3.5.3/src/interface/themeprovider.h	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/themeprovider.h	2012-10-25 03:30:07.000000000 +0000
@@ -14,7 +14,7 @@
 {
 public:
 	CThemeProvider();
-	virtual ~CThemeProvider() { }
+	virtual ~CThemeProvider() {}
 
 	static std::list<wxString> GetThemes();
 	static std::list<wxBitmap*> GetAllImages(const wxString& theme, const wxSize& size);
@@ -27,7 +27,7 @@
 
 protected:
 	static wxString GetThemePath();
-	
+
 	wxBitmap CreateBitmap(const wxArtID& id, const wxArtClient& /*client*/, const wxSize& size);
 
 	std::list<wxString> GetSearchDirs(const wxSize& size);
diff -Nru filezilla-3.5.3/src/interface/toolbar.cpp filezilla-3.7.3~precise/src/interface/toolbar.cpp
--- filezilla-3.5.3/src/interface/toolbar.cpp	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/toolbar.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -18,7 +18,7 @@
 
 CToolBar::~CToolBar()
 {
-	for (std::map<int, wxToolBarToolBase*>::iterator iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); iter++)
+	for (std::map<int, wxToolBarToolBase*>::iterator iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); ++iter)
 		delete iter->second;
 }
 
@@ -206,7 +206,7 @@
 	int offset = 0;
 
 	std::map<int, wxToolBarToolBase*>::iterator iter;
-	for (iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); iter++)
+	for (iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); ++iter)
 	{
 		if (iter->second->GetId() != id)
 		{
@@ -234,14 +234,14 @@
 	if (!tool)
 		return false;
 
-	for (std::map<int, wxToolBarToolBase*>::iterator iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); iter++)
+	for (std::map<int, wxToolBarToolBase*>::iterator iter = m_hidden_tools.begin(); iter != m_hidden_tools.end(); ++iter)
 	{
 		if (iter->first > pos)
 			break;
-		
+
 		pos++;
 	}
-	
+
 	m_hidden_tools[pos] = tool;
 
 	return true;
diff -Nru filezilla-3.5.3/src/interface/toolbar.h filezilla-3.7.3~precise/src/interface/toolbar.h
--- filezilla-3.5.3/src/interface/toolbar.h	2011-11-08 20:33:06.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/toolbar.h	2013-06-09 03:30:05.000000000 +0000
@@ -31,7 +31,7 @@
 
 	std::map<int, wxToolBarToolBase*> m_hidden_tools;
 
-	DECLARE_DYNAMIC_CLASS(CToolBar);
+	DECLARE_DYNAMIC_CLASS(CToolBar)
 };
 
 #endif //__TOOLBAR_H__
diff -Nru filezilla-3.5.3/src/interface/treectrlex.cpp filezilla-3.7.3~precise/src/interface/treectrlex.cpp
--- filezilla-3.5.3/src/interface/treectrlex.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/treectrlex.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -1,12 +1,12 @@
 #include <filezilla.h>
 #include "treectrlex.h"
 
-IMPLEMENT_CLASS(wxTreeCtrlEx, wxTreeCtrl);
+IMPLEMENT_CLASS(wxTreeCtrlEx, wxTreeCtrl)
 
 wxTreeCtrlEx::wxTreeCtrlEx(wxWindow *parent, wxWindowID id /*=wxID_ANY*/,
-               const wxPoint& pos /*=wxDefaultPosition*/,
-               const wxSize& size /*=wxDefaultSize*/,
-               long style /*=wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT*/)
+			   const wxPoint& pos /*=wxDefaultPosition*/,
+			   const wxSize& size /*=wxDefaultSize*/,
+			   long style /*=wxTR_HAS_BUTTONS|wxTR_LINES_AT_ROOT*/)
 	: wxTreeCtrl(parent, id, pos, size, style), m_setSelection(false)
 {
 }
diff -Nru filezilla-3.5.3/src/interface/treectrlex.h filezilla-3.7.3~precise/src/interface/treectrlex.h
--- filezilla-3.5.3/src/interface/treectrlex.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/treectrlex.h	2013-06-09 03:30:06.000000000 +0000
@@ -3,13 +3,13 @@
 
 class wxTreeCtrlEx : public wxTreeCtrl
 {
-	DECLARE_CLASS(wxTreeCtrlEx);
+	DECLARE_CLASS(wxTreeCtrlEx)
 
 public:
 	wxTreeCtrlEx(wxWindow *parent, wxWindowID id = wxID_ANY,
-               const wxPoint& pos = wxDefaultPosition,
-               const wxSize& size = wxDefaultSize,
-               long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
+			   const wxPoint& pos = wxDefaultPosition,
+			   const wxSize& size = wxDefaultSize,
+			   long style = wxTR_HAS_BUTTONS | wxTR_LINES_AT_ROOT);
 	void SafeSelectItem(const wxTreeItemId& item);
 
 protected:
diff -Nru filezilla-3.5.3/src/interface/updatewizard.cpp filezilla-3.7.3~precise/src/interface/updatewizard.cpp
--- filezilla-3.5.3/src/interface/updatewizard.cpp	2011-01-09 19:53:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/updatewizard.cpp	2013-04-15 03:30:12.000000000 +0000
@@ -2,10 +2,11 @@
 
 #if FZ_MANUALUPDATECHECK
 
-#include "updatewizard.h"
+#include "buildinfo.h"
 #include "filezillaapp.h"
+#include "sizeformatting.h"
+#include "updatewizard.h"
 #include "Options.h"
-#include "buildinfo.h"
 #include <wx/stdpaths.h>
 #include "Mainfrm.h"
 #ifdef __WXMSW__
@@ -80,6 +81,11 @@
 class CUpdateWizardOptions : public COptionsBase
 {
 public:
+	CUpdateWizardOptions()
+		: m_use_internal_rootcert(true)
+	{
+	}
+
 	virtual int GetOptionVal(unsigned int nID)
 	{
 		return COptions::Get()->GetOptionVal(nID);
@@ -87,7 +93,7 @@
 
 	virtual wxString GetOption(unsigned int nID)
 	{
-		if (nID == OPTION_INTERNAL_ROOTCERT)
+		if (nID == OPTION_INTERNAL_ROOTCERT && m_use_internal_rootcert)
 			return s_update_cert;
 
 		return COptions::Get()->GetOption(nID);
@@ -102,6 +108,8 @@
 	{
 		return COptions::Get()->SetOption(nID, value);
 	}
+
+	bool m_use_internal_rootcert;
 };
 
 CUpdateWizard::CUpdateWizard(wxWindow* pParent)
@@ -183,7 +191,7 @@
 
 
 	GetPageAreaSizer()->Add(m_pages[0]);
-	
+
 	std::vector<wxWindow*> windows;
 	for (unsigned int i = 0; i < m_pages.size(); i++)
 		windows.push_back(m_pages[i]);
@@ -280,7 +288,7 @@
 #ifdef __WXMSW__
 	// Old Vista has a profile directory for downloaded files,
 	// need to get it using SHGetKnownFolderPath which we need to
-	// load dynamically to preserve forward compatibility with the 
+	// load dynamically to preserve forward compatibility with the
 	// upgrade to Windows XP.
 	wxDynamicLibrary lib(_T("shell32.dll"));
 	if (lib.IsLoaded() && lib.HasSymbol(_T("SHGetKnownFolderPath")))
@@ -311,7 +319,7 @@
 	CLocalPath downloadDir(COptions::Get()->GetOption(OPTION_UPDATECHECK_DOWNLOADDIR));
 	if (downloadDir.empty() || !downloadDir.Exists())
 		downloadDir = defaultDownloadDir;
-	
+
 	const int flags = wxFD_SAVE | wxFD_OVERWRITE_PROMPT;
 
 	const wxString& ext = filename.Right(4);
@@ -387,7 +395,7 @@
 			return;
 		}
 	}
-	
+
 	m_skipPageChanging = false;
 }
 
@@ -418,6 +426,9 @@
 
 	m_inTransfer = false;
 
+	if (m_update_options)
+		m_update_options->m_use_internal_rootcert = false;
+
 	int res = m_pEngine->Command(CConnectCommand(CServer(m_urlProtocol, DEFAULT, m_urlServer, (m_urlProtocol == HTTPS) ? 443 : 80)));
 	if (res == FZ_REPLY_OK)
 	{
@@ -453,9 +464,9 @@
 		XRCCTRL(*this, "ID_FAILURE", wxStaticText)->SetLabel(_("Failed to check for newer version of FileZilla."));
 	else
 		XRCCTRL(*this, "ID_FAILURE", wxStaticText)->SetLabel(_("Failed to download the latest version of FileZilla."));
-	
+
 	((wxWizardPageSimple*)GetCurrentPage())->SetNext(m_pages[3]);
-	m_pages[3]->SetPrev((wxWizardPageSimple*)GetCurrentPage());	
+	m_pages[3]->SetPrev((wxWizardPageSimple*)GetCurrentPage());
 
 	m_skipPageChanging = true;
 	ShowPage(m_pages[3]);
@@ -519,7 +530,7 @@
 					else if (m_currentPage == 2)
 					{
 						wxStaticText *pText = XRCCTRL(*this, "ID_DOWNLOADPROGRESSTEXT", wxStaticText);
-						
+
 						wxString text = pLogMsg->msg;
 						text.Replace(_T("&"), _T("&&"));
 						WrapText(pText, text, m_pages[2]->GetClientSize().x);
@@ -721,7 +732,7 @@
 			m_news.Trim(false);
 			break;
 		}
-		
+
 		// Extract type of update
 		pos = line.Find(' ');
 		if (pos < 1)
@@ -871,7 +882,7 @@
 		return;
 	}
 
-	
+
 	wxTimeSpan elapsed = wxDateTime::Now().Subtract(pStatus->started);
 	int elapsedSeconds = elapsed.GetSeconds().GetLo(); // Assume GetHi is always 0
 
@@ -880,12 +891,15 @@
 	{
 		wxFileOffset rate = (pStatus->currentOffset - pStatus->startOffset) / elapsedSeconds;
 
-        if (rate > (1000*1000))
-			text.Printf(_("%s bytes (%d.%d MB/s)"), wxLongLong(pStatus->currentOffset).ToString().c_str(), (int)(rate / 1000 / 1000), (int)((rate / 1000 / 100) % 10));
-		else if (rate > 1000)
-			text.Printf(_("%s bytes (%d.%d KB/s)"), wxLongLong(pStatus->currentOffset).ToString().c_str(), (int)(rate / 1000), (int)((rate / 100) % 10));
-		else
-			text.Printf(_("%s bytes (%d B/s)"), wxLongLong(pStatus->currentOffset).ToString().c_str(), (int)rate);
+		CSizeFormat::_format format = static_cast<CSizeFormat::_format>(COptions::Get()->GetOptionVal(OPTION_SIZE_FORMAT));
+		if (format == CSizeFormat::bytes)
+			format = CSizeFormat::iec;
+		const wxString ratestr = CSizeFormat::Format(rate, true,
+													 format,
+													 COptions::Get()->GetOptionVal(OPTION_SIZE_USETHOUSANDSEP) != 0,
+													 COptions::Get()->GetOptionVal(OPTION_SIZE_DECIMALPLACES));
+
+		text.Printf(_("%s bytes (%s/s)"), wxLongLong(pStatus->currentOffset).ToString().c_str(), ratestr.c_str());
 
 		if (pStatus->totalSize > 0 && rate > 0)
 		{
@@ -907,7 +921,7 @@
 	m_pages[2]->GetSizer()->Layout();
 
 	if (pStatus->totalSize > 0)
-	{	
+	{
 		int percent = (pStatus->currentOffset * 100) / pStatus->totalSize;
 		if (percent > 100)
 			percent = 100;
@@ -961,7 +975,7 @@
 	if (lastCheckStr == _T(""))
 		return true;
 
-	wxDateTime lastCheck;	
+	wxDateTime lastCheck;
 	lastCheck.ParseDateTime(lastCheckStr);
 	if (!lastCheck.IsValid())
 		return true;
@@ -971,7 +985,7 @@
 	if (span.GetSeconds() < 0)
 		// Last check in future
 		return true;
-	
+
 	int days;
 	if (CBuildInfo::GetBuildType() == _T("official") && CBuildInfo::IsUnstable())
 		days = 3600 * 24;
@@ -990,6 +1004,7 @@
 	if (COptions::Get()->GetOptionVal(OPTION_UPDATECHECK_CHECKBETA) != 0)
 		m_urlFile += _T("&beta=1");
 
+	m_update_options->m_use_internal_rootcert = true;
 	int res = m_pEngine->Command(CConnectCommand(CServer(m_urlProtocol, DEFAULT, m_urlServer, (m_urlProtocol == HTTPS) ? 443 : 80)));
 	if (res == FZ_REPLY_OK)
 	{
@@ -1082,7 +1097,13 @@
 	}
 	else
 	{
-		if (!newUrl.Left(7).CmpNoCase(_T("http://")))
+		m_urlProtocol = HTTP;
+		if (!newUrl.Left(8).CmpNoCase(_T("https://")))
+		{
+			newUrl = newUrl.Mid(8);
+			m_urlProtocol = HTTPS;
+		}
+		else if (!newUrl.Left(7).CmpNoCase(_T("http://")))
 			newUrl = newUrl.Mid(7);
 		int pos = newUrl.Find('/');
 		if (pos == -1)
@@ -1097,7 +1118,6 @@
 			XRCCTRL(*this, "ID_UPDATEDESC2", wxStaticText)->SetLabel(_("Alternatively, visit http://filezilla-project.org to download the most recent version."));
 			XRCCTRL(*this, "ID_UPDATEDESC2", wxStaticText)->Show();
 
-			m_urlProtocol = HTTP;
 			m_urlServer = newUrl.Left(pos);
 			m_urlFile = newUrl.Mid(pos);
 			m_update_checksum = newChecksum;
@@ -1245,9 +1265,9 @@
 	XRCCTRL(*this, "ID_MISMATCH2", wxStaticText)->Show();
 	XRCCTRL(*this, "ID_MISMATCH3", wxStaticText)->Show();
 	XRCCTRL(*this, "ID_MISMATCH4", wxStaticText)->Show();
-	
+
 	((wxWizardPageSimple*)GetCurrentPage())->SetNext(m_pages[3]);
-	m_pages[3]->SetPrev((wxWizardPageSimple*)GetCurrentPage());	
+	m_pages[3]->SetPrev((wxWizardPageSimple*)GetCurrentPage());
 
 	m_skipPageChanging = true;
 	ShowPage(m_pages[3]);
diff -Nru filezilla-3.5.3/src/interface/updatewizard.h filezilla-3.7.3~precise/src/interface/updatewizard.h
--- filezilla-3.5.3/src/interface/updatewizard.h	2010-03-08 03:00:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/updatewizard.h	2013-04-15 03:30:12.000000000 +0000
@@ -6,7 +6,7 @@
 #include <wx/wizard.h>
 #include "wrapengine.h"
 
-class COptionsBase;
+class CUpdateWizardOptions;
 class CUpdateWizard : public wxWizard, protected CWrapEngine
 {
 public:
@@ -71,7 +71,7 @@
 	wxString m_update_log;
 
 	wxTimer m_statusTimer;
-	
+
 	// If there's already another dialog shown, wait
 	// with displaying update dialog until the other
 	// dialog gets closed. Check once every second.
@@ -94,7 +94,7 @@
 	bool m_menuUpdated;
 	bool m_start_check;
 
-	COptionsBase* m_update_options;
+	CUpdateWizardOptions* m_update_options;
 
 	bool m_successfully_downloaded;
 };
diff -Nru filezilla-3.5.3/src/interface/verifycertdialog.cpp filezilla-3.7.3~precise/src/interface/verifycertdialog.cpp
--- filezilla-3.5.3/src/interface/verifycertdialog.cpp	2010-11-20 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/verifycertdialog.cpp	2013-05-26 15:45:23.000000000 +0000
@@ -7,9 +7,9 @@
 
 CVerifyCertDialog::~CVerifyCertDialog()
 {
-	for (std::list<t_certData>::iterator iter = m_trustedCerts.begin(); iter != m_trustedCerts.end(); iter++)
+	for (std::list<t_certData>::iterator iter = m_trustedCerts.begin(); iter != m_trustedCerts.end(); ++iter)
 		delete [] iter->data;
-	for (std::list<t_certData>::iterator iter = m_sessionTrustedCerts.begin(); iter != m_sessionTrustedCerts.end(); iter++)
+	for (std::list<t_certData>::iterator iter = m_sessionTrustedCerts.begin(); iter != m_sessionTrustedCerts.end(); ++iter)
 		delete [] iter->data;
 }
 
@@ -54,6 +54,7 @@
 		pDlg->SetLabel(XRCID("ID_SERIAL"), _("None"));
 
 	pDlg->SetLabel(XRCID("ID_PKALGO"), wxString::Format(_("%s with %d bits"), cert.GetPkAlgoName().c_str(), cert.GetPkAlgoBits()));
+	pDlg->SetLabel(XRCID("ID_SIGNALGO"), cert.GetSignatureAlgorithm());
 
 	pDlg->SetLabel(XRCID("ID_FINGERPRINT_MD5"), cert.GetFingerPrintMD5());
 	pDlg->SetLabel(XRCID("ID_FINGERPRINT_SHA1"), cert.GetFingerPrintSHA1());
@@ -119,6 +120,8 @@
 
 	bool warning = DisplayCert(m_pDlg, m_certificates[0]);
 
+	m_pDlg->SetLabel(XRCID("ID_PROTOCOL"), pNotification->GetProtocol());
+	m_pDlg->SetLabel(XRCID("ID_KEYEXCHANGE"), pNotification->GetKeyExchange());
 	m_pDlg->SetLabel(XRCID("ID_CIPHER"), pNotification->GetSessionCipher());
 	m_pDlg->SetLabel(XRCID("ID_MAC"), pNotification->GetSessionMac());
 
@@ -187,13 +190,13 @@
 	ParseDN_by_prefix(pDlg, tokenlist, _T("EMAIL"), _("E-Mail:"), pSizer);
 	ParseDN_by_prefix(pDlg, tokenlist, _T("serialNumber"), _("Serial number:"), pSizer);
 	ParseDN_by_prefix(pDlg, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.3"), _("Jurisdiction country:"), pSizer, true);
-	ParseDN_by_prefix(pDlg, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.2"), _("Jurisdiction state or province:"), pSizer, true);	
+	ParseDN_by_prefix(pDlg, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.2"), _("Jurisdiction state or province:"), pSizer, true);
 	ParseDN_by_prefix(pDlg, tokenlist, _T("1.3.6.1.4.1.311.60.2.1.1"), _("Jurisdiction locality:"), pSizer, true);
 
 	if (!tokenlist.empty())
 	{
 		wxString value = tokenlist.front();
-		for (std::list<wxString>::const_iterator iter = ++tokenlist.begin(); iter != tokenlist.end(); iter++)
+		for (std::list<wxString>::const_iterator iter = ++tokenlist.begin(); iter != tokenlist.end(); ++iter)
 			value += _T(",") + *iter;
 
 		pSizer->Add(new wxStaticText(pDlg, wxID_ANY, _("Other:")));
@@ -204,8 +207,8 @@
 void CVerifyCertDialog::ParseDN_by_prefix(wxDialog* pDlg, std::list<wxString>& tokens, wxString prefix, const wxString& name, wxSizer* pSizer, bool decode /*=false*/)
 {
 	prefix += _T("=");
-	const int len = prefix.Length();
-	
+	int len = prefix.Length();
+
 	wxString value;
 
 	bool append = false;
@@ -217,7 +220,7 @@
 		{
 			if (iter->Left(len) != prefix)
 			{
-				iter++;
+				++iter;
 				continue;
 			}
 
@@ -236,6 +239,7 @@
 		{
 			value.RemoveLast();
 			append = true;
+			len = 0;
 		}
 
 		std::list<wxString>::iterator remove = iter++;
@@ -267,7 +271,7 @@
 
 bool CVerifyCertDialog::IsTrusted(const wxString& host, int port, const unsigned char* data, unsigned int len, bool permanentOnly)
 {
-	for (std::list<t_certData>::const_iterator iter = m_trustedCerts.begin(); iter != m_trustedCerts.end(); iter++)
+	for (std::list<t_certData>::const_iterator iter = m_trustedCerts.begin(); iter != m_trustedCerts.end(); ++iter)
 	{
 		if (host != iter->host)
 			continue;
@@ -285,7 +289,7 @@
 	if (permanentOnly)
 		return false;
 
-	for (std::list<t_certData>::const_iterator iter = m_sessionTrustedCerts.begin(); iter != m_sessionTrustedCerts.end(); iter++)
+	for (std::list<t_certData>::const_iterator iter = m_sessionTrustedCerts.begin(); iter != m_sessionTrustedCerts.end(); ++iter)
 	{
 		if (host != iter->host)
 			continue;
@@ -393,7 +397,7 @@
 		wxString value = GetTextElement(pCert, "Data");
 
 		TiXmlElement* pRemove = 0;
-		
+
 		t_certData data;
 		if (value == _T("") || !(data.data = ConvertStringToHex(value, data.len)))
 			pRemove = pCert;
@@ -418,7 +422,7 @@
 			m_trustedCerts.push_back(data);
 		else
 			delete [] data.data;
-		
+
 		pCert = pCert->NextSiblingElement("Certificate");
 
 		if (pRemove)
diff -Nru filezilla-3.5.3/src/interface/verifycertdialog.h filezilla-3.7.3~precise/src/interface/verifycertdialog.h
--- filezilla-3.5.3/src/interface/verifycertdialog.h	2010-10-25 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/verifycertdialog.h	2012-10-06 03:30:11.000000000 +0000
@@ -19,7 +19,7 @@
 
 	void ParseDN(wxDialog* pDlg, const wxString& dn, wxSizer* pSizer);
 	void ParseDN_by_prefix(wxDialog* pDlg, std::list<wxString>& tokens, wxString prefix, const wxString& name, wxSizer* pSizer, bool decode = false);
-	
+
 	wxString DecodeValue(const wxString& value);
 
 	wxString ConvertHexToString(const unsigned char* data, unsigned int len);
diff -Nru filezilla-3.5.3/src/interface/verifyhostkeydialog.cpp filezilla-3.7.3~precise/src/interface/verifyhostkeydialog.cpp
--- filezilla-3.5.3/src/interface/verifyhostkeydialog.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/verifyhostkeydialog.cpp	2012-12-04 04:30:07.000000000 +0000
@@ -8,12 +8,12 @@
 
 void CVerifyHostkeyDialog::ShowVerificationDialog(wxWindow* parent, CHostKeyNotification* pNotification)
 {
-	wxDialogEx* pDlg = new wxDialogEx;
+	wxDialogEx dlg;
 	bool loaded;
 	if (pNotification->GetRequestID() == reqId_hostkey)
-		loaded = pDlg->Load(parent, _T("ID_HOSTKEY"));
+		loaded = dlg.Load(parent, _T("ID_HOSTKEY"));
 	else
-		loaded = pDlg->Load(parent, _T("ID_HOSTKEYCHANGED"));
+		loaded = dlg.Load(parent, _T("ID_HOSTKEYCHANGED"));
 	if (!loaded)
 	{
 		pNotification->m_trust = false;
@@ -22,21 +22,21 @@
 		return;
 	}
 
-	pDlg->WrapText(pDlg, XRCID("ID_DESC"), 400);
+	dlg.WrapText(&dlg, XRCID("ID_DESC"), 400);
 
 	const wxString host = wxString::Format(_T("%s:%d"), pNotification->GetHost().c_str(), pNotification->GetPort());
-	pDlg->SetLabel(XRCID("ID_HOST"), host);
-	pDlg->SetLabel(XRCID("ID_FINGERPRINT"), pNotification->GetFingerprint());
+	dlg.SetLabel(XRCID("ID_HOST"), host);
+	dlg.SetLabel(XRCID("ID_FINGERPRINT"), pNotification->GetFingerprint());
 
-	pDlg->GetSizer()->Fit(pDlg);
-	pDlg->GetSizer()->SetSizeHints(pDlg);
+	dlg.GetSizer()->Fit(&dlg);
+	dlg.GetSizer()->SetSizeHints(&dlg);
 
-	int res = pDlg->ShowModal();
+	int res = dlg.ShowModal();
 
 	if (res == wxID_OK)
 	{
 		pNotification->m_trust = true;
-		pNotification->m_alwaysTrust = XRCCTRL(*pDlg, "ID_ALWAYS", wxCheckBox)->GetValue();
+		pNotification->m_alwaysTrust = XRCCTRL(dlg, "ID_ALWAYS", wxCheckBox)->GetValue();
 
 		struct t_keyData data;
 		data.host = host;
@@ -53,7 +53,7 @@
 {
 	const wxString host = wxString::Format(_T("%s:%d"), pNotification->GetHost().c_str(), pNotification->GetPort());
 
-	for (std::list<struct t_keyData>::const_iterator iter = m_sessionTrustedKeys.begin(); iter != m_sessionTrustedKeys.end(); iter++)
+	for (std::list<struct t_keyData>::const_iterator iter = m_sessionTrustedKeys.begin(); iter != m_sessionTrustedKeys.end(); ++iter)
 	{
 		if (iter->host == host && iter->fingerprint == pNotification->GetFingerprint())
 			return true;
diff -Nru filezilla-3.5.3/src/interface/view.cpp filezilla-3.7.3~precise/src/interface/view.cpp
--- filezilla-3.5.3/src/interface/view.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/view.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -47,7 +47,7 @@
 	}
 	if (!m_pWnd)
 		return;
-    
+
 	m_pWnd->SetSize(rect);
 }
 
diff -Nru filezilla-3.5.3/src/interface/view.h filezilla-3.7.3~precise/src/interface/view.h
--- filezilla-3.5.3/src/interface/view.h	2008-06-02 02:00:25.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/view.h	2013-06-09 03:30:06.000000000 +0000
@@ -19,7 +19,7 @@
 	CViewHeader* m_pHeader;
 	wxStatusBar* m_pStatusBar;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSize(wxSizeEvent& event);
 };
 
diff -Nru filezilla-3.5.3/src/interface/viewheader.cpp filezilla-3.7.3~precise/src/interface/viewheader.cpp
--- filezilla-3.5.3/src/interface/viewheader.cpp	2011-06-26 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/viewheader.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -53,7 +53,7 @@
 	}
 #endif //__WXMSW__
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnKeyDown(wxKeyEvent& event)
 	{
 		if (event.GetKeyCode() != WXK_TAB)
@@ -74,7 +74,7 @@
 	{
 		if (event.GetKeyCode() == WXK_TAB)
 			return;
-			
+
 #ifdef __WXMAC__
 		if (event.GetKeyCode() == 'v' && event.GetModifiers() == wxMOD_CMD)
 		{
@@ -298,7 +298,7 @@
 	const int len = directory.Len();
 
 	// Check if directory is already in the list
-	for (std::list<wxString>::const_iterator iter = m_recentDirectories.begin(); iter != m_recentDirectories.end(); iter++)
+	for (std::list<wxString>::const_iterator iter = m_recentDirectories.begin(); iter != m_recentDirectories.end(); ++iter)
 	{
 		if (*iter == directory)
 		{
@@ -597,7 +597,7 @@
 		return;
 	}
 
-	if (!m_pState->m_pCommandQueue->Idle())
+	if (!m_pState->IsRemoteIdle())
 	{
 		wxBell();
 		return;
@@ -619,7 +619,7 @@
 		return;
 	}
 
-	if (!m_pState->m_pCommandQueue->Idle())
+	if (!m_pState->IsRemoteIdle())
 	{
 		wxBell();
 		return;
diff -Nru filezilla-3.5.3/src/interface/viewheader.h filezilla-3.7.3~precise/src/interface/viewheader.h
--- filezilla-3.5.3/src/interface/viewheader.h	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/viewheader.h	2013-06-09 03:30:05.000000000 +0000
@@ -28,7 +28,7 @@
 	wxStaticText* m_pLabel;
 	bool m_alreadyInPaint;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnSize(wxSizeEvent& event);
 
 	void OnPaint(wxPaintEvent& event);
@@ -55,7 +55,7 @@
 
 	wxString m_oldValue;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTextChanged(wxCommandEvent& event);
 	void OnTextEnter(wxCommandEvent& event);
 	void OnSelectionChanged(wxCommandEvent& event);
@@ -77,7 +77,7 @@
 	CServer m_lastServer;
 	CServerPath m_path;
 
-	DECLARE_EVENT_TABLE();
+	DECLARE_EVENT_TABLE()
 	void OnTextChanged(wxCommandEvent& event);
 	void OnTextEnter(wxCommandEvent& event);
 	void OnSelectionChanged(wxCommandEvent& event);
diff -Nru filezilla-3.5.3/src/interface/volume_enumerator.cpp filezilla-3.7.3~precise/src/interface/volume_enumerator.cpp
--- filezilla-3.5.3/src/interface/volume_enumerator.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/volume_enumerator.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -29,7 +29,7 @@
 	m_stop = true;
 	Wait();
 
-	for (std::list<t_VolumeInfoInternal>::const_iterator iter = m_volumeInfo.begin(); iter != m_volumeInfo.end(); iter++)
+	for (std::list<t_VolumeInfoInternal>::const_iterator iter = m_volumeInfo.begin(); iter != m_volumeInfo.end(); ++iter)
 	{
 		delete [] iter->pVolume;
 		delete [] iter->pVolumeName;
@@ -190,8 +190,8 @@
 	std::list<t_VolumeInfo> volumeInfo;
 
 	m_crit_section.Enter();
-	
-	for (std::list<t_VolumeInfoInternal>::const_iterator iter = m_volumeInfo.begin(); iter != m_volumeInfo.end(); iter++)
+
+	for (std::list<t_VolumeInfoInternal>::const_iterator iter = m_volumeInfo.begin(); iter != m_volumeInfo.end(); ++iter)
 	{
 		t_VolumeInfo info;
 		info.volume = iter->pVolume;
diff -Nru filezilla-3.5.3/src/interface/welcome_dialog.cpp filezilla-3.7.3~precise/src/interface/welcome_dialog.cpp
--- filezilla-3.5.3/src/interface/welcome_dialog.cpp	2010-10-12 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/welcome_dialog.cpp	2013-05-22 03:30:08.000000000 +0000
@@ -22,7 +22,6 @@
 			return true;
 		}
 
-		greetingVersion = COptions::Get()->GetOption(OPTION_GREETINGVERSION);
 		if (greetingVersion != _T("") &&
 			CBuildInfo::ConvertToVersionNumber(ownVersion) <= CBuildInfo::ConvertToVersionNumber(greetingVersion))
 		{
@@ -32,6 +31,9 @@
 			return true;
 		}
 		COptions::Get()->SetOption(OPTION_GREETINGVERSION, ownVersion);
+
+		if (greetingVersion.IsEmpty() && !COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE))
+			COptions::Get()->SetOption(OPTION_PROMPTPASSWORDSAVE, 1);
 	}
 
 	if (!wxXmlResource::Get()->LoadDialog(this, parent, _T("ID_WELCOME")))
diff -Nru filezilla-3.5.3/src/interface/welcome_dialog.h filezilla-3.7.3~precise/src/interface/welcome_dialog.h
--- filezilla-3.5.3/src/interface/welcome_dialog.h	2010-06-13 03:30:16.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/welcome_dialog.h	2012-10-25 03:30:07.000000000 +0000
@@ -7,15 +7,15 @@
 {
 public:
 	CWelcomeDialog() {}
-	virtual ~CWelcomeDialog() { }
+	virtual ~CWelcomeDialog() {}
 
-    bool Run(wxWindow* parent, bool force = false, bool delay = false);
+	bool Run(wxWindow* parent, bool force = false, bool delay = false);
 
 protected:
-    wxTimer m_delayedShowTimer;
+	wxTimer m_delayedShowTimer;
 
-    DECLARE_EVENT_TABLE()
-    void OnTimer(wxTimerEvent& event);
+	DECLARE_EVENT_TABLE()
+	void OnTimer(wxTimerEvent& event);
 };
 
 #endif //__WELCOME_DIALOG_H__
diff -Nru filezilla-3.5.3/src/interface/window_state_manager.cpp filezilla-3.7.3~precise/src/interface/window_state_manager.cpp
--- filezilla-3.5.3/src/interface/window_state_manager.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/window_state_manager.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -49,7 +49,7 @@
 {
 	if (wxGetKeyState(WXK_SHIFT) && wxGetKeyState(WXK_ALT) && wxGetKeyState(WXK_CONTROL))
 		return false;
-	
+
 	// Fields:
 	// - maximized (1 or 0)
 	// - x position
diff -Nru filezilla-3.5.3/src/interface/wrapengine.cpp filezilla-3.7.3~precise/src/interface/wrapengine.cpp
--- filezilla-3.5.3/src/interface/wrapengine.cpp	2010-12-13 04:30:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/wrapengine.cpp	2013-04-15 03:30:12.000000000 +0000
@@ -199,7 +199,7 @@
 	- Wrap embedded English text fragments only on spaces
 
 	For this kind of languages, a different wrapping algorithm is used.
-    */
+	*/
 
 	if (!m_font.IsOk())
 		m_font = parent->GetFont();
@@ -231,11 +231,15 @@
 	unsigned int lineLength = 0;
 
 	bool url = false;
+	bool containsURL = false;
 	for (int i = 0; i <= strLen; i++)
 	{
 		if ((text[i] == ':' && text[i + 1] == '/' && text[i + 2] == '/') || // absolute
 			(text[i] == '/' && (!i || text[i - 1] == ' '))) // relative
+		{
 			url = true;
+			containsURL = true;
+		}
 		if (text[i] != ' ' && text[i] != 0)
 		{
 			// If url, wrap on slashes and ampersands, but not first slash of something://
@@ -328,7 +332,7 @@
 
 #ifdef __WXDEBUG__
 		wxString unwrapped = UnwrapText(text);
-		wxASSERT(original == unwrapped);
+		wxASSERT(original == unwrapped || containsURL);
 #endif
 
 	return true;
@@ -356,7 +360,7 @@
 int CWrapEngine::WrapRecursive(wxWindow* wnd, wxSizer* sizer, int max)
 {
 	// This function auto-wraps static texts.
-	
+
 #if WRAPDEBUG >= 3
 	static int level = 1;
 	plvl printf("Enter with max = %d\n", max);
@@ -393,7 +397,7 @@
 		wxASSERT(min.GetWidth() + rborder + lborder <= sizer->GetMinSize().GetWidth());
 
 		if (min.GetWidth() + item->GetPosition().x + lborder + rborder <= max)
-		    continue;
+			continue;
 
 		wxWindow* window;
 		wxSizer* subSizer = 0;
@@ -409,13 +413,13 @@
 #endif
 				if (max - rect.GetLeft() - rborder - offset <= 0)
 					continue;
-					
+
 				wxString str = text->GetLabel();
 				if (!WrapText(text, str, max - wxMax(0, rect.GetLeft()) - rborder - offset))
 				{
 #if WRAPDEBUG >= 3
 					plvl printf("Leave: WrapText failed\n");
-#endif		
+#endif
 					return result | wrap_failed;
 				}
 				text->SetLabel(str);
@@ -492,7 +496,7 @@
 			}
 		}
 	}
-	
+
 #if WRAPDEBUG >= 3
 	plvl printf("Leave: Success\n");
 #endif
@@ -513,7 +517,7 @@
 	unsigned int i = 0;
 	for (std::list<int>::const_iterator iter = wrapped.begin();
 		iter != wrapped.end();
-		iter++)
+		++iter)
 	{
 		UnwrapRecursive(windows[i], windows[i]->GetSizer());
 		windows[i]->GetSizer()->Layout();
@@ -528,7 +532,7 @@
 				continue;
 			}
 		}
-		
+
 		i++;
 	}
 }
@@ -538,14 +542,14 @@
 	int maxWidth = GetWidthFromCache(name);
 	if (maxWidth)
 	{
-		for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); iter++)
+		for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); ++iter)
 		{
 			wxSizer* pSizer = (*iter)->GetSizer();
 			if (!pSizer)
 				continue;
 
 			pSizer->Layout();
-			
+
 #ifdef __WXMAC__
 			const int offset = 6;
 #elif defined(__WXGTK__)
@@ -561,7 +565,9 @@
 			wxASSERT(!(res & wrap_failed));
 			pSizer->Layout();
 			pSizer->Fit(*iter);
+#ifdef __WXDEBUG__
 			wxSize size = pSizer->GetMinSize();
+#endif
 			wxASSERT(size.x <= maxWidth);
 		}
 		return true;
@@ -571,7 +577,7 @@
 
 	wxSize size = minRequestedSize;
 
-	for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); iter++)
+	for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); ++iter)
 	{
 		wxSizer* pSizer = (*iter)->GetSizer();
 		if (!pSizer)
@@ -599,19 +605,19 @@
 
 	double bestRatioDiff = currentRatio - ratio;
 	int bestWidth = max;
-	
-#if WRAPDEBUG > 0	
+
+#if WRAPDEBUG > 0
 	printf("Target ratio: %f\n", (float)ratio);
 	printf("Canvas: % 4d % 4d\n", canvas.x, canvas.y);
 	printf("Initial min and max: %d %d\n", min, max);
 #endif
 
-	while (true)
+	for (;;)
 	{
 		std::list<int> didwrap;
 
 		wxSize size = minRequestedSize;
-		for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); iter++)
+		for (std::vector<wxWindow*>::iterator iter = windows.begin(); iter != windows.end(); ++iter)
 		{
 			wxSizer* pSizer = (*iter)->GetSizer();
 #ifdef __WXMAC__
@@ -634,7 +640,7 @@
 		}
 
 #if WRAPDEBUG > 0
-	    printf("Current: % 4d % 4d   desiredWidth: %d, min: %d, max: %d\n", size.GetWidth(), size.GetHeight(), desiredWidth, min, max);
+		printf("Current: % 4d % 4d   desiredWidth: %d, min: %d, max: %d\n", size.GetWidth(), size.GetHeight(), desiredWidth, min, max);
 #endif
 		if (size.GetWidth() > desiredWidth)
 		{
@@ -656,9 +662,9 @@
 		actualWidth = size.GetWidth();
 
 		double newRatio = ((double)(size.GetWidth() + canvas.x) / (size.GetHeight() + canvas.y));
-#if WRAPDEBUG > 0		
+#if WRAPDEBUG > 0
 		printf("Ratio: %f\n", (float)newRatio);
-#endif		
+#endif
 
 		if (newRatio < ratio)
 		{
@@ -703,7 +709,7 @@
 
 		currentRatio = newRatio;
 	}
-#if WRAPDEBUG > 0		
+#if WRAPDEBUG > 0
 		printf("Performing final wrap with bestwidth %d\n", bestWidth);
 #endif
 #ifdef __WXMAC__
@@ -713,7 +719,7 @@
 #else
 			const int offset = 0;
 #endif
-	for (std::vector<wxWindow*>::iterator iter = all_windows.begin(); iter != all_windows.end(); iter++)
+	for (std::vector<wxWindow*>::iterator iter = all_windows.begin(); iter != all_windows.end(); ++iter)
 	{
 		wxSizer *pSizer = (*iter)->GetSizer();
 
@@ -774,6 +780,17 @@
 #endif
 	{
 		unwrapped = text;
+
+		// Special handling for unwrapping of URLs
+		int pos;
+		while ( (pos = unwrapped.Find(_T("&&\n"))) > 0 )
+		{
+			if (unwrapped[pos - 1] == ' ')
+				unwrapped = unwrapped.Left(pos + 2) + _T(" ") + unwrapped.Mid(pos + 3);
+			else
+				unwrapped = unwrapped.Left(pos + 2) + unwrapped.Mid(pos + 3);				
+		}
+
 		unwrapped.Replace(_T("\n"), _T(" "));
 		unwrapped.Replace(_T("\r"), _T(""));
 	}
@@ -796,7 +813,7 @@
 			if (text)
 			{
 				wxString unwrapped = UnwrapText(text->GetLabel());
-                text->SetLabel(unwrapped);
+				text->SetLabel(unwrapped);
 
 				continue;
 			}
diff -Nru filezilla-3.5.3/src/interface/xh_menu_ex.cpp filezilla-3.7.3~precise/src/interface/xh_menu_ex.cpp
--- filezilla-3.5.3/src/interface/xh_menu_ex.cpp	2010-02-12 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_menu_ex.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -7,24 +7,24 @@
 
 wxObject *wxMenuBarXmlHandlerEx::DoCreateResource()
 {
-    wxMenuBar *menubar = 0;
+	wxMenuBar *menubar = 0;
 
 	// Only difference from wx <=2.8.10, this one
 	// has working subclassing
-    int style = GetStyle();
-    wxASSERT(!style || !m_instance);
-    if (m_instance)
-        menubar = wxDynamicCast(m_instance, wxMenuBar);
-    if (!menubar)
-        menubar = new wxMenuBar(style);
-    CreateChildren(menubar);
+	int style = GetStyle();
+	wxASSERT(!style || !m_instance);
+	if (m_instance)
+		menubar = wxDynamicCast(m_instance, wxMenuBar);
+	if (!menubar)
+		menubar = new wxMenuBar(style);
+	CreateChildren(menubar);
 
-    if (m_parentAsWindow)
-    {
-        wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
-        if (parentFrame)
-            parentFrame->SetMenuBar(menubar);
-    }
+	if (m_parentAsWindow)
+	{
+		wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
+		if (parentFrame)
+			parentFrame->SetMenuBar(menubar);
+	}
 
-    return menubar;
+	return menubar;
 }
diff -Nru filezilla-3.5.3/src/interface/xh_menu_ex.h filezilla-3.7.3~precise/src/interface/xh_menu_ex.h
--- filezilla-3.5.3/src/interface/xh_menu_ex.h	2010-02-12 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_menu_ex.h	2012-10-06 03:30:11.000000000 +0000
@@ -8,10 +8,10 @@
 
 class wxMenuBarXmlHandlerEx : public wxMenuBarXmlHandler
 {
-    DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandlerEx)
+	DECLARE_DYNAMIC_CLASS(wxMenuBarXmlHandlerEx)
 
 public:
-    virtual wxObject *DoCreateResource();
+	virtual wxObject *DoCreateResource();
 };
 
 #endif // _WX_XH_MENU_EX_H_
diff -Nru filezilla-3.5.3/src/interface/xh_text_ex.cpp filezilla-3.7.3~precise/src/interface/xh_text_ex.cpp
--- filezilla-3.5.3/src/interface/xh_text_ex.cpp	2011-06-26 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_text_ex.cpp	2013-06-09 03:30:06.000000000 +0000
@@ -5,19 +5,19 @@
 
 #ifdef __WXMAC__
 
-IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandlerEx, wxTextCtrlXmlHandler);
+IMPLEMENT_DYNAMIC_CLASS(wxTextCtrlXmlHandlerEx, wxTextCtrlXmlHandler)
 
 wxObject *wxTextCtrlXmlHandlerEx::DoCreateResource()
 {
 	XRC_MAKE_INSTANCE(text, wxTextCtrlEx);
 
 	text->Create(m_parentAsWindow,
-	             GetID(),
-	             GetText(wxT("value")),
-	             GetPosition(), GetSize(),
-	             GetStyle(),
-	             wxDefaultValidator,
-	             GetName());
+				 GetID(),
+				 GetText(wxT("value")),
+				 GetPosition(), GetSize(),
+				 GetStyle(),
+				 wxDefaultValidator,
+				 GetName());
 
 	SetupWindow(text);
 
diff -Nru filezilla-3.5.3/src/interface/xh_text_ex.h filezilla-3.7.3~precise/src/interface/xh_text_ex.h
--- filezilla-3.5.3/src/interface/xh_text_ex.h	2011-06-26 03:30:23.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_text_ex.h	2013-06-09 03:30:06.000000000 +0000
@@ -9,7 +9,7 @@
 
 class wxTextCtrlXmlHandlerEx : public wxTextCtrlXmlHandler
 {
-	DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandlerEx);
+	DECLARE_DYNAMIC_CLASS(wxTextCtrlXmlHandlerEx)
 
 public:
 	virtual wxObject *DoCreateResource();
diff -Nru filezilla-3.5.3/src/interface/xh_toolb_ex.cpp filezilla-3.7.3~precise/src/interface/xh_toolb_ex.cpp
--- filezilla-3.5.3/src/interface/xh_toolb_ex.cpp	2010-02-07 15:40:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_toolb_ex.cpp	2012-10-06 03:30:11.000000000 +0000
@@ -8,156 +8,156 @@
 wxToolBarXmlHandlerEx::wxToolBarXmlHandlerEx()
 : wxXmlResourceHandler(), m_isInside(false), m_toolbar(NULL)
 {
-    XRC_ADD_STYLE(wxTB_FLAT);
-    XRC_ADD_STYLE(wxTB_DOCKABLE);
-    XRC_ADD_STYLE(wxTB_VERTICAL);
-    XRC_ADD_STYLE(wxTB_HORIZONTAL);
-    XRC_ADD_STYLE(wxTB_3DBUTTONS);
-    XRC_ADD_STYLE(wxTB_TEXT);
-    XRC_ADD_STYLE(wxTB_NOICONS);
-    XRC_ADD_STYLE(wxTB_NODIVIDER);
-    XRC_ADD_STYLE(wxTB_NOALIGN);
-    XRC_ADD_STYLE(wxTB_HORZ_LAYOUT);
-    XRC_ADD_STYLE(wxTB_HORZ_TEXT);
-
-    XRC_ADD_STYLE(wxTB_TOP);
-    XRC_ADD_STYLE(wxTB_LEFT);
-    XRC_ADD_STYLE(wxTB_RIGHT);
-    XRC_ADD_STYLE(wxTB_BOTTOM);
+	XRC_ADD_STYLE(wxTB_FLAT);
+	XRC_ADD_STYLE(wxTB_DOCKABLE);
+	XRC_ADD_STYLE(wxTB_VERTICAL);
+	XRC_ADD_STYLE(wxTB_HORIZONTAL);
+	XRC_ADD_STYLE(wxTB_3DBUTTONS);
+	XRC_ADD_STYLE(wxTB_TEXT);
+	XRC_ADD_STYLE(wxTB_NOICONS);
+	XRC_ADD_STYLE(wxTB_NODIVIDER);
+	XRC_ADD_STYLE(wxTB_NOALIGN);
+	XRC_ADD_STYLE(wxTB_HORZ_LAYOUT);
+	XRC_ADD_STYLE(wxTB_HORZ_TEXT);
+
+	XRC_ADD_STYLE(wxTB_TOP);
+	XRC_ADD_STYLE(wxTB_LEFT);
+	XRC_ADD_STYLE(wxTB_RIGHT);
+	XRC_ADD_STYLE(wxTB_BOTTOM);
 
-    AddWindowStyles();
+	AddWindowStyles();
 }
 
 wxObject *wxToolBarXmlHandlerEx::DoCreateResource()
 {
-    if (m_class == wxT("tool"))
-    {
-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));
-
-        if (GetPosition() != wxDefaultPosition)
-        {
-            m_toolbar->AddTool(GetID(),
-                               GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
-                               GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
-                               GetBool(wxT("toggle")),
-                               GetPosition().x,
-                               GetPosition().y,
-                               NULL,
-                               GetText(wxT("tooltip")),
-                               GetText(wxT("longhelp")));
-        }
-        else
-        {
-            wxItemKind kind = wxITEM_NORMAL;
-            if (GetBool(wxT("radio")))
-                kind = wxITEM_RADIO;
-            if (GetBool(wxT("toggle")))
-            {
-                wxASSERT_MSG( kind == wxITEM_NORMAL,
-                              _T("can't have both toggleable and radion button at once") );
-                kind = wxITEM_CHECK;
-            }
-            m_toolbar->AddTool(GetID(),
-                               GetText(wxT("label")),
-                               GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_iconSize),
-                               GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_iconSize),
-                               kind,
-                               GetText(wxT("tooltip")),
-                               GetText(wxT("longhelp")));
-
-            if ( GetBool(wxT("disabled")) )
-                m_toolbar->EnableTool(GetID(), false);
-        }
-        return m_toolbar; // must return non-NULL
-    }
-
-    else if (m_class == wxT("separator"))
-    {
-        wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));
-        m_toolbar->AddSeparator();
-        return m_toolbar; // must return non-NULL
-    }
-
-    else /*<object class="wxToolBar">*/
-    {
-        int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL);
+	if (m_class == wxT("tool"))
+	{
+		wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: tool not within a toolbar!"));
+
+		if (GetPosition() != wxDefaultPosition)
+		{
+			m_toolbar->AddTool(GetID(),
+							   GetBitmap(wxT("bitmap"), wxART_TOOLBAR),
+							   GetBitmap(wxT("bitmap2"), wxART_TOOLBAR),
+							   GetBool(wxT("toggle")),
+							   GetPosition().x,
+							   GetPosition().y,
+							   NULL,
+							   GetText(wxT("tooltip")),
+							   GetText(wxT("longhelp")));
+		}
+		else
+		{
+			wxItemKind kind = wxITEM_NORMAL;
+			if (GetBool(wxT("radio")))
+				kind = wxITEM_RADIO;
+			if (GetBool(wxT("toggle")))
+			{
+				wxASSERT_MSG( kind == wxITEM_NORMAL,
+							  _T("can't have both toggleable and radion button at once") );
+				kind = wxITEM_CHECK;
+			}
+			m_toolbar->AddTool(GetID(),
+							   GetText(wxT("label")),
+							   GetBitmap(wxT("bitmap"), wxART_TOOLBAR, m_iconSize),
+							   GetBitmap(wxT("bitmap2"), wxART_TOOLBAR, m_iconSize),
+							   kind,
+							   GetText(wxT("tooltip")),
+							   GetText(wxT("longhelp")));
+
+			if ( GetBool(wxT("disabled")) )
+				m_toolbar->EnableTool(GetID(), false);
+		}
+		return m_toolbar; // must return non-NULL
+	}
+
+	else if (m_class == wxT("separator"))
+	{
+		wxCHECK_MSG(m_toolbar, NULL, wxT("Incorrect syntax of XRC resource: separator not within a toolbar!"));
+		m_toolbar->AddSeparator();
+		return m_toolbar; // must return non-NULL
+	}
+
+	else /*<object class="wxToolBar">*/
+	{
+		int style = GetStyle(wxT("style"), wxNO_BORDER | wxTB_HORIZONTAL);
 #ifdef __WXMSW__
-        if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
+		if (!(style & wxNO_BORDER)) style |= wxNO_BORDER;
 #endif
 
-        XRC_MAKE_INSTANCE(toolbar, wxToolBar)
+		XRC_MAKE_INSTANCE(toolbar, wxToolBar)
 
-        toolbar->Create(m_parentAsWindow,
-                         GetID(),
-                         GetPosition(),
-                         GetSize(),
-                         style,
-                         GetName());
+		toolbar->Create(m_parentAsWindow,
+						 GetID(),
+						 GetPosition(),
+						 GetSize(),
+						 style,
+						 GetName());
 
-        wxSize bmpsize;
+		wxSize bmpsize;
 		if (m_iconSize.IsFullySpecified())
 			bmpsize = m_iconSize;
 		else
 			bmpsize = GetSize(wxT("bitmapsize"));
-        if (!(bmpsize == wxDefaultSize))
-            toolbar->SetToolBitmapSize(bmpsize);
-        wxSize margins = GetSize(wxT("margins"));
-        if (!(margins == wxDefaultSize))
-            toolbar->SetMargins(margins.x, margins.y);
-        long packing = GetLong(wxT("packing"), -1);
-        if (packing != -1)
-            toolbar->SetToolPacking(packing);
-        long separation = GetLong(wxT("separation"), -1);
-        if (separation != -1)
-            toolbar->SetToolSeparation(separation);
-        if (HasParam(wxT("bg")))
-            toolbar->SetBackgroundColour(GetColour(wxT("bg")));
-
-        wxXmlNode *children_node = GetParamNode(wxT("object"));
-        if (!children_node)
-           children_node = GetParamNode(wxT("object_ref"));
-
-        if (children_node == NULL) return toolbar;
-
-        m_isInside = true;
-        m_toolbar = toolbar;
-
-        wxXmlNode *n = children_node;
-
-        while (n)
-        {
-            if ((n->GetType() == wxXML_ELEMENT_NODE) &&
-                (n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))
-            {
-                wxObject *created = CreateResFromNode(n, toolbar, NULL);
-                wxControl *control = wxDynamicCast(created, wxControl);
-                if (!IsOfClass(n, wxT("tool")) &&
-                    !IsOfClass(n, wxT("separator")) &&
-                    control != NULL)
-                    toolbar->AddControl(control);
-            }
-            n = n->GetNext();
-        }
-
-        m_isInside = false;
-        m_toolbar = NULL;
-
-        toolbar->Realize();
-
-        if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
-        {
-            wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
-            if (parentFrame)
-                parentFrame->SetToolBar(toolbar);
-        }
+		if (!(bmpsize == wxDefaultSize))
+			toolbar->SetToolBitmapSize(bmpsize);
+		wxSize margins = GetSize(wxT("margins"));
+		if (!(margins == wxDefaultSize))
+			toolbar->SetMargins(margins.x, margins.y);
+		long packing = GetLong(wxT("packing"), -1);
+		if (packing != -1)
+			toolbar->SetToolPacking(packing);
+		long separation = GetLong(wxT("separation"), -1);
+		if (separation != -1)
+			toolbar->SetToolSeparation(separation);
+		if (HasParam(wxT("bg")))
+			toolbar->SetBackgroundColour(GetColour(wxT("bg")));
+
+		wxXmlNode *children_node = GetParamNode(wxT("object"));
+		if (!children_node)
+		   children_node = GetParamNode(wxT("object_ref"));
+
+		if (children_node == NULL) return toolbar;
+
+		m_isInside = true;
+		m_toolbar = toolbar;
+
+		wxXmlNode *n = children_node;
+
+		while (n)
+		{
+			if ((n->GetType() == wxXML_ELEMENT_NODE) &&
+				(n->GetName() == wxT("object") || n->GetName() == wxT("object_ref")))
+			{
+				wxObject *created = CreateResFromNode(n, toolbar, NULL);
+				wxControl *control = wxDynamicCast(created, wxControl);
+				if (!IsOfClass(n, wxT("tool")) &&
+					!IsOfClass(n, wxT("separator")) &&
+					control != NULL)
+					toolbar->AddControl(control);
+			}
+			n = n->GetNext();
+		}
+
+		m_isInside = false;
+		m_toolbar = NULL;
+
+		toolbar->Realize();
+
+		if (m_parentAsWindow && !GetBool(wxT("dontattachtoframe")))
+		{
+			wxFrame *parentFrame = wxDynamicCast(m_parent, wxFrame);
+			if (parentFrame)
+				parentFrame->SetToolBar(toolbar);
+		}
 
-        return toolbar;
-    }
+		return toolbar;
+	}
 }
 
 bool wxToolBarXmlHandlerEx::CanHandle(wxXmlNode *node)
 {
-    return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||
-            (m_isInside && IsOfClass(node, wxT("tool"))) ||
-            (m_isInside && IsOfClass(node, wxT("separator"))));
+	return ((!m_isInside && IsOfClass(node, wxT("wxToolBar"))) ||
+			(m_isInside && IsOfClass(node, wxT("tool"))) ||
+			(m_isInside && IsOfClass(node, wxT("separator"))));
 }
diff -Nru filezilla-3.5.3/src/interface/xh_toolb_ex.h filezilla-3.7.3~precise/src/interface/xh_toolb_ex.h
--- filezilla-3.5.3/src/interface/xh_toolb_ex.h	2008-02-03 03:00:10.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xh_toolb_ex.h	2012-10-06 03:30:11.000000000 +0000
@@ -10,15 +10,15 @@
 class wxToolBarXmlHandlerEx : public wxXmlResourceHandler
 {
 public:
-    wxToolBarXmlHandlerEx();
-    virtual wxObject *DoCreateResource();
-    virtual bool CanHandle(wxXmlNode *node);
+	wxToolBarXmlHandlerEx();
+	virtual wxObject *DoCreateResource();
+	virtual bool CanHandle(wxXmlNode *node);
 
 	static void SetIconSize(const wxSize& size) { m_iconSize = size; }
 
 private:
-    bool m_isInside;
-    wxToolBar *m_toolbar;
+	bool m_isInside;
+	wxToolBar *m_toolbar;
 
 	static wxSize m_iconSize;
 };
diff -Nru filezilla-3.5.3/src/interface/xmlfunctions.cpp filezilla-3.7.3~precise/src/interface/xmlfunctions.cpp
--- filezilla-3.5.3/src/interface/xmlfunctions.cpp	2011-12-02 04:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xmlfunctions.cpp	2013-01-14 04:30:08.000000000 +0000
@@ -38,13 +38,13 @@
 	delete m_pDocument;
 }
 
-TiXmlElement* CXmlFile::Load(const wxString& name, bool create)
+TiXmlElement* CXmlFile::Load(const wxString& name)
 {
 	wxFileName fileName(COptions::Get()->GetOption(OPTION_DEFAULT_SETTINGSDIR), name + _T(".xml"));
-	return Load(fileName, create);
+	return Load(fileName);
 }
 
-TiXmlElement* CXmlFile::Load(const wxFileName& fileName, bool create)
+TiXmlElement* CXmlFile::Load(const wxFileName& fileName)
 {
 	if (fileName.IsOk())
 		SetFileName(fileName);
@@ -55,7 +55,7 @@
 	m_pDocument = 0;
 
 	wxString error;
-	TiXmlElement* pElement = GetXmlFile(m_fileName, create, &error);
+	TiXmlElement* pElement = GetXmlFile(m_fileName, &error);
 	if (!pElement)
 	{
 		if (!error.empty())
@@ -250,7 +250,7 @@
 		break;
 	}
 
-    node->LinkEndChild(new TiXmlText(value));
+	node->LinkEndChild(new TiXmlText(value));
 }
 
 wxString GetTextElement_Trimmed(TiXmlElement* node, const char* name)
@@ -388,7 +388,7 @@
 	const char* str = textNode->Value();
 	if (!str)
 		return defValue;
-	
+
 	switch (str[0])
 	{
 	case '0':
@@ -433,7 +433,7 @@
 
 // Opens the specified XML file if it exists or creates a new one otherwise.
 // Returns 0 on error.
-TiXmlElement* GetXmlFile(wxFileName file, bool create /*=true*/, wxString* error /*=0*/)
+TiXmlElement* GetXmlFile(wxFileName file, wxString* error /*=0*/)
 {
 	if (wxFileExists(file.GetFullPath()) && file.GetSize() > 0)
 	{
@@ -466,23 +466,13 @@
 	}
 	else
 	{
-		// File does not exist
-		if (!create)
-			return 0;
-		
-		// create new XML document
+		// File does not exist, return empty XML document.
 		TiXmlDocument* pXmlDocument = new TiXmlDocument();
 		pXmlDocument->SetCondenseWhiteSpace(false);
 		pXmlDocument->LinkEndChild(new TiXmlDeclaration("1.0", "UTF-8", "yes"));
 
 		pXmlDocument->LinkEndChild(new TiXmlElement("FileZilla3"));
 
-		if (!SaveXmlFile(file, pXmlDocument, 0))
-		{
-			delete pXmlDocument;
-			return 0;
-		}
-
 		return pXmlDocument->FirstChildElement("FileZilla3");
 	}
 }
@@ -497,7 +487,7 @@
 	TiXmlDocument* pDocument = node->GetDocument();
 
 	bool exists = false;
-	
+
 	bool isLink = false;
 	int flags = 0;
 	if (CLocalFileSystem::GetFileInfo( fullPath, isLink, 0, 0, &flags ) == CLocalFileSystem::file)
@@ -677,7 +667,7 @@
 		return;
 
 	bool kiosk_mode = COptions::Get()->GetOptionVal(OPTION_DEFAULT_KIOSKMODE) != 0;
-	
+
 	node->Clear();
 
 	AddTextElement(node, "Host", server.GetHost());
@@ -742,7 +732,7 @@
 		if (!postLoginCommands.empty())
 		{
 			TiXmlElement* pElement = node->LinkEndChild(new TiXmlElement("PostLoginCommands"))->ToElement();
-			for (std::vector<wxString>::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); iter++)
+			for (std::vector<wxString>::const_iterator iter = postLoginCommands.begin(); iter != postLoginCommands.end(); ++iter)
 				AddTextElement(pElement, "Command", *iter);
 		}
 	}
@@ -761,7 +751,7 @@
 	if (!utf8)
 		return;
 
-    node->SetAttribute(name, utf8);
+	node->SetAttribute(name, utf8);
 	delete [] utf8;
 }
 
diff -Nru filezilla-3.5.3/src/interface/xmlfunctions.h filezilla-3.7.3~precise/src/interface/xmlfunctions.h
--- filezilla-3.5.3/src/interface/xmlfunctions.h	2011-05-17 03:30:21.000000000 +0000
+++ filezilla-3.7.3~precise/src/interface/xmlfunctions.h	2013-01-14 04:30:08.000000000 +0000
@@ -25,19 +25,19 @@
 	void SetFileName(const wxString& name);
 	void SetFileName(const wxFileName& fileName);
 	const wxFileName& GetFileName() const { return m_fileName; }
-	
+
 	bool HasFileName() const { return m_fileName.IsOk(); }
-	
+
 	// Sets error description on failure
-	TiXmlElement* Load(const wxString& name, bool create = true);
-	TiXmlElement* Load(const wxFileName& fileName = wxFileName(), bool create = true);
+	TiXmlElement* Load(const wxString& name);
+	TiXmlElement* Load(const wxFileName& fileName = wxFileName());
 
 	wxString GetError() const { return m_error; }
 	int GetRawDataLength();
 	void GetRawDataHere(char* p); // p has to big enough to hold at least GetRawDataLength() bytes
 
 	bool ParseData(char* data); // data has to be 0-terminated
-	
+
 	void Close();
 
 	TiXmlElement* GetElement();
@@ -45,7 +45,7 @@
 
 	bool Modified();
 
-    bool Save(wxString* error = 0);
+	bool Save(wxString* error = 0);
 
 protected:
 	wxDateTime m_modificationTime;
@@ -97,7 +97,7 @@
 
 // Opens the specified XML file if it exists or creates a new one otherwise.
 // Returns 0 on error.
-TiXmlElement* GetXmlFile(wxFileName file, bool create = true, wxString *error = 0);
+TiXmlElement* GetXmlFile(wxFileName file, wxString *error = 0);
 
 // Save the XML document to the given file
 bool SaveXmlFile(const wxFileName& file, TiXmlNode* node, wxString* error = 0, bool move = false);
diff -Nru filezilla-3.5.3/src/putty/Makefile.am filezilla-3.7.3~precise/src/putty/Makefile.am
--- filezilla-3.5.3/src/putty/Makefile.am	2009-01-03 17:09:41.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/Makefile.am	2012-09-03 03:30:05.000000000 +0000
@@ -71,6 +71,7 @@
   fzsftp_SOURCES += pproxy.c
   fzsftp_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS -DNO_GSSAPI
   fzsftp_LDADD += windows/libfzsftp_win.a windows/libfzputtycommon_win.a $(RESOURCEFILE)
+  fzsftp_LDADD += -lws2_32
 
   fzputtygen_CPPFLAGS = $(AM_CPPFLAGS) -D_WINDOWS -DNO_GSSAPI
   fzputtygen_LDADD = windows/libfzputtycommon_win.a libfzputtycommon.a $(RESOURCEFILE)
diff -Nru filezilla-3.5.3/src/putty/Makefile.in filezilla-3.7.3~precise/src/putty/Makefile.in
--- filezilla-3.5.3/src/putty/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -19,6 +19,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -42,7 +59,9 @@
 @SFTP_UNIX_TRUE@am__append_2 = unix/libfzsftp_ux.a unix/libfzputtycommon_ux.a
 @SFTP_UNIX_TRUE@am__append_3 = tree234.c
 @SFTP_MINGW_TRUE@am__append_4 = pproxy.c
-@SFTP_MINGW_TRUE@am__append_5 = windows/libfzsftp_win.a windows/libfzputtycommon_win.a $(RESOURCEFILE)
+@SFTP_MINGW_TRUE@am__append_5 = windows/libfzsftp_win.a \
+@SFTP_MINGW_TRUE@	windows/libfzputtycommon_win.a \
+@SFTP_MINGW_TRUE@	$(RESOURCEFILE) -lws2_32
 subdir = src/putty
 DIST_COMMON = $(noinst_HEADERS) $(srcdir)/Makefile.am \
 	$(srcdir)/Makefile.in COPYING
@@ -51,8 +70,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -113,8 +133,11 @@
 	fzsftp-proxy.$(OBJEXT) fzsftp-fzsftp.$(OBJEXT) \
 	$(am__objects_2) $(am__objects_3)
 fzsftp_OBJECTS = $(am_fzsftp_OBJECTS)
+@SFTP_MINGW_TRUE@am__DEPENDENCIES_1 = windows/libfzsftp_win.a \
+@SFTP_MINGW_TRUE@	windows/libfzputtycommon_win.a \
+@SFTP_MINGW_TRUE@	$(RESOURCEFILE)
 fzsftp_DEPENDENCIES = libfzputtycommon.a $(am__append_2) \
-	$(am__append_5)
+	$(am__DEPENDENCIES_1)
 DEFAULT_INCLUDES = -I.@am__isrc@ -I$(top_builddir)/src/include
 depcomp = $(SHELL) $(top_srcdir)/config/depcomp
 am__depfiles_maybe = depfiles
@@ -139,6 +162,11 @@
 	install-pdf-recursive install-ps-recursive install-recursive \
 	installcheck-recursive installdirs-recursive pdf-recursive \
 	ps-recursive uninstall-recursive
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 RECURSIVE_CLEAN_TARGETS = mostlyclean-recursive clean-recursive	\
@@ -197,6 +225,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -234,6 +263,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -279,6 +309,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -312,7 +343,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -411,14 +441,17 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfzputtycommon.a: $(libfzputtycommon_a_OBJECTS) $(libfzputtycommon_a_DEPENDENCIES) 
+libfzputtycommon.a: $(libfzputtycommon_a_OBJECTS) $(libfzputtycommon_a_DEPENDENCIES) $(EXTRA_libfzputtycommon_a_DEPENDENCIES) 
 	-rm -f libfzputtycommon.a
 	$(libfzputtycommon_a_AR) libfzputtycommon.a $(libfzputtycommon_a_OBJECTS) $(libfzputtycommon_a_LIBADD)
 	$(RANLIB) libfzputtycommon.a
 install-binPROGRAMS: $(bin_PROGRAMS)
 	@$(NORMAL_INSTALL)
-	test -z "$(bindir)" || $(MKDIR_P) "$(DESTDIR)$(bindir)"
 	@list='$(bin_PROGRAMS)'; test -n "$(bindir)" || list=; \
+	if test -n "$$list"; then \
+	  echo " $(MKDIR_P) '$(DESTDIR)$(bindir)'"; \
+	  $(MKDIR_P) "$(DESTDIR)$(bindir)" || exit 1; \
+	fi; \
 	for p in $$list; do echo "$$p $$p"; done | \
 	sed 's/$(EXEEXT)$$//' | \
 	while read p p1; do if test -f $$p || test -f $$p1; \
@@ -458,10 +491,10 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-fzputtygen$(EXEEXT): $(fzputtygen_OBJECTS) $(fzputtygen_DEPENDENCIES) 
+fzputtygen$(EXEEXT): $(fzputtygen_OBJECTS) $(fzputtygen_DEPENDENCIES) $(EXTRA_fzputtygen_DEPENDENCIES) 
 	@rm -f fzputtygen$(EXEEXT)
 	$(LINK) $(fzputtygen_OBJECTS) $(fzputtygen_LDADD) $(LIBS)
-fzsftp$(EXEEXT): $(fzsftp_OBJECTS) $(fzsftp_DEPENDENCIES) 
+fzsftp$(EXEEXT): $(fzsftp_OBJECTS) $(fzsftp_DEPENDENCIES) $(EXTRA_fzsftp_DEPENDENCIES) 
 	@rm -f fzsftp$(EXEEXT)
 	$(LINK) $(fzsftp_OBJECTS) $(fzsftp_LDADD) $(LIBS)
 
@@ -1341,13 +1374,10 @@
 	done
 	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
 	  if test "$$subdir" = .; then :; else \
-	    test -d "$(distdir)/$$subdir" \
-	    || $(MKDIR_P) "$(distdir)/$$subdir" \
-	    || exit 1; \
-	  fi; \
-	done
-	@list='$(DIST_SUBDIRS)'; for subdir in $$list; do \
-	  if test "$$subdir" = .; then :; else \
+	    $(am__make_dryrun) \
+	      || test -d "$(distdir)/$$subdir" \
+	      || $(MKDIR_P) "$(distdir)/$$subdir" \
+	      || exit 1; \
 	    dir1=$$subdir; dir2="$(distdir)/$$subdir"; \
 	    $(am__relativize); \
 	    new_distdir=$$reldir; \
@@ -1385,10 +1415,15 @@
 
 installcheck: installcheck-recursive
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/putty/cmdgen.c filezilla-3.7.3~precise/src/putty/cmdgen.c
--- filezilla-3.5.3/src/putty/cmdgen.c	2008-03-03 03:00:18.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/cmdgen.c	2013-04-29 03:30:06.000000000 +0000
@@ -54,9 +54,9 @@
     struct RSAKey *ssh1key = NULL;
 
     printf("fzputtygen\n");
+    printf("Copyright (C) 2008-2013  Tim Kosse\n");
     printf("Based on PuTTY's puttygen\n");
-    printf("Copyright (C) 2008  Tim Kosse\n");
-    printf("Copyright (C) 1997-2008  Simon Tatham and the PuTTY team\n");
+    printf("Copyright (C) 1997-2013  Simon Tatham and the PuTTY team\n");
     printf("Converts private SSH keys into PuTTY's format.\n");
     printf("This program is used by FileZilla and not intended to be used directly.\n");
     printf("Use the puttygen tool from PuTTY for a human-usable tool.\n");
diff -Nru filezilla-3.5.3/src/putty/import.c filezilla-3.7.3~precise/src/putty/import.c
--- filezilla-3.5.3/src/putty/import.c	2011-06-27 03:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/import.c	2013-08-06 09:08:32.000000000 +0000
@@ -290,7 +290,7 @@
     if (len < 4)
         goto error;
     bytes = GET_32BIT(d);
-    if (len < 4+bytes)
+    if (bytes < 0 || len-4 < bytes)
         goto error;
 
     ret->start = d + 4;
diff -Nru filezilla-3.5.3/src/putty/misc.c filezilla-3.7.3~precise/src/putty/misc.c
--- filezilla-3.5.3/src/putty/misc.c	2011-06-27 03:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/misc.c	2012-12-05 04:30:05.000000000 +0000
@@ -332,7 +332,10 @@
  *  - return the current size of the buffer chain in bytes
  */
 
-#define BUFFER_GRANULE  512
+/* FZ:
+ * Default granule of 512 leads to low performance.
+ */
+#define BUFFER_GRANULE  512*2*32
 
 struct bufchain_granule {
     struct bufchain_granule *next;
diff -Nru filezilla-3.5.3/src/putty/psftp.c filezilla-3.7.3~precise/src/putty/psftp.c
--- filezilla-3.5.3/src/putty/psftp.c	2011-06-27 03:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/psftp.c	2012-12-05 04:30:05.000000000 +0000
@@ -771,7 +771,7 @@
     xfer = xfer_upload_init(fh, offset);
     err = eof = 0;
     while ((!err && !eof) || !xfer_done(xfer)) {
-	char buffer[4096];
+        char buffer[4096*4];
 	int len, ret;
 
 	while (xfer_upload_ready(xfer) && !err && !eof) {
@@ -2930,7 +2930,7 @@
 
     if (len > 0) {
 	if (pendsize < pendlen + len) {
-	    pendsize = pendlen + len + 4096;
+	    pendsize = pendlen + len + 4096*4;
 	    pending = sresize(pending, pendsize, unsigned char);
 	}
 	memcpy(pending + pendlen, p, len);
diff -Nru filezilla-3.5.3/src/putty/sftp.c filezilla-3.7.3~precise/src/putty/sftp.c
--- filezilla-3.5.3/src/putty/sftp.c	2010-01-02 14:42:28.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/sftp.c	2012-12-05 04:30:05.000000000 +0000
@@ -55,8 +55,9 @@
     pkt = snew(struct sftp_packet);
     pkt->data = NULL;
     pkt->savedpos = -1;
-    pkt->length = 0;
     pkt->maxlen = 0;
+    pkt->length = 4;
+    sftp_pkt_ensure(pkt, 4);
     sftp_pkt_addbyte(pkt, (unsigned char) pkt_type);
     return pkt;
 }
@@ -266,9 +267,8 @@
 int sftp_send(struct sftp_packet *pkt)
 {
     int ret;
-    char x[4];
-    PUT_32BIT(x, pkt->length);
-    ret = (sftp_senddata(x, 4) && sftp_senddata(pkt->data, pkt->length));
+    PUT_32BIT(pkt->data, pkt->length-4);
+    ret = sftp_senddata(pkt->data, pkt->length);
     sftp_pkt_free(pkt);
     return ret;
 }
diff -Nru filezilla-3.5.3/src/putty/ssh.c filezilla-3.7.3~precise/src/putty/ssh.c
--- filezilla-3.5.3/src/putty/ssh.c	2011-08-21 17:53:50.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/ssh.c	2013-04-28 03:30:03.000000000 +0000
@@ -1000,7 +1000,7 @@
     Keyfile_list *list = ssh->cfg.keyfile_list;
     Loaded_keyfile_list* loaded_list = NULL;
     int num_loaded = 0;
-	int type;
+    int type;
 
     for (; list; list = list->next) {
 	Loaded_keyfile_list* loaded = snew(Loaded_keyfile_list);
@@ -1033,9 +1033,14 @@
 	    }
 	}
 	else if (type == SSH_KEYTYPE_SSH2) {
-	    loaded->ssh2key = ssh2_load_userkey(&list->file, 0, 0);
+	    const char* error = NULL;
+	    loaded->ssh2key = ssh2_load_userkey(&list->file, 0, &error);
 	    if (loaded->ssh2key == SSH2_WRONG_PASSPHRASE || !loaded->ssh2key)
 	    {
+		if (!error) {
+		    error = "unknown";
+		}
+		logeventf(ssh, "Failed to load key '%s': %s", &list->file, error);
 		sfree(loaded);
 		continue;
 	    }
diff -Nru filezilla-3.5.3/src/putty/sshbn.c filezilla-3.7.3~precise/src/putty/sshbn.c
--- filezilla-3.5.3/src/putty/sshbn.c	2011-08-21 17:53:50.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/sshbn.c	2013-08-07 17:25:47.000000000 +0000
@@ -1018,6 +1018,13 @@
 
     pqlen = (p[0] > q[0] ? p[0] : q[0]);
 
+    /*
+     * Make sure that we're allowing enough space. The shifting below
+     * will underflow the vectors we allocate if pqlen is too small.
+     */
+    if (2*pqlen <= mlen)
+        pqlen = mlen/2 + 1;
+
     /* Allocate n of size pqlen, copy p to n */
     n = snewn(pqlen, BignumInt);
     i = pqlen - p[0];
@@ -1306,7 +1313,15 @@
 int bignum_cmp(Bignum a, Bignum b)
 {
     int amax = a[0], bmax = b[0];
-    int i = (amax > bmax ? amax : bmax);
+    int i;
+
+    /* Annoyingly we have two representations of zero */
+    if (amax == 1 && a[amax] == 0)
+        amax = 0;
+    if (bmax == 1 && b[bmax] == 0)
+        bmax = 0;
+
+    i = (amax > bmax ? amax : bmax);
     while (i) {
 	BignumInt aval = (i > amax ? 0 : a[i]);
 	BignumInt bval = (i > bmax ? 0 : b[i]);
@@ -1864,6 +1879,44 @@
             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;
 
diff -Nru filezilla-3.5.3/src/putty/sshdss.c filezilla-3.7.3~precise/src/putty/sshdss.c
--- filezilla-3.5.3/src/putty/sshdss.c	2007-11-23 11:34:00.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/sshdss.c	2013-08-07 17:25:47.000000000 +0000
@@ -43,6 +43,8 @@
     if (*datalen < 4)
 	return;
     *length = GET_32BIT(*data);
+    if (*length < 0)
+        return;
     *datalen -= 4;
     *data += 4;
     if (*datalen < *length)
@@ -98,7 +100,7 @@
     }
 #endif
 
-    if (!p || memcmp(p, "ssh-dss", 7)) {
+    if (!p || slen != 7 || memcmp(p, "ssh-dss", 7)) {
 	sfree(dss);
 	return NULL;
     }
@@ -249,8 +251,13 @@
     }
     r = get160(&sig, &siglen);
     s = get160(&sig, &siglen);
-    if (!r || !s)
+    if (!r || !s) {
+        if (r)
+            freebn(r);
+        if (s)
+            freebn(s);
 	return 0;
+    }
 
     /*
      * Step 1. w <- s^-1 mod q.
@@ -599,6 +606,7 @@
     s = modmul(kinv, hxr, dss->q);     /* s = k^-1 * (hash + x*r) mod q */
     freebn(hxr);
     freebn(kinv);
+    freebn(k);
     freebn(hash);
 
     /*
diff -Nru filezilla-3.5.3/src/putty/sshrsa.c filezilla-3.7.3~precise/src/putty/sshrsa.c
--- filezilla-3.5.3/src/putty/sshrsa.c	2011-06-27 03:30:19.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/sshrsa.c	2013-08-06 09:08:32.000000000 +0000
@@ -526,6 +526,8 @@
     if (*datalen < 4)
 	return;
     *length = GET_32BIT(*data);
+    if (*length < 0)
+        return;
     *datalen -= 4;
     *data += 4;
     if (*datalen < *length)
diff -Nru filezilla-3.5.3/src/putty/unix/Makefile.in filezilla-3.7.3~precise/src/putty/unix/Makefile.in
--- filezilla-3.5.3/src/putty/unix/Makefile.in	2012-01-08 13:29:13.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/unix/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -43,8 +60,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -85,6 +103,11 @@
 SOURCES = $(libfzputtycommon_ux_a_SOURCES) $(libfzsftp_ux_a_SOURCES)
 DIST_SOURCES = $(libfzputtycommon_ux_a_SOURCES) \
 	$(libfzsftp_ux_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
 CTAGS = ctags
@@ -111,6 +134,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -148,6 +172,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -193,6 +218,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -226,7 +252,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -300,11 +325,11 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfzputtycommon_ux.a: $(libfzputtycommon_ux_a_OBJECTS) $(libfzputtycommon_ux_a_DEPENDENCIES) 
+libfzputtycommon_ux.a: $(libfzputtycommon_ux_a_OBJECTS) $(libfzputtycommon_ux_a_DEPENDENCIES) $(EXTRA_libfzputtycommon_ux_a_DEPENDENCIES) 
 	-rm -f libfzputtycommon_ux.a
 	$(libfzputtycommon_ux_a_AR) libfzputtycommon_ux.a $(libfzputtycommon_ux_a_OBJECTS) $(libfzputtycommon_ux_a_LIBADD)
 	$(RANLIB) libfzputtycommon_ux.a
-libfzsftp_ux.a: $(libfzsftp_ux_a_OBJECTS) $(libfzsftp_ux_a_DEPENDENCIES) 
+libfzsftp_ux.a: $(libfzsftp_ux_a_OBJECTS) $(libfzsftp_ux_a_DEPENDENCIES) $(EXTRA_libfzsftp_ux_a_DEPENDENCIES) 
 	-rm -f libfzsftp_ux.a
 	$(libfzsftp_ux_a_AR) libfzsftp_ux.a $(libfzsftp_ux_a_OBJECTS) $(libfzsftp_ux_a_LIBADD)
 	$(RANLIB) libfzsftp_ux.a
@@ -589,10 +614,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/putty/windows/Makefile.in filezilla-3.7.3~precise/src/putty/windows/Makefile.in
--- filezilla-3.5.3/src/putty/windows/Makefile.in	2012-01-08 13:29:14.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/windows/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,8 +61,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -87,6 +105,11 @@
 SOURCES = $(libfzputtycommon_win_a_SOURCES) $(libfzsftp_win_a_SOURCES)
 DIST_SOURCES = $(libfzputtycommon_win_a_SOURCES) \
 	$(libfzsftp_win_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA) $(nodist_noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -114,6 +137,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -151,6 +175,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -196,6 +221,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -229,7 +255,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -310,11 +335,11 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libfzputtycommon_win.a: $(libfzputtycommon_win_a_OBJECTS) $(libfzputtycommon_win_a_DEPENDENCIES) 
+libfzputtycommon_win.a: $(libfzputtycommon_win_a_OBJECTS) $(libfzputtycommon_win_a_DEPENDENCIES) $(EXTRA_libfzputtycommon_win_a_DEPENDENCIES) 
 	-rm -f libfzputtycommon_win.a
 	$(libfzputtycommon_win_a_AR) libfzputtycommon_win.a $(libfzputtycommon_win_a_OBJECTS) $(libfzputtycommon_win_a_LIBADD)
 	$(RANLIB) libfzputtycommon_win.a
-libfzsftp_win.a: $(libfzsftp_win_a_OBJECTS) $(libfzsftp_win_a_DEPENDENCIES) 
+libfzsftp_win.a: $(libfzsftp_win_a_OBJECTS) $(libfzsftp_win_a_DEPENDENCIES) $(EXTRA_libfzsftp_win_a_DEPENDENCIES) 
 	-rm -f libfzsftp_win.a
 	$(libfzsftp_win_a_AR) libfzsftp_win.a $(libfzsftp_win_a_OBJECTS) $(libfzsftp_win_a_LIBADD)
 	$(RANLIB) libfzsftp_win.a
@@ -599,10 +624,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/src/putty/windows/version.rc2 filezilla-3.7.3~precise/src/putty/windows/version.rc2
--- filezilla-3.5.3/src/putty/windows/version.rc2	2012-01-08 11:19:37.000000000 +0000
+++ filezilla-3.7.3~precise/src/putty/windows/version.rc2	2013-04-29 03:30:06.000000000 +0000
@@ -102,7 +102,7 @@
 	    VALUE "OriginalFilename",	APPNAME
 	    VALUE "FileVersion",	VERSION_TEXT
 	    VALUE "ProductVersion",	VERSION_TEXT
-	    VALUE "LegalCopyright",	"Copyright \251 2004-2012 Tim Kosse,   1997-2011 Simon Tatham."
+	    VALUE "LegalCopyright",	"Copyright \251 2004-2013 Tim Kosse,   1997-2013 Simon Tatham."
 #if (!defined SNAPSHOT) && (!defined RELEASE)
 	    /* Only if VS_FF_PRIVATEBUILD. */
 	    VALUE "PrivateBuild",	VERSION_TEXT /* NBI */
diff -Nru filezilla-3.5.3/src/tinyxml/Makefile.in filezilla-3.7.3~precise/src/tinyxml/Makefile.in
--- filezilla-3.5.3/src/tinyxml/Makefile.in	2012-01-08 13:29:14.000000000 +0000
+++ filezilla-3.7.3~precise/src/tinyxml/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -18,6 +18,23 @@
 
 
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,8 +61,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -74,6 +92,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(libtinyxml_a_SOURCES)
 DIST_SOURCES = $(libtinyxml_a_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 DATA = $(dist_noinst_DATA)
 HEADERS = $(noinst_HEADERS)
 ETAGS = etags
@@ -101,6 +124,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -138,6 +162,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -183,6 +208,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -216,7 +242,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -277,7 +302,7 @@
 
 clean-noinstLIBRARIES:
 	-test -z "$(noinst_LIBRARIES)" || rm -f $(noinst_LIBRARIES)
-libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES) 
+libtinyxml.a: $(libtinyxml_a_OBJECTS) $(libtinyxml_a_DEPENDENCIES) $(EXTRA_libtinyxml_a_DEPENDENCIES) 
 	-rm -f libtinyxml.a
 	$(libtinyxml_a_AR) libtinyxml.a $(libtinyxml_a_OBJECTS) $(libtinyxml_a_LIBADD)
 	$(RANLIB) libtinyxml.a
@@ -416,10 +441,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/tests/Makefile.am filezilla-3.7.3~precise/tests/Makefile.am
--- filezilla-3.5.3/tests/Makefile.am	2009-01-21 03:00:35.000000000 +0000
+++ filezilla-3.7.3~precise/tests/Makefile.am	2012-12-09 04:30:04.000000000 +0000
@@ -20,5 +20,6 @@
 test_LDFLAGS += $(LIBGNUTLS_LIBS)
 test_LDFLAGS += $(WX_LIBS)
 test_LDFLAGS += $(IDN_LIB)
+test_LDFLAGS += $(LIBSQLITE3_LIBS)
 
 test_DEPENDENCIES = ../src/engine/libengine.a
diff -Nru filezilla-3.5.3/tests/Makefile.in filezilla-3.7.3~precise/tests/Makefile.in
--- filezilla-3.5.3/tests/Makefile.in	2012-01-08 13:29:14.000000000 +0000
+++ filezilla-3.7.3~precise/tests/Makefile.in	2013-08-07 19:17:15.000000000 +0000
@@ -1,9 +1,9 @@
-# Makefile.in generated by automake 1.11.1 from Makefile.am.
+# Makefile.in generated by automake 1.11.6 from Makefile.am.
 # @configure_input@
 
 # Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
-# 2003, 2004, 2005, 2006, 2007, 2008, 2009  Free Software Foundation,
-# Inc.
+# 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software
+# Foundation, Inc.
 # This Makefile.in is free software; the Free Software Foundation
 # gives unlimited permission to copy and/or distribute it,
 # with or without modifications, as long as this notice is preserved.
@@ -17,6 +17,23 @@
 
 # Rules for the test code (use `make check` to execute)
 VPATH = @srcdir@
+am__make_dryrun = \
+  { \
+    am__dry=no; \
+    case $$MAKEFLAGS in \
+      *\\[\ \	]*) \
+        echo 'am--echo: ; @echo "AM"  OK' | $(MAKE) -f - 2>/dev/null \
+          | grep '^AM OK$$' >/dev/null || am__dry=yes;; \
+      *) \
+        for am__flg in $$MAKEFLAGS; do \
+          case $$am__flg in \
+            *=*|--*) ;; \
+            *n*) am__dry=yes; break;; \
+          esac; \
+        done;; \
+    esac; \
+    test $$am__dry = yes; \
+  }
 pkgdatadir = $(datadir)/@PACKAGE@
 pkgincludedir = $(includedir)/@PACKAGE@
 pkglibdir = $(libdir)/@PACKAGE@
@@ -44,8 +61,9 @@
 	$(top_srcdir)/m4/cppunit.m4 \
 	$(top_srcdir)/m4/fz_check_tinyxml.m4 \
 	$(top_srcdir)/m4/fz_checkversion.m4 \
-	$(top_srcdir)/m4/libgnutls.m4 $(top_srcdir)/m4/pkg.m4 \
-	$(top_srcdir)/m4/wxwin.m4 $(top_srcdir)/configure.in
+	$(top_srcdir)/m4/icopyhookw.m4 $(top_srcdir)/m4/libgnutls.m4 \
+	$(top_srcdir)/m4/pkg.m4 $(top_srcdir)/m4/wxwin.m4 \
+	$(top_srcdir)/configure.in
 am__configure_deps = $(am__aclocal_m4_deps) $(CONFIGURE_DEPENDENCIES) \
 	$(ACLOCAL_M4)
 mkinstalldirs = $(install_sh) -d
@@ -76,6 +94,11 @@
 	$(LDFLAGS) -o $@
 SOURCES = $(test_SOURCES)
 DIST_SOURCES = $(test_SOURCES)
+am__can_run_installinfo = \
+  case $$AM_UPDATE_INFO_DIR in \
+    n|no|NO) false;; \
+    *) (install-info --version) >/dev/null 2>&1;; \
+  esac
 ETAGS = etags
 CTAGS = ctags
 am__tty_colors = \
@@ -103,6 +126,7 @@
 CYGPATH_W = @CYGPATH_W@
 DEFS = @DEFS@
 DEPDIR = @DEPDIR@
+DLLTOOL = @DLLTOOL@
 DSYMUTIL = @DSYMUTIL@
 DUMPBIN = @DUMPBIN@
 ECHO_C = @ECHO_C@
@@ -140,6 +164,7 @@
 LN_S = @LN_S@
 LTLIBOBJS = @LTLIBOBJS@
 MAKEINFO = @MAKEINFO@
+MANIFEST_TOOL = @MANIFEST_TOOL@
 MKDIR_P = @MKDIR_P@
 NM = @NM@
 NMEDIT = @NMEDIT@
@@ -185,6 +210,7 @@
 abs_srcdir = @abs_srcdir@
 abs_top_builddir = @abs_top_builddir@
 abs_top_srcdir = @abs_top_srcdir@
+ac_ct_AR = @ac_ct_AR@
 ac_ct_CC = @ac_ct_CC@
 ac_ct_CXX = @ac_ct_CXX@
 ac_ct_DUMPBIN = @ac_ct_DUMPBIN@
@@ -218,7 +244,6 @@
 libexecdir = @libexecdir@
 localedir = @localedir@
 localstatedir = @localstatedir@
-lt_ECHO = @lt_ECHO@
 mandir = @mandir@
 mkdir_p = @mkdir_p@
 msgfmt = @msgfmt@
@@ -248,7 +273,7 @@
 test_CPPFLAGS = $(WX_CPPFLAGS)
 test_CXXFLAGS = $(WX_CXXFLAGS_ONLY) $(CPPUNIT_CFLAGS)
 test_LDFLAGS = $(CPPUNIT_LIBS) ../src/engine/libengine.a \
-	$(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB)
+	$(LIBGNUTLS_LIBS) $(WX_LIBS) $(IDN_LIB) $(LIBSQLITE3_LIBS)
 test_DEPENDENCIES = ../src/engine/libengine.a
 all: all-am
 
@@ -293,7 +318,7 @@
 	list=`for p in $$list; do echo "$$p"; done | sed 's/$(EXEEXT)$$//'`; \
 	echo " rm -f" $$list; \
 	rm -f $$list
-test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) 
+test$(EXEEXT): $(test_OBJECTS) $(test_DEPENDENCIES) $(EXTRA_test_DEPENDENCIES) 
 	@rm -f test$(EXEEXT)
 	$(test_LINK) $(test_OBJECTS) $(test_LDADD) $(LIBS)
 
@@ -539,14 +564,15 @@
 	  fi; \
 	  dashes=`echo "$$dashes" | sed s/./=/g`; \
 	  if test "$$failed" -eq 0; then \
-	    echo "$$grn$$dashes"; \
+	    col="$$grn"; \
 	  else \
-	    echo "$$red$$dashes"; \
+	    col="$$red"; \
 	  fi; \
-	  echo "$$banner"; \
-	  test -z "$$skipped" || echo "$$skipped"; \
-	  test -z "$$report" || echo "$$report"; \
-	  echo "$$dashes$$std"; \
+	  echo "$${col}$$dashes$${std}"; \
+	  echo "$${col}$$banner$${std}"; \
+	  test -z "$$skipped" || echo "$${col}$$skipped$${std}"; \
+	  test -z "$$report" || echo "$${col}$$report$${std}"; \
+	  echo "$${col}$$dashes$${std}"; \
 	  test "$$failed" -eq 0; \
 	else :; fi
 
@@ -596,10 +622,15 @@
 
 installcheck: installcheck-am
 install-strip:
-	$(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
-	  install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
-	  `test -z '$(STRIP)' || \
-	    echo "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'"` install
+	if test -z '$(STRIP)'; then \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	      install; \
+	else \
+	  $(MAKE) $(AM_MAKEFLAGS) INSTALL_PROGRAM="$(INSTALL_STRIP_PROGRAM)" \
+	    install_sh_PROGRAM="$(INSTALL_STRIP_PROGRAM)" INSTALL_STRIP_FLAG=-s \
+	    "INSTALL_PROGRAM_ENV=STRIPPROG='$(STRIP)'" install; \
+	fi
 mostlyclean-generic:
 
 clean-generic:
diff -Nru filezilla-3.5.3/tests/dirparsertest.cpp filezilla-3.7.3~precise/tests/dirparsertest.cpp
--- filezilla-3.5.3/tests/dirparsertest.cpp	2011-08-28 20:36:18.000000000 +0000
+++ filezilla-3.7.3~precise/tests/dirparsertest.cpp	2012-10-10 03:30:10.000000000 +0000
@@ -68,7 +68,7 @@
 void CDirectoryListingParserTest::InitEntries()
 {
 	// Unix-style listings
-        // -------------------
+	// -------------------
 
 	// We start with a perfect example of a unix style directory listing without anomalies.
 	m_entries.push_back((t_entry){
@@ -296,7 +296,7 @@
 	utc = wxDateTime(13, wxDateTime::Feb, 1996, 23, 58, 27);
 	utc.MakeFromTimezone(wxDateTime::UTC);
 	m_entries.push_back((t_entry){
-        	"+i8388621.50690,m824255907,/,\t15-eplf dir",
+			"+i8388621.50690,m824255907,/,\t15-eplf dir",
 			{
 				_T("15-eplf dir"),
 				-1,
@@ -513,6 +513,20 @@
 		});
 
 	m_entries.push_back((t_entry){
+			"dr-xr-xr-x   2 root     other      2235 szept 26 20:10 28b-datetest-hungarian dir",
+			{
+				_T("28b-datetest-hungarian dir"),
+				2235,
+				_T("dr-xr-xr-x"),
+				_T("root other"),
+				CDirentry::flag_dir | CDirentry::flag_timestamp_date | CDirentry::flag_timestamp_time,
+				_T(""),
+				wxDateTime(26, wxDateTime::Sep, calcYear(7, 26), 20, 10)
+			},
+			DEFAULT
+		});
+
+	m_entries.push_back((t_entry){
 			"-r-xr-xr-x   2 root     other      2235 2.   Okt.  2003 29-datetest-ger file",
 			{
 				_T("29-datetest-ger file"),
@@ -1056,11 +1070,11 @@
 	});
 
 	// MVS Dataset members
-	// 
+	//
 	// As common with IBM misdesign, multiple styles exist.
-	
+
 	// Speciality: Some members have no attributes at all.
-	// Requires servertype to be MVS or it won't be parsed, as 
+	// Requires servertype to be MVS or it won't be parsed, as
 	// it would conflict with lots of other servers.
 	m_entries.push_back((t_entry){
 			"65-MVS-PDS-MEMBER",
@@ -1137,7 +1151,7 @@
 
 	// z/VM, another IBM abomination. Description by Alexandre Charbey
 	// Requires type set to ZVM or it cannot be parsed.
-	// 
+	//
 	// 70-ZVMFILE
 	//   is a filename
 	// TRACE
@@ -1257,7 +1271,7 @@
 				utc
 			},
 			DEFAULT
-		});	
+		});
 
 		m_entries.push_back((t_entry){
 			"type=OS.unix=slink:/foo; 76 MLSD symlink",
@@ -1271,7 +1285,7 @@
 				wxDateTime()
 			},
 			DEFAULT
-		});	
+		});
 
 		// Old ietf draft for MLST earlier than mlst-07 has no trailing semicolon after facts
 		m_entries.push_back((t_entry){
diff -Nru filezilla-3.5.3/tests/test.cpp filezilla-3.7.3~precise/tests/test.cpp
--- filezilla-3.5.3/tests/test.cpp	2011-05-22 15:57:08.000000000 +0000
+++ filezilla-3.7.3~precise/tests/test.cpp	2012-10-10 03:30:10.000000000 +0000
@@ -5,7 +5,7 @@
 #include <cppunit/ui/text/TestRunner.h>
 #include <locale.h>
 #include <wx/init.h>
-	
+
 int main(int argc, char* argv[])
 {
 	setlocale(LC_ALL, "");